3
0
Fork 0
forked from mirrors/nixpkgs

flannel: extracted from goPackages

This commit is contained in:
Kamil Chmielewski 2016-06-03 13:17:53 +02:00
parent 387246080b
commit e5b9d23de7
3 changed files with 19 additions and 8 deletions

View file

@ -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";
};
}

View file

@ -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 { };

View file

@ -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}";