From 02ddbf4ee62808ef473cb74eb6278cd1ac3c82bb Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Tue, 24 Sep 2024 23:27:38 +0200 Subject: [PATCH 1/5] =?UTF-8?q?geos:=C2=A03.12.2=20->=203.13.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/geos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 0cd143a1ded4..2e63196b0420 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "geos"; - version = "3.12.2"; + version = "3.13.0"; src = fetchurl { url = "https://download.osgeo.org/geos/geos-${finalAttrs.version}.tar.bz2"; - hash = "sha256-NMd3C/AJDuiEiK+Ydn0I53nxJPozQ34Kq+yKvUYJ/sY="; + hash = "sha256-R+yD/zNNZyueRCZpXxXabmNoJEIUlx+r84b/jvbfOeQ="; }; nativeBuildInputs = [ cmake ]; From 23786f00fce342616a47b5c1408638a2825bbbe9 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Wed, 25 Sep 2024 11:35:25 +0200 Subject: [PATCH 2/5] gdal: temporarily disable one test to work with geos 3.13.0 --- pkgs/development/libraries/gdal/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 18f82b99afa0..b7a50b480857 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -2,6 +2,7 @@ , stdenv , callPackage , fetchFromGitHub +, fetchpatch , useMinimalFeatures ? false , useTiledb ? (!useMinimalFeatures) && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) @@ -88,6 +89,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-BXnpNfi9tUd6nnwYdstuOfGsFVif8kkmkW97X1UAgt8="; }; + patches = [ + (fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/91e4f55f8f374a75f8f2ecd05670edcfa4c0af84.patch"; + sha256 = "sha256-C2lkZLsORso7WVxgX79r5swkoVu/APPwQp2C/rmmCAo="; + }) + ]; + nativeBuildInputs = [ bison cmake From 3fe4d32e78558ceec012dd3f6b27e8d3e0331047 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Wed, 25 Sep 2024 19:26:17 +0200 Subject: [PATCH 3/5] librasterlite2: fix build by using libxml2 with http support --- pkgs/development/libraries/librasterlite2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librasterlite2/default.nix b/pkgs/development/libraries/librasterlite2/default.nix index a1655dc6a13d..0286d944691f 100644 --- a/pkgs/development/libraries/librasterlite2/default.nix +++ b/pkgs/development/libraries/librasterlite2/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { libspatialite libtiff libwebp - libxml2 + (libxml2.override { enableHttp = true; }) lz4 minizip openjpeg @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { proj sqlite zstd - ] ++ lib.optional stdenv.hostPlatform.isDarwin ApplicationServices; + ] ++ lib.optional stdenv.isDarwin ApplicationServices; enableParallelBuilding = true; From e4212a9b2d5814a3548e38160e8b2eaa526b2c84 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Thu, 26 Sep 2024 10:39:51 +0200 Subject: [PATCH 4/5] python3Packages.psycopg: disable flakey tests and known timing tests --- pkgs/development/python-modules/psycopg/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index bc55c2d697bc..7d7692018e80 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -205,13 +205,16 @@ buildPythonPackage rec { # Mypy typing test "tests/test_typing.py" "tests/crdb/test_typing.py" + # https://github.com/psycopg/psycopg/pull/915 + "tests/test_notify.py" + "tests/test_notify_async.py" ]; pytestFlagsArray = [ "-o" "cache_dir=$TMPDIR" "-m" - "'not refcount and not timing'" + "'not refcount and not timing and not flakey'" # pytest.PytestRemovedIn9Warning: Marks applied to fixtures have no effect "-W" "ignore::pytest.PytestRemovedIn9Warning" From ba1ae3cc4862c4ae9c1ac6e98af4d6558ce0558e Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Thu, 26 Sep 2024 11:31:13 +0200 Subject: [PATCH 5/5] gdal: disable flaky tests, not yet marked as CI --- pkgs/development/libraries/gdal/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index b7a50b480857..6bddc8c6b5e5 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -94,6 +94,10 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/OSGeo/gdal/commit/91e4f55f8f374a75f8f2ecd05670edcfa4c0af84.patch"; sha256 = "sha256-C2lkZLsORso7WVxgX79r5swkoVu/APPwQp2C/rmmCAo="; }) + (fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/40c3212fe4ba93e5176df4cd8ae5e29e06bb6027.patch"; + sha256 = "sha256-D55iT6E/YdpSyfN7KUDTh1gdmIDLHXW4VC5d6D9B7ls="; + }) ]; nativeBuildInputs = [ @@ -264,6 +268,9 @@ stdenv.mkDerivation (finalAttrs: { # failing with PROJ 9.3.1 # https://github.com/OSGeo/gdal/issues/8908 "test_osr_esri_28" + # flakey tests, to remove on next release + "test_vsiaz_write_blockblob_chunk_size_1" + "test_vsiaz_fake_write" ] ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ # likely precision-related expecting x87 behaviour "test_jp2openjpeg_22"