bootstrap command for traditional flakes.

Author: vic

.github/workflows/flake-check.yaml

@@ -16,11 +16,25 @@ jobs:
           templates=$(find templates -mindepth 2 -maxdepth 2  -name flake.nix -print0 | xargs -0 dirname | xargs -n 1 basename | jq -R | jq -sc)
           echo "$templates"
           echo "templates=$templates" >> $GITHUB_OUTPUT
-  bootstrap:
-    name: Bootstrap
+  bootstrap-command:
+    name: Bootstrap command
     runs-on: ubuntu-latest
     env:
-      NIX_PATH: "nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz"
+      NIX_PATH: "nixpkgs=https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
+    steps:
+      - uses: wimpysworld/nothing-but-nix@main
+      - uses: cachix/install-nix-action@v31
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: actions/checkout@v4
+      - run: echo '{ }' > flake.nix
+      - run: nix-shell "https://github.com/$GITHUB_REPOSITORY/archive/$GITHUB_SHA.zip" -A flake-file.sh --run bootstrap
+      - run: grep inputs.flake-file.flakeModules.flake flake.nix
+      - run: grep github:vic/flake-file flake.nix
+  bootstrap-tests:
+    name: Bootstrap apps
+    runs-on: ubuntu-latest
+    env:
+      NIX_PATH: "nixpkgs=https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
     steps:
       - uses: wimpysworld/nothing-but-nix@main
       - uses: cachix/install-nix-action@v31

modules/bootstrap/default.nix

@@ -2,8 +2,9 @@
   pkgs ? import <nixpkgs> { },
   modules ? [ ],
   outdir ? ".",
-  bootstrap ? [ ],
+  inputs ? null,
   outputs ? null,
+  do-not-edit ? null,
   import-tree ? (
     pkgs.fetchFromGitHub {
       owner = "vic";
@@ -24,15 +25,6 @@ let
     type = lib.types.submodule { freeformType = lib.types.lazyAttrsOf lib.types.unspecified; };
   };
 
-  bootstrapInputs =
-    let
-      ins = import ./inputs.nix { inherit lib; };
-      take = name: { flake-file.inputs.${name} = ins.flake-file.inputs.${name}; };
-      names =
-        if bootstrap == true then lib.attrNames ins.flake-file.inputs else lib.flatten [ bootstrap ];
-    in
-    map take names;
-
   module = {
     imports = [
       tree
@@ -45,8 +37,11 @@ let
       ./../write-flake.nix
       ./../write-lock.nix
       ./../flake-options.nix
-      { imports = bootstrapInputs; }
-      (if outputs == null then { } else { flake-file.outputs = outputs; })
+      (lib.optionalAttrs (inputs != null) { flake-file.inputs = inputs; })
+      (lib.optionalAttrs (outputs != null) { flake-file.outputs = strOrFile outputs; })
+      (lib.optionalAttrs (do-not-edit != null) { flake-file.do-not-edit = strOrFile do-not-edit; })
+
+      bootstrap-app
     ];
     config.flake-file.intoPath = outdir;
     options = {
@@ -56,10 +51,34 @@ let
     };
   };
 
-  evaled = lib.evalModules {
-    modules = [ module ];
-    specialArgs.inputs.self.outPath = "";
+  strOrFile = str: if builtins.isPath str then builtins.readFile str else str;
+
+  bootstrap-app = {
+    flake-file.apps.bootstrap =
+      pkgs:
+      let
+        inputs = ''{ flake-file.url = "github:vic/flake-file"; }'';
+        notice = pkgs.writeText "notice" ''
+          # DO-NOT-EDIT. Generated by github:vic/flake-file from flake-file.nix. Regen with:
+          # nix-shell https://github.com/vic/flake-file/archive/main.zip -A flake-file.sh --run bootstrap
+        '';
+      in
+      pkgs.writeShellApplication {
+        name = "bootstrap";
+        text = ''
+          if ! test -f flake-file.nix; then
+            cp flake.nix flake-file.nix
+          fi
+          nix-shell ${../..} -A flake-file.sh --run write-flake \
+            --arg modules ./flake-file.nix \
+            --arg do-not-edit ${notice} \
+            --argstr outputs flake-module \
+            --arg inputs '${inputs}'
+        '';
+      };
   };
 
+  evaled = lib.evalModules { modules = [ module ]; };
+
 in
 evaled.config

modules/bootstrap/inputs.nix

@@ -4,7 +4,7 @@
     import-tree.url = lib.mkDefault "github:vic/import-tree";
     flake-file.url = lib.mkDefault "github:vic/flake-file";
     flake-parts.url = lib.mkDefault "github:hercules-ci/flake-parts";
-    flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
+    flake-parts.inputs.nixpkgs-lib.follows = lib.mkDefault "nixpkgs";
     nixpkgs.url = lib.mkDefault "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
   };
 }

modules/default.nix

@@ -1,7 +1,8 @@
 let
   flakeModules = {
     inherit
-      default
+      flake # for non-flake-parts flakes
+      default # for flake-parts flakes (keep as default for compatibility)
       allfollow
       nix-auto-follow
       dendritic
@@ -13,6 +14,13 @@ let
       ;
   };
 
+  # A flake without flake-parts. (traditional flake)
+  flake.imports = [
+    base
+    flake-options
+    ./write-flake.nix
+  ];
+
   flake-options = ./flake-options.nix;
 
   base.imports = [

modules/flake-options.nix

@@ -1,6 +1,6 @@
 { lib, config, ... }:
 let
-  outputsOption = lib.mkOption { type = lib.type.functionTo outputsType; };
+  outputsOption = lib.mkOption { type = lib.types.functionTo outputsType; };
 
   outputsType = lib.types.submoduleWith {
     modules = [

modules/options/outputs.nix

@@ -13,7 +13,7 @@ let
       inputs:
         (inputs.nixpkgs.lib.evalModules {
           specialArgs = { inherit inputs; inherit (inputs) self; };
-          modules = [ ./flake-file.nix ];
+          modules = [ inputs.flake-file.flakeModules.flake  ./flake-file.nix ];
         }).config.outputs inputs
     '';
 

modules/write-flake.nix

@@ -87,7 +87,7 @@ let
       name = "write-flake";
       text = ''
         cd ${config.flake-file.intoPath}
-        cp --no-preserve=mode ${formatted pkgs} flake.nix
+        cat ${formatted pkgs} > flake.nix
         ${hooks}
       '';
     };