commit a10842c7f0343bad733d039c72cf15a6ca0d1eb4 · pyrox.dev/nixpkgs

+4

nixos/doc/manual/release-notes/rl-2405.section.md

···

       53
       53
        
       - `system.etc.overlay.enable` option was added. If enabled, `/etc` is

     

       54
       54
        
         mounted via an overlayfs instead of being created by a custom perl script.

     

       55
       55
        
       

     

       56
       56
       +
       - For each supporting version of the Linux kernel firmware blobs and kernel modules

     

       57
       57
       +
         are compressed with zstd. For firmware blobs this means an increase of 4.4% in size, however

     

       58
       58
       +
         a significantly higher decompression speed.

     

       59
       59
       +
       

     

       56
       60
        
       - NixOS AMIs are now uploaded regularly to a new AWS Account.

     

       57
       61
        
         Instructions on how to use them can be found on <https://nixos.github.io/amis>.

     

       58
       62
        
         We are working on integration the data into the NixOS homepage.

+10 -4

nixos/modules/services/hardware/udev.nix

···

       167
       167
        
             mv etc/udev/hwdb.bin $out

     

       168
       168
        
           '';

     

       169
       169
        
       

     

       170
       170
       -
         compressFirmware = firmware: if (config.boot.kernelPackages.kernelAtLeast "5.3" && (firmware.compressFirmware or true)) then

     

       171
       171
       -
           pkgs.compressFirmwareXz firmware

     

       172
       172
       -
         else

     

       173
       173
       -
           id firmware;

     

       170
       170
       +
         compressFirmware = firmware:

     

       171
       171
       +
           let

     

       172
       172
       +
             inherit (config.boot.kernelPackages) kernelAtLeast;

     

       173
       173
       +
           in

     

       174
       174
       +
             if ! (firmware.compressFirmware or true) then

     

       175
       175
       +
               firmware

     

       176
       176
       +
             else

     

       177
       177
       +
               if kernelAtLeast "5.19" then pkgs.compressFirmwareZstd firmware

     

       178
       178
       +
               else if kernelAtLeast "5.3" then pkgs.compressFirmwareXz firmware

     

       179
       179
       +
               else firmware;

     

       174
       180
        
       

     

       175
       181
        
         # Udev has a 512-character limit for ENV{PATH}, so create a symlink

     

       176
       182
        
         # tree to work around this.

-29

pkgs/build-support/kernel/compress-firmware-xz.nix

···

       1
       1
       -
       { runCommand, lib }:

     

       2
       2
       -
       

     

       3
       3
       -
       firmware:

     

       4
       4
       -
       

     

       5
       5
       -
       let

     

       6
       6
       -
         args = {

     

       7
       7
       -
           allowedRequisites = [];

     

       8
       8
       -
         } // lib.optionalAttrs (firmware ? meta) { inherit (firmware) meta; };

     

       9
       9
       -
       in

     

       10
       10
       -
       

     

       11
       11
       -
       runCommand "${firmware.name}-xz" args ''

     

       12
       12
       -
         mkdir -p $out/lib

     

       13
       13
       -
         (cd ${firmware} && find lib/firmware -type d -print0) |

     

       14
       14
       -
             (cd $out && xargs -0 mkdir -v --)

     

       15
       15
       -
         (cd ${firmware} && find lib/firmware -type f -print0) |

     

       16
       16
       -
             (cd $out && xargs -0rtP "$NIX_BUILD_CORES" -n1 \

     

       17
       17
       -
                 sh -c 'xz -9c -T1 -C crc32 --lzma2=dict=2MiB "${firmware}/$1" > "$1.xz"' --)

     

       18
       18
       -
         (cd ${firmware} && find lib/firmware -type l) | while read link; do

     

       19
       19
       -
             target="$(readlink "${firmware}/$link")"

     

       20
       20
       -
             if [ -f "${firmware}/$link" ]; then

     

       21
       21
       -
               ln -vs -- "''${target/^${firmware}/$out}.xz" "$out/$link.xz"

     

       22
       22
       -
             else

     

       23
       23
       -
               ln -vs -- "''${target/^${firmware}/$out}" "$out/$link"

     

       24
       24
       -
             fi

     

       25
       25
       -
         done

     

       26
       26
       -
       

     

       27
       27
       -
         echo "Checking for broken symlinks:"

     

       28
       28
       -
         find -L $out -type l -print -execdir false -- '{}' '+'

     

       29
       29
       -
       ''

+43

pkgs/build-support/kernel/compress-firmware.nix

···

       1
       1
       +
       { runCommand, lib, type ? "zstd", zstd }:

     

       2
       2
       +
       

     

       3
       3
       +
       firmware:

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         compressor = {

     

       7
       7
       +
           xz = {

     

       8
       8
       +
             ext = "xz";

     

       9
       9
       +
             nativeBuildInputs = [ ];

     

       10
       10
       +
             cmd = file: target: ''xz -9c -T1 -C crc32 --lzma2=dict=2MiB "${file}" > "${target}"'';

     

       11
       11
       +
           };

     

       12
       12
       +
           zstd = {

     

       13
       13
       +
             ext = "zst";

     

       14
       14
       +
             nativeBuildInputs = [ zstd ];

     

       15
       15
       +
             cmd = file: target: ''zstd -T1 -19 --long --check -f "${file}" -o "${target}"'';

     

       16
       16
       +
           };

     

       17
       17
       +
         }.${type} or (throw "Unsupported compressor type for firmware.");

     

       18
       18
       +
       

     

       19
       19
       +
         args = {

     

       20
       20
       +
           allowedRequisites = [];

     

       21
       21
       +
           inherit (compressor) nativeBuildInputs;

     

       22
       22
       +
         } // lib.optionalAttrs (firmware ? meta) { inherit (firmware) meta; };

     

       23
       23
       +
       in

     

       24
       24
       +
       

     

       25
       25
       +
       runCommand "${firmware.name}-${type}" args ''

     

       26
       26
       +
         mkdir -p $out/lib

     

       27
       27
       +
         (cd ${firmware} && find lib/firmware -type d -print0) |

     

       28
       28
       +
             (cd $out && xargs -0 mkdir -v --)

     

       29
       29
       +
         (cd ${firmware} && find lib/firmware -type f -print0) |

     

       30
       30
       +
             (cd $out && xargs -0rtP "$NIX_BUILD_CORES" -n1 \

     

       31
       31
       +
                 sh -c '${compressor.cmd "${firmware}/$1" "$1.${compressor.ext}"}' --)

     

       32
       32
       +
         (cd ${firmware} && find lib/firmware -type l) | while read link; do

     

       33
       33
       +
             target="$(readlink "${firmware}/$link")"

     

       34
       34
       +
             if [ -f "${firmware}/$link" ]; then

     

       35
       35
       +
               ln -vs -- "''${target/^${firmware}/$out}.${compressor.ext}" "$out/$link.${compressor.ext}"

     

       36
       36
       +
             else

     

       37
       37
       +
               ln -vs -- "''${target/^${firmware}/$out}" "$out/$link"

     

       38
       38
       +
             fi

     

       39
       39
       +
         done

     

       40
       40
       +
       

     

       41
       41
       +
         echo "Checking for broken symlinks:"

     

       42
       42
       +
         find -L $out -type l -print -execdir false -- '{}' '+'

     

       43
       43
       +
       ''

+1 -1

pkgs/build-support/kernel/modules-closure.sh

···

       80
       80
        
           # of its output.

     

       81
       81
        
           modinfo -b $kernel --set-version "$version" -F firmware $module | grep -v '^name:' | while read -r i; do

     

       82
       82
        
               echo "firmware for $module: $i"

     

       83
       83
       -
               for name in "$i" "$i.xz" ""; do

     

       83
       83
       +
               for name in "$i" "$i.xz" "$i.zst" ""; do

     

       84
       84
        
                   [ -z "$name" ] && echo "WARNING: missing firmware $i for module $module"

     

       85
       85
        
                   if cp -v --parents --no-preserve=mode lib/firmware/$name "$out" 2>/dev/null; then

     

       86
       86
        
                       break

+9

pkgs/build-support/vm/default.nix

···

       40
       40
        
               ${pkgs.stdenv.cc.libc}/lib/libc.so.* \

     

       41
       41
        
               ${pkgs.stdenv.cc.libc}/lib/libm.so.* \

     

       42
       42
        
               ${pkgs.stdenv.cc.libc}/lib/libresolv.so.* \

     

       43
       43
       +
               ${pkgs.stdenv.cc.libc}/lib/libpthread.so.* \

     

       44
       44
       +
               ${pkgs.zstd.out}/lib/libzstd.so.* \

     

       45
       45
       +
               ${pkgs.xz.out}/lib/liblzma.so.* \

     

       43
       46
        
               $out/lib

     

       44
       47
        
       

     

       45
       48
        
             # Copy BusyBox.

     

       46
       49
        
             cp -pd ${pkgs.busybox}/bin/* $out/bin

     

       50
       50
       +
             cp -pd ${pkgs.kmod}/bin/* $out/bin

     

       47
       51
        
       

     

       48
       52
        
             # Run patchelf to make the programs refer to the copied libraries.

     

       49
       53
        
             for i in $out/bin/* $out/lib/*; do if ! test -L $i; then nuke-refs $i; fi; done

     
···

       53
       57
        
                     echo "patching $i..."

     

       54
       58
        
                     patchelf --set-interpreter $out/lib/ld-*.so.? --set-rpath $out/lib $i || true

     

       55
       59
        
                 fi

     

       60
       60
       +
             done

     

       61
       61
       +
       

     

       62
       62
       +
             find $out/lib -type f \! -name 'ld*.so.?' | while read i; do

     

       63
       63
       +
               echo "patching $i..."

     

       64
       64
       +
               patchelf --set-rpath $out/lib $i

     

       56
       65
        
             done

     

       57
       66
        
           ''; # */

     

       58
       67

+12 -8

pkgs/os-specific/linux/kernel/common-config.nix

···

       871
       871
        
           };

     

       872
       872
        
       

     

       873
       873
        
           zram = {

     

       874
       874
       -
             ZRAM            = module;

     

       875
       875
       -
             ZRAM_WRITEBACK  = option yes;

     

       876
       876
       -
             ZRAM_MULTI_COMP = whenAtLeast "6.2" yes;

     

       877
       877
       -
             ZSWAP           = option yes;

     

       878
       878
       -
             ZPOOL           = yes;

     

       879
       879
       -
             ZBUD            = option yes;

     

       874
       874
       +
             ZRAM                          = module;

     

       875
       875
       +
             ZRAM_WRITEBACK                = option yes;

     

       876
       876
       +
             ZRAM_MULTI_COMP               = whenAtLeast "6.2" yes;

     

       877
       877
       +
             ZRAM_DEF_COMP_ZSTD            = whenAtLeast "5.11" yes;

     

       878
       878
       +
             ZSWAP                         = option yes;

     

       879
       879
       +
             ZSWAP_COMPRESSOR_DEFAULT_ZSTD = whenAtLeast "5.7" yes;

     

       880
       880
       +
             ZPOOL                         = yes;

     

       881
       881
       +
             ZSMALLOC                      = option yes;

     

       880
       882
        
           };

     

       881
       883
        
       

     

       882
       884
        
           brcmfmac = {

     
···

       948
       950
        
             THRUSTMASTER_FF    = yes;

     

       949
       951
        
             ZEROPLUS_FF        = yes;

     

       950
       952
        
       

     

       951
       951
       -
             MODULE_COMPRESS    = whenOlder "5.13" yes;

     

       952
       952
       -
             MODULE_COMPRESS_XZ = yes;

     

       953
       953
       +
             MODULE_COMPRESS      = whenOlder "5.13" yes;

     

       954
       954
       +
             MODULE_COMPRESS_XZ   = whenOlder "5.13" yes;

     

       955
       955
       +
             MODULE_COMPRESS_ZSTD = whenAtLeast "5.13" yes;

     

       953
       956
        
       

     

       954
       957
        
             SYSVIPC            = yes;  # System-V IPC

     

       955
       958
        
       

     
···

       1124
       1127
        
             FW_LOADER_USER_HELPER_FALLBACK = option no;

     

       1125
       1128
        
       

     

       1126
       1129
        
             FW_LOADER_COMPRESS = whenAtLeast "5.3" yes;

     

       1130
       1130
       +
             FW_LOADER_COMPRESS_ZSTD = whenAtLeast "5.19" yes;

     

       1127
       1131
        
       

     

       1128
       1132
        
             HOTPLUG_PCI_ACPI = yes; # PCI hotplug using ACPI

     

       1129
       1133
        
             HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support

+3 -1

pkgs/top-level/all-packages.nix

···

       1302
       1302
        
       

     

       1303
       1303
        
         makeBinaryWrapper = callPackage ../build-support/setup-hooks/make-binary-wrapper { };

     

       1304
       1304
        
       

     

       1305
       1305
       -
         compressFirmwareXz = callPackage ../build-support/kernel/compress-firmware-xz.nix { };

     

       1305
       1305
       +
         compressFirmwareXz = callPackage ../build-support/kernel/compress-firmware.nix { type = "xz"; };

     

       1306
       1306
       +
       

     

       1307
       1307
       +
         compressFirmwareZstd = callPackage ../build-support/kernel/compress-firmware.nix { type = "zstd"; };

     

       1306
       1308
        
       

     

       1307
       1309
        
         makeModulesClosure = { kernel, firmware, rootModules, allowMissing ? false }:

     

       1308
       1310
        
           callPackage ../build-support/kernel/modules-closure.nix {