flake.nix: refactor and correctly propagate tailscale version when de…

…ploying with nix - use flake-parts instead of flake-utils - fix wrong version info by setting ldflags `"-X tailscale.com/version.longStamp=${tsVersion}"` and `"-X tailscale.com/version.shortStamp=${tsVersion}"`, where `tsVersion` is matched from `go.mod` using regex - originally, `services.golink.package` is set to `pkgs.golink` by default (which is fine), however, the module does not apply the defined overlay, causing the module to use [the outdated golink from nixpkgs](https://search.nixos.org/packages?channel=unstable&show=golink&from=0&size=50&sort=relevance&type=packages&query=golink) - update the dev shell go from 1.21 to 1.23 Signed-off-by: Yifei Sun <[email protected]>
tailscale · Dec 30, 2024 · b692e31 · b692e31
1 parent d55b2a3
commit b692e31
Show file tree

Hide file tree

Showing 2 changed files with 162 additions and 165 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,159 +3,143 @@
 
   inputs = {
     nixpkgs.url = "nixpkgs/nixpkgs-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
+    parts.url = "github:hercules-ci/flake-parts";
+    systems.url = "github:nix-systems/default";
   };
 
-  outputs =
-    { self
-    , nixpkgs
-    , flake-utils
-    , ...
-    }:
-    let
-      golinkVersion =
-        if (self ? shortRev)
-        then self.shortRev
-        else "dev";
-    in
-    {
-      overlay = final: prev:
-        let
-          pkgs = nixpkgs.legacyPackages.${prev.system};
-        in
-        rec {
-          golink = pkgs.buildGo123Module rec {
-            pname = "golink";
-            version = golinkVersion;
-            src = pkgs.nix-gitignore.gitignoreSource [ ] ./.;
-
-            vendorHash = "sha256-myGEAOCJkeKGTzyLD6yBC10yHULxcbOnzseGVtYD7qM="; # SHA based on vendoring go.mod
-          };
+  outputs = inputs @ { self, parts, ... }: parts.lib.mkFlake { inherit inputs; } {
+    systems = import inputs.systems;
+
+    perSystem = { pkgs, ... }: {
+      formatter = pkgs.nixpkgs-fmt;
+
+      devShells.default = pkgs.mkShell { buildInputs = [ pkgs.go_1_23 ]; };
+
+      packages.default =
+        pkgs.buildGo123Module {
+          pname = "golink";
+          version =
+            if (self ? shortRev)
+            then self.shortRev
+            else "dev";
+          src = pkgs.nix-gitignore.gitignoreSource [ ] ./.;
+          ldflags =
+            let
+              tsVersion = with builtins; head (match
+                ".*tailscale.com v([0-9]+\.[0-9]+\.[0-9]+-[a-zA-Z]+).*"
+                (readFile ./go.mod));
+            in
+            [
+              "-w"
+              "-s"
+              "-X tailscale.com/version.longStamp=${tsVersion}"
+              "-X tailscale.com/version.shortStamp=${tsVersion}"
+            ];
+          vendorHash = "sha256-myGEAOCJkeKGTzyLD6yBC10yHULxcbOnzseGVtYD7qM="; # SHA based on vendoring go.mod
         };
-    }
-    // flake-utils.lib.eachDefaultSystem
-      (system:
+    };
+
+    flake.overlays.default = final: prev: {
+      golink = self.packages.${prev.system}.default;
+    };
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }:
       let
-        pkgs = import nixpkgs {
-          overlays = [ self.overlay ];
-          inherit system;
-        };
+        cfg = config.services.golink;
+        inherit (lib)
+          concatStringsSep
+          escapeShellArg
+          mkEnableOption
+          mkIf
+          mkOption
+          optionalString
+          optionals
+          types
+          ;
       in
-      rec {
-        # `nix develop`
-        devShell = pkgs.mkShell { buildInputs = [ pkgs.go_1_21 ]; };
+      {
+        options.services.golink = {
+          enable = mkEnableOption "Enable golink";
+
+          package = mkOption {
+            type = types.package;
+            description = ''
+              golink package to use
+            '';
+            default = pkgs.golink;
+          };
 
-        # `nix build`
-        packages = with pkgs; {
-          inherit golink;
-        };
+          dataDir = mkOption {
+            type = types.path;
+            default = "/var/lib/golink";
+            description = "Path to data dir";
+          };
 
-        defaultPackage = pkgs.golink;
+          user = mkOption {
+            type = types.str;
+            default = "golink";
+            description = "User account under which golink runs.";
+          };
+
+          group = mkOption {
+            type = types.str;
+            default = "golink";
+            description = "Group account under which golink runs.";
+          };
 
-        # `nix run`
-        apps.golink = flake-utils.lib.mkApp {
-          drv = packages.golink;
+          databaseFile = mkOption {
+            type = types.path;
+            default = "/var/lib/golink/golink.db";
+            description = "Path to SQLite database";
+          };
+
+          tailscaleAuthKeyFile = mkOption {
+            type = types.path;
+            description = "Path to file containing the Tailscale Auth Key";
+          };
+
+          verbose = mkOption {
+            type = types.bool;
+            default = false;
+          };
         };
-        defaultApp = apps.golink;
-
-        overlays.default = self.overlay;
-      })
-    // {
-      nixosModules.default =
-        { pkgs
-        , lib
-        , config
-        , ...
-        }:
-        let
-          cfg = config.services.golink;
-        in
-        {
-          options = with lib; {
-            services.golink = {
-              enable = mkEnableOption "Enable golink";
-
-              package = mkOption {
-                type = types.package;
-                description = ''
-                  golink package to use
-                '';
-                default = pkgs.golink;
-              };
-
-              dataDir = mkOption {
-                type = types.path;
-                default = "/var/lib/golink";
-                description = "Path to data dir";
-              };
-
-              user = mkOption {
-                type = types.str;
-                default = "golink";
-                description = "User account under which golink runs.";
-              };
-
-              group = mkOption {
-                type = types.str;
-                default = "golink";
-                description = "Group account under which golink runs.";
-              };
-
-              databaseFile = mkOption {
-                type = types.path;
-                default = "/var/lib/golink/golink.db";
-                description = "Path to SQLite database";
-              };
-
-              tailscaleAuthKeyFile = mkOption {
-                type = types.path;
-                description = "Path to file containing the Tailscale Auth Key";
-              };
-
-              verbose = mkOption {
-                type = types.bool;
-                default = false;
-              };
-            };
+
+        config = mkIf cfg.enable {
+          nixpkgs.overlays = [ self.overlays.default ];
+
+          users.groups."${cfg.group}" = { };
+          users.users."${cfg.user}" = {
+            home = cfg.dataDir;
+            createHome = true;
+            group = "${cfg.group}";
+            isSystemUser = true;
+            isNormalUser = false;
+            description = "user for golink service";
           };
-          config = lib.mkIf cfg.enable {
-            users.users."${cfg.user}" = {
-              home = cfg.dataDir;
-              createHome = true;
-              group = "${cfg.group}";
-              isSystemUser = true;
-              isNormalUser = false;
-              description = "user for golink service";
-            };
-            users.groups."${cfg.group}" = { };
-
-            systemd.services.golink = {
-              enable = true;
-              script =
-                let
-                  args =
-                    [
-                      "--sqlitedb ${cfg.databaseFile}"
-                    ]
-                    ++ lib.optionals cfg.verbose [ "--verbose" ];
-                in
-                ''
-                  ${lib.optionalString (cfg.tailscaleAuthKeyFile != null) ''
-                    export TS_AUTHKEY="$(head -n1 ${lib.escapeShellArg cfg.tailscaleAuthKeyFile})"
-                  ''}
-
-                  ${cfg.package}/bin/golink ${builtins.concatStringsSep " " args}
-                '';
-              wantedBy = [ "multi-user.target" ];
-              serviceConfig = {
-                User = cfg.user;
-                Group = cfg.group;
-                Restart = "always";
-                RestartSec = "15";
-                WorkingDirectory = "${cfg.dataDir}";
-              };
+
+          systemd.services.golink = {
+            enable = true;
+            script =
+              let
+                args = [ "--sqlitedb ${cfg.databaseFile}" ] ++ optionals cfg.verbose [ "--verbose" ];
+              in
+              ''
+                ${optionalString (cfg.tailscaleAuthKeyFile != null) ''
+                  export TS_AUTHKEY="$(head -n1 ${escapeShellArg cfg.tailscaleAuthKeyFile})"
+                ''}
+
+                ${cfg.package}/bin/golink ${concatStringsSep " " args}
+              '';
+            wantedBy = [ "multi-user.target" ];
+            serviceConfig = {
+              User = cfg.user;
+              Group = cfg.group;
+              Restart = "always";
+              RestartSec = "15";
+              WorkingDirectory = "${cfg.dataDir}";
             };
           };
         };
-    };
+      };
+  };
 }