Compare commits

..

6 Commits

Author SHA1 Message Date
github-actions[bot]
1b564b2054 automated: Update flake.lock
Some checks failed
Check Nix flake / Perform Nix flake checks (ubuntu-latest) (pull_request) Successful in 3m58s
Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 22s
Check Nix formatting / Perform Nix format checks (pull_request) Failing after 15m13s
Check Nix flake / Build nix outputs (ubuntu-latest) (pull_request) Failing after 17m49s
- The following Nix Flake inputs were updated:

```
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/ef3a956f697525883b77192cbe208233ea0f8f79?narHash=sha256-oxI9TLgnQbQ/WL0tIwVSIooLbXq4PW1QUhf5aQmXFgk%3D' (2025-04-09)
  → 'github:nixos/nixpkgs/6b93024f590b15b1f3888fcc6e56a0866e0c26c2?narHash=sha256-dIPrBepej1ebT1IaWEFLI5mpQO65%2BoM%2BSArkrNI9gjo%3D' (2025-04-11)
```

```
comparing packages.x86_64-linux.default:
<<< /nix/store/5fccy69jpxgpjv9sqsxkamz0jcqhdppk-flupdt-env.drv
>>> /nix/store/axwmn6rkqbcly5x9c12lxvsvra4cm0ka-flupdt-env.drv
Version changes:
[U.]  #1  uv  0.6.13, 0.6.13-vendor, 0.6.13-vendor-staging -> 0.6.14, 0.6.14-vendor, 0.6.14-vendor-staging
Added packages:
[A.]  #1  m2jy8gypx2nrj74vv9xf3mf36982fj9k-source  <none>
Removed packages:
[R.]  #1  004h7003giz15aqr1vhi0z8jxrdz74ag-source  <none>
Closure size: 1272 -> 1272 (24 paths added, 24 paths removed, delta +0, disk usage +0B).

comparing checks.x86_64-linux.pre-commit-check:
<<< /nix/store/sq83g40mkhff3yd2p0xibgv2j7ra9ka5-pre-commit-run.drv
>>> /nix/store/214f2vp8h2n6qvlxh22ijwqabk9g9bsa-pre-commit-run.drv
Added packages:
[A+]  #1  m2jy8gypx2nrj74vv9xf3mf36982fj9k-source  <none>
Removed packages:
[R-]  #1  004h7003giz15aqr1vhi0z8jxrdz74ag-source  <none>
Closure size: 2547 -> 2547 (9 paths added, 9 paths removed, delta +0, disk usage +40B).

comparing formatter.x86_64-linux:
<<< /nix/store/1m5lfqhasqn9wqzbqzsqfw7abgwnqn46-nixfmt-unstable-2025-04-04.drv
>>> /nix/store/1m5lfqhasqn9wqzbqzsqfw7abgwnqn46-nixfmt-unstable-2025-04-04.drv
No version or selection state changes.
Closure size: 1307 -> 1307 (0 paths added, 0 paths removed, delta +0, disk usage +0B).

comparing packages.x86_64-linux.flupdt:
<<< /nix/store/5fccy69jpxgpjv9sqsxkamz0jcqhdppk-flupdt-env.drv
>>> /nix/store/axwmn6rkqbcly5x9c12lxvsvra4cm0ka-flupdt-env.drv
Version changes:
[U.]  #1  uv  0.6.13, 0.6.13-vendor, 0.6.13-vendor-staging -> 0.6.14, 0.6.14-vendor, 0.6.14-vendor-staging
Added packages:
[A.]  #1  m2jy8gypx2nrj74vv9xf3mf36982fj9k-source  <none>
Removed packages:
[R.]  #1  004h7003giz15aqr1vhi0z8jxrdz74ag-source  <none>
Closure size: 1272 -> 1272 (24 paths added, 24 paths removed, delta +0, disk usage +0B).

comparing devShells.x86_64-linux.default:
<<< /nix/store/gijsq2j5vymzrbh08bkb1sqgd3g95dfs-nix-shell.drv
>>> /nix/store/q5vsdbikbilx0cg01bfs2p12hpnyb9h4-nix-shell.drv
Version changes:
[U*]  #1  uv  0.6.13, 0.6.13-vendor, 0.6.13-vendor-staging -> 0.6.14, 0.6.14-vendor, 0.6.14-vendor-staging
Added packages:
[A.]  #1  m2jy8gypx2nrj74vv9xf3mf36982fj9k-source  <none>
Removed packages:
[R.]  #1  004h7003giz15aqr1vhi0z8jxrdz74ag-source  <none>
Closure size: 2634 -> 2634 (45 paths added, 45 paths removed, delta +0, disk usage +40B).

```

Auto-generated by [update.yml][1] with the help of
[create-pull-request][2].

[1]: https://nayeonie.com/ahuston-0/nix-dotfiles/src/branch/main/.github/workflows/flake-update.yml
[2]: https://forgejo.stefka.eu/jiriks74/create-pull-request
2025-04-11 12:06:22 +00:00
2bf76c2adf Merge pull request 'accept flake config by default' (#13) from feature/logging-and-exit into main
All checks were successful
Check flake.lock / Check health of `flake.lock` (push) Successful in 7s
Check Nix formatting / Perform Nix format checks (push) Successful in 2m26s
Check Nix flake / Perform Nix flake checks (ubuntu-latest) (push) Successful in 3m50s
Check Nix flake / Build nix outputs (ubuntu-latest) (push) Successful in 5m8s
Update flakes / update_lockfile (push) Successful in 9m27s
Reviewed-on: #13
2025-04-10 15:59:19 -04:00
90deb23e94 temp remove attic cache
All checks were successful
Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 8s
Check Nix flake / Build nix outputs (ubuntu-latest) (pull_request) Successful in 3m3s
Check Nix flake / Perform Nix flake checks (ubuntu-latest) (pull_request) Successful in 3m42s
Check Nix formatting / Perform Nix format checks (pull_request) Successful in 2m16s
2025-04-10 15:50:56 -04:00
24cb8609e8 enable fallback 2025-04-10 15:50:56 -04:00
b31026260a accept flake config by default 2025-04-10 15:50:56 -04:00
88a8981713 Merge pull request 'automated: Update flake.lock' (#10) from update-flake-lock into main
Some checks failed
Check flake.lock / Check health of `flake.lock` (push) Successful in 17s
Check Nix formatting / Perform Nix format checks (push) Successful in 2m55s
Check Nix flake / Build nix outputs (ubuntu-latest) (push) Successful in 3m23s
Check Nix flake / Perform Nix flake checks (ubuntu-latest) (push) Failing after 6m8s
Reviewed-on: #10
2025-04-10 15:50:36 -04:00
5 changed files with 9 additions and 8 deletions

6
flake.lock generated
View File

@ -57,11 +57,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1744174375,
"narHash": "sha256-oxI9TLgnQbQ/WL0tIwVSIooLbXq4PW1QUhf5aQmXFgk=",
"lastModified": 1744348691,
"narHash": "sha256-dIPrBepej1ebT1IaWEFLI5mpQO65+oM+SArkrNI9gjo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ef3a956f697525883b77192cbe208233ea0f8f79",
"rev": "6b93024f590b15b1f3888fcc6e56a0866e0c26c2",
"type": "github"
},
"original": {

View File

@ -4,7 +4,7 @@
nixConfig = {
substituters = [
"https://cache.nixos.org/?priority=1&want-mass-query=true"
"https://attic.nayeonie.com/nix-cache"
#"https://attic.nayeonie.com/nix-cache"
"https://nix-community.cachix.org/?priority=10&want-mass-query=true"
];
trusted-substituters = [
@ -17,6 +17,7 @@
"nix-cache:trR+y5nwpQHR4hystoogubFmp97cewkjWeqqbygRQRs="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
fallback = true;
};
inputs = {

View File

@ -23,7 +23,7 @@ def build_output(path: str, output: str) -> str | None:
"""
logger.info(f"build {output}")
logger.debug(f"outputting to {OUTPUT_DIR}/{output}.nixoutput")
out = bash_wrapper(f"nix build {path}#{output} -o {OUTPUT_DIR}/{output}.nixoutput")
out = bash_wrapper(f"nix build {path}#{output} -o {OUTPUT_DIR}/{output}.nixoutput --accept-flake-config")
logger.debug("output")
logger.debug(out[0])
logger.debug("error")

View File

@ -21,7 +21,7 @@ def evaluate_output(path: str, output: str) -> str | None:
:raises RuntimeError: evaluation succeeds but no derivation is found
"""
logger.info(f"evaluating {output}")
out = bash_wrapper(f"nix eval {path}#{output}")
out = bash_wrapper(f"nix eval {path}#{output} --accept-flake-config")
logger.debug(out[0])
logger.debug(out[1])
logger.debug(out[2])

View File

@ -53,7 +53,7 @@ def get_derivations_from_check(nix_path: str, path_to_flake: str) -> list[str]:
:param path_to_flake: path to flake to be checked
:returns a list of all valid derivations in the flake
"""
flake_check = bash_wrapper(f"{nix_path} flake check --verbose --keep-going", path=path_to_flake)
flake_check = bash_wrapper(f"{nix_path} flake check --verbose --keep-going --accept-flake-config", path=path_to_flake)
if flake_check[2] != 0:
logger.warning(
"nix flake check returned non-zero exit code, collecting all available outputs"
@ -83,7 +83,7 @@ def get_derivations(path_to_flake: str) -> list[str]:
if nix_path is None:
status_msg = "nix is not available in the PATH, please verify that it is installed"
raise RuntimeError(status_msg)
flake_show = bash_wrapper(f"{nix_path} flake show --json", path=path_to_flake)
flake_show = bash_wrapper(f"{nix_path} flake show --json --accept-flake-path", path=path_to_flake)
if flake_show[2] != 0:
logger.error("flake show returned non-zero exit code")
logger.warning("falling back to full evaluation via nix flake check")