From 51bcfbe007ca77e36a7ec63297a9072164ce55c6 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 5 Dec 2015 08:34:50 +0100
Subject: pythonPackages.acme: extract from letsencrypt derivation.

---
 pkgs/tools/admin/letsencrypt/default.nix | 22 ++++------------------
 pkgs/top-level/python-packages.nix       | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/admin/letsencrypt/default.nix b/pkgs/tools/admin/letsencrypt/default.nix
index 5481ad3aaf70..2c74a677b913 100644
--- a/pkgs/tools/admin/letsencrypt/default.nix
+++ b/pkgs/tools/admin/letsencrypt/default.nix
@@ -1,27 +1,13 @@
 { stdenv, pythonPackages, fetchurl, dialog }:
 
-let
+pythonPackages.buildPythonPackage rec {
+  version = "0.1.0";
+  name = "letsencrypt-${version}";
+
   src = fetchurl {
     url = "https://github.com/letsencrypt/letsencrypt/archive/v${version}.tar.gz";
     sha256 = "056y5bsmpc4ya5xxals4ypzsm927j6n5kwby3bjc03sy3sscf6hw";
   };
-  version = "0.1.0";
-  acme = pythonPackages.buildPythonPackage rec {
-    name = "acme-${version}";
-    inherit src version;
-
-    propagatedBuildInputs = with pythonPackages; [
-      cryptography pyasn1 pyopenssl pyRFC3339 pytz requests2 six werkzeug mock
-      ndg-httpsclient
-    ];
-
-    buildInputs = with pythonPackages; [ nose ];
-
-    sourceRoot = "letsencrypt-${version}/acme";
-  };
-in pythonPackages.buildPythonPackage rec {
-  name = "letsencrypt-${version}";
-  inherit src version;
 
   propagatedBuildInputs = with pythonPackages; [
     zope_interface zope_component six requests2 pytz pyopenssl psutil mock acme
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c12af9efa31b..c62715593c7b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -230,6 +230,21 @@ in modules // {
     };
   };
 
+  acme = buildPythonPackage rec {
+    inherit (pkgs.letsencrypt) src version;
+
+    name = "acme-${version}";
+
+    propagatedBuildInputs = with self; [
+      cryptography pyasn1 pyopenssl pyRFC3339 pytz requests2 six werkzeug mock
+      ndg-httpsclient
+    ];
+
+    buildInputs = with self; [ nose ];
+
+    sourceRoot = "letsencrypt-${version}/acme";
+  };
+
   actdiag = buildPythonPackage rec {
     name = "actdiag-0.5.3";
 
-- 
cgit 1.4.1