diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-28 14:39:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-10 08:52:36 +0000 |
commit | 693e64ef7421374338ddb1dc12b9573feec75972 (patch) | |
tree | 2526ac075d248699c35d63e04499890ee4381f5f /nixpkgs/pkgs/development/libraries/proj | |
parent | 7014df2256694d97093d6f2bb1db340d346dea88 (diff) | |
parent | 8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17 (diff) | |
download | nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.gz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.bz2 nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.lz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.xz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.zst nixlib-693e64ef7421374338ddb1dc12b9573feec75972.zip |
Merge commit '8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/proj')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/proj/5.2.nix | 20 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/proj/default.nix | 8 |
2 files changed, 4 insertions, 24 deletions
diff --git a/nixpkgs/pkgs/development/libraries/proj/5.2.nix b/nixpkgs/pkgs/development/libraries/proj/5.2.nix deleted file mode 100644 index ee76c668716c..000000000000 --- a/nixpkgs/pkgs/development/libraries/proj/5.2.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "proj-5.2.0"; - - src = fetchurl { - url = "https://download.osgeo.org/proj/proj-5.2.0.tar.gz"; - sha256 = "0q3ydh2j8qhwlxmnac72pg69rw2znbi5b6k5wama8qmwzycr94gg"; - }; - - doCheck = stdenv.is64bit; - - meta = with lib; { - description = "Cartographic Projections Library"; - homepage = "https://proj4.org"; - license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ vbgl ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/proj/default.nix b/nixpkgs/pkgs/development/libraries/proj/default.nix index 22d6206fd851..92119a8788d7 100644 --- a/nixpkgs/pkgs/development/libraries/proj/default.nix +++ b/nixpkgs/pkgs/development/libraries/proj/default.nix @@ -1,21 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook, libtiff, curl }: stdenv.mkDerivation rec { pname = "proj"; - version = "6.3.1"; + version = "7.2.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = version; - sha256 = "1ildcp57qsa01kvv2qxd05nqw5mg0wfkksiv9l138dbhp0s7rkxp"; + sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9"; }; outputs = [ "out" "dev"]; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ sqlite ]; + buildInputs = [ sqlite libtiff curl ]; doCheck = stdenv.is64bit; |