Skip to content

Commit 56bb730

Browse files
chores: update nix to 2.28.3 and NixOS to 25.05 (#32)
1 parent d5a48f5 commit 56bb730

4 files changed

Lines changed: 37 additions & 5 deletions

File tree

Cargo.lock

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ anyhow = "1.0.93"
1313
base64 = "0.22.1"
1414
clap = { version = "4.5.21", features = ["derive", "env"] }
1515
console = "0.15.10"
16+
const_format = "0.2.34"
1617
csv = "1.3.1"
1718
dirs = "5.0"
1819
env_logger = "0.11.5"

src/image_builder.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use std::{
88
};
99

1010
use anyhow::{bail, Context, Result};
11+
use const_format::formatcp;
1112
use indicatif::{ProgressBar, ProgressStyle};
1213
use liblzma::read::XzDecoder;
1314
use regex::Regex;
@@ -25,13 +26,16 @@ use tempfile::tempdir;
2526
use crate::nixos;
2627
use crate::shell::*;
2728

28-
const NIX_VERSION: &str = "2.24.12";
29+
const NIX_VERSION: &str = "2.28.3";
2930

30-
const NIX_CONF: &str = "experimental-features = nix-command flakes
31-
extra-nix-path = nixpkgs=github:nixos/nixpkgs/nixos-24.11
31+
const NIX_CONF: &str = formatcp!(
32+
"experimental-features = nix-command flakes
33+
extra-nix-path = nixpkgs=github:nixos/nixpkgs/nixos-{}
3234
build-users-group =
3335
sandbox = false
34-
";
36+
",
37+
nixos::NIXOS_VERSION
38+
);
3539

3640
static BASE_SHA256: &str = "/nix/.base.sha256";
3741
static BASE_PATHS: &str = "/nix/.base.paths";

src/nixos.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::{
88
use anyhow::{bail, Context, Result};
99
use regex::Regex;
1010

11-
const NIXOS_VERSION: &str = "24.11";
11+
pub(crate) const NIXOS_VERSION: &str = "25.05";
1212

1313
pub(crate) const ENV_VARS: [(&str, &str); 4] = [
1414
("PATH", "/nix/.bin"),

0 commit comments

Comments
 (0)