summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pkgs/tools/text/grin/default.nix (renamed from pkgs/development/python-modules/grin/default.nix)0
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/python-packages.nix2
3 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/grin/default.nix b/pkgs/tools/text/grin/default.nix
index 63c40e86571e..63c40e86571e 100644
--- a/pkgs/development/python-modules/grin/default.nix
+++ b/pkgs/tools/text/grin/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90dfd2876e83..650d1108f013 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 bedae7b00cd3..5e8e537949a5 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 = {