From ff323ed355ff62795c79c3fed04c4ee06c641898 Mon Sep 17 00:00:00 2001 From: Fabián Heredia Montiel Date: Tue, 12 Sep 2023 22:44:46 -0600 Subject: treewide: vendorSha256 → vendorHash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit via: `find pkgs/ -type f -exec sed -i 's/vendorSha256 = "sha256/vendorHash = "sha256/' {};` --- pkgs/applications/networking/bee/bee.nix | 8 ++++---- pkgs/applications/networking/browsers/amfora/default.nix | 2 +- .../applications/networking/cluster/assign-lb-ip/default.nix | 2 +- pkgs/applications/networking/cluster/atmos/default.nix | 2 +- pkgs/applications/networking/cluster/cmctl/default.nix | 2 +- pkgs/applications/networking/cluster/cni/default.nix | 2 +- pkgs/applications/networking/cluster/fetchit/default.nix | 2 +- pkgs/applications/networking/cluster/fluxcd/default.nix | 2 +- pkgs/applications/networking/cluster/fluxctl/default.nix | 2 +- pkgs/applications/networking/cluster/hashi-up/default.nix | 2 +- pkgs/applications/networking/cluster/jx/default.nix | 2 +- pkgs/applications/networking/cluster/k0sctl/default.nix | 2 +- pkgs/applications/networking/cluster/kconf/default.nix | 2 +- pkgs/applications/networking/cluster/kubecolor/default.nix | 2 +- .../networking/cluster/kubectl-doctor/default.nix | 2 +- .../networking/cluster/kubectl-klock/default.nix | 2 +- .../applications/networking/cluster/kubectl-ktop/default.nix | 2 +- .../applications/networking/cluster/kubectl-tree/default.nix | 2 +- pkgs/applications/networking/cluster/kubent/default.nix | 2 +- pkgs/applications/networking/cluster/kubeval/default.nix | 2 +- pkgs/applications/networking/cluster/levant/default.nix | 2 +- pkgs/applications/networking/cluster/linkerd/default.nix | 2 +- pkgs/applications/networking/cluster/linkerd/edge.nix | 2 +- pkgs/applications/networking/cluster/linkerd/generic.nix | 4 ++-- .../networking/cluster/nomad-autoscaler/default.nix | 2 +- pkgs/applications/networking/cluster/nomad-pack/default.nix | 2 +- pkgs/applications/networking/cluster/nomad/default.nix | 12 ++++++------ .../cluster/octant/plugins/starboard-octant-plugin.nix | 2 +- pkgs/applications/networking/cluster/qbec/default.nix | 2 +- pkgs/applications/networking/cluster/sonobuoy/default.nix | 2 +- pkgs/applications/networking/cluster/temporalite/default.nix | 2 +- .../networking/cluster/terraform-docs/default.nix | 2 +- .../networking/cluster/terraform-inventory/default.nix | 2 +- pkgs/applications/networking/cluster/tgswitch/default.nix | 2 +- pkgs/applications/networking/feedreaders/photon/default.nix | 2 +- pkgs/applications/networking/gmailctl/default.nix | 2 +- pkgs/applications/networking/hyprspace/default.nix | 2 +- .../networking/instant-messengers/go-neb/default.nix | 2 +- .../networking/instant-messengers/gomuks/default.nix | 2 +- .../networking/instant-messengers/mm/default.nix | 2 +- pkgs/applications/networking/irc/senpai/default.nix | 2 +- pkgs/applications/networking/p2p/magnetico/default.nix | 2 +- pkgs/applications/networking/peroxide/default.nix | 2 +- pkgs/applications/networking/r53-ddns/default.nix | 2 +- pkgs/applications/networking/stc-cli/default.nix | 2 +- pkgs/applications/networking/tcping-go/default.nix | 2 +- pkgs/applications/networking/websocketd/default.nix | 2 +- 47 files changed, 56 insertions(+), 56 deletions(-) (limited to 'pkgs/applications/networking') diff --git a/pkgs/applications/networking/bee/bee.nix b/pkgs/applications/networking/bee/bee.nix index fd6177c4647da..f2fe81e8379f8 100644 --- a/pkgs/applications/networking/bee/bee.nix +++ b/pkgs/applications/networking/bee/bee.nix @@ -9,14 +9,14 @@ let rev = "824636a2c2629c329ab10275cef6a0b7395343ad"; goVersionString = "g" + builtins.substring 0 7 rev; # this seems to be some kind of standard of git describe... sha256 = "0ly1yqjq29arbak8lchdradf39l5bmxpbfir6ljjc7nyqdxz0sxg"; - vendorSha256 = "sha256-w5ZijaK8Adt1ZHPMmXqRWq0v0jdprRKRu03rePtZLXA="; + vendorHash = "sha256-w5ZijaK8Adt1ZHPMmXqRWq0v0jdprRKRu03rePtZLXA="; }; release = rec { pname = "bee"; version = "0.5.0"; rev = "refs/tags/v${version}"; sha256 = "sha256-3Oy9RhgMPRFjUs3Dj8XUhAqoxx5BTi32OiK4Y8YEG2Q="; - vendorSha256 = "sha256-w5ZijaK8Adt1ZHPMmXqRWq0v0jdprRKRu03rePtZLXA="; + vendorHash = "sha256-w5ZijaK8Adt1ZHPMmXqRWq0v0jdprRKRu03rePtZLXA="; }; "0.5.0" = release; "0.4.1" = rec { @@ -24,14 +24,14 @@ let version = "0.4.1"; rev = "refs/tags/v${version}"; sha256 = "1bmgbav52pcb5p7cgq9756512fzfqhjybyr0dv538plkqx47mpv7"; - vendorSha256 = "0j393va4jrg9q3wlc9mgkbpgnn2w2s3k2hcn8phzj8d5fl4n4v2h"; + vendorHash = "sha256-UGxiCXWlIfnhRZZBMYcWXFj77pqvJkb5wOllSdQeaUg="; }; }.${version}; in buildGoModule { - inherit (versionSpec) pname version vendorSha256; + inherit (versionSpec) pname version vendorHash; src = fetchFromGitHub { owner = "ethersphere"; diff --git a/pkgs/applications/networking/browsers/amfora/default.nix b/pkgs/applications/networking/browsers/amfora/default.nix index 0422ea5976757..7fd29f1a39429 100644 --- a/pkgs/applications/networking/browsers/amfora/default.nix +++ b/pkgs/applications/networking/browsers/amfora/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-93xNzYPoy8VsbY2JyvDXt4J/gIbI2wzrCD83JUaP150="; }; - vendorSha256 = "sha256-XtiGj2Tr6sSBduIjBspeZpYaSTd6x6EVf3VEVMXDAD0="; + vendorHash = "sha256-XtiGj2Tr6sSBduIjBspeZpYaSTd6x6EVf3VEVMXDAD0="; postInstall = lib.optionalString (!stdenv.isDarwin) '' sed -i "s:amfora:$out/bin/amfora:" amfora.desktop diff --git a/pkgs/applications/networking/cluster/assign-lb-ip/default.nix b/pkgs/applications/networking/cluster/assign-lb-ip/default.nix index dadb679cd55c9..7b85443db3f04 100644 --- a/pkgs/applications/networking/cluster/assign-lb-ip/default.nix +++ b/pkgs/applications/networking/cluster/assign-lb-ip/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-Sfi58wcX61HNCmlDoparTqnfsuxu6barSnV0uYlC+ng="; }; - vendorSha256 = "sha256-N78a0pjs2Bg2Bslk/I0ntL88ui4IkRGenL0Pn17Lt/w="; + vendorHash = "sha256-N78a0pjs2Bg2Bslk/I0ntL88ui4IkRGenL0Pn17Lt/w="; meta = with lib; { description = "Assigns loadBalancerIP address to a Kubernetes service for testing purposes"; diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index c1e4df0a3893b..e3bd97e91dad2 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-6NUuKU8KQBfHE6fcN3a9lBcUk7p5I9SuY9g+qJxGXmU="; }; - vendorSha256 = "sha256-vZwADD7fi9ZvJby9Ijdeueid8jRfUyyj6Nu4kgkO5Wo="; + vendorHash = "sha256-vZwADD7fi9ZvJby9Ijdeueid8jRfUyyj6Nu4kgkO5Wo="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index ab4789741fbf4..ac5273242472f 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "128s5vd4hp5mr0rnb21grzmijzx0ibpv71as36dcgw7z4v3gq7lx"; }; - vendorSha256 = "sha256-+r0QpD97r6dokUr07Qjb9kvoK+oz2rvml0cIebtYuHg="; + vendorHash = "sha256-+r0QpD97r6dokUr07Qjb9kvoK+oz2rvml0cIebtYuHg="; subPackages = [ "cmd/ctl" ]; diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index 3dcf284021ed0..33688148985f9 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-g7fVeoqquxPa17AfTu6wnB6PQJDluJ21T3ETrcvWtWg="; }; - vendorSha256 = "sha256-nH/myA/KdTeFXvmBymXITyx5fdCGnWRn6hNRinXc3/s="; + vendorHash = "sha256-nH/myA/KdTeFXvmBymXITyx5fdCGnWRn6hNRinXc3/s="; subPackages = [ "./cnitool" diff --git a/pkgs/applications/networking/cluster/fetchit/default.nix b/pkgs/applications/networking/cluster/fetchit/default.nix index b4e7e66d7dcee..cadc331a9605d 100644 --- a/pkgs/applications/networking/cluster/fetchit/default.nix +++ b/pkgs/applications/networking/cluster/fetchit/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "sha256-hxS/+/fbYOpMJ5VfvvG5l7wWKBUUR22rYn9X79DzUUk="; }; - vendorSha256 = "sha256-SyPd8P9s8R2YbGEPqFeztF98W1QyGSBumtirSdpm8VI="; + vendorHash = "sha256-SyPd8P9s8R2YbGEPqFeztF98W1QyGSBumtirSdpm8VI="; subPackages = [ "cmd/fetchit" ]; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 50ea8c1689801..500bd2a752b9a 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-RVHDiJS1MhskVorS/SNZlXWP/oc8OXjUjApeanBkIWQ="; + vendorHash = "sha256-RVHDiJS1MhskVorS/SNZlXWP/oc8OXjUjApeanBkIWQ="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index a192abc57e4ea..5891934462850 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-rKZ0fI9UN4oq6gfDMNR2+kCazlDexE1+UVzQ3xgkSA8="; }; - vendorSha256 = "sha256-6Trk49Vo3oMjSaHRDm2v+elPDHwdn2D3Z6i4UYcx0IQ="; + vendorHash = "sha256-6Trk49Vo3oMjSaHRDm2v+elPDHwdn2D3Z6i4UYcx0IQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/hashi-up/default.nix b/pkgs/applications/networking/cluster/hashi-up/default.nix index 1efc1c438a5ab..583a0c32b1d1b 100644 --- a/pkgs/applications/networking/cluster/hashi-up/default.nix +++ b/pkgs/applications/networking/cluster/hashi-up/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-PdZ8X2pJ5TfT0bJ4/P/XbMTv+yyL5/1AxIFHnL/qNcg="; }; - vendorSha256 = "sha256-dircE3WlDPsPnF+0wT5RG/c4hC8qPs8NaSGM5wpvVlM="; + vendorHash = "sha256-dircE3WlDPsPnF+0wT5RG/c4hC8qPs8NaSGM5wpvVlM="; meta = with lib; { description = "A lightweight utility to install HashiCorp Consul, Nomad, or Vault on any remote Linux host"; diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 0afe7b8344959..204b08962454d 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-kwcmZSOA26XuSgNSHitGaMohalnLobabXf4z3ybSJtk="; }; - vendorSha256 = "sha256-ZtcCBXcJXX9ThzY6T0MhNfDDzRC9PYzRB1VyS4LLXLs="; + vendorHash = "sha256-ZtcCBXcJXX9ThzY6T0MhNfDDzRC9PYzRB1VyS4LLXLs="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index b8eb1a79bfe4d..c7b66eaac77c3 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-ntjrk2OEIkAmNpf9Ag6HkSIOSA3NtO9hSJOBgvne4b0="; }; - vendorSha256 = "sha256-JlaXQqDO/b1xe9NA2JtuB1DZZlphWu3Mo/Mf4lhmKNo="; + vendorHash = "sha256-JlaXQqDO/b1xe9NA2JtuB1DZZlphWu3Mo/Mf4lhmKNo="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/kconf/default.nix b/pkgs/applications/networking/cluster/kconf/default.nix index 44dc9f4900fc4..78ff236085e5b 100644 --- a/pkgs/applications/networking/cluster/kconf/default.nix +++ b/pkgs/applications/networking/cluster/kconf/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-aEZTwXccKZDXRNWr4XS2ZpqtEnNGbsIVau8zPvaHTkk="; }; - vendorSha256 = "sha256-7mzk2OP1p8FfRsbs4B6XP/szBeckm7Q7hf8AkbZUG2Q="; + vendorHash = "sha256-7mzk2OP1p8FfRsbs4B6XP/szBeckm7Q7hf8AkbZUG2Q="; ldflags = [ "-s" "-w" "-X github.com/particledecay/kconf/build.Version=${version}" diff --git a/pkgs/applications/networking/cluster/kubecolor/default.nix b/pkgs/applications/networking/cluster/kubecolor/default.nix index 625f53515a30e..d7742cbfc2339 100644 --- a/pkgs/applications/networking/cluster/kubecolor/default.nix +++ b/pkgs/applications/networking/cluster/kubecolor/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-d1gtbpeK9vp8bwhsMOPVKmohfyEZtQuvRB36VZCB3sY="; }; - vendorSha256 = "sha256-g5bLi0HQ7LQM+DKn5x8enXn8/9j3LFhgDjQ+YN0M7dM="; + vendorHash = "sha256-g5bLi0HQ7LQM+DKn5x8enXn8/9j3LFhgDjQ+YN0M7dM="; ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; diff --git a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix b/pkgs/applications/networking/cluster/kubectl-doctor/default.nix index 8e504294053b0..e198de456cca3 100644 --- a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-doctor/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { }) ]; - vendorSha256 = "sha256-qhffg/s1RZFNW0nHLbJ89yqLzdC72ARXdbSfMLJK2pQ="; + vendorHash = "sha256-qhffg/s1RZFNW0nHLbJ89yqLzdC72ARXdbSfMLJK2pQ="; postInstall = '' mv $out/bin/{cmd,kubectl-doctor} diff --git a/pkgs/applications/networking/cluster/kubectl-klock/default.nix b/pkgs/applications/networking/cluster/kubectl-klock/default.nix index d6c84b58a4fc0..dc9f8c25b5c8e 100644 --- a/pkgs/applications/networking/cluster/kubectl-klock/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-klock/default.nix @@ -11,7 +11,7 @@ buildGo121Module rec { sha256 = "sha256-HO9/hr/CBmJkrbNdX8tp2pNRfZDaWNW8shyCR46G77A="; }; - vendorSha256 = "sha256-QvD5yVaisq5Zz/M81HAMKpgQJRB5qPCYveLgldHHGf0="; + vendorHash = "sha256-QvD5yVaisq5Zz/M81HAMKpgQJRB5qPCYveLgldHHGf0="; meta = with lib; { description = "A kubectl plugin to render watch output in a more readable fashion"; diff --git a/pkgs/applications/networking/cluster/kubectl-ktop/default.nix b/pkgs/applications/networking/cluster/kubectl-ktop/default.nix index fbca4e4b8a51a..a7a27e54c065e 100644 --- a/pkgs/applications/networking/cluster/kubectl-ktop/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-ktop/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-nkIRVt2kqsE9QBYvvHmupohnzH+OBcwWwV16rMePw4I="; }; - vendorSha256 = "sha256-IiAMmHOq69WMT2B1q9ZV2fGDnLr7AbRm1P7ACSde2FE="; + vendorHash = "sha256-IiAMmHOq69WMT2B1q9ZV2fGDnLr7AbRm1P7ACSde2FE="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/kubectl-tree/default.nix b/pkgs/applications/networking/cluster/kubectl-tree/default.nix index 5a6d0efc0584d..1cb0cc3e9419c 100644 --- a/pkgs/applications/networking/cluster/kubectl-tree/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-tree/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-J4/fiTECcTE0N2E+MPrQKE9Msvvm8DLdvLbnDUnUo74="; }; - vendorSha256 = "sha256-iblEfpYOvTjd3YXQ3Mmj5XckivHoXf4336H+F7NEfBA="; + vendorHash = "sha256-iblEfpYOvTjd3YXQ3Mmj5XckivHoXf4336H+F7NEfBA="; meta = with lib; { description = "kubectl plugin to browse Kubernetes object hierarchies as a tree"; diff --git a/pkgs/applications/networking/cluster/kubent/default.nix b/pkgs/applications/networking/cluster/kubent/default.nix index e689af406ecf1..f54b6875a92ba 100644 --- a/pkgs/applications/networking/cluster/kubent/default.nix +++ b/pkgs/applications/networking/cluster/kubent/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-QIvMhKAo30gInqJBpHvhcyjgVkdRqgBKwLQ80ng/75U="; }; - vendorSha256 = "sha256-XXf6CPPHVvCTZA4Ve5/wmlgXQ/gZZUW0W/jXA0bJgLA="; + vendorHash = "sha256-XXf6CPPHVvCTZA4Ve5/wmlgXQ/gZZUW0W/jXA0bJgLA="; ldflags = [ "-w" "-s" diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index 9c28ba063e243..574bfc61bb877 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { }) ]; - vendorSha256 = "sha256-R/vVrLsVSA9SGra4ytoHlQkPaIgQaj/XdivcQp8xjSM="; + vendorHash = "sha256-R/vVrLsVSA9SGra4ytoHlQkPaIgQaj/XdivcQp8xjSM="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/levant/default.nix b/pkgs/applications/networking/cluster/levant/default.nix index be25739db2cba..48e07567a853f 100644 --- a/pkgs/applications/networking/cluster/levant/default.nix +++ b/pkgs/applications/networking/cluster/levant/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-UI8PVvTqk8D4S9kq3sgxrm8dkRokpgkLyTN6pzUXNV0="; }; - vendorSha256 = "sha256-MzKttGfuIg0Pp/iz68EpXuk4I+tFozhIabKlsWuvJ48="; + vendorHash = "sha256-MzKttGfuIg0Pp/iz68EpXuk4I+tFozhIabKlsWuvJ48="; # The tests try to connect to a Nomad cluster. doCheck = false; diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 413fc8b1ec75b..ecc92bd07f188 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -4,5 +4,5 @@ channel = "stable"; version = "2.14.0"; sha256 = "0j4qzmfhi286vsngf1j3s8zhk7xj2saqr27clmjy7ypjszlz5rvm"; - vendorSha256 = "sha256-HxxekAipoWNxcLUSOSwUOXlrWMODw7gS8fcyTD3CMYE="; + vendorHash = "sha256-HxxekAipoWNxcLUSOSwUOXlrWMODw7gS8fcyTD3CMYE="; } diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index ca34c20a1a54d..31b07419b4dd5 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -4,5 +4,5 @@ channel = "edge"; version = "23.8.3"; sha256 = "1mj16nzs2da530lvvsg6gh8fcgy8rwq13mryqznflgyr39x4c56i"; - vendorSha256 = "sha256-HxxekAipoWNxcLUSOSwUOXlrWMODw7gS8fcyTD3CMYE="; + vendorHash = "sha256-HxxekAipoWNxcLUSOSwUOXlrWMODw7gS8fcyTD3CMYE="; } diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix index a4aec900a4848..0384f56f14aa6 100644 --- a/pkgs/applications/networking/cluster/linkerd/generic.nix +++ b/pkgs/applications/networking/cluster/linkerd/generic.nix @@ -1,10 +1,10 @@ { lib, fetchFromGitHub, buildGoModule, installShellFiles }: -{ channel, version, sha256, vendorSha256 }: +{ channel, version, sha256, vendorHash }: buildGoModule rec { pname = "linkerd-${channel}"; - inherit version vendorSha256; + inherit version vendorHash; src = fetchFromGitHub { owner = "linkerd"; diff --git a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix index eb185f9743c1f..acd0643b4bdf3 100644 --- a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix +++ b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix @@ -28,7 +28,7 @@ let sha256 = "sha256-fK5GsszNhz/WP0zVk2lOfU/gwYijdQa5qhNYO33RhXc="; }; - vendorSha256 = "sha256-Duzjpl011mj/SNoX/jQGMXwqUHPDz7iIMygRmK1vC3Q="; + vendorHash = "sha256-Duzjpl011mj/SNoX/jQGMXwqUHPDz7iIMygRmK1vC3Q="; buildPhase = '' runHook preBuild diff --git a/pkgs/applications/networking/cluster/nomad-pack/default.nix b/pkgs/applications/networking/cluster/nomad-pack/default.nix index 65b012a10a0d8..92c98c44fde60 100644 --- a/pkgs/applications/networking/cluster/nomad-pack/default.nix +++ b/pkgs/applications/networking/cluster/nomad-pack/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-Br+BJRAo9qSJQjg2awQTnsYz76WReVWsTUw6XoUb1YY="; }; - vendorSha256 = "sha256-dUPDwKdkBXBfyfbFxrpgHwZ0Q5jB7aamClNmv+tLCGA="; + vendorHash = "sha256-dUPDwKdkBXBfyfbFxrpgHwZ0Q5jB7aamClNmv+tLCGA="; # skip running go tests as they require network access doCheck = false; diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 73c71b2928539..b9bb93249a258 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -8,12 +8,12 @@ let generic = - { buildGoModule, version, sha256, vendorSha256, ... }@attrs: - let attrs' = builtins.removeAttrs attrs [ "buildGoModule" "version" "sha256" "vendorSha256" ]; + { buildGoModule, version, sha256, vendorHash, ... }@attrs: + let attrs' = builtins.removeAttrs attrs [ "buildGoModule" "version" "sha256" "vendorHash" ]; in buildGoModule (rec { pname = "nomad"; - inherit version vendorSha256; + inherit version vendorHash; subPackages = [ "." ]; @@ -57,7 +57,7 @@ rec { buildGoModule = buildGo120Module; version = "1.4.12"; sha256 = "sha256-dO98FOaO5MB5pWzeF705s/aBDTaF0OyWnVxWGB91suI="; - vendorSha256 = "sha256-D5TcTZa64Jr47u4mrTXK4lUIC5gfBQNVgL6QKh1CaQM="; + vendorHash = "sha256-D5TcTZa64Jr47u4mrTXK4lUIC5gfBQNVgL6QKh1CaQM="; passthru.tests.nomad = nixosTests.nomad; }; @@ -65,7 +65,7 @@ rec { buildGoModule = buildGo120Module; version = "1.5.8"; sha256 = "sha256-5VAUNunQz4s1Icd+s5i8Kx6u1P0By+ikl4C5wXM1oho="; - vendorSha256 = "sha256-y3WiQuoQn6SdwTgtPWuB6EBtsJC+YleQPzownZQNkno="; + vendorHash = "sha256-y3WiQuoQn6SdwTgtPWuB6EBtsJC+YleQPzownZQNkno="; passthru.tests.nomad = nixosTests.nomad; preCheck = '' export PATH="$PATH:$NIX_BUILD_TOP/go/bin" @@ -76,7 +76,7 @@ rec { buildGoModule = buildGo120Module; version = "1.6.1"; sha256 = "sha256-RsyGUaLteGiNf0PTkKLcjHTevhKb/mNx2JORpXhHJMw="; - vendorSha256 = "sha256-Y3O7ADzZPlLWFbXSYBcI6b5MAhMD0UnkhQxO9VJMpOY="; + vendorHash = "sha256-Y3O7ADzZPlLWFbXSYBcI6b5MAhMD0UnkhQxO9VJMpOY="; passthru.tests.nomad = nixosTests.nomad; preCheck = '' export PATH="$PATH:$NIX_BUILD_TOP/go/bin" diff --git a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix index 4d3662ea8750b..f59b8d26de08f 100644 --- a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-JTSZtIRVFdUjhQsp2EMukeoVIo6nNx4xofq+3iOZUIk="; }; - vendorSha256 = "sha256-1zrB+CobUBgdpBHRJPpfDYCD6oVWY4j4Met9EqNQQbE="; + vendorHash = "sha256-1zrB+CobUBgdpBHRJPpfDYCD6oVWY4j4Met9EqNQQbE="; ldflags = [ "-s" "-w" diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 8dcb08247e359..ea7c1479ef133 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-js/UjnNYRW7s3b4TeprhmBe4cDLDYDrMeLtpASI9aN4="; }; - vendorSha256 = "sha256-oEbKk9cMbI0ZWXrfM8Y19OF/A75mwHl0C/PJx0oTOBo="; + vendorHash = "sha256-oEbKk9cMbI0ZWXrfM8Y19OF/A75mwHl0C/PJx0oTOBo="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index b558a7ff0b543..f4d50d3dbbcd8 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { sha256 = "sha256-YiVCdAdwdK9PcQ6VQQNAjLQq2X54vJmZfbHRjV2d8VQ="; }; - vendorSha256 = "sha256-Fqxkyl9AKZ7H4QSp2V/yztpeXHt57+LjpzzGtOPndX0="; + vendorHash = "sha256-Fqxkyl9AKZ7H4QSp2V/yztpeXHt57+LjpzzGtOPndX0="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/temporalite/default.nix b/pkgs/applications/networking/cluster/temporalite/default.nix index a842a896285a1..efe1f2d30c5d5 100644 --- a/pkgs/applications/networking/cluster/temporalite/default.nix +++ b/pkgs/applications/networking/cluster/temporalite/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-IEB9AFEt8U2zXYfbChfL/UH1rNSLPnfS396/cPE8UdE="; }; - vendorSha256 = "sha256-w86/XCMRGBmXM+oQ5+0qiX0fdwiKXvsmEkApuRLUOiA="; + vendorHash = "sha256-w86/XCMRGBmXM+oQ5+0qiX0fdwiKXvsmEkApuRLUOiA="; subPackages = [ "cmd/temporalite" ]; diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix index 50efacfd62ef4..319db3c9b8738 100644 --- a/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "sha256-zSSK2WfcbD1DvqsFUKdTydLfyApWzm1h+ihSnLUmq2E="; }; - vendorSha256 = "sha256-0Bkjx/gq2MAWjxoMSGtBcRzv40SSUVDZBh4PzEtKj5o="; + vendorHash = "sha256-0Bkjx/gq2MAWjxoMSGtBcRzv40SSUVDZBh4PzEtKj5o="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/applications/networking/cluster/terraform-inventory/default.nix index 783f9c79bb7fd..89d4b769e9af1 100644 --- a/pkgs/applications/networking/cluster/terraform-inventory/default.nix +++ b/pkgs/applications/networking/cluster/terraform-inventory/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-gkSDxcBoYmCBzkO8y1WKcRtZdfl8w5qVix0zbyb4Myo="; }; - vendorSha256 = "sha256-pj9XLzaGU1PuNnpTL/7XaKJZUymX+i8hFMroZtHIqTc="; + vendorHash = "sha256-pj9XLzaGU1PuNnpTL/7XaKJZUymX+i8hFMroZtHIqTc="; ldflags = [ "-s" "-w" "-X main.build_version=${version}" ]; diff --git a/pkgs/applications/networking/cluster/tgswitch/default.nix b/pkgs/applications/networking/cluster/tgswitch/default.nix index 31df14cebeda7..25c301f0cbb5a 100644 --- a/pkgs/applications/networking/cluster/tgswitch/default.nix +++ b/pkgs/applications/networking/cluster/tgswitch/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "sha256-Q3Cef3B7hfVHLvW8Rx6IdH9g/3luDhpUMZ8TXVpb8gQ="; }; - vendorSha256 = "sha256-PlTdbA8Z2I2SWoG7oYG87VQfczx9zP1SCJx70UWOEog="; + vendorHash = "sha256-PlTdbA8Z2I2SWoG7oYG87VQfczx9zP1SCJx70UWOEog="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/feedreaders/photon/default.nix b/pkgs/applications/networking/feedreaders/photon/default.nix index 08df4af2db4f9..34612e2a87fcc 100644 --- a/pkgs/applications/networking/feedreaders/photon/default.nix +++ b/pkgs/applications/networking/feedreaders/photon/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { proxyVendor = true; - vendorSha256 = "sha256-n9XNqXIoqn+f0xKCenJWXUYXtQhtbNBar68onWH/WV4="; + vendorHash = "sha256-n9XNqXIoqn+f0xKCenJWXUYXtQhtbNBar68onWH/WV4="; meta = with lib; { description = "RSS/Atom reader with the focus on speed, usability and a bit of unix philosophy"; diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index cce2b739e1001..be8173da16d9a 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-OpRkBHNWRrBhh6nGrV7dZT01xsSlbANCk+g7b8SidG0="; }; - vendorSha256 = "sha256-+r0WHrKARcxW1hUY1HwAXk0X6ZQrbgBj9+GjIJV5DS0="; + vendorHash = "sha256-+r0WHrKARcxW1hUY1HwAXk0X6ZQrbgBj9+GjIJV5DS0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/networking/hyprspace/default.nix b/pkgs/applications/networking/hyprspace/default.nix index 69b0f1642334d..8fc678683658d 100644 --- a/pkgs/applications/networking/hyprspace/default.nix +++ b/pkgs/applications/networking/hyprspace/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "sha256-UlIQCy4moW58tQ1dqxrPsU5LN1Bs/Jy5X+2CEmXdYIk="; }; - vendorSha256 = "sha256-EV59sXmjunWs+MC++CwyuBlbWzWZI1YXDLEsOaESgRU="; + vendorHash = "sha256-EV59sXmjunWs+MC++CwyuBlbWzWZI1YXDLEsOaESgRU="; meta = with lib; { description = "A Lightweight VPN Built on top of Libp2p for Truly Distributed Networks."; diff --git a/pkgs/applications/networking/instant-messengers/go-neb/default.nix b/pkgs/applications/networking/instant-messengers/go-neb/default.nix index 4dc24073f5b5b..d1947825c42b1 100644 --- a/pkgs/applications/networking/instant-messengers/go-neb/default.nix +++ b/pkgs/applications/networking/instant-messengers/go-neb/default.nix @@ -14,7 +14,7 @@ buildGoModule { buildInputs = [ olm ]; - vendorSha256 = "sha256-5Vg7aUkqiFIQuxmsDOJjvXoeA5NjMoBoD0XBhC+o4GA="; + vendorHash = "sha256-5Vg7aUkqiFIQuxmsDOJjvXoeA5NjMoBoD0XBhC+o4GA="; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index cc0a654ad2a0a..d7fd400298435 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { sha256 = "sha256-gLyjqmGZudj8PmsYUGXHOjetZzi6u5CFI7Y50y2XAzk="; }; - vendorSha256 = "sha256-FmQJG6hv0YPyHVjZ/DvkQExrGLc1hjoiPS59MnqG2gU="; + vendorHash = "sha256-FmQJG6hv0YPyHVjZ/DvkQExrGLc1hjoiPS59MnqG2gU="; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix index ce4963df01e85..b6c48a0e948c2 100644 --- a/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -10,7 +10,7 @@ buildGoModule { sha256 = "sha256-SdD4EE/rc85H7xqKB/kU8XFsC63i1sVObPha/zrxFGk="; }; - vendorSha256 = "sha256-zJJ9PzQShv2iRNyCg1XVscbwjV9ZtMIojJDtXXm3rVM="; + vendorHash = "sha256-zJJ9PzQShv2iRNyCg1XVscbwjV9ZtMIojJDtXXm3rVM="; meta = with lib; { description = "A file system based matrix client"; diff --git a/pkgs/applications/networking/irc/senpai/default.nix b/pkgs/applications/networking/irc/senpai/default.nix index 3e87b2aa1dafb..eaefa41a6650a 100644 --- a/pkgs/applications/networking/irc/senpai/default.nix +++ b/pkgs/applications/networking/irc/senpai/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-q167og8S8YbLcREZ7DVbJhjMzx4iO0WgIFkOV2IpieM="; }; - vendorSha256 = "sha256-PkoEHQEGKCiNbJsm7ieL65MtEult/wubLreJKA1gGpg="; + vendorHash = "sha256-PkoEHQEGKCiNbJsm7ieL65MtEult/wubLreJKA1gGpg="; subPackages = [ "cmd/senpai" diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix index f7130edf66a5b..a51dba890a40b 100644 --- a/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/pkgs/applications/networking/p2p/magnetico/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-V1pBzillWTk9iuHAhFztxYaq4uLL3U3HYvedGk6ffbk="; }; - vendorSha256 = "sha256-ngYkTtBEZSyYYnfBHi0VrotwKGvMOiowbrwigJnjsuU="; + vendorHash = "sha256-ngYkTtBEZSyYYnfBHi0VrotwKGvMOiowbrwigJnjsuU="; buildPhase = '' runHook preBuild diff --git a/pkgs/applications/networking/peroxide/default.nix b/pkgs/applications/networking/peroxide/default.nix index 9638d0863c533..6e8537275f055 100644 --- a/pkgs/applications/networking/peroxide/default.nix +++ b/pkgs/applications/networking/peroxide/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-6Jb1i4aNjeemiQp9FF/KGyZ+Evom9PPBvARbJWyrhok="; }; - vendorSha256 = "sha256-kuFlkkMkCKO5Rrh1EoyVdaykvxTfchK2l1/THqTBeAY="; + vendorHash = "sha256-kuFlkkMkCKO5Rrh1EoyVdaykvxTfchK2l1/THqTBeAY="; postPatch = '' # These tests connect to the internet, which does not work in sandboxed diff --git a/pkgs/applications/networking/r53-ddns/default.nix b/pkgs/applications/networking/r53-ddns/default.nix index 321d1268caacc..6761741ce9cec 100644 --- a/pkgs/applications/networking/r53-ddns/default.nix +++ b/pkgs/applications/networking/r53-ddns/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-KJAPhSGaC3upWLfo2eeSD3Vit9Blmbol7s8y3f849N4="; }; - vendorSha256 = "sha256-KkyMd94cejWkgg/RJudy1lm/M3lsEJXFGqVTzGIX3qM="; + vendorHash = "sha256-KkyMd94cejWkgg/RJudy1lm/M3lsEJXFGqVTzGIX3qM="; meta = with lib; { license = licenses.mit; diff --git a/pkgs/applications/networking/stc-cli/default.nix b/pkgs/applications/networking/stc-cli/default.nix index c2d7995371749..bae71f82cb4eb 100644 --- a/pkgs/applications/networking/stc-cli/default.nix +++ b/pkgs/applications/networking/stc-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-g1zn/CBpLv0oNhp32njeNhhli8aTCECgh92+zn5v+4U="; }; - vendorSha256 = "sha256-0OsxCGCJT5k5bHXNSIL6QiJXj72bzYCZiI03gvHQuR8="; + vendorHash = "sha256-0OsxCGCJT5k5bHXNSIL6QiJXj72bzYCZiI03gvHQuR8="; meta = with lib; { description = "Syncthing CLI Tool"; diff --git a/pkgs/applications/networking/tcping-go/default.nix b/pkgs/applications/networking/tcping-go/default.nix index b7f8ceb6d6818..1502f8a16aef7 100644 --- a/pkgs/applications/networking/tcping-go/default.nix +++ b/pkgs/applications/networking/tcping-go/default.nix @@ -11,7 +11,7 @@ buildGoModule { sha256 = "sha256-GSkNfaGMJbBqDg8DKhDtLAuUg1yF3FbBdxcf4oG50rI="; }; - vendorSha256 = "sha256-Q+aFgi7GCAn3AxDuGtRG4DdPhI7gQKEo7A9iu1YcTsQ="; + vendorHash = "sha256-Q+aFgi7GCAn3AxDuGtRG4DdPhI7gQKEo7A9iu1YcTsQ="; meta = with lib; { description = "Ping over TCP instead of ICMP, written in Go"; diff --git a/pkgs/applications/networking/websocketd/default.nix b/pkgs/applications/networking/websocketd/default.nix index 636443c9b8585..212850dcc7f52 100644 --- a/pkgs/applications/networking/websocketd/default.nix +++ b/pkgs/applications/networking/websocketd/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-cp4iBSQ6Cd0+NPZ2i79Mulg1z17u//OCm3yoArbZEHs="; }; - vendorSha256 = "sha256-i5IPJ3srUXL7WWjBW9w803VSoyjwA5JgPWKsAckPYxY="; + vendorHash = "sha256-i5IPJ3srUXL7WWjBW9w803VSoyjwA5JgPWKsAckPYxY="; doCheck = false; -- cgit 1.4.1