diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 22 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 14 |
2 files changed, 24 insertions, 12 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54d3d0fd78fb..e644102bcab1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9242,6 +9242,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; + fly = callPackage ../development/tools/continuous-integration/fly { }; + foreman = callPackage ../tools/system/foreman { }; goreman = callPackage ../tools/system/goreman { }; @@ -10560,6 +10562,8 @@ in gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { }; + gdal_2 = callPackage ../development/libraries/gdal/2.4.0.nix { }; + gdcm = callPackage ../development/libraries/gdcm { }; ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {}; @@ -12706,6 +12710,10 @@ in proj = callPackage ../development/libraries/proj { }; + proj_5 = callPackage ../development/libraries/proj/5.2.nix { }; + + proj-datumgrid = callPackage ../development/libraries/proj-datumgrid { }; + proselint = callPackage ../tools/text/proselint { inherit (python3Packages) buildPythonApplication click future six; @@ -13439,6 +13447,8 @@ in tdb = callPackage ../development/libraries/tdb {}; + tdlib = callPackage ../development/libraries/tdlib { }; + tecla = callPackage ../development/libraries/tecla { }; tectonic = callPackage ../tools/typesetting/tectonic { @@ -19060,7 +19070,9 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor { }; + merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor { + gdal = gdal_2; # https://github.com/openstreetmap/merkaartor/issues/179 + }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; @@ -20215,6 +20227,10 @@ in insync = callPackage ../applications/networking/insync { }; + libstrangle = callPackage ../tools/X11/libstrangle { + stdenv = stdenv_32bit; + }; + lightdm = libsForQt5.callPackage ../applications/display-managers/lightdm { }; lightdm_qt = lightdm.override { withQt5 = true; }; @@ -21898,10 +21914,6 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa; }; - saga_2_3_2 = callPackage ../applications/gis/saga/lts.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - samplv1 = callPackage ../applications/audio/samplv1 { }; sauerbraten = callPackage ../games/sauerbraten {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ed5c7753f08..b8e85d775f5d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2712,7 +2712,7 @@ in { filelock = callPackage ../development/python-modules/filelock {}; - fiona = callPackage ../development/python-modules/fiona { gdal = pkgs.gdal; }; + fiona = callPackage ../development/python-modules/fiona { gdal_2 = pkgs.gdal_2; }; fitbit = callPackage ../development/python-modules/fitbit { }; @@ -4028,11 +4028,7 @@ in { pyotp = callPackage ../development/python-modules/pyotp { }; - pyproj = callPackage ../development/python-modules/pyproj { - # pyproj does *work* if you want to use a system supplied proj, but with the current version(s) the tests fail by - # a few decimal places, so caveat emptor. - proj = null; - }; + pyproj = callPackage ../development/python-modules/pyproj { }; pyqrcode = callPackage ../development/python-modules/pyqrcode { }; @@ -4230,7 +4226,9 @@ in { rabbitpy = callPackage ../development/python-modules/rabbitpy { }; - rasterio = callPackage ../development/python-modules/rasterio { }; + rasterio = callPackage ../development/python-modules/rasterio { + gdal = pkgs.gdal_2; # gdal 3.0 not supported yet + }; radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud {}; @@ -4637,6 +4635,8 @@ in { virtualenv = callPackage ../development/python-modules/virtualenv { }; + vsts = callPackage ../development/python-modules/vsts { }; + weasyprint = callPackage ../development/python-modules/weasyprint { }; webassets = callPackage ../development/python-modules/webassets { }; |