Skip to content
Snippets Groups Projects
Commit 11140101 authored by Florian Sesser's avatar Florian Sesser
Browse files

Merge branch 'upgrade-nixos-to-23.11' into 'develop'

Upgrade nixos to 23.11

See merge request !439
parents 3a0b1f19 8f8c5ab4
Branches
No related tags found
2 merge requests!442Merge develop into production,!439Upgrade nixos to 23.11
Pipeline #5731 passed
......@@ -87,7 +87,6 @@ in
# Configure the bootloader how we like.
boot.loader.timeout = 10;
boot.loader.grub.enable = true;
boot.loader.grub.version = 2;
boot.loader.grub.device = "/dev/disk/by-id/${grubDeviceID}";
# Let me in to do subsequent configuration. This makes the machine wide
......
......@@ -103,7 +103,6 @@ in {
# harder to deploy in the bootstrap environment.
config =
{ boot.loader.grub.enable = true;
boot.loader.grub.version = 2;
boot.loader.grub.device = if cfg.grubDeviceID == "nodev" then "nodev" else "/dev/disk/by-id/${cfg.grubDeviceID}";
boot.loader.timeout = 10;
networking.firewall.enable = false;
......
......@@ -69,7 +69,7 @@ in {
] ++ (
optionals (config.services.nfs.server.enable) [ "nfsd" ]
) ++ (
optionals ("" != config.boot.initrd.services.swraid.mdadmConf) [ "mdadm" ]
optionals ("" != config.boot.swraid.mdadmConf) [ "mdadm" ]
) ++ (
optionals ({} != config.networking.bonds) [ "bonding" ]
) ++ (
......
......@@ -26,8 +26,8 @@
enable = true;
# We only allow key-based authentication.
kbdInteractiveAuthentication = false;
passwordAuthentication = false;
settings.KbdInteractiveAuthentication = false;
settings.PasswordAuthentication = false;
extraConfig = ''
# Possibly this is superfluous considering we don't allow
......
{
"name": "source",
"url": "https://releases.nixos.org/nixos/23.05/nixos-23.05.4738.41de143fda10/nixexprs.tar.xz",
"sha256": "0bqq6l4c0k62g6a1npk9gbzf8j373859gvb7kxnpq5p5175mzw6d"
"url": "https://releases.nixos.org/nixos/23.11/nixos-23.11.2962.b8dd8be3c790/nixexprs.tar.xz",
"sha256": "053dwx7smszz3a0khbm6zvf9pvy5xz1ifdk9jx6gz5cmwjab0gmp"
}
\ No newline at end of file
......@@ -10,7 +10,7 @@ from ps_tools import get_url_hash
# We pass this to builtins.fetchTarball which only supports sha256
HASH_TYPE = "sha256"
DEFAULT_CHANNEL = "nixos-23.05"
DEFAULT_CHANNEL = "nixos-23.11"
CHANNEL_URL_TEMPLATE = "https://channels.nixos.org/{channel}/nixexprs.tar.xz"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment