k3s: remove extra buildInputs
In the intial version of this package, I missed a few inputs that weren't needed including a debug hook.
This commit is contained in:
parent
08c7b8187f
commit
83f827cba7
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, makeWrapper, socat, iptables, iproute, bridge-utils
|
||||
, conntrack-tools, buildGoPackage, git, runc, libseccomp, pkgconfig
|
||||
, autoPatchelfHook, breakpointHook, ethtool, utillinux, ipset
|
||||
, fetchFromGitHub, fetchurl, fetchzip, fetchgit
|
||||
, ethtool, utillinux, ipset, fetchFromGitHub, fetchurl, fetchzip
|
||||
, fetchgit
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
@ -34,6 +34,7 @@ let
|
|||
url = "https://kubernetes-charts.storage.googleapis.com/traefik-${traefikChartVersion}.tgz";
|
||||
sha256 = "1aqpzgjlvqhil0g3angz94zd4xbl4iq0qmpjcy5aq1xv9qciwdi9";
|
||||
};
|
||||
pkgMaintainers = [ maintainers.euank ];
|
||||
# so, k3s is a complicated thing to package
|
||||
# This derivation attempts to avoid including any random binaries from the
|
||||
# internet. k3s-root is _mostly_ binaries built to be bundled in k3s (which
|
||||
|
@ -64,10 +65,10 @@ let
|
|||
};
|
||||
|
||||
meta = {
|
||||
description = "k3s-cni-plugins";
|
||||
description = "CNI plugins, as patched by rancher for k3s";
|
||||
license = licenses.asl20;
|
||||
homepage = https://k3s.io;
|
||||
maintainers = [];
|
||||
maintainers = pkgMaintainers;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
|
@ -76,7 +77,7 @@ let
|
|||
k3sRepo = fetchgit {
|
||||
url = "https://github.com/rancher/k3s";
|
||||
rev = "v${k3sVersion}";
|
||||
leaveDotGit = true; # for version / build date below
|
||||
leaveDotGit = true; # ./scripts/version.sh depends on git
|
||||
sha256 = "0qahyc0mf9glxj49va6d20mcncqg4svfic2iz8b1lqid5c4g68mm";
|
||||
};
|
||||
# Stage 1 of the k3s build:
|
||||
|
@ -110,8 +111,8 @@ let
|
|||
|
||||
patches = [ ./patches/00-k3s.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoPatchelfHook breakpointHook ];
|
||||
buildInputs = [ git runc libseccomp ];
|
||||
nativeBuildInputs = [ git pkgconfig ];
|
||||
buildInputs = [ libseccomp ];
|
||||
|
||||
buildPhase = ''
|
||||
pushd go/src/${goPackagePath}
|
||||
|
@ -136,7 +137,7 @@ let
|
|||
description = "The various binaries that get packaged into the final k3s binary.";
|
||||
license = licenses.asl20;
|
||||
homepage = https://k3s.io;
|
||||
maintainers = [];
|
||||
maintainers = pkgMaintainers;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
|
@ -150,8 +151,8 @@ let
|
|||
|
||||
patches = [ ./patches/00-k3s.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoPatchelfHook breakpointHook ];
|
||||
buildInputs = [ git k3sBuildStage1 ];
|
||||
nativeBuildInputs = [ git pkgconfig ];
|
||||
buildInputs = [ k3sBuildStage1 k3sPlugins runc ];
|
||||
|
||||
# In order to build the thick k3s binary (which is what
|
||||
# ./scripts/package-cli does), we need to get all the binaries that script
|
||||
|
@ -191,7 +192,7 @@ let
|
|||
description = "The k3s go binary which is used by the final wrapped output below.";
|
||||
license = licenses.asl20;
|
||||
homepage = https://k3s.io;
|
||||
maintainers = [];
|
||||
maintainers = pkgMaintainers;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
|
@ -229,7 +230,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A lightweight Kubernetes distribution.";
|
||||
license = licenses.asl20;
|
||||
homepage = https://k3s.io;
|
||||
maintainers = with maintainers; [ euank ];
|
||||
maintainers = pkgMaintainers;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue