diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2016-10-01 17:22:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-01 17:22:34 +0200 |
| commit | 98a8146428b28354182dbe1eff78e3f540f565a6 (patch) | |
| tree | 016bcda175232d93c8ee4ece4aa3e2ae67a0aa40 /pkgs/tools/networking | |
| parent | fcee1d0b28aa0f45f559d38659fd2a11cd34dafe (diff) | |
| parent | feb9fc3aff07698a01163336613224b08547d65b (diff) | |
| download | nixlib-98a8146428b28354182dbe1eff78e3f540f565a6.tar nixlib-98a8146428b28354182dbe1eff78e3f540f565a6.tar.gz nixlib-98a8146428b28354182dbe1eff78e3f540f565a6.tar.bz2 nixlib-98a8146428b28354182dbe1eff78e3f540f565a6.tar.lz nixlib-98a8146428b28354182dbe1eff78e3f540f565a6.tar.xz nixlib-98a8146428b28354182dbe1eff78e3f540f565a6.tar.zst nixlib-98a8146428b28354182dbe1eff78e3f540f565a6.zip | |
Merge pull request #19016 from offlinehacker/pkgs/flannel/update/0.6.2
flannel: update, add nixos module, add tests
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/flannel/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 2eea08b92383..732051d8ec78 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -1,8 +1,10 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub }: +with lib; + buildGoPackage rec { name = "flannel-${version}"; - version = "0.5.5"; + version = "0.6.2"; rev = "v${version}"; goPackagePath = "github.com/coreos/flannel"; @@ -13,6 +15,14 @@ buildGoPackage rec { inherit rev; owner = "coreos"; repo = "flannel"; - sha256 = "19nrilcc41411rag2qm22vdna4kpqm933ry9m82wkd7sqzb50fpw"; + sha256 = "03l0zyv9ajda70zw7jgwlmilw26h849jbb9f4slbycphhvbmpvb9"; + }; + + meta = { + description = "Network fabric for containers, designed for Kubernetes"; + license = licenses.asl20; + homepage = https://github.com/coreos/flannel; + maintainers = with maintainers; [offline]; + platforms = with platforms; linux; }; } |