From 15fbb8e90ab00a2df149da44db16522a936bfba7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 1 Jun 2019 02:01:33 -0500 Subject: [PATCH] cni: simplify now that default build is sufficient --- .../networking/cluster/cni/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index 14a0db5f8f1b..88dbd177da04 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -1,28 +1,17 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "cni-${version}"; + pname = "cni"; version = "0.7.0"; src = fetchFromGitHub { owner = "containernetworking"; - repo = "cni"; + repo = pname; rev = "v${version}"; sha256 = "15ad323dw44k82bfx9r8w5q2kn7jix60p9v4ciyzx2p5pip36wp8"; }; goPackagePath = "github.com/containernetworking/cni"; - - buildPhase = '' - cd "go/src/${goPackagePath}" - patchShebangs build.sh - ./build.sh - ''; - - installPhase = '' - install -Dm555 bin/cnitool $bin/bin/cnitool - ''; - meta = with stdenv.lib; { description = "Container Network Interface - networking for Linux containers"; license = licenses.asl20;