geos: 3.12.2 -> 3.13.0 (#344310)

authored by Ivan Mincik and committed by GitHub ead36718 2c5fac3e

+23 -5
+15
pkgs/development/libraries/gdal/default.nix
··· 2 2 , stdenv 3 3 , callPackage 4 4 , fetchFromGitHub 5 + , fetchpatch 5 6 6 7 , useMinimalFeatures ? false 7 8 , useTiledb ? (!useMinimalFeatures) && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ··· 87 88 rev = "v${finalAttrs.version}"; 88 89 hash = "sha256-BXnpNfi9tUd6nnwYdstuOfGsFVif8kkmkW97X1UAgt8="; 89 90 }; 91 + 92 + patches = [ 93 + (fetchpatch { 94 + url = "https://github.com/OSGeo/gdal/commit/91e4f55f8f374a75f8f2ecd05670edcfa4c0af84.patch"; 95 + sha256 = "sha256-C2lkZLsORso7WVxgX79r5swkoVu/APPwQp2C/rmmCAo="; 96 + }) 97 + (fetchpatch { 98 + url = "https://github.com/OSGeo/gdal/commit/40c3212fe4ba93e5176df4cd8ae5e29e06bb6027.patch"; 99 + sha256 = "sha256-D55iT6E/YdpSyfN7KUDTh1gdmIDLHXW4VC5d6D9B7ls="; 100 + }) 101 + ]; 90 102 91 103 nativeBuildInputs = [ 92 104 bison ··· 256 268 # failing with PROJ 9.3.1 257 269 # https://github.com/OSGeo/gdal/issues/8908 258 270 "test_osr_esri_28" 271 + # flakey tests, to remove on next release 272 + "test_vsiaz_write_blockblob_chunk_size_1" 273 + "test_vsiaz_fake_write" 259 274 ] ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ 260 275 # likely precision-related expecting x87 behaviour 261 276 "test_jp2openjpeg_22"
+2 -2
pkgs/development/libraries/geos/default.nix
··· 9 9 10 10 stdenv.mkDerivation (finalAttrs: { 11 11 pname = "geos"; 12 - version = "3.12.2"; 12 + version = "3.13.0"; 13 13 14 14 src = fetchurl { 15 15 url = "https://download.osgeo.org/geos/geos-${finalAttrs.version}.tar.bz2"; 16 - hash = "sha256-NMd3C/AJDuiEiK+Ydn0I53nxJPozQ34Kq+yKvUYJ/sY="; 16 + hash = "sha256-R+yD/zNNZyueRCZpXxXabmNoJEIUlx+r84b/jvbfOeQ="; 17 17 }; 18 18 19 19 nativeBuildInputs = [ cmake ];
+2 -2
pkgs/development/libraries/librasterlite2/default.nix
··· 63 63 libspatialite 64 64 libtiff 65 65 libwebp 66 - libxml2 66 + (libxml2.override { enableHttp = true; }) 67 67 lz4 68 68 minizip 69 69 openjpeg ··· 71 71 proj 72 72 sqlite 73 73 zstd 74 - ] ++ lib.optional stdenv.hostPlatform.isDarwin ApplicationServices; 74 + ] ++ lib.optional stdenv.isDarwin ApplicationServices; 75 75 76 76 enableParallelBuilding = true; 77 77
+4 -1
pkgs/development/python-modules/psycopg/default.nix
··· 205 205 # Mypy typing test 206 206 "tests/test_typing.py" 207 207 "tests/crdb/test_typing.py" 208 + # https://github.com/psycopg/psycopg/pull/915 209 + "tests/test_notify.py" 210 + "tests/test_notify_async.py" 208 211 ]; 209 212 210 213 pytestFlagsArray = [ 211 214 "-o" 212 215 "cache_dir=$TMPDIR" 213 216 "-m" 214 - "'not refcount and not timing'" 217 + "'not refcount and not timing and not flakey'" 215 218 # pytest.PytestRemovedIn9Warning: Marks applied to fixtures have no effect 216 219 "-W" 217 220 "ignore::pytest.PytestRemovedIn9Warning"