flake: rewirte archive

.gitattributes

@@ -1 +0,0 @@
-flake/branch.nix merge=ours

flake.nix

@@ -68,11 +68,7 @@
     nixosConfigurations = import ./flake/nixos.nix { inherit inputs localLib; };
     overlays.default = final: prev:
       { localPackages = (import ./packages { inherit localLib; pkgs = final; topInputs = inputs; }); };
-    config =
-    {
-      branch = import ./flake/branch.nix;
-      dns = inputs.self.packages.x86_64-linux.dns-push.meta.config;
-    };
+    config.dns = inputs.self.packages.x86_64-linux.dns-push.meta.config;
     devShells.x86_64-linux = import ./flake/dev.nix { inherit inputs; };
     src = import ./flake/src.nix { inherit inputs; };
     apps.x86_64-linux.dns-push = { type = "app"; program = "${inputs.self.packages.x86_64-linux.dns-push}"; };

flake/branch.nix

@@ -1 +0,0 @@
-"production"

flake/packages.nix

@@ -46,7 +46,10 @@
   };
   archive = pkgs.writeText "archive" (builtins.concatStringsSep "\n" (builtins.concatLists
   [
-    (inputs.nixpkgs.lib.mapAttrsToList (_: v: v.config.system.build.toplevel) inputs.self.outputs.nixosConfigurations)
+    (inputs.nixpkgs.lib.mapAttrsToList
+      (_: v: (v.extendModules { modules = [{ config.system.includeBuildDependencies = true; }]; })
+        .config.system.build.toplevel)
+      inputs.self.outputs.nixosConfigurations)
     [ src ]
     (builtins.attrValues inputs)
   ]));

modules/system/default.nix

@@ -62,11 +62,7 @@ inputs:
       {
         versionSuffix = inputs.lib.mkForce "";
         tags = let inherit (inputs.topInputs) self; in
-        [
-          self.config.branch
-          (builtins.substring 2 6 self.lastModifiedDate)
-          (builtins.substring 0 6 self.rev or "dirty")
-        ];
+          [ (builtins.substring 2 6 self.lastModifiedDate) (builtins.substring 0 6 self.rev or "dirty") ];
       };
     };
   };

modules/system/nix.nix

@@ -69,8 +69,6 @@ inputs:
     }
     # marches
     { nix.settings.system-features = builtins.map (march: "gccarch-${march}") nix.marches; }
-    # includeBuildDependencies
-    { system.includeBuildDependencies = inputs.topInputs.self.config.branch == "archive"; }
     # remote.slave
     (inputs.lib.mkIf (nix.remote.slave != null)
     {