From 42a4e0a0fbf4d724057261fa1477f27567d51de2 Mon Sep 17 00:00:00 2001 From: Victor Borja Date: Sun, 15 Mar 2026 00:05:43 -0600 Subject: [PATCH 1/2] use nothing-but-nix@v10 --- .github/workflows/flake-check.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/flake-check.yaml b/.github/workflows/flake-check.yaml index 0c0135a..dfc5ee4 100644 --- a/.github/workflows/flake-check.yaml +++ b/.github/workflows/flake-check.yaml @@ -22,7 +22,7 @@ jobs: env: NIX_PATH: "nixpkgs=https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" steps: - - uses: wimpysworld/nothing-but-nix@main + - uses: wimpysworld/nothing-but-nix@v10 - uses: cachix/install-nix-action@v31 - uses: DeterminateSystems/magic-nix-cache-action@main - uses: actions/checkout@v4 @@ -43,7 +43,7 @@ jobs: env: NIX_PATH: "nixpkgs=https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" steps: - - uses: wimpysworld/nothing-but-nix@main + - uses: wimpysworld/nothing-but-nix@v10 - uses: cachix/install-nix-action@v31 - uses: DeterminateSystems/magic-nix-cache-action@main - uses: actions/checkout@v4 @@ -58,7 +58,7 @@ jobs: exclude: - template: minimal steps: - - uses: wimpysworld/nothing-but-nix@main + - uses: wimpysworld/nothing-but-nix@v10 - uses: cachix/install-nix-action@v31 - uses: DeterminateSystems/magic-nix-cache-action@main - run: | @@ -85,7 +85,7 @@ jobs: if: ${{ contains(github.event.pull_request.labels.*.name, 'npins') }} steps: - uses: actions/checkout@v4 - - uses: wimpysworld/nothing-but-nix@main + - uses: wimpysworld/nothing-but-nix@v10 - uses: cachix/install-nix-action@v31 - uses: DeterminateSystems/magic-nix-cache-action@main - run: | @@ -103,7 +103,7 @@ jobs: NIX_PATH: "nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz" steps: - uses: actions/checkout@v4 - - uses: wimpysworld/nothing-but-nix@main + - uses: wimpysworld/nothing-but-nix@v10 - uses: cachix/install-nix-action@v31 - uses: DeterminateSystems/magic-nix-cache-action@main - run: | @@ -120,7 +120,7 @@ jobs: NIX_PATH: "nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz" steps: - uses: actions/checkout@v4 - - uses: wimpysworld/nothing-but-nix@main + - uses: wimpysworld/nothing-but-nix@v10 - uses: cachix/install-nix-action@v31 - uses: DeterminateSystems/magic-nix-cache-action@main - run: | @@ -134,7 +134,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: wimpysworld/nothing-but-nix@main + - uses: wimpysworld/nothing-but-nix@v10 - uses: cachix/install-nix-action@v31 - uses: DeterminateSystems/magic-nix-cache-action@main - run: cd dev && nix flake check && nix flake metadata && nix flake check @@ -143,7 +143,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: wimpysworld/nothing-but-nix@main + - uses: wimpysworld/nothing-but-nix@v10 - uses: cachix/install-nix-action@v31 - uses: DeterminateSystems/magic-nix-cache-action@main - run: nix run -L ./dev#fmt -- --ci From d10b139d7cd0f7f7241253b4466b0e686c088b01 Mon Sep 17 00:00:00 2001 From: Victor Borja Date: Sun, 15 Mar 2026 22:53:18 -0600 Subject: [PATCH 2/2] feat(core): Add flake-file.preProcess option to allow customizing inputs before giving them to backend. --- modules/nixlock/default.nix | 7 +------ modules/npins/default.nix | 2 +- modules/write-flake.nix | 2 +- modules/write-inputs.nix | 8 +++++++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/nixlock/default.nix b/modules/nixlock/default.nix index 0f29545..8214c01 100644 --- a/modules/nixlock/default.nix +++ b/modules/nixlock/default.nix @@ -3,7 +3,7 @@ let inherit (config) flake-file; inherit (import ../lib.nix lib) inputsExpr; - inputs = flake-file.nixlock.preProcess (inputsExpr flake-file.inputs); + inputs = flake-file.preProcess (inputsExpr flake-file.inputs); nixlock-source = fetchTarball { url = flake-file.nixlock.url; @@ -166,10 +166,5 @@ in description = "nixlock custom input types"; default = { }; }; - preProcess = lib.mkOption { - type = lib.types.functionTo lib.types.raw; - description = "Pre-process flake-file inputs before giving to nixlock"; - default = lib.id; - }; }; } diff --git a/modules/npins/default.nix b/modules/npins/default.nix index 95c7ba4..5055d36 100644 --- a/modules/npins/default.nix +++ b/modules/npins/default.nix @@ -3,7 +3,7 @@ let inherit (config) flake-file; inherit (import ../lib.nix lib) inputsExpr; - inputs = inputsExpr flake-file.inputs; + inputs = flake-file.preProcess (inputsExpr flake-file.inputs); # Synthesise a canonical URL from attrset-form inputs (no url field). gitHostScheme = { github = "github"; gitlab = "gitlab"; sourcehut = "sourcehut"; }; diff --git a/modules/write-flake.nix b/modules/write-flake.nix index 06fa5e7..4062a73 100644 --- a/modules/write-flake.nix +++ b/modules/write-flake.nix @@ -63,7 +63,7 @@ let flakeInputs = "inputs = ${ nixCode { - expr = inputsExpr flake-file.inputs; + expr = flake-file.preProcess (inputsExpr flake-file.inputs); styles = [ { attrSortPriority = sortPriority.inputs; diff --git a/modules/write-inputs.nix b/modules/write-inputs.nix index a73cbf0..767550b 100644 --- a/modules/write-inputs.nix +++ b/modules/write-inputs.nix @@ -8,7 +8,7 @@ let # DO-NOT-EDIT: Generated by github:vic/flake-file. # To re-generate use: nix-shell . -A flake-file.sh --run write-inputs '' - + (nixCode { expr = inputsExpr flake-file.inputs; }); + + (nixCode { expr = flake-file.preProcess (inputsExpr flake-file.inputs); }); inputsFile = pkgs: @@ -77,5 +77,11 @@ in visible = false; default = shell flake-file.pkgs; }; + + preProcess = lib.mkOption { + type = lib.types.functionTo lib.types.raw; + description = "Pre-process flake-file inputs before giving to backend"; + default = lib.id; + }; }; }