diff --git a/pkgs/default.nix b/pkgs/default.nix

index 8a2053e7793d6b61a73834290d769107dcfec342..242284456c67f19db7f8f1baa02448adea9cbb60 100644

--- a/pkgs/default.nix

+++ b/pkgs/default.nix

@@ -1,6 +1,6 @@

{ pkgs, sources }:

let

• inherit (pkgs) lib newScope recurseIntoAttrs python3Packages libsForQt5;

• inherit (pkgs) lib newScope recurseIntoAttrs libsForQt5;

in

lib.makeScope newScope (

self: with self; {

@@ -84,31 +84,15 @@ };

 ### DEVELOPMENT / PYTHON MODULES

• cheetah3 = python3Packages.callPackage ./development/python-modules/cheetah3 {

•  inherit sources;
  

• };

• click-6-7 = python3Packages.callPackage ./development/python-modules/click { };

• gpxelevations = python3Packages.callPackage ./development/python-modules/gpxelevations {

•  inherit sources;
  

• };

• jsonseq = python3Packages.callPackage ./development/python-modules/jsonseq {

•  inherit sources;
  

• };

• mercantile = python3Packages.callPackage ./development/python-modules/mercantile {

•  inherit sources;
  

• };

• mikatools = python3Packages.callPackage ./development/python-modules/mikatools {

•  inherit sources;
  

• };

• pyephem = python3Packages.callPackage ./development/python-modules/pyephem {

•  inherit sources;
  

• };

• python-hfst = python3Packages.callPackage ./development/python-modules/python-hfst {

•  inherit hfst;
  

• };

• pymbtiles = python3Packages.callPackage ./development/python-modules/pymbtiles {

•  inherit sources;
  

• };

• cheetah3 = callPackage ./development/python-modules/cheetah3 { };

• click-6-7 = callPackage ./development/python-modules/click { };

• gpxelevations = callPackage ./development/python-modules/gpxelevations { };

• jsonseq = callPackage ./development/python-modules/jsonseq { };

• mercantile = callPackage ./development/python-modules/mercantile { };

• mikatools = callPackage ./development/python-modules/mikatools { };

• pyephem = callPackage ./development/python-modules/pyephem { };

• python-hfst = callPackage ./development/python-modules/python-hfst { };

• pymbtiles = callPackage ./development/python-modules/pymbtiles { };

 ### TOOLS

@@ -118,8 +102,7 @@ csvquote = callPackage ./tools/text/csvquote { };

 csvtools = callPackage ./tools/text/csvtools { };

 datamaps = callPackage ./tools/geo/datamaps { };

 docker-reg-tool = callPackage ./tools/docker-reg-tool { };

• elevation = python3Packages.callPackage ./tools/geo/elevation {

•  inherit sources;
  

• elevation = callPackage ./tools/geo/elevation {

   click = click-6-7;

 };

 gimgtools = callPackage ./tools/geo/gimgtools { };

@@ -129,18 +112,12 @@ inherit sources;

 };

 gpxtools = callPackage ./tools/geo/gpxtools { };

 gt-bash-client = callPackage ./tools/dict/gt-bash-client { };

• gt4gd = python3Packages.callPackage ./tools/dict/gt4gd {

•  inherit sources;
  

• };

• gt4gd = callPackage ./tools/dict/gt4gd { };

 i18n-editor = callPackage ./tools/i18n-editor { jre = pkgs.jdk11; };

 imgdecode = callPackage ./tools/geo/imgdecode { };

 ish = callPackage ./tools/networking/ish { };

• lsdreader = python3Packages.callPackage ./tools/dict/lsdreader {

•  inherit sources;
  

• };

• morse-talk = python3Packages.callPackage ./tools/morse-talk {

•  inherit sources;
  

• };

• lsdreader = callPackage ./tools/dict/lsdreader { };

• morse-talk = callPackage ./tools/morse-talk { };

 musig = callPackage ./tools/audio/musig { };

 ocad2img = perlPackages.callPackage ./tools/geo/ocad2img {

   inherit cgpsmapper ocad2mp;

@@ -161,16 +138,10 @@ then callPackage ./tools/dict/stardict-tools {

     libmysqlclient = libmysql;

   }

   else callPackage ./tools/dict/stardict-tools { };

• supermercado = python3Packages.callPackage ./tools/geo/supermercado {

•  inherit sources mercantile;
  

• };

• supermercado = callPackage ./tools/geo/supermercado { };

 supload = callPackage ./tools/supload { };

• tilesets-cli = python3Packages.callPackage ./tools/geo/tilesets-cli {

•  inherit sources jsonseq;
  

• };

• tpkutils = python3Packages.callPackage ./tools/geo/tpkutils {

•  inherit sources mercantile pymbtiles;
  

• };

• tilesets-cli = callPackage ./tools/geo/tilesets-cli { };

• tpkutils = callPackage ./tools/geo/tpkutils { };

 xfractint = callPackage ./tools/xfractint { };

 ### SERVERS

diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix

index 41a2113c0c3c793dfdc83f0ff65010c3794c222e..cf9f1b8417032a5989fbabca7fdf5b8f558eab9a 100644

--- a/pkgs/development/python-modules/cheetah3/default.nix

+++ b/pkgs/development/python-modules/cheetah3/default.nix

@@ -1,10 +1,10 @@

-{ lib, buildPythonPackage, sources }:

+{ lib, python3Packages, sources }:

let

pname = "cheetah3";

date = lib.substring 0 10 sources.cheetah3.date;

version = "unstable-" + date;

in

-buildPythonPackage {

+python3Packages.buildPythonPackage {

inherit pname version;

src = sources.cheetah3;

diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix

index 2f8f6462a0cfb6c46963ba19ea628b4c9d7858db..2e6fbee9d2716a690733ee70d121389a0a7547f2 100644

--- a/pkgs/development/python-modules/click/default.nix

+++ b/pkgs/development/python-modules/click/default.nix

@@ -1,31 +1,31 @@

-{ stdenv, buildPythonPackage, fetchPypi, substituteAll, locale, pytest }:

+{ lib, python3Packages, substituteAll, locale }:

let

pname = "click";

version = "6.7";

in

-buildPythonPackage {

+python3Packages.buildPythonPackage {

inherit pname version;

• src = fetchPypi {

• src = python3Packages.fetchPypi {

 inherit pname version;

 sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi";

};

• patches = stdenv.lib.optional (stdenv.lib.versionAtLeast version "6.7") (

• patches = lib.optional (lib.versionAtLeast version "6.7") (

 substituteAll {

   src = ./fix-paths.patch;

   locale = "${locale}/bin/locale";

 }

);

• buildInputs = [ pytest ];

• checkInputs = with python3Packages; [ pytest ];

checkPhase = "py.test tests";

https://github.com/pallets/click/issues/823

doCheck = false;

• meta = with stdenv.lib; {

• meta = with lib; {

 homepage = "http://click.pocoo.org/";

 description = "Create beautiful command line interfaces in Python";

 license = licenses.bsd3;

diff --git a/pkgs/development/python-modules/gpxelevations/default.nix b/pkgs/development/python-modules/gpxelevations/default.nix

index 70811a34b2aeea4ef988d01d1a701ba59c89c24b..08e8ba30bbfcb78861ab79823baf7d1b9fd6e34f 100644

--- a/pkgs/development/python-modules/gpxelevations/default.nix

+++ b/pkgs/development/python-modules/gpxelevations/default.nix

@@ -1,18 +1,18 @@

-{ lib, buildPythonApplication, python, requests, gpxpy, sources }:

+{ lib, python3Packages, sources }:

let

pname = "gpxelevations";

date = lib.substring 0 10 sources.gpxelevations.date;

version = "unstable-" + date;

in

-buildPythonApplication {

+python3Packages.buildPythonApplication {

inherit pname version;

src = sources.gpxelevations;

• propagatedBuildInputs = [ requests gpxpy ];

• propagatedBuildInputs = with python3Packages; [ requests gpxpy ];

doCheck = false;

#checkPhase = ''

• ${python.interpreter} -m unittest test

• ${python3Packages.python.interpreter} -m unittest test

#'';

meta = with lib; {

diff --git a/pkgs/development/python-modules/jsonseq/default.nix b/pkgs/development/python-modules/jsonseq/default.nix

index fe587175aec7fa42aa39a64c3c3e8213818d4d06..bd1290b562d41b4644211737cbb858e9e6af50b7 100644

--- a/pkgs/development/python-modules/jsonseq/default.nix

+++ b/pkgs/development/python-modules/jsonseq/default.nix

@@ -1,10 +1,10 @@

-{ lib, buildPythonPackage, sources }:

+{ lib, python3Packages, sources }:

let

pname = "jsonseq";

date = lib.substring 0 10 sources.jsonseq.date;

version = "unstable-" + date;

in

-buildPythonPackage {

+python3Packages.buildPythonPackage {

inherit pname version;

src = sources.jsonseq;

diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix

index 7191d60cf8af662a24643358412170acb23d4fba..fbad56c77b5fc73ec7edae627aaa957302490d24 100644

--- a/pkgs/development/python-modules/mercantile/default.nix

+++ b/pkgs/development/python-modules/mercantile/default.nix

@@ -1,16 +1,16 @@

-{ lib, buildPythonPackage, click, pytest, hypothesis, sources }:

+{ lib, python3Packages, sources }:

let

pname = "mercantile";

date = lib.substring 0 10 sources.mercantile.date;

version = "unstable-" + date;

in

-buildPythonPackage {

+python3Packages.buildPythonPackage {

inherit pname version;

src = sources.mercantile;

• propagatedBuildInputs = [ click ];

• propagatedBuildInputs = with python3Packages; [ click ];

• checkInputs = [ pytest hypothesis ];

• checkInputs = with python3Packages; [ pytest hypothesis ];

checkPhase = "pytest";

meta = with lib; {

diff --git a/pkgs/development/python-modules/mikatools/default.nix b/pkgs/development/python-modules/mikatools/default.nix

index efd65fe6515f529288cf18e29894ebc82116d936..634ce6ea2e8177d0b8349b5412b347fed8078d18 100644

--- a/pkgs/development/python-modules/mikatools/default.nix

+++ b/pkgs/development/python-modules/mikatools/default.nix

@@ -1,14 +1,14 @@

-{ lib, buildPythonPackage, requests, clint, sources }:

+{ lib, python3Packages, sources }:

let

pname = "mikatools";

date = lib.substring 0 10 sources.mikatools.date;

version = "unstable-" + date;

in

-buildPythonPackage {

+python3Packages.buildPythonPackage {

inherit pname version;

src = sources.mikatools;

• propagatedBuildInputs = [ requests clint ];

• propagatedBuildInputs = with python3Packages; [ requests clint ];

meta = with lib; {

 inherit (sources.mikatools) description homepage;

diff --git a/pkgs/development/python-modules/pyephem/default.nix b/pkgs/development/python-modules/pyephem/default.nix

index 808ac4b1f149c6758c396d3227a170308d0e6e09..19392bb976d108f3f447660dfd67a2a059205656 100644

--- a/pkgs/development/python-modules/pyephem/default.nix

+++ b/pkgs/development/python-modules/pyephem/default.nix

@@ -1,10 +1,10 @@

-{ lib, buildPythonPackage, sources }:

+{ lib, python3Packages, sources }:

let

pname = "pyephem";

date = lib.substring 0 10 sources.pyephem.date;

version = "unstable-" + date;

in

-buildPythonPackage {

+python3Packages.buildPythonPackage {

inherit pname version;

src = sources.pyephem;

diff --git a/pkgs/development/python-modules/pymbtiles/default.nix b/pkgs/development/python-modules/pymbtiles/default.nix

index d8f9da72784cd905fc1bf079ce5cfc26b68366cc..dc0a45aeeb27ad24026929232a70cc7d7f1078c2 100644

--- a/pkgs/development/python-modules/pymbtiles/default.nix

+++ b/pkgs/development/python-modules/pymbtiles/default.nix

@@ -1,14 +1,14 @@

-{ lib, buildPythonPackage, pytest, sources }:

+{ lib, python3Packages, sources }:

let

pname = "pymbtiles";

date = lib.substring 0 10 sources.pymbtiles.date;

version = "unstable-" + date;

in

-buildPythonPackage {

+python3Packages.buildPythonPackage {

inherit pname version;

src = sources.pymbtiles;

• checkInputs = [ pytest ];

• checkInputs = with python3Packages; [ pytest ];

checkPhase = "pytest";

meta = with lib; {

diff --git a/pkgs/development/python-modules/python-hfst/default.nix b/pkgs/development/python-modules/python-hfst/default.nix

index 28dc16a01d1ce1dd1d534e9cc04736648c61af59..3b86f45533d53d852267adb650238e2dbf42dabf 100644

--- a/pkgs/development/python-modules/python-hfst/default.nix

+++ b/pkgs/development/python-modules/python-hfst/default.nix

@@ -1,6 +1,6 @@

-{ lib, buildPythonPackage, hfst, swig }:

+{ lib, python3Packages, hfst, swig }:

-buildPythonPackage {

+python3Packages.buildPythonPackage {

pname = "python-hfst";

inherit (hfst) src version;

diff --git a/pkgs/tools/dict/gt4gd/default.nix b/pkgs/tools/dict/gt4gd/default.nix

index 8261784b0abc93a189bd91ba832b719c7df3c3fc..546a3d55b54c3ce59eabe9fee6c7a91df06e66de 100644

--- a/pkgs/tools/dict/gt4gd/default.nix

+++ b/pkgs/tools/dict/gt4gd/default.nix

@@ -1,20 +1,14 @@

-{ lib

-, buildPythonApplication

-, requests

-, sources

-, withUI ? true

-, tkinter

-}:

+{ lib, python3Packages, sources, withUI ? true }:

let

pname = "gt4gd";

date = lib.substring 0 10 sources.gt4gd.date;

version = "unstable-" + date;

in

-buildPythonApplication {

+python3Packages.buildPythonApplication {

inherit pname version;

src = sources.gt4gd;

• propagatedBuildInputs = [ requests ] ++ (lib.optional withUI tkinter);

• propagatedBuildInputs = with python3Packages; [ requests ] ++ (lib.optional withUI tkinter);

postInstall = lib.optionalString withUI ''

 install -Dm755 googletranslateui.py $out/bin/googletranslateui

diff --git a/pkgs/tools/dict/lsdreader/default.nix b/pkgs/tools/dict/lsdreader/default.nix

index d47715e9a4c67d7029ed78e223f35dbc4a912464..f4b0597b930ccea0acbd9128f2d0da27e574eb44 100644

--- a/pkgs/tools/dict/lsdreader/default.nix

+++ b/pkgs/tools/dict/lsdreader/default.nix

@@ -1,10 +1,10 @@

-{ lib, buildPythonApplication, sources }:

+{ lib, python3Packages, sources }:

let

pname = "lsdreader";

date = lib.substring 0 10 sources.lsdreader.date;

version = "unstable-" + date;

in

-buildPythonApplication {

+python3Packages.buildPythonApplication {

inherit pname version;

src = sources.lsdreader;

diff --git a/pkgs/tools/geo/elevation/default.nix b/pkgs/tools/geo/elevation/default.nix

index afaebccadf26b2c41cb4fcaccf7613540fbeb989..70b2e61c1c290e052fa1a9e8209dbce81a5e4d25 100644

--- a/pkgs/tools/geo/elevation/default.nix

+++ b/pkgs/tools/geo/elevation/default.nix

@@ -1,16 +1,11 @@

{ lib

-, buildPythonApplication

-, fasteners

-, future

-, appdirs

+, python3Packages

, click

, gnumake

, curl

, unzip

, gzip

, gdal

-, pytest

-, pytest-mock

, sources

}:

let

@@ -18,11 +13,11 @@ pname = "elevation";

date = lib.substring 0 10 sources.elevation.date;

version = "unstable-" + date;

in

-buildPythonApplication {

+python3Packages.buildPythonApplication {

inherit pname version;

src = sources.elevation;

• propagatedBuildInputs = [ fasteners future appdirs click ];

• propagatedBuildInputs = with python3Packages; [ fasteners future appdirs click ];

postPatch = ''

 for f in elevation/datasource.* \

@@ -39,7 +34,7 @@ --replace "gdalbuildvrt " "${lib.getBin gdal}/bin/gdalbuildvrt "

 done

'';

• checkInputs = [ pytest pytest-mock ];

• checkInputs = with python3Packages; [ pytest pytest-mock ];

checkPhase = "pytest";

meta = with lib; {

diff --git a/pkgs/tools/geo/supermercado/default.nix b/pkgs/tools/geo/supermercado/default.nix

index 826416e8b5b920b7974c9160cedf2499e7971733..b667379e64a7e425fe3532bfbc1a8292e6341342 100644

--- a/pkgs/tools/geo/supermercado/default.nix

+++ b/pkgs/tools/geo/supermercado/default.nix

@@ -1,11 +1,7 @@

{ lib

, fetchpatch

-, buildPythonApplication

-, click-plugins

-, rasterio

+, python3Packages

, mercantile

-, numpy

-, pytest

, sources

}:

let

@@ -13,7 +9,7 @@ pname = "supermercado";

date = lib.substring 0 10 sources.supermercado.date;

version = "unstable-" + date;

in

-buildPythonApplication {

+python3Packages.buildPythonApplication {

inherit pname version;

src = sources.supermercado;

@@ -27,9 +23,9 @@ }

 )

];

• propagatedBuildInputs = [ click-plugins rasterio mercantile numpy ];

• propagatedBuildInputs = with python3Packages; [ click-plugins rasterio mercantile numpy ];

• checkInputs = [ pytest ];

• checkInputs = with python3Packages; [ pytest ];

checkPhase = "pytest";

meta = with lib; {

diff --git a/pkgs/tools/geo/tilesets-cli/default.nix b/pkgs/tools/geo/tilesets-cli/default.nix

index b05834ff10e30705b4c93bcce6a608ab71326c2c..23e974cf6be39c2f773bf1fdd6541e85d6d9f025 100644

--- a/pkgs/tools/geo/tilesets-cli/default.nix

+++ b/pkgs/tools/geo/tilesets-cli/default.nix

@@ -1,14 +1,14 @@

-{ lib, buildPythonApplication, boto3, click, cligj, requests, requests-toolbelt, jsonschema, jsonseq, sources }:

+{ lib, python3Packages, jsonseq, sources }:

let

pname = "tilesets-cli";

date = lib.substring 0 10 sources.tilesets-cli.date;

version = "unstable-" + date;

in

-buildPythonApplication {

+python3Packages.buildPythonApplication {

inherit pname version;

src = sources.tilesets-cli;

• propagatedBuildInputs = [ boto3 click cligj requests requests-toolbelt jsonschema jsonseq ];

• propagatedBuildInputs = with python3Packages; [ boto3 click cligj requests requests-toolbelt jsonschema jsonseq ];

meta = with lib; {

 inherit (sources.tilesets-cli) description homepage;

diff --git a/pkgs/tools/geo/tpkutils/default.nix b/pkgs/tools/geo/tpkutils/default.nix

index 7827893545e7d8cd49d0e0d1b9f2e01f85680b05..15f018850bfb12549e8541cc0394e833fe80aa61 100644

--- a/pkgs/tools/geo/tpkutils/default.nix

+++ b/pkgs/tools/geo/tpkutils/default.nix

@@ -1,16 +1,16 @@

-{ lib, buildPythonApplication, mercantile, pymbtiles, pytest, setuptools, six, sources }:

+{ lib, python3Packages, mercantile, pymbtiles, sources }:

let

pname = "tpkutils";

date = lib.substring 0 10 sources.tpkutils.date;

version = "unstable-" + date;

in

-buildPythonApplication {

+python3Packages.buildPythonApplication {

inherit pname version;

src = sources.tpkutils;

• propagatedBuildInputs = [ mercantile pymbtiles setuptools six ];

• propagatedBuildInputs = with python3Packages; [ mercantile pymbtiles setuptools six ];

• checkInputs = [ pytest ];

• checkInputs = with python3Packages; [ pytest ];

checkPhase = "pytest";

meta = with lib; {

diff --git a/pkgs/tools/morse-talk/default.nix b/pkgs/tools/morse-talk/default.nix

index 416fb9aceef0cef9ee342e379f6dab8992d3297e..f2a53132b050f6abf284b6e1eca3e0f089933822 100644

--- a/pkgs/tools/morse-talk/default.nix

+++ b/pkgs/tools/morse-talk/default.nix

@@ -1,16 +1,16 @@

-{ lib, buildPythonApplication, matplotlib, nose, sounddevice, sources }:

+{ lib, python3Packages, sources }:

let

pname = "morse-talk";

date = lib.substring 0 10 sources.morse-talk.date;

version = "unstable-" + date;

in

-buildPythonApplication {

+python3Packages.buildPythonApplication {

inherit pname version;

src = sources.morse-talk;

• propagatedBuildInputs = [ matplotlib sounddevice ];

• propagatedBuildInputs = with python3Packages; [ matplotlib sounddevice tkinter ];

• checkInputs = [ nose ];

• checkInputs = with python3Packages; [ nose ];

checkPhase = "nosetests";

meta = with lib; {