commit 54e1db21522a61ca771aeafbbd77c4a474e82f8e · pyrox.dev/nixpkgs

+47 -8

pkgs/applications/gis/qgis/unwrapped.nix

···

       1
       1
       -
       { mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos

     

       2
       2
       -
       , xlibsWrapper, sqlite, gsl, qwt, fcgi, python3Packages, libspatialindex

     

       3
       3
       -
       , libspatialite, postgresql, txt2tags, openssl, libzip, hdf5, netcdf, exiv2

     

       4
       4
       -
       , protobuf, qtbase, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport

     

       5
       5
       -
       , qtxmlpatterns, withGrass ? true, grass, withWebKit ? true, qtwebkit }:

     

       6
       6
       -
       with lib;

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , mkDerivation

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , fetchpatch

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       , ninja

     

       7
       7
       +
       , flex

     

       8
       8
       +
       , bison

     

       9
       9
       +
       , proj

     

       10
       10
       +
       , geos

     

       11
       11
       +
       , xlibsWrapper

     

       12
       12
       +
       , sqlite

     

       13
       13
       +
       , gsl

     

       14
       14
       +
       , qwt

     

       15
       15
       +
       , fcgi

     

       16
       16
       +
       , python3Packages

     

       17
       17
       +
       , libspatialindex

     

       18
       18
       +
       , libspatialite

     

       19
       19
       +
       , postgresql

     

       20
       20
       +
       , txt2tags

     

       21
       21
       +
       , openssl

     

       22
       22
       +
       , libzip

     

       23
       23
       +
       , hdf5

     

       24
       24
       +
       , netcdf

     

       25
       25
       +
       , exiv2

     

       26
       26
       +
       , protobuf

     

       27
       27
       +
       , qtbase

     

       28
       28
       +
       , qtsensors

     

       29
       29
       +
       , qca-qt5

     

       30
       30
       +
       , qtkeychain

     

       31
       31
       +
       , qscintilla

     

       32
       32
       +
       , qtserialport

     

       33
       33
       +
       , qtxmlpatterns

     

       34
       34
       +
       , withGrass ? true

     

       35
       35
       +
       , grass

     

       36
       36
       +
       , withWebKit ? true

     

       37
       37
       +
       , qtwebkit

     

       38
       38
       +
       }:

     

       39
       39
       +
       

     

       7
       40
        
       let

     

       8
       41
        
         pythonBuildInputs = with python3Packages; [

     

       9
       42
        
           qscintilla-qt5

     
···

       25
       58
        
         ];

     

       26
       59
        
       in mkDerivation rec {

     

       27
       60
        
         version = "3.16.10";

     

       28
       28
       -
         pname = "qgis";

     

       29
       29
       -
         name = "${pname}-unwrapped-${version}";

     

       61
       61
       +
         pname = "qgis-unwrapped";

     

       30
       62
        
       

     

       31
       63
        
         src = fetchFromGitHub {

     

       32
       64
        
           owner = "qgis";

     
···

       34
       66
        
           rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";

     

       35
       67
        
           sha256 = "sha256-/lsfyTDlkZNIVHg5qgZW7qfOyTC2+1r3ZbsnQmEdy30=";

     

       36
       68
        
         };

     

       69
       69
       +
       

     

       70
       70
       +
         patches = [

     

       71
       71
       +
           (fetchpatch {

     

       72
       72
       +
             url = "https://github.com/qgis/QGIS/commit/fc1ac8bef8dcc3194857ecd32519aca4867b4fa1.patch";

     

       73
       73
       +
             sha256 = "106smg3drx8c7yxzfhd1c7xrq757l5cfxx8lklihyvr4a7wc9gpy";

     

       74
       74
       +
           })

     

       75
       75
       +
         ];

     

       37
       76
        
       

     

       38
       77
        
         passthru = {

     

       39
       78
        
           inherit pythonBuildInputs;

+3 -3

pkgs/applications/misc/osm2xmap/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, libroxml, proj, libyamlcpp, boost } :

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, libroxml, proj_7, libyamlcpp, boost } :

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "osm2xmap";

     
···

       14
       14
        
         makeFlags = [

     

       15
       15
        
           "GIT_VERSION=${version}"

     

       16
       16
        
           "GIT_TIMESTAMP="

     

       17
       17
       -
           "SHAREDIR=${placeholder "out"}/share/osm2xmap"

     

       17
       17
       +
           "SHAREDIR=${placeholder "out"}/share/osm2xmap/"

     

       18
       18
        
           "INSTALL_BINDIR=${placeholder "out"}/bin"

     

       19
       19
        
           "INSTALL_MANDIR=${placeholder "out"}/share/man/man1"

     

       20
       20
        
         ];

     

       21
       21
        
       

     

       22
       22
        
         NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";

     

       23
       23
        
       

     

       24
       24
       -
         buildInputs = [ libroxml proj libyamlcpp boost ];

     

       24
       24
       +
         buildInputs = [ libroxml proj_7 libyamlcpp boost ];

     

       25
       25
        
       

     

       26
       26
        
         meta = with lib; {

     

       27
       27
        
           homepage = "https://github.com/sembruk/osm2xmap";

+2 -2

pkgs/applications/misc/survex/default.nix

···

       6
       6
        
       , wxGTK30-gtk3

     

       7
       7
        
       , wxmac

     

       8
       8
        
       , ffmpeg

     

       9
       9
       -
       , proj

     

       9
       9
       +
       , proj_7

     

       10
       10
        
       , perl532

     

       11
       11
        
       , unscii

     

       12
       12
        
       , python

     
···

       29
       29
        
         nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python ];

     

       30
       30
        
       

     

       31
       31
        
         buildInputs = [

     

       32
       32
       -
           libGL libGLU ffmpeg proj

     

       32
       32
       +
           libGL libGLU ffmpeg proj_7

     

       33
       33
        
         ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       34
       34
        
           wxmac Carbon Cocoa

     

       35
       35
        
         ] ++ lib.optionals stdenv.hostPlatform.isLinux [

+2 -2

pkgs/applications/misc/xygrib/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj_7, libpng, openjpeg }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "1.2.6.1";

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];

     

       15
       15
       -
         buildInputs = [ bzip2 qtbase libnova proj openjpeg libpng ];

     

       15
       15
       +
         buildInputs = [ bzip2 qtbase libnova proj_7 openjpeg libpng ];

     

       16
       16
        
         cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-${lib.versions.majorMinor openjpeg.version}" ]

     

       17
       17
        
           ++ lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ];

     

       18
       18

+54 -16

pkgs/applications/science/misc/gplates/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, qt4, qwt6_qt4, libGLU, libGL, glew, gdal, cgal

     

       2
       2
       -
       , proj, boost, cmake, python2, doxygen, graphviz, gmp, mpfr }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , mkDerivation

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       , doxygen

     

       6
       6
       +
       , graphviz

     

       7
       7
       +
       , boost

     

       8
       8
       +
       , cgal_5

     

       9
       9
       +
       , gdal

     

       10
       10
       +
       , glew

     

       11
       11
       +
       , gmp

     

       12
       12
       +
       , libGL

     

       13
       13
       +
       , libGLU

     

       14
       14
       +
       , mpfr

     

       15
       15
       +
       , proj

     

       16
       16
       +
       , python3

     

       17
       17
       +
       , qtxmlpatterns

     

       18
       18
       +
       , qwt

     

       19
       19
       +
       }:

     

       3
       20
        
       

     

       4
       4
       -
       stdenv.mkDerivation rec {

     

       21
       21
       +
       let

     

       22
       22
       +
         python = python3.withPackages (ps: with ps; [

     

       23
       23
       +
           numpy

     

       24
       24
       +
         ]);

     

       25
       25
       +
         boost' = boost.override {

     

       26
       26
       +
           enablePython = true;

     

       27
       27
       +
           inherit python;

     

       28
       28
       +
         };

     

       29
       29
       +
         cgal = cgal_5.override {

     

       30
       30
       +
           boost = boost';

     

       31
       31
       +
         };

     

       32
       32
       +
       in mkDerivation rec {

     

       5
       33
        
         pname = "gplates";

     

       6
       6
       -
         version = "2.2.0";

     

       34
       34
       +
         version = "2.3.0";

     

       7
       35
        
       

     

       8
       36
        
         src = fetchurl {

     

       9
       9
       -
           url = "mirror://sourceforge/gplates/${pname}-${version}-unixsrc.tar.bz2";

     

       10
       10
       -
           sha256 = "1jrcv498vpcs8xklhbsgg12yfa90f96p2mwq6x5sjnrlpf8mh50b";

     

       37
       37
       +
           name = "gplates_${version}_src.tar.bz2";

     

       38
       38
       +
           url = "https://www.earthbyte.org/download/8421/?uid=b89bb31428";

     

       39
       39
       +
           sha256 = "0lrcmcxc924ixddii8cyglqlwwxvk7f00g4yzbss5i3fgcbh8n96";

     

       11
       40
        
         };

     

       12
       41
        
       

     

       13
       13
       -
         nativeBuildInputs = [ cmake ];

     

       42
       42
       +
         nativeBuildInputs = [

     

       43
       43
       +
           cmake

     

       44
       44
       +
           doxygen

     

       45
       45
       +
           graphviz

     

       46
       46
       +
         ];

     

       47
       47
       +
       

     

       14
       48
        
         buildInputs = [

     

       15
       15
       -
           qt4 qwt6_qt4 libGLU libGL glew gdal cgal proj python2

     

       16
       16
       -
           doxygen graphviz gmp mpfr

     

       17
       17
       -
           (boost.override {

     

       18
       18
       -
             enablePython = true;

     

       19
       19
       -
             python = python2;

     

       20
       20
       -
           })

     

       49
       49
       +
           boost'

     

       50
       50
       +
           cgal

     

       51
       51
       +
           gdal

     

       52
       52
       +
           glew

     

       53
       53
       +
           gmp

     

       54
       54
       +
           libGL

     

       55
       55
       +
           libGLU

     

       56
       56
       +
           mpfr

     

       57
       57
       +
           proj

     

       58
       58
       +
           python

     

       59
       59
       +
           qtxmlpatterns

     

       60
       60
       +
           qwt

     

       21
       61
        
         ];

     

       22
       62
        
       

     

       23
       23
       -
         NIX_CFLAGS_LINK="-ldl -lpthread -lutil";

     

       24
       24
       -
       

     

       25
       63
        
         meta = with lib; {

     

       26
       64
        
           description = "Desktop software for the interactive visualisation of plate-tectonics";

     

       27
       65
        
           homepage = "https://www.gplates.org";

     

       28
       28
       -
           license = licenses.gpl2;

     

       66
       66
       +
           license = licenses.gpl2Only;

     

       29
       67
        
           platforms = platforms.all;

     

       30
       68
        
         };

     

       31
       69
        
       }

+2

pkgs/development/libraries/mapnik/default.nix

···

       96
       96
        
           maintainers = with maintainers; [ hrdinka ];

     

       97
       97
        
           license = licenses.lgpl21;

     

       98
       98
        
           platforms = platforms.all;

     

       99
       99
       +
           # https://github.com/mapnik/mapnik/issues/4232

     

       100
       100
       +
           broken = lib.versionAtLeast proj.version "8.0.0";

     

       99
       101
        
         };

     

       100
       102
        
       }

+58

pkgs/development/libraries/proj/7.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       , pkg-config

     

       6
       6
       +
       , sqlite

     

       7
       7
       +
       , libtiff

     

       8
       8
       +
       , curl

     

       9
       9
       +
       , gtest

     

       10
       10
       +
       , fetchpatch

     

       11
       11
       +
       }:

     

       12
       12
       +
       

     

       13
       13
       +
       stdenv.mkDerivation rec {

     

       14
       14
       +
         pname = "proj";

     

       15
       15
       +
         version = "7.2.1";

     

       16
       16
       +
       

     

       17
       17
       +
         src = fetchFromGitHub {

     

       18
       18
       +
           owner = "OSGeo";

     

       19
       19
       +
           repo = "PROJ";

     

       20
       20
       +
           rev = version;

     

       21
       21
       +
           sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9";

     

       22
       22
       +
         };

     

       23
       23
       +
       

     

       24
       24
       +
         patches = [

     

       25
       25
       +
           (fetchpatch { # https://github.com/OSGeo/PROJ/issues/2557

     

       26
       26
       +
             name = "gie_self_tests-fail.diff"; # included in >= 8.0.1

     

       27
       27
       +
             url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff";

     

       28
       28
       +
             sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf";

     

       29
       29
       +
           })

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         postPatch = lib.optionalString (version == "7.2.1") ''

     

       33
       33
       +
           substituteInPlace CMakeLists.txt \

     

       34
       34
       +
             --replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1"

     

       35
       35
       +
         '';

     

       36
       36
       +
       

     

       37
       37
       +
         outputs = [ "out" "dev"];

     

       38
       38
       +
       

     

       39
       39
       +
         nativeBuildInputs = [ cmake pkg-config ];

     

       40
       40
       +
       

     

       41
       41
       +
         buildInputs = [ sqlite libtiff curl ];

     

       42
       42
       +
       

     

       43
       43
       +
         checkInputs = [ gtest ];

     

       44
       44
       +
       

     

       45
       45
       +
         cmakeFlags = [

     

       46
       46
       +
           "-DUSE_EXTERNAL_GTEST=ON"

     

       47
       47
       +
         ];

     

       48
       48
       +
       

     

       49
       49
       +
         doCheck = true;

     

       50
       50
       +
       

     

       51
       51
       +
         meta = with lib; {

     

       52
       52
       +
           description = "Cartographic Projections Library";

     

       53
       53
       +
           homepage = "https://proj4.org";

     

       54
       54
       +
           license = licenses.mit;

     

       55
       55
       +
           platforms = platforms.unix;

     

       56
       56
       +
           maintainers = with maintainers; [ vbgl dotlambda ];

     

       57
       57
       +
         };

     

       58
       58
       +
       }

+5 -22

pkgs/development/libraries/proj/default.nix

···

       7
       7
        
       , libtiff

     

       8
       8
        
       , curl

     

       9
       9
        
       , gtest

     

       10
       10
       -
       , fetchpatch

     

       11
       10
        
       }:

     

       12
       11
        
       

     

       13
       12
        
       stdenv.mkDerivation rec {

     

       14
       13
        
         pname = "proj";

     

       15
       15
       -
         version = "7.2.1";

     

       14
       14
       +
         version = "8.1.1";

     

       16
       15
        
       

     

       17
       16
        
         src = fetchFromGitHub {

     

       18
       17
        
           owner = "OSGeo";

     

       19
       18
        
           repo = "PROJ";

     

       20
       19
        
           rev = version;

     

       21
       21
       -
           sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9";

     

       20
       20
       +
           sha256 = "sha256-Z2nruyowC3NG4Wb8AFBL0PME/zp9D7SwQdMSl6VjH/w=";

     

       22
       21
        
         };

     

       23
       22
        
       

     

       24
       24
       -
         patches = [

     

       25
       25
       -
           (fetchpatch { # https://github.com/OSGeo/PROJ/issues/2557

     

       26
       26
       -
             name = "gie_self_tests-fail.diff"; # included in >= 8.0.1

     

       27
       27
       -
             url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff";

     

       28
       28
       -
             sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf";

     

       29
       29
       -
           })

     

       30
       30
       -
         ];

     

       31
       31
       -
       

     

       32
       32
       -
         postPatch = lib.optionalString (version == "7.2.1") ''

     

       33
       33
       -
           substituteInPlace CMakeLists.txt \

     

       34
       34
       -
             --replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1"

     

       35
       35
       -
         '';

     

       36
       36
       -
       

     

       37
       23
        
         outputs = [ "out" "dev"];

     

       38
       24
        
       

     

       39
       25
        
         nativeBuildInputs = [ cmake pkg-config ];

     
···

       44
       30
        
       

     

       45
       31
        
         cmakeFlags = [

     

       46
       32
        
           "-DUSE_EXTERNAL_GTEST=ON"

     

       33
       33
       +
           "-DRUN_NETWORK_DEPENDENT_TESTS=OFF"

     

       47
       34
        
         ];

     

       48
       35
        
       

     

       49
       49
       -
         doCheck = stdenv.is64bit;

     

       50
       50
       -
       

     

       51
       51
       -
         preCheck = ''

     

       52
       52
       -
           export HOME=$TMPDIR

     

       53
       53
       -
         '';

     

       36
       36
       +
         doCheck = true;

     

       54
       37
        
       

     

       55
       38
        
         meta = with lib; {

     

       56
       39
        
           description = "Cartographic Projections Library";

     

       57
       57
       -
           homepage = "https://proj4.org";

     

       40
       40
       +
           homepage = "https://proj.org/";

     

       58
       41
        
           license = licenses.mit;

     

       59
       42
        
           platforms = platforms.unix;

     

       60
       43
        
           maintainers = with maintainers; [ vbgl dotlambda ];

+9 -2

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

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "cartopy";

     

       11
       11
       -
         version = "0.19.0.post1";

     

       11
       11
       +
         version = "0.20.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit version;

     

       15
       15
        
           pname = "Cartopy";

     

       16
       16
       -
           sha256 = "0xnm8z3as3hriivdfd26s6vn5b63gb46x6vxw6gh1mwfm5rlg2sb";

     

       16
       16
       +
           sha256 = "eae58aff26806e63cf115b2bce9477cedc4aa9f578c5e477b2c25cfa404f2b7a";

     

       17
       17
        
         };

     

       18
       18
       +
       

     

       19
       19
       +
         postPatch = ''

     

       20
       20
       +
           # https://github.com/SciTools/cartopy/issues/1880

     

       21
       21
       +
           substituteInPlace lib/cartopy/tests/test_crs.py \

     

       22
       22
       +
             --replace "test_osgb(" "dont_test_osgb(" \

     

       23
       23
       +
             --replace "test_epsg(" "dont_test_epsg("

     

       24
       24
       +
         '';

     

       18
       25
        
       

     

       19
       26
        
         buildInputs = [

     

       20
       27
        
           geos proj

+14 -1

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

···

       1
       1
       -
       { lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder

     

       1
       1
       +
       { lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder

     

       2
       2
        
       , pandas, shapely, fiona, pyproj

     

       3
       3
        
       , pytestCheckHook, Rtree }:

     

       4
       4
        
       

     
···

       13
       13
        
           rev = "v${version}";

     

       14
       14
        
           sha256 = "sha256-58X562OkRzZ4UTNMTwXW4U5czoa5tbSMBCcE90DqbaE=";

     

       15
       15
        
         };

     

       16
       16
       +
       

     

       17
       17
       +
         patches = [

     

       18
       18
       +
           (fetchpatch {

     

       19
       19
       +
             name = "skip-pandas-master-fillna-test.patch";

     

       20
       20
       +
             url = "https://github.com/geopandas/geopandas/pull/1878.patch";

     

       21
       21
       +
             sha256 = "1yw3i4dbhaq7f02n329b9y2cqxbwlz9db81mhgrfc7af3whwysdb";

     

       22
       22
       +
           })

     

       23
       23
       +
           (fetchpatch {

     

       24
       24
       +
             name = "fix-proj4strings-test.patch";

     

       25
       25
       +
             url = "https://github.com/geopandas/geopandas/pull/1958.patch";

     

       26
       26
       +
             sha256 = "0kzmpq5ry87yvhqr6gnh9p2606b06d3ynzjvw0hpp9fncczpc2yn";

     

       27
       27
       +
           })

     

       28
       28
       +
         ];

     

       16
       29
        
       

     

       17
       30
        
         propagatedBuildInputs = [

     

       18
       31
        
           pandas

+17 -25

pkgs/development/python-modules/pyproj/001.proj.patch

···

       1
       1
       -
       diff -Nur a/pyproj/datadir.py b/pyproj/datadir.py

     

       2
       2
       -
       --- a/pyproj/datadir.py	2021-04-10 18:26:52.829018483 +0100

     

       3
       3
       -
       +++ b/pyproj/datadir.py	2021-04-10 18:44:59.155190614 +0100

     

       4
       4
       -
       @@ -70,7 +70,7 @@

     

       1
       1
       +
       diff --git a/pyproj/datadir.py b/pyproj/datadir.py

     

       2
       2
       +
       index 9ca1d25..4198490 100644

     

       3
       3
       +
       --- a/pyproj/datadir.py

     

       4
       4
       +
       +++ b/pyproj/datadir.py

     

       5
       5
       +
       @@ -70,7 +70,7 @@ def get_data_dir() -> str:

     

       6
       6
       +
            global _VALIDATED_PROJ_DATA

     

       5
       7
        
            if _VALIDATED_PROJ_DATA is not None:

     

       6
       8
        
                return _VALIDATED_PROJ_DATA

     

       7
       7
       -
            global _USER_PROJ_DATA

     

       8
       9
        
       -    internal_datadir = Path(__file__).absolute().parent / "proj_dir" / "share" / "proj"

     

       9
       10
        
       +    internal_datadir = Path("@proj@/share/proj")

     

       10
       11
        
            proj_lib_dirs = os.environ.get("PROJ_LIB", "")

     

       11
       12
        
            prefix_datadir = Path(sys.prefix, "share", "proj")

     

       12
       13
        
        

     

       13
       13
       -
       diff -Nur a/setup.py b/setup.py

     

       14
       14
       -
       --- a/setup.py	2021-04-10 18:26:52.817018512 +0100

     

       15
       15
       -
       +++ b/setup.py	2021-04-10 18:46:01.652324424 +0100

     

       16
       16
       -
       @@ -11,7 +11,7 @@

     

       14
       14
       +
       diff --git a/setup.py b/setup.py

     

       15
       15
       +
       index 6bb0c6c..b3d0321 100644

     

       16
       16
       +
       --- a/setup.py

     

       17
       17
       +
       +++ b/setup.py

     

       18
       18
       +
       @@ -12,7 +12,7 @@ from setuptools import Extension, setup

     

       17
       19
        
        PROJ_MIN_VERSION = parse_version("7.2.0")

     

       18
       20
        
        CURRENT_FILE_PATH = Path(__file__).absolute().parent

     

       19
       21
        
        BASE_INTERNAL_PROJ_DIR = Path("proj_dir")

     
···

       22
       24
        
        

     

       23
       25
        
        

     

       24
       26
        
        def get_proj_version(proj_dir: Path) -> str:

     

       25
       25
       -
       @@ -150,7 +150,7 @@

     

       27
       27
       +
       @@ -155,7 +155,7 @@ def get_extension_modules():

     

       26
       28
        
            # By default we'll try to get options PROJ_DIR or the local version of proj

     

       27
       29
        
            proj_dir = get_proj_dir()

     

       28
       30
        
            library_dirs = get_proj_libdirs(proj_dir)

     
···

       31
       33
        
        

     

       32
       34
        
            proj_version = get_proj_version(proj_dir)

     

       33
       35
        
            check_proj_version(proj_version)

     

       34
       34
       -
       diff -Nur a/test/conftest.py b/test/conftest.py

     

       35
       35
       -
       --- a/test/conftest.py	2021-04-10 18:26:52.831018478 +0100

     

       36
       36
       -
       +++ b/test/conftest.py	2021-04-10 18:37:01.605682432 +0100

     

       37
       37
       -
       @@ -2,6 +2,7 @@

     

       38
       38
       -
        from contextlib import contextmanager

     

       39
       39
       -
        from distutils.version import LooseVersion

     

       40
       40
       -
        from pathlib import Path

     

       41
       41
       -
       +import stat

     

       42
       42
       -
        

     

       43
       43
       -
        import pyproj

     

       44
       44
       -
        from pyproj.datadir import get_data_dir, get_user_data_dir, set_data_dir

     

       45
       45
       -
       diff -Nur a/test/test_cli.py b/test/test_cli.py

     

       46
       46
       -
       --- a/test/test_cli.py	2021-04-10 18:26:52.831018478 +0100

     

       47
       47
       -
       +++ b/test/test_cli.py	2021-04-10 22:17:04.665088162 +0100

     

       48
       48
       -
       @@ -14,7 +14,7 @@

     

       36
       36
       +
       diff --git a/test/test_cli.py b/test/test_cli.py

     

       37
       37
       +
       index 7a696de..1b9b777 100644

     

       38
       38
       +
       --- a/test/test_cli.py

     

       39
       39
       +
       +++ b/test/test_cli.py

     

       40
       40
       +
       @@ -14,7 +14,7 @@ from pyproj.sync import _load_grid_geojson

     

       49
       41
        
        from test.conftest import grids_available, proj_env, tmp_chdir

     

       50
       42
        
        

     

       51
       43
        
        PYPROJ_CLI_ENDPONTS = pytest.mark.parametrize(

+2 -2

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

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "pyproj";

     

       20
       20
       -
         version = "3.1.0";

     

       20
       20
       +
         version = "3.2.1";

     

       21
       21
        
         disabled = pythonOlder "3.7";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "pyproj4";

     

       25
       25
        
           repo = "pyproj";

     

       26
       26
        
           rev = version;

     

       27
       27
       -
           sha256 = "sha256-UN8cJk5Lgd+d2tKmFuF6QvKr36w1435RKovzGfMXi1E=";

     

       27
       27
       +
           sha256 = "sha256-r343TvXpSr+EMAbvzSUpsfipwP8TFmitOfT0gjgoO00=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         # force pyproj to use ${proj}

+11 -5

pkgs/top-level/all-packages.nix

···

       18545
       18545
        
       

     

       18546
       18546
        
         proj = callPackage ../development/libraries/proj { };

     

       18547
       18547
        
       

     

       18548
       18548
       +
         proj_7 = callPackage ../development/libraries/proj/7.nix { };

     

       18549
       18549
       +
       

     

       18548
       18550
        
         proj-datumgrid = callPackage ../development/libraries/proj-datumgrid { };

     

       18549
       18551
        
       

     

       18550
       18552
        
         proselint = callPackage ../tools/text/proselint {

     
···

       26957
       26959
        
       

     

       26958
       26960
        
         qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { };

     

       26959
       26961
        
       

     

       26960
       26960
       -
         qlandkartegt = libsForQt514.callPackage ../applications/misc/qlandkartegt {};

     

       26962
       26962
       +
         qlandkartegt = libsForQt514.callPackage ../applications/misc/qlandkartegt {

     

       26963
       26963
       +
           gdal = gdal.override {

     

       26964
       26964
       +
             libgeotiff = libgeotiff.override { proj = proj_7; };

     

       26965
       26965
       +
             libspatialite = libspatialite.override { proj = proj_7; };

     

       26966
       26966
       +
             proj = proj_7;

     

       26967
       26967
       +
           };

     

       26968
       26968
       +
           proj = proj_7;

     

       26969
       26969
       +
         };

     

       26961
       26970
        
       

     

       26962
       26971
        
         garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {};

     

       26963
       26972
        
       

     
···

       31121
       31130
        
       

     

       31122
       31131
        
         gildas = callPackage ../applications/science/astronomy/gildas { };

     

       31123
       31132
        
       

     

       31124
       31124
       -
         gplates = callPackage ../applications/science/misc/gplates {

     

       31125
       31125
       -
           boost = boost160;

     

       31126
       31126
       -
           cgal = cgal.override { boost = boost160; };

     

       31127
       31127
       -
         };

     

       31133
       31133
       +
         gplates = libsForQt5.callPackage ../applications/science/misc/gplates { };

     

       31128
       31134
        
       

     

       31129
       31135
        
         gravit = callPackage ../applications/science/astronomy/gravit { };

     

       31130
       31136