diff options
author | Robin Gloster <mail@glob.in> | 2016-03-01 21:09:17 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-03-01 21:09:17 +0000 |
commit | d47857c3d900c559dfb5134645311bd78b41a34e (patch) | |
tree | 2c0a02d76ce72b5210ea0f0cc97b7343d1bef5fb /pkgs/tools/admin | |
parent | 1bbb2f0cf3f1303abd40e7bc801e7582b74f3c62 (diff) | |
parent | 02891a0de97d965be5b792c60d8287794d3c2e5f (diff) | |
download | nixlib-d47857c3d900c559dfb5134645311bd78b41a34e.tar nixlib-d47857c3d900c559dfb5134645311bd78b41a34e.tar.gz nixlib-d47857c3d900c559dfb5134645311bd78b41a34e.tar.bz2 nixlib-d47857c3d900c559dfb5134645311bd78b41a34e.tar.lz nixlib-d47857c3d900c559dfb5134645311bd78b41a34e.tar.xz nixlib-d47857c3d900c559dfb5134645311bd78b41a34e.tar.zst nixlib-d47857c3d900c559dfb5134645311bd78b41a34e.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/admin')
-rw-r--r-- | pkgs/tools/admin/letsencrypt/default.nix | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/pkgs/tools/admin/letsencrypt/default.nix b/pkgs/tools/admin/letsencrypt/default.nix index 516fc20c5a74..be314a567313 100644 --- a/pkgs/tools/admin/letsencrypt/default.nix +++ b/pkgs/tools/admin/letsencrypt/default.nix @@ -1,22 +1,36 @@ -{ stdenv, pythonPackages, fetchurl, dialog }: +{ stdenv, pythonPackages, fetchFromGitHub, dialog }: pythonPackages.buildPythonApplication rec { - version = "0.1.0"; name = "letsencrypt-${version}"; + version = "0.4.0"; - src = fetchurl { - url = "https://github.com/letsencrypt/letsencrypt/archive/v${version}.tar.gz"; - sha256 = "056y5bsmpc4ya5xxals4ypzsm927j6n5kwby3bjc03sy3sscf6hw"; + src = fetchFromGitHub { + owner = "letsencrypt"; + repo = "letsencrypt"; + rev = "v${version}"; + sha256 = "0r2wis48w5nailzp2d5brkh2f40al6sbz816xx0akh3ll0rl1hbv"; }; propagatedBuildInputs = with pythonPackages; [ - zope_interface zope_component six requests2 pytz pyopenssl psutil mock acme - cryptography configobj pyRFC3339 python2-pythondialog parsedatetime ConfigArgParse + ConfigArgParse + acme + configobj + cryptography + parsedatetime + psutil + pyRFC3339 + pyopenssl + python2-pythondialog + pytz + six + zope_component + zope_interface ]; buildInputs = with pythonPackages; [ nose dialog ]; patchPhase = '' substituteInPlace letsencrypt/notify.py --replace "/usr/sbin/sendmail" "/var/setuid-wrappers/sendmail" + substituteInPlace letsencrypt/le_util.py --replace "sw_vers" "/usr/bin/sw_vers" ''; postInstall = '' |