From f57d9d54058059b3f81a45b7af1ed1d5708b35b1 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Wed, 12 Jun 2024 22:00:20 +0200 Subject: [PATCH 01/14] tailscale: 1.66.4 -> 1.68.0 (cherry picked from commit f9c317b8a5b941e5ffdd68cb45608c9a8e6e5adf) --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 216add099af5..81f270ebd9c6 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -13,7 +13,7 @@ }: let - version = "1.66.4"; + version = "1.68.0"; in buildGoModule { pname = "tailscale"; @@ -23,7 +23,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-ETBca3qKO2iS30teIF5sr/oyJdRSKFqLFVO3+mmm7bo="; + hash = "sha256-GTl5RCwIoDuzbaigy0/++xaPPEMLRDbBi/z82xCDOZY="; }; patches = [ @@ -35,7 +35,7 @@ buildGoModule { }) ]; - vendorHash = "sha256-Hd77xy8stw0Y6sfk3/ItqRIbM/349M/4uf0iNy1xJGw="; + vendorHash = "sha256-SUjoeOFYz6zbEgv/vND7kEXbuWlZDrUKF2Dmqsf/KVw="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; From f21868b6db512ab092410ff8f6f2c4c90db4281d Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sat, 15 Jun 2024 12:56:15 -0400 Subject: [PATCH 02/14] tailscale: 1.68.0 -> 1.68.1 https://github.com/tailscale/tailscale/releases/tag/v1.68.1 (cherry picked from commit b7e8cdd6d79ddb4d81ba3e0071c57905e40eb7bb) --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 81f270ebd9c6..c78db256460c 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -13,7 +13,7 @@ }: let - version = "1.68.0"; + version = "1.68.1"; in buildGoModule { pname = "tailscale"; @@ -23,7 +23,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-GTl5RCwIoDuzbaigy0/++xaPPEMLRDbBi/z82xCDOZY="; + hash = "sha256-ZAzro69F7ovfdqzRss/U7puh1T37bkEtUXabCYc5LwU="; }; patches = [ From eb8723022e1b85fda1ff5900c5cb58db4f688f3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Jul 2024 04:32:48 +0000 Subject: [PATCH 03/14] tailscale: 1.68.1 -> 1.68.2 (cherry picked from commit 203fb14ff3032c0fd64018f479bc6c3975e1bfa2) --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index c78db256460c..d523a856735b 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -13,7 +13,7 @@ }: let - version = "1.68.1"; + version = "1.68.2"; in buildGoModule { pname = "tailscale"; @@ -23,7 +23,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-ZAzro69F7ovfdqzRss/U7puh1T37bkEtUXabCYc5LwU="; + hash = "sha256-VI5k8PnPP8r2rIkW7AeQod7JmoHWuSLiaxkZXXv+0T8="; }; patches = [ From d8ae8dcefe267aec684410b086f88b0a33a346fd Mon Sep 17 00:00:00 2001 From: Pyrox Date: Wed, 17 Jul 2024 17:04:21 -0400 Subject: [PATCH 04/14] tailscale: 1.68.2 -> 1.70.0 (cherry picked from commit d97f6cdd0251a880494ef73ce08c95395c9365aa) --- pkgs/servers/tailscale/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index d523a856735b..7581e04d6497 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -13,7 +13,7 @@ }: let - version = "1.68.2"; + version = "1.70.0"; in buildGoModule { pname = "tailscale"; @@ -23,7 +23,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-VI5k8PnPP8r2rIkW7AeQod7JmoHWuSLiaxkZXXv+0T8="; + hash = "sha256-rB/zaJavA3OH1HK7Rfpta/QmQzi0xsEYTvW5JzzTAlI="; }; patches = [ @@ -35,7 +35,7 @@ buildGoModule { }) ]; - vendorHash = "sha256-SUjoeOFYz6zbEgv/vND7kEXbuWlZDrUKF2Dmqsf/KVw="; + vendorHash = "sha256-NtNjH2Vo1Leh98VIOkpyALErhC+6H5BE/uaPkwlejoo="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; @@ -73,9 +73,10 @@ buildGoModule { meta = with lib; { homepage = "https://tailscale.com"; - description = "The node agent for Tailscale, a mesh VPN built on WireGuard"; + description = "Node agent for Tailscale, a mesh VPN built on WireGuard"; + changelog = "https://github.com/tailscale/tailscale/releases/tag/v${version}"; license = licenses.bsd3; mainProgram = "tailscale"; - maintainers = with maintainers; [ mbaillie jk mfrw ]; + maintainers = with maintainers; [ mbaillie jk mfrw pyrox0 ]; }; } From 0f0533a63b429772b28dc1d93ce94d71da80d2aa Mon Sep 17 00:00:00 2001 From: Peter Lehmann Date: Fri, 14 Jun 2024 21:15:11 +0200 Subject: [PATCH 05/14] tailscale: add shell completions (cherry picked from commit 7c0b81b097eab0ff7a72381f5b8d6974e4b4db2d) --- pkgs/servers/tailscale/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 7581e04d6497..d4aaf89b1499 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -10,6 +10,7 @@ , shadow , procps , nixosTests +, installShellFiles }: let @@ -37,7 +38,7 @@ buildGoModule { vendorHash = "sha256-NtNjH2Vo1Leh98VIOkpyALErhC+6H5BE/uaPkwlejoo="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ] ++ [ installShellFiles ]; CGO_ENABLED = 0; @@ -63,6 +64,12 @@ buildGoModule { --prefix PATH : ${lib.makeBinPath [ iproute2 iptables getent shadow ]} \ --suffix PATH : ${lib.makeBinPath [ procps ]} + local INSTALL="$out/bin/tailscale" + installShellCompletion --cmd tailscale \ + --bash <($out/bin/tailscale completion bash) \ + --fish <($out/bin/tailscale completion fish) \ + --zsh <($out/bin/tailscale completion zsh) + sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service ''; From f5c084de828f447915db7c450e7defbbd5018fb5 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 17 Jul 2024 23:25:28 +0200 Subject: [PATCH 06/14] tailscale: only generate shell completions if possible (cherry picked from commit b41e59ef28735566ec63164abafec8a2f42d778f) --- pkgs/servers/tailscale/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index d4aaf89b1499..1824625bdf84 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -63,15 +63,14 @@ buildGoModule { wrapProgram $out/bin/tailscaled \ --prefix PATH : ${lib.makeBinPath [ iproute2 iptables getent shadow ]} \ --suffix PATH : ${lib.makeBinPath [ procps ]} - + sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service + install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' local INSTALL="$out/bin/tailscale" installShellCompletion --cmd tailscale \ --bash <($out/bin/tailscale completion bash) \ --fish <($out/bin/tailscale completion fish) \ --zsh <($out/bin/tailscale completion zsh) - - sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service - install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service ''; passthru.tests = { From 0c6b68e52d2efdf95bc95e853a8dc926857a6090 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Tue, 20 Aug 2024 08:45:29 +0530 Subject: [PATCH 07/14] tailscale: 1.70.0 -> 1.72.0 Changes: https://tailscale.com/changelog#2024-08-19 (cherry picked from commit 354dc1e807230951a7ce13a12763f203475c703c) --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 1824625bdf84..81879ee95c61 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -14,7 +14,7 @@ }: let - version = "1.70.0"; + version = "1.72.0"; in buildGoModule { pname = "tailscale"; @@ -24,7 +24,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-rB/zaJavA3OH1HK7Rfpta/QmQzi0xsEYTvW5JzzTAlI="; + hash = "sha256-PFXXd5ToBbvuGl+u4nEAHy1F696lxHD3PrPJ3Tpb+eg="; }; patches = [ @@ -36,7 +36,7 @@ buildGoModule { }) ]; - vendorHash = "sha256-NtNjH2Vo1Leh98VIOkpyALErhC+6H5BE/uaPkwlejoo="; + vendorHash = "sha256-M5e5dE1gGW3ly94r3SxCsBmVwbBmhVtaVDW691vxG/8="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ] ++ [ installShellFiles ]; From e4231d5541108c5cfd7843ea88fd1087fe72dc71 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Fri, 23 Aug 2024 00:40:02 +0530 Subject: [PATCH 08/14] tailscale: 1.72.0 -> 1.72.1 Changes: https://tailscale.com/changelog#2024-08-22 (cherry picked from commit eb19b36ec45caf14e9fe5026d3970d89c03ced69) --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 81879ee95c61..91740df4ba55 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -14,7 +14,7 @@ }: let - version = "1.72.0"; + version = "1.72.1"; in buildGoModule { pname = "tailscale"; @@ -24,7 +24,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-PFXXd5ToBbvuGl+u4nEAHy1F696lxHD3PrPJ3Tpb+eg="; + hash = "sha256-b1o3UHotVs5/+cpMx9q8bvt6BSM2QamLDUNyBNfb58A="; }; patches = [ From 128bcc646d933e2fed5c46a743edcf4a2153c7e1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 23 Jun 2024 16:35:50 +1000 Subject: [PATCH 09/14] go_1_23: init at 1.23rc1 (cherry picked from commit 2dbd8d8258ac09714f974ef6f7fd665a0e1775b7) --- pkgs/development/compilers/go/1.23.nix | 190 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 11 ++ 2 files changed, 201 insertions(+) create mode 100644 pkgs/development/compilers/go/1.23.nix diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix new file mode 100644 index 000000000000..5660710f049f --- /dev/null +++ b/pkgs/development/compilers/go/1.23.nix @@ -0,0 +1,190 @@ +{ lib +, stdenv +, fetchurl +, tzdata +, substituteAll +, iana-etc +, Security +, Foundation +, xcbuild +, mailcap +, buildPackages +, pkgsBuildTarget +, threadsCross +, testers +, skopeo +, buildGo123Module +}: + +let + useGccGoBootstrap = stdenv.buildPlatform.isMusl; + goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap121.nix { }; + + skopeoTest = skopeo.override { buildGoModule = buildGo123Module; }; + + goarch = platform: { + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + "i686" = "386"; + "mips" = "mips"; + "mips64el" = "mips64le"; + "mipsel" = "mipsle"; + "powerpc64" = "ppc64"; + "powerpc64le" = "ppc64le"; + "riscv64" = "riscv64"; + "s390x" = "s390x"; + "x86_64" = "amd64"; + "wasm32" = "wasm"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); + + # We need a target compiler which is still runnable at build time, + # to handle the cross-building case where build != host == target + targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; + + isCross = stdenv.buildPlatform != stdenv.targetPlatform; +in +stdenv.mkDerivation (finalAttrs: { + pname = "go"; + version = "1.23rc1"; + + src = fetchurl { + url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; + hash = "sha256-bpxHZYcoCGY8zwuTflY3x99nFGlD+m6JCagaDRKcgEU="; + }; + + strictDeps = true; + buildInputs = [ ] + ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; + + depsBuildTarget = lib.optional isCross targetCC; + + depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; + + postPatch = '' + patchShebangs . + ''; + + patches = [ + (substituteAll { + src = ./iana-etc-1.17.patch; + iana = iana-etc; + }) + # Patch the mimetype database location which is missing on NixOS. + # but also allow static binaries built with NixOS to run outside nix + (substituteAll { + src = ./mailcap-1.17.patch; + inherit mailcap; + }) + # prepend the nix path to the zoneinfo files but also leave the original value for static binaries + # that run outside a nix server + (substituteAll { + src = ./tzdata-1.19.patch; + inherit tzdata; + }) + ./remove-tools-1.11.patch + ./go_no_vendor_checks-1.22.patch + ]; + + GOOS = if stdenv.targetPlatform.isWasi then "wasip1" else stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = + if isCross then + "${targetCC}/bin/${targetCC.targetPrefix}cc" + else + null; + CXX_FOR_TARGET = + if isCross then + "${targetCC}/bin/${targetCC.targetPrefix}c++" + else + null; + + GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); + GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 + # Wasi does not support CGO + CGO_ENABLED = if stdenv.targetPlatform.isWasi then 0 else 1; + + GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go"; + + buildPhase = '' + runHook preBuild + export GOCACHE=$TMPDIR/go-cache + + export PATH=$(pwd)/bin:$PATH + + ${lib.optionalString isCross '' + # Independent from host/target, CC should produce code for the building system. + # We only set it when cross-compiling. + export CC=${buildPackages.stdenv.cc}/bin/cc + ''} + ulimit -a + + pushd src + ./make.bash + popd + runHook postBuild + ''; + + preInstall = '' + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) '' + rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} + ''} + '' else lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) '' + rm -rf bin/*_* + ${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) '' + rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH} + ''} + ''); + + installPhase = '' + runHook preInstall + mkdir -p $out/share/go + cp -a bin pkg src lib misc api doc go.env $out/share/go + mkdir -p $out/bin + ln -s $out/share/go/bin/* $out/bin + runHook postInstall + ''; + + disallowedReferences = [ goBootstrap ]; + + passthru = { + inherit goBootstrap skopeoTest; + tests = { + skopeo = testers.testVersion { package = skopeoTest; }; + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "go version"; + version = "go${finalAttrs.version}"; + }; + }; + }; + + meta = with lib; { + changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor finalAttrs.version}"; + description = "Go Programming language"; + homepage = "https://go.dev/"; + license = licenses.bsd3; + maintainers = teams.golang.members; + platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi; + mainProgram = "go"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a0c2cbc94e5..deb1c327a214 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25171,6 +25171,17 @@ with pkgs; go = buildPackages.go_1_22; }; + # requires a newer Apple SDK + go_1_23 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.23.nix { + inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security; + }; + buildGo123Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix { + go = buildPackages.go_1_23; + }; + buildGo123Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix { + go = buildPackages.go_1_23; + }; + leaps = callPackage ../development/tools/leaps { }; ### DEVELOPMENT / JAVA MODULES From 6aced5fabdcc4cd882d96cd004502f9e1b169ddf Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 17 Jul 2024 10:11:28 +1000 Subject: [PATCH 10/14] go_1_23: 1.23rc1 -> 1.23rc2 Changelog: https://go.dev/doc/devel/release#go1.23 (cherry picked from commit 5a7e12c85f0a1f6e6118a605d3454f4eb138ae7f) --- pkgs/development/compilers/go/1.23.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 5660710f049f..80c351f7ebd8 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -48,11 +48,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23rc1"; + version = "1.23rc2"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-bpxHZYcoCGY8zwuTflY3x99nFGlD+m6JCagaDRKcgEU="; + hash = "sha256-9pnOJWD8Iq2CwGseBLYxi4Xn9obLy0/OFWWCEyxX2Ps="; }; strictDeps = true; From 06818320912a2d568e85b3c1900c9b803eea107b Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 13 Aug 2024 22:59:34 -0400 Subject: [PATCH 11/14] go_1_23: 1.23rc2 -> 1.23.0 Changelog: https://go.dev/doc/devel/release#go1.23 (cherry picked from commit cf4f89ec3f6e7f45ca0e3a2f9f45493088952868) --- pkgs/development/compilers/go/1.23.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 80c351f7ebd8..ec0a15b61b45 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -48,11 +48,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23rc2"; + version = "1.23.0"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-9pnOJWD8Iq2CwGseBLYxi4Xn9obLy0/OFWWCEyxX2Ps="; + hash = "sha256-Qreo6A2AXaoDAi7T/eQyHUw78smQoUQWXQHu7Nb2mcY="; }; strictDeps = true; From 01365ae2b93c786edcb0be9ca065556152445ec0 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 5 Sep 2024 14:34:51 -0400 Subject: [PATCH 12/14] go_1_23: 1.23.0 -> 1.23.1 Changelog: https://go.dev/doc/devel/release#go1.23 (cherry picked from commit 0e0665d1e0a05ade073ff23e54b6e389c928af20) --- pkgs/development/compilers/go/1.23.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index ec0a15b61b45..f5560778e27f 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -48,11 +48,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23.0"; + version = "1.23.1"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-Qreo6A2AXaoDAi7T/eQyHUw78smQoUQWXQHu7Nb2mcY="; + hash = "sha256-buROKYN50Ual5aprHFtdX10KM2XqvdcHQebiE0DsOw0="; }; strictDeps = true; From 39525747c7a72526c1ff6201fe64b24e10c0d86f Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Fri, 13 Sep 2024 07:17:08 +0530 Subject: [PATCH 13/14] tailscale: 1.72.1 -> 1.74.0 - switch to go 1.23.0 Changes: https://tailscale.com/changelog#2024-09-12 (cherry picked from commit 40a20e6af106bcbe586175945e803605a3a9269e) --- pkgs/servers/tailscale/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 91740df4ba55..1932235cc1ea 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -14,7 +14,7 @@ }: let - version = "1.72.1"; + version = "1.74.0"; in buildGoModule { pname = "tailscale"; @@ -24,7 +24,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-b1o3UHotVs5/+cpMx9q8bvt6BSM2QamLDUNyBNfb58A="; + hash = "sha256-KTg1rxyCgvZAwkGxhFXLff5UggKlqa6VLMItK81JV2k="; }; patches = [ @@ -36,7 +36,7 @@ buildGoModule { }) ]; - vendorHash = "sha256-M5e5dE1gGW3ly94r3SxCsBmVwbBmhVtaVDW691vxG/8="; + vendorHash = "sha256-HJEgBs2GOzXvRa95LdwySQmG4/+QwupFDBGrQT6Y2vE="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ] ++ [ installShellFiles ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index deb1c327a214..943ad02c2658 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26586,7 +26586,7 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; tailscale = callPackage ../servers/tailscale { - buildGoModule = buildGo122Module; + buildGoModule = buildGo123Module; }; tailscale-systray = callPackage ../applications/misc/tailscale-systray { }; From cb2976aba6c483241c4a7a37acf303dbd84b0fb7 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 19 Sep 2024 02:00:18 +0530 Subject: [PATCH 14/14] tailscale: 1.74.0 -> 1.74.1 Changes: https://tailscale.com/changelog#2024-09-18 (cherry picked from commit d74bb82cca02f9af3c70b7ac34f35df1b9d784ca) --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 1932235cc1ea..63195df7d2e8 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -14,7 +14,7 @@ }: let - version = "1.74.0"; + version = "1.74.1"; in buildGoModule { pname = "tailscale"; @@ -24,7 +24,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-KTg1rxyCgvZAwkGxhFXLff5UggKlqa6VLMItK81JV2k="; + hash = "sha256-672FtDKgz7Nmoufoe4Xg/b8sA8EuKH8X+3n9PAKYjFk="; }; patches = [