summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-09-03 19:10:16 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2020-09-03 19:10:16 +0200
commit30f07d16574bd572fa2db4505139e33d2cf36cfe (patch)
treef7a1e40d166b53092a4d0f36c3a060cdd12f1d7d
parentc25a7cd8468eeeed82d7444855c10552ab3452ba (diff)
pythonPackages.dnspython: use 1.x for Python 2
-rw-r--r--pkgs/applications/misc/electrum/default.nix8
-rw-r--r--pkgs/top-level/python-packages.nix8
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index ac296c1224ac..db6b6f2e1813 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -25,13 +25,7 @@ let
# use the latest 1.x release instead
py = python3.override {
packageOverrides = self: super: {
- dnspython = super.dnspython.overridePythonAttrs (oldAttrs: rec {
- version = "1.16.0";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01";
- };
- });
+ dnspython = super.dnspython_1;
};
};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 29e23ce83b6b..bae167e20bbd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1694,7 +1694,13 @@ in {
dnslib = callPackage ../development/python-modules/dnslib { };
- dnspython = callPackage ../development/python-modules/dnspython { };
+ dnspython = if isPy3k then
+ callPackage ../development/python-modules/dnspython { }
+ else
+ self.dnspython_1;
+
+ dnspython_1 = callPackage ../development/python-modules/dnspython/1.nix { };
+
dns = self.dnspython; # Alias for compatibility, 2017-12-10
doc8 = callPackage ../development/python-modules/doc8 { };