Unverified Commit ead36718 authored by Ivan Mincik's avatar Ivan Mincik Committed by GitHub
Browse files

geos: 3.12.2 -> 3.13.0 (#344310)

parents 2c5fac3e ba1ae3cc

pkgs/development/libraries/gdal/default.nix

+15 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
, stdenv

, callPackage

, fetchFromGitHub

, fetchpatch



, useMinimalFeatures ? false

, useTiledb ? (!useMinimalFeatures) && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64)
@@ -88,6 +89,17 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-BXnpNfi9tUd6nnwYdstuOfGsFVif8kkmkW97X1UAgt8=";

  };



  patches = [

    (fetchpatch {

      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 = [

    bison

    cmake
@@ -256,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"

pkgs/development/libraries/geos/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 ];

pkgs/development/libraries/librasterlite2/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;

pkgs/development/python-modules/psycopg/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -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"