From d40d41ef51cbe82bf98e4d309374706002f50385 Mon Sep 17 00:00:00 2001 From: Gregory Pfeil Date: Sat, 13 Jan 2018 09:56:42 -0700 Subject: [PATCH] Move flootty from python-modules. --- .../{python-modules => tools}/flootty/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 7 insertions(+), 5 deletions(-) rename pkgs/development/{python-modules => tools}/flootty/default.nix (80%) diff --git a/pkgs/development/python-modules/flootty/default.nix b/pkgs/development/tools/flootty/default.nix similarity index 80% rename from pkgs/development/python-modules/flootty/default.nix rename to pkgs/development/tools/flootty/default.nix index 92ce520fd194..9535ba86dd06 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 843849319744..4d31c9bcfdf5 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 eede88535740..fec2e3fd4932 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 {