Unverified Commit b2982669 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents f0427845 1323df1a

lib/types.nix

+5 −3
Original line number Diff line number Diff line
@@ -775,9 +775,11 @@ rec { 
          };

          binOp = lhs: rhs: {

            class =

              if lhs.class == null then rhs.class

              else if rhs.class == null then lhs.class

              else if lhs.class == rhs.class then lhs.class

              # `or null` was added for backwards compatibility only. `class` is

              # always set in the current version of the module system.

              if lhs.class or null == null then rhs.class or null

              else if rhs.class or null == null then lhs.class or null

              else if lhs.class or null == rhs.class then lhs.class or null

              else throw "A submoduleWith option is declared multiple times with conflicting class values \"${toString lhs.class}\" and \"${toString rhs.class}\".";

            modules = lhs.modules ++ rhs.modules;

            specialArgs =

nixos/modules/config/swap.nix

+5 −6
Original line number Diff line number Diff line
@@ -275,12 +275,11 @@ in 
                ''}

                ${optionalString sw.randomEncryption.enable ''

                  cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} \

                '' + concatMapStrings (arg: arg + " \\\n") (flatten [

                  ${concatStringsSep " \\\n" (flatten [

                    (optional (sw.randomEncryption.sectorSize != null) "--sector-size=${toString sw.randomEncryption.sectorSize}")

                    (optional (sw.randomEncryption.keySize != null) "--key-size=${toString sw.randomEncryption.keySize}")

                    (optional sw.randomEncryption.allowDiscards "--allow-discards")

                ]) + ''

                  ${sw.device} ${sw.deviceName}

                  ])} ${sw.device} ${sw.deviceName}

                  mkswap ${sw.realDevice}

                ''}

              '';

nixos/modules/services/monitoring/grafana-agent.nix

+0 −2
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ in 
            agent.enabled = true;

            agent.scrape_integration = true;

            node_exporter.enabled = true;

            replace_instance_label = true;

          };

        }

      '';
@@ -122,7 +121,6 @@ in 
        agent.enabled = mkDefault true;

        agent.scrape_integration = mkDefault true;

        node_exporter.enabled = mkDefault true;

        replace_instance_label = mkDefault true;

      };

    };

nixos/tests/swap-file-btrfs.nix

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ import ./make-test-python.nix ({ lib, ... }: 


  testScript = ''

    machine.wait_for_unit('var-swapfile.swap')

    # Ensure the swap file creation script ran to completion without failing when creating the swap file

    machine.fail("systemctl is-failed --quiet mkswap-var-swapfile.service")

    machine.succeed("stat --file-system --format=%T /var/swapfile | grep btrfs")

    # First run. Auto creation.

    machine.succeed("swapon --show | grep /var/swapfile")
@@ -41,6 +43,8 @@ import ./make-test-python.nix ({ lib, ... }: 


    # Second run. Use it as-is.

    machine.wait_for_unit('var-swapfile.swap')

    # Ensure the swap file creation script ran to completion without failing when the swap file already exists

    machine.fail("systemctl is-failed --quiet mkswap-var-swapfile.service")

    machine.succeed("swapon --show | grep /var/swapfile")

  '';

})

pkgs/applications/misc/yubioath-flutter/helper.nix

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ buildPythonApplication { 
    sed -i \

      -e 's,zxing-cpp = .*,zxing-cpp = "*",g' \

      -e 's,mss = .*,mss = "*",g' \

      -e 's,yubikey-manager = .*,yubikey-manager = "*",g' \

      -e 's,Pillow = .*,Pillow = "*",g' \

      pyproject.toml

  '';