python.pkgs.gssapi: 1.1.4 -> 1.2.0, (#32681)

- fix for darwin - move to separate module
NixOS · Dec 14, 2017 · a3b84e0 · a3b84e0
1 parent 0d9343b
commit a3b84e0
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 26 deletions.
diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, pkgs, lib, buildPythonPackage, fetchPypi, six, enum34, decorator,
+nose, shouldbe, gss, krb5Full, which, darwin }:
+
+buildPythonPackage rec {
+  pname = "gssapi";
+  version = "1.2.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1q6ccpz6anl9vggwxdq32wp6xjh2lyfbf7av6jqnmvmyqdfwh3b9";
+  };
+
+  LD_LIBRARY_PATH="${pkgs.krb5Full}/lib";
+
+  buildInputs = [ krb5Full which nose shouldbe ]
+  ++ ( if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.GSS ] else [ gss ] );
+
+  propagatedBuildInputs =  [ decorator enum34 six ];
+
+  doCheck = false; # No such file or directory: '/usr/sbin/kadmin.local'
+
+  meta = with stdenv.lib; {
+    homepage = https://pypi.python.org/pypi/gssapi;
+    description = "Python GSSAPI Wrapper";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -220,6 +220,8 @@ in {
 
   diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };
 
+  gssapi = callPackage ../development/python-modules/gssapi { };
+
   h5py = callPackage ../development/python-modules/h5py {
     hdf5 = pkgs.hdf5;
   };
@@ -9288,32 +9290,6 @@ in {
     };
   };
 
-  gssapi = buildPythonPackage rec {
-    version = "1.1.4";
-    name = "gssapi-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/g/gssapi/${name}.tar.gz";
-      sha256 = "0mdl7m6h57n0zkfmm6fqz0hldfxrb2d7d48k2lhc8hqbr3962c7x";
-    };
-
-    GSSAPI_SUPPORT_DETECT = "false";
-    LD_LIBRARY_PATH="${pkgs.krb5Full}/lib";
-
-    buildInputs = [ pkgs.gss pkgs.krb5Full pkgs.which
-                    self.nose self.shouldbe ];
-
-    propagatedBuildInputs = with self; [ decorator enum34 six ];
-
-    doCheck = false; # No such file or directory: '/usr/sbin/kadmin.local'
-
-    meta = {
-      homepage = https://pypi.python.org/pypi/gssapi;
-      description = "Python GSSAPI Wrapper";
-      license = licenses.mit;
-    };
-  };
-
   gyp = buildPythonPackage rec {
     name = "gyp-${version}";
     version = "2015-06-11";