Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pkgs: weekly update (weekly-update-2024.38) #527

Merged
merged 8 commits into from
Sep 19, 2024
Merged

pkgs: weekly update (weekly-update-2024.38) #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a59b9d6
flake: weekly update of nix flake inputs
imincik Sep 16, 2024
ca4af5c
libspatialindex: fix on darwin
imincik Sep 19, 2024
91e36d5
python3-fiona: 1.10.0 -> 1.10.1
imincik Sep 19, 2024
116cdd0
pdal: 2.7.2 -> 2.8.0
imincik Sep 19, 2024
11265a8
qgis: 3.38.2 -> 3.38.3
imincik Sep 19, 2024
278c40b
qgis-ltr: 3.34.10 -> 3.34.11
imincik Sep 19, 2024
bdadfd4
qgis-plugins: weekly update
imincik Sep 19, 2024
05c9df5
grass-plugins: weekly update
imincik Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/fiona/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion pkgs/grass/plugins-list.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'';
};


Expand Down
4 changes: 2 additions & 2 deletions pkgs/grass/plugins-rev.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
rev = "5762dd9";
hash = "sha256-8nJlm2WfcKQ5/eZln+stIJPn1xX0As25ZBMJcT+EGJU=";
rev = "dbc2be3";
hash = "sha256-0xM/MzuM+vj8I5hTiFgP0V5ppxYkLpPbZ2qZpcyDxQ8=";
}
2 changes: 1 addition & 1 deletion pkgs/libspatialindex/nixpkgs/files.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pkgs/development/libraries/libspatialindex/* pkgs/libspatialindex/
pkgs/by-name/li/libspatialindex/* pkgs/libspatialindex/
22 changes: 16 additions & 6 deletions pkgs/libspatialindex/default.nix → pkgs/libspatialindex/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
{
lib,
stdenv,
fetchFromGitHub,
cmake,
fixDarwinDylibNames,
}:

stdenv.mkDerivation (finalAttrs: {
pname = "libspatialindex";
Expand All @@ -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)
Expand All @@ -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;
};
})
8 changes: 2 additions & 6 deletions pkgs/pdal/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
37 changes: 22 additions & 15 deletions pkgs/qgis/qgis-ltr-plugins-list.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=";
};


Expand Down Expand Up @@ -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=";
};


Expand All @@ -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=";
};


Expand Down Expand Up @@ -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=";
};


Expand Down
37 changes: 22 additions & 15 deletions pkgs/qgis/qgis-plugins-list.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=";
};


Expand Down Expand Up @@ -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=";
};


Expand All @@ -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=";
};


Expand Down Expand Up @@ -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=";
};


Expand Down
5 changes: 2 additions & 3 deletions pkgs/qgis/unwrapped-ltr.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions pkgs/qgis/unwrapped.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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"
Expand Down