i3cat: extracted from goPackages

5 files changed, 38 insertions, 10 deletions

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 5e6e29ec6b2b..84093998b513 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -898,5 +898,14 @@
       "rev": "9ae4729fba20b3533d829a9c6ba8195b068f2abc",
       "sha256": "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"
     }
+  },
+  {
+    "goPackagePath": "github.com/vincent-petithory/structfield",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/vincent-petithory/structfield",
+      "rev": "01a738558a47fbf16712994d1737fb31c77e7d11",
+      "sha256": "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw"
+    }
   }
 ]
\ No newline at end of file
diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix
new file mode 100644
index 000000000000..c0333a14ed47
--- /dev/null
+++ b/pkgs/tools/misc/i3cat/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "i3cat-${version}";
+  version = "20150321-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576";
+
+  goPackagePath = "github.com/vincent-petithory/i3cat";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/vincent-petithory/i3cat";
+    sha256 = "1xlm5c9ajdb71985nq7hcsaraq2z06przbl6r4ykvzi8w2lwgv72";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/tools/misc/i3cat/deps.json b/pkgs/tools/misc/i3cat/deps.json
new file mode 100644
index 000000000000..cd4c703aed65
--- /dev/null
+++ b/pkgs/tools/misc/i3cat/deps.json
@@ -0,0 +1,8 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/vincent-petithory/structfield"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52d00e5a1341..195948b2384c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13026,7 +13026,7 @@ in
 
   i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { };
 
-  i3cat = goPackages.i3cat.bin // { outputs = [ "bin" ]; };
+  i3cat = callPackage ../tools/misc/i3cat { };
 
   i3lock = callPackage ../applications/window-managers/i3/lock.nix {
     cairo = cairo.override { xcbSupport = true; };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 2f34ea4d6992..31f699984547 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2026,15 +2026,6 @@ let
     ];
   };
 
-  i3cat = buildFromGitHub {
-    rev    = "b9ba886a7c769994ccd8d4627978ef4b51fcf576";
-    version = "2015-03-21";
-    owner  = "vincent-petithory";
-    repo   = "i3cat";
-    sha256 = "1xlm5c9ajdb71985nq7hcsaraq2z06przbl6r4ykvzi8w2lwgv72";
-    buildInputs = [ structfield ];
-  };
-
   inf = buildFromGitHub {
     rev    = "c85f1217d51339c0fa3a498cc8b2075de695dae6";
     owner  = "go-inf";