Skip to content
This repository has been archived by the owner on Nov 27, 2024. It is now read-only.

pkgs: weekly update (weekly-update-2024.35) #519

Merged
merged 6 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

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

4 changes: 2 additions & 2 deletions pkgs/gdal/master-rev.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
rev = "2a11f6b";
hash = "sha256-Q2+zgshBmW7bjZqJvmkW7dQ3aYJbu85N0MkYauAQVKY=";
rev = "a220d4a";
hash = "sha256-DAtjCKjA+ZJapiKzTU6gsXk/8dbfMJ1Lki7Wm3zOKb8=";
}
4 changes: 2 additions & 2 deletions pkgs/grass/plugins-rev.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
rev = "8f99872";
hash = "sha256-O+NQIFcmGtjgW0ihYrgV0A7wIyi+Nx160s42CQZXk+Q=";
rev = "fc565ea";
hash = "sha256-L+7AlGAHsykxP2HlUiX8sOP8GWtCGxKt6qQ55idP9x0=";
}
27 changes: 15 additions & 12 deletions pkgs/libspatialindex/default.nix
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
30 changes: 15 additions & 15 deletions pkgs/qgis/qgis-ltr-plugins-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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=";
};


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


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


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


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


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


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


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


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


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


Expand Down
4 changes: 2 additions & 2 deletions pkgs/shapely/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down