From a59b9d6d86cbe64ab043258046e999bb8b58f2b9 Mon Sep 17 00:00:00 2001 From: imincik Date: Mon, 16 Sep 2024 01:29:10 +0000 Subject: [PATCH 1/8] 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 65d1598..216ec54 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725001927, - "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", + "lastModified": 1726320982, + "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", + "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", "type": "github" }, "original": { From ca4af5cd3e20a3c3b158b82a8a107bf1faa65dd8 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 19 Sep 2024 12:36:20 +0200 Subject: [PATCH 2/8] libspatialindex: fix on darwin Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/342589 --- flake.nix | 2 +- pkgs/libspatialindex/nixpkgs/files.txt | 2 +- .../{default.nix => package.nix} | 22 ++++++++++++++----- 3 files changed, 18 insertions(+), 8 deletions(-) rename pkgs/libspatialindex/{default.nix => package.nix} (66%) diff --git a/flake.nix b/flake.nix index 6924194..6519df0 100644 --- a/flake.nix +++ b/flake.nix @@ -102,7 +102,7 @@ inherit geos; }; - libspatialindex = pkgs.callPackage ./pkgs/libspatialindex { }; + libspatialindex = pkgs.callPackage ./pkgs/libspatialindex/package.nix { }; libspatialite = pkgs.callPackage ./pkgs/libspatialite { inherit geos librttopo proj; diff --git a/pkgs/libspatialindex/nixpkgs/files.txt b/pkgs/libspatialindex/nixpkgs/files.txt index 34a37f2..beca330 100644 --- a/pkgs/libspatialindex/nixpkgs/files.txt +++ b/pkgs/libspatialindex/nixpkgs/files.txt @@ -1 +1 @@ -pkgs/development/libraries/libspatialindex/* pkgs/libspatialindex/ +pkgs/by-name/li/libspatialindex/* pkgs/libspatialindex/ diff --git a/pkgs/libspatialindex/default.nix b/pkgs/libspatialindex/package.nix similarity index 66% rename from pkgs/libspatialindex/default.nix rename to pkgs/libspatialindex/package.nix index 0f9d958..ead9fe2 100644 --- a/pkgs/libspatialindex/default.nix +++ b/pkgs/libspatialindex/package.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + fixDarwinDylibNames, +}: stdenv.mkDerivation (finalAttrs: { pname = "libspatialindex"; @@ -15,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs test/ ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) @@ -31,11 +37,15 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - meta = with lib; { + postFixup = lib.optionalString stdenv.isDarwin '' + install_name_tool -change "@rpath/libspatialindex.7.dylib" "$out/lib/libspatialindex.7.dylib" $out/lib/libspatialindex_c.dylib + ''; + + meta = { description = "Extensible spatial index library in C++"; homepage = "https://libspatialindex.org"; - license = licenses.mit; - maintainers = teams.geospatial.members; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = lib.teams.geospatial.members; + platforms = lib.platforms.unix; }; }) From 91e36d595c5f2e6a434906f3fadbbf651f97b892 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 19 Sep 2024 12:37:34 +0200 Subject: [PATCH 3/8] python3-fiona: 1.10.0 -> 1.10.1 Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/342404 --- pkgs/fiona/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/fiona/default.nix b/pkgs/fiona/default.nix index 49076c4..eabd53a 100644 --- a/pkgs/fiona/default.nix +++ b/pkgs/fiona/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "fiona"; - version = "1.10.0"; + version = "1.10.1"; pyproject = true; src = fetchFromGitHub { owner = "Toblerity"; repo = "Fiona"; rev = "refs/tags/${version}"; - hash = "sha256-0Jiyq9x9YLDN1a1LBlCK2ac6kLZ5X2rOPusUQH5OPrQ="; + hash = "sha256-5NN6PBh+6HS9OCc9eC2TcBvkcwtI4DV8qXnz4tlaMXc="; }; build-system = [ From 116cdd0218f2844db47dc8f072277c006c446e24 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 19 Sep 2024 12:38:22 +0200 Subject: [PATCH 4/8] pdal: 2.7.2 -> 2.8.0 Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/340015 --- pkgs/pdal/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/pdal/default.nix b/pkgs/pdal/default.nix index f1e7009..5693b7e 100644 --- a/pkgs/pdal/default.nix +++ b/pkgs/pdal/default.nix @@ -28,19 +28,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdal"; - version = "2.7.2"; + version = "2.8.0"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; rev = finalAttrs.version; - sha256 = "sha256-ukBZLr/iyYQ68sv9JWrR4YP0ahHfGhytgcWKPzrF3Ps="; + hash = "sha256-VHcUyYADmNzxZ+Ix56TNuaP9wG+vRlEl71cNM0uMaHg="; }; - patches = [ - ./pdal.pc.in.patch - ]; - nativeBuildInputs = [ cmake pkg-config From 11265a83e743eada30ab1c45c7fb2ccdec507874 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 19 Sep 2024 12:39:32 +0200 Subject: [PATCH 5/8] qgis: 3.38.2 -> 3.38.3 Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/342248 --- pkgs/qgis/unwrapped.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/qgis/unwrapped.nix b/pkgs/qgis/unwrapped.nix index 65988d7..d875195 100644 --- a/pkgs/qgis/unwrapped.nix +++ b/pkgs/qgis/unwrapped.nix @@ -73,14 +73,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.38.2"; + version = "3.38.3"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-lArwRtHR/KAsgjpjid6YnPA9BkcG1Mg/KeIIOWN75Kg="; + hash = "sha256-yJFYq4t0LzBr+O2bmtBSeehQ2vfUaZIQfOY68WZcHG4="; }; passthru = { @@ -146,7 +146,6 @@ in mkDerivation rec { env.QT_QPA_PLATFORM_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}/platforms"; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DWITH_3D=True" "-DWITH_PDAL=True" "-DENABLE_TESTS=False" From 278c40bf354dddcf5cfa2c5cf0159243a781d10a Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 19 Sep 2024 12:40:16 +0200 Subject: [PATCH 6/8] qgis-ltr: 3.34.10 -> 3.34.11 Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/342254 --- pkgs/qgis/unwrapped-ltr.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/qgis/unwrapped-ltr.nix b/pkgs/qgis/unwrapped-ltr.nix index bbbf37b..1fcaee3 100644 --- a/pkgs/qgis/unwrapped-ltr.nix +++ b/pkgs/qgis/unwrapped-ltr.nix @@ -73,14 +73,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.34.10"; + version = "3.34.11"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-E2Ak14h1kWdGq+JNbCeh5YJkr/S9g/0HD834MtgACSA="; + hash = "sha256-VNgUMEA7VKZXsLG1ZYUIlYvjwRrH8LsliGiVRMnXOM0="; }; passthru = { @@ -146,7 +146,6 @@ in mkDerivation rec { env.QT_QPA_PLATFORM_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}/platforms"; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DWITH_3D=True" "-DWITH_PDAL=True" "-DENABLE_TESTS=False" From bdadfd4df1a22d475452c03181c5ceb37ca977c4 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 19 Sep 2024 12:44:56 +0200 Subject: [PATCH 7/8] qgis-plugins: weekly update --- pkgs/qgis/qgis-ltr-plugins-list.nix | 37 +++++++++++++++++------------ pkgs/qgis/qgis-plugins-list.nix | 37 +++++++++++++++++------------ 2 files changed, 44 insertions(+), 30 deletions(-) diff --git a/pkgs/qgis/qgis-ltr-plugins-list.nix b/pkgs/qgis/qgis-ltr-plugins-list.nix index c31eb49..a857e76 100644 --- a/pkgs/qgis/qgis-ltr-plugins-list.nix +++ b/pkgs/qgis/qgis-ltr-plugins-list.nix @@ -64,9 +64,9 @@ Lizmap = { - version = "4.3.22"; - url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.22/download/"; - hash = "sha256-W5sPoR9UtMhsRAYS4k08KxB680MsgO0FnD8WGWoIhDM="; + version = "4.4.0"; + url = "https://plugins.qgis.org/plugins/lizmap/version/4.4.0/download/"; + hash = "sha256-wYn2JinbxurTygAw2O0p4RaMKC6l69Tt6o9xxAG5wx4="; }; @@ -427,17 +427,24 @@ }; + Online-Routing-Mapper = { + version = "0.9"; + url = "https://plugins.qgis.org/plugins/OnlineRoutingMapper/version/0.9/download/"; + hash = "sha256-BrFXWe2EsehRi6jtVd7Qf1Bqy7C1dn6FWXoZM0+00WQ="; + }; + + OSMInfo = { - version = "0.8.1"; - url = "https://plugins.qgis.org/plugins/osminfo/version/0.8.1/download/"; - hash = "sha256-amEiD7K+DGxc8hcPfyg0NSTtlBq2xNPbcpcPtAIGSe4="; + version = "0.9.1"; + url = "https://plugins.qgis.org/plugins/osminfo/version/0.9.1/download/"; + hash = "sha256-TCX+Gqz7RBO7IUmkvw8ldDzivrF/NSzeLvX/H/xc94c="; }; TUFLOW = { - version = "3.12"; - url = "https://plugins.qgis.org/plugins/tuflow/version/3.12/download/"; - hash = "sha256-ZHSGCYLJQCgokgYG6HB3zULYJmOZZKBgMkTS58wFiXE="; + version = "3.12.1"; + url = "https://plugins.qgis.org/plugins/tuflow/version/3.12.1/download/"; + hash = "sha256-jUXzQQIDlQS4EWoxPnY7sIQUGjL6nIUTTba4lfRiFMw="; }; @@ -463,9 +470,9 @@ Lat-Lon-Tools = { - version = "3.7.1"; - url = "https://plugins.qgis.org/plugins/latlontools/version/3.7.1/download/"; - hash = "sha256-XrM2KldXWj/WYgCP4ZG3M3jihgiTvSGookAVdiOC9wc="; + version = "3.7.2"; + url = "https://plugins.qgis.org/plugins/latlontools/version/3.7.2/download/"; + hash = "sha256-4JCojPehcj7SnntQfmlGp+7RjIdoPuw5kxlDPnsrXIQ="; }; @@ -512,9 +519,9 @@ Search-Layers = { - version = "3.1.0"; - url = "https://plugins.qgis.org/plugins/searchlayers/version/3.1.0/download/"; - hash = "sha256-1VaVrykqaXzODgOXn76JAXP0Zzwg3CwsoG0+R7n1AlM="; + version = "3.1.1"; + url = "https://plugins.qgis.org/plugins/searchlayers/version/3.1.1/download/"; + hash = "sha256-hGMPw3jWhOEResglwFcMMXx5gQy4Czz1+kKPJsZWyQg="; }; diff --git a/pkgs/qgis/qgis-plugins-list.nix b/pkgs/qgis/qgis-plugins-list.nix index 8fa774a..61bce59 100644 --- a/pkgs/qgis/qgis-plugins-list.nix +++ b/pkgs/qgis/qgis-plugins-list.nix @@ -64,9 +64,9 @@ Lizmap = { - version = "4.3.22"; - url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.22/download/"; - hash = "sha256-W5sPoR9UtMhsRAYS4k08KxB680MsgO0FnD8WGWoIhDM="; + version = "4.4.0"; + url = "https://plugins.qgis.org/plugins/lizmap/version/4.4.0/download/"; + hash = "sha256-wYn2JinbxurTygAw2O0p4RaMKC6l69Tt6o9xxAG5wx4="; }; @@ -427,17 +427,24 @@ }; + Online-Routing-Mapper = { + version = "0.9"; + url = "https://plugins.qgis.org/plugins/OnlineRoutingMapper/version/0.9/download/"; + hash = "sha256-BrFXWe2EsehRi6jtVd7Qf1Bqy7C1dn6FWXoZM0+00WQ="; + }; + + OSMInfo = { - version = "0.8.1"; - url = "https://plugins.qgis.org/plugins/osminfo/version/0.8.1/download/"; - hash = "sha256-amEiD7K+DGxc8hcPfyg0NSTtlBq2xNPbcpcPtAIGSe4="; + version = "0.9.1"; + url = "https://plugins.qgis.org/plugins/osminfo/version/0.9.1/download/"; + hash = "sha256-TCX+Gqz7RBO7IUmkvw8ldDzivrF/NSzeLvX/H/xc94c="; }; TUFLOW = { - version = "3.12"; - url = "https://plugins.qgis.org/plugins/tuflow/version/3.12/download/"; - hash = "sha256-ZHSGCYLJQCgokgYG6HB3zULYJmOZZKBgMkTS58wFiXE="; + version = "3.12.1"; + url = "https://plugins.qgis.org/plugins/tuflow/version/3.12.1/download/"; + hash = "sha256-jUXzQQIDlQS4EWoxPnY7sIQUGjL6nIUTTba4lfRiFMw="; }; @@ -463,9 +470,9 @@ Lat-Lon-Tools = { - version = "3.7.1"; - url = "https://plugins.qgis.org/plugins/latlontools/version/3.7.1/download/"; - hash = "sha256-XrM2KldXWj/WYgCP4ZG3M3jihgiTvSGookAVdiOC9wc="; + version = "3.7.2"; + url = "https://plugins.qgis.org/plugins/latlontools/version/3.7.2/download/"; + hash = "sha256-4JCojPehcj7SnntQfmlGp+7RjIdoPuw5kxlDPnsrXIQ="; }; @@ -512,9 +519,9 @@ Search-Layers = { - version = "3.1.0"; - url = "https://plugins.qgis.org/plugins/searchlayers/version/3.1.0/download/"; - hash = "sha256-1VaVrykqaXzODgOXn76JAXP0Zzwg3CwsoG0+R7n1AlM="; + version = "3.1.1"; + url = "https://plugins.qgis.org/plugins/searchlayers/version/3.1.1/download/"; + hash = "sha256-hGMPw3jWhOEResglwFcMMXx5gQy4Czz1+kKPJsZWyQg="; }; From 05c9df507f991061d68c30721f201583b9f0562c Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 19 Sep 2024 12:45:20 +0200 Subject: [PATCH 8/8] grass-plugins: weekly update --- pkgs/grass/plugins-list.nix | 2 +- pkgs/grass/plugins-rev.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/grass/plugins-list.nix b/pkgs/grass/plugins-list.nix index d6b6278..0a31802 100644 --- a/pkgs/grass/plugins-list.nix +++ b/pkgs/grass/plugins-list.nix @@ -56,7 +56,7 @@ g-download-location = { name = "g.download.location"; - description = ''Download GRASS project (location) from the web Get GRASS project from an URL or file path''; + description = ''Download GRASS Location from the web Get GRASS Location from an URL or file path''; }; diff --git a/pkgs/grass/plugins-rev.nix b/pkgs/grass/plugins-rev.nix index c409a57..43890b4 100644 --- a/pkgs/grass/plugins-rev.nix +++ b/pkgs/grass/plugins-rev.nix @@ -1,4 +1,4 @@ { - rev = "5762dd9"; - hash = "sha256-8nJlm2WfcKQ5/eZln+stIJPn1xX0As25ZBMJcT+EGJU="; + rev = "dbc2be3"; + hash = "sha256-0xM/MzuM+vj8I5hTiFgP0V5ppxYkLpPbZ2qZpcyDxQ8="; }