[Backport release-24.05] tailscale: move to by-name (#350424)

NixOS · Oct 22, 2024 · f042fe7 · f042fe7
2 parents c9449b8 + 362a5bd
commit f042fe7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/pkgs/servers/tailscale/default.nix → pkgs/by-name/ta/tailscale/package.nix b/pkgs/servers/tailscale/default.nix → pkgs/by-name/ta/tailscale/package.nix
@@ -1,6 +1,6 @@
 { lib
 , stdenv
-, buildGoModule
+, buildGo123Module
 , fetchFromGitHub
 , fetchpatch
 , makeWrapper
@@ -16,7 +16,7 @@
 let
   version = "1.76.1";
 in
-buildGoModule {
+buildGo123Module {
   pname = "tailscale";
   inherit version;
 

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -26595,10 +26595,6 @@ with pkgs;
 
   systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
 
-  tailscale = callPackage ../servers/tailscale {
-    buildGoModule = buildGo123Module;
-  };
-
   tailscale-systray = callPackage ../applications/misc/tailscale-systray { };
 
   tailspin = callPackage ../tools/misc/tailspin { };