Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/image_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ use tempfile::tempdir;
use crate::nixos;
use crate::shell::*;

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

const NIX_CONF: &str = "experimental-features = nix-command flakes
extra-nix-path = nixpkgs=flake:nixpkgs
extra-nix-path = nixpkgs=github:nixos/nixpkgs/nixos-24.11
build-users-group =
sandbox = false
";
Expand Down
3 changes: 3 additions & 0 deletions src/nixos.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ use std::{
use anyhow::{bail, Context, Result};
use regex::Regex;

const NIXOS_VERSION: &str = "24.11";

pub(crate) const ENV_VARS: [(&str, &str); 4] = [
("PATH", "/nix/.bin"),
("NIX_CONF_DIR", "/nix/etc"),
Expand Down Expand Up @@ -76,6 +78,7 @@ pub fn build_flake_from_package_list(
match &caps[1] {
"name" => name,
"description" => description,
"version" => NIXOS_VERSION,
"packages" => &package_list,
_ => "",
}
Expand Down
2 changes: 1 addition & 1 deletion src/templates/flake.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
description = "{{ description }}";
inputs = {
nixpkgs.url = "flake:nixpkgs";
nixpkgs.url = "github:nixos/nixpkgs/nixos-{{ version }}";
flake-utils.url = "github:numtide/flake-utils";
};

Expand Down