diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix | |
parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix b/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix index c9d3e0a998a0..a914cf87102e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix @@ -5,7 +5,7 @@ lib: # commit hash k3sCommit, k3sRepoSha256 ? lib.fakeHash, - k3sVendorSha256 ? lib.fakeHash, + k3sVendorHash ? lib.fakeHash, # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 k3sRootVersion, k3sRootSha256 ? lib.fakeHash, @@ -182,7 +182,7 @@ let version = k3sVersion; src = k3sRepo; - vendorSha256 = k3sVendorSha256; + vendorHash = k3sVendorHash; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp sqlite.dev ]; @@ -238,7 +238,7 @@ buildGoModule rec { tags = [ "libsqlite3" "linux" "ctrd" ]; src = k3sRepo; - vendorSha256 = k3sVendorSha256; + vendorHash = k3sVendorHash; postPatch = '' # Nix prefers dynamically linked binaries over static binary. @@ -296,7 +296,7 @@ buildGoModule rec { # Specifically, it has a 'go generate' which runs part of the package. See # this comment: # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 - # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. + # So, why do we use buildGoModule at all? For the `vendorHash` / `go mod download` stuff primarily. buildPhase = '' patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload |