From e70a3c75991813d9bba1e2afe571ad01a1cd9f3b Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Mon, 15 Oct 2018 14:28:56 -0400
Subject: [PATCH] pythonPackages.closure-linter: refactor move to
 python-modules

---
 .../python-modules/closure-linter/default.nix | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 24 +-------------
 2 files changed, 34 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/python-modules/closure-linter/default.nix

diff --git a/pkgs/development/python-modules/closure-linter/default.nix b/pkgs/development/python-modules/closure-linter/default.nix
new file mode 100644
index 00000000000..f6c94ace1fa
--- /dev/null
+++ b/pkgs/development/python-modules/closure-linter/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, isPy3k
+, gflags
+}:
+
+/* There is a project called "closure-linter" on PyPI that is the
+   same as this, but it does not appear to be owned by Google.
+   So we're pulling from Google's GitHub repo instead. */
+buildPythonPackage rec {
+  pname = "closure-linter";
+  version = "2.3.19";
+
+  /* This project has no Python 3 support, as noted by
+     https://github.com/google/closure-linter/issues/81 */
+  disabled = isPy3k;
+
+  src = fetchgit {
+    url = "https://github.com/google/closure-linter";
+    rev = "5c27529075bb88bdc45e73008f496dec8438d658";
+    sha256 = "076c7q7pr7akfvq5y8lxr1ab81wwps07gw00igdkcxnc5k9dzxwc";
+  };
+
+  propagatedBuildInputs = [ gflags ];
+
+  meta = with stdenv.lib; {
+    description = "Checks JavaScript files against Google's style guide.";
+    homepage = "https://developers.google.com/closure/utilities/";
+    license = with licenses; [ asl20 ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 27815318c96..481b8d5ed5e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1312,29 +1312,7 @@ in {
 
   cligj = callPackage ../development/python-modules/cligj { };
 
-  /* There is a project called "closure-linter" on PyPI that is the
-     same as this, but it does not appear to be owned by Google.
-     So we're pulling from Google's GitHub repo instead. */
-  closure-linter = buildPythonPackage rec {
-    name = "closure-linter-${version}";
-    version = "2.3.19";
-
-    /* This project has no Python 3 support, as noted by
-       https://github.com/google/closure-linter/issues/81 */
-    disabled = isPy3k;
-
-    propagatedBuildInputs = with self; [ gflags ];
-    src = pkgs.fetchgit {
-      url = "https://github.com/google/closure-linter";
-      rev = "5c27529075bb88bdc45e73008f496dec8438d658";
-      sha256 = "076c7q7pr7akfvq5y8lxr1ab81wwps07gw00igdkcxnc5k9dzxwc";
-    };
-    meta = {
-      description = "Checks JavaScript files against Google's style guide.";
-      homepage = "https://developers.google.com/closure/utilities/";
-      license = with licenses; [ asl20 ];
-    };
-  };
+  closure-linter = callPackage ../development/python-modules/closure-linter { };
 
   cloudpickle = callPackage ../development/python-modules/cloudpickle { };