flannel: Migrate to go-packages

This commit is contained in:
William A. Kennington III 2015-09-02 17:05:42 -07:00
parent 81c9095d90
commit 5b13442747
3 changed files with 8 additions and 26 deletions

View File

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

View File

@ -1489,7 +1489,7 @@ let
inherit (perlPackages) ImageExifTool JSON; inherit (perlPackages) ImageExifTool JSON;
}; };
flannel = callPackage ../tools/networking/flannel { }; flannel = pkgs.goPackages.flannel.bin // { outputs = [ "bin" ]; };
flashbench = callPackage ../os-specific/linux/flashbench { }; flashbench = callPackage ../os-specific/linux/flashbench { };

View File

@ -581,6 +581,13 @@ let
}; };
}; };
flannel = buildFromGitHub {
rev = "v0.5.3";
owner = "coreos";
repo = "flannel";
sha256 = "0d9khv0bczvsaqnz16p546m4r5marmnkcrdhi0f3ajnwxb776r9p";
};
fsnotify.v1 = buildGoPackage rec { fsnotify.v1 = buildGoPackage rec {
rev = "v1.2.0"; rev = "v1.2.0";
name = "fsnotify.v1-${rev}"; name = "fsnotify.v1-${rev}";