summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2022-01-13 15:01:53 +0800
committerGitHub <noreply@github.com>2022-01-13 15:01:53 +0800
commitdf3022f35ac566b9b7badb1f9f28f365f03a02a1 (patch)
tree8b56437bc6a553d252ee130e86b702e41328ca64
parentMerge pull request #154428 from r-ryantm/auto-update/victor-mono (diff)
parentheadscale: 0.11.0 -> 0.12.2 (diff)
downloadnixpkgs-df3022f35ac566b9b7badb1f9f28f365f03a02a1.tar.gz
Merge pull request #153705 from 06kellyjac/headscale
headscale: 0.11.0 -> 0.12.2
-rw-r--r--pkgs/servers/headscale/default.nix6
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix
index d3133a86c719..8057b56e9f39 100644
--- a/pkgs/servers/headscale/default.nix
+++ b/pkgs/servers/headscale/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "headscale";
- version = "0.11.0";
+ version = "0.12.2";
src = fetchFromGitHub {
owner = "juanfont";
repo = "headscale";
rev = "v${version}";
- sha256 = "sha256-grLYyVYlvqBNO5CVRVDTJKEi45Nsc6Bgs8I3pY7pZfg=";
+ sha256 = "sha256-PgSjxDmPahGd2o3QBfvytMva+LHWeLPm500DsNdB77Q=";
};
- vendorSha256 = "sha256-t7S1jE76AFFIePrFtvrIQcId7hLeNIAm/eA9AVoFy5E=";
+ vendorSha256 = "sha256-gD4jGaR4KQiYL6+yA8g2u6cTEbfySTMErNqerw76Ook=";
ldflags = [ "-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbb34fa55d7b..e6355f8f2f1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6346,7 +6346,9 @@ with pkgs;
heimdall-gui = heimdall.override { enableGUI = true; };
- headscale = callPackage ../servers/headscale { };
+ headscale = callPackage ../servers/headscale {
+ buildGoModule = buildGo117Module;
+ };
heisenbridge = callPackage ../servers/heisenbridge { };