emily/nixos-images
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #285 from nix-community/nixos-facter

Browse source 
fix python3 overrides
This commit is contained in:
Jörg Thalheim 2024-09-24 22:39:06 +02:00 committed by GitHub
commit 65d9487002
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nix/kexec-installer/module.nix
View file

@ -21,6 +21,7 @@ in
../serial.nix ../serial.nix
../restore-remote-access.nix ../restore-remote-access.nix
]; ];
options = { options = {
system.kexec-installer.name = lib.mkOption { system.kexec-installer.name = lib.mkOption {
type = lib.types.str; type = lib.types.str;
@ -32,6 +33,7 @@ in
}; };
config = { config = {
boot.initrd.compressor = "xz";
# This is a variant of the upstream kexecScript that also allows embedding # This is a variant of the upstream kexecScript that also allows embedding
# a ssh key. # a ssh key.
system.build.kexecRun = pkgs.runCommand "kexec-run" { } '' system.build.kexecRun = pkgs.runCommand "kexec-run" { } ''

13
nix/python-minimal.nix
View file

@ -1,15 +1,10 @@
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
bcachefs-tools = prev.bcachefs-tools.overrideAttrs (old: { bcachefs-tools = prev.bcachefs-tools.override { python3 = final.python3Minimal; };
python3 = prev.python3Minimal; cifs-utils = prev.cifs-utils.override { python3 = final.python3Minimal; };
}); nfs-utils = prev.nfs-utils.override { python3 = final.python3Minimal; };
cifs-utils = prev.cifs-utils.overrideAttrs (old: { talloc = prev.talloc.override { python3 = final.python3Minimal; };
python3 = prev.python3Minimal;
});
nfs-utils = prev.nfs-utils.overrideAttrs (old: {
python3 = prev.python3Minimal;
});
}) })
]; ];
} }