aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-05-25 11:55:08 +0200
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-05-25 11:59:25 +0200
commit4007f5063bf431f2b0555af7448f656467907a6a (patch)
treebd47004ab3fb4b7ccf5683cf6d203561c21bf57a
parentfix(pkgs/by-name/ya/yambar-{memory,cpu}): Add devshell (diff)
downloadnixos-config-4007f5063bf431f2b0555af7448f656467907a6a.zip
fix(treewide): Use `nixVersions.latest` instead of just `nix`
`nix` is an alias (in `all-packages.nix`) to `nixVersions.stable`. `nixVersion.latest` is always the last released version of nix. I obviously want that `nix` with more features (and slightly more bugs probably).
-rw-r--r--bootstrap/default.nix6
-rw-r--r--pkgs/by-name/fu/fupdate/package.nix4
2 files changed, 5 insertions, 5 deletions
diff --git a/bootstrap/default.nix b/bootstrap/default.nix
index b3e44380..1f727cd8 100644
--- a/bootstrap/default.nix
+++ b/bootstrap/default.nix
@@ -6,19 +6,19 @@
ensure_config_variables_dependencies = builtins.attrValues {inherit (pkgs) systemd jq dash gnugrep curl;};
replacementStrings = {SCRIPT_ENSURE_CONFIG_VARIABLES = "${ensure_config_variables}/bin/ensure_config_variables";};
activate = sysLib.writeShellScript {
- dependencies = builtins.attrValues {inherit (pkgs) jq gawk curl coreutils libuuid nix git;} ++ ensure_config_variables_dependencies;
+ dependencies = with pkgs; [jq gawk curl coreutils libuuid nixVersions.latest git] ++ ensure_config_variables_dependencies;
name = "activate";
src = ./01_activate.sh;
inherit replacementStrings;
};
install = sysLib.writeShellScript {
- dependencies = builtins.attrValues {inherit (pkgs) jq dash curl gawk btrfs-progs coreutils libuuid gptfdisk dosfstools toybox nix git;} ++ ensure_config_variables_dependencies;
+ dependencies = with pkgs; [jq dash curl gawk btrfs-progs coreutils libuuid gptfdisk dosfstools toybox nixVersions.latest git] ++ ensure_config_variables_dependencies;
name = "install";
src = ./01_install.sh;
inherit replacementStrings;
};
setup = sysLib.writeShellScript {
- dependencies = builtins.attrValues {inherit (pkgs) dash gawk curl git nix gnugrep nixos-install-tools coreutils libuuid;} ++ ensure_config_variables_dependencies;
+ dependencies = with pkgs; [dash gawk curl git nixVersions.latest gnugrep nixos-install-tools coreutils libuuid] ++ ensure_config_variables_dependencies;
name = "setup";
src = ./02_setup.sh;
inherit replacementStrings;
diff --git a/pkgs/by-name/fu/fupdate/package.nix b/pkgs/by-name/fu/fupdate/package.nix
index 259d1c03..eef9e7b2 100644
--- a/pkgs/by-name/fu/fupdate/package.nix
+++ b/pkgs/by-name/fu/fupdate/package.nix
@@ -1,7 +1,7 @@
{
sysLib,
dash,
- nix,
+ nixVersions,
gnugrep,
fd,
coreutils,
@@ -17,7 +17,7 @@ sysLib.writeShellScript {
keepPath = true;
dependencies = [
dash
- nix
+ nixVersions.latest
gnugrep
fd
coreutils