diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/geos')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/geos/3.9.nix | 15 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/geos/default.nix | 22 |
2 files changed, 25 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/geos/3.9.nix b/nixpkgs/pkgs/development/libraries/geos/3.9.nix index fd0531fa747f..415746d3e544 100644 --- a/nixpkgs/pkgs/development/libraries/geos/3.9.nix +++ b/nixpkgs/pkgs/development/libraries/geos/3.9.nix @@ -1,11 +1,15 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geos"; version = "3.9.2"; src = fetchurl { - url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; + url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; sha256 = "sha256-RKWpviHX1HNDa/Yhwt3MPPWou+PHhuEyKWGKO52GEpc="; }; @@ -14,12 +18,15 @@ stdenv.mkDerivation rec { # https://trac.osgeo.org/geos/ticket/993 configureFlags = lib.optional stdenv.isAarch32 "--disable-inline"; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; homepage = "https://trac.osgeo.org/geos"; license = licenses.lgpl21Only; + pkgConfigModules = [ "geos" ]; maintainers = with lib.maintainers; [ willcohen ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/geos/default.nix b/nixpkgs/pkgs/development/libraries/geos/default.nix index cfcccc571818..333d8196d57f 100644 --- a/nixpkgs/pkgs/development/libraries/geos/default.nix +++ b/nixpkgs/pkgs/development/libraries/geos/default.nix @@ -1,26 +1,32 @@ { lib -, stdenv , fetchurl -, fetchpatch -, cmake }: +, stdenv +, testers +, cmake +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geos"; - version = "3.11.0"; + version = "3.11.2"; src = fetchurl { - url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; - sha256 = "sha256-eauMq/SqhgTRYVV7UuPk2EV1rNwNCMsJqz96rvpNhYo="; + url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; + hash = "sha256-sfB3ZpSBxaPmKv/EnpbrBvKBmHpdNv2rIlIX5bgl5Mw="; }; nativeBuildInputs = [ cmake ]; + doCheck = true; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; homepage = "https://trac.osgeo.org/geos"; license = licenses.lgpl21Only; + pkgConfigModules = [ "geos" ]; maintainers = with lib.maintainers; [ willcohen ]; }; -} +}) |