From aab4512caea4e0a5feac98e3ede30cde85be2436 Mon Sep 17 00:00:00 2001 From: imincik Date: Mon, 4 Mar 2024 01:23:39 +0000 Subject: [PATCH 1/7] flake: update nix flake inputs --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index a55339ca..d9050601 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -72,11 +72,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708831307, - "narHash": "sha256-0iL/DuGjiUeck1zEaL+aIe2WvA3/cVhp/SlmTcOZXH4=", + "lastModified": 1709309926, + "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b", + "rev": "79baff8812a0d68e24a836df0a364c678089e2c7", "type": "github" }, "original": { From 58d8cff04eeba0fded2636ddbf6fb30ee783c320 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 7 Mar 2024 12:58:22 +0100 Subject: [PATCH 2/7] pkgs(grass): remove default configure options Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/293519 --- pkgs/grass/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/grass/default.nix b/pkgs/grass/default.nix index 0d650f6a..a9eaf8f2 100644 --- a/pkgs/grass/default.nix +++ b/pkgs/grass/default.nix @@ -93,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--with-blas" - "--with-fftw" "--with-geos" # It complains about missing libmysqld but doesn't really seem to need it "--with-mysql" @@ -107,10 +106,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-proj-share=${proj}/share/proj" "--with-pthread" "--with-readline" - "--with-zstd" "--without-opengl" - ] ++ lib.optionals stdenv.isLinux [ - "--with-pdal" ] ++ lib.optionals stdenv.isDarwin [ "--without-cairo" "--without-freetype" From 4a1d76f72d12d64727caa6af0153cccf7a01fa23 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Fri, 8 Mar 2024 08:07:42 +0100 Subject: [PATCH 3/7] pkgs(proj): 9.3.1 -> 9.4.0 Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/293113 --- pkgs/proj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/proj/default.nix b/pkgs/proj/default.nix index 326f219c..daab5ac2 100644 --- a/pkgs/proj/default.nix +++ b/pkgs/proj/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proj"; - version = "9.3.1"; + version = "9.4.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = finalAttrs.version; - hash = "sha256-M8Zgy5xnmZu7mzxXXGqaIfe7o7iMf/1sOJVOBsTvtdQ="; + hash = "sha256-m8u5+uWeXI2lxxsTcVJbvCiV30CQifw4reAY3GHHavA="; }; patches = [ From 72f6c0a112f0c11efa91f2347130a0bc25389dd3 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Fri, 8 Mar 2024 08:09:11 +0100 Subject: [PATCH 4/7] pkgs(python3-pyproj): disable failing test due to missing proj-data grid Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/293113 --- pkgs/pyproj/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/pyproj/default.nix b/pkgs/pyproj/default.nix index 242e80bc..11ec1ef4 100644 --- a/pkgs/pyproj/default.nix +++ b/pkgs/pyproj/default.nix @@ -83,6 +83,9 @@ buildPythonPackage rec { "test_sync_download__directory" "test_sync_download__system_directory" "test_transformer_group__download_grids" + + # proj-data grid required + "test_azimuthal_equidistant" ]; pythonImportsCheck = [ From d82ab781f89ff7440b1a3bf5f120405cf7413ebc Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Fri, 8 Mar 2024 08:11:00 +0100 Subject: [PATCH 5/7] pkgs(python3-rasterio): disable flaky test Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/293765 --- pkgs/rasterio/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/rasterio/default.nix b/pkgs/rasterio/default.nix index 0e216ce1..324c6584 100644 --- a/pkgs/rasterio/default.nix +++ b/pkgs/rasterio/default.nix @@ -106,7 +106,10 @@ buildPythonPackage rec { "-m 'not network'" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = [ + # flaky + "test_outer_boundless_pixel_fidelity" + ] ++ lib.optionals stdenv.isDarwin [ "test_reproject_error_propagation" ]; From 07b505767b8a92b6d8c35bb64a9e9bbf8a88d699 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Fri, 8 Mar 2024 08:12:24 +0100 Subject: [PATCH 6/7] pkgs(grass): 8.3.1 -> 8.3.2 Nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/294073 --- pkgs/grass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/grass/default.nix b/pkgs/grass/default.nix index a9eaf8f2..80fd9ccf 100644 --- a/pkgs/grass/default.nix +++ b/pkgs/grass/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "grass"; - version = "8.3.1"; + version = "8.3.2"; src = fetchFromGitHub { owner = "OSGeo"; repo = "grass"; rev = finalAttrs.version; - hash = "sha256-SoJq4SuDYImfkM2e991s47vYusrmnrQaXn7p3xwyOOQ="; + hash = "sha256-loeg+7h676d2WdYOMcJFyzeEZcxjBynir6Hz0J/GBns="; }; nativeBuildInputs = [ From 3b812afe6cc8972a7345b7cb6fddf01b9dd74b60 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Fri, 8 Mar 2024 08:55:19 +0100 Subject: [PATCH 7/7] pkgs(pdal): fix loading of proj dependency --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index b8824e67..6394185a 100644 --- a/flake.nix +++ b/flake.nix @@ -107,7 +107,7 @@ }; pdal = pkgs.callPackage ./pkgs/pdal { - inherit gdal libgeotiff tiledb; + inherit gdal libgeotiff proj tiledb; }; proj = pkgs.callPackage ./pkgs/proj { };