flannel: Migrate to go-packages

3 files changed, 8 insertions, 26 deletions

diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
deleted file mode 100644
index 3c439541e915..000000000000
--- a/pkgs/tools/networking/flannel/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  version = "0.1.0";
-  name = "flannel-${version}";
-  goPackagePath = "github.com/coreos/flannel";
-  src = fetchFromGitHub {
-    owner = "coreos";
-    repo = "flannel";
-    rev = "v${version}";
-    sha256 = "1f7x6a2c8ix6j5y1r0dq56b58bl2rs2ycbdqb9fz5zv1zk2w20rd";
-  };
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "Flannel is an etcd backed network fabric for containers";
-    homepage = https://github.com/coreos/flannel;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ offline ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 448640623303..ff7dd06c090b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1489,7 +1489,7 @@ let
     inherit (perlPackages) ImageExifTool JSON;
   };
 
-  flannel = callPackage ../tools/networking/flannel { };
+  flannel = pkgs.goPackages.flannel.bin // { outputs = [ "bin" ]; };
 
   flashbench = callPackage ../os-specific/linux/flashbench { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 81cfbb250d07..836daa0427bc 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -581,6 +581,13 @@ let
     };
   };
 
+  flannel = buildFromGitHub {
+    rev = "v0.5.3";
+    owner = "coreos";
+    repo = "flannel";
+    sha256 = "0d9khv0bczvsaqnz16p546m4r5marmnkcrdhi0f3ajnwxb776r9p";
+  };
+
   fsnotify.v1 = buildGoPackage rec {
     rev = "v1.2.0";
     name = "fsnotify.v1-${rev}";