commit f5622df47060a7670cc6d350ddb79815d5a1a3ef · pyrox.dev/nixpkgs

+5

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

···

       388
       388
        
       

     

       389
       389
        
       - The `mpich` package expression now requires `withPm` to be a list, e.g. `"hydra:gforker"` becomes `[ "hydra" "gforker" ]`.

     

       390
       390
        
       

     

       391
       391
       +
       - When merging systemd unit options (of type `unitOption`),

     

       392
       392
       +
         if at least one definition is a list, all those which aren't are now lifted into a list,

     

       393
       393
       +
         making it possible to accumulate definitions without resorting to `mkForce`,

     

       394
       394
       +
         hence to retain the definitions not anticipating that need.

     

       395
       395
       +
       

     

       391
       396
        
       - YouTrack is bumped to 2023.3. The update is not performed automatically, it requires manual interaction. See the YouTrack section in the manual for details.

     

       392
       397
        
       

     

       393
       398
        
       - QtMultimedia has changed its default backend to `QT_MEDIA_BACKEND=ffmpeg` (previously `gstreamer` on Linux or `darwin` on MacOS).

+2 -8

nixos/lib/systemd-unit-options.nix

···

       21
       21
        
             let

     

       22
       22
        
               defs' = filterOverrides defs;

     

       23
       23
        
             in

     

       24
       24
       -
               if isList (head defs').value

     

       25
       25
       -
               then concatMap (def:

     

       26
       26
       -
                 if builtins.typeOf def.value == "list"

     

       27
       27
       -
                 then def.value

     

       28
       28
       -
                 else

     

       29
       29
       -
                   throw "The definitions for systemd unit options should be either all lists, representing repeatable options, or all non-lists, but for the option ${showOption loc}, the definitions are a mix of list and non-list ${lib.options.showDefs defs'}"

     

       30
       30
       -
               ) defs'

     

       31
       31
       -
       

     

       24
       24
       +
               if any (def: isList def.value) defs'

     

       25
       25
       +
               then concatMap (def: toList def.value) defs'

     

       32
       26
        
               else mergeEqualOption loc defs';

     

       33
       27
        
         };

     

       34
       28

+2

pkgs/test/default.nix

···

       175
       175
        
         nixpkgs-check-by-name = callPackage ./nixpkgs-check-by-name { };

     

       176
       176
        
       

     

       177
       177
        
         auto-patchelf-hook = callPackage ./auto-patchelf-hook { };

     

       178
       178
       +
       

     

       179
       179
       +
         systemd = callPackage ./systemd { };

     

       178
       180
        
       }

+5

pkgs/test/systemd/default.nix

···

       1
       1
       +
       { lib, callPackage }:

     

       2
       2
       +
       

     

       3
       3
       +
       lib.recurseIntoAttrs {

     

       4
       4
       +
         nixos = callPackage ./nixos { };

     

       5
       5
       +
       }

+37

pkgs/test/systemd/nixos/default.nix

···

       1
       1
       +
       { pkgs, lib, stdenv, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       lib.runTests {

     

       4
       4
       +
         # Merging two non-list definitions must still result in an error

     

       5
       5
       +
         # about a conflicting definition.

     

       6
       6
       +
         test-unitOption-merging-non-lists-conflict =

     

       7
       7
       +
           let nixos = pkgs.nixos {

     

       8
       8
       +
               system.stateVersion = lib.trivial.release;

     

       9
       9
       +
               systemd.services.systemd-test-nixos = {

     

       10
       10
       +
                 serviceConfig = lib.mkMerge [

     

       11
       11
       +
                   { StateDirectory = "foo"; }

     

       12
       12
       +
                   { StateDirectory = "bar"; }

     

       13
       13
       +
                 ];

     

       14
       14
       +
               };

     

       15
       15
       +
             };

     

       16
       16
       +
           in {

     

       17
       17
       +
           expr = (builtins.tryEval (nixos.config.systemd.services.systemd-test-nixos.serviceConfig.StateDirectory)).success;

     

       18
       18
       +
           expected = false;

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         # Merging must lift non-list definitions to a list

     

       22
       22
       +
         # if at least one of them is a list.

     

       23
       23
       +
         test-unitOption-merging-list-non-list-append =

     

       24
       24
       +
           let nixos = pkgs.nixos {

     

       25
       25
       +
               system.stateVersion = lib.trivial.release;

     

       26
       26
       +
               systemd.services.systemd-test-nixos = {

     

       27
       27
       +
                 serviceConfig = lib.mkMerge [

     

       28
       28
       +
                   { StateDirectory = "foo"; }

     

       29
       29
       +
                   { StateDirectory = ["bar"]; }

     

       30
       30
       +
                 ];

     

       31
       31
       +
               };

     

       32
       32
       +
             };

     

       33
       33
       +
           in {

     

       34
       34
       +
           expr = nixos.config.systemd.services.systemd-test-nixos.serviceConfig.StateDirectory;

     

       35
       35
       +
           expected = [ "foo" "bar" ];

     

       36
       36
       +
         };

     

       37
       37
       +
       }