diff options
author | zimbatm <zimbatm@zimbatm.com> | 2016-05-10 22:17:29 +0100 |
---|---|---|
committer | zimbatm <zimbatm@zimbatm.com> | 2016-05-10 22:17:29 +0100 |
commit | 89675e4a079a81adf498d59fea99d6a16352c05e (patch) | |
tree | 9ae1551748e55c1f0add80b0f0b5376424a34cf2 /pkgs | |
parent | 988b151fa1c04183f6ff0b01e47e0da24fdd870b (diff) | |
parent | 4989a3bedf3840d0035ce1c60df3896ff3c2c8d9 (diff) | |
download | nixlib-89675e4a079a81adf498d59fea99d6a16352c05e.tar nixlib-89675e4a079a81adf498d59fea99d6a16352c05e.tar.gz nixlib-89675e4a079a81adf498d59fea99d6a16352c05e.tar.bz2 nixlib-89675e4a079a81adf498d59fea99d6a16352c05e.tar.lz nixlib-89675e4a079a81adf498d59fea99d6a16352c05e.tar.xz nixlib-89675e4a079a81adf498d59fea99d6a16352c05e.tar.zst nixlib-89675e4a079a81adf498d59fea99d6a16352c05e.zip |
Merge pull request #15371 from groxxda/bump/simp_le
simp_le: 2016-02-06 -> 2016-04-17
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/admin/simp_le/default.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 23 |
2 files changed, 4 insertions, 27 deletions
diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 78ae1953ad71..fdb531736d05 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "simp_le-2016-02-06"; + name = "simp_le-2016-04-17"; src = fetchFromGitHub { owner = "kuba"; repo = "simp_le"; - rev = "8f258bc098a84b7a20c2732536d0740244d814f7"; - sha256 = "1r2c31bhj91n3cjyf01spx52vkqxi5475zzkc9s1aliy3fs3lc4r"; + rev = "3a103b76f933f9aef782a47401dd2eff5057a6f7"; + sha256 = "0x8gqazn09m30bn1l7xnf8snhbb7yz7sb09imciqmm4jqdvn797z"; }; - propagatedBuildInputs = with pythonPackages; [ acme_0_1 ]; + propagatedBuildInputs = with pythonPackages; [ acme ]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f5840461b80d..19e0483ceb00 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -270,29 +270,6 @@ in modules // { postUnpack = "sourceRoot=\${sourceRoot}/acme"; }; - # Maintained for simp_le compatibility - acme_0_1 = buildPythonPackage rec { - version = "0.1.0"; - - name = "acme-${version}"; - - src = pkgs.fetchFromGitHub { - owner = "letsencrypt"; - repo = "letsencrypt"; - rev = "v${version}"; - sha256 = "1f7406nnybsdbwxf7r9qjf6hzkfd7cg6qp8l9l7hrzwscsq5hicj"; - }; - - propagatedBuildInputs = with self; [ - cryptography pyasn1 pyopenssl pyRFC3339 pytz requests2 six werkzeug mock - ndg-httpsclient - ]; - - buildInputs = with self; [ nose ]; - - sourceRoot = "letsencrypt-v${version}-src/acme"; - }; - acme-tiny = buildPythonPackage rec { name = "acme-tiny-${version}"; version = "20151229"; |