From 6d412797812f0da7d69d06a8918d79c3f40f649f Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Thu, 17 Mar 2022 18:07:26 +0000 Subject: [PATCH] Upgrade to go 1.18 --- flake.lock | 8 ++++---- flake.nix | 30 ++++++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index b25969cf..7368f5f1 100644 --- a/flake.lock +++ b/flake.lock @@ -17,16 +17,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1646254136, - "narHash": "sha256-8nQx02tTzgYO21BP/dy5BCRopE8OwE8Drsw98j+Qoaw=", + "lastModified": 1647536224, + "narHash": "sha256-SUIiz4DhMXgM7i+hvFWmLnhywr1WeRGIz+EIbwQQguM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e072546ea98db00c2364b81491b893673267827", + "rev": "dd8cebebbf0f9352501f251ac37b851d947f92dc", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable", + "ref": "master", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index 76e1acf7..6b3bf725 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,10 @@ description = "headscale - Open Source Tailscale Control server"; inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable"; + # TODO: Use unstable when Go 1.18 has made it in + # https://nixpk.gs/pr-tracker.html?pr=164292 + # nixpkgs.url = "nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "nixpkgs/master"; flake-utils.url = "github:numtide/flake-utils"; }; @@ -53,7 +56,7 @@ }; headscale = - pkgs.buildGo117Module rec { + pkgs.buildGo118Module rec { pname = "headscale"; version = headscaleVersion; src = pkgs.lib.cleanSource self; @@ -72,7 +75,7 @@ overlays = [ self.overlay ]; inherit system; }; - buildDeps = with pkgs; [ git go_1_17 gnumake ]; + buildDeps = with pkgs; [ git go_1_18 gnumake ]; devDeps = with pkgs; buildDeps ++ [ golangci-lint @@ -110,8 +113,8 @@ packages = with pkgs; { inherit headscale; inherit headscale-docker; - }; + defaultPackage = pkgs.headscale; # `nix run` @@ -120,6 +123,25 @@ }; defaultApp = apps.headscale; + checks = { + format = pkgs.runCommand "check-format" + { + buildInputs = with pkgs; [ + nixpkgs-fmt + golangci-lint + nodePackages.prettier + golines + clang-tools + ]; + } '' + ${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt ${./.} + ${pkgs.golangci-lint}/bin/golangci-lint run --fix --timeout 10m + ${pkgs.nodePackages.prettier}/bin/prettier --write '**/**.{ts,js,md,yaml,yml,sass,css,scss,html}' + ${pkgs.golines}/bin/golines --max-len=88 --base-formatter=gofumpt -w ${./.} + ${pkgs.clang-tools}/bin/clang-format -style="{BasedOnStyle: Google, IndentWidth: 4, AlignConsecutiveDeclarations: true, AlignConsecutiveAssignments: true, ColumnLimit: 0}" -i ${./.} + ''; + }; + }); }