diff options
author | William A. Kennington III <william@wkennington.com> | 2015-09-02 17:05:42 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-09-02 17:05:42 -0700 |
commit | 5b134427473e1e6eb4bedc579ffe968efbb88352 (patch) | |
tree | 6e0827fee7bf65ebba8fc9d7307fbf5ef17bdda4 /pkgs | |
parent | 81c9095d90df9338928f26525b1bddc512ddd46c (diff) | |
download | nixlib-5b134427473e1e6eb4bedc579ffe968efbb88352.tar nixlib-5b134427473e1e6eb4bedc579ffe968efbb88352.tar.gz nixlib-5b134427473e1e6eb4bedc579ffe968efbb88352.tar.bz2 nixlib-5b134427473e1e6eb4bedc579ffe968efbb88352.tar.lz nixlib-5b134427473e1e6eb4bedc579ffe968efbb88352.tar.xz nixlib-5b134427473e1e6eb4bedc579ffe968efbb88352.tar.zst nixlib-5b134427473e1e6eb4bedc579ffe968efbb88352.zip |
flannel: Migrate to go-packages
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/networking/flannel/default.nix | 25 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/go-packages.nix | 7 |
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}"; |