diff options
| author | Robert Schütz <nix@dotlambda.de> | 2021-12-31 08:07:19 +0000 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-01-01 02:09:08 +0100 |
| commit | 4acf7d91b3c0175efe48f47067e95713c3384078 (patch) | |
| tree | b6b2eae375cf86ca3d864eefc260c291f208fd99 | |
| parent | b487ccf50099eee2da77227d9fb99c84cc90a0c7 (diff) | |
python2Packages.bitbucket-cli: move to top-level
| -rw-r--r-- | pkgs/tools/misc/bitbucket-cli/default.nix (renamed from pkgs/development/python-modules/bitbucket-cli/default.nix) | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python2-packages.nix | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/bitbucket-cli/default.nix b/pkgs/tools/misc/bitbucket-cli/default.nix index bb1fa1d6c17c1..4a770b187fe74 100644 --- a/pkgs/development/python-modules/bitbucket-cli/default.nix +++ b/pkgs/tools/misc/bitbucket-cli/default.nix @@ -1,16 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, requests }: +{ lib +, python2 +}: -buildPythonPackage rec { +python2.pkgs.buildPythonApplication rec { pname = "bitbucket-cli"; version = "0.5.1"; - disabled = isPy3k; - src = fetchPypi { + src = python2.pkgs.fetchPypi { inherit pname version; sha256 = "1xmn73x6jirnwfwcdy380ncmkai9f9dhmld6zin01ypbqwgf50fq"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = with python2.pkgs; [ + requests + ]; # No tests doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5ae544ba32c6..0536fe2b61021 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2192,7 +2192,7 @@ with pkgs; birdtray = libsForQt5.callPackage ../applications/misc/birdtray { }; - bitbucket-cli = python2Packages.bitbucket-cli; + bitbucket-cli = callPackage ../tools/misc/bitbucket-cli { }; bitbucket-server-cli = callPackage ../applications/version-management/git-and-tools/bitbucket-server-cli { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 1f894f3a14b63..f22de3c301b8e 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -30,8 +30,6 @@ with self; with super; { bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; - bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { }; - blivet = callPackage ../development/python-modules/blivet { }; box2d = callPackage ../development/python-modules/box2d { }; |