diff --git a/pkgs/by-name/pa/panotools/cmake4.patch b/pkgs/by-name/pa/panotools/cmake4.patch deleted file mode 100644 index 13d12cc103f8..000000000000 --- a/pkgs/by-name/pa/panotools/cmake4.patch +++ /dev/null @@ -1,32 +0,0 @@ -Subject: Vendor upstream patches (mercurial/sourceforge) -Author: Andreas Metzler - -From: -- https://sourceforge.net/p/panotools/libpano13/ci/698e20b4d296c1dbde9d010c3fb8d54050e56ddb/ -- https://sourceforge.net/p/panotools/libpano13/ci/6b0f2a5ef7a0490866fb224158d1dfbb8bf5896f/ - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -28,8 +28,7 @@ - ## may need to edit the wxWidgets version number below. - ## - --# require at least cmake 3.0 --cmake_minimum_required(VERSION 3.0) -+cmake_minimum_required(VERSION 3.12...4.0) - if(POLICY CMP0074) - cmake_policy(SET CMP0074 NEW) - endif() -@@ -382,12 +382,12 @@ - endif() - - # create TAGS file --ADD_CUSTOM_COMMAND( OUTPUT ctags POST_BUILD -- COMMAND ctags-exuberant -e *.c *.h tools/*.c -+ADD_CUSTOM_COMMAND( OUTPUT ${PROJECT_SOURCE_DIR}/TAGS -+ COMMAND ctags -e *.c *.h tools/*.c - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/ - COMMENT "Build TAGS file" - ) --ADD_CUSTOM_TARGET( TAGS DEPENDS ctags) -+ADD_CUSTOM_TARGET( TAGS DEPENDS ${PROJECT_SOURCE_DIR}/TAGS) diff --git a/pkgs/by-name/pa/panotools/package.nix b/pkgs/by-name/pa/panotools/package.nix index fe5e41c95c12..a5db44159eb3 100644 --- a/pkgs/by-name/pa/panotools/package.nix +++ b/pkgs/by-name/pa/panotools/package.nix @@ -11,15 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libpano13"; - version = "2.9.22"; + version = "2.9.23"; src = fetchurl { url = "mirror://sourceforge/panotools/libpano13-${finalAttrs.version}.tar.gz"; - hash = "sha256-r/xoMM2+ccKNJzHcv43qKs2m2f/UYJxtvzugxoRAqOM="; + hash = "sha256-58B203oUw5Q0liEV5H3b4YRSyj3lzkDiqu+nz1gV6ig="; }; - patches = [ ./cmake4.patch ]; - strictDeps = true; nativeBuildInputs = [