tailscale: 1.96.2 -> 1.96.3; trayscale: 0.18.5 -> 0.18.7; treewide: use buildGoModule without 1.26 override (#501921)
This commit is contained in:
@@ -6,7 +6,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
writableTmpDirAsHomeHook,
|
||||
go_1_26,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -22,7 +21,7 @@ let
|
||||
};
|
||||
in
|
||||
|
||||
buildGoModule.override { go = go_1_26; } rec {
|
||||
buildGoModule rec {
|
||||
pname = "fluxcd";
|
||||
inherit vendorHash version;
|
||||
|
||||
|
||||
@@ -2,10 +2,9 @@
|
||||
lib,
|
||||
tailscale,
|
||||
buildGoModule,
|
||||
go_1_26,
|
||||
}:
|
||||
|
||||
buildGoModule.override { go = go_1_26; } {
|
||||
buildGoModule {
|
||||
pname = "tailscale-gitops-pusher";
|
||||
inherit (tailscale) version;
|
||||
|
||||
|
||||
@@ -2,11 +2,10 @@
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
go_1_26,
|
||||
tailscale,
|
||||
}:
|
||||
|
||||
buildGoModule.override { go = go_1_26; } {
|
||||
buildGoModule {
|
||||
pname = "tailscale-nginx-auth";
|
||||
inherit (tailscale) version src vendorHash;
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
stdenv,
|
||||
|
||||
buildGoModule,
|
||||
go_1_26,
|
||||
fetchFromGitHub,
|
||||
|
||||
makeWrapper,
|
||||
@@ -23,9 +22,9 @@
|
||||
tailscale-nginx-auth,
|
||||
}:
|
||||
|
||||
buildGoModule.override { go = go_1_26; } (finalAttrs: {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "tailscale";
|
||||
version = "1.96.2";
|
||||
version = "1.96.3";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -36,7 +35,7 @@ buildGoModule.override { go = go_1_26; } (finalAttrs: {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6taTRKYFxCNK7BUnNZ3lljqVS7AeYEfm46gmilf6eEk=";
|
||||
hash = "sha256-zEXRhnofNxDslnvT3NiAyVjZM1V9I7i4pXzhsIVEIZo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rhuWEEN+CtumVxOw6Dy/IRxWIrZ2x6RJb6ULYwXCQc4=";
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "trayscale";
|
||||
version = "0.18.5";
|
||||
version = "0.18.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DeedleFake";
|
||||
repo = "trayscale";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rrN0ofmKn8oSZ8jD3yMirTUSoXwqq1SJwXueG7mk0Ek=";
|
||||
hash = "sha256-t284DpU4kmfrAgOmBZTwHYsxpl6vt7FPytv8/nsNfPM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-N1FaKkOVzSdY+jTVroHDshPrzMORTWN3lzf+ugirJyw=";
|
||||
vendorHash = "sha256-+2NoNIbB4lXcZhj2pifQpdiKZXslAhv6lxiKUThqTVc=";
|
||||
|
||||
subPackages = [ "cmd/trayscale" ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user