From e5b9d23de7c4687fc0356c14cf5105d1cc809178 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 13:17:53 +0200
Subject: [PATCH] flannel: extracted from goPackages

---
 pkgs/tools/networking/flannel/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 +-
 pkgs/top-level/go-packages.nix            |  7 -------
 3 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/tools/networking/flannel/default.nix

diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
new file mode 100644
index 00000000000..be2f10b3a35
--- /dev/null
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -0,0 +1,18 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "flannel-${version}";
+  version = "0.5.5";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/coreos/flannel";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/coreos/flannel";
+    sha256 = "19nrilcc41411rag2qm22vdna4kpqm933ry9m82wkd7sqzb50fpw";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbb0b59e3e0..f473461b8b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1514,7 +1514,7 @@ in
     inherit (perlPackages) ImageExifTool JSON;
   };
 
-  flannel = goPackages.flannel.bin // { outputs = [ "bin" ]; };
+  flannel = (callPackage ../tools/networking/flannel {}).bin;
 
   flashbench = callPackage ../os-specific/linux/flashbench { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 81db5296e9f..f056b5273a0 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -856,13 +856,6 @@ let
     };
   };
 
-  flannel = buildFromGitHub {
-    rev = "v0.5.5";
-    owner = "coreos";
-    repo = "flannel";
-    sha256 = "19nrilcc41411rag2qm22vdna4kpqm933ry9m82wkd7sqzb50fpw";
-  };
-
   fsnotify.v1 = buildGoPackage rec {
     rev = "v1.2.0";
     name = "fsnotify.v1-${rev}";