From 0ebeb90bfe9318c06aa0054a1b896b3df2fe14f3 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Mon, 30 Oct 2023 13:08:33 -0600 Subject: [PATCH] overlays/tailscale: update to 1.52.0 on unstable --- overlays/default.nix | 3 ++- overlays/tailscale.nix | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/overlays/default.nix b/overlays/default.nix index a065c44..75a59dd 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -7,7 +7,7 @@ let #_1password-gui = prIsOpen.overlay 235900 (import ./1password-gui.nix); #openssh = import ./openssh.nix; #obsidian = prIsOpen.overlay 235408 (import ./obsidian.nix); - #tailscale = prIsOpen.overlay 239176 import ./tailscale.nix; + tailscale = prIsOpen.overlay 0 import ./tailscale.nix; #tidal-hifi = prIsOpen.overlay 239732 (import ./tidal-hifi.nix); matrix-synapse = prIsOpen.overlay 263243 (import ./matrix-synapse.nix); #nixd = prIsOpen.overlay 238779 (import ./nixd.nix); @@ -21,6 +21,7 @@ in nixpkgs.overlays = if isUnstable then [ + tailscale pls bruno signal-desktop diff --git a/overlays/tailscale.nix b/overlays/tailscale.nix index 2b0ab1d..652f5bf 100644 --- a/overlays/tailscale.nix +++ b/overlays/tailscale.nix @@ -1,31 +1,31 @@ let - version = "1.44.0"; + version = "1.52.0"; fetchArgs = { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-/SiQFkhVseLkjK7ePNzNyBs0r3XE3kHJ6CDTFjdCXec="; + hash = "sha256-mvsDM1kOLP/1LbTzmojquEF8HGy6Kb2cqJu7EnxEHPU="; }; - vendorHash = "sha256-fgCrmtJs1svFz0Xn7iwLNrbBNlcO6V0yqGPMY0+V1VQ="; + vendorHash = "sha256-WGZkpffwe4I8FewdBHXGaLbKQP/kHr7UF2lCXBTcNb4="; ldflags = [ "-X tailscale.com/version.longStamp=${version}" "-X tailscale.com/version.shortStamp=${version}" ]; - tailscale = _: super: { - tailscale = super.tailscale.overrideAttrs (_: { - src = super.fetchFromGitHub fetchArgs; - inherit vendorHash ldflags version; - }); - }; #tailscale = _: super: { - # tailscale = super.callPackage "${super.path}/pkgs/servers/tailscale" { - # buildGoModule = args: - # super.buildGo120Module (args // { - # src = super.fetchFromGitHub fetchArgs; - # inherit vendorHash ldflags version; - # }); - # }; + # tailscale = super.tailscale.overrideAttrs (_: { + # src = super.fetchFromGitHub fetchArgs; + # inherit vendorHash ldflags version; + # }); #}; + tailscale = _: super: { + tailscale = super.callPackage "${super.path}/pkgs/servers/tailscale" { + buildGoModule = args: + super.buildGo121Module (args // { + src = super.fetchFromGitHub fetchArgs; + inherit vendorHash ldflags version; + }); + }; + }; in tailscale