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

Merge master into staging-next

parents 5a3f7821 b6626849

doc/build-helpers/images/dockertools.section.md

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has 
  If specified, the layer created by `buildImage` will be appended to the layers defined in the base image, resulting in an image with at least two layers (one or more layers from the base image, and the layer created by `buildImage`).

  Otherwise, the resulting image with contain the single layer created by `buildImage`.



  :::{.note}

  Only **Env** configuration is inherited from the base image.

  :::



  _Default value:_ `null`.



`fromImageName` (String or Null; _optional_)

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

+4 −0
Original line number Diff line number Diff line
@@ -452,6 +452,10 @@ 


- The hooks `yarnConfigHook` and `yarnBuildHook` were added. These should replace `yarn2nix.mkYarnPackage` and other `yarn2nix` related tools. The motivation to get rid of `yarn2nix` tools is the fact that they are too complex and hard to maintain, and they rely upon too much Nix evaluation which is problematic if import-from-derivation is not allowed (see more details at [#296856](https://github.com/NixOS/nixpkgs/issues/296856). The transition from `mkYarnPackage` to `yarn{Config,Build}Hook` is tracked at [#324246](https://github.com/NixOS/nixpkgs/issues/324246).



- `services.timesyncd.servers` now defaults to `null`, allowing systemd-timesyncd to use NTP servers advertised by DHCP.



- `services.timesyncd.fallbackServers` was added and defaults to `networking.timeServers`.



- Cinnamon has been updated to 6.2, please check [upstream announcement](https://www.linuxmint.com/rel_wilma_whatsnew.php) for more details.

  Following Mint 22 defaults, the Cinnamon module no longer ships geary and hexchat by default.

nixos/modules/config/i18n.nix

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
        };

        defaultText = lib.literalExpression ''

          pkgs.glibcLocales.override {

            allLocales = any (x: x == "all") config.i18n.supportedLocales;

            allLocales = lib.any (x: x == "all") config.i18n.supportedLocales;

            locales = config.i18n.supportedLocales;

          }

        '';

nixos/modules/config/resolvconf.nix

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ in 
    (lib.mkRenamedOptionModule [ "networking" "dnsExtensionMechanism" ] [ "networking" "resolvconf" "dnsExtensionMechanism" ])

    (lib.mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ])

    (lib.mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ])

    (lib.mkRemovedOptionModule [ "networking" "resolvconf" "useHostResolvConf" ] "This option was never used for lib.anything lib.anyways")

    (lib.mkRemovedOptionModule [ "networking" "resolvconf" "useHostResolvConf" ] "This option was never used for anything anyways")

  ];



  options = {

nixos/modules/services/continuous-integration/github-runner/service.nix

+2 −1
Original line number Diff line number Diff line
@@ -151,9 +151,10 @@ with lib; 
                # Always clean workDir

                find -H "$WORK_DIRECTORY" -mindepth 1 -delete

              '';

              configureRunner = writeScript "configure" ''

              configureRunner = writeScript "configure" /*bash*/''

                if [[ -e "${newConfigTokenPath}" ]]; then

                  echo "Configuring GitHub Actions Runner"

                  # shellcheck disable=SC2054  # don't complain about commas in --labels

                  args=(

                    --unattended

                    --disableupdate