diff options
| author | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-03 13:17:53 +0200 |
|---|---|---|
| committer | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-09 11:21:30 +0200 |
| commit | e5b9d23de7c4687fc0356c14cf5105d1cc809178 (patch) | |
| tree | 07bf0a41ea8b8abb9c96f0bc82886ad5597fcbec /pkgs | |
| parent | 387246080b2cd9675d7fcdab3ad528a4048842b5 (diff) | |
| download | nixlib-e5b9d23de7c4687fc0356c14cf5105d1cc809178.tar nixlib-e5b9d23de7c4687fc0356c14cf5105d1cc809178.tar.gz nixlib-e5b9d23de7c4687fc0356c14cf5105d1cc809178.tar.bz2 nixlib-e5b9d23de7c4687fc0356c14cf5105d1cc809178.tar.lz nixlib-e5b9d23de7c4687fc0356c14cf5105d1cc809178.tar.xz nixlib-e5b9d23de7c4687fc0356c14cf5105d1cc809178.tar.zst nixlib-e5b9d23de7c4687fc0356c14cf5105d1cc809178.zip | |
flannel: extracted from goPackages
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/flannel/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/go-packages.nix | 7 |
3 files changed, 19 insertions, 8 deletions
diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix new file mode 100644 index 000000000000..be2f10b3a35e --- /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 bbb0b59e3e07..f473461b8b11 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 81db5296e9fa..f056b5273a0e 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}"; |