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

Merge master into staging-next

parents d41ca978 b1b78f43

doc/build-helpers/trivial-build-helpers.chapter.md

+2 −2
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ writeTextFile { 
    echo "hi"

  '';

  executable = true;

  destination = "bin/my-script"

  destination = "bin/my-script";

}

```
@@ -576,7 +576,7 @@ writeTextFile { 
    echo "hi"

  '';

  executable = true;

  destination = "bin/my-script"

  destination = "bin/my-script";

}

```

maintainers/maintainer-list.nix

+16 −0
Original line number Diff line number Diff line
@@ -8642,6 +8642,12 @@ 
    github = "j0xaf";

    githubId = 932697;

  };

  j1nxie = {

    email = "rylie@rylie.moe";

    name = "Nguyen Pham Quoc An";

    github = "j1nxie";

    githubId = 52886388;

  };

  j4m3s = {

    name = "James Landrein";

    email = "github@j4m3s.eu";
@@ -18782,6 +18788,16 @@ 
    githubId = 39732259;

    name = "Justus K";

  };

  stv0g = {

    name = "Steffen Vogel";

    email = "post@steffenvogel.de";

    matrix = "@stv0ge:matrix.org";

    github = "stv0g";

    githubId = 285829;

    keys = [{

      fingerprint = "09BE 3BAE 8D55 D4CD 8579  285A 9675 EAC3 4897 E6E2";

    }];

  };

  SubhrajyotiSen = {

    email = "subhrajyoti12@gmail.com";

    github = "SubhrajyotiSen";

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

+3 −0
Original line number Diff line number Diff line
@@ -333,6 +333,9 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m 
  - The `erlang_node_short_name`, `erlang_node_name`, `port` and `options` configuration parameters are gone, and have been replaced with an `environment` parameter.

    Use the appropriate [environment variables](https://hexdocs.pm/livebook/readme.html#environment-variables) inside `environment` to configure the service instead.



- The `crystal` package has been updated to 1.11.x, which has some breaking changes.

  Refer to crystal's changelog for more information. ([v1.10](https://github.com/crystal-lang/crystal/blob/master/CHANGELOG.md#1100-2023-10-09), [v1.11](https://github.com/crystal-lang/crystal/blob/master/CHANGELOG.md#1110-2024-01-08))



## Other Notable Changes {#sec-release-24.05-notable-changes}



<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

nixos/modules/profiles/macos-builder.nix

+5 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ in 
        # This installCredentials script is written so that it's as easy as

        # possible for a user to audit before confirming the `sudo`

        installCredentials = hostPkgs.writeShellScript "install-credentials" ''

          set -euo pipefail



          KEYS="''${1}"

          INSTALL=${hostPkgs.coreutils}/bin/install

          "''${INSTALL}" -g nixbld -m 600 "''${KEYS}/${user}_${keyType}" ${privateKey}
@@ -154,6 +156,9 @@ in 
        hostPkgs = config.virtualisation.host.pkgs;



        script = hostPkgs.writeShellScriptBin "create-builder" (

          ''

            set -euo pipefail

          '' +

          # When running as non-interactively as part of a DarwinConfiguration the working directory

          # must be set to a writeable directory.

        (if cfg.workingDirectory != "." then ''

nixos/modules/tasks/filesystems/envfs.nix

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ let 
      device = "none";

      fsType = "envfs";

      options = [

        "bind-mount=/bin"

        "fallback-path=${pkgs.runCommand "fallback-path" {} (''

          mkdir -p $out

          ln -s ${config.environment.usrbinenv} $out/env
@@ -15,6 +16,9 @@ let 
        "nofail"

      ];

    };

    # We need to bind-mount /bin to /usr/bin, because otherwise upgrading

    # from envfs < 1.0.5 will cause having the old envs with no /bin bind mount.

    # Systemd is smart enough to not mount /bin if it's already mounted.

    "/bin" = {

      device = "/usr/bin";

      fsType = "none";