diff options
| author | Charles Strahan <charles@cstrahan.com> | 2018-04-04 19:14:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-04 19:14:48 -0400 |
| commit | 5c066e2bba13c8272a8fa477b82c09ff484967e5 (patch) | |
| tree | 4dcb215cbe0a9e06fff0681c39b6f614d82e53f0 /pkgs/applications/networking | |
| parent | cae43fb1dd6518572bc0022c6636bd86898683df (diff) | |
| parent | 709b6f664e472ae2075bbee83bfb1dd1ba95e0e7 (diff) | |
| download | nixlib-5c066e2bba13c8272a8fa477b82c09ff484967e5.tar nixlib-5c066e2bba13c8272a8fa477b82c09ff484967e5.tar.gz nixlib-5c066e2bba13c8272a8fa477b82c09ff484967e5.tar.bz2 nixlib-5c066e2bba13c8272a8fa477b82c09ff484967e5.tar.lz nixlib-5c066e2bba13c8272a8fa477b82c09ff484967e5.tar.xz nixlib-5c066e2bba13c8272a8fa477b82c09ff484967e5.tar.zst nixlib-5c066e2bba13c8272a8fa477b82c09ff484967e5.zip | |
Merge pull request #37218 from cstrahan/kube-test-fix
nixos: kubernetes fixes
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/cluster/cni/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/networking/cluster/cni/plugins.nix | 33 |
2 files changed, 34 insertions, 4 deletions
diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index 3ce056c1e11e..0f232772f076 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -13,17 +13,14 @@ stdenv.mkDerivation rec { buildInputs = [ go ]; - outputs = ["out" "plugins"]; - buildPhase = '' patchShebangs build.sh ./build.sh ''; installPhase = '' - mkdir -p $out/bin $plugins + mkdir -p $out/bin mv bin/cnitool $out/bin - mv bin/* $plugins/ ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix new file mode 100644 index 000000000000..9f6b6fcb7e11 --- /dev/null +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, go }: + +stdenv.mkDerivation rec { + name = "cni-plugins-${version}"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "containernetworking"; + repo = "plugins"; + rev = "v${version}"; + sha256 = "0m885v76azs7lrk6m6n53rwh0xadwvdcr90h0l3bxpdv87sj2mnf"; + }; + + buildInputs = [ go ]; + + buildPhase = '' + patchShebangs build.sh + ./build.sh + ''; + + installPhase = '' + mkdir -p $out/bin + mv bin/* $out/bin + ''; + + meta = with lib; { + description = "Some standard networking plugins, maintained by the CNI team"; + homepage = https://github.com/containernetworking/plugins; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ cstrahan ]; + }; +} |