From bce93755b9ac9dd154812dda0ebaae9d86e34f41 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 18:42:33 +0200
Subject: [PATCH] textql: extracted from goPackages

---
 pkgs/development/go-modules/libs.json     |  6 ++---
 pkgs/development/tools/textql/default.nix | 27 +++++++++++++++++++++++
 pkgs/development/tools/textql/deps.json   |  8 +++++++
 pkgs/top-level/all-packages.nix           |  2 +-
 pkgs/top-level/go-packages.nix            | 17 --------------
 5 files changed, 39 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/tools/textql/default.nix
 create mode 100644 pkgs/development/tools/textql/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 2ee01f42ea2..673c5c8010e 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -211,8 +211,8 @@
     "fetch": {
       "type": "git",
       "url": "https://github.com/mattn/go-sqlite3",
-      "rev": "c5aee9649735e8dadac55eb968ccebd9fa29a881",
-      "sha256": "1505piq2mks6s77hfzrlv2siiqpy55lxgy1h9364jfz0baxjqpas"
+      "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42",
+      "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"
     }
   },
   {
@@ -476,4 +476,4 @@
       "sha256": "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb"
     }
   }
-]
+]
\ No newline at end of file
diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix
new file mode 100644
index 00000000000..abc9312c9e2
--- /dev/null
+++ b/pkgs/development/tools/textql/default.nix
@@ -0,0 +1,27 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "textql-${version}";
+  version = "2.0.3";
+  rev = "${version}";
+  
+  goPackagePath = "github.com/dinedal/textql";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/dinedal/textql";
+    sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3";
+  };
+
+  goDeps = ./deps.json;
+
+  meta = with stdenv.lib; {
+    description = "Execute SQL against structured text like CSV or TSV";
+    homepage = https://github.com/dinedal/textql;
+    license = licenses.mit;
+    maintainers = with maintainers; [ vrthra ];
+  };
+}
diff --git a/pkgs/development/tools/textql/deps.json b/pkgs/development/tools/textql/deps.json
new file mode 100644
index 00000000000..d2a75b9e45b
--- /dev/null
+++ b/pkgs/development/tools/textql/deps.json
@@ -0,0 +1,8 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/mattn/go-sqlite3"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e993fc9b1a4..d087e118c1f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3740,7 +3740,7 @@ in
 
   testdisk = callPackage ../tools/misc/testdisk { };
 
-  textql = goPackages.textql.bin // { outputs = [ "bin" ]; };
+  textql = (callPackage ../development/tools/textql { }).bin;
 
   html2text = callPackage ../tools/text/html2text { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index dd171b484d6..9bf27c55fa5 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -4008,23 +4008,6 @@ let
     propagatedBuildInputs = [ ];
   };
 
-  textql = buildFromGitHub rec {
-    rev     = "1785cd353c68aa34f97627143b9c2908dfd4ea04";
-    version = "2.0.3";
-    owner   = "dinedal";
-    repo    = "textql";
-    sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3";
-    propagatedBuildInputs = [ go-sqlite3 ];
-
-    meta = with stdenv.lib; {
-      description = "Execute SQL against structured text like CSV or TSV";
-      homepage = https://github.com/dinedal/textql;
-      license = licenses.mit;
-      maintainers = with maintainers; [ vrthra ];
-    };
-
-  };
-
   gopsutil = buildFromGitHub rec {
     version = "1.0.0";
     rev = "37d89088411de59a4ef9fc340afa0e89dfcb4ea9";