diff options
| author | Gregory Pfeil <greg@technomadic.org> | 2018-01-13 09:56:42 -0700 |
|---|---|---|
| committer | Gregory Pfeil <greg@technomadic.org> | 2018-01-13 09:59:25 -0700 |
| commit | d40d41ef51cbe82bf98e4d309374706002f50385 (patch) | |
| tree | 17a395ad92750730c03577c1d3f9c56d6821769b | |
| parent | 38deb5354221881f8fa6437d7b1c522835fb2aba (diff) | |
| download | nixpkgs-d40d41ef51cbe82bf98e4d309374706002f50385.tar nixpkgs-d40d41ef51cbe82bf98e4d309374706002f50385.tar.gz nixpkgs-d40d41ef51cbe82bf98e4d309374706002f50385.tar.bz2 nixpkgs-d40d41ef51cbe82bf98e4d309374706002f50385.tar.lz nixpkgs-d40d41ef51cbe82bf98e4d309374706002f50385.tar.xz nixpkgs-d40d41ef51cbe82bf98e4d309374706002f50385.tar.zst nixpkgs-d40d41ef51cbe82bf98e4d309374706002f50385.zip | |
Move flootty from python-modules.
| -rw-r--r-- | pkgs/development/tools/flootty/default.nix (renamed from pkgs/development/python-modules/flootty/default.nix) | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/flootty/default.nix b/pkgs/development/tools/flootty/default.nix index 92ce520fd19..9535ba86dd0 100644 --- a/pkgs/development/python-modules/flootty/default.nix +++ b/pkgs/development/tools/flootty/default.nix @@ -1,6 +1,10 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, python }: -buildPythonPackage rec { +let + inherit (python.pkgs) buildPythonApplication fetchPypi; +in + +buildPythonApplication rec { pname = "Flootty"; version = "3.2.1"; name = "${pname}-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84384931974..4d31c9bcfdf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7444,7 +7444,7 @@ with pkgs; findbugs = callPackage ../development/tools/analysis/findbugs { }; - flootty = pythonPackages.flootty; + flootty = callPackage ../development/tools/flootty { }; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eede8853574..fec2e3fd493 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -225,8 +225,6 @@ in { diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; - flootty = callPackage ../development/python-modules/flootty { }; - gssapi = callPackage ../development/python-modules/gssapi { }; h5py = callPackage ../development/python-modules/h5py { |