From 373db0dc5ec90299efe5a34a11838d53b4c06744 Mon Sep 17 00:00:00 2001 From: Juan Font Alonso Date: Sat, 3 Sep 2022 23:05:34 +0200 Subject: [PATCH 1/2] Switch to nix unstable --- flake.lock | 14 +++++++------- flake.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 1c16c063..45b4c6d7 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -17,16 +17,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1654847188, - "narHash": "sha256-MC+eP7XOGE1LAswOPqdcGoUqY9mEQ3ZaaxamVTbc0hM=", + "lastModified": 1662019588, + "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b66e3f2ebcc644b78cec9d6f152192f4e7d322f", + "rev": "2da64a81275b68fdad38af669afeda43d401e94b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 62631bfa..6553c147 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "headscale - Open Source Tailscale Control server"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; }; From 663dbf73952a74d5f8c0e741518903f2afb395ee Mon Sep 17 00:00:00 2001 From: Juan Font Alonso Date: Sat, 3 Sep 2022 23:06:21 +0200 Subject: [PATCH 2/2] Use go 1.19 in Nix --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 6553c147..ccfd8bc1 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ in rec { headscale = - pkgs.buildGo118Module rec { + pkgs.buildGo119Module rec { pname = "headscale"; version = headscaleVersion; src = pkgs.lib.cleanSource self; @@ -95,7 +95,7 @@ overlays = [ self.overlay ]; inherit system; }; - buildDeps = with pkgs; [ git go_1_18 gnumake ]; + buildDeps = with pkgs; [ git go_1_19 gnumake ]; devDeps = with pkgs; buildDeps ++ [ golangci-lint