From c8c6ff4a96f1216fdb9c1fae6002b12d1b8deacf Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Mon, 12 Dec 2016 16:19:19 +0100 Subject: [PATCH 1/2] simp_le: bump acme dependency to newer version acme_0_5_0 is no longer working and removed in another commit --- pkgs/tools/admin/simp_le/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 24bfe043b9d..b4ed398541f 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -15,9 +15,13 @@ pythonPackages.buildPythonApplication rec { url = "https://github.com/kuba/simp_le/commit/4bc788fdd611c4118c3f86b5f546779723aca5a7.patch"; sha256 = "0036p11qn3plydv5s5z6i28r6ihy1ipjl0y8la0izpkiq273byfc"; }) + (fetchpatch { + url = "https://github.com/kuba/simp_le/commit/9ec7efe593cadb46348dc6924c1e6a31f0f9e636.patch"; + sha256 = "0n3m94n14y9c42185ly47d061g6awc8vb8xs9abffaigxv59k06j"; + }) ]; - propagatedBuildInputs = with pythonPackages; [ acme_0_5_0 ]; + propagatedBuildInputs = with pythonPackages; [ acme ]; meta = with stdenv.lib; { inherit (src.meta) homepage; From ee4b59c5219146f36c4c25cf7b73521aa15bafcd Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Mon, 12 Dec 2016 16:17:01 +0100 Subject: [PATCH 2/2] acme_0_5_0: remove as it is no longer required --- pkgs/top-level/python-packages.nix | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 89971bdf05b..87cd2970fab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -412,26 +412,6 @@ in { maintainers = with maintainers; [ teh ]; }; }; - acme_0_5_0 = buildPythonPackage rec { - version = "0.5.0"; - name = "acme-${version}"; - - src = pkgs.fetchFromGitHub { - owner = "letsencrypt"; - repo = "letsencrypt"; - rev = "v${version}"; - sha256 = "0x098cdyfgqvh7x5d3sz56qjpjyg5b4fl82086sm43d8mbz0h5rm"; - }; - - 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 = buildPythonPackage rec { inherit (pkgs.certbot) src version;