From 663d369211d9a62233d69b159ff43fb051b7f532 Mon Sep 17 00:00:00 2001 From: Aaron Bull Schaefer Date: Fri, 26 May 2017 15:55:15 -0700 Subject: [PATCH 1/3] pythonPackages.ntlm-auth: init at 1.0.3 --- .../python-modules/ntlm-auth/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/ntlm-auth/default.nix diff --git a/pkgs/development/python-modules/ntlm-auth/default.nix b/pkgs/development/python-modules/ntlm-auth/default.nix new file mode 100644 index 00000000000..03890f712af --- /dev/null +++ b/pkgs/development/python-modules/ntlm-auth/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, pytest +, unittest2 +, six +}: + +buildPythonPackage rec { + pname = "ntlm-auth"; + version = "1.0.3"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "jborean93"; + repo = "ntlm-auth"; + rev = "v${version}"; + sha256 = "09f2g4ivfi9lh1kr30hlg0q4n2imnvmd79w83gza11q9nmhhiwpz"; + }; + + checkInputs = [ mock pytest unittest2 ]; + propagatedBuildInputs = [ six ]; + + # Functional tests require networking + checkPhase = '' + py.test --ignore=tests/functional/test_iis.py + ''; + + meta = with lib; { + description = "Calculates NTLM Authentication codes"; + homepage = https://github.com/jborean93/ntlm-auth; + license = licenses.lgpl3; + maintainers = with maintainers; [ elasticdog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 83baa3a9312..18a0d7ac718 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -234,6 +234,8 @@ in { nltk = callPackage ../development/python-modules/nltk.nix { }; + ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; + pitz = callPackage ../applications/misc/pitz { }; plantuml = callPackage ../tools/misc/plantuml { }; From 65587984e4576b07ffa31faa076fe016077579bb Mon Sep 17 00:00:00 2001 From: Aaron Bull Schaefer Date: Fri, 26 May 2017 15:55:51 -0700 Subject: [PATCH 2/3] pythonPackages.requests_ntlm: init at 1.0.0 --- .../python-modules/requests_ntlm/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/requests_ntlm/default.nix diff --git a/pkgs/development/python-modules/requests_ntlm/default.nix b/pkgs/development/python-modules/requests_ntlm/default.nix new file mode 100644 index 00000000000..c475ff85ff3 --- /dev/null +++ b/pkgs/development/python-modules/requests_ntlm/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ntlm-auth +, requests +}: + +buildPythonPackage rec { + pname = "requests_ntlm"; + version = "1.0.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hb689p2jyb867c2wlq5mjkqxgc0jq6lxv3rmhw8rq9qangk3jjk"; + }; + + propagatedBuildInputs = [ ntlm-auth requests ]; + + # Tests require networking + doCheck = false; + + meta = with lib; { + description = "HTTP NTLM authentication support for python-requests"; + homepage = https://github.com/requests/requests-ntlm; + license = licenses.isc; + maintainers = with maintainers; [ elasticdog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 18a0d7ac718..451eafaf5df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21373,6 +21373,8 @@ in { }; }; + requests_ntlm = callPackage ../development/python-modules/requests_ntlm { }; + requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib.nix { }; requests_toolbelt = buildPythonPackage rec { From c5b1a9da4bdf600eb9c33e1565536b7f0ea0f72f Mon Sep 17 00:00:00 2001 From: Aaron Bull Schaefer Date: Fri, 26 May 2017 15:56:48 -0700 Subject: [PATCH 3/3] pythonPackages.pywinrm: 0.1.1 -> 0.2.2 --- .../python-modules/pywinrm/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +----------- 2 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/pywinrm/default.nix diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix new file mode 100644 index 00000000000..b2b5ba20801 --- /dev/null +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mock +, pytest +, requests +, requests_ntlm +, six +, xmltodict +}: + +buildPythonPackage rec { + pname = "pywinrm"; + version = "0.2.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "06xc0mbqf718vmsp0fq0rb64nql66l5w2x23bmqnzl6nzc0gfc1h"; + }; + + checkInputs = [ mock pytest ]; + propagatedBuildInputs = [ requests requests_ntlm six xmltodict ]; + + meta = with lib; { + description = "Python library for Windows Remote Management"; + homepage = "http://github.com/diyan/pywinrm/"; + license = licenses.mit; + maintainers = with maintainers; [ elasticdog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 451eafaf5df..37466daace2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21092,25 +21092,7 @@ in { }; }; - pywinrm = buildPythonPackage rec { - version = "0.1.1"; - name = "pywinrm-${version}"; - - src = pkgs.fetchurl { - url = "https://github.com/diyan/pywinrm/archive/v${version}.tar.gz"; - sha256 = "1pc0987f6q5sxcgm50a1k1xz2pk45ny9xxnyapaf60662rcavvfb"; - }; - - propagatedBuildInputs = with self; [ isodate kerberos xmltodict ]; - - meta = { - homepage = "http://github.com/diyan/pywinrm/"; - description = "Python library for Windows Remote Management"; - license = licenses.mit; - # error: libgssapi_krb5.so: cannot open shared object file: No such file or directory - broken = true; # - }; - }; + pywinrm = callPackage ../development/python-modules/pywinrm { }; PyXAPI = stdenv.mkDerivation rec { name = "PyXAPI-0.1";