commit 43981181cd68f2f384d3b2569dc61dba356d2421 parent fc6ba56ea0a218777e5cb83bb62eccb45e0a6d5a Author: Nikolay Korotkiy <sikmir@gmail.com> Date: Sat, 11 Jul 2020 15:40:05 +0300 Cleanup python packages Diffstat:
17 files changed, 69 insertions(+), 113 deletions(-)
diff --git 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 @@ lib.makeScope newScope ( ### 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 @@ lib.makeScope newScope ( 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 @@ lib.makeScope newScope ( }; 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 @@ lib.makeScope newScope ( 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ let 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 @@ buildPythonApplication { 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 @@ -1,11 +1,7 @@ { lib , fetchpatch -, buildPythonApplication -, click-plugins -, rasterio +, python3Packages , mercantile -, numpy -, pytest , sources }: let @@ -13,7 +9,7 @@ let 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 @@ buildPythonApplication { ) ]; - 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 @@ -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 @@ -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 @@ -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; {