From 362a5bdeada158f52e73c7cb836c1a2ca1cf5b12 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Tue, 22 Oct 2024 13:49:07 +0530 Subject: [PATCH] tailscale: move to by-name (#350402) Signed-off-by: Muhammad Falak R Wani (cherry picked from commit 8478b0738d4acad31990ed4ea3d6446e12fd7511) --- .../default.nix => by-name/ta/tailscale/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{servers/tailscale/default.nix => by-name/ta/tailscale/package.nix} (98%) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/by-name/ta/tailscale/package.nix similarity index 98% rename from pkgs/servers/tailscale/default.nix rename to pkgs/by-name/ta/tailscale/package.nix index 1c3a41d877d41..cdf5a17c80092 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/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 index c0d2930d54dd2..66b673e364309 100644 --- 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 { };