git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #140108 from figsoda/multus-cni

multus-cni: fix version ouput, clean up

commit2edf68513fcc329d391a6268cebc77043c9f341c authorfigsoda <figsoda@pm.me> dateSat 2 Oct 2021, 12:44 (5 years ago) parent8ca2ed7af9b4c3
1 file changed+8−8
pkgs/applications/networking/cluster/multus-cni/default.nix+8−8
pkgs/applications/networking/cluster/multus-cni/default.nix+8−8
@@ -1,4 +1,4 @@
1−{ lib, fetchFromGitHub, buildGoModule }:
1+{ lib, buildGoModule, fetchFromGitHub }:
22
33buildGoModule rec {
44 pname = "multus-cni";
@@ -11,15 +11,14 @@ buildGoModule rec {
1111 sha256 = "sha256-wG6SRts3+bmeMkfScyNorsBvRl/hxe+CUnL0rwfknpc=";
1212 };
1313
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}"
14+ ldflags = [
15+ "-s"
16+ "-w"
17+ "-X=gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.version=${version}"
1918 ];
2019
2120 preInstall = ''
22− mv $GOPATH/bin/cmd $GOPATH/bin/multus
21+ mv $GOPATH/bin/cmd $GOPATH/bin/multus
2322 '';
2423
2524 vendorSha256 = null;
@@ -28,10 +27,11 @@ buildGoModule rec {
2827 doCheck = false;
2928
3029 meta = with lib; {
31− description = "Multus CNI is a container network interface (CNI) plugin for Kubernetes that enables attaching multiple network interfaces to pods. ";
30+ description = "Multus CNI is a container network interface (CNI) plugin for Kubernetes that enables attaching multiple network interfaces to pods";
3231 homepage = "https://github.com/k8snetworkplumbingwg/multus-cni";
3332 license = licenses.asl20;
3433 platforms = platforms.linux;
3534 maintainers = with maintainers; [ onixie ];
35+ mainProgram = "multus";
3636 };
3737}