From bad2b3c229ceebbce5e41711b1fe25fcdbb06b5f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 11:32:07 -0400 Subject: [PATCH] pythonPackages.pyramid_hawkauth: refactor move to python-modules --- .../pyramid_hawkauth/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 13 +-------- 2 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/pyramid_hawkauth/default.nix diff --git a/pkgs/development/python-modules/pyramid_hawkauth/default.nix b/pkgs/development/python-modules/pyramid_hawkauth/default.nix new file mode 100644 index 000000000000..a27232550571 --- /dev/null +++ b/pkgs/development/python-modules/pyramid_hawkauth/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchgit +, pyramid +, hawkauthlib +, tokenlib +, webtest +}: + +buildPythonPackage rec { + pname = "pyramidhawkauth"; + version = "0.1.0"; + + src = fetchgit { + url = https://github.com/mozilla-services/pyramid_hawkauth.git; + rev = "refs/tags/v${version}"; + sha256 = "038ign7qlavlmvrhb2y8bygbxvy4j7bx2k1zg0i3wblg2ja50w7h"; + }; + + propagatedBuildInputs = [ pyramid hawkauthlib tokenlib ]; + buildInputs = [ webtest ]; + + meta = with stdenv.lib; { + homepage = https://github.com/mozilla-services/pyramid_hawkauth; + description = "A Pyramid authentication plugin for HAWK"; + license = licenses.mpl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e15429f9362..edcd19a96848 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2115,18 +2115,7 @@ in { pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { }; - pyramid_hawkauth = buildPythonPackage rec { - name = "pyramidhawkauth-${version}"; - version = "0.1.0"; - src = pkgs.fetchgit { - url = https://github.com/mozilla-services/pyramid_hawkauth.git; - rev = "refs/tags/v${version}"; - sha256 = "038ign7qlavlmvrhb2y8bygbxvy4j7bx2k1zg0i3wblg2ja50w7h"; - }; - - propagatedBuildInputs = with self; [ pyramid hawkauthlib tokenlib ]; - buildInputs = with self; [ webtest ]; - }; + pyramid_hawkauth = callPackage ../development/python-modules/pyramid_hawkauth { }; pyroute2 = callPackage ../development/python-modules/pyroute2 { };