Merge pull request #140108 from figsoda/multus-cni
multus-cni: fix version ouput, clean up
This commit is contained in:
commit
2edf68513f
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "multus-cni";
|
||||
|
@ -11,15 +11,14 @@ buildGoModule rec {
|
|||
sha256 = "sha256-wG6SRts3+bmeMkfScyNorsBvRl/hxe+CUnL0rwfknpc=";
|
||||
};
|
||||
|
||||
ldflags = let
|
||||
multus = "gopkg.in/intel/multus-cni.v3/pkg/multus";
|
||||
commit = "f6298a3a294a79f9fbda0b8f175e521799d5f8d7";
|
||||
in [
|
||||
"-s" "-w" "-X ${multus}.version=v${version}" "-X ${multus}.commit=${commit}"
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.version=${version}"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
mv $GOPATH/bin/cmd $GOPATH/bin/multus
|
||||
mv $GOPATH/bin/cmd $GOPATH/bin/multus
|
||||
'';
|
||||
|
||||
vendorSha256 = null;
|
||||
|
@ -28,10 +27,11 @@ buildGoModule rec {
|
|||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multus CNI is a container network interface (CNI) plugin for Kubernetes that enables attaching multiple network interfaces to pods. ";
|
||||
description = "Multus CNI is a container network interface (CNI) plugin for Kubernetes that enables attaching multiple network interfaces to pods";
|
||||
homepage = "https://github.com/k8snetworkplumbingwg/multus-cni";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ onixie ];
|
||||
mainProgram = "multus";
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue