diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-22 16:39:12 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-22 16:39:12 +0200 |
| commit | 11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27 (patch) | |
| tree | c137efcba7e4188db3b58c60f7b5565e3c6ca05c /pkgs/top-level/python-packages.nix | |
| parent | 76b7dd1ba95c6cef48a2e71c427287a2d12c07ab (diff) | |
| parent | 1bd03f0379318a370563ae721a7ab3af6ef8e095 (diff) | |
| download | nixlib-11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27.tar nixlib-11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27.tar.gz nixlib-11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27.tar.bz2 nixlib-11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27.tar.lz nixlib-11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27.tar.xz nixlib-11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27.tar.zst nixlib-11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e40a1e67378..6cc85b1e8558 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -721,7 +721,7 @@ in { mailman-web = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/web.nix { }); - mailmanclient = callPackage ../development/python-modules/mailmanclient { }; + mailmanclient = disabledIf (!isPy3k) (callPackage ../development/python-modules/mailmanclient { }); mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { }; @@ -2145,9 +2145,9 @@ in { libais = callPackage ../development/python-modules/libais { }; - libfdt = disabledIf isPy3k (toPythonModule (pkgs.dtc.override { - python2 = python; - })); + libfdt = toPythonModule (pkgs.dtc.override { + inherit python; + }); libtmux = callPackage ../development/python-modules/libtmux { }; |