Skip to content

chores: update nix to 2.28.3 and NixOS to 25.05 #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raphaelcoeffic merged 1 commit into from
Jun 26, 2025
Merged

chores: update nix to 2.28.3 and NixOS to 25.05 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ anyhow = "1.0.93"
base64 = "0.22.1"
clap = { version = "4.5.21", features = ["derive", "env"] }
console = "0.15.10"
const_format = "0.2.34"
csv = "1.3.1"
dirs = "5.0"
env_logger = "0.11.5"
Expand Down
12 changes: 8 additions & 4 deletions src/image_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use std::{
};

use anyhow::{bail, Context, Result};
use const_format::formatcp;
use indicatif::{ProgressBar, ProgressStyle};
use liblzma::read::XzDecoder;
use regex::Regex;
Expand All @@ -25,13 +26,16 @@ use tempfile::tempdir;
use crate::nixos;
use crate::shell::*;

const NIX_VERSION: &str = "2.24.12";
const NIX_VERSION: &str = "2.28.3";

const NIX_CONF: &str = "experimental-features = nix-command flakes
extra-nix-path = nixpkgs=github:nixos/nixpkgs/nixos-24.11
const NIX_CONF: &str = formatcp!(
"experimental-features = nix-command flakes
extra-nix-path = nixpkgs=github:nixos/nixpkgs/nixos-{}
build-users-group =
sandbox = false
";
",
nixos::NIXOS_VERSION
);

static BASE_SHA256: &str = "/nix/.base.sha256";
static BASE_PATHS: &str = "/nix/.base.paths";
Expand Down
2 changes: 1 addition & 1 deletion src/nixos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::{
use anyhow::{bail, Context, Result};
use regex::Regex;

const NIXOS_VERSION: &str = "24.11";
pub(crate) const NIXOS_VERSION: &str = "25.05";

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