summaryrefslogtreecommitdiffstats
path: root/pkgs/top-level/python-packages.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-09-06 22:46:05 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-09-06 22:46:05 +0200
commit66bc7fc1b3e7a85a2cfde9bb121498a181d411a4 (patch)
treefa53c32dfef1265496170172a28a3c71bb32a655 /pkgs/top-level/python-packages.nix
parentf9237f315264a0ccb8b50ff4fa6ff456239e4dc1 (diff)
parentcfe51be04f8b7c36fe9f71ca5835bd683ede087f (diff)
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r--pkgs/top-level/python-packages.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2b9a4a46f1f1..aa4d6521c005 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6194,6 +6194,8 @@ in {
inherit python;
})).python;
+ zeroc-ice = callPackage ../development/python-modules/zeroc-ice { };
+
zm-py = callPackage ../development/python-modules/zm-py { };
rfc7464 = callPackage ../development/python-modules/rfc7464 { };