Merge branch 'main' into fix-https-listen

flake.lock

@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1662019588,
-        "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=",
+        "lastModified": 1664106353,
+        "narHash": "sha256-HMJP80+DSxFySpWyuxz5+iNozS3+dVt0b4n6YMIU5/8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2da64a81275b68fdad38af669afeda43d401e94b",
+        "rev": "79d3ca08920364759c63fd3eb562e99c0c17044a",
         "type": "github"
       },
       "original": {

flake.nix

@@ -6,18 +6,22 @@
     flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, flake-utils, ... }:
-    let
-      headscaleVersion = if (self ? shortRev) then self.shortRev else "dev";
+  outputs = {
+    self,
+    nixpkgs,
+    flake-utils,
+    ...
+  }: let
+    headscaleVersion =
+      if (self ? shortRev)
+      then self.shortRev
+      else "dev";
   in
     {
-      overlay = final: prev:
-        let
+      overlay = _: prev: let
         pkgs = nixpkgs.legacyPackages.${prev.system};
-        in
-        rec {
-          headscale =
-            pkgs.buildGo119Module rec {
+      in rec {
+        headscale = pkgs.buildGo119Module rec {
           pname = "headscale";
           version = headscaleVersion;
           src = pkgs.lib.cleanSource self;
@@ -26,11 +30,10 @@
           # update this if you have a mismatch after doing a change to thos files.
           vendorSha256 = "sha256-DosFCSiQ5FURbIrt4NcPGkExc84t2MGMqe9XLxNHdIM=";
 
-              ldflags = [ "-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}" ];
+          ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"];
         };
 
-          golines =
-            pkgs.buildGoModule rec {
+        golines = pkgs.buildGoModule rec {
           pname = "golines";
           version = "0.9.0";
 
@@ -43,7 +46,7 @@
 
           vendorSha256 = "sha256-sEzWUeVk5GB0H41wrp12P8sBWRjg0FHUX6ABDEEBqK8=";
 
-              nativeBuildInputs = [ pkgs.installShellFiles ];
+          nativeBuildInputs = [pkgs.installShellFiles];
         };
 
         golangci-lint = prev.golangci-lint.override {
@@ -69,8 +72,7 @@
         #     nativeBuildInputs = [ pkgs.installShellFiles ];
         #   };
 
-          protoc-gen-grpc-gateway =
-            pkgs.buildGoModule rec {
+        protoc-gen-grpc-gateway = pkgs.buildGoModule rec {
           pname = "grpc-gateway";
           version = "2.8.0";
 
@@ -83,21 +85,22 @@
 
           vendorSha256 = "sha256-AW2Gn/mlZyLMwF+NpK59eiOmQrYWW/9HPjbunYc9Ij4=";
 
-              nativeBuildInputs = [ pkgs.installShellFiles ];
+          nativeBuildInputs = [pkgs.installShellFiles];
 
-              subPackages = [ "protoc-gen-grpc-gateway" "protoc-gen-openapiv2" ];
+          subPackages = ["protoc-gen-grpc-gateway" "protoc-gen-openapiv2"];
         };
       };
-    } // flake-utils.lib.eachDefaultSystem
-      (system:
-        let
+    }
+    // flake-utils.lib.eachDefaultSystem
+    (system: let
       pkgs = import nixpkgs {
-            overlays = [ self.overlay ];
+        overlays = [self.overlay];
         inherit system;
       };
-          buildDeps = with pkgs; [ git go_1_19 gnumake ];
+      buildDeps = with pkgs; [git go_1_19 gnumake];
       devDeps = with pkgs;
-            buildDeps ++ [
+        buildDeps
+        ++ [
           golangci-lint
           golines
           nodePackages.prettier
@@ -111,7 +114,6 @@
           clang-tools # clang-format
         ];
 
-
       # Add entry to build a docker image with headscale
       # caveat: only works on Linux
       #
@@ -121,13 +123,12 @@
       headscale-docker = pkgs.dockerTools.buildLayeredImage {
         name = "headscale";
         tag = headscaleVersion;
-            contents = [ pkgs.headscale ];
-            config.Entrypoint = [ (pkgs.headscale + "/bin/headscale") ];
+        contents = [pkgs.headscale];
+        config.Entrypoint = [(pkgs.headscale + "/bin/headscale")];
       };
-        in
-        rec {
+    in rec {
       # `nix develop`
-          devShell = pkgs.mkShell { buildInputs = devDeps; };
+      devShell = pkgs.mkShell {buildInputs = devDeps;};
 
       # `nix build`
       packages = with pkgs; {
@@ -144,7 +145,8 @@
       defaultApp = apps.headscale;
 
       checks = {
-            format = pkgs.runCommand "check-format"
+        format =
+          pkgs.runCommand "check-format"
           {
             buildInputs = with pkgs; [
               gnumake
@@ -162,7 +164,5 @@
             ${pkgs.clang-tools}/bin/clang-format -style="{BasedOnStyle: Google, IndentWidth: 4, AlignConsecutiveDeclarations: true, AlignConsecutiveAssignments: true, ColumnLimit: 0}" -i ${./.}
           '';
       };
-
-
     });
 }