summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammad Falak R Wani <falakreyaz@gmail.com>2024-02-16 13:12:22 +0530
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2024-02-16 12:46:59 +0000
commit47148dedb90a47ab89a64299c7311d6cc968fdb8 (patch)
tree1f695fb2b614a817c51fd9d8901900cf80246030
parentMerge pull request #289261 from NixOS/backport-289258-to-release-23.11 (diff)
downloadnixpkgs-origin/backport-289228-to-release-23.11.tar.gz
tailscale: 1.58.2 -> 1.60.0origin/backport-289228-to-release-23.11
Diff: https://github.com/tailscale/tailscale/compare/v1.58.2...v1.60.0 Changelog: https://github.com/tailscale/tailscale/releases/tag/v1.60.0 Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com> (cherry picked from commit 0adbce5f2a58970e52d33e3c0da103da857e5dd9)
-rw-r--r--pkgs/servers/tailscale/default.nix6
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index 2f36358e912c..11bace1ae1e3 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -12,7 +12,7 @@
}:
let
- version = "1.58.2";
+ version = "1.60.0";
in
buildGoModule {
pname = "tailscale";
@@ -22,9 +22,9 @@ buildGoModule {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
- hash = "sha256-FiFFfUtse0CKR4XJ82HEjpZNxCaa4FnwSJfEzJ5kZgk=";
+ hash = "sha256-qx6ukgaEsdsq76E+GQkYH/Ydv3VKO9jLTh1zm0pGeWw=";
};
- vendorHash = "sha256-BK1zugKGtx2RpWHDvFZaFqz/YdoewsG8SscGt25uwtQ=";
+ vendorHash = "sha256-eci4f6golU1eIQOezplA+I+gmOfof40ktIdpr0v/uMc=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2a371ec2315..1c5c250adaf5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27449,7 +27449,9 @@ with pkgs;
systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
- tailscale = callPackage ../servers/tailscale { };
+ tailscale = callPackage ../servers/tailscale {
+ buildGoModule = buildGo122Module;
+ };
tailscale-systray = callPackage ../applications/misc/tailscale-systray { };