Unverified Commit ab4b7fa1 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents 69c21228 eca6229e

doc/languages-frameworks/index.md

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Each supported language or software ecosystem has its own package set named `<la 
  # Navigate Java compiler variants in `javaPackages` with `nix repl`



  ```shell-session

  $ nix repl '<nixpkgs>' -I nixpkgs=channel:nixpkgs-unstable

  $ nix repl -f '<nixpkgs>' -I nixpkgs=channel:nixpkgs-unstable

  nix-repl> javaPackages.<tab>

  javaPackages.compiler               javaPackages.openjfx15              javaPackages.openjfx21              javaPackages.recurseForDerivations

  javaPackages.jogl_2_4_0             javaPackages.openjfx17              javaPackages.openjfx25

doc/release-notes/rl-2605.section.md

+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ 


- `mozc` and `mozc-ut` no longer contains the IBus front-end, which are now provided by `ibus-engines.mozc` and `ibus-engines.mozc-ut`.



- `nemorosa` has been updated from `0.4.3` to `0.5.0`. Version [0.5.0](https://github.com/KyokoMiki/nemorosa/releases/tag/0.5.0) introduced breaking changes to the package configuration.



- `n8n` has been updated to version 2. You can find the breaking changes here: https://docs.n8n.io/2-0-breaking-changes/.



- The default NVIDIA drivers no longer support Maxwell (GTX 1xxx) or older GPUs. Pin the nvidia package to ` config.boot.kernelPackages.nvidiaPackages.legacy_580` for continued support.

maintainers/maintainer-list.nix

+10 −0
Original line number Diff line number Diff line
@@ -3488,6 +3488,11 @@ 
    githubId = 30630233;

    name = "Timo Triebensky";

  };

  BIOS9 = {

    name = "NightFish";

    github = "BIOS9";

    githubId = 15035908;

  };

  birdee = {

    name = "birdee";

    github = "BirdeeHub";
@@ -16159,6 +16164,11 @@ 
    githubId = 8094643;

    keys = [ { fingerprint = "BAA9 7711 58CA D457 B4AE  8B06 8188 423D 2FA2 0A65"; } ];

  };

  m7medvision = {

    name = "Mohammed";

    github = "m7medVision";

    githubId = 88824957;

  };

  ma27 = {

    email = "maximilian@mbosch.me";

    matrix = "@ma27:nicht-so.sexy";

nixos/doc/manual/configuration/modularity.section.md

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ Interactive exploration of the configuration is possible using `nix 
  repl`, a read-eval-print loop for Nix expressions. A typical use:



```ShellSession

$ nix repl '<nixpkgs/nixos>'

$ nix repl -f '<nixpkgs/nixos>'



nix-repl> config.networking.hostName

"mandark"

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -1204,6 +1204,7 @@ 
  ./services/networking/frr.nix

  ./services/networking/g3proxy.nix

  ./services/networking/gdomap.nix

  ./services/networking/geph.nix

  ./services/networking/ghostunnel.nix

  ./services/networking/git-daemon.nix

  ./services/networking/globalprotect-vpn.nix