Commit 3b1869aa authored by maralorn's avatar maralorn
Browse files

Merge branch 'master' into haskell-updates

parents 4045943b 05968fc7

doc/builders/special/darwin-builder.section.md

+7 −5
Original line number Diff line number Diff line
@@ -28,19 +28,21 @@ Password: 
```



… so that it can install a private key used to `ssh` into the build server.

After that the script will launch the virtual machine:

After that the script will launch the virtual machine and automatically log you

in as the `builder` user:



```

<<< Welcome to NixOS 22.11.20220901.1bd8d11 (aarch64) - ttyAMA0 >>>



Run 'nixos-help' for the NixOS manual.



nixos login:

nixos login: builder (automatic login)





[builder@nixos:~]$

```



> Note: When you need to stop the VM, type `Ctrl`-`a` + `c` to open the `qemu`

> prompt and then type `system_powerdown` followed by `Enter`, or run `shutdown now`

> as the `builder` user (e.g. `ssh -i keys/builder_ed25519 builder@localhost shutdown now`)

> Note: When you need to stop the VM, run `shutdown now` as the `builder` user.



To delegate builds to the remote builder, add the following options to your

`nix.conf` file:

doc/contributing/quick-start.chapter.md

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ To add a package to Nixpkgs: 


   - Apache HTTPD: [`pkgs/servers/http/apache-httpd/2.4.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/2.4.nix). A bunch of optional features, variable substitutions in the configure flags, a post-install hook, and miscellaneous hackery.



   - Thunderbird: [`pkgs/applications/networking/mailreaders/thunderbird/default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/default.nix). Lots of dependencies.

   - buildMozillaMach: [`pkgs/applications/networking/browser/firefox/common.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/browsers/firefox/common.nix). A reusable build function for Firefox, Thunderbird and Librewolf.



   - JDiskReport, a Java utility: [`pkgs/tools/misc/jdiskreport/default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix). Nixpkgs doesn’t have a decent `stdenv` for Java yet so this is pretty ad-hoc.

maintainers/maintainer-list.nix

+12 −0
Original line number Diff line number Diff line
@@ -121,6 +121,12 @@ 
    githubId = 7414843;

    name = "Nicholas von Klitzing";

  };

  _3JlOy-PYCCKUi = {

    name = "3JlOy-PYCCKUi";

    email = "3jl0y_pycckui@riseup.net";

    github = "3JlOy-PYCCKUi";

    githubId = 46464602;

  };

  _360ied = {

    name = "Brian Zhu";

    email = "therealbarryplayer@gmail.com";
@@ -4552,6 +4558,12 @@ 
    githubId = 225893;

    name = "James Cook";

  };

  farcaller = {

    name = "Vladimir Pouzanov";

    email = "farcaller@gmail.com";

    github = "farcaller";

    githubId = 693;

  };

  fare = {

    email = "fahree@gmail.com";

    github = "fare";

nixos/doc/manual/from_md/installation/upgrading.chapter.xml

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
    <listitem>

      <para>

        <emphasis>Stable channels</emphasis>, such as

        <link xlink:href="https://nixos.org/channels/nixos-22.05"><literal>nixos-22.11</literal></link>.

        <link xlink:href="https://nixos.org/channels/nixos-22.11"><literal>nixos-22.11</literal></link>.

        These only get conservative bug fixes and package upgrades. For

        instance, a channel update may cause the Linux kernel on your

        system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix),
@@ -33,7 +33,7 @@ 
    <listitem>

      <para>

        <emphasis>Small channels</emphasis>, such as

        <link xlink:href="https://nixos.org/channels/nixos-22.05-small"><literal>nixos-22.11-small</literal></link>

        <link xlink:href="https://nixos.org/channels/nixos-22.11-small"><literal>nixos-22.11-small</literal></link>

        or

        <link xlink:href="https://nixos.org/channels/nixos-unstable-small"><literal>nixos-unstable-small</literal></link>.

        These are identical to the stable and unstable channels

nixos/doc/manual/from_md/release-notes/rl-2305.section.xml

+9 −0
Original line number Diff line number Diff line
@@ -115,6 +115,15 @@ 
          <link linkend="opt-services.borgbackup.jobs._name_.inhibitsSleep"><literal>services.borgbackup.jobs.&lt;name&gt;.inhibitsSleep</literal></link>.

        </para>

      </listitem>

      <listitem>

        <para>

          <literal>podman</literal> now uses the

          <literal>netavark</literal> network stack. Users will need to

          delete all of their local containers, images, volumes, etc, by

          running <literal>podman system reset --force</literal> once

          before upgrading their systems.

        </para>

      </listitem>

      <listitem>

        <para>

          The EC2 image module no longer fetches instance metadata in