public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21102 from mayflower/simp_le-fix 

Fix simp_le certificate creation
This commit is contained in:
Franz Pletz 2016-12-12 18:06:49 +01:00 committed by GitHub
parent 09fecd18b2 ee4b59c521
commit 4dfa8794fe
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/admin/simp_le/default.nix
View File

@ -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;

20
pkgs/top-level/python-packages.nix
View File

@ -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;