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

Merge master into staging-next

parents 84295459 1786e50c

doc/build-helpers/fetchers.chapter.md

+2 −2
Original line number Diff line number Diff line
@@ -505,8 +505,8 @@ fetchurl { 


  downloadToTemp = true;

  postFetch = ''

    ${lib.getExe hello} >> $downloadedFile

    mv $downloadedFile $out

    hello >> "$downloadedFile"

    mv "$downloadedFile" "$out"

  '';



  hash = "sha256-ceooQQYmDx5+0nfg40uU3NNI2yKrixP7HZ/xLZUNv+w=";

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

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


- Zig 0.12 has been removed.



- `services.forgejo.dump.age` now defaults to `4w`, which deletes dumps older than 4 weeks. This new behaviour could result in older backups being deleted.



- `ansible-later` has been removed because it was discontinued by the author.



- `k3s` airgap images passthru attributes have changed:

maintainers/scripts/update-channel-branches.sh

+1 −1
Original line number Diff line number Diff line 
#!/usr/bin/env bash

set -e



: ${NIXOS_CHANNELS:=https://nixos.org/channels/}

: ${NIXOS_CHANNELS:=https://channels.nixos.org/}

: ${CHANNELS_NAMESPACE:=refs/heads/channels/}



# List all channels which are currently in the repository which we would

nixos/doc/manual/development/replace-modules.section.md

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ nixos-unstable unless explicitly configured to do so. 


  imports = [

    # Use postgresql service from nixos-unstable channel.

    # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable

    # sudo nix-channel --add https://channels.nixos.org/nixos-unstable nixos-unstable

    <nixos-unstable/nixos/modules/services/databases/postgresql.nix>

  ];

nixos/doc/manual/installation/installing-from-other-distro.section.md

+2 −2
Original line number Diff line number Diff line
@@ -35,14 +35,14 @@ The first steps to all these are the same: 


    ```ShellSession

    $ nix-channel --list

    nixpkgs https://nixos.org/channels/nixpkgs-unstable

    nixpkgs https://channels.nixos.org/nixpkgs-unstable

    ```



    As that channel gets released without running the NixOS tests, it

    will be safer to use the `nixos-*` channels instead:



    ```ShellSession

    $ nix-channel --add https://nixos.org/channels/nixos-<version> nixpkgs

    $ nix-channel --add https://channels.nixos.org/nixos-<version> nixpkgs

    ```



    Where `<version>` corresponds to the latest version available on [channels.nixos.org](https://channels.nixos.org/).