Unverified Commit d3401fc7 authored by Justin Bedo's avatar Justin Bedo
Browse files

Merge remote-tracking branch 'origin/master' into r-updates

parents ae09f9d3 81590b26

.github/CODEOWNERS

+2 −2
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ 
# @raitobezarius is not "code owner", but is listed here to be notified of changes

# pertaining to the Nix package manager.

# i.e. no authority over those files.

pkgs/tools/package-management/nix/                    @raitobezarius

nixos/modules/installer/tools/nix-fallback-paths.nix  @raitobezarius

pkgs/tools/package-management/nix/                    @NixOS/nix-team @raitobezarius

nixos/modules/installer/tools/nix-fallback-paths.nix  @NixOS/nix-team @raitobezarius



# Nixpkgs documentation

/maintainers/scripts/db-to-md.sh @jtojnar @ryantm

.github/PULL_REQUEST_TEMPLATE.md

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ For new packages please briefly describe the package or provide a link to its ho 
  - [NixOS test(s)](https://nixos.org/manual/nixos/unstable/index.html#sec-nixos-tests) (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))

  - and/or [package tests](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#package-tests)

  - or, for functions and "core" functionality, tests in [lib/tests](https://github.com/NixOS/nixpkgs/blob/master/lib/tests) or [pkgs/test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/test)

  - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages

  - made sure NixOS tests are [linked](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#linking-nixos-module-tests-to-a-package) to the relevant packages

- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage)

- [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)

- [24.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2411.section.md) (or backporting [23.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2311.section.md) and [24.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2405.section.md) Release notes)

.github/workflows/check-nix-format.yml

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ jobs: 


          if (( "${#unformattedFiles[@]}" > 0 )); then

            echo "Some new/changed Nix files are not properly formatted"

            echo "Please run the following in \`nix-shell\`:"

            echo "Please go to the Nixpkgs root directory, run \`nix-shell\`, then:"

            echo "nixfmt ${unformattedFiles[*]@Q}"

            exit 1

          fi

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ Anderson Torres <torres.anderson.85@protonmail.com> 
Atemu <git@atemu.net> <atemu.main@gmail.com>

Daniel Løvbrøtte Olsen <me@dandellion.xyz> <daniel.olsen99@gmail.com>

Fabian Affolter <mail@fabian-affolter.ch> <fabian@affolter-engineering.ch>

goatastronaut0212 <goatastronaut0212@proton.me> <goatastronaut0212@outlook.com>

Janne Heß <janne@hess.ooo> <dasJ@users.noreply.github.com>

Jörg Thalheim <joerg@thalheim.io> <Mic92@users.noreply.github.com>

Martin Weinelt <hexa@darmstadt.ccc.de> <mweinelt@users.noreply.github.com>

ci/pinned-nixpkgs.json

+2 −2
Original line number Diff line number Diff line 
{

  "rev": "521d48afa9ae596930a95325529df27fa7135ff5",

  "sha256": "0a1pa5azw990narsfipdli1wng4nc3vhvrp00hb8v1qfchcq7dc9"

  "rev": "4de4818c1ffa76d57787af936e8a23648bda6be4",

  "sha256": "0l3b9jr5ydzqgvd10j12imc9jqb6jv5v2bdi1gyy5cwkwplfay67"

}