diff options
| author | superherointj <5861043+superherointj@users.noreply.github.com> | 2024-03-15 11:02:19 -0300 |
|---|---|---|
| committer | superherointj <5861043+superherointj@users.noreply.github.com> | 2024-03-15 11:02:52 -0300 |
| commit | eb170ecf6ee535402a76c4d58f6a9d509ed2e62f (patch) | |
| tree | 357fb66f41416810b744d10ecc5eaf8eba80202d /pkgs | |
| parent | 551ef9c87b5cf04c7b52fd1a2b912cdeb1aff3e0 (diff) | |
| download | nixlib-eb170ecf6ee535402a76c4d58f6a9d509ed2e62f.tar nixlib-eb170ecf6ee535402a76c4d58f6a9d509ed2e62f.tar.gz nixlib-eb170ecf6ee535402a76c4d58f6a9d509ed2e62f.tar.bz2 nixlib-eb170ecf6ee535402a76c4d58f6a9d509ed2e62f.tar.lz nixlib-eb170ecf6ee535402a76c4d58f6a9d509ed2e62f.tar.xz nixlib-eb170ecf6ee535402a76c4d58f6a9d509ed2e62f.tar.zst nixlib-eb170ecf6ee535402a76c4d58f6a9d509ed2e62f.zip | |
k3s: remove restriction on runtime checking of golang version
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/cluster/k3s/builder.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 2173748cd2df..01659d9236c8 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -187,13 +187,12 @@ let patches = # Disable: Add runtime checking of golang version - lib.optional (lib.versionAtLeast k3sVersion "1.28") - (fetchpatch { - # https://github.com/k3s-io/k3s/pull/9054 - url = "https://github.com/k3s-io/k3s/commit/b297996b9252b02e56e9425f55f6becbf6bb7832.patch"; - hash = "sha256-xBOY2jnLhT9dtVKtq26V9QUnuX1q6E/9UcO9IaU719U="; - revert = true; - }); + (fetchpatch { + # https://github.com/k3s-io/k3s/pull/9054 + url = "https://github.com/k3s-io/k3s/commit/b297996b9252b02e56e9425f55f6becbf6bb7832.patch"; + hash = "sha256-xBOY2jnLhT9dtVKtq26V9QUnuX1q6E/9UcO9IaU719U="; + revert = true; + }); nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp sqlite.dev ]; |