From 02fdd3840081ffa9f3178a8ddd7ce72d505d3851 Mon Sep 17 00:00:00 2001
From: Simon Jagoe <simon@simonjagoe.com>
Date: Sun, 8 Mar 2015 16:29:41 +0000
Subject: [PATCH 1/5] Add grin package
---
.../python-modules/grin/default.nix | 19 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 1 +
2 files changed, 20 insertions(+)
create mode 100644 pkgs/development/python-modules/grin/default.nix
diff --git a/pkgs/development/python-modules/grin/default.nix b/pkgs/development/python-modules/grin/default.nix
new file mode 100644
index 000000000000..63c40e86571e
--- /dev/null
+++ b/pkgs/development/python-modules/grin/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+ name = "grin-1.2.1";
+ namePrefix = "";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/g/grin/${name}.tar.gz";
+ sha256 = "1swzwb17wibam8jszdv98h557hlx44pg6psv6rjz7i33qlxk0fdz";
+ };
+
+ buildInputs = with pythonPackages; [ nose ];
+ propagatedBuildInputs = with pythonPackages; [ argparse ];
+
+ meta = {
+ homepage = https://pypi.python.org/pypi/grin;
+ description = "A grep program configured the way I like it.";
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a16121f2e933..3cec31f4b5a9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4844,6 +4844,7 @@ let
};
};
+ grin = callPackage ../development/python-modules/grin { };
gyp = buildPythonPackage rec {
rev = "1977";
From ab6a03e70628b3165d50f940af72c0d8768e5aa0 Mon Sep 17 00:00:00 2001
From: Simon Jagoe <simon@simonjagoe.com>
Date: Sun, 8 Mar 2015 17:08:53 +0000
Subject: [PATCH 2/5] Place grin in Python 2.7 section; it is not Python 3.x
compatible
---
pkgs/top-level/python-packages.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3cec31f4b5a9..bedae7b00cd3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4844,8 +4844,6 @@ let
};
};
- grin = callPackage ../development/python-modules/grin { };
-
gyp = buildPythonPackage rec {
rev = "1977";
name = "gyp-r${rev}";
@@ -13047,6 +13045,8 @@ let
};
};
+ grin = callPackage ../development/python-modules/grin { };
+
gsutil = buildPythonPackage rec {
name = "gsutil-4.6";
meta = {
@@ -13270,7 +13270,7 @@ let
license = licenses.mit;
};
};
-
+
html2text = buildPythonPackage rec {
name = "html2text-2014.12.29";
From f4965177b585f8f8345027e6169f8c87ebb441d5 Mon Sep 17 00:00:00 2001
From: Simon Jagoe <simon@simonjagoe.com>
Date: Sun, 8 Mar 2015 20:10:40 +0000
Subject: [PATCH 3/5] 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 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 = {
From aca88a275e71fb356828f5eb88615590201acb74 Mon Sep 17 00:00:00 2001
From: Simon Jagoe <simon@simonjagoe.com>
Date: Sun, 8 Mar 2015 20:45:32 +0000
Subject: [PATCH 4/5] Specify platform compatibility for grin
---
pkgs/tools/text/grin/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix
index 63c40e86571e..638a044177f3 100644
--- a/pkgs/tools/text/grin/default.nix
+++ b/pkgs/tools/text/grin/default.nix
@@ -15,5 +15,6 @@ pythonPackages.buildPythonPackage rec {
meta = {
homepage = https://pypi.python.org/pypi/grin;
description = "A grep program configured the way I like it.";
+ platform = stdenv.lib.platforms.all;
};
}
From 456750c1adae59d215b5b424ad4d3e67a337ccae Mon Sep 17 00:00:00 2001
From: Simon Jagoe <simon@simonjagoe.com>
Date: Sun, 8 Mar 2015 20:46:23 +0000
Subject: [PATCH 5/5] Add sjagoe as maintainer of grin package
---
lib/maintainers.nix | 1 +
pkgs/tools/text/grin/default.nix | 1 +
2 files changed, 2 insertions(+)
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8db7c33d1a5d..8f7eb0dbb8d7 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -158,6 +158,7 @@
shell = "Shell Turner <cam.turn@gmail.com>";
shlevy = "Shea Levy <shea@shealevy.com>";
simons = "Peter Simons <simons@cryp.to>";
+ sjagoe = "Simon Jagoe <simon@simonjagoe.com>";
sjmackenzie = "Stewart Mackenzie <setori88@gmail.com>";
skeidel = "Sven Keidel <svenkeidel@gmail.com>";
smironov = "Sergey Mironov <ierton@gmail.com>";
diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix
index 638a044177f3..da7799900a35 100644
--- a/pkgs/tools/text/grin/default.nix
+++ b/pkgs/tools/text/grin/default.nix
@@ -16,5 +16,6 @@ pythonPackages.buildPythonPackage rec {
homepage = https://pypi.python.org/pypi/grin;
description = "A grep program configured the way I like it.";
platform = stdenv.lib.platforms.all;
+ maintainers = [ stdenv.lib.maintainers.sjagoe ];
};
}