From 988b151fa1c04183f6ff0b01e47e0da24fdd870b Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Mon, 9 May 2016 17:28:52 +0200
Subject: [PATCH] letsencrypt: 0.4.0 -> 0.5.0 seems like the dependency on
 gnureadline is more or less optional for letsencrypt itself but the tests
 will not pass without it

---
 pkgs/tools/admin/letsencrypt/default.nix | 12 ++++++------
 pkgs/top-level/python-packages.nix       |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/admin/letsencrypt/default.nix b/pkgs/tools/admin/letsencrypt/default.nix
index be314a56731..ce5221e6d18 100644
--- a/pkgs/tools/admin/letsencrypt/default.nix
+++ b/pkgs/tools/admin/letsencrypt/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "letsencrypt-${version}";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
-    owner = "letsencrypt";
-    repo = "letsencrypt";
+    owner = "certbot";
+    repo = "certbot";
     rev = "v${version}";
-    sha256 = "0r2wis48w5nailzp2d5brkh2f40al6sbz816xx0akh3ll0rl1hbv";
+    sha256 = "0x098cdyfgqvh7x5d3sz56qjpjyg5b4fl82086sm43d8mbz0h5rm";
   };
 
   propagatedBuildInputs = with pythonPackages; [
@@ -26,7 +26,7 @@ pythonPackages.buildPythonApplication rec {
     zope_component
     zope_interface
   ];
-  buildInputs = with pythonPackages; [ nose dialog ];
+  buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]);
 
   patchPhase = ''
     substituteInPlace letsencrypt/notify.py --replace "/usr/sbin/sendmail" "/var/setuid-wrappers/sendmail"
@@ -41,7 +41,7 @@ pythonPackages.buildPythonApplication rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/letsencrypt/letsencrypt;
+    homepage = src.meta.homepage;
     description = "ACME client that can obtain certs and extensibly update server configurations";
     platforms = platforms.unix;
     maintainers = [ maintainers.iElectric ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d3ff56d5c9f..f5840461b80 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -267,8 +267,7 @@ in modules // {
     ];
 
     buildInputs = with self; [ nose ];
-
-    sourceRoot = "letsencrypt-v${version}-src/acme";
+    postUnpack = "sourceRoot=\${sourceRoot}/acme";
   };
 
   # Maintained for simp_le compatibility