diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-25 14:20:27 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-25 14:20:27 -0400 |
commit | c701d6cb21e1e83a82ebdefe180f2d6233087f4a (patch) | |
tree | 3e7a7503cd7e84c8d2ee8aaffe264301fb591ebf /pkgs/top-level/python-packages.nix | |
parent | 6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf (diff) | |
parent | 6cd28a468aec0005052ee01eaf8510735948a2dd (diff) | |
download | nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.tar nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.tar.gz nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.tar.bz2 nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.tar.lz nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.tar.xz nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.tar.zst nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0354bdda6ef6..c8fc8c64de39 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -560,6 +560,8 @@ in { serversyncstorage = callPackage ../development/python-modules/serversyncstorage {}; + shellingham = callPackage ../development/python-modules/shellingham {}; + simpleeval = callPackage ../development/python-modules/simpleeval { }; singledispatch = callPackage ../development/python-modules/singledispatch { }; @@ -1544,6 +1546,10 @@ in { click = callPackage ../development/python-modules/click {}; + click-completion = callPackage ../development/python-modules/click-completion {}; + + click-didyoumean = callPackage ../development/python-modules/click-didyoumean {}; + click-log = callPackage ../development/python-modules/click-log {}; click-plugins = callPackage ../development/python-modules/click-plugins {}; @@ -2203,27 +2209,9 @@ in { elasticsearch = callPackage ../development/python-modules/elasticsearch { }; - elasticsearchdsl = buildPythonPackage (rec { - name = "elasticsearch-dsl-0.0.9"; - - src = pkgs.fetchurl { - url = "mirror://pypi/e/elasticsearch-dsl/${name}.tar.gz"; - sha256 = "1gdcdshk881vy18p0czcmbb3i4s5hl8llnfg6961b6x7jkvhihbj"; - }; - - buildInputs = with self; [ covCore dateutil elasticsearch mock pytest pytestcov unittest2 urllib3 pytz ]; - - # ImportError: No module named test_elasticsearch_dsl - # Tests require a local instance of elasticsearch - doCheck = false; - - meta = { - description = "Python client for Elasticsearch"; - homepage = https://github.com/elasticsearch/elasticsearch-dsl-py; - license = licenses.asl20; - maintainers = with maintainers; [ desiderius ]; - }; - }); + elasticsearch-dsl = callPackage ../development/python-modules/elasticsearch-dsl { }; + # alias + elasticsearchdsl = self.elasticsearch-dsl; elasticsearch-curator = callPackage ../development/python-modules/elasticsearch-curator { }; @@ -12387,6 +12375,8 @@ in { shapely = callPackage ../development/python-modules/shapely { }; + sharedmem = callPackage ../development/python-modules/sharedmem { }; + soco = callPackage ../development/python-modules/soco { }; sopel = buildPythonPackage rec { |