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

Merge master into haskell-updates

parents f908b35d 9f813c8d

doc/languages-frameworks/java.section.md

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ stdenv.mkDerivation { 
```



Note that `jdk` is an alias for the OpenJDK (self-built where available,

or pre-built via Zulu). Platforms with OpenJDK not (yet) in Nixpkgs

(`Aarch32`, `Aarch64`) point to the (unfree) `oraclejdk`.

or pre-built via Zulu).



Also note that not using `stripJavaArchivesHook` will likely cause the

generated `.jar` files to be non-deterministic, which is not optimal.

maintainers/maintainer-list.nix

+6 −6
Original line number Diff line number Diff line
@@ -4368,6 +4368,12 @@ 
    githubId = 18414241;

    name = "Andreas Erdes";

  };

  computerdane = {

    email = "danerieber@gmail.com";

    github = "computerdane";

    githubId = 6487079;

    name = "Dane Rieber";

  };

  confus = {

    email = "con-f-use@gmx.net";

    github = "con-f-use";
@@ -4766,12 +4772,6 @@ 
    githubId = 24708079;

    name = "Dan Eads";

  };

  danerieber = {

    email = "danerieber@gmail.com";

    github = "danerieber";

    githubId = 6487079;

    name = "Dane Rieber";

  };

  danid3v = {

    email = "sch220233@spengergasse.at";

    github = "DaniD3v";

nixos/doc/manual/administration/rollback.section.md

+4 −4
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ system has booted, you can make the selected configuration the default 
for subsequent boots:



```ShellSession

# /run/current-system/bin/apply boot

# /run/current-system/bin/switch-to-configuration boot

```



Second, you can switch to the previous configuration in a running
@@ -25,11 +25,11 @@ system: 
This is equivalent to running:



```ShellSession

# /nix/var/nix/profiles/system-N-link/bin/apply switch

# /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch

```



where `N` is the number of the NixOS system configuration to roll back to.

To get a list of the available configurations, run:

where `N` is the number of the NixOS system configuration. To get a

list of the available configurations, do:



```ShellSession

$ ls -l /nix/var/nix/profiles/system-*-link

nixos/doc/manual/development/non-switchable-systems.section.md

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ profile: 
The most notable deviation of this profile from a standard NixOS configuration

is that after building it, you cannot switch *to* the configuration anymore.

The profile sets `config.system.switch.enable = false;`, which excludes

`apply` and `switch-to-configuration`, the central scripts called by `nixos-rebuild`, from

`switch-to-configuration`, the central script called by `nixos-rebuild`, from

your system. Removing this script makes the image lighter and slightly more

secure.

nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ This chapter explains some of the internals of this command to make it simpler 
for new module developers to configure their units correctly and to make it

easier to understand what is happening and why for curious administrators.



`nixos-rebuild`, like many deployment solutions, calls `apply` (or for NixOS older than 24.11, `switch-to-configuration`)

which resides in a NixOS system at `$out/bin/apply`. The

`nixos-rebuild`, like many deployment solutions, calls `switch-to-configuration`

which resides in a NixOS system at `$out/bin/switch-to-configuration`. The

script is called with the action that is to be performed like `switch`, `test`,

`boot`. There is also the `dry-activate` action which does not really perform

the actions but rather prints what it would do if you called it with `test`.