Merge pull request #140108 from figsoda/multus-cni

multus-cni: fix version ouput, clean up

authored by figsoda and committed by GitHub 2edf6851 8ca2ed7b

+8 -8
+8 -8
pkgs/applications/networking/cluster/multus-cni/default.nix
··· 1 - { lib, fetchFromGitHub, buildGoModule }: 2 3 buildGoModule rec { 4 pname = "multus-cni"; ··· 11 sha256 = "sha256-wG6SRts3+bmeMkfScyNorsBvRl/hxe+CUnL0rwfknpc="; 12 }; 13 14 - ldflags = let 15 - multus = "gopkg.in/intel/multus-cni.v3/pkg/multus"; 16 - commit = "f6298a3a294a79f9fbda0b8f175e521799d5f8d7"; 17 - in [ 18 - "-s" "-w" "-X ${multus}.version=v${version}" "-X ${multus}.commit=${commit}" 19 ]; 20 21 preInstall = '' 22 - mv $GOPATH/bin/cmd $GOPATH/bin/multus 23 ''; 24 25 vendorSha256 = null; ··· 28 doCheck = false; 29 30 meta = with lib; { 31 - description = "Multus CNI is a container network interface (CNI) plugin for Kubernetes that enables attaching multiple network interfaces to pods. "; 32 homepage = "https://github.com/k8snetworkplumbingwg/multus-cni"; 33 license = licenses.asl20; 34 platforms = platforms.linux; 35 maintainers = with maintainers; [ onixie ]; 36 }; 37 }
··· 1 + { lib, buildGoModule, fetchFromGitHub }: 2 3 buildGoModule rec { 4 pname = "multus-cni"; ··· 11 sha256 = "sha256-wG6SRts3+bmeMkfScyNorsBvRl/hxe+CUnL0rwfknpc="; 12 }; 13 14 + ldflags = [ 15 + "-s" 16 + "-w" 17 + "-X=gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.version=${version}" 18 ]; 19 20 preInstall = '' 21 + mv $GOPATH/bin/cmd $GOPATH/bin/multus 22 ''; 23 24 vendorSha256 = null; ··· 27 doCheck = false; 28 29 meta = with lib; { 30 + description = "Multus CNI is a container network interface (CNI) plugin for Kubernetes that enables attaching multiple network interfaces to pods"; 31 homepage = "https://github.com/k8snetworkplumbingwg/multus-cni"; 32 license = licenses.asl20; 33 platforms = platforms.linux; 34 maintainers = with maintainers; [ onixie ]; 35 + mainProgram = "multus"; 36 }; 37 }