summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* lib/modules.nix: Clean up mergeAttrDefinitionsWithPrio impl•••(cherry picked from commit 895ac176341606688b864bc84312140c065db741) origin/backport-238136-to-release-23.05Robert Hensing2023-06-231-9/+2
* nixos/nixpkgs: Don't check when _module.args.pkgs is set•••(cherry picked from commit 8f31bff7940ed8d8d3e250e6ab7e7bc5b6160f1d) Robert Hensing2023-06-231-6/+11
* lib.modules: Add mergeAttrDefinitionsWithPrio•••This will let us make assertions involving _module.args.pkgs, which is not an option but a value attribute, and therefore doesn't have its own highestPrio to inspect. The new function gives us that info. (cherry picked from commit 36ea2bbfe81ccf1118fd0ef66b13868fa3cc27e4) Robert Hensing2023-06-233-0/+65
* nixos/nixpkgs: Make default Nixpkgs lazy when overridden•••(cherry picked from commit a742767bafecf0644585309b744e24f90cdff207) Robert Hensing2023-06-231-1/+9
* Merge pull request #239344 from NixOS/backport-239313-to-release-23.05•••[Backport release-23.05] mu: 1.10.3 -> 1.10.4Nick Cao2023-06-241-2/+2
|\
| * mu: 1.10.3 -> 1.10.4•••https://github.com/djcb/mu/releases/tag/v1.10.4 (cherry picked from commit de1467e7b6e44389d91c2d87704ebe3aec367d02) Charlotte Van Petegem2023-06-231-2/+2
* | pkgsStatic.libargon2: fix build•••By default, LIBRARIES includes both $(LIB_SH) (the shared library), and $(LIB_ST) (the static library). (cherry picked from commit d6660fa81bb6c14c2b6565ccada1b459ae25d9df) Alyssa Ross2023-06-231-0/+2
* | Merge pull request #239090 from NixOS/backport-239020-to-release-23.05•••[Backport release-23.05] Linux kernel updates 2023-06-21Maximilian Bosch2023-06-239-19/+19
|\ \
| * | linux_latest-libre: 19331 -> 19337•••(cherry picked from commit 786896e22900d7b5c4904997365333e83865defc) Maximilian Bosch2023-06-221-2/+2
| * | linux-rt_5_10: 5.10.78-rt55 -> 5.10.184-rt90•••(cherry picked from commit 5fcaa94255cc52c0039a16253ab5663301c5ee25) Maximilian Bosch2023-06-221-3/+3
| * | linux: 6.3.8 -> 6.3.9•••(cherry picked from commit 1b038dbb7a74ec550b91233ed22f7df2a8400a98) Maximilian Bosch2023-06-221-2/+2
| * | linux: 6.1.34 -> 6.1.35•••(cherry picked from commit a90ca2ad2b521f759ba8d7a5af79ad1395639071) Maximilian Bosch2023-06-221-2/+2
| * | linux: 5.4.247 -> 5.4.248•••(cherry picked from commit bf2aa164604966cc2c22bf607c5e224dfb2dda7a) Maximilian Bosch2023-06-221-2/+2
| * | linux: 5.15.117 -> 5.15.118•••(cherry picked from commit 00b1db98acc7238f37b6bb4889ecca20853fd001) Maximilian Bosch2023-06-221-2/+2
| * | linux: 5.10.184 -> 5.10.185•••(cherry picked from commit 9b063660201564e0e27f5b6bcfc1e038eabfc8af) Maximilian Bosch2023-06-221-2/+2
| * | linux: 4.19.286 -> 4.19.287•••(cherry picked from commit 0557763fc6faa87b00469cab51a8667f9d5016be) Maximilian Bosch2023-06-221-2/+2
| * | linux: 4.14.318 -> 4.14.319•••(cherry picked from commit 93c6573133bc24d85b1ba8f2e74bee6451a8a2d8) Maximilian Bosch2023-06-221-2/+2
* | | linux_testing: 6.4-rc6 -> 6.4-rc7•••https://lwn.net/Articles/935082/ (cherry picked from commit 4fa45e42782ee3897406f8bf75ac896360bcad68) Raito Bezarius2023-06-231-2/+2
* | | Merge pull request #239150 from NixOS/backport-238958-to-release-23.05Franz Pletz2023-06-231-4/+4
|\ \ \ | |_|/ |/| |
| * | prometheus: 2.42.0 -> 2.44.0•••(cherry picked from commit b7c57a09232495e6e73feae34881e24adbc66942) Franz Pletz2023-06-221-4/+4
* | | Merge pull request #239317 from NixOS/backport-239174-to-release-23.05•••[Backport release-23.05] element-{web,desktop}: v1.11.33 -> v1.11.34Nick Cao2023-06-231-5/+5
|\ \ \
| * | | element-{web,desktop}: v1.11.33 -> v1.11.34•••https://github.com/vector-im/element-web/releases/tag/v1.11.34 https://github.com/vector-im/element-desktop/releases/tag/v1.11.34 (cherry picked from commit 4bd44c052130331db06e153b1dcc7bebfa9c7eb8) Yaya2023-06-231-5/+5
* | | | Merge pull request #239319 from NixOS/backport-239308-to-release-23.05•••[Backport release-23.05] vscode-extensions.dbaeumer.vscode-eslint: 2.4.0 -> 2.4.2Nick Cao2023-06-231-2/+2
|\ \ \ \
| * | | | vscode-extensions.dbaeumer.vscode-eslint: 2.4.0 -> 2.4.2•••(cherry picked from commit 43ea039eb24a57db4d76516a5771c12a6649386e) datafoo2023-06-231-2/+2
|/ / / /
* | | | Merge pull request #239311 from NixOS/backport-238941-to-release-23.05•••[Backport release-23.05] terraform: 1.5.0 -> 1.5.1Nick Cao2023-06-231-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | terraform: 1.5.0 -> 1.5.1•••Diff: https://github.com/hashicorp/terraform/compare/v1.5.0...v1.5.1 Changelog: https://github.com/hashicorp/terraform/blob/v1.5.1/CHANGELOG.md (cherry picked from commit cf4f8ce0ee9cb1a4fcb6e2cdaf122765bbdcfd99) Mario Rodas2023-06-231-2/+2
|/ / /
* | | Merge pull request #239276 from NixOS/backport-239208-to-release-23.05•••[Backport release-23.05] nixos/vault: set coredump ulimit to 0Nick Cao2023-06-231-0/+1
|\ \ \
| * | | vault: set coredump ulimit to 0•••(cherry picked from commit 53a3ddfab88c4e45be8fe4d69f70fa11672c2c90) Jelle Besseling2023-06-231-0/+1
* | | | Merge pull request #239243 from NixOS/backport-237235-to-release-23.05•••[Backport release-23.05] nixosTests.os-prober: fixNick Cao2023-06-232-5/+7
|\ \ \ \ | |/ / / |/| | |
| * | | nixosTests.os-prober: add missing kbd extra dep•••(cherry picked from commit d48e365ff604796ecfd970bc6bc3a7546d8b0a12) Alyssa Ross2023-06-221-0/+2
| * | | nixosTests.os-prober: fix filesystem for Debian•••Debian's e2fsprogs does not understand the metadata_csum_seed ext4 feature, which our e2fsprogs enables by default, so we have to disable it. (cherry picked from commit ee0c8cd15cd4ef5c3cf2292dc7c760de5e709eac) Alyssa Ross2023-06-221-1/+1
| * | | vmTools: download debs from snapshot URLs•••The deb files we want are no longer available in the Debian mirrors, so we need to download them from the snapshots we download the package lists from. This makes it possible to build the os-prober NixOS test again. (cherry picked from commit 64bfa05b36ae13bb94327bb9154afdf4d7bfbdf7) Alyssa Ross2023-06-221-4/+4
* | | | Merge pull request #239165 from NixOS/backport-239024-to-release-23.05•••[Backport release-23.05] knot-resolver: respect doInstallCheck even in wrapperNick Cao2023-06-231-3/+3
|\ \ \ \
| * | | | knot-resolver: respect doInstallCheck even in wrapper•••The main point is to avoid it when cross-compiling. (cherry picked from commit 962e2323a2d9e0d61b9c26e0a1fbef26028ebe1a) Vladimír Čunát2023-06-221-3/+3
* | | | | Merge pull request #239227 from NixOS/backport-239221-to-release-23.05•••[Backport release-23.05] bird: 2.13 -> 2.13.1Martin Weinelt2023-06-231-2/+2
|\ \ \ \ \
| * | | | | bird: 2.13 -> 2.13.1•••> When a case statement in filter had an empty branch, it crashed BIRD. This bug > applies to versions 2.13 and 2.0.12. Version 2.0.11 is not affected. > Also we fixed a bug in BGP Roles manifesting when the other party sent no > capabilities at all. https://trubka.network.cz/pipermail/bird-users/2023-June/017034.html (cherry picked from commit 0ed1db3ee52c42adb38b23751cf895e48915cf2f) Moritz 'e1mo' Fromm2023-06-221-2/+2
| | |/ / / | |/| | |
* / | | | Remove myself from maintainers•••Done with `sed -i -E '/^\s+(maintainers\.)?jtojnar\s*$/d;s/ (@|maintainers\.|)jtojnar//g' (rg ' jtojnar|maintainers\.jtojnar|^\s+jtojnar\s*$' -l -g '!maintainers/maintainer-list.nix')`. (Always check the `rg` result beforehand to avoid corruption.) Jan Tojnar2023-06-2250-51/+46
|/ / / /
* | | | Merge pull request #239188 from vcunat/p/lib-tests-23.05•••lib/tests: compatibility with more Nix versionsJohn Ericson2023-06-224-97/+104
|\ \ \ \
| * | | | lib/tests: Also run with nixVersions.minimum and nixVersions.unstable•••The previous commits ensure that the tests also succeed with those versions (cherry picked from commit 013acf2396f451c73b6cd6b0148df21cbaa4c165) Silvan Mosberger2023-06-221-42/+52
| * | | | lib/tests/filesystem.sh: Check success and failure separately•••(cherry picked from commit de0c11241f8a2e72c2cd02b86fedaaeb30292e97) Silvan Mosberger2023-06-221-46/+37
| * | | | lib/tests: Fix when run with Nix 2.3•••(cherry picked from commit 0b6021ee53eb4677e96f28a260db9157b4f19c7a) Silvan Mosberger2023-06-222-10/+15
| * | | | lib.filesystem.pathType: Fix tests for Nix >= 2.14•••(cherry picked from commit 04db3589a8150c0a97869b10e269d6d5c516f3e9) Silvan Mosberger2023-06-221-2/+3
| |/ / /
* | | | Merge pull request #239179 from NixOS/backport-239167-to-release-23.05•••[Backport release-23.05] yt-dlp: 2023.6.21 -> 2023.6.22Mario Rodas2023-06-221-2/+2
|\ \ \ \
| * | | | yt-dlp: 2023.6.21 -> 2023.6.22•••https://github.com/yt-dlp/yt-dlp/releases/tag/2023.06.22 (cherry picked from commit c35e9553a449c1d2292a7b58a6553d91a44d0510) zowoq2023-06-221-2/+2
|/ / / /
* | | | Merge pull request #239172 from NixOS/backport-238691-to-release-23.05Artturi2023-06-221-2/+2
|\ \ \ \
| * | | | discord-canary: 0.0.158 -> 0.0.160•••(cherry picked from commit b29b09406eff0c941a907749b17c6267ef25aadf) R. Ryantm2023-06-221-2/+2
* | | | | Merge pull request #239144 from NixOS/backport-236143-to-release-23.05•••[Backport release-23.05] minidlna: 1.3.2 -> 1.3.3Weijia Wang2023-06-221-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | minidlna: 1.3.2 -> 1.3.3•••(cherry picked from commit 98586c419d710a035e123b12d7970a4ba711d869) R. Ryantm2023-06-221-2/+2
| | |/ / | |/| |
* | | | Merge pull request #239171 from NixOS/backport-237146-to-release-23.05Artturi2023-06-221-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | discord-canary: 0.0.154 -> 0.0.158•••(cherry picked from commit b81d4086b56d83bb35e2089d295514220e11e9d3) R. Ryantm2023-06-221-2/+2
|/ / /
generated by cgit v1.2.3 (git 2.52.0) at 2026-01-17 05:36:26 +0000