From c86d9f2ab1a87f3ce565457b4cb47d9c01c98c4e Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 24 Dec 2022 17:57:44 -0800 Subject: [PATCH] flake.nix: rename package to just "tailscale". There is no unstability inherent in this package, it's just unstable if you choose to import the flake at the main branch. Signed-off-by: David Anderson --- flake.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 9b51b6a5b..f81889f5f 100644 --- a/flake.nix +++ b/flake.nix @@ -91,10 +91,10 @@ # or the empty string when building from a local checkout of the # tailscale repo. tailscaleRev = if builtins.hasAttr "rev" self then self.rev else ""; - # tailscaleUnstable takes a nixpkgs package set, and builds - # Tailscale from the same commit as this flake. IOW, it provides - # "tailscale built from HEAD", where HEAD is "whatever commit you - # imported the flake at". + # tailscale takes a nixpkgs package set, and builds Tailscale from + # the same commit as this flake. IOW, it provides "tailscale built + # from HEAD", where HEAD is "whatever commit you imported the + # flake at". # # This is currently unfortunately brittle, because we have to # specify vendorSha256, and that sha changes any time we alter @@ -108,8 +108,8 @@ # So really, this flake is for tailscale devs to dogfood with, if # you're an end user you should be prepared for this flake to not # build periodically. - tailscaleUnstable = pkgs: pkgs.buildGo119Module rec { - name = "tailscale-unstable"; + tailscale = pkgs: pkgs.buildGo119Module rec { + name = "tailscale"; src = ./.; vendorSha256 = fileContents ./go.mod.sri; @@ -133,11 +133,11 @@ flakeForSystem = nixpkgs: system: let upstreamPkgs = nixpkgs.legacyPackages.${system}; pkgs = pkgsWithTailscaleGo upstreamPkgs; - ts = tailscaleUnstable pkgs; + ts = tailscale pkgs; in { packages = { tailscale-go = pkgs.tailscale-go; - tailscale-unstable = ts; + tailscale = ts; }; devShell = pkgs.mkShell { packages = with upstreamPkgs; [