diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-02-18 18:24:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-18 18:24:27 +0000 |
| commit | 68d08a0574bbd963a05598ca5c9f9df23ff68802 (patch) | |
| tree | 2d87c07574b2000fd45ebfe746a106e1de4c8c09 /pkgs | |
| parent | 5ab428799ec920022b82d5d4f2c10ebfe0f418c4 (diff) | |
| parent | 49dbb875369e35b370a18601e8e1d09a9782e1da (diff) | |
| download | nixpkgs-68d08a0574bbd963a05598ca5c9f9df23ff68802.tar nixpkgs-68d08a0574bbd963a05598ca5c9f9df23ff68802.tar.gz nixpkgs-68d08a0574bbd963a05598ca5c9f9df23ff68802.tar.bz2 nixpkgs-68d08a0574bbd963a05598ca5c9f9df23ff68802.tar.lz nixpkgs-68d08a0574bbd963a05598ca5c9f9df23ff68802.tar.xz nixpkgs-68d08a0574bbd963a05598ca5c9f9df23ff68802.tar.zst nixpkgs-68d08a0574bbd963a05598ca5c9f9df23ff68802.zip | |
Merge pull request #35133 from dotlambda/pymacaroons-pynacl
pythonPackages.pymacaroons-pynacl: move expression
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/pymacaroons-pynacl/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 13 |
2 files changed, 25 insertions, 12 deletions
diff --git a/pkgs/development/python-modules/pymacaroons-pynacl/default.nix b/pkgs/development/python-modules/pymacaroons-pynacl/default.nix new file mode 100644 index 00000000000..8bc644252c0 --- /dev/null +++ b/pkgs/development/python-modules/pymacaroons-pynacl/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pynacl, six }: + +buildPythonPackage rec { + pname = "pymacaroons-pynacl"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "pymacaroons"; + rev = "v${version}"; + sha256 = "0bykjk01zdndp6gjr30x46blsn0cvxa7j0zh5g8raxwaawchjhii"; + }; + + propagatedBuildInputs = [ pynacl six ]; + + # Tests require an old version of hypothesis + doCheck = false; + + meta = with lib; { + description = "Macaroon library for Python"; + homepage = https://github.com/matrix-org/pymacaroons; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fa0e0d02517..0eebd578c3a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19946,18 +19946,7 @@ EOF propagatedBuildInputs = with self; []; }; - pymacaroons-pynacl = buildPythonPackage rec { - name = "pymacaroons-pynacl-${version}"; - version = "0.9.3"; - - src = pkgs.fetchgit { - url = "https://github.com/matrix-org/pymacaroons.git"; - rev = "refs/tags/v${version}"; - sha256 = "0bykjk01zdndp6gjr30x46blsn0cvxa7j0zh5g8raxwaawchjhii"; - }; - - propagatedBuildInputs = with self; [ pynacl six ]; - }; + pymacaroons-pynacl = callPackage ../development/python-modules/pymacaroons-pynacl { }; pynacl = callPackage ../development/python-modules/pynacl { }; |