From f4965177b585f8f8345027e6169f8c87ebb441d5 Mon Sep 17 00:00:00 2001 From: Simon Jagoe Date: Sun, 8 Mar 2015 20:10:40 +0000 Subject: [PATCH] Move grin definition to tools/text and call it from all-packages.nix --- .../{development/python-modules => tools/text}/grin/default.nix | 0 pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{development/python-modules => tools/text}/grin/default.nix (100%) diff --git a/pkgs/development/python-modules/grin/default.nix b/pkgs/tools/text/grin/default.nix similarity index 100% rename from pkgs/development/python-modules/grin/default.nix rename to pkgs/tools/text/grin/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90dfd2876e8..650d1108f01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1412,6 +1412,8 @@ let */ graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix { }; + grin = callPackage ../tools/text/grin { }; + grive = callPackage ../tools/filesystems/grive { json_c = json-c-0-11; # won't configure with 0.12; others are vulnerable }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bedae7b00cd..5e8e537949a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13045,8 +13045,6 @@ let }; }; - grin = callPackage ../development/python-modules/grin { }; - gsutil = buildPythonPackage rec { name = "gsutil-4.6"; meta = {