From 38394e71e27ab9b4c21d81a299a90e41ecbba298 Mon Sep 17 00:00:00 2001 From: imincik Date: Mon, 26 Aug 2024 01:28:41 +0000 Subject: [PATCH 1/6] flake: weekly update of nix flake inputs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 3595207..791ad0e 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723938990, - "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", "type": "github" }, "original": { From 7826af1870e4abe3283b6db23c0214a366a44abe Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 29 Aug 2024 09:24:37 +0200 Subject: [PATCH 2/6] libspatialindex: 1.9.3 -> 2.0.0 Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/318245 --- pkgs/libspatialindex/default.nix | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/libspatialindex/default.nix b/pkgs/libspatialindex/default.nix index e1f93c8..0f9d958 100644 --- a/pkgs/libspatialindex/default.nix +++ b/pkgs/libspatialindex/default.nix @@ -1,29 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation (finalAttrs: { pname = "libspatialindex"; - version = "1.9.3"; + version = "2.0.0"; src = fetchFromGitHub { owner = "libspatialindex"; repo = "libspatialindex"; rev = finalAttrs.version; - hash = "sha256-zsvS0IkCXyuNLCQpccKdAsFKoq0l+y66ifXlTHLNTkc="; + hash = "sha256-hZyAXz1ddRStjZeqDf4lYkV/g0JLqLy7+GrSUh75k20="; }; - patches = [ - # Allow building static libs - (fetchpatch { - name = "fix-static-lib-build.patch"; - url = "https://github.com/libspatialindex/libspatialindex/commit/caee28d84685071da3ff3a4ea57ff0b6ae64fc87.patch"; - hash = "sha256-nvTW/t9tw1ZLeycJY8nj7rQgZogxQb765Ca2b9NDvRo="; - }) - ]; + postPatch = '' + patchShebangs test/ + ''; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DSIDX_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) + + # The cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR + # correctly (setting it to an absolute path causes include files to go to + # $out/$out/include, because the absolute path is interpreted with root + # at $out). + # See: https://github.com/NixOS/nixpkgs/issues/144170 + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" ]; doCheck = true; From f5375d3504956c74af12cd4ee17b8783a786d15d Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 29 Aug 2024 09:31:17 +0200 Subject: [PATCH 3/6] python3-shapely: 2.0.5 -> 2.0.6 Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/336020 --- pkgs/shapely/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shapely/default.nix b/pkgs/shapely/default.nix index 4086971..db6e185 100644 --- a/pkgs/shapely/default.nix +++ b/pkgs/shapely/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "shapely"; - version = "2.0.5"; + version = "2.0.6"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-v/I2a8eGv6bLNT1rR9BEPFcMMndmEuUn7ke232P8/jI="; + hash = "sha256-mX9hWbFIQFnsI5ysqlNGf9i1Vk2r4YbNhKwpRGY7C/Y="; }; nativeBuildInputs = [ From 1a168c7b1fdeb569a21ee5333083a8bc9fcca985 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 29 Aug 2024 09:32:29 +0200 Subject: [PATCH 4/6] gdal-master: weekly update --- pkgs/gdal/master-rev.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/gdal/master-rev.nix b/pkgs/gdal/master-rev.nix index 8766866..cb0ad71 100644 --- a/pkgs/gdal/master-rev.nix +++ b/pkgs/gdal/master-rev.nix @@ -1,4 +1,4 @@ { - rev = "2a11f6b"; - hash = "sha256-Q2+zgshBmW7bjZqJvmkW7dQ3aYJbu85N0MkYauAQVKY="; + rev = "a220d4a"; + hash = "sha256-DAtjCKjA+ZJapiKzTU6gsXk/8dbfMJ1Lki7Wm3zOKb8="; } From 80940a9767ab1f68f786be6872016425080948eb Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 29 Aug 2024 09:37:16 +0200 Subject: [PATCH 5/6] qgis-plugins: weekly update --- pkgs/qgis/qgis-ltr-plugins-list.nix | 30 ++++++++++++++--------------- pkgs/qgis/qgis-plugins-list.nix | 30 ++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pkgs/qgis/qgis-ltr-plugins-list.nix b/pkgs/qgis/qgis-ltr-plugins-list.nix index f05dd8d..8b8cad3 100644 --- a/pkgs/qgis/qgis-ltr-plugins-list.nix +++ b/pkgs/qgis/qgis-ltr-plugins-list.nix @@ -323,9 +323,9 @@ Networks = { - version = "2.7.21"; - url = "https://plugins.qgis.org/plugins/networks/version/2.7.21/download/"; - hash = "sha256-ltGqhHoI7UP1MuxL/jO3gh/BmnuhnH8/M4uc3Qu/vTM="; + version = "2.7.22"; + url = "https://plugins.qgis.org/plugins/networks/version/2.7.22/download/"; + hash = "sha256-vAapU1DAyPOkoXePg5g9bqpyTbRdsZH6w7ldZqRsJJI="; }; @@ -463,9 +463,9 @@ AnotherDXFImporter = { - version = "1.3.1"; - url = "https://plugins.qgis.org/plugins/AnotherDXF2Shape/version/1.3.1/download/"; - hash = "sha256-fDAjOiaLql3kC9tJJjAHhhTtNRLWecDjBxYwUW1ugkg="; + version = "1.3.2"; + url = "https://plugins.qgis.org/plugins/AnotherDXF2Shape/version/1.3.2/download/"; + hash = "sha256-nmwaqlTy8A0D69lnvE5ho0Kh9Y2c9JB7pqjgKC7NFtU="; }; @@ -519,9 +519,9 @@ SRTM-Downloader = { - version = "3.2.2"; - url = "https://plugins.qgis.org/plugins/SRTM-Downloader/version/3.2.2/download/"; - hash = "sha256-Tsw5i2Ond2JSW8fs+GVBCtzuoJwc+dBmbZuW3QtRQFM="; + version = "3.2.3"; + url = "https://plugins.qgis.org/plugins/SRTM-Downloader/version/3.2.3/download/"; + hash = "sha256-CZs4MjS296C+D7ZweniA+9E3tmuMGeV6e6q5xjWnmzk="; }; @@ -547,9 +547,9 @@ HCMGIS = { - version = "24.1.12"; - url = "https://plugins.qgis.org/plugins/HCMGIS/version/24.1.12/download/"; - hash = "sha256-GSx22o+2fOMwxhhVo2gdmHFdOzewME1ip+ZBru42wYo="; + version = "24.8.27"; + url = "https://plugins.qgis.org/plugins/HCMGIS/version/24.8.27/download/"; + hash = "sha256-fXJkCir2XiLsX6MmBzG+hUgabB+zc+2iwKqCAe3vFOs="; }; @@ -568,9 +568,9 @@ KML-Tools = { - version = "3.1.33"; - url = "https://plugins.qgis.org/plugins/kmltools/version/3.1.33/download/"; - hash = "sha256-sUioqLmhHqN9Vr2L7Md51XzUtGd+GPa59h6AALo5L3g="; + version = "3.2.2"; + url = "https://plugins.qgis.org/plugins/kmltools/version/3.2.2/download/"; + hash = "sha256-tVoGPXdGoM9bzFmBOXVoKXaw8sVSXRmMUnVH31FT8fU="; }; diff --git a/pkgs/qgis/qgis-plugins-list.nix b/pkgs/qgis/qgis-plugins-list.nix index 139fc36..7cb084a 100644 --- a/pkgs/qgis/qgis-plugins-list.nix +++ b/pkgs/qgis/qgis-plugins-list.nix @@ -323,9 +323,9 @@ Networks = { - version = "2.7.21"; - url = "https://plugins.qgis.org/plugins/networks/version/2.7.21/download/"; - hash = "sha256-ltGqhHoI7UP1MuxL/jO3gh/BmnuhnH8/M4uc3Qu/vTM="; + version = "2.7.22"; + url = "https://plugins.qgis.org/plugins/networks/version/2.7.22/download/"; + hash = "sha256-vAapU1DAyPOkoXePg5g9bqpyTbRdsZH6w7ldZqRsJJI="; }; @@ -463,9 +463,9 @@ AnotherDXFImporter = { - version = "1.3.1"; - url = "https://plugins.qgis.org/plugins/AnotherDXF2Shape/version/1.3.1/download/"; - hash = "sha256-fDAjOiaLql3kC9tJJjAHhhTtNRLWecDjBxYwUW1ugkg="; + version = "1.3.2"; + url = "https://plugins.qgis.org/plugins/AnotherDXF2Shape/version/1.3.2/download/"; + hash = "sha256-nmwaqlTy8A0D69lnvE5ho0Kh9Y2c9JB7pqjgKC7NFtU="; }; @@ -519,9 +519,9 @@ SRTM-Downloader = { - version = "3.2.2"; - url = "https://plugins.qgis.org/plugins/SRTM-Downloader/version/3.2.2/download/"; - hash = "sha256-Tsw5i2Ond2JSW8fs+GVBCtzuoJwc+dBmbZuW3QtRQFM="; + version = "3.2.3"; + url = "https://plugins.qgis.org/plugins/SRTM-Downloader/version/3.2.3/download/"; + hash = "sha256-CZs4MjS296C+D7ZweniA+9E3tmuMGeV6e6q5xjWnmzk="; }; @@ -547,9 +547,9 @@ HCMGIS = { - version = "24.1.12"; - url = "https://plugins.qgis.org/plugins/HCMGIS/version/24.1.12/download/"; - hash = "sha256-GSx22o+2fOMwxhhVo2gdmHFdOzewME1ip+ZBru42wYo="; + version = "24.8.27"; + url = "https://plugins.qgis.org/plugins/HCMGIS/version/24.8.27/download/"; + hash = "sha256-fXJkCir2XiLsX6MmBzG+hUgabB+zc+2iwKqCAe3vFOs="; }; @@ -568,9 +568,9 @@ KML-Tools = { - version = "3.1.33"; - url = "https://plugins.qgis.org/plugins/kmltools/version/3.1.33/download/"; - hash = "sha256-sUioqLmhHqN9Vr2L7Md51XzUtGd+GPa59h6AALo5L3g="; + version = "3.2.2"; + url = "https://plugins.qgis.org/plugins/kmltools/version/3.2.2/download/"; + hash = "sha256-tVoGPXdGoM9bzFmBOXVoKXaw8sVSXRmMUnVH31FT8fU="; }; From f9cd10f2f374c324410c46d8a0ed274ea6bde0c0 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 29 Aug 2024 09:37:53 +0200 Subject: [PATCH 6/6] grass-plugins: weekly update --- pkgs/grass/plugins-rev.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/grass/plugins-rev.nix b/pkgs/grass/plugins-rev.nix index d620e81..7171a59 100644 --- a/pkgs/grass/plugins-rev.nix +++ b/pkgs/grass/plugins-rev.nix @@ -1,4 +1,4 @@ { - rev = "8f99872"; - hash = "sha256-O+NQIFcmGtjgW0ihYrgV0A7wIyi+Nx160s42CQZXk+Q="; + rev = "fc565ea"; + hash = "sha256-L+7AlGAHsykxP2HlUiX8sOP8GWtCGxKt6qQ55idP9x0="; }