From 53489b496e313bd3ef3f6dd17ef4d28e278c3eb3 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 21 Sep 2019 21:23:48 -0400 Subject: dtc: fix Python support --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e40a1e67378..035d0d0aba24 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { }; -- cgit 1.4.1 From 67202a95bafe821402b6b0c6486059faf2a0b2cb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Sep 2019 14:09:50 +0200 Subject: python-mailmanclient: this package builds only with Python 3.x (cherry picked from commit df74899305f863ba4f2956ebf64a9e84687aaaa7) --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 035d0d0aba24..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 { }; -- cgit 1.4.1