diff options
| author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-07-15 01:19:03 +0200 |
|---|---|---|
| committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-07-15 01:29:48 +0200 |
| commit | 18ecdd1e7e20ceba84c28ae6bc9b77e0a2ffd76e (patch) | |
| tree | e3c15cf0718e9f6e79a87d7b22be9c8957e96720 | |
| parent | fcc747ffa0afc8699ecfe51b16ba39a98a2e542d (diff) | |
| download | nixpkgs-18ecdd1e7e20ceba84c28ae6bc9b77e0a2ffd76e.tar nixpkgs-18ecdd1e7e20ceba84c28ae6bc9b77e0a2ffd76e.tar.gz nixpkgs-18ecdd1e7e20ceba84c28ae6bc9b77e0a2ffd76e.tar.bz2 nixpkgs-18ecdd1e7e20ceba84c28ae6bc9b77e0a2ffd76e.tar.lz nixpkgs-18ecdd1e7e20ceba84c28ae6bc9b77e0a2ffd76e.tar.xz nixpkgs-18ecdd1e7e20ceba84c28ae6bc9b77e0a2ffd76e.tar.zst nixpkgs-18ecdd1e7e20ceba84c28ae6bc9b77e0a2ffd76e.zip | |
python.pkgs.backports_ssl_match_hostname_3_4_0_2: remove
| -rw-r--r-- | pkgs/applications/misc/octoprint/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 14 |
2 files changed, 7 insertions, 15 deletions
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 6b057186eaf..b3a32d30c39 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -4,7 +4,13 @@ let pythonPackages = python2.pkgs.override { overrides = self: super: with self; { - backports_ssl_match_hostname = self.backports_ssl_match_hostname_3_4_0_2; + backports_ssl_match_hostname = super.backports_ssl_match_hostname.overridePythonAttrs (oldAttrs: rec { + version = "3.4.0.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "07410e7fb09aab7bdaf5e618de66c3dac84e2e3d628352814dc4c37de321d6ae"; + }; + }); flask = super.flask.overridePythonAttrs (oldAttrs: rec { version = "0.12.4"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f97de7347f..0338ca81d65 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -941,20 +941,6 @@ in { backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; - backports_ssl_match_hostname_3_4_0_2 = if !(pythonOlder "3.5") then null else self.buildPythonPackage rec { - name = "backports.ssl_match_hostname-3.4.0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/backports.ssl_match_hostname/backports.ssl_match_hostname-3.4.0.2.tar.gz"; - sha256 = "07410e7fb09aab7bdaf5e618de66c3dac84e2e3d628352814dc4c37de321d6ae"; - }; - - meta = { - description = "The Secure Sockets layer is only actually *secure*"; - homepage = https://bitbucket.org/brandon/backports.ssl_match_hostname; - }; - }; - backports_ssl_match_hostname = if !(pythonOlder "3.5") then null else callPackage ../development/python-modules/backports_ssl_match_hostname { }; |