From 8eaac7704856797ea1b45876690a20ee39c820a2 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 8 Apr 2021 14:04:04 -0300 Subject: [PATCH] k3s: 1.20.4+k3s1 -> 1.20.5+k3s1 Extra: @r-rmcgibbo bot requested 'makeWrapper' to be moved from buildInputs to nativeBuildInputs. --- pkgs/applications/networking/cluster/k3s/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 285e1db536d..fd5b2fff8b9 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -44,7 +44,7 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.20.4+k3s1"; # k3s git tag + k3sVersion = "1.20.5+k3s1"; # k3s git tag traefikChartVersion = "1.81.0"; # taken from ./scripts/download at the above k3s tag k3sRootVersion = "0.8.1"; # taken from ./scripts/download at the above k3s tag k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at the above k3s tag @@ -79,7 +79,7 @@ let owner = "rancher"; repo = "plugins"; rev = "v${version}"; - sha256 = "13kx9msn5y9rw8v1p717wx0wbjqln59g6y3qfb1760aiwknva35q"; + sha256 = "sha256-uAy17eRRAXPCcnh481KxFMvFQecnnBs24jn5YnVNfY4="; }; meta = { @@ -96,7 +96,7 @@ let url = "https://github.com/k3s-io/k3s"; rev = "v${k3sVersion}"; leaveDotGit = true; # ./scripts/version.sh depends on git - sha256 = "0rmn3nh8a94axv6lb2xjnn3gpq0scnvj69bvcs74azvw62fvq016"; + sha256 = "sha256-7RAZkSTh15BEZ3p6u2xE9vd5fpy4KBYrl2TjtpIiStM="; }; # Stage 1 of the k3s build: # Let's talk about how k3s is structured. @@ -243,16 +243,17 @@ stdenv.mkDerivation rec { iproute2 bridge-utils ethtool - util-linux + util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 ipset conntrack-tools ]; buildInputs = [ k3sBin - makeWrapper ] ++ k3sRuntimeDeps; + nativeBuildInputs = [ makeWrapper ]; + unpackPhase = "true"; # And, one final derivation (you thought the last one was it, right?)