pyrox.dev
Merge pull request #140108 from figsoda/multus-cni
multus-cni: fix version ouput, clean up
+8
-8
pkgs/applications/networking/cluster/multus-cni/default.nix
+8
-8
pkgs/applications/networking/cluster/multus-cni/default.nix
···
1
-
{ lib, fetchFromGitHub, buildGoModule }:
1
+
{ lib, buildGoModule, fetchFromGitHub }:
2
2
3
3
buildGoModule rec {
4
4
pname = "multus-cni";
···
11
11
sha256 = "sha256-wG6SRts3+bmeMkfScyNorsBvRl/hxe+CUnL0rwfknpc=";
12
12
};
13
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}"
14
+
ldflags = [
15
+
"-s"
16
+
"-w"
17
+
"-X=gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.version=${version}"
19
18
];
20
19
21
20
preInstall = ''
22
-
mv $GOPATH/bin/cmd $GOPATH/bin/multus
21
+
mv $GOPATH/bin/cmd $GOPATH/bin/multus
23
22
'';
24
23
25
24
vendorSha256 = null;
···
28
27
doCheck = false;
29
28
30
29
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";
32
31
homepage = "https://github.com/k8snetworkplumbingwg/multus-cni";
33
32
license = licenses.asl20;
34
33
platforms = platforms.linux;
35
34
maintainers = with maintainers; [ onixie ];
35
+
mainProgram = "multus";
36
36
};
37
37
}