From 8fcc6084a92ed1e67bcd18b70da8cf8c679fdf88 Mon Sep 17 00:00:00 2001 From: imincik Date: Mon, 10 Jun 2024 01:28:18 +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 1926ce6..c17beef 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717159533, - "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "lastModified": 1717880976, + "narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c", "type": "github" }, "original": { From ad5141905fc557aa8b1ddd0e29a908b9cdedef04 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 13 Jun 2024 12:06:34 +0200 Subject: [PATCH 2/6] gdal: add pname suffix when builing minimal version Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/318820 --- pkgs/gdal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/gdal/default.nix b/pkgs/gdal/default.nix index b059620..e7a9994 100644 --- a/pkgs/gdal/default.nix +++ b/pkgs/gdal/default.nix @@ -79,7 +79,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "gdal"; + pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; version = "3.8.5"; src = fetchFromGitHub { From 9e7a2aa5925be6052252734a72ee472621d40c55 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 13 Jun 2024 12:08:15 +0200 Subject: [PATCH 3/6] pg_tileserv: Remove indefinite article from meta.description Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/317959 --- pkgs/pg_tileserv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/pg_tileserv/default.nix b/pkgs/pg_tileserv/default.nix index 69340e0..0fce8e0 100644 --- a/pkgs/pg_tileserv/default.nix +++ b/pkgs/pg_tileserv/default.nix @@ -38,7 +38,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "A very thin PostGIS-only tile server in Go"; + description = "Very thin PostGIS-only tile server in Go"; mainProgram = "pg_tileserv"; homepage = "https://github.com/CrunchyData/pg_tileserv"; license = licenses.asl20; From 5c6a52b4312f1ef6efe966debea7695b4345b8e1 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 13 Jun 2024 12:08:59 +0200 Subject: [PATCH 4/6] qgis: Remove indefinite article from meta.description Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/317959 --- pkgs/qgis/unwrapped-ltr.nix | 2 +- pkgs/qgis/unwrapped.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/qgis/unwrapped-ltr.nix b/pkgs/qgis/unwrapped-ltr.nix index 2645022..4d07c9a 100644 --- a/pkgs/qgis/unwrapped-ltr.nix +++ b/pkgs/qgis/unwrapped-ltr.nix @@ -176,7 +176,7 @@ in mkDerivation rec { ''; meta = with lib; { - description = "A Free and Open Source Geographic Information System"; + description = "Free and Open Source Geographic Information System"; homepage = "https://www.qgis.org"; license = licenses.gpl2Plus; maintainers = with maintainers; teams.geospatial.members ++ [ lsix ]; diff --git a/pkgs/qgis/unwrapped.nix b/pkgs/qgis/unwrapped.nix index 7e280dc..48eed4d 100644 --- a/pkgs/qgis/unwrapped.nix +++ b/pkgs/qgis/unwrapped.nix @@ -176,7 +176,7 @@ in mkDerivation rec { ''; meta = with lib; { - description = "A Free and Open Source Geographic Information System"; + description = "Free and Open Source Geographic Information System"; homepage = "https://www.qgis.org"; license = licenses.gpl2Plus; maintainers = with maintainers; teams.geospatial.members ++ [ lsix ]; From 771599563258200a614054278cb023d9b20b665e Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 13 Jun 2024 12:09:53 +0200 Subject: [PATCH 5/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 6fd12fa..56cbdba 100644 --- a/pkgs/gdal/master-rev.nix +++ b/pkgs/gdal/master-rev.nix @@ -1,4 +1,4 @@ { - rev = "0b1f77f"; - hash = "sha256-jtYfdQHmMFDu8SSv5z4RBakNWE4ZLClx/bGjXMcxDlI="; + rev = "064ea59"; + hash = "sha256-MqZ9+xn6m22wFpVg8NmSqavCOboXvXdkU4G3K53fBEY="; } From 7e67f0b73ddfc24965280590f089c04f0b690860 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 13 Jun 2024 12:13:42 +0200 Subject: [PATCH 6/6] qgis-plugins: weekly update --- pkgs/qgis/qgis-ltr-plugins-list.nix | 23 +++++++++++++++-------- pkgs/qgis/qgis-plugins-list.nix | 19 +++++++++++++------ 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/pkgs/qgis/qgis-ltr-plugins-list.nix b/pkgs/qgis/qgis-ltr-plugins-list.nix index d156c51..dce05ac 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.15"; - url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.15/download/"; - hash = "sha256-88VcFkc1pMois4IcCmkD3ET5prPmlUdoQ3e4Mx8XGcs="; + version = "4.3.16"; + url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.16/download/"; + hash = "sha256-1f26e2OUdKjubY9SUnlmKlM2/D0CEh/XtlQEoPOxIu0="; }; @@ -217,6 +217,13 @@ }; + Buffer-by-Percentage = { + version = "0.3.3"; + url = "https://plugins.qgis.org/plugins/BufferByPercentage/version/0.3.3/download/"; + hash = "sha256-ggm0Fe3RIAurQztvVWm/KVSVV6PupRH5IOqAgIEJw4s="; + }; + + cadastre = { version = "1.19.1"; url = "https://plugins.qgis.org/plugins/cadastre/version/1.19.1/download/"; @@ -248,7 +255,7 @@ go2streetview = { version = "8.8"; url = "https://plugins.qgis.org/plugins/go2streetview/version/8.8/download/"; - hash = "sha256-jg5S/aJffrSN9Z5M06df3HTlo4TVQIYvWwAoNwMfYDE="; + hash = "sha256-sHrBnKasoWLlMrJCpF/bHWLAt4NC6LecPK9XolorjIg="; }; @@ -365,9 +372,9 @@ qgis2web = { - version = "3.20.0"; - url = "https://plugins.qgis.org/plugins/qgis2web/version/3.20.0/download/"; - hash = "sha256-ECDSL0VfYtcOGBJTlZ2JV/oHreKcGk3HrzV64LaR9Eg="; + version = "3.21.0"; + url = "https://plugins.qgis.org/plugins/qgis2web/version/3.21.0/download/"; + hash = "sha256-7XyaXDvhtYWF2sH72DsUL8/d7EIps9MIkJVCS0wkwj0="; }; @@ -465,7 +472,7 @@ QGIS-Resource-Sharing = { version = "1.1.0"; url = "https://plugins.qgis.org/plugins/qgis_resource_sharing/version/1.1.0/download/"; - hash = "sha256-iwFoJq1KKpPnslMcjfXjxqz73B2mHwfiVwg2iIEfSjU="; + hash = "sha256-rktu7PyFa8cycyMwOZhoPx0UD66iH35ppnSoZJt6W9M="; }; diff --git a/pkgs/qgis/qgis-plugins-list.nix b/pkgs/qgis/qgis-plugins-list.nix index 3a47719..bfed58d 100644 --- a/pkgs/qgis/qgis-plugins-list.nix +++ b/pkgs/qgis/qgis-plugins-list.nix @@ -64,9 +64,9 @@ Lizmap = { - version = "4.3.15"; - url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.15/download/"; - hash = "sha256-88VcFkc1pMois4IcCmkD3ET5prPmlUdoQ3e4Mx8XGcs="; + version = "4.3.16"; + url = "https://plugins.qgis.org/plugins/lizmap/version/4.3.16/download/"; + hash = "sha256-1f26e2OUdKjubY9SUnlmKlM2/D0CEh/XtlQEoPOxIu0="; }; @@ -217,6 +217,13 @@ }; + Buffer-by-Percentage = { + version = "0.3.3"; + url = "https://plugins.qgis.org/plugins/BufferByPercentage/version/0.3.3/download/"; + hash = "sha256-ggm0Fe3RIAurQztvVWm/KVSVV6PupRH5IOqAgIEJw4s="; + }; + + cadastre = { version = "1.19.1"; url = "https://plugins.qgis.org/plugins/cadastre/version/1.19.1/download/"; @@ -365,9 +372,9 @@ qgis2web = { - version = "3.20.0"; - url = "https://plugins.qgis.org/plugins/qgis2web/version/3.20.0/download/"; - hash = "sha256-ECDSL0VfYtcOGBJTlZ2JV/oHreKcGk3HrzV64LaR9Eg="; + version = "3.21.0"; + url = "https://plugins.qgis.org/plugins/qgis2web/version/3.21.0/download/"; + hash = "sha256-7XyaXDvhtYWF2sH72DsUL8/d7EIps9MIkJVCS0wkwj0="; };