Merge pull request 'Update nixpkgs' (#5211) from update-nixpkgs into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/5211
This commit is contained in:
Michael Hoang
2025-10-13 13:19:45 +00:00
3 changed files with 17 additions and 3 deletions

6
flake.lock generated
View File

@@ -115,10 +115,10 @@
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 315532800, "lastModified": 315532800,
"narHash": "sha256-1tUpklZsKzMGI3gjo/dWD+hS8cf+5Jji8TF5Cfz7i3I=", "narHash": "sha256-yDxtm0PESdgNetiJN5+MFxgubBcLDTiuSjjrJiyvsvM=",
"rev": "08b8f92ac6354983f5382124fef6006cade4a1c1", "rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10",
"type": "tarball", "type": "tarball",
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre862603.08b8f92ac635/nixexprs.tar.xz" "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre871443.d7f52a7a640b/nixexprs.tar.xz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",

View File

@@ -119,6 +119,13 @@ def run_machine_hardware_info_init(
if opts.debug: if opts.debug:
cmd += ["--debug"] cmd += ["--debug"]
# REMOVEME when nixos-anywhere > 1.12.0
# In 1.12.0 and earlier, nixos-anywhere doesn't pass Nix options when attempting to get substituters
# which leads to the installation test failing with the error of not being able to substitute flake-parts
# see: https://github.com/nix-community/nixos-anywhere/pull/596
if "CLAN_TEST_STORE" in environ:
cmd += ["--no-use-machine-substituters"]
# Add nix options to nixos-anywhere # Add nix options to nixos-anywhere
cmd.extend(opts.machine.flake.nix_options or []) cmd.extend(opts.machine.flake.nix_options or [])

View File

@@ -191,6 +191,13 @@ def run_machine_install(opts: InstallOptions, target_host: Remote) -> None:
if opts.debug: if opts.debug:
cmd.append("--debug") cmd.append("--debug")
# REMOVEME when nixos-anywhere > 1.12.0
# In 1.12.0 and earlier, nixos-anywhere doesn't pass Nix options when attempting to get substituters
# which leads to the installation test failing with the error of not being able to substitute flake-parts
# see: https://github.com/nix-community/nixos-anywhere/pull/596
if "CLAN_TEST_STORE" in environ:
cmd += ["--no-use-machine-substituters"]
# Add nix options to nixos-anywhere # Add nix options to nixos-anywhere
cmd.extend(opts.machine.flake.nix_options or []) cmd.extend(opts.machine.flake.nix_options or [])