From 253f59e039977fbe01216908c1456a0223b09358 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Feb 2021 18:51:17 +0100 Subject: [PATCH 1/2] geos: 3.9.0 -> 3.9.1 --- pkgs/development/libraries/geos/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index f96707b549f..19b03eb620c 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.9.0"; + pname = "geos"; + version = "3.9.1"; src = fetchurl { - url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "sha256-vYCCzxL0XydjAZPHi9taPLqEe4HnKyAmg1bCpPwGUmk="; + url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; + sha256 = "sha256-fmMFB9ysncB1ZdJJom8GoVyfWwxS3SkSmg49OB1+OCo="; }; enableParallelBuilding = true; @@ -18,6 +19,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; homepage = "https://trac.osgeo.org/geos"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; }; } From cf33ca630d2d7409cf4c9d48f47a169d9e22a3b0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Feb 2021 18:51:46 +0100 Subject: [PATCH 2/2] python3Packages.shapely: fix build --- pkgs/development/python-modules/shapely/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 1e18027c4be..e8ea874e5ca 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pytestCheckHook ]; - # environment variable used in shapely/_buildcfg.py + # Environment variable used in shapely/_buildcfg.py GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; patches = [ @@ -48,18 +48,12 @@ buildPythonPackage rec { ".travis.yml" ]; }) - # Patch to search form GOES .so/.dylib files in a Nix-aware way (substituteAll { src = ./library-paths.patch; libgeos_c = GEOS_LIBRARY_PATH; libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; }) - # included in next release. - (fetchpatch { - url = "https://github.com/Toblerity/Shapely/commit/ea5b05a0c87235d3d8f09930ad47c396a76c8b0c.patch"; - sha256 = "sha256-egdydlV+tpXosSQwQFHaXaeBhXEHAs+mn7vLUDpvybA="; - }) ]; preCheck = '' @@ -70,9 +64,12 @@ buildPythonPackage rec { "test_collection" ]; + pythonImportsCheck = [ "shapely" ]; + meta = with lib; { description = "Geometric objects, predicates, and operations"; - maintainers = with maintainers; [ knedlsepp ]; homepage = "https://pypi.python.org/pypi/Shapely/"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ knedlsepp ]; }; }