diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-12-05 12:44:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 12:44:02 +0000 |
| commit | 7e6068c3533cf67ffbcbbd902f586650a76c3b0a (patch) | |
| tree | 89450e6a1f00600b8847fd5b323d636d66ed342b /pkgs/top-level | |
| parent | 8e97f8fac4a5ccd07d78547848d0c5164c060519 (diff) | |
| parent | 7e39ecba684a9e1e64a6f18c69543a170a36bd52 (diff) | |
| download | nixlib-7e6068c3533cf67ffbcbbd902f586650a76c3b0a.tar nixlib-7e6068c3533cf67ffbcbbd902f586650a76c3b0a.tar.gz nixlib-7e6068c3533cf67ffbcbbd902f586650a76c3b0a.tar.bz2 nixlib-7e6068c3533cf67ffbcbbd902f586650a76c3b0a.tar.lz nixlib-7e6068c3533cf67ffbcbbd902f586650a76c3b0a.tar.xz nixlib-7e6068c3533cf67ffbcbbd902f586650a76c3b0a.tar.zst nixlib-7e6068c3533cf67ffbcbbd902f586650a76c3b0a.zip | |
Merge pull request #32335 from makefu/pkgs/devpi-common/update
init devpi-server at 4.3.1, bump devpi-client
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b29f4f9fc1d..3de35be2dac8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5530,6 +5530,8 @@ with pkgs; devpi-client = callPackage ../development/tools/devpi-client {}; + devpi-server = callPackage ../development/tools/devpi-server {}; + dotty = callPackage ../development/compilers/scala/dotty.nix { jre = jre8;}; drumstick = callPackage ../development/libraries/drumstick { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 435613e8033d..1d857ac6512d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -162,6 +162,8 @@ in { ansicolor = callPackage ../development/python-modules/ansicolor { }; + argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; + asana = callPackage ../development/python-modules/asana { }; asn1crypto = callPackage ../development/python-modules/asn1crypto { }; @@ -3766,6 +3768,8 @@ in { }; }; + pytest-timeout = callPackage ../development/python-modules/pytest-timeout { }; + pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; pytestpep8 = buildPythonPackage rec { @@ -24458,6 +24462,7 @@ EOF parse-type = callPackage ../development/python-modules/parse-type { }; ephem = callPackage ../development/python-modules/ephem { }; + }); in fix' (extends overrides packages) |