JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #84384 from euank/pkg/k3s-update

Browse Source 
k3s: remove extra buildInputs
This commit is contained in:
Florian Klink 2020-04-07 13:41:55 +02:00 committed by GitHub
commit 718305392f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/networking/cluster/k3s/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, makeWrapper, socat, iptables, iproute, bridge-utils { stdenv, lib, makeWrapper, socat, iptables, iproute, bridge-utils
, conntrack-tools, buildGoPackage, git, runc, libseccomp, pkgconfig , conntrack-tools, buildGoPackage, git, runc, libseccomp, pkgconfig
, autoPatchelfHook, breakpointHook, ethtool, utillinux, ipset , ethtool, utillinux, ipset, fetchFromGitHub, fetchurl, fetchzip
, fetchFromGitHub, fetchurl, fetchzip, fetchgit , fetchgit
}: }:
with lib; with lib;
@ -64,10 +64,10 @@ let
}; };
meta = { meta = {
description = "k3s-cni-plugins"; description = "CNI plugins, as patched by rancher for k3s";
license = licenses.asl20; license = licenses.asl20;
homepage = https://k3s.io; homepage = https://k3s.io;
maintainers = []; maintainers = [ maintainers.euank ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
}; };
@ -76,7 +76,7 @@ let
k3sRepo = fetchgit { k3sRepo = fetchgit {
url = "https://github.com/rancher/k3s"; url = "https://github.com/rancher/k3s";
rev = "v${k3sVersion}"; rev = "v${k3sVersion}";
leaveDotGit = true; # for version / build date below leaveDotGit = true; # ./scripts/version.sh depends on git
sha256 = "0qahyc0mf9glxj49va6d20mcncqg4svfic2iz8b1lqid5c4g68mm"; sha256 = "0qahyc0mf9glxj49va6d20mcncqg4svfic2iz8b1lqid5c4g68mm";
}; };
# Stage 1 of the k3s build: # Stage 1 of the k3s build:
@ -110,8 +110,8 @@ let
patches = [ ./patches/00-k3s.patch ]; patches = [ ./patches/00-k3s.patch ];
nativeBuildInputs = [ pkgconfig autoPatchelfHook breakpointHook ]; nativeBuildInputs = [ git pkgconfig ];
buildInputs = [ git runc libseccomp ]; buildInputs = [ libseccomp ];
buildPhase = '' buildPhase = ''
pushd go/src/${goPackagePath} pushd go/src/${goPackagePath}
@ -136,7 +136,7 @@ let
description = "The various binaries that get packaged into the final k3s binary."; description = "The various binaries that get packaged into the final k3s binary.";
license = licenses.asl20; license = licenses.asl20;
homepage = https://k3s.io; homepage = https://k3s.io;
maintainers = []; maintainers = [ maintainers.euank ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
}; };
@ -150,8 +150,8 @@ let
patches = [ ./patches/00-k3s.patch ]; patches = [ ./patches/00-k3s.patch ];
nativeBuildInputs = [ pkgconfig autoPatchelfHook breakpointHook ]; nativeBuildInputs = [ git pkgconfig ];
buildInputs = [ git k3sBuildStage1 ]; buildInputs = [ k3sBuildStage1 k3sPlugins runc ];
# In order to build the thick k3s binary (which is what # In order to build the thick k3s binary (which is what
# ./scripts/package-cli does), we need to get all the binaries that script # ./scripts/package-cli does), we need to get all the binaries that script
@ -191,7 +191,7 @@ let
description = "The k3s go binary which is used by the final wrapped output below."; description = "The k3s go binary which is used by the final wrapped output below.";
license = licenses.asl20; license = licenses.asl20;
homepage = https://k3s.io; homepage = https://k3s.io;
maintainers = []; maintainers = [ maintainers.euank ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
}; };
@ -229,7 +229,7 @@ stdenv.mkDerivation rec {
description = "A lightweight Kubernetes distribution."; description = "A lightweight Kubernetes distribution.";
license = licenses.asl20; license = licenses.asl20;
homepage = https://k3s.io; homepage = https://k3s.io;
maintainers = with maintainers; [ euank ]; maintainers = [ maintainers.euank ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }