From d38485921a4f8187dd5ec145337db1ac4e3d7d06 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 22 Sep 2023 01:11:11 +0800 Subject: treewide: vendorSha256 -> vendorHash (#256514) --- pkgs/applications/networking/alpnpass/default.nix | 2 +- pkgs/applications/networking/brig/default.nix | 2 +- pkgs/applications/networking/browsers/bombadillo/default.nix | 2 +- pkgs/applications/networking/cluster/dnsname-cni/default.nix | 2 +- pkgs/applications/networking/cluster/k3s/1_24/default.nix | 4 ++-- pkgs/applications/networking/cluster/k3s/1_25/default.nix | 4 ++-- pkgs/applications/networking/cluster/k3s/builder.nix | 4 ++-- pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix | 2 +- .../applications/networking/instant-messengers/slack-term/default.nix | 2 +- pkgs/applications/networking/kubo-migrator/all-migrations.nix | 2 +- pkgs/applications/networking/kubo/default.nix | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) (limited to 'pkgs/applications/networking') diff --git a/pkgs/applications/networking/alpnpass/default.nix b/pkgs/applications/networking/alpnpass/default.nix index 1d24c8028770..81bdc29a54f3 100644 --- a/pkgs/applications/networking/alpnpass/default.nix +++ b/pkgs/applications/networking/alpnpass/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { hash = "sha256-hNZqGTV17rFSKLhZzNqH2E4SSb6Jhk7YQ4TN0HnE+9g="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Inspect the plaintext payload inside of proxied TLS connections"; diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix index d049ed4e3893..23370866e721 100644 --- a/pkgs/applications/networking/brig/default.nix +++ b/pkgs/applications/networking/brig/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "0gi39jmnzqrgj146yw8lcmgmvzx7ii1dgw4iqig7kx8c0jiqi600"; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/browsers/bombadillo/default.nix b/pkgs/applications/networking/browsers/bombadillo/default.nix index 983f8ac1ee39..96a968a50fe9 100644 --- a/pkgs/applications/networking/browsers/bombadillo/default.nix +++ b/pkgs/applications/networking/browsers/bombadillo/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = null; + vendorHash = null; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/networking/cluster/dnsname-cni/default.nix b/pkgs/applications/networking/cluster/dnsname-cni/default.nix index 3a543f40dd49..3b6edd575297 100644 --- a/pkgs/applications/networking/cluster/dnsname-cni/default.nix +++ b/pkgs/applications/networking/cluster/dnsname-cni/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { wrapProgram $out/bin/dnsname --prefix PATH : ${lib.makeBinPath [ dnsmasq ]} ''; - vendorSha256 = null; + vendorHash = null; subPackages = [ "plugins/meta/dnsname" ]; doCheck = false; # NOTE: requires root privileges diff --git a/pkgs/applications/networking/cluster/k3s/1_24/default.nix b/pkgs/applications/networking/cluster/k3s/1_24/default.nix index 6f7644dd543b..9fed570ffce2 100644 --- a/pkgs/applications/networking/cluster/k3s/1_24/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_24/default.nix @@ -117,7 +117,7 @@ let k3sCNIPlugins = buildGoModule rec { pname = "k3s-cni-plugins"; version = k3sCNIVersion; - vendorSha256 = null; + vendorHash = null; subPackages = [ "." ]; @@ -210,7 +210,7 @@ let rev = "v${containerdVersion}"; sha256 = containerdSha256; }; - vendorSha256 = null; + vendorHash = null; buildInputs = [ btrfs-progs ]; subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; ldflags = versionldflags; diff --git a/pkgs/applications/networking/cluster/k3s/1_25/default.nix b/pkgs/applications/networking/cluster/k3s/1_25/default.nix index 47c3b5886c59..49eb5fcadb1f 100644 --- a/pkgs/applications/networking/cluster/k3s/1_25/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_25/default.nix @@ -116,7 +116,7 @@ let k3sCNIPlugins = buildGoModule rec { pname = "k3s-cni-plugins"; version = k3sCNIVersion; - vendorSha256 = null; + vendorHash = null; subPackages = [ "." ]; @@ -208,7 +208,7 @@ let rev = "v${containerdVersion}"; sha256 = containerdSha256; }; - vendorSha256 = null; + vendorHash = null; buildInputs = [ btrfs-progs ]; subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; ldflags = versionldflags; diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 9605ff9f9476..c9d3e0a998a0 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -129,7 +129,7 @@ let k3sCNIPlugins = buildGoModule rec { pname = "k3s-cni-plugins"; version = k3sCNIVersion; - vendorSha256 = null; + vendorHash = null; subPackages = [ "." ]; @@ -226,7 +226,7 @@ let rev = "v${containerdVersion}"; sha256 = containerdSha256; }; - vendorSha256 = null; + vendorHash = null; buildInputs = [ btrfs-progs ]; subPackages = [ "cmd/containerd-shim-runc-v2" ]; ldflags = versionldflags; diff --git a/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix b/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix index 54f99f91c8a2..f17c2b2ad1ab 100644 --- a/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-alU1c1ppn4cQi582kcA/PIAJJt73i3uG02cQvSYij1A="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "This plugin evicts the given pod and is useful for testing pod disruption budget rules"; diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix index 99b8b4563d23..2750336cf1d1 100644 --- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1fbq7bdhy70hlkklppimgdjamnk0v059pg73xm9ax1f4616ki1m6"; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Slack client for your terminal"; diff --git a/pkgs/applications/networking/kubo-migrator/all-migrations.nix b/pkgs/applications/networking/kubo-migrator/all-migrations.nix index 39a9f141c7a4..8cdeb3efb8ea 100644 --- a/pkgs/applications/networking/kubo-migrator/all-migrations.nix +++ b/pkgs/applications/networking/kubo-migrator/all-migrations.nix @@ -14,7 +14,7 @@ let inherit pname version; inherit (kubo-migrator-unwrapped) src; sourceRoot = "${kubo-migrator-unwrapped.src.name}/${pname}"; - vendorSha256 = null; + vendorHash = null; # Fix build on Go 1.17 and later: panic: qtls.ClientHelloInfo doesn't match # See https://github.com/ipfs/fs-repo-migrations/pull/163 postPatch = lib.optionalString (lib.elem pname [ "fs-repo-10-to-11" "fs-repo-11-to-12" ]) '' diff --git a/pkgs/applications/networking/kubo/default.nix b/pkgs/applications/networking/kubo/default.nix index dccd827b1295..793f8b8d8613 100644 --- a/pkgs/applications/networking/kubo/default.nix +++ b/pkgs/applications/networking/kubo/default.nix @@ -27,7 +27,7 @@ buildGoModule rec { passthru.tests.kubo = nixosTests.kubo; - vendorSha256 = null; + vendorHash = null; outputs = [ "out" "systemd_unit" "systemd_unit_hardened" ]; -- cgit 1.4.1