From d8293de5be32df165a63d236a994839a97d7a0b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 24 Sep 2024 22:17:05 +0200 Subject: [PATCH 1/2] fix python3 overrides --- nix/python-minimal.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/nix/python-minimal.nix b/nix/python-minimal.nix index 6ef3cc0..595ac7f 100644 --- a/nix/python-minimal.nix +++ b/nix/python-minimal.nix @@ -1,15 +1,10 @@ { nixpkgs.overlays = [ (final: prev: { - bcachefs-tools = prev.bcachefs-tools.overrideAttrs (old: { - python3 = prev.python3Minimal; - }); - cifs-utils = prev.cifs-utils.overrideAttrs (old: { - python3 = prev.python3Minimal; - }); - nfs-utils = prev.nfs-utils.overrideAttrs (old: { - python3 = prev.python3Minimal; - }); + bcachefs-tools = prev.bcachefs-tools.override { python3 = final.python3Minimal; }; + cifs-utils = prev.cifs-utils.override { python3 = final.python3Minimal; }; + nfs-utils = prev.nfs-utils.override { python3 = final.python3Minimal; }; + talloc = prev.talloc.override { python3 = final.python3Minimal; }; }) ]; } From f4b3c682cf3dbf37f24f3043a72f7ba209393072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 24 Sep 2024 22:34:07 +0200 Subject: [PATCH 2/2] kexec: switch to xz compressor for initrd --- nix/kexec-installer/module.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nix/kexec-installer/module.nix b/nix/kexec-installer/module.nix index 2e865bd..224e301 100644 --- a/nix/kexec-installer/module.nix +++ b/nix/kexec-installer/module.nix @@ -21,6 +21,7 @@ in ../serial.nix ../restore-remote-access.nix ]; + options = { system.kexec-installer.name = lib.mkOption { type = lib.types.str; @@ -32,6 +33,7 @@ in }; config = { + boot.initrd.compressor = "xz"; # This is a variant of the upstream kexecScript that also allows embedding # a ssh key. system.build.kexecRun = pkgs.runCommand "kexec-run" { } ''