Compare commits

..

823 Commits

Author SHA1 Message Date
Leona Maroni
11cb3517b3 Release NixOS 25.05 2025-05-23 20:56:20 +02:00
OPNA2608
f526c3e77a nixosTests.lomiri-filemanager-app: Fix OCR
(cherry picked from commit 66301f51a3)
2025-05-23 23:25:53 +05:30
OPNA2608
a12287d041 lomiri.lomiri-filemanager-app: 1.1.3 -> 1.1.4
(cherry picked from commit 2143771374)
2025-05-23 23:25:53 +05:30
Emily
85464f6a96 [Backport release-25.05] Revert "lib.meta.availableOn: Return false if pkg parameter is null" (#410242) 2025-05-23 18:47:35 +01:00
Emily
ea235dc9ee Revert "lib.meta.availableOn: Return false if pkg parameter is null"
I believe this change is wrong both theoretically and practically.

Theoretically, `null` is available on every platform, because
`buildInputs = [ null ];` always succeeds and never throws a platform
availability error. `null` should be handled consistently with packages
that have no explicit list of supported platforms, as it of course
has no such list itself.

Practically, we use `null` to represent libraries that are always
present on a platform and do not require a library (for instance,
because they are part of `libc` or the macOS SDK). This has been
used for a long time by `libintl` (on all non‐glibc platforms),
and is also now used by `libGL` and friends on Darwin. This change
broke the check SDL3 does for OpenGL availability on Darwin, causing
<https://github.com/NixOS/nixpkgs/issues/407056>, which had to be
worked around by <https://github.com/NixOS/nixpkgs/pull/409525>.

Both `libintl` and `libGL` should count as available on platforms
where their functionality is part of the standard build environment,
and a package that is completely unavailable and whose functionality
cannot be expected should not use `null`, as it should result in
errors if used in a dependency list on an unsupported platform.

I accept that overriding with `null` is often a useful way to disable
dependencies that don’t have explicit feature flags, but I do not
think that making it work better with feature flags conditioned on
availability is worth the inconsistency and problems caused by this
change. Packages can instead expose the relevant feature flags as
arguments that default to the `lib.meta.availableOn` check or, if they
want to keep an “override the dependency to `null`” interface,
insert an explicit `pkg != null && …` check.

Additionally, the pull request was merged over a week after all
breaking changes were restricted for the 25.05 release. I believe that
the potential problems of dealing with the effects of this change for
an entire release cycle – the first release cycle where `libGL` is
`null` on Darwin, a change I made before the deadline and before this
change to `lib.meta.availableOn` – offset the risks of backporting
this revert at such a late stage.

It will cause overrides to backwards‐incompatibly revert to the
behaviour they had before the change, but since such overrides were
not possible until a few weeks ago, I hope that is an acceptable risk
compared to the potential issues leaving this in the release can
cause, given that it was merged after the deadline and has already
broken an existing construction in Nixpkgs.

This reverts commit 9338d924db.

(cherry picked from commit 98dbc7cc58)
2025-05-23 17:39:28 +00:00
nixpkgs-ci[bot]
c5ac655645 [Backport release-25.05] ente-desktop: fix literal inclusion of '$out' (#410215)
ente-desktop: fix literal inclusion of '$out' (#410214)

(cherry picked from commit 766a203ac7)

Co-authored-by: oddlama <oddlama@oddlama.org>
2025-05-23 19:01:28 +02:00
Aleksana
243c587ad6 [Backport release-25.05] python313Packages.entry-points-txt: refactor (#408169) 2025-05-23 23:49:50 +08:00
Aleksana
35b528a99b [Backport release-25.05] python313Packages.types-lxml: adjust inputs (#408172) 2025-05-23 23:49:16 +08:00
Aleksana
773e2b7fef [Backport release-25.05] lazygit: 0.51.0 -> 0.51.1 (#410137) 2025-05-23 23:43:05 +08:00
Pol Dellaiera
591f3ea49f [Backport release-25.05] maintainers: remove my gpg key (#410189) 2025-05-23 14:37:08 +00:00
Aleksana
3d840c10d3 [Backport release-25.05] neovide, neovim-gtk, neovim-qt-unwrapped: minor refreshment (#410134) 2025-05-23 22:31:26 +08:00
Aleksana
9fb1625d7d [Backport release-25.05] rquickshare: clean up dependencies, don't use applyPatches (#410139) 2025-05-23 22:30:52 +08:00
eljamm
048ac2787b maintainers: remove my gpg key
(cherry picked from commit 75e677c32e)
2025-05-23 14:29:42 +00:00
Aleksana
cf6267fb09 [Backport release-25.05] tftui: accept posthog 4 (#407766) 2025-05-23 22:12:10 +08:00
Aleksana
55d285372d [Backport release-25.05] tree-sitter: update changelog url (#410133) 2025-05-23 22:11:21 +08:00
Aleksana
92d1b796c3 [Backport release-25.05] sing-box: clean up (#410175) 2025-05-23 22:10:07 +08:00
Sizhe Zhao
dedb89c43d sing-box: install shell completions directly 2025-05-23 21:56:54 +08:00
Sizhe Zhao
828eac07e7 sing-box: add prince213 to maintainers 2025-05-23 21:56:54 +08:00
Sizhe Zhao
7c6cc26c27 sing-box: use finalAttrs 2025-05-23 21:56:54 +08:00
Sizhe Zhao
fca99741a9 sing-box: avoid with lib; 2025-05-23 21:53:24 +08:00
Jörg Thalheim
76b4b619b8 [Backport release-25.05] qmk: add bootloadhid as a propagatedBuildInput for hardware support (#410147) 2025-05-23 15:28:18 +02:00
Aleksana
52207c55fd [Backport release-25.05] donpapi: refactor and mark as broken on darwin (#408965) 2025-05-23 21:21:04 +08:00
Aleksana
ddd0a706be [Backport release-25.05] nixos/orca: Make available to gdm greeter (#409142) 2025-05-23 21:20:41 +08:00
Aleksana
660a8bba18 [Backport release-25.05] pencil2d: init at 0.7.0 (#410154) 2025-05-23 21:19:34 +08:00
TheTaoOfSu
775ffcabc6 qmk: add bootloadhid as a propagatedBuildInput to support flashing more hardware
(cherry picked from commit 6fb834fb3c)
2025-05-23 16:11:37 +03:00
misuzu
d9335df305 [Backport release-25.05] bootloadhid: init at 0-unstable-2012-12-08 (#410149) 2025-05-23 16:08:48 +03:00
Aleksana
acdf0eb91a [Backport release-25.05] nixos/doc/rl-2505: add an entry for nixos/agnos (#410152) 2025-05-23 21:02:35 +08:00
Savchenko Dmitriy
40986e7094 pencil2d: init at 0.7.0 (#402895)
(cherry picked from commit e2cbbf11fc)
2025-05-23 13:00:33 +00:00
Sandro
fb54862276 [Backport release-25.05] yt-dlp: 2025.4.30 -> 2025.5.22 (#409746) 2025-05-23 14:57:55 +02:00
Sandro
2a17f894f8 [Backport release-25.05] python313Packages.tendo: fix build with python 3.13 (#409489) 2025-05-23 14:57:05 +02:00
Aleksana
779f282eeb [Backport release-25.05] ext4magic: add patch to fix segfault (#410136) 2025-05-23 20:55:16 +08:00
Justinas Stankevicius
aec7844290 nixos/doc/rl-2505: add an entry for nixos/agnos
(cherry picked from commit 315681dfe2)
2025-05-23 12:48:47 +00:00
TheTaoOfSu
5739aebdf7 bootloadhid: init at 0-unstable-2012-12-08
(cherry picked from commit d6fa60faf1)
2025-05-23 12:47:42 +00:00
TheTaoOfSu
b1af56092e maintainers: add thetaoofsu
(cherry picked from commit ed8e18ad6a)
2025-05-23 12:47:41 +00:00
Aleksana
58ae193744 [Backport release-25.05] vault: 1.19.3 -> 1.19.4, vault-bin: 1.19.3 -> 1.19.4 (#409914) 2025-05-23 20:33:58 +08:00
TomaSajt
afb42377cb rquickshare: clean up dependencies, don't use applyPatches
(cherry picked from commit 8a5a277122)
2025-05-23 12:28:42 +00:00
Aleksana
1a7b9de192 [Backport release-25.05] akkoma-admin-fe: Fix build for x86_64-darwin (#410014) 2025-05-23 20:23:00 +08:00
Aleksana
f2b15650e4 [Backport release-25.05] yandex-music: 5.50.0 -> 5.51.1 (#409751) 2025-05-23 20:22:22 +08:00
Aleksana
863399e14a [Backport release-25.05] python3Packages.klayout: fix darwin build (#409732) 2025-05-23 20:22:10 +08:00
Jost Alemann
1e591dc363 lazygit: 0.51.0 -> 0.51.1
Diff: https://github.com/jesseduffield/lazygit/compare/v0.51.0...v0.51.1
Changelog: https://github.com/jesseduffield/lazygit/releases/tag/v0.51.1
(cherry picked from commit b47cac5d69)
2025-05-23 12:21:42 +00:00
Nicolas Benes
7e6409f466 ext4magic: add patch to fix segfault
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854497
(cherry picked from commit 704bda7d20)
2025-05-23 12:18:02 +00:00
Acid Bong
c7cd3d76b4 neovim-gtk: use finalAttrs, remove with lib
(cherry picked from commit d88309158f)
2025-05-23 12:16:47 +00:00
Acid Bong
ba85488790 neovim-qt-unwrapped: use finalAttrs, remove with lib
(cherry picked from commit e98fa16484)
2025-05-23 12:16:47 +00:00
Acid Bong
6adeba369b neovide: use finalAttrs, remove with lib
(cherry picked from commit 6cead234cb)
2025-05-23 12:16:47 +00:00
uncenter
c7f133a9ca tree-sitter: update changelog url
(cherry picked from commit e5c4040441)
2025-05-23 12:11:36 +00:00
Adam M. Szalkowski
49189325fd hyprlandPlugins.hy3: 0.48.0 -> 0.49.0
(cherry picked from commit 41b894265a)
2025-05-23 17:40:35 +05:30
Aleksana
684552d89c [Backport release-25.05] argbash: update meta.homepage (#410127) 2025-05-23 19:56:25 +08:00
Aleksana
3756de4e62 [Backport release-25.05] plant-it: init at 0.10.0 (#410104) 2025-05-23 19:40:00 +08:00
Kenichi Kamiya
d9234922b0 argbash: update meta.homepage
Upstream replaced the link in 48a7252cfe

(cherry picked from commit f05abeb30e)
2025-05-23 11:39:14 +00:00
Edgar Pireyn
d220a959b6 plant-it-frontend: init at 0.10.0
(cherry picked from commit 2aa307ab83)
2025-05-23 10:17:47 +00:00
Edgar Pireyn
c8038975d0 plant-it: init at 0.10.0
(cherry picked from commit e2b421c169)
2025-05-23 10:17:47 +00:00
Edgar Pireyn
a8bf682bdc maintainers: Add epireyn
I plan on maintaining `plant-it` and probably other self-hosted services.

(cherry picked from commit 838e42eb51)
2025-05-23 10:17:47 +00:00
Robert Hensing
fa89de23e9 [Backport release-25.05] json-schema-catalog-rs: init at 0.1.1 (#410067) 2025-05-23 10:51:13 +02:00
Aleksana
1a4ede4083 [Backport release-25.05] lazygit: 0.50.0 -> 0.51.0 (#409822) 2025-05-23 16:33:58 +08:00
Aleksana
3ea5b529b4 [Backport release-25.05] anytype: fix single instance detection and specify URL in .desktop file (#410020) 2025-05-23 16:33:15 +08:00
Aleksana
5518e8787b [Backport release-25.05] fractal: 11 -> 11.1 (#409826) 2025-05-23 15:40:34 +08:00
Aleksana
263d12c0f3 [Backport release-25.05] pmars: Fix FTBFS due to ncurses change (#410023) 2025-05-23 15:39:20 +08:00
Aleksana
3b4043f39d [Backport release-25.05] musicpod: 2.11.4 -> 2.12.0 (#410065) 2025-05-23 15:32:13 +08:00
Ethan Carter Edwards
92e83dd9a0 json-schema-catalog-rs: add versionCheckHook
(cherry picked from commit 72eaf394d3)
2025-05-23 07:31:28 +00:00
Robert Hensing
b8815f1856 json-schema-catalog-rs: init at 0.1.1
(cherry picked from commit c598c6d576)
2025-05-23 07:31:28 +00:00
emaryn
1bf2e381f9 musicpod: 2.11.4 -> 2.12.0
(cherry picked from commit 07fbfa430b)
2025-05-23 07:24:54 +00:00
Aleksana
e4b8c79e53 [Backport release-25.05] fasthenry: fix build with gcc 14 (#410008) 2025-05-23 15:22:45 +08:00
Thomas Gerbet
5a06550939 [Backport release-25.05] librewolf-bin-unwrapped: 138.0.1-2 -> 138.0.4-1 (#409907) 2025-05-23 09:19:39 +02:00
Aleksana
ed3e8fdc88 [Backport release-25.05] nixos/paperless: expose manage package (#408739) 2025-05-23 15:19:26 +08:00
Aleksana
3e7836c84c [Backport release-25.05] llvmPackages.lldb-manpages: fix building (#410012) 2025-05-23 15:18:06 +08:00
Aleksana
955de76601 [Backport release-25.05] nwg-dock-hyprland: 0.4.5 -> 0.4.6 (#409993) 2025-05-23 15:17:44 +08:00
Aleksana
1282f40a4c [Backport release-25.05] scope-tui: 0.3.0-unstable-2024-05-06 -> 0.3.3 (#409991) 2025-05-23 15:16:04 +08:00
Leona Maroni
b53bc1676f [Backport release-25.05] doc/rl-2505: final cleanups (#410059) 2025-05-23 09:11:43 +02:00
Wolfgang Walther
67526450ee [Backport release-25.05] workflows/eval: run when base branch changed (#409857) 2025-05-23 07:09:06 +00:00
Sarah Clark
bee3bb87f2 python3Packages.labelbox: 6.6.0 -> 6.10.0
Changelogs:
* https://github.com/Labelbox/labelbox-python/releases/tag/v.6.10.0
* https://github.com/Labelbox/labelbox-python/releases/tag/v.6.9.0
* https://github.com/Labelbox/labelbox-python/releases/tag/v.6.8.0
* https://github.com/Labelbox/labelbox-python/releases/tag/v.6.8.0

diff: https://github.com/Labelbox/labelbox-python/compare/v.6.6.0...v.6.10.0
(cherry picked from commit 7b2772c14d)
2025-05-23 07:06:48 +00:00
Sarah Clark
bbdb4945bf python3Packages.labelbox: build missing lbox-clients dependency
(cherry picked from commit ae45b31e06)
2025-05-23 07:06:48 +00:00
Seth Flynn
7be97c226e nixos/doc/rl-2505: cleanup "new modules" section
(cherry picked from commit 7fb7f0c4a1)
2025-05-23 07:04:40 +00:00
Seth Flynn
4e3f17c106 doc/rl-2505: fix nexusmods.app entry formatting
I don't really think this needs its own header and section...

(cherry picked from commit b17e45ca7c)
2025-05-23 07:04:40 +00:00
Seth Flynn
0c0d19b831 doc/rl-2505: move unrelated entries from lib section
(cherry picked from commit 00ae244074)
2025-05-23 07:04:40 +00:00
Seth Flynn
8f6b37ece6 doc/rl-2505: fix links in lib section
(cherry picked from commit 041c3794c4)
2025-05-23 07:04:39 +00:00
Doron Behar
41430d9c93 [Backport release-25.05] nixos/i18n: Re-add special handling of LANGUAGE (#410054) 2025-05-23 09:33:08 +03:00
Doron Behar
24b41a7f8b nixos/i18n: Re-add special handling of LANGUAGE
This reverts commit 263297b4e5 while also
explaining in the docs where exactly LANGUAGE is ignored, and why.

Fixes #409306.

(cherry picked from commit 82dfbe95f5)
2025-05-23 06:25:48 +00:00
Aleksana
f89c89a1e7 [Backport release-25.05] netbird: fix typo in warning message (#410021) 2025-05-23 11:48:10 +08:00
Aleksana
4e0e6884e8 [Backport release-25.05] ulauncher: revert back to webkitgtk_4_0 to fix startup error (#410013) 2025-05-23 11:47:51 +08:00
Aleksana
03de5d2e9d [Backport release-25.05] catppuccin-plymouth: fix variant selection (#410015) 2025-05-23 11:47:32 +08:00
Aleksana
4a82db41dc [Backport release-25.05] nixos/foot: fix zshrc (#410018) 2025-05-23 11:47:12 +08:00
Tristan Ross
809b099146 [Backport release-25.05] selinux-sandbox: fix building (#410011) 2025-05-22 20:44:42 -07:00
OPNA2608
ada6f666ff pmars: Fix FTBFS due to ncurses change
WINDOW struct was turned opaque in recent versions, meaning that direct access to struct members is no longer supported.
Add patch to replace direct access with calls to getter functions.

(cherry picked from commit fe359e9681)
2025-05-23 03:36:05 +00:00
Pop
298a25eeec netbird: fix typo in warning message (#406819)
(cherry picked from commit 017276a4aa)
2025-05-23 03:32:43 +00:00
Axel Karjalainen
95ee32e5d8 anytype: fix single instance detection and specify URL in .desktop file
(cherry picked from commit 09ccea2424)
2025-05-23 03:31:31 +00:00
nyukuru
690b077209 nixos/foot: fix zshrc
Fixes error 'command not found: add-zsh-hook'

(cherry picked from commit 2c7a56cee9)
2025-05-23 03:27:28 +00:00
palumbou
ad30ac89b6 catppuccin-plymouth: fix formatting using "nix fmt" as written in the CONTRIBUTING.md documentation
(cherry picked from commit def8389c97)
2025-05-23 03:21:01 +00:00
palumbou
f8356eef66 catppuccin-plymouth: fix formatting using nixpkgs-fmt and statix
(cherry picked from commit 203e626742)
2025-05-23 03:21:01 +00:00
palumbou
d6cd99f80b catppuccin-plymouth: fix variant selection
The package previously had an issue where it defined valid variants but did
not properly connect the validation to the derivation. This resulted in only
the default "macchiato" variant being accessible.

Fixed by replacing `lib.checkListOfEnum` with `assert lib.assertOneOf`
to properly validate and allow selection of all defined variants:
"latte", "frappe", "macchiato" and "mocha".

Tested by successfully building the package with each variant.

(cherry picked from commit d71402645d)
2025-05-23 03:21:01 +00:00
Fiona Behrens
6588ff10ab akkoma-admin-fe: Fix build for x86_64-darwin
Add xcodebuild as build dependencies for both darwin platforms as
x86_64 needs it to run xcodebuild

(cherry picked from commit 0047d6e995)
2025-05-23 03:19:19 +00:00
Lan Tian
9f7898818d ulauncher: revert back to webkitgtk_4_0 to fix startup error
(cherry picked from commit 460905fe2e)
2025-05-23 03:16:11 +00:00
Tristan Ross
69a4741a6c llvmPackages.lldb-manpages: fix building
(cherry picked from commit 02260cbf40)
2025-05-23 03:15:36 +00:00
Tristan Ross
c0d22180c5 selinux-sandbox: fix building
(cherry picked from commit e34d28b3f3)
2025-05-23 03:15:19 +00:00
Aleksana
90576afade [Backport release-25.05] doc/rl-2505: wrangle in nixpkgs and nixos split (#410009) 2025-05-23 11:09:47 +08:00
Seth Flynn
fade580c6f doc/rl-2505: re-introduce note about __structuredAttrs & python
Seems this was accidentally removed in 8ae9309 instead of only being
moved from the highlight section

(cherry picked from commit 59b2dd2496)
2025-05-23 02:58:26 +00:00
Seth Flynn
f0e2cff733 doc/rl-2505: move all package entries from nixos notes
This ensures the NixOS notes only refer to things like modules and
NixOS-specific improvements, while the Nixpkgs notes refer to all
package changes

(cherry picked from commit 39a20c95fe)
2025-05-23 02:58:26 +00:00
Seth Flynn
e47625e0e2 nixos/doc/rl-2505: use "Release" as header name
This keeps us in-line with all previous releases. Users should be able
to still differentiate the NixOS and Nixpkgs release notes based on the
header of Nixpkgs' notes

(cherry picked from commit 7edb76465e)
2025-05-23 02:58:26 +00:00
Seth Flynn
71944a8ce8 doc/rl-2505: de-duplicate nixos entires
Make sure package updates are reported in the Nixpkgs notes

(cherry picked from commit 6f5fa0eee4)
2025-05-23 02:58:26 +00:00
Seth Flynn
1f0fc1044c doc/rl-2505: move some entires from nixos notes
These are more broadly applicable to Nixpkgs than only NixOS

(cherry picked from commit 84d6322031)
2025-05-23 02:58:26 +00:00
Sigmanificient
007e8903a9 fasthenry: modernize
(cherry picked from commit afc5cef256)
2025-05-23 02:57:21 +00:00
Sigmanificient
cbe848490c fasthenry: fix build
(cherry picked from commit 9aaa4ac521)
2025-05-23 02:57:21 +00:00
Aleksana
4d98ad776b [Backport release-25.05] treewide: rm empty inherit (#410004) 2025-05-23 10:46:25 +08:00
Sizhe Zhao
ecd10c7cef treewide: rm empty inherit
(cherry picked from commit 43ce4eae1b)
2025-05-23 02:37:45 +00:00
Aaron Andersen
270e01754e [Backport release-25.05] kodiPackages.youtube: 7.1.1.6 -> 7.2.0.1 (#409701) 2025-05-22 22:33:09 -04:00
rewine
4953a0bab4 [Backport release-25.05] vivaldi: 7.3.3635.11 -> 7.3.3635.12 (#409925) 2025-05-23 10:17:09 +08:00
R. Ryantm
1ebe1d9aa9 nwg-dock-hyprland: 0.4.5 -> 0.4.6
(cherry picked from commit 2d536ee8e8)
2025-05-23 02:14:27 +00:00
Lin Xianyi
16a5034a63 scope-tui: 0.3.0-unstable-2024-05-06 -> 0.3.3
Changelog: https://github.com/alemidev/scope-tui/releases/tag/v0.3.3
Diff: c2fe70a69c...v0.3.3
(cherry picked from commit 50f2577220)
2025-05-23 02:12:53 +00:00
Winter
c4aa829967 [Backport release-25.05] cargo-bazel: add libz as buildInput for darwin (#409731) 2025-05-22 21:59:15 -04:00
Aleksana
326ecfa0d5 [Backport release-25.05] gnomeExtensions.arcmenu: 63 -> 65 (#408326) 2025-05-23 09:37:20 +08:00
Aleksana
e6f0153145 [Backport release-25.05] xcircuit: fix build with gcc 14 (#409783) 2025-05-23 09:36:46 +08:00
Aleksana
d964705043 [Backport release-25.05] leo-editor: update meta.homepage (#409785) 2025-05-23 09:36:17 +08:00
Leona Maroni
55d1f923c4 [Backport release-25.05] nixos/manual/upgrading: update release number 24.11 -> 25.05 (#409931) 2025-05-23 00:35:25 +02:00
Leona Maroni
3acf6120ab [Backport release-25.05] nixos/doc/release-notes-2505: fix table formatting for system.build (#409930) 2025-05-23 00:35:16 +02:00
Leona Maroni
04e3910cf4 nixos/manual/upgrading: update release number 24.11 -> 25.05
(cherry picked from commit cc6a8582f6)
2025-05-22 22:26:06 +00:00
Leona Maroni
131205f2f9 nixos/doc/release-notes-2505: fix table formatting for system.build
(cherry picked from commit cce58bb959)
2025-05-22 22:25:08 +00:00
Leona Maroni
85dd2f6acf [Backport release-25.05] doc/rl-2505: Add deprecation warning for removal of GHC versions. (#409909) 2025-05-23 00:23:25 +02:00
R. Ryantm
bb248f8ff6 vivaldi: 7.3.3635.11 -> 7.3.3635.12
(cherry picked from commit 856bddbe8e)
2025-05-22 22:15:55 +00:00
techknowlogick
220c75f1bf vault-bin: 1.19.3 -> 1.19.4
(cherry picked from commit 26088a9aa8)
2025-05-22 21:54:46 +00:00
techknowlogick
9920daf3cd vault: 1.19.3 -> 1.19.4
Diff: https://github.com/hashicorp/vault/compare/v1.19.3...v1.19.4

Changelog: https://github.com/hashicorp/vault/blob/v1.19.4/CHANGELOG.md
(cherry picked from commit d9a74dfb6b)
2025-05-22 21:54:46 +00:00
Arne Keller
bd6e146876 [Backport release-25.05] golly: fix build on darwin (#409886) 2025-05-22 23:43:09 +02:00
maralorn
f86bd390bc doc/rl-2505: Add deprecation warning for removal of GHC versions.
(cherry picked from commit fd7165462c)
2025-05-22 21:28:30 +00:00
emaryn
e261f8c829 librewolf-bin-unwrapped: 138.0.3-1 -> 138.0.4-1
(cherry picked from commit a5fceb3f83)
2025-05-22 21:23:01 +00:00
emaryn
46224b87aa librewolf-bin-unwrapped: 138.0.1-2 -> 138.0.3-1
(cherry picked from commit 1d86f262cc)
2025-05-22 21:23:01 +00:00
Ben Siraphob
6f08466ff8 golly: fix build on darwin
(cherry picked from commit 9be97d3de7)
2025-05-22 20:26:11 +00:00
Wolfgang Walther
984f7dd066 [Backport release-25.05] ci/eval: remove left-over stats.json (#409856) 2025-05-22 20:10:06 +00:00
misuzu
b3627a1c6e [Backport release-25.05] floorp: 11.26.1 -> 11.26.2 (#409794) 2025-05-22 22:47:15 +03:00
Wolfgang Walther
042d2e6417 workflows: avoid running jobs when editing title etc.
We intend to use the edited event to react to base branch changes - but
before this change, we also ran those jobs on simple edits like title or
description.

While this works for some of the quicker jobs, it will not be
sustainable for all evaluation-related jobs. But evaluation needs to be
re-triggered on a base branch change as well, thus this change.

(cherry picked from commit 9b01e09a35)
2025-05-22 19:14:03 +00:00
Wolfgang Walther
dbb5ea9c26 ci/eval: remove left-over stats.json
This seems to be a left-over from before the performance comparison was
changed to a difference-per-chunk analysis.

(cherry picked from commit edaf51cb83)
2025-05-22 19:08:27 +00:00
K900
2225637595 [Backport release-25.05] unbreak linux v5.10 on x86_64 by disabling OF_OVERLAY (#409847) 2025-05-22 21:25:28 +03:00
K900
70d0752c76 [Backport release-25.05] linux/common-config: enable EFI on supported platforms (#409846) 2025-05-22 21:25:19 +03:00
K900
262b698461 [Backport release-25.05] Kernel updates for 2025-05-22 (#409845) 2025-05-22 21:25:12 +03:00
Yarny0
10d58f8ab4 linux/common-config: disable OF_OVERLAY on x86_64 if version < 5.15
`OF_OVERLAY` breaks kernel compilation for version 5.10
(beginning with 5.10.236), but only on x86_64.
Luckily, `OF_OVERLAY` is of not real interest on x86_64,
so this commit unbreaks the build by just disabling that option
if the target is x86_64 *and* the kernel version is below 5.15.

v5.15 contains a patch that turns the compilation error into a
warning, so this measure is not needed from that version on:
https://git.kernel.org/linus/5aad03685185b5133a28e1ee1d4e98d3fd3642a3

The reasons for the build failure are not
fully clear at the time of this writing;
apparently, a change in `pahole` is the core cause.
For details see the issue and in particular this comment:
https://github.com/NixOS/nixpkgs/issues/403985#issuecomment-2863338895
If that is correct and `pahole` gets fixed,
we can probably revert the commit at hand.

(cherry picked from commit 1e6c445767)
2025-05-22 18:25:07 +00:00
Ben Wolsieffer
6e1ff90aaf linux/common-config: enable EFI on supported platforms
Currently, is it possible for stdenv.hostPlatform.isEfi to be true but
the kernel to have no EFI support. This mainly occurs on armv6l and
causes systemd in initrd to fail to build because it attempts to include
the non-existent efivarfs module in the initrd.

To fix this, automatically enable CONFIG_EFI on platforms where isEfi is
true. An alternative would be to make isEfi false on armv6l, but EFI is
in fact usable on that platform.

To prove this, I successfully booted NixOS on a Raspberry Pi Zero using
systemd-boot and U-Boot's EFI support. I confirmed that efivarfs works
as well.

(cherry picked from commit 3aff7b471c)
2025-05-22 18:24:56 +00:00
K900
52788bba0b linux_5_15: 5.15.183 -> 5.15.184
(cherry picked from commit 858ce19170)
2025-05-22 18:24:53 +00:00
K900
637793bdb0 linux_6_1: 6.1.139 -> 6.1.140
(cherry picked from commit 3b7f48048a)
2025-05-22 18:24:53 +00:00
K900
f2d5d9fa17 linux_6_6: 6.6.91 -> 6.6.92
(cherry picked from commit 4fb15d7946)
2025-05-22 18:24:53 +00:00
K900
ec418d1b80 linux_6_12: 6.12.29 -> 6.12.30
(cherry picked from commit c02eaae23d)
2025-05-22 18:24:53 +00:00
K900
0f61178d7e linux_6_14: 6.14.7 -> 6.14.8
(cherry picked from commit 39f51ddad7)
2025-05-22 18:24:53 +00:00
Adam C. Stephens
8b602f0cff fractal: 11 -> 11.1
(cherry picked from commit ce802f152e)
2025-05-22 17:03:56 +00:00
Morgan Jones
64ac770c5a [Backport release-25.05] z3: 4.14.1 → 4.15.0, z3_4_14: drop (#409741) 2025-05-22 09:48:07 -07:00
Morgan Jones
cd4df48f4a [Backport release-25.05] mattermost: 10.5.5 -> 10.5.6, mattermostLatest: 10.8.0 -> 10.8.1 (#409734) 2025-05-22 09:44:13 -07:00
Jost Alemann
0d55ea6ddb lazygit: 0.50.0 -> 0.51.0
Changelog: https://github.com/jesseduffield/lazygit/releases/tag/v0.51.0
Diff: https://github.com/jesseduffield/lazygit/compare/v0.50.0...v0.51.0
(cherry picked from commit 9810b2ce38)
2025-05-22 16:36:21 +00:00
hustlerone
d5138ca3d6 nixos/limine: tidy up the boot menu
(cherry picked from commit de6905ee37)
2025-05-22 21:03:39 +05:30
Niklas Korz
96b2436984 [Backport release-25.05] nixos/meilisearch: use meilisearch_1_11 for stateVersion below 25.05 (#409773) 2025-05-22 17:31:33 +02:00
Christoph Heiss
27aaacdd00 floorp: 11.26.1 -> 11.26.2
Security fixes.

Release announcement: https://blog.floorp.app/en/release/11.26.2.html
Git changelog: https://github.com/Floorp-Projects/Floorp/compare/v11.26.1...v11.26.2

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
(cherry picked from commit d1bc54ae6c)
2025-05-22 14:54:17 +00:00
Aleksana
099325e609 [Backport release-25.05] velocity: make Nix register dependencies of native libraries (#409725) 2025-05-22 22:36:37 +08:00
Robert Hensing
6cb1302c83 [Backport release-25.05] nixVersions.git: 2.29pre20250409_e76bbe41 -> 2.30pre20250521_76a4d4c2 (#409644) 2025-05-22 16:24:18 +02:00
Jost Alemann
05f3285aae leo-editor: update meta.homepage
meta.homepage seems outdated

(cherry picked from commit e6ee64c4d4)
2025-05-22 14:23:22 +00:00
Sigmanificient
c8f63b2a82 xcircuit: fix build with gcc 14
(cherry picked from commit c06a4060f2)
2025-05-22 14:19:29 +00:00
Aleksana
5de2d5042d [Backport release-25.05] neo4j: fix and enable strictDeps (#409641) 2025-05-22 22:11:23 +08:00
Aleksana
558884cb6f [Backport release-25.05] lixPackageSets.{lix_2_92,lix_2_93,git}.lix: fix building on darwin (#409726) 2025-05-22 22:11:07 +08:00
Aleksana
a53af79559 [Backport release-25.05] ugarit: fix build (#409737) 2025-05-22 22:10:55 +08:00
Niklas Korz
26506af385 nixos/meilisearch: use meilisearch_1_11 for stateVersion below 25.05
(cherry picked from commit aac2e41ce0)
2025-05-22 13:54:53 +00:00
Niklas Korz
83a5adfbd0 meilisearch_1_11: init at 1.11.3
(cherry picked from commit 9b8ced6e69)
2025-05-22 13:54:53 +00:00
K900
24181e7f5c [Backport release-25.05] wireplumber: 0.5.8 -> 0.5.10 (#409762) 2025-05-22 16:12:13 +03:00
K900
2131c2cb01 wireplumber: 0.5.8 -> 0.5.10
Diff: https://gitlab.freedesktop.org/pipewire/wireplumber/-/compare/0.5.8...0.5.10
(cherry picked from commit 49842e98a7)
2025-05-22 13:11:53 +00:00
Leona Maroni
9f74a122b8 [Backport release-25.05] gitlab: 18.0.0 -> 18.0.1 (#409718) 2025-05-22 14:29:24 +02:00
R. Ryantm
9200345239 yandex-music: 5.50.0 -> 5.51.1
(cherry picked from commit accb7207bc)
2025-05-22 12:09:59 +00:00
Jost Alemann
c082e01f5c yt-dlp: 2025.4.30 -> 2025.5.22
Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2025.05.22
Diff: https://github.com/yt-dlp/yt-dlp/compare/2025.04.30...2025.05.22
(cherry picked from commit 74595d480b)
2025-05-22 11:49:04 +00:00
Tom van Dijk
c8c8dadcde doc: rl-2505: z3 4.14 -> 4.15
(cherry picked from commit fa2bee6de3)
2025-05-22 11:46:42 +00:00
Tom van Dijk
ce48072285 z3: refactor
(cherry picked from commit 13c6d411e7)
2025-05-22 11:46:42 +00:00
Tom van Dijk
7ab6069ba4 z3_4_15: rename to z3
(cherry picked from commit 4b9c17e546)
2025-05-22 11:46:42 +00:00
Tom van Dijk
9bfc93a652 z3: add aliases for older versions
(cherry picked from commit 60cbd81553)
2025-05-22 11:46:41 +00:00
Tom van Dijk
bb98fba388 z3: 4.14.1 → 4.15.0, z3_4_14: drop, z3_4_15: init at 4.15.0
(cherry picked from commit f9d66c36aa)
2025-05-22 11:46:41 +00:00
Tom van Dijk
5eb2b2eefe ugarit: fix build
(cherry picked from commit edc5b6b0a5)
2025-05-22 11:44:12 +00:00
Thomas Gerbet
9db7cbf9f6 mattermostLatest: 10.8.0 -> 10.8.1
Fixes MMSA-2025-00491 (rated as a critical vuln).

(cherry picked from commit 45e21093c3)
2025-05-22 11:40:45 +00:00
Thomas Gerbet
60d095da85 mattermost: 10.5.5 -> 10.5.6
Fixes MMSA-2025-00491 (rated as a critical vuln).

(cherry picked from commit 0c65612e31)
2025-05-22 11:40:45 +00:00
Qiming Chu
881687dc9b python3Packages.klayout: fix darwin build
Signed-off-by: Qiming Chu <cchuqiming@gmail.com>
(cherry picked from commit e5474c6db5)
2025-05-22 11:39:19 +00:00
Fiona Behrens
5b841354b7 cargo-bazel: add libz as buildInput for darwin
Add libz as build input to allow building cargo-bazel on darwin.

(cherry picked from commit a952bd4a00)
2025-05-22 11:38:22 +00:00
Seth Flynn
1f9c0d8a31 lixPackageSets.{lix_2_92,lix_2_93,git}.lix: fix building on darwin
https://git.lix.systems/lix-project/lix/issues/568
https://git.lix.systems/lix-project/lix/issues/832
(cherry picked from commit ccd5688c94)
2025-05-22 11:27:47 +00:00
FliegendeWurst
3643b0d814 velocity: make Nix register dependencies of native libraries
Also fix and enable strictDeps.

(cherry picked from commit d0027f93ac)
2025-05-22 11:27:01 +00:00
Aleksana
031f393b52 [Backport release-25.05] bottles-unwrapped: 51.17 -> 51.21, update patches, add gamemode to propagatedBuildInputs, fix typo in warn-unsupported.patch (#408717) 2025-05-22 19:07:55 +08:00
Aleksana
56d78ec9a1 [Backport release-25.05] media-downloader: 5.3.2 -> 5.3.3 (#409647) 2025-05-22 19:07:24 +08:00
Leona Maroni
c20fc9e97d gitlab: 18.0.0 -> 18.0.1
https://about.gitlab.com/releases/2025/05/21/patch-release-gitlab-18-0-1-released/
(cherry picked from commit 3b258c1272)
2025-05-22 11:05:57 +00:00
R. Ryantm
1be40df630 kodiPackages.youtube: 7.1.1.6 -> 7.2.0.1
(cherry picked from commit 6957c41b05)
2025-05-22 10:26:43 +00:00
SchweGELBin
0711254279 element-web: 1.11.99 -> 1.11.100
(cherry picked from commit c1ef83481f)
2025-05-22 15:46:21 +05:30
SchweGELBin
ed640b085b element-desktop: 1.11.99 -> 1.11.100
(cherry picked from commit f25948845a)
2025-05-22 15:46:21 +05:30
Fabian Affolter
9ca0be1b31 python313Packages.nomadnet: 0.6.2 -> 0.7.0
Diff: https://github.com/markqvist/NomadNet/compare/refs/tags/0.6.2...refs/tags/0.7.0

Changelog: https://github.com/markqvist/NomadNet/releases/tag/0.7.0
(cherry picked from commit ae2ba4778a)
2025-05-22 15:45:39 +05:30
Fabian Affolter
5e47231a59 python313Packages.rns: 0.9.5 -> 0.9.6
Diff: https://github.com/markqvist/Reticulum/compare/refs/tags/0.9.5...refs/tags/0.9.6

Changelog: https://github.com/markqvist/Reticulum/blob/0.9.6/Changelog.md
(cherry picked from commit e229486656)
2025-05-22 15:45:39 +05:30
Fabian Affolter
c264cabb08 python313Packages.lxmf: 0.6.3 -> 0.7.1
Diff: markqvist/LXMF@refs/tags/0.6.3...refs/tags/0.7.1

Changelog: https://github.com/markqvist/LXMF/releases/tag/0.7.1
(cherry picked from commit 7dc9a25626)
2025-05-22 15:45:39 +05:30
Niklas Korz
6fd1da938a [Backport release-25.05] wesnoth: 1.18.4 -> 1.18.5 (#409690) 2025-05-22 12:06:00 +02:00
Niklas Korz
8247e3ab65 wesnoth: set meta.changelog
(cherry picked from commit 4601a7333d)
2025-05-22 09:49:48 +00:00
R. Ryantm
5787bd61ea wesnoth: 1.18.4 -> 1.18.5
Changelog: https://github.com/wesnoth/wesnoth/blob/1.18.5/changelog.md
(cherry picked from commit 8a0962d40f)
2025-05-22 09:49:48 +00:00
TomaSajt
615f703403 yacreader: fix darwin build
(cherry picked from commit 032bd9d013)
2025-05-22 08:45:36 +00:00
eljamm
fe9e37d756 linuxPackages.v86d: small improvements
- use `tag` in `src`
- specify phase hooks
- remove `with lib;` in `meta`

(cherry picked from commit 16dc84994e)
2025-05-22 08:38:42 +00:00
eljamm
d4c6f7eed4 linuxPackages.v86d: fix build
(cherry picked from commit fcd0c8318d)
2025-05-22 08:38:42 +00:00
Arne Keller
ccb6cb597e [Backport release-25.05] nodejs_24: 24.0.2 -> 24.1.0 (#409544) 2025-05-22 08:48:49 +02:00
Vincent Tourneur
f99963cbfd ocamlPackages.readline: 0.1 -> 0.2
Add myself as a maintainer.

(cherry picked from commit b67fbd8419)
2025-05-22 08:22:39 +02:00
R. Ryantm
b46093bb1b media-downloader: 5.3.2 -> 5.3.3
(cherry picked from commit 8a1a5d1b0f)
2025-05-22 05:35:45 +00:00
Aleksana
7060e0d30e [Backport release-25.05] Don't trigger the evaluation of apple-sdk in Linux stdenv (#409630) 2025-05-22 13:32:15 +08:00
Aleksana
e711955b96 [Backport release-25.05] nixos/gtklock: init (#409633) 2025-05-22 13:20:26 +08:00
John Ericson
a73b775fd6 nixVersions.git: 2.29pre20250409_e76bbe41 -> 2.30pre20250521_76a4d4c2
Changes: e76bbe41...76a4d4c2
(cherry picked from commit 70582d29dc)
2025-05-22 05:15:36 +00:00
FliegendeWurst
c44e43f872 neo4j: fix and enable strictDeps
neo4j-admin is a bash script.

(cherry picked from commit c08e5ee6d9)
2025-05-22 05:11:28 +00:00
Fugi
63b6a715ed nixos/gtklock: init
(cherry picked from commit 65a759f7b4)
2025-05-22 03:49:50 +00:00
Zhaofeng Li
5a465d9e8f Don't trigger the evaluation of apple-sdk in Linux stdenv
During the Apple SDK revamp of #346043, cc-wrapper and bintools-wrapper
were modified to automatically add a fallback SDK if $DEVELOPER_DIR is
not set [^1]. However, because of the order of the && operands,
apple-sdk is always evaluated even when it's not needed.

Flip the && operands so we only trigger the evaluation when targeting
Darwin.

[^1]: 51755b0c00

(cherry picked from commit 5953ae56d8)
2025-05-22 03:32:38 +00:00
Martin Weinelt
f2b166b813 bind: 9.20.7 -> 9.20.8 (#409609) 2025-05-22 04:22:21 +02:00
Aleksana
df0c56903b [Backport release-25.05] luaPackages.luv: fix installCheckPhase on Darwin (#409396) 2025-05-22 10:03:36 +08:00
Aleksana
4c0061c95a [Backport release-25.05] gitrs: add libz on darwin (#409395) 2025-05-22 10:03:15 +08:00
Aleksana
9ce41ef433 [Backport release-25.05] attic-server: don't depend on nix (#409477) 2025-05-22 10:03:02 +08:00
Martin Weinelt
547e5d4816 bind: remove globin from maintainers
Added in 2019 but made no change since.

(cherry picked from commit a3e38960d1)
2025-05-22 03:44:23 +02:00
Martin Weinelt
58071ef740 bind: make kubernetes passthru tests conditional on x86_64-linux
This unbreaks `nix-build -A knot.tests --eval system aarch64-linux`.

(cherry picked from commit 7f5b661595)
2025-05-22 03:44:19 +02:00
Martin Weinelt
85e096c5f8 bind: 9.20.8 -> 9.20.9
https://downloads.isc.org/isc/bind9/cur/9.20/doc/arm/html/notes.html#notes-for-bind-9-20-9

Fixes: CVE-2025-40775
(cherry picked from commit 135f8cb73c)
2025-05-22 03:44:14 +02:00
R. Ryantm
de90cbad22 bind: 9.20.7 -> 9.20.8
(cherry picked from commit cf21fe4271)
2025-05-22 03:43:50 +02:00
Leona Maroni
a289e66c76 [Backport release-25.05] percona-server_8_0: 8.0.41-32 -> 8.0.42-33 (#409555) 2025-05-21 23:25:15 +02:00
R. Ryantm
ff7f861950 percona-server_8_0: 8.0.41-32 -> 8.0.42-33
(cherry picked from commit 2bb53e99dd)
2025-05-21 21:18:32 +00:00
Adam C. Stephens
cd0a35bc10 [Backport release-25.05] erlang_28: 28.0-rc4 -> 28.0 (#409507) 2025-05-21 17:09:32 -04:00
Adam C. Stephens
3fba9b32a2 [Backport release-25.05] beam26Packages.elixir: 1.18.3 -> 1.18.4 (#409508) 2025-05-21 17:09:11 -04:00
Leona Maroni
27c1806235 [Backport release-25.05] python313Packages.supervisor: fix build with python 3.13 (#409542) 2025-05-21 22:49:36 +02:00
Antoine du Hamel
ea776c1eb0 nodejs_24: 24.0.2 -> 24.1.0
(cherry picked from commit c4869aace4)
2025-05-21 20:44:54 +00:00
Leona Maroni
cca8ef85e6 python313Packages.supervisor: fix build with python 3.13
(cherry picked from commit c16a5fefc6)
2025-05-21 20:41:48 +00:00
Yt
eb416ab640 [Backport release-25.05] stalwart-mail: use system jemalloc (#409430) 2025-05-21 15:56:01 -04:00
Felix Schröter
0b69188459 [Backport release-25.05] {tor,mullvad}-browser: 14.5.1 -> 14.5.2 (#409498) 2025-05-21 19:30:17 +00:00
Ramses
76647f3f1b [Backport release-25.05] udevCheckHook: guard platform (#409488) 2025-05-21 21:17:52 +02:00
Morgan Jones
5e8bb332d6 release-notes: document tpm2-pkcs11 abrmd changes for 25.05
(cherry picked from commit f86ebd9ac5)
2025-05-22 00:37:29 +05:30
Morgan Jones
423873feaa nixos/tpm2: default pkcs#11 module based on abrmd config
Since there are now variants of tpm2-pkcs11 with and without ABRMD
support (for the kernel resource manager), ensure we pick the correct
default.

Fixes an accidental backwards incompatibility with the module.

(cherry picked from commit 9c1564e395)
2025-05-22 00:37:29 +05:30
Morgan Jones
93cdd0f649 tpm2-pkcs11: export abrmd passthru
security.tpm2 should depend on this for the default PKCS#11 module.

(cherry picked from commit 75f77e7570)
2025-05-22 00:37:29 +05:30
Peder Bergebakken Sundt
ee4f822ff4 [Backport release-25.05] pygame{,-ce}: migrate to sdl2-compat; SDL2_classic: drop (#409503) 2025-05-21 21:03:00 +02:00
Thiago Kenji Okada
4f31d66c2a [Backport release-25.05] nixos-rebuild-ng: fixes for Python 3.13 (#409472) 2025-05-21 19:37:13 +01:00
R. Ryantm
195127387b beam26Packages.elixir: 1.18.3 -> 1.18.4
(cherry picked from commit ecd16b486d)
2025-05-21 18:35:52 +00:00
Adam C. Stephens
d052c58287 erlang_28: 28.0-rc4 -> 28.0
https://github.com/erlang/otp/releases/tag/OTP-28.0
https://www.erlang.org/blog/highlights-otp-28/
https://www.erlang.org/news/180
(cherry picked from commit 75aae3d848)
2025-05-21 18:35:28 +00:00
Grimmauld
374570b087 SDL2_classic: drop
(cherry picked from commit 67081ee1ba)
2025-05-21 20:30:41 +02:00
Grimmauld
79d5a39832 SDL2_classic_image: drop
(cherry picked from commit 3e7b6edf80)
2025-05-21 20:30:41 +02:00
Grimmauld
e4f1cf2208 SDL2_classic_mixer: drop
(cherry picked from commit 5d67c99207)
2025-05-21 20:30:41 +02:00
Grimmauld
0b4ab86284 SDL2_classic_ttf: drop
(cherry picked from commit 9bf188c26a)
2025-05-21 20:30:41 +02:00
Grimmauld
6d49d90eef SDL2_classic: remove passthru tests
(cherry picked from commit 39693262f5)
2025-05-21 20:30:41 +02:00
Marcin Serwin
6a69bd2539 SDL2_classic: use tests that actually use the package
The default libraries use SDL2 compat after migration, switched to use
the specifically created classic variants. Only pygame and pygame-ce
use SDL2 classic, other listed packages use SDL2 compat so they were
removed.

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
2025-05-21 20:30:24 +02:00
Marcin Serwin
83a88e9f7d SDL2_classic: 2.32.4 -> 2.32.6 2025-05-21 20:30:24 +02:00
Marcin Serwin
b5e655b817 SDL2_classic: fix update script
Without the more specific regex it considered 3.x releases for updates.
2025-05-21 20:30:23 +02:00
Marcin Serwin
09457cb230 pygame: migrate to sdl2-compat
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit 99ecf06993)
2025-05-21 18:22:05 +00:00
Marcin Serwin
8bc000b3c9 pygame-ce: migrate to sdl2-compat
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit 225330b95d)
2025-05-21 18:22:05 +00:00
Marcin Serwin
0fdddacaf2 python3Packages.gymnasium: explicitly use dummy videodriver in checkPhase
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit 03a1fef71d)
2025-05-21 18:22:05 +00:00
Marcin Serwin
419efe965b python3Packages.gym: explicitly use dummy videodriver in checkPhase
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit 070f2a0336)
2025-05-21 18:22:04 +00:00
Sefa Eyeoglu
915fee7789 [Backport release-25.05] qpwgraph: 0.9.0 -> 0.9.2 (#409495) 2025-05-21 20:17:44 +02:00
Felix Schröter
2e8b38f142 mullvad-browser: 14.5.1 -> 14.5.2
https://github.com/mullvad/mullvad-browser/releases/tag/14.5.2
(cherry picked from commit 4d96fe74a5)
2025-05-21 18:13:15 +00:00
Felix Schröter
d296b6a849 tor-browser: 14.5.1 -> 14.5.2
https://blog.torproject.org/new-release-tor-browser-1452/
(cherry picked from commit c2763a2a81)
2025-05-21 18:13:14 +00:00
programmerlexi
f5c8555577 nixos/limine: don't modify boot order on bootloader update
(cherry picked from commit 95030d7eb3)
2025-05-21 23:38:10 +05:30
R. Ryantm
016b2284ad qpwgraph: 0.9.0 -> 0.9.2
(cherry picked from commit 1515a809d6)
2025-05-21 18:07:38 +00:00
Yohann Boniface
aeacd18dbe [Backport release-25.05] authelia: 4.39.1 -> 4.39.3 (#409333) 2025-05-21 19:49:38 +02:00
Michele Guerini Rocco
d05317b80e [Backport release-25.05] pdns-recursor: 5.1.2 -> 5.2.2 (#409486) 2025-05-21 19:41:55 +02:00
Leona Maroni
1bdd06c264 python313Packages.tendo: fix build with python 3.13
(cherry picked from commit dd54389252)
2025-05-21 17:39:23 +00:00
Felix Bargfeldt
9a2b723115 [Backport release-25.05] glance: 0.8.1 -> 0.8.3, fix build on x86_64-darwin (#409487) 2025-05-21 19:37:53 +02:00
Grimmauld
abeca9a5e3 udevCheckHook: guard platform
It is technically possible to guard all udevCheckHook usages behind
`lib.optionals (lib.meta.availableOn stdenv.buildPlatform systemdMinimal)`.

However, doing this is hard to read, clunky, and hard to discover.
*Not* doing such a guard would mean cross-compilation darwin -> linux breaks.
The workaround here is to just accept any udev rules if they can't be properly checked.

(cherry picked from commit 1461a8401c)
2025-05-21 17:37:02 +00:00
Defelo
cbbc83a308 glance: 0.8.1 -> 0.8.3
(cherry picked from commit f519f7581c)
2025-05-21 17:28:47 +00:00
Defelo
1f5bb8ce86 glance: fix build on x86_64-darwin
(cherry picked from commit 05859772ec)
2025-05-21 17:28:47 +00:00
emaryn
5f5b7b360e pdns-recursor: 5.1.2 -> 5.2.2
(cherry picked from commit e5a10947bb)
2025-05-21 17:24:07 +00:00
Yureka
06c38d6619 attic-server: don't depend on nix
(cherry picked from commit 4673e3b79e)
2025-05-21 16:30:16 +00:00
Martin Weinelt
82dc36b90d esphome: pin paho-mqtt at 1.6.1 (#409467) 2025-05-21 18:22:53 +02:00
Aleksana
18ba8345b0 [Backport release-25.05] poutine: mark as broken on darwin (#408963) 2025-05-22 00:18:34 +08:00
Aleksana
0ff579bc51 [Backport release-25.05] vorbis-tools: remove patch applied upstream (#409468) 2025-05-22 00:15:17 +08:00
Aleksana
471292d3f2 [Backport release-25.05] gupnp_1_6: Unbreak on Darwin (#408667) 2025-05-22 00:14:53 +08:00
Aleksana
10ebe60cac [Backport release-25.05] nixos/doc/rl-2505: Fix wording of users.users subuid allocation note (#408025) 2025-05-22 00:14:14 +08:00
Aleksana
6c8cd30a08 [Backport release-25.05] matrix-continuwuity: init at 0.5.0-rc.5; nixos/matrix-continuwuity: init (#407850) 2025-05-22 00:11:54 +08:00
Aleksana
a91687154d [Backport release-25.05] python313Packages.vat-moss: disable (#407941) 2025-05-22 00:11:41 +08:00
Aleksana
7d1cf045d3 [Backport release-25.05] bitwarden-cli: add zsh completion (#408901) 2025-05-22 00:11:02 +08:00
Aleksana
44ab8abcd7 [Backport release-25.05] {jimtcl,openocd,tinygo}: unmark as broken on Darwin (#409397) 2025-05-22 00:10:34 +08:00
Thiago Kenji Okada
df20fc4cbb nixos-rebuild-ng: assert if get_qualified_name is used by internal modules
(cherry picked from commit b1a205154c)
2025-05-21 16:08:56 +00:00
Thiago Kenji Okada
231feee62e nixos-rebuild-ng: do not use get_qualified_name for non-internal modules
To avoid breakage in future this avoid using `get_qualified_name()` for
any non-internal mock. This is fine because the idea to
`get_qualified_name()` is to make it easier to refactor since you can
rename the method name and this is also automatically rename the mocks,
but non-internal mocks are unlikely to change names anyway.

(cherry picked from commit 90f7121314)
2025-05-21 16:08:56 +00:00
Thiago Kenji Okada
c04b6a04ec nixos-rebuild-ng: avoid get_qualified_name usage for pathlib.Path
Seems to be broken since Python 3.13.

(cherry picked from commit 86e3302381)
2025-05-21 16:08:55 +00:00
Martin Madsen
e1b8fcbb5a vorbis-tools: remove patch applied upstream
(cherry picked from commit c529a88fcc)
2025-05-21 16:02:42 +00:00
DontEatOreo
2f2a3eb824 raycast: 1.98.0 -> 1.99.0
Changelog: https://www.raycast.com/changelog/1-99-0
(cherry picked from commit 1208d75e7e)
2025-05-21 09:00:26 -07:00
Martin Weinelt
7c0dc1475d esphome: pin paho-mqtt at 1.6.1
Closes: #409387
(cherry picked from commit 8ab765e2d4)
2025-05-21 17:56:39 +02:00
emaryn
75433c77cb organicmaps: 2025.03.02-7 -> 2025.05.20-5
Diff: https://github.com/organicmaps/organicmaps/compare/refs/tags/2025.03.02-7-android...refs/tags/2025.05.20-5-android
(cherry picked from commit 98a8834d7a)
2025-05-21 14:48:34 +00:00
Yureka
ceda4e89d3 stalwart-mail: use system jemalloc
fixes the package on aarch64 16k-pagesize systems

(cherry picked from commit 29ae2000b1)
2025-05-21 14:07:39 +00:00
Aleksana
b300e82533 [Backport release-25.05] librespeed-cli: refactor and mark as broken on darwin (#408956) 2025-05-21 21:43:24 +08:00
Aleksana
8e799186ae [Backport release-25.05] maigret: refactor and makr as broken on darwin (#408958) 2025-05-21 21:43:17 +08:00
Aleksana
414483378b [Backport release-25.05] mx-takeover: refactor and disable on darwin (#408960) 2025-05-21 21:43:07 +08:00
Aleksana
7cb7069726 [Backport release-25.05] azurehound: disable on darwin (#408961) 2025-05-21 21:42:52 +08:00
Felix Bargfeldt
b721e18bd4 [Backport release-25.05] synapse-admin-etkecc: 0.10.4-etke41 -> 0.11.0-etke42 (#409423) 2025-05-21 15:42:42 +02:00
Aleksana
5fa459ca90 [Backport release-25.05] cups-browsed: Fix cross-compilation RiscV (#409415) 2025-05-21 21:40:11 +08:00
Aleksana
1ea5694823 [Backport release-25.05] qc71_laptop: rectify meta.platforms (#409105) 2025-05-21 21:40:02 +08:00
Aleksana
a36016bd71 [Backport release-25.05] authelia: fix cross build (#409414) 2025-05-21 21:39:30 +08:00
Defelo
ebd1f7a253 synapse-admin-etkecc: 0.10.4-etke41 -> 0.11.0-etke42
(cherry picked from commit 1de00c4a2b)
2025-05-21 13:30:58 +00:00
Marcus Ramberg
df61adab13 [Backport release-25.05] cloudflare-warp: wrap warp-cli to fix browser opening (#408323) 2025-05-21 15:26:39 +02:00
Felix Bargfeldt
13c942f49c [Backport release-25.05] treefmt: 2.3.0 -> 2.3.1 (#409417) 2025-05-21 15:26:26 +02:00
Brian McGee
c701041032 treefmt: 2.3.0 -> 2.3.1
(cherry picked from commit 8d5d9d28be)
2025-05-21 13:16:47 +00:00
Jonas Heinrich
02032edaeb cups-browsed: Fix cross-compilation RiscV
(cherry picked from commit 8ae40661d1)
2025-05-21 13:11:53 +00:00
FliegendeWurst
645dcf4f86 authelia: fix cross build
(cherry picked from commit 490a00c7d9)
2025-05-21 13:08:33 +00:00
Aleksana
46e0204126 [Backport release-25.05] unicorn-angr: mark as broken on darwin (#408962) 2025-05-21 20:24:57 +08:00
Aleksana
8f2bef8334 [Backport release-25.05] deepsecrets: refactor and mark as broken on darwin (#408966) 2025-05-21 20:24:43 +08:00
Aleksana
7004e2ad6e [Backport release-25.05] midori: drop (#409393) 2025-05-21 20:24:03 +08:00
Liam Murphy
62f8fb0c1a tinygo: unmark as broken on Darwin
(cherry picked from commit 68443d7da6)
2025-05-21 12:24:00 +00:00
Liam Murphy
0651c9a51a openocd: unmark as broken on Darwin
(cherry picked from commit 5de8edee04)
2025-05-21 12:24:00 +00:00
Liam Murphy
cfcba5424d jimtcl: unmark as broken on Darwin
(cherry picked from commit e3002620b9)
2025-05-21 12:24:00 +00:00
Aleksana
338e3843d6 [Backport release-25.05] ares-rs: mark as broken on darwin (#408968) 2025-05-21 20:22:24 +08:00
Alex James
0d09a05785 luaPackages.luv: fix installCheckPhase on Darwin
(cherry picked from commit d58e5041de)
2025-05-21 12:22:23 +00:00
Aleksana
59191bb826 [Backport release-25.05] arp-scan-rs: mark as broken on darwin (#408969) 2025-05-21 20:22:08 +08:00
Fiona Behrens
b3af4ac586 gitrs: add libz on darwin
(cherry picked from commit fac152987b)
2025-05-21 12:21:23 +00:00
Thomas Gerbet
e8bf3e2fb5 midori: drop
Package is broken for a while and upstream project
seems to have been re-oriented to a Firefox fork.
See https://github.com/midori-browser/core/issues/468

Closes #374354

(cherry picked from commit f492075c53)
2025-05-21 12:16:05 +00:00
Sizhe Zhao
cd2812de55 limine: 9.3.0 -> 9.3.2 2025-05-21 16:35:15 +05:30
Sizhe Zhao
257020538a limine: add prince213 to maintainers 2025-05-21 16:35:15 +05:30
Yaya
f64ff96c0a nixos/doc/rl-2505: Mention minimal postgresql requirement for gitlab 18
`gitlab` >= 18.0 requires at least `postgresql` >= 16. GitLab users
are advised to follow the mentioned steps in the manual to upgrade their
PostgreSQL installation.

(cherry picked from commit c46cc8a67a)
2025-05-21 12:57:34 +02:00
Yaya
a1d1c7afd9 nixos/gitlab: update minimum PostgreSQL version assertion
GitLab 18.0.0 requires at least PostgreSQL 16.

https://docs.gitlab.com/18.0/install/requirements/#postgresql
(cherry picked from commit ee58f11546)
2025-05-21 12:57:34 +02:00
Yaya
7489e88915 gitlab: move to pkgs/by-name
(cherry picked from commit 4a1bbbba52)
2025-05-21 12:57:34 +02:00
Yaya
b437573e4a gitlab: 17.11.2 -> 18.0.0
https://gitlab.com/gitlab-org/gitlab/-/blob/v18.0.0-ee/CHANGELOG.md
(cherry picked from commit 816aa29cd6)
2025-05-21 12:57:34 +02:00
programmerlexi
d8c429b16a nixos/limine: carefully remove files instead of nuking them
(cherry picked from commit a094b5d8cc)
2025-05-21 15:42:12 +05:30
programmerlexi
ecc74afaf4 nixos/limine: atomically copy files
(cherry picked from commit 2c7659b1ff)
2025-05-21 15:42:12 +05:30
Aleksana
6408656bdf [Backport release-25.05] pan: 0.158 -> 0.162 (#409345) 2025-05-21 17:43:06 +08:00
Aleksana
7c5451f69a [Backport release-25.05] better-control: init at 6.11.6 (#409341) 2025-05-21 17:23:38 +08:00
emaryn
e7df0771b4 pan: 0.158 -> 0.162
(cherry picked from commit 522d23c200)
2025-05-21 09:22:58 +00:00
Rishabh
3087ace5ca better-control: init at 6.11.6 2025-05-21 14:28:08 +05:30
Ramses
ed42876fa5 [Backport release-25.05] brscan5: remove deprecated SYSFS udev rule (#409320) 2025-05-21 10:51:41 +02:00
Ramses
aac963f4c4 [Backport release-25.05] udevCheckHook: init (#409322) 2025-05-21 10:51:20 +02:00
Rishabh
f35374558e maintainers: add Rishabh5321 2025-05-21 14:12:47 +05:30
transcaffeine
b7ec9a04b8 authelia: 4.39.1 -> 4.39.3
Release notes:
  - https://github.com/authelia/authelia/releases/tag/v4.39.2
  - https://github.com/authelia/authelia/releases/tag/v4.39.3
Full changelog: https://github.com/authelia/authelia/compare/v4.39.1...v4.39.3

See #406404

(cherry picked from commit 7bbc83cedf)
2025-05-21 08:37:07 +00:00
Thiago Kenji Okada
4a9a592907 [Backport release-25.05] nixos-rebuild-ng: kill underlying remote process (#409147) 2025-05-21 09:31:01 +01:00
Felix Bargfeldt
21d52bffbc [Backport release-25.05] wivrn: 0.24.1 -> 0.25 (#408506) 2025-05-21 10:16:52 +02:00
Aleksana
a07ce2b16f [Backport release-25.05] anytype: Minor fixes to .desktop file (#409311) 2025-05-21 16:06:51 +08:00
Aleksana
bff1ef50f0 [Backport release-25.05] scorched3d: add gcc 14 fix (#409302) 2025-05-21 16:05:38 +08:00
Grimmauld
e01dd0db36 udevCheckHook: init
Usage:
```nix
nativeBuildInputs = [
  udevCheckHook
];
doInstallCheck = true;
```

This hook executes `udevadm verify --resolve-names=never --no-style`
on all outputs that have `/etc/udev/rules.d`.
This us a logical part of #404323 to check packages that supply udev rules.

Note this hook introduces a dependency on `systemdMinimal`,
meaning this can't check systemdMinimal or its dependencies.

(cherry picked from commit b3bdbf4806)
2025-05-21 07:52:46 +00:00
Matt Christ
7c33418bb0 brscan5: remove deprecated SYSFS udev rule
This patch resolves an issue where systemd-udevd outputs events like:

/nix/store/jm9paymkapbi6pzwbjgmi634vaf2y5va-udev-rules/49-brother-mfp-brscan5-1.0.2-2.rules:17 Invalid key 'SYSFS'.

(cherry picked from commit ff62fe4136)
2025-05-21 07:50:48 +00:00
Marcus Ramberg
8ff79da307 [Backport release-25.05] helmfile-wrapped: 1.0.0 -> 1.1.0 (#409242) 2025-05-21 09:49:34 +02:00
Axel Karjalainen
6782628b42 anytype: Minor fixes to .desktop file
Renamed to `anytype.desktop` to stay consistent with the Wayland
application ID and added support for the custom URL scheme handler.

(cherry picked from commit d02c917a25)
2025-05-21 06:59:37 +00:00
Aleksana
88ba6dcd9a [Backport release-25.05] clojure: fix and enable strictDeps (#409303) 2025-05-21 14:53:27 +08:00
Aleksana
9a58bf41cf [Backport release-25.05] nixos/spotifyd: Fix 404 URLs (#409304) 2025-05-21 14:53:04 +08:00
Evan Scamehorn
e9461aa3e3 nixos/spotifyd: Fix 404 URLs (#408504)
(cherry picked from commit a4e1ad5521)
2025-05-21 06:46:57 +00:00
FliegendeWurst
9edb988168 clojure: fix and enable strictDeps
(cherry picked from commit b46869e2b6)
2025-05-21 06:46:30 +00:00
Aleksana
f1cbdccde4 [Backport release-25.05] python313Packages.turrishw: fix changelog entry (#408957) 2025-05-21 14:42:12 +08:00
Marcin Serwin
3152f9d33a scorched3d: add gcc 14 fix
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit f51f718e7c)
2025-05-21 06:41:49 +00:00
Aleksana
3c76d9eba3 [Backport release-25.05] tsukimi: 0.20.0 -> 0.21.0 (#409298) 2025-05-21 14:40:23 +08:00
Aleksana
a279a19f67 [Backport release-25.05] iplookup-gtk: 0.4.0 -> 0.4.1 (#409297) 2025-05-21 14:40:08 +08:00
K900
05614b07fb [Backport release-25.05] mumble: Apply point release number to internal version string (#409299) 2025-05-21 09:35:37 +03:00
Felix Singer
fa9260a9fe mumble: Apply point release number to internal version string
Without applying the build option BUILD_NUMBER, Mumble only knows about
the major and minor version. So, if the actual version string is
1.5.735, then the Mumble application only displays 1.5.0. Fix that.

Reported-by: Hartmnt
Signed-off-by: Felix Singer <felixsinger@posteo.net>
(cherry picked from commit ccf1614060)
2025-05-21 06:32:55 +00:00
R. Ryantm
d7e521930e tsukimi: 0.20.0 -> 0.21.0
(cherry picked from commit 6ec497cb47)
2025-05-21 06:32:54 +00:00
R. Ryantm
8b2ea03133 iplookup-gtk: 0.4.0 -> 0.4.1
(cherry picked from commit 3978e2e8c4)
2025-05-21 06:31:35 +00:00
Aleksana
67bf56fa8c [Backport release-25.05] share-preview: 0.5.0 -> 1.0.0 (#409048) 2025-05-21 13:19:08 +08:00
R. Ryantm
3eee9a91de helmfile-wrapped: 1.0.0 -> 1.1.0
(cherry picked from commit 4ca5d61436)
2025-05-21 01:01:41 +00:00
Peder Bergebakken Sundt
d5bf86502f [Backport release-25.05] python3Packages.auto-lazy-imports: init at 0.4.2 (#408889) 2025-05-21 01:23:04 +02:00
Philip Taron
33ce17a328 [Backport release-25.05] openvpn3: 24 -> 24.1 (#409217)
Fixes CVE-2025-3908 / GHSA-fp2g-4h6f-28h2
2025-05-20 16:14:52 -07:00
Thomas Gerbet
1640a299be openvpn3: 24 -> 24.1
Fixes CVE-2025-3908.

https://github.com/OpenVPN/openvpn3-linux/releases/tag/v24.1
(cherry picked from commit 7dad80a626)
2025-05-20 22:32:56 +00:00
Fabián Heredia Montiel
9b4ab8a3d3 [Backport release-25.05] Linux kernels 2025-05-19 (#409094) 2025-05-20 16:17:52 -06:00
Peder Bergebakken Sundt
1b9bb5d0b8 [Backport release-25.05] moonlight-qt: build against sdl2-compat (#409204) 2025-05-21 00:10:13 +02:00
Grimmauld
c9dd6a6905 moonlight-qt: build against sdl2-compat
This was preliminarily pinned to SDL2_classic in 2532c66211 (#393386).
The reason for that was DRM support and an incompatible override interface.
sdl3 is build with drm enabled by default, which means building things
that depend on drm through sdl2-compat should just work, no override needed.

(cherry picked from commit 8f2001fb55)
2025-05-20 21:35:44 +00:00
Leona Maroni
3ff32b4adc [Backport release-25.05] gitlab-runner: Make Bash a runtime dependency to fix clear-docker-cache. (#409121) 2025-05-20 22:59:31 +02:00
Sefa Eyeoglu
d4512b12db [Backport release-25.05] proton-ge-bin: GE-Proton10-1 -> GE-Proton10-2, GE-Proton10-2 -> GE-Proton10-3 , add myself as maintainer (#409149) 2025-05-20 21:01:25 +02:00
Gliczy
16e8991cec proton-ge-bin: add myself as maintainer
(cherry picked from commit 0742d7dae9)
2025-05-20 20:37:32 +02:00
Gliczy
dd5a79547d proton-ge-bin: GE-Proton10-2 -> GE-Proton10-3
(cherry picked from commit b54dae9d78)
2025-05-20 20:37:29 +02:00
NotAShelf
ada2854c28 proton-ge-bin: GE-Proton10-1 -> GE-Proton10-2
https://github.com/GloriousEggroll/proton-ge-custom/compare/GE-Proton10-1...GE-Proton10-2
(cherry picked from commit 97d49b6c8a)
2025-05-20 20:37:26 +02:00
Thiago Kenji Okada
ca0f1439c5 nixos-rebuild-ng: use Final in constants.py
(cherry picked from commit b74e861c28)
2025-05-20 18:24:53 +00:00
Thiago Kenji Okada
9634c32938 nixos-rebuild-ng: mark logger as Final
(cherry picked from commit 2e06b6da56)
2025-05-20 18:24:53 +00:00
Thiago Kenji Okada
3bf9894d76 nixos-rebuild-ng: alert user if we can't clean-up remote process
(cherry picked from commit 062eaf7379)
2025-05-20 18:24:53 +00:00
Thiago Kenji Okada
621a8d5ce4 nixos-rebuild-ng: kill underlying remote process
`nixos-rebuild-ng` explicitly don't allocate a pseudo-TTY for SSH
because this causes lots of issues depending on the use case (for
example, multiplexing multiple SSH sessions).

Sadly not using a pseudo-TTY also cause other issues, like the fact that
using Ctrl+C (SIGINT) doesn't kill the underlying process because SSH
doesn't support it.

We can't really start using pseudo-TTY unless we want to overcomplicate
the code for parsing results (pseudo-TTY mangles the stdout/stderr
together), so we need to handle killing the underlying remote process
manually.

This is what this commit does, when we receive a `KeyboardInterrupt`
exception while calling `run_wrapper`, we will check if it is a remote
process and send a `pkill --full` with the arguments (this should ensure
that we don't kill other process, but we can't guarantee it). This
assumes the user has `procps` installed, but I think it is a safe
assumption since this seems to be a core package.

Sadly nothing we can do if the user doesn't have `procps` installed, the
good thing is that the worst that can happen is that we will silent
fail and the process will stay in background until it finishes.

Fix #403269.

(cherry picked from commit 61e61a59eb)
2025-05-20 18:24:53 +00:00
Jan Tojnar
3e574f1237 nixos/orca: Make available to gdm greeter
Without this, the greeter is unable to see `orca` program on `PATH`
and so `${gdm}/share/gdm/greeter/autostart/orca-autostart.desktop`
will fail to start it. As a result, screen reader would not work
on the login screen.

(cherry picked from commit 9af27f1cb5)
2025-05-20 18:09:17 +00:00
Felix Bargfeldt
41d0856d57 [Backport release-25.05] synapse-admin-etkecc: 0.10.4-etke40 -> 0.10.4-etke41 (#409129) 2025-05-20 19:32:55 +02:00
Defelo
31c69144b2 synapse-admin-etkecc: 0.10.4-etke40 -> 0.10.4-etke41
(cherry picked from commit ba675822e9)
2025-05-20 17:19:24 +00:00
commiterate
b31ced563d gitlab-runner: Make Bash a runtime dependency to fix clear-docker-cache.
(cherry picked from commit f26dd73367)
2025-05-20 16:48:17 +00:00
misuzu
8746d3bd23 [Backport release-25.05] snac2: 2.75 -> 2.77 (#408949) 2025-05-20 19:32:11 +03:00
LucasFA
302622d373 qc71_laptop: rectify meta.platforms
This package is not expected to build in other platforms and
has been failing aarch64-linux in Hydra for years:
https://hydra.nixos.org/eval/1790516?filter=qc71&compare=1790473
https://hydra.nixos.org/eval/1795290?filter=qc71&compare=1795271
https://hydra.nixos.org/eval/1807986?filter=qc71&compare=1807946

(cherry picked from commit 645719c0b3)
2025-05-20 15:50:15 +00:00
Alyssa Ross
2451b54fb4 linux/hardened/patches/6.6: v6.6.83-hardened1 -> v6.6.90-hardened1
(cherry picked from commit 43bfaecca6)
2025-05-20 15:04:37 +00:00
Alyssa Ross
fab51ff715 linux/hardened/patches/6.14: init at v6.14.6-hardened1
Co-authored-by: Fabián Heredia Montiel <fabianhjr@protonmail.com>
(cherry picked from commit 28ea08fde9)
2025-05-20 15:04:37 +00:00
Alyssa Ross
358ad9d030 linux/hardened/patches/6.13: v6.13.7-hardened1 -> v6.13.12-hardened1
(cherry picked from commit 0154bc329f)
2025-05-20 15:04:37 +00:00
Alyssa Ross
103574ce2f linux/hardened/patches/6.12: v6.12.19-hardened1 -> v6.12.28-hardened1
(cherry picked from commit da5df08f08)
2025-05-20 15:04:37 +00:00
Alyssa Ross
b7df92b766 linux/hardened/patches/6.1: v6.1.131-hardened1 -> v6.1.138-hardened1
(cherry picked from commit c44b873ebc)
2025-05-20 15:04:37 +00:00
Alyssa Ross
4d6ba54edf linux/hardened/patches/5.4: v5.4.291-hardened1 -> v5.4.293-hardened1
(cherry picked from commit cbdbb6ea17)
2025-05-20 15:04:37 +00:00
Alyssa Ross
83d754b142 linux/hardened/patches/5.15: v5.15.179-hardened1 -> v5.15.182-hardened1
(cherry picked from commit 993fa0f255)
2025-05-20 15:04:37 +00:00
Alyssa Ross
f699660ce1 linux/hardened/patches/5.10: v5.10.235-hardened1 -> v5.10.237-hardened1
(cherry picked from commit af90fa1c5e)
2025-05-20 15:04:37 +00:00
Alyssa Ross
a6be49f189 linux_latest-libre: 19769 -> 19792
(cherry picked from commit 5ff58f53b6)
2025-05-20 15:04:37 +00:00
Alyssa Ross
566a4bfce3 linux-rt_6_6: 6.6.77-rt50 -> 6.6.87-rt54
(cherry picked from commit b6208691c0)
2025-05-20 15:04:37 +00:00
Alyssa Ross
ef2c70f127 linux-rt_6_1: 6.1.128-rt49 -> 6.1.134-rt51
(cherry picked from commit 61fbc69aef)
2025-05-20 15:04:36 +00:00
Alyssa Ross
8b1a3f88bf linux-rt_5_15: 5.15.177-rt83 -> 5.15.179-rt84
(cherry picked from commit 9641b16352)
2025-05-20 15:04:36 +00:00
Alyssa Ross
eb6fbb5bd3 linux-rt_5_10: 5.10.234-rt127 -> 5.10.237-rt131
(cherry picked from commit c3c0061572)
2025-05-20 15:04:36 +00:00
Alyssa Ross
3c8d59d194 linux_testing: 6.15-rc6 -> 6.15-rc7
(cherry picked from commit 26b82c99ab)
2025-05-20 15:04:36 +00:00
Florian Klink
03c3cfde8f irccat: 0.4.8 -> 0.4.12
(cherry picked from commit 4612572032)
2025-05-20 16:38:20 +02:00
Arian van Putten
5815cbccc9 [Backport release-25.05] nixos/systemd: unconditional systemd-journald-audit.socket (#409070) 2025-05-20 16:31:50 +02:00
benaryorg
f551d91f2e nixos/systemd: unconditional systemd-journald-audit.socket
Containers did not have *systemd-journald-audit.socket* in *additionalUpstreamSystemUnits*, which meant that the unit was not provided.
However the *wantedBy* was added without any additional check, therefore creating an empty unit with just the *WantedBy* on *boot.isContainer* machines.
This caused `systemd-analyze verify` to fail:

```text
systemd-journald-audit.socket: Unit has no Listen setting (ListenStream=, ListenDatagram=, ListenFIFO=, ...). Refusing.
systemd-journald-audit.socket: Cannot add dependency job, ignoring: Unit systemd-journald-audit.socket has a bad unit file setting.
systemd-journald-audit.socket: Cannot add dependency job, ignoring: Unit systemd-journald-audit.socket has a bad unit file setting.
```

The upstream unit already contains the following, which should make it safe to include regardless:

```ini
[Unit]
ConditionSecurity=audit
ConditionCapability=CAP_AUDIT_READ
```

For reference, this popped up in the context of #[360426](https://redirect.github.com/NixOS/nixpkgs/issues/360426) as well as #[407696](https://redirect.github.com/NixOS/nixpkgs/pull/407696).

Co-authored-by: Bruce Toll <4109762+tollb@users.noreply.github.com>
Signed-off-by: benaryorg <binary@benary.org>
(cherry picked from commit e434130d0b)
2025-05-20 13:30:26 +00:00
Bruce Toll
0c6b3ff337 nixos/tests/systemd-journal: Fix failing tests
Fix regression from https://github.com/NixOS/nixpkgs/pull/379629.
The systemd-journal test has been failing on hydra since 2025-02-10.
See, for instance: https://hydra.nixos.org/build/290855155.

This commit enables auditing, as expected by the tests. It also
addresses an issue where audit messages were getting dropped due to
rate limits.

(cherry picked from commit 22d51e08cf)
2025-05-20 13:30:26 +00:00
Niklas Korz
33e0650223 [Backport release-25.05] doctoc: remove dangling symlinks (#409056) 2025-05-20 14:37:08 +02:00
Doron Behar
d155ce7c2c [Backport release-25.05] i18n: Add charset related settings (#409054) 2025-05-20 15:32:04 +03:00
Jasper Orschulko
8013887864 doctoc: remove dangling symlinks
Fixes https://github.com/NixOS/nixpkgs/issues/409046

(cherry picked from commit 5c380be4d3)
2025-05-20 12:29:39 +00:00
Doron Behar
ef5bc91e93 nixos/i18n: Remove special handling of LANGUAGE
Partially revert #179194 which first filtered
`extraLocaleSettings.LANGUAGE`. Indeed this environment variable is
given precedence according to:

https://www.gnu.org/software/gettext/manual/html_node/Locale-Environment-Variables.html

So using it will simply make all other `extraLocaleSettings` be ignored
in practice, but the OS shouldn't ignore it when aggregating the locales
required in general, as this setup should still be legitimate, and it
may even be useful if you wish to set it by default and use `env -u
LANGUAGE` for some programs.

(cherry picked from commit 263297b4e5)
2025-05-20 12:17:52 +00:00
Doron Behar
53efec63d6 nixosTests.i18n: init
(cherry picked from commit cbbd59e14e)
2025-05-20 12:17:52 +00:00
Doron Behar
fdba215260 i18n: Add charset related settings
Fixes #404758

(cherry picked from commit e8581078a1)
2025-05-20 12:17:52 +00:00
awwpotato
e2667d755c share-preview: 0.5.0 -> 1.0.0
(cherry picked from commit 55e671aa88)
2025-05-20 11:57:16 +00:00
Martin Weinelt
2e90f0c297 [Backport release-25.05] deliantra-server: mark broken (#408931) 2025-05-20 13:14:16 +02:00
Maximilian Bosch
f48dd0b4fd Merge: [Backport release-25.05] mautrix-signal: 0.8.2 -> 0.8.3 (#407715) 2025-05-20 13:12:27 +02:00
Maximilian Bosch
fb3c66ee91 Merge: [Backport release-25.05] mautrix-whatsapp: 0.12.0 -> 0.12.1 (#407838) 2025-05-20 13:11:29 +02:00
R. Ryantm
4a79c48d14 ladybird: 0-unstable-2025-05-07 -> 0-unstable-2025-05-18
(cherry picked from commit 1b3b541eb1)
2025-05-20 10:33:49 +00:00
R. Ryantm
a9e3ea5d77 vulkan-memory-allocator: 3.2.1 -> 3.3.0
(cherry picked from commit 5efd4067cc)
2025-05-20 10:33:21 +00:00
Thiago Kenji Okada
fa7d4cb6aa [Backport release-25.05] linuxKernel.kernels.linux_zen: 6.14.6-zen1 -> 6.14.7-zen1, linuxKernel.kernels.linux_lqx: 6.14.6-lqx1 -> 6.14.7-lqx1 (#408703) 2025-05-20 10:47:38 +01:00
Arne Keller
cf83689420 [Backport release-25.05] flyctl: 0.3.116 -> 0.3.125 (#408525) 2025-05-20 10:35:07 +02:00
Niklas Korz
2ed07b2a8f [Backport release-25.05] python3Packages.whisperx: disable import check for aarch64-linux (#408986) 2025-05-20 09:56:53 +02:00
Aleksana
6a4a3aeba8 [Backport release-25.05] ptyxis: 47.10 -> 48.3 (#408983) 2025-05-20 15:47:30 +08:00
Benjamin Sparks
f16f2b3026 python3Packages.whisperx: disable import check for aarch64-linux
`onnxruntime` fails to find the logger in sandboxed `aarch64-linux` builds,
and promptly segfaults. As all other builds will check this import, I
doubt this has an effect on package health.

(cherry picked from commit 3de9866a86)
2025-05-20 07:43:57 +00:00
Florian Klink
e041816285 [Backport release-25.05] ipmitool: fix IANA registry warnings (#408982) 2025-05-20 10:37:10 +03:00
aleksana
7c9a9d026f ptyxis: 47.10 -> 48.3
(cherry picked from commit 51650dcf60)
2025-05-20 07:36:55 +00:00
Aleksana
2d67ec57a0 [Backport release-25.05] geteduroam: init at 0.10 (#408915) 2025-05-20 15:36:47 +08:00
Stefan Frijters
7e6e2afdb3 ipmitool: fix IANA registry warnings
(cherry picked from commit 6d85cc6c1c)
2025-05-20 07:36:19 +00:00
Jörg Thalheim
d7fdb1c0ba [Backport release-25.05] k3s: use patched util-linuxMinimal (#408972) 2025-05-20 08:57:16 +02:00
Jörg Thalheim
d0764b7e96 k3s: better util-linux patch url
The commit is in master so we don't need to point to the pull request
2025-05-20 08:56:20 +02:00
Morgan Jones
3708c98785 k3s: #405952: fix mount regression
Until #405952 is fixed, we can use our own util-linux to avoid breaking
k3s in the release. Revert this commit when that happens.

(cherry picked from commit 4cf4acae57)
2025-05-20 06:52:45 +00:00
Morgan Jones
83085bba1d k3s: use util-linuxMinimal
The full version of util-linux has systemd, NLS, and ncurses support.
k3s only uses a couple utilities from it at runtime, so use the minimal
version.

(cherry picked from commit 44d7b6dd7b)
2025-05-20 06:52:45 +00:00
Morgan Jones
c239eca2d9 nixos/k3s: get tests working again
Some of the attributes fetched throw, so tryEval them. Recurse into the
attribute set to pick up all the tests.

(cherry picked from commit 727809f534)
2025-05-20 06:52:45 +00:00
Fabian Affolter
df6ad0fcb0 arp-scan-rs: mark as broken on darwin
(cherry picked from commit 183015d5fa)
2025-05-20 06:41:35 +00:00
Fabian Affolter
98446992b4 ares-rs: mark as broken on darwin
(cherry picked from commit ed13d8a02f)
2025-05-20 06:41:26 +00:00
Fabian Affolter
d4d2192aaf deepsecrets: mark as broekn on darwin
(cherry picked from commit 075f82fe32)
2025-05-20 06:41:02 +00:00
Fabian Affolter
f9147b2b04 deepsecrets: refactor
(cherry picked from commit 51f6d18c05)
2025-05-20 06:41:02 +00:00
Fabian Affolter
391a088a14 donpapi: mark as broken on darwin
(cherry picked from commit d073665f04)
2025-05-20 06:40:53 +00:00
Fabian Affolter
130a9b1fe5 donpapi: refactor
(cherry picked from commit 4bd954bba1)
2025-05-20 06:40:53 +00:00
Fabian Affolter
13c6f2227a poutine: mark as broken on darwin
(cherry picked from commit f6d2a400a0)
2025-05-20 06:39:42 +00:00
Fabian Affolter
68fdc0273a unicorn-angr: mark as broken on darwin
(cherry picked from commit c940e6d868)
2025-05-20 06:39:35 +00:00
Fabian Affolter
973ba91345 azurehound: disable on darwin
(cherry picked from commit b9709f944d)
2025-05-20 06:39:05 +00:00
Fabian Affolter
06d02daff6 mx-takeover: disable on darwin
(cherry picked from commit c0c54903b1)
2025-05-20 06:38:39 +00:00
Fabian Affolter
50a802522d mx-takeover: refactor
(cherry picked from commit 85cd98223f)
2025-05-20 06:38:39 +00:00
Fabian Affolter
4f4b9450c0 maigret: mark as broken on darwin
(cherry picked from commit f218242aa9)
2025-05-20 06:38:31 +00:00
Fabian Affolter
1c1564de0f maigret: refactor
(cherry picked from commit 676d2f074e)
2025-05-20 06:38:30 +00:00
Fabian Affolter
79e272abd4 python313Packages.turrishw: disable tests on darwin
(cherry picked from commit cb6f5a6d1a)
2025-05-20 06:37:04 +00:00
Fabian Affolter
0fb6bb757a python313Packages.turrishw: fix changelog entry
(cherry picked from commit b096c95f51)
2025-05-20 06:37:04 +00:00
Fabian Affolter
9f20548cc6 librespeed-cli: mark as broken on darwin
(cherry picked from commit a1108763e0)
2025-05-20 06:36:53 +00:00
Fabian Affolter
4082f008ba librespeed-cli: refactor
(cherry picked from commit b910f2a72f)
2025-05-20 06:36:53 +00:00
R. Ryantm
9c3542c273 snac2: 2.75 -> 2.77
(cherry picked from commit ae837ad0a6)
2025-05-20 05:46:46 +00:00
Jonas Heinrich
3e1e848be4 [Backport release-25.05] nixos/tests/oncall: Fix LDAP mapping (#408939) 2025-05-20 07:12:20 +02:00
Johannes Kirschbauer
f0b1db3f94 [Backport release-25.05] python312Packages.llama-index-core: 0.12.23 -> 0.12.35 (#408669) 2025-05-20 06:16:16 +02:00
Jonas Heinrich
d86afdceca nixos/tests/oncall: Fix LDAP mapping
(cherry picked from commit 8a9cd899ac)
2025-05-20 04:00:29 +00:00
Rebecca Kelly
e4d44b9ac6 deliantra-server: remove
I'm not really using or maintaining it anymore and it's getting increasingly bit-rotted.

(cherry picked from commit b8a2f7fff9)
2025-05-20 02:39:44 +00:00
Peder Bergebakken Sundt
636724d4a8 geteduroam: init at 0.10
(cherry picked from commit 65888ccba9)
2025-05-20 01:21:00 +00:00
Martin Weinelt
8adbe6eafc [Backport release-25.05] home-assistant-custom-components.xiaomi_miot: 1.0.18 -> 1.0.19 (#408903) 2025-05-20 02:40:17 +02:00
R. Ryantm
8d82c8a0a7 home-assistant-custom-components.xiaomi_miot: 1.0.18 -> 1.0.19
(cherry picked from commit 5154d6cca5)
2025-05-20 00:24:41 +00:00
Yechiel Worenklein
c5d3a384d4 bitwarden-cli: add zsh completion
(cherry picked from commit 0200335e08)
2025-05-20 00:13:53 +00:00
Toma
0951a30f58 [Backport release-25.05] lrcget: use cargo-tauri.hook (#408718) 2025-05-20 01:56:35 +02:00
dotlambda
2d8aa81ec1 [Backport release-25.05] pgadmin4: fix build for sandbox=relaxed builds on darwin (#408840) 2025-05-19 16:36:13 -07:00
Gaétan Lepage
556000d37b [Backport release-25.05] apptainer: 1.4.0 -> 1.4.1 (#408751) 2025-05-20 01:04:15 +02:00
Peder Bergebakken Sundt
070dd17943 python3Packages.auto-lazy-imports: init at 0.4.2
(cherry picked from commit bbe729f9d5)
2025-05-19 22:57:54 +00:00
Peder Bergebakken Sundt
f6ea324012 python3Packages.hatch-autorun: init at 1.1.0
(cherry picked from commit e4f2d59409)
2025-05-19 22:57:53 +00:00
Arne Keller
9480817831 [Backport release-25.05] sticky-notes: 0.2.6 -> 0.2.7 (#408863) 2025-05-19 23:44:05 +02:00
Brian McGillion
50e53b391c sticky-notes: 0.2.6 -> 0.2.7
Fixes and issue where the application segfaults on launch.

https://github.com/vixalien/sticky/releases/tag/v0.2.7

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
(cherry picked from commit 628013b47c)
2025-05-19 20:55:29 +00:00
Florian Brandes
925b2a5177 pgadmin4: fix build for sandbox=relaxed builds on darwin
fixes: clang: error: no such file or directory: '/usr/local/lib/libpng16.a'
on sandboxed darwin boxes

1. mozjpeg hasn't been updated since 2021. The newest commit from 2023
  fixes the build on darwin but no new release was put forward
  (see imagemin/mozjpeg-bin#64 and imagemin/mozjpeg-bin#81)
2. This prompts to manually patching the yarn.lock file
3. Which also needs to split the yarnConfigHook logic and
  duplicate it in parts in the derivation

The benefit is to be able to build pgadmin on aarch64-darwin
without network.

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
(cherry picked from commit 10ff832c4f)
2025-05-19 19:46:30 +00:00
Arne Keller
8cfb3a50f3 [Backport release-25.05] python3Packages.pydal: fix Darwin build (#408648) 2025-05-19 21:15:13 +02:00
Arne Keller
4dd119ab0d [Backport release-25.05] plexamp: 4.12.2 -> 4.12.3 (#408437) 2025-05-19 21:14:40 +02:00
dotlambda
c384b10abb [Backport release-25.05] qt6Packages.qgpgme: mark broken on Darwin (#408608) 2025-05-19 09:20:20 -07:00
Martin Weinelt
bd7e2ac052 [Backport release-25.05] element-call: 0.10.0 -> 0.11.1 (#408750) 2025-05-19 17:30:00 +02:00
Thomas Gerbet
ce260f0906 [Backport release-25.05] nodejs_24: 24.0.1 -> 24.0.2 (#408500) 2025-05-19 17:13:13 +02:00
Gaetan Lepage
cd443e9ecb apptainer: 1.4.0 -> 1.4.1
Diff: https://github.com/apptainer/apptainer/compare/v1.4.0...v1.4.1

Changelog:
https://github.com/apptainer/apptainer/blob/v1.4.1/CHANGELOG.md
(cherry picked from commit 5d336e7a9e)
2025-05-19 15:12:41 +00:00
Martin Weinelt
30c143bded element-call: 0.10.0 -> 0.11.1
https://github.com/element-hq/element-call/releases/tag/v0.11.0
https://github.com/element-hq/element-call/releases/tag/v0.11.1
(cherry picked from commit b4ac082d8a)
2025-05-19 15:08:28 +00:00
Martin Weinelt
ec3c9bf555 [Backport release-25.05] librewolf-unwrapped: 138.0.1-2 -> 138.0.4-1 (#408745) 2025-05-19 17:06:13 +02:00
Thomas Gerbet
f007fa8ec3 [Backport release-25.05] microsoft-edge: remove (#408740) 2025-05-19 17:02:07 +02:00
Andrew Marshall
11b66f7583 librewolf-unwrapped: 138.0.1-2 -> 138.0.4-1
(cherry picked from commit 9909624ba5)
2025-05-19 14:58:48 +00:00
Aleksana
3fc18e2cff [Backport release-25.05] est-sfs: drop (#408408) 2025-05-19 22:57:47 +08:00
Thomas Gerbet
16c3d05d9a [Backport release-25.05] mono: 6.12.0.182 -> 6.14.1 (#408492) 2025-05-19 16:54:21 +02:00
Leona Maroni
84b9a3019a [Backport release-25.05] release-notes: rework highlights section (#408646) 2025-05-19 16:40:51 +02:00
Adam C. Stephens
aff790ba7c microsoft-edge: remove
Due to lack of active maintenance, removing from tree to avoid
unnecessarily exposing users to active security vulnerabilities

(cherry picked from commit 13dce3b2e0)
2025-05-19 14:40:42 +00:00
Jonas Sander
c7eaa2ddb2 nixos/paperless: expose manage package (#405610)
(cherry picked from commit 309871725f)
2025-05-19 14:38:20 +00:00
David McFarland
6447b33849 godot3-mono: fix compile error with mono 6.14
This was introduced with #401409.

(cherry picked from commit c4b497e8d4)
2025-05-19 16:38:16 +02:00
Michele Guerini Rocco
c2db6a61f2 [Backport release-25.05] nixos/pdns-recursor: deprecate settings, add yaml-settings (#408645) 2025-05-19 16:30:26 +02:00
TomaSajt
2db6cadfc0 lrcget: use cargo-tauri.hook
(cherry picked from commit 9887ab90ba)
2025-05-19 13:01:22 +00:00
Gliczy
c9a844d156 bottles: fix typo in warn-unsupported.patch
(cherry picked from commit 4b6d16b82a)
2025-05-19 14:50:03 +02:00
Gliczy
80bdc3ecff bottles-unwrapped: add gamemode to propagatedBuildInputs
(cherry picked from commit 006b8bc52c)
2025-05-19 14:49:58 +02:00
Gliczy
87671549bf bottles: add info to disable unsupported popup
(cherry picked from commit bb8327b825)
2025-05-19 14:49:55 +02:00
Gliczy
c6b57432a7 bottles: update remove-unsupported-warning.patch
(cherry picked from commit 400b8c420c)
2025-05-19 14:49:51 +02:00
XBagon
31ad7d4e39 bottles-unwrapped: 51.17 -> 51.21
Diff: https://github.com/bottlesdevs/bottles/compare/refs/tags/51.17...refs/tags/51.21

bottles-unwrapped: update remove-flatpack-check.patch according to https://github.com/NixOS/nixpkgs/pull/403938#pullrequestreview-2847541020
(cherry picked from commit 2a7622d9f8)
2025-05-19 14:49:45 +02:00
XBagon
9e8ea59a07 bottles-unwrapped: add XBagon to maintainers
(cherry picked from commit d6c9c226f1)
2025-05-19 14:49:39 +02:00
Katherine Jamison
6bfb9d34a4 linuxKernel.kernels.linux_lqx: 6.14.6-lqx1 -> 6.14.7-lqx1
(cherry picked from commit 190577598a)
2025-05-19 12:31:40 +00:00
Katherine Jamison
cec51a9563 linuxKernel.kernels.linux_zen: 6.14.6-zen1 -> 6.14.7-zen1
(cherry picked from commit 0b09a98d61)
2025-05-19 12:31:40 +00:00
Jenny
9fe036b6ab [Backport release-25.05] arduino-cli: 1.2.0 -> 1.2.2 (#408698) 2025-05-19 14:31:04 +02:00
Jenny
f9b1b35fbd [Backport release-25.05] dependency-track: 4.12.7 -> 4.13.2 (#408692) 2025-05-19 14:17:48 +02:00
Stefan Frijters
ec1b8d5ea8 arduino-cli: remove 'with lib'
(cherry picked from commit 60faec14b9)
2025-05-19 12:13:32 +00:00
Stefan Frijters
935ba05bff arduino-cli: 1.2.0 -> 1.2.2
(cherry picked from commit 1e595f40ae)
2025-05-19 12:13:32 +00:00
R. Ryantm
2846ed5221 dependency-track: 4.12.7 -> 4.13.2
(cherry picked from commit 1bdb53fcf8)
2025-05-19 11:58:29 +00:00
taku0
c1b2b2231c [Backport release-25.05] thunderbird-latest-bin-unwrapped: 138.0 -> 138.0.1 (#408378) 2025-05-19 20:40:34 +09:00
Arian van Putten
f0be5c993c [Backport release-25.05] amazon-image: Increase disk size, Remove tags from label - use version only (#408684) 2025-05-19 13:25:59 +02:00
phaer
88294331fd amazon-image: Increase diskSize 3 -> 4GB
Disk usage of the image has risen considerably since last release. We
still need to investigate the cause in detail. Increasing it for now
prevents build failures at least.

(cherry picked from commit 813d0ba1fb)
2025-05-19 11:13:17 +00:00
phaer
9eaf700bf0 amazon-image: Remove tags from label, use version only
By default, `system.nixos.label` includes `system.nixos.tags` which
historically was not set for the amazon image.

Keeping the tag in the label of the generated disk image inside the
derivation (i.e. `image.filePath`) makes it easier to tell that the
file is for amazon (i.e.
`nixos-image-amazon-25.11pre-git-x86_64-linux.vpc`) while the "label"
in `image-info.json` for users of the AWS api stays stable (i.e.
`/25.05pre-git-x86_64-linux`).

`

(cherry picked from commit 8ccd7e5d9a)
2025-05-19 11:13:17 +00:00
Gaétan Lepage
9d22b3e6f6 [Backport release-25.05] python3Packages.wandb: fix x86_64-darwin (#408491) 2025-05-19 12:29:49 +02:00
Fabian Affolter
c233951d69 python312Packages.lama-index: update build-system
(cherry picked from commit e58d3c0f59)
2025-05-19 10:07:33 +00:00
Fabian Affolter
60d3b6ae19 python312Packages.curated-transformers: 0.1.1 -> 2.0.1
Changelog: https://github.com/explosion/curated-transformers/releases/tag/v2.0.1
(cherry picked from commit 86cfd4121c)
2025-05-19 10:07:33 +00:00
Fabian Affolter
a60bad2b58 python312Packages.llama-index-core: 0.12.23 -> 0.12.35
Changelog: https://github.com/run-llama/llama_index/blob/v0.12.35/CHANGELOG.md
(cherry picked from commit 2d72f28a38)
2025-05-19 10:07:32 +00:00
Fabian Affolter
4d5bc388fe python312Packages.llama-index-agent-openai: 0.4.6 -> 0.4.7
(cherry picked from commit 7d11816d36)
2025-05-19 10:07:32 +00:00
Fabian Affolter
c1f73838c8 python312Packages.llama-index-embeddings-huggingface: 0.5.3 -> 0.5.4
(cherry picked from commit 4e03a8ac2b)
2025-05-19 10:07:32 +00:00
Fabian Affolter
8188112c72 python312Packages.llama-index-graph-stores-neptune: 0.3.2 -> 0.3.3
(cherry picked from commit f9aa2ca7ff)
2025-05-19 10:07:32 +00:00
Fabian Affolter
55d63b7385 python312Packages.llama-index-llms-openai: 0.3.33 -> 0.3.38
(cherry picked from commit 7efba6d0f6)
2025-05-19 10:07:32 +00:00
Fabian Affolter
6779c602a0 python312Packages.llama-index-vector-stores-postgres: 0.4.2 -> 0.5.3
(cherry picked from commit f6cadae0e1)
2025-05-19 10:07:32 +00:00
Jan Tojnar
8529bbe7d6 gupnp_1_6: Use finalAttrs
(cherry picked from commit 96aca7526a)
2025-05-19 09:47:34 +00:00
Jan Tojnar
0d62eb72ea gupnp_1_6: Unbreak on Darwin
All the tests except `context-filter` are broken:

    ERROR:../tests/test-context.c:265:test_gupnp_context_error_when_bound: assertion failed (error == NULL): Error binding to address 127.0.0.1:0: Operation not permitted (g-io-error-quark, 14)

    ERROR:../tests/test-context-manager.c:42:test_context_manager_manage: assertion failed (error == NULL): Failed to find IP of interface lo (gssdp-error, 0)

But we already disable them on the old `gupnp`.

(cherry picked from commit 0443142472)
2025-05-19 09:47:34 +00:00
Jan Tojnar
761ad5fcad gssdp_1_6: Use finalAttrs
(cherry picked from commit edd0dc6111)
2025-05-19 09:47:34 +00:00
Jan Tojnar
0d1ada761e gssdp_1_6: Unbreak on Darwin
Only all the tests are broken:

    ERROR:../tests/test-functional.c:491:test_client_creation: assertion failed (error == NULL): Failed to bind socketError binding to address 169.254.192.89:1900: Operation not permitted (g-io-error-quark, 14)

But we already disable them on the old `gssdp`.

(cherry picked from commit 0ee528d2cc)
2025-05-19 09:47:34 +00:00
tomberek
dae513c187 [Backport release-25.05] teleport: modernize (#408582) 2025-05-19 05:30:32 -04:00
Atemu
5a0bb053d1 [Backport release-25.05] nixos/signald, signald, signaldctl, purple-signald: drop (#408483) 2025-05-19 11:10:56 +02:00
Atemu
190639e8e4 [Backport release-25.05] lasso: fix build with gcc14 (#408458) 2025-05-19 11:08:08 +02:00
K900
9b92bb723e [Backport release-25.05] kanidm: fix to actually work on Linux again (#408652) 2025-05-19 11:49:30 +03:00
K900
48479abffa [Backport release-25.05] nixos/tests/installer: fix eval (#408650) 2025-05-19 11:49:20 +03:00
K900
217bc1016e nixos/tests/kanidm: pin to v1.6
These should really be made versioned, but this gets us _something_
quickly, at least.

(cherry picked from commit bf0aa25e4b)
2025-05-19 08:49:00 +00:00
K900
494cad83b5 kanidm: fix running on Linux
(cherry picked from commit 29c9fa86b5)
2025-05-19 08:49:00 +00:00
K900
16f669780b nixos/tests/installer: fix eval
(cherry picked from commit c87615a319)
2025-05-19 08:48:28 +00:00
Thomas Gerbet
f1246574f5 [Backport release-25.05] webkitgtk_6_0: 2.48.1 → 2.48.2 (#408079) 2025-05-19 10:47:55 +02:00
FliegendeWurst
45c5fa41dc python3Packages.pydal: fix Darwin build
(cherry picked from commit c32a49ef8f)
2025-05-19 08:40:28 +00:00
Leona Maroni
c2d6e6ecd1 release-notes: rework highlights section
(cherry picked from commit 8ae9309031)
2025-05-19 08:32:49 +00:00
Leona Maroni
f995684de2 [25.05] xmlroff: mark as broken (#408385) 2025-05-19 10:31:48 +02:00
rnhmjoj
0142405cb7 nixos/release-notes: deprecate services.pdns-recursor.settings
(cherry picked from commit ab8653abd5)
2025-05-19 08:30:52 +00:00
rnhmjoj
77406f7c09 nixos/tests/pdns-recursor: test old-settings
(cherry picked from commit 13accc23b0)
2025-05-19 08:30:52 +00:00
rnhmjoj
fb77c246cb nixos/pdns-recursor: deprecate settings, add yaml-settings
(cherry picked from commit b71d4f5fb3)
2025-05-19 08:30:52 +00:00
Vladimír Čunát
3a5d2e3e26 thunderbird-esr(-bin): 128.10.0 -> 128.10.1, thunderbird-latest: 138.0 -> 138.0.1 (#408638) 2025-05-19 10:01:24 +02:00
Thomas Gerbet
12206c8aad thunderbird-latest-unwrapped: 138.0 -> 138.0.1
Fixes: CVE-2025-3875, CVE-2025-3877, CVE-2025-3909, CVE-2025-3932
https://www.mozilla.org/en-US/security/advisories/mfsa2025-35/

https://www.thunderbird.net/en-US/thunderbird/138.0.1/releasenotes/
(cherry picked from commit 47b01e7cbd)
2025-05-19 07:50:38 +00:00
Thomas Gerbet
ed92aa1b96 thunderbird-esr-unwrapped: 128.10.0 -> 128.10.1
Fixes: CVE-2025-3875, CVE-2025-3877, CVE-2025-3909, CVE-2025-3932
https://www.mozilla.org/en-US/security/advisories/mfsa2025-34/

https://www.thunderbird.net/en-US/thunderbird/128.10.1esr/releasenotes/
(cherry picked from commit 850c00e115)
2025-05-19 07:50:38 +00:00
Thomas Gerbet
059b47dcf7 thunderbird-esr-bin-unwrapped: 128.10.0 -> 128.10.1
Fixes: CVE-2025-3875, CVE-2025-3877, CVE-2025-3909, CVE-2025-3932
https://www.mozilla.org/en-US/security/advisories/mfsa2025-34/

https://www.thunderbird.net/en-US/thunderbird/128.10.1esr/releasenotes/
(cherry picked from commit 595c41eeaf)
2025-05-19 07:50:38 +00:00
Vladimír Čunát
a7fb7dd2ed linuxPackages.system76-acpi: fix build (#408633) 2025-05-19 09:41:56 +02:00
eljamm
805471238b linuxPackages.system76-acpi: small improvements
- use `finalAttrs`
- use `tag` and `hash` in `src`
- add {pre,post} hooks to the `installPhase`
- remove `with lib;` from `meta`

(cherry picked from commit 4adde8f35b)
2025-05-19 07:40:43 +00:00
eljamm
00500fe01f linuxPackages.system76-acpi: fix build
(cherry picked from commit 3b24475288)
2025-05-19 07:40:43 +00:00
Vladimír Čunát
4b026ac8a9 linuxPackages.rtl8821au: unstable-2024-03-16 -> unstable-2025-04-08 (#408630) 2025-05-19 09:35:11 +02:00
Winter
e33fd8ac58 [Backport release-25.05] nixos/tests: don't explicitly set meta.platforms (#408629) 2025-05-19 03:33:10 -04:00
cy
7870338039 linuxPackages.rtl8821au: fix meta.homepage
(cherry picked from commit 22966fa889)
2025-05-19 07:27:08 +00:00
cy
32b668e030 linuxPackages.rtl8821au: unstable-2024-03-16 -> unstable-2025-04-08
changelog: 168ac48174...b90b76d307
(cherry picked from commit 9fecdecb86)
2025-05-19 07:27:08 +00:00
Winter
25e8cba5ec nixos/tests/installer: include x86_64-darwin in platforms for uefi tests
Also makes it so that we only set `meta.platforms` in cases where we need
to restrict it; otherwise, we go with the default.

(cherry picked from commit f3db57edfa)
2025-05-19 07:24:22 +00:00
Winter
587a2bd106 nixos/tests: don't explicitly set meta.platforms
This prevents the tests from running on Darwin for no real reason.

(cherry picked from commit 2680e0beca)
2025-05-19 07:24:22 +00:00
Arne Keller
f362501e32 [Backport release-25.05] notmuch-mailmover: 0.6.0 -> 0.7.0 (#408063) 2025-05-19 09:00:45 +02:00
Leona Maroni
aad0fa6d18 [25.05] ggobi: mark as broken (#408374) 2025-05-19 08:36:05 +02:00
Ramses
e77859ec50 [Backport release-25.05] niri: 25.02 -> 25.05 (#408554) 2025-05-19 08:33:20 +02:00
Robert Schütz
d6cd75ce6e qt6Packages.qgpgme: mark broken on Darwin
(cherry picked from commit 58a92a258b)
2025-05-19 06:03:45 +00:00
Winter
a1ddb5de19 [Backport release-25.05] tpm2-tss: disable tcti-libtpms on darwin (#408593) 2025-05-19 01:57:56 -04:00
Winter
f32186bacd [Backport release-25.05] nixos/tests/common/x11.nix: Fix IceWM theme (#408446) 2025-05-19 01:51:06 -04:00
jopejoe1
3461d4da71 [Backport release-25.05] discord: update various (#408476) 2025-05-19 07:46:13 +02:00
Fiona Behrens
f81d7d1b86 tpm2-tss: disable tcti-libtpms on darwin
Add the `--disable-tcti-libtpms` config flag if build on darwin.
This was already done in a pr that also introduced darwin support for
tpm2-tss[0] but a earlier one was merged[1]

[0]: https://github.com/NixOS/nixpkgs/pull/370516
[1]: https://github.com/NixOS/nixpkgs/pull/365010

(cherry picked from commit e3c24c24fe)
2025-05-19 04:43:55 +00:00
JuliusFreudenberger
8e3671e458 teleport: move to by-name
Make teleport built by the by-name structure in package.nix.
The versioned attributes are defined in their own package.nix
in by-name using overrides.
Also change reference in ci/OWNERS

(cherry picked from commit a01b51d00b)
2025-05-19 02:40:51 +00:00
JuliusFreudenberger
e302c1fb18 teleport: remove with lib
(cherry picked from commit f45bf7d6a6)
2025-05-19 02:40:50 +00:00
JuliusFreudenberger
deac61c2a8 teleport: use finalAttrs pattern
(cherry picked from commit aa50c85761)
2025-05-19 02:40:50 +00:00
Defelo
eff078eb02 niri: 25.02 -> 25.05
(cherry picked from commit a1a253ef84)
2025-05-18 23:38:56 +00:00
Peder Bergebakken Sundt
ca49c4304a [Backport release-25.05] SDL_ttf: fix version string (#408539) 2025-05-19 01:15:00 +02:00
Grimmauld
e61f520014 SDL_ttf: fix version string
While upstream has added release notes in their repo [1], no `2.0.11.1` version has been tagged.
According to the repology guidelines [2] that we mostly follow,
versioning of snapshots should be relative to the last tagged upstream release, which would be `2.0.11`.
The `2.0.11.1-unstable...` version string currently crashes the update script,
which is irritating when checking for all updates as a maintainer.

By the off-chance upstream does end up tagging a `2.0.11.1` later,
our version string would also incorrectly represent what we actually have.
Changelogs in git without a tag are still subject to change,
though unlikely in the case of SDL_ttf.

Whether we do or do not have the `.1` probably does not matter too much.

[1] e31d11a692
[2] https://repology.org/docs/requirements

(cherry picked from commit 1d5023fc3e)
2025-05-18 22:49:42 +00:00
Jan Tojnar
40dedf83fa Merge [Backport release-25.05] gnomeExtensions.applications-menu: fix GMenu import (#408196) 2025-05-19 00:24:49 +02:00
Peder Bergebakken Sundt
4eed07903c [Backport release-25.05] dolphin-emu: set correct git revision (#408501) 2025-05-19 00:18:19 +02:00
Martin Weinelt
ac9cee7c04 [Backport release-25.05] firefox-esr: 128.10.0esr -> 128.10.1esr (#408516) 2025-05-19 00:14:14 +02:00
R. Ryantm
d989771974 flyctl: 0.3.116 -> 0.3.125
(cherry picked from commit 7ff2295b69)
2025-05-18 22:11:28 +00:00
Amadej Kastelic
aa3732438e firefox-esr: 128.10.0esr -> 128.10.1esr
Release-notes: https://www.mozilla.org/en-US/firefox/128.10.1/releasenotes/
Security-advisory: https://www.mozilla.org/en-US/security/advisories/mfsa2025-37/
Fixes: CVE-2025-4920, CVE-2025-4921

(cherry picked from commit 626cea8f4e)
2025-05-18 21:47:29 +00:00
Sapphire
9e3d6f80c3 wivrn: 0.24.1 -> 0.25
(cherry picked from commit 9a8c1bed1c)
2025-05-18 21:27:03 +00:00
Peder Bergebakken Sundt
9a444fd46a dolphin-emu: set correct git revision
(cherry picked from commit b335f1d5dd)
2025-05-18 21:14:25 +00:00
Antoine du Hamel
ae316829e9 nodejs_24: 24.0.1 -> 24.0.2
(cherry picked from commit 07f722d0a7)
2025-05-18 21:13:57 +00:00
Peder Bergebakken Sundt
31447d67ad [Backport release-25.05] SDL_image: 1.2.12-unstable-2025-02-13 -> 1.2.12-unstable-2025-04-27 (#408393) 2025-05-18 23:04:00 +02:00
Grimmauld
41288f7e08 mono: 6.14.0 -> 6.14.1
(cherry picked from commit b0319a96fb)
2025-05-18 20:35:57 +00:00
Grimmauld
1586de70b4 mono: 6.12.0.182 -> 6.14.0
The original Mono project [1] was archived.
It is now maintained by WineHQ on their gitlab [2].

This changes the homepage for the new mono package,
and moves the source fetchers to the version profiles.

[1] https://www.mono-project.com/
[2] https://gitlab.winehq.org/mono/mono

(cherry picked from commit 85e1bcb3a6)
2025-05-18 20:35:57 +00:00
Niklas Korz
b24acc6958 python3Packages.wandb: fix x86_64-darwin
(cherry picked from commit 7924c28ad9)
2025-05-18 20:29:49 +00:00
Niklas Korz
f357ba3e53 release-notes: removal of signald module and all signald-related packages
(cherry picked from commit 3186b66d0a)
2025-05-18 19:45:41 +00:00
Niklas Korz
5ef1b95049 signald: drop
(cherry picked from commit 2b19df574c)
2025-05-18 19:45:41 +00:00
Niklas Korz
ee21fc2e69 purple-signald: drop
(cherry picked from commit 0f842e0540)
2025-05-18 19:45:41 +00:00
Niklas Korz
8e140286aa signaldctl: drop
(cherry picked from commit 1cfcd51cf1)
2025-05-18 19:45:40 +00:00
Niklas Korz
ed59c106c7 nixos/signald: drop
(cherry picked from commit 9958792cae)
2025-05-18 19:45:40 +00:00
Niklas Korz
ac7187ebef [Backport release-25.05] signald: set jdkOnBuild (#408479) 2025-05-18 21:44:33 +02:00
Martin Weinelt
f51e2279a4 [Backport release-25.05] digikam: mark as big-paralllel (#408478) 2025-05-18 21:38:03 +02:00
tomberek
8fa6d96c96 [Backport release-25.05] teleport_17: 17.4.5 -> 17.4.8; teleport_16: 16.5.3 -> 16.5.8 (#408392) 2025-05-18 15:37:54 -04:00
Atemu
190ce8ef0f signald: set jdkOnBuild
This is required if the building jdk is a different version than what is default
which is now 21.

(cherry picked from commit 4541097f67)
2025-05-18 19:37:00 +00:00
Martin Weinelt
076c54c593 digikam: mark as big-paralllel
This will allocate more resources to the build making sure it completes
in a more reasonable time and not block a build slot for over 3 hours.

(cherry picked from commit 8ef6064848)
2025-05-18 19:35:13 +00:00
jopejoe1
b18979b822 pkgsCross.aarch64-darwin.discord-development: 0.0.87 -> 0.0.88
(cherry picked from commit ecfa3b3aa0)
2025-05-18 19:28:34 +00:00
jopejoe1
25e0adf975 pkgsCross.aarch64-darwin.discord-canary: 0.0.774 -> 0.0.784
(cherry picked from commit ad26466ee6)
2025-05-18 19:28:34 +00:00
jopejoe1
0fbfe433ec pkgsCross.aarch64-darwin.discord-ptb: 0.0.171 -> 0.0.173
(cherry picked from commit c4ce782320)
2025-05-18 19:28:34 +00:00
jopejoe1
2d069cf306 pkgsCross.aarch64-darwin.discord: 0.0.344 -> 0.0.345
(cherry picked from commit 758fe4bb87)
2025-05-18 19:28:33 +00:00
jopejoe1
932e8c1da5 discord-development: 0.0.74 -> 0.0.75
(cherry picked from commit fa58683542)
2025-05-18 19:28:33 +00:00
jopejoe1
5bfbfef6df discord-canary: 0.0.668 -> 0.0.678
(cherry picked from commit f5cd8207e8)
2025-05-18 19:28:33 +00:00
jopejoe1
05c93e17fb discord-ptb: 0.0.141 -> 0.0.143
(cherry picked from commit 6adbe026ac)
2025-05-18 19:28:33 +00:00
Atemu
91e450f385 [Backport release-25.05] lngen: fix build with GHC >=9.8.1 (#408404) 2025-05-18 20:44:02 +02:00
Atemu
ffd83d9253 [Backport release-25.05] edge-runtime: drop (#408407) 2025-05-18 20:43:31 +02:00
Leona Maroni
6648830ce0 lasso: fix build with gcc14
(cherry picked from commit 37385d9192)
2025-05-18 18:24:01 +00:00
Arne Keller
50c4e1db25 [Backport release-25.05] nodejs_20: 20.19.1 -> 20.19.2 (#408439) 2025-05-18 20:22:11 +02:00
R. Ryantm
cd28f44de0 tomcat: 11.0.6 -> 11.0.7
(cherry picked from commit c1053a2ea8)
2025-05-18 20:06:10 +02:00
R. Ryantm
e24d645c07 tomcat9: 9.0.104 -> 9.0.105
(cherry picked from commit f88761e23c)
2025-05-18 20:05:55 +02:00
R. Ryantm
24a5d1295d jetty: 12.0.20 -> 12.0.21
(cherry picked from commit 63611760d3)
2025-05-18 20:05:33 +02:00
R. Ryantm
a20f81f1b6 tomcat10: 10.1.40 -> 10.1.41
(cherry picked from commit 147f9b9ad9)
2025-05-18 20:05:06 +02:00
OPNA2608
9ac24b33ed nixos/tests/common/x11.nix: Fix IceWM theme
(cherry picked from commit f66c4ad65f)
2025-05-18 17:09:17 +00:00
Peder Bergebakken Sundt
58c34e570d [Backport release-25.05] SDL_net: 1.2.8-unstable-2024-04-23 -> 1.2.8-unstable-2025-04-21 (#408399) 2025-05-18 18:54:21 +02:00
Antoine du Hamel
b88415246f nodejs_20: 20.19.1 -> 20.19.2
(cherry picked from commit 2e14cbb3d8)
2025-05-18 16:28:06 +00:00
R. Ryantm
52121e5d86 plexamp: 4.12.2 -> 4.12.3
(cherry picked from commit 4d628d83ab)
2025-05-18 16:24:52 +00:00
Aleksana
8e1439fe0f [Backport release-25.05] upscaler: 1.5.1 -> 1.5.2 (#408434) 2025-05-19 00:09:39 +08:00
Grimmauld
88c14c523e upscaler: 1.5.1 -> 1.5.2
(cherry picked from commit b9b954e2e6)
2025-05-18 15:53:48 +00:00
Felix Bargfeldt
a842273877 [Backport release-25.05] fflogs: 8.17.1 -> 8.17.13 (#407862) 2025-05-18 17:51:44 +02:00
Aleksana
b6af4c9857 [Backport release-25.05] fluffychat: 1.26.0 -> 1.26.1 (#408418) 2025-05-18 23:00:24 +08:00
Atemu
982648f224 [Backport release-25.05] riko4: drop (#408410) 2025-05-18 16:51:16 +02:00
Atemu
a8895367c8 [Backport release-25.05] git-annex-utils: drop (#408402) 2025-05-18 16:43:25 +02:00
Atemu
00d78cf384 [Backport release-25.05] x16: adopt, fix build on GCC 14, modernize (#408401) 2025-05-18 16:42:45 +02:00
aleksana
341df29b3a fluffychat: add aleksana to maintainers
(cherry picked from commit 97e834870b)
2025-05-18 14:39:23 +00:00
aleksana
49a1857949 fluffychat: 1.26.0 -> 1.26.1
(cherry picked from commit 419fb0fdf2)
2025-05-18 14:39:23 +00:00
Grimmauld
8928fcbdf5 riko4: drop
The package in nixpkgs was basically unmaintained since 2018.
It's maintainer in nixpkgs is inactive since 2022.
It dependended on the already dropped SDL_gpu package, which it pinned internally.
This now also started failing to build.
While upstream has a newer version of `riko4` available,
it does not remove the SDL_gpu dependency or fix its issues.

(cherry picked from commit 3035235407)
2025-05-18 14:21:38 +00:00
Leona Maroni
733a794906 est-sfs: drop
Unmaintained in Nixpkgs

(cherry picked from commit 337d643e89)
2025-05-18 14:15:37 +00:00
Grimmauld
d6deff043e edge-runtime: drop
The version in nixpkgs was outdated since Nov 2024, with countless releases since [1].
This is unacceptable for what is intended to be a network-facing service.
It also started failing to build.

[1] https://github.com/supabase/edge-runtime/releases

(cherry picked from commit 4e5251e1ef)
2025-05-18 14:14:39 +00:00
Leah Amelia Chen
d76d76a3df lngen: fix build with GHC >=9.8.1
ZHF #403336

(cherry picked from commit 4f64e094ff)
2025-05-18 14:13:23 +00:00
Leona Maroni
0af09df267 [Backport release-25.05] edbrowse: drop (#408368) 2025-05-18 16:07:31 +02:00
Leona Maroni
b12e49a7cf git-annex-utils: drop
Upstream repositority deleted, unmaintained

(cherry picked from commit b6036a7067)
2025-05-18 14:06:43 +00:00
Atemu
d1bfeb9c2b clean: mark as broken (#408338) 2025-05-18 16:02:39 +02:00
Leah Amelia Chen
1f47ea6d8c x16: adopt & modernize
(cherry picked from commit 0405671c7b)
2025-05-18 14:01:24 +00:00
Leah Amelia Chen
fa53c7b41f x16: fix build on GCC 14
(cherry picked from commit b1a81b82aa)
2025-05-18 14:01:24 +00:00
R. Ryantm
06f07f8f77 SDL_net: 1.2.8-unstable-2024-04-23 -> 1.2.8-unstable-2025-04-21
(cherry picked from commit 1955443bda)
2025-05-18 13:55:54 +00:00
R. Ryantm
b6b5ecb97a SDL_image: 1.2.12-unstable-2025-02-13 -> 1.2.12-unstable-2025-04-27
(cherry picked from commit 484eeec743)
2025-05-18 13:47:32 +00:00
JuliusFreudenberger
43880c03b7 teleport_16: 16.5.3 -> 16.5.9
Changelogs: https://github.com/gravitational/teleport/releases/tag/v16.5.4 https://github.com/gravitational/teleport/releases/tag/v16.5.5 https://github.com/gravitational/teleport/releases/tag/v16.5.6 https://github.com/gravitational/teleport/releases/tag/v16.5.7 https://github.com/gravitational/teleport/releases/tag/v16.5.8 https://github.com/gravitational/teleport/releases/tag/v16.5.9
Diff: https://github.com/gravitational/teleport/compare/v16.5.3...v16.5.9
(cherry picked from commit 1cbe1100b0)
2025-05-18 13:40:32 +00:00
JuliusFreudenberger
3b595a9c77 teleport_17: 17.4.5 -> 17.4.8
Changelogs: https://github.com/gravitational/teleport/releases/tag/v17.4.6 https://github.com/gravitational/teleport/releases/tag/v17.4.7 https://github.com/gravitational/teleport/releases/tag/v17.4.8
Diff: https://github.com/gravitational/teleport/compare/v17.4.5...v17.4.8
(cherry picked from commit 9a0eed76cd)
2025-05-18 13:40:32 +00:00
Leona Maroni
149c1fc570 xmlroff: mark as broken 2025-05-18 15:21:52 +02:00
R. Ryantm
8b7f17f900 thunderbird-latest-bin-unwrapped: 138.0 -> 138.0.1
(cherry picked from commit ef1fae5601)
2025-05-18 12:59:25 +00:00
Emily
ff9aa69607 [Backport release-25.05] darwin: remove nix search warning spam (#408371) 2025-05-18 13:59:08 +01:00
Leona Maroni
5176aa4a9f ggobi: mark as broken 2025-05-18 14:44:11 +02:00
ash
f5d39add70 darwin: lib.warn -> lib.warnOnInstantiate
(cherry picked from commit a249cd2ea2)
2025-05-18 12:40:55 +00:00
ash
8cf643e05f darwin: reduce nix search warning spam
(cherry picked from commit 62b67805d4)
2025-05-18 12:40:55 +00:00
Aleksana
0aa45a9270 [25.05] libgadu: mark as broken (#407960) 2025-05-18 20:37:53 +08:00
Leona Maroni
5e761e6c10 edbrowse: drop
Unmaintained in Nixpkgs for 3 years

(cherry picked from commit 992bd81dd7)
2025-05-18 12:34:39 +00:00
Martin Weinelt
42ef2213ef [Backport release-25.05] firefox{,-bin}-unwrapped: 138.0.3 -> 138.0.4 (#408337) 2025-05-18 14:23:03 +02:00
Emily
e5f3555a82 [Backport release-25.05] home-assistant-custom-components.dwd: 2024.11.0 -> 2025.5.0 (#408356) 2025-05-18 14:07:59 +02:00
Martin Weinelt
8532614b36 [Backport release-25.05] python3Packages.schema-salad: drop black build-time dependency (#408348) 2025-05-18 13:58:10 +02:00
Martin Weinelt
237d61b1a2 home-assistant-custom-components.dwd: 2024.11.0 -> 2025.5.0
https://github.com/hg1337/homeassistant-dwd/compare/2024.11.0...2025.5.0
(cherry picked from commit 6a4dee9a11)
2025-05-18 11:57:43 +00:00
Martin Weinelt
10a0180429 python3Packages.schema-salad: drop black build-time dependency
(cherry picked from commit 8c51931373)
2025-05-18 11:40:40 +00:00
Aleksana
dd4dcc6ef1 [Backport release-25.05] darling-dmg: fix compilation (#408343) 2025-05-18 19:39:50 +08:00
Aleksana
b538637c39 [Backport release-25.05] tilda: fix build (#408083) 2025-05-18 19:37:41 +08:00
Aleksana
710fc44fe9 [Backport release-25.05] fvwm2: fix build with GCC 14 (#408239) 2025-05-18 19:37:11 +08:00
Luflosi
5397beb766 darling-dmg: fix compilation
See https://github.com/darlinghq/darling-dmg/pull/105 and https://github.com/darlinghq/darling-dmg/issues/104.

(cherry picked from commit f1652b7670)
2025-05-18 11:34:04 +00:00
Adam C. Stephens
ffc785f086 [Backport release-25.05] invidious: 2.20250504.0 -> 2.20250517.0 (#408222) 2025-05-18 07:30:38 -04:00
Leona Maroni
76aa65043b clean: mark as broken 2025-05-18 13:25:11 +02:00
Sizhe Zhao
3429ab3d11 firefox-bin-unwrapped: 138.0.3 -> 138.0.4
Release-notes: https://www.mozilla.org/en-US/firefox/138.0.4/releasenotes/
Security-advisory: https://www.mozilla.org/en-US/security/advisories/mfsa2025-36/
Fixes: CVE-2025-4920, CVE-2025-4921
(cherry picked from commit 6c01b61e60)
2025-05-18 11:23:53 +00:00
Sizhe Zhao
e6c8bfb62b firefox-unwrapped: 138.0.3 -> 138.0.4
Release-notes: https://www.mozilla.org/en-US/firefox/138.0.4/releasenotes/
Security-advisory: https://www.mozilla.org/en-US/security/advisories/mfsa2025-36/
Fixes: CVE-2025-4920, CVE-2025-4921
(cherry picked from commit 8d9cdf2f6c)
2025-05-18 11:23:53 +00:00
Atemu
1e1873f016 [Backport release-25.05] nixos/tests/vaultwarden: fix UI testing (#408121) 2025-05-18 13:06:59 +02:00
Atemu
6840462ad0 [Backport release-25.05] odyssey: fix build (#408324) 2025-05-18 12:51:44 +02:00
Atemu
aba0991370 [Backport release-25.05] monado: port vulkan headers bump compat fix (#408319) 2025-05-18 12:46:50 +02:00
Bu Kun
59764ed369 gnomeExtensions.arcmenu: 63 -> 65
(cherry picked from commit 880af66d0d)
2025-05-18 10:33:23 +00:00
alyaeanyx
a0dbe9449e odyssey: fix build
(cherry picked from commit a4bb668ee9)
2025-05-18 10:24:02 +00:00
Marcus Ramberg
a55b8b1cf7 cloudflare-warp: wrap warp-cli to fix browser opening
(cherry picked from commit 331d67aed2)
2025-05-18 10:23:36 +00:00
Atemu
59100184da [Backport release-25.05] salmon: add missing dependency (#408082) 2025-05-18 12:13:33 +02:00
Atemu
362ee73979 monado: port vulkan headers bump compat fix
(cherry picked from commit a026c010cd)
2025-05-18 10:13:19 +00:00
Atemu
73eeda0809 [Backport release-25.05] text-engine: 0.1.1 -> 0.1.1-unstable-2024-09-16 (#408034) 2025-05-18 12:13:14 +02:00
Atemu
5f2ee6fb08 [Backport release-25.05] nixosTests.curl-impersonate: skip failing test (#408091) 2025-05-18 12:09:59 +02:00
Aleksana
a53115afeb [Backport release-25.05] luminance: fix GSettings schemas (#408310) 2025-05-18 18:07:43 +08:00
Arne Keller
2add6d9950 [Backport release-25.05] trilium-server: fix build error (#408090) 2025-05-18 12:02:37 +02:00
Rishabh5321
17817436eb luminance: fix GSettings schemas
(cherry picked from commit 65fce93bbb)
2025-05-18 09:47:06 +00:00
Aleksana
6d152297e1 [Backport release-25.05] wivrn: patch monado to work with vulkan-headers >= 1.4.310 (#408306) 2025-05-18 17:44:24 +08:00
Aleksana
4eeec4c914 [Backport release-25.05] manticore: drop (#408282) 2025-05-18 17:36:42 +08:00
Aleksana
092c99a903 [Backport release-25.05] mapmap: drop (#408084) 2025-05-18 17:35:44 +08:00
Amadej Kastelic
94384e2b7e wivrn: remove usages of with
(cherry picked from commit c7366e9184)
2025-05-18 09:35:42 +00:00
Amadej Kastelic
4acf56d485 wivrn: patch monado to work with vulkan-headers >= 1.4.310
(cherry picked from commit 1aa6bf6f60)
2025-05-18 09:35:42 +00:00
Sizhe Zhao
c678f46ac1 google-chrome: fix com.google.Chrome.desktop
(cherry picked from commit 6759d61d8d)
2025-05-18 14:42:43 +05:30
Aleksana
4a8e70531c [Backport release-25.05] nightfox-gtk-theme: 0-unstable-2024-11-06 -> 0-unstable-2025-04-24 (#408181) 2025-05-18 16:41:33 +08:00
Aleksana
5ecb4d2bc4 [Backport release-25.05] tokyonight-gtk-theme: 0-unstable-2024-11-06 -> 0-unstable-2025-04-24 (#408180) 2025-05-18 16:35:59 +08:00
Aleksana
8557110d4f [Backport release-25.05] gruvbox-gtk-theme: 0-unstable-2024-11-06 -> 0-unstable-2025-04-24 (#408182) 2025-05-18 16:35:51 +08:00
Léana 江
ba69044785 manticore: drop
(cherry picked from commit abcbae3cfd)
2025-05-18 08:03:22 +00:00
Aleksana
70d033876c [Backport release-25.05] lutris: migrate to the new meson build system (#408279) 2025-05-18 15:57:57 +08:00
K900
b3c1949c16 [Backport release-25.05] Kernel updates for 2025-05-18 (#408281) 2025-05-18 10:43:43 +03:00
K900
07ed702f97 linux_5_15: 5.15.182 -> 5.15.183
(cherry picked from commit 35c0688fae)
2025-05-18 07:43:20 +00:00
K900
9127b92f91 linux_6_1: 6.1.138 -> 6.1.139
(cherry picked from commit 15b8679d3a)
2025-05-18 07:43:20 +00:00
K900
b2341e2739 linux_6_6: 6.6.90 -> 6.6.91
(cherry picked from commit 43a5b3934e)
2025-05-18 07:43:19 +00:00
K900
2f10b980ff linux_6_12: 6.12.28 -> 6.12.29
(cherry picked from commit 2c3f3560ce)
2025-05-18 07:43:19 +00:00
K900
c0a50f51b2 linux_6_14: 6.14.6 -> 6.14.7
(cherry picked from commit c03b00a6b1)
2025-05-18 07:43:19 +00:00
Skythrew
825b7da918 lutris: migrate to the new meson build system
This commit makes the Lutris package use the meson build system, which is more appropriate to build the desktop app.
Indeed, the meson build of Lutris is the only one supporting translations for the desktop app.
However, the presence of the Makefile at the source root is preventing the Nix build system from building the package with meson without overriding the different build phases.

(cherry picked from commit 44cdbd3481)
2025-05-18 07:42:48 +00:00
Jon Seager
a7cecb9ee5 [Backport release-25.05] snapcraft: make SSL certs available during tests (#408129) 2025-05-18 08:17:29 +02:00
Aleksana
32db0a56c7 [Backport release-25.05] debsigs: Add dependency 'ar' and fix path (#408243) 2025-05-18 12:40:23 +08:00
Aleksana
3a90f3e386 [Backport release-25.05] matrix-gtk-theme: 0-unstable-2024-11-06 -> 0-unstable-2025-05-06 (#408179) 2025-05-18 12:40:03 +08:00
Aleksana
bc6942be13 [Backport release-25.05] python3Packages.aiocache: disable time-sensitive tests (#408123) 2025-05-18 12:39:45 +08:00
Aleksana
346c065d05 [Backport release-25.05] shh: rev2 enhancements to path handling, manpages, shell-completion (#407853) 2025-05-18 12:39:14 +08:00
Aleksana
9b3da47873 [Backport release-25.05] python312Packages.roadlib: add missing inputs (#408170) 2025-05-18 12:38:46 +08:00
Peter Membrey
996d332cb7 Add dependency 'ar' and fix path
(cherry picked from commit 0f5c286263)
2025-05-18 04:33:24 +00:00
Aleksana
9065bac3a0 [Backport release-25.05] foliate: 3.2.1 -> 3.3.0 (#408240) 2025-05-18 12:28:30 +08:00
Aleksana
4b9db8d947 [Backport release-25.05] varia: 2025.1.24-1 -> 2025.4.22 (#407855) 2025-05-18 12:03:16 +08:00
R. Ryantm
7620586ee9 foliate: 3.2.1 -> 3.3.0
(cherry picked from commit b5ce85d8c6)
2025-05-18 04:02:57 +00:00
Leah Amelia Chen
75aaf7c003 fvwm2: fix build with GCC 14
ZHF #403336

(cherry picked from commit f3d97d0823)
2025-05-18 04:00:54 +00:00
Aleksana
43a4459b08 [Backport release-25.05] collision: 3.9.0 -> 3.10.0 (#408237) 2025-05-18 11:55:46 +08:00
Aleksana
00193d2b64 [Backport release-25.05] create-react-app: drop (#408235) 2025-05-18 11:55:35 +08:00
sund3RRR
421d714108 collision: 3.9.0 -> 3.10.0
(cherry picked from commit 03b7b645e8)
2025-05-18 03:42:01 +00:00
networkException
6e9a0f103a create-react-app: drop
This tool was only meant to create new projects and has
since been deprecated upstream.

(cherry picked from commit e3b9e54d07)
2025-05-18 03:40:59 +00:00
Bobby Rong
edd6cb2754 [Backport release-25.05] epiphany: Various Pantheon fixes (#408233) 2025-05-18 11:40:46 +08:00
Bobby Rong
53c646a0ab pantheon.elementary-gtk-theme: 8.2.0 -> 8.2.1
https://github.com/elementary/stylesheet/compare/8.2.0...8.2.1

Contains style fix for epiphany 48.

(cherry picked from commit 6906aed53d)
2025-05-18 03:29:04 +00:00
Bobby Rong
d7d0a2ec14 epiphany: Fix startup crash on Pantheon
* gdk_display_manager_get() was called before gtk_init()
* gtk_menu_button_set_icon_name: assertion 'GTK_IS_MENU_BUTTON (menu_button)' failed

(cherry picked from commit 353c718f02)
2025-05-18 03:29:04 +00:00
Bobby Rong
3279ff8d0f [Backport release-25.05] xfce.thunar: 4.20.2 -> 4.20.3 (#408231) 2025-05-18 11:26:08 +08:00
Bobby Rong
32e0688d7d xfce.thunar: 4.20.2 -> 4.20.3
https://gitlab.xfce.org/xfce/thunar/-/compare/thunar-4.20.2...thunar-4.20.3
(cherry picked from commit 9137c96a53)
2025-05-18 03:18:51 +00:00
Gaetan Lepage
33604d16e3 invidious: 2.20250504.0 -> 2.20250517.0
Diff:
https://github.com/iv-org/invidious/compare/v2.20250504.0...v2.20250517.0

Changelog:
https://github.com/iv-org/invidious/blob/v2.20250517.0/CHANGELOG.md
(cherry picked from commit 55245e62aa)
2025-05-18 02:16:27 +00:00
André Lima
0da5e3e7ed gnomeExtensions.applications-menu: fix GMenu import
(cherry picked from commit c77b9c5842)
2025-05-17 23:40:46 +00:00
R. Ryantm
04bb0fac08 gruvbox-gtk-theme: 0-unstable-2024-11-06 -> 0-unstable-2025-04-24
(cherry picked from commit 63b4c7ce84)
2025-05-17 22:44:34 +00:00
R. Ryantm
6b8960c961 nightfox-gtk-theme: 0-unstable-2024-11-06 -> 0-unstable-2025-04-24
(cherry picked from commit b88aca0a1b)
2025-05-17 22:42:53 +00:00
R. Ryantm
4974c03953 tokyonight-gtk-theme: 0-unstable-2024-11-06 -> 0-unstable-2025-04-24
(cherry picked from commit 3d8b9f46f2)
2025-05-17 22:41:12 +00:00
Antonio
b6243a22e8 matrix-gtk-theme: 0-unstable-2024-11-06 -> 0-unstable-2025-05-06
(cherry picked from commit 5c354a3e3d)
2025-05-17 22:39:25 +00:00
Fabian Affolter
863d9cde7b python313Packages.types-lxml: adjust inputs
(cherry picked from commit c8f871d2ba)
2025-05-17 22:24:41 +00:00
Fabian Affolter
d1a06ea3d8 python312Packages.roadlib: add missing inputs
(cherry picked from commit b5b0cecfd2)
2025-05-17 22:20:13 +00:00
Fabian Affolter
cba9b14a51 python312Packages.wheel-inspect: refactor
(cherry picked from commit b3bf51cbb6)
2025-05-17 22:20:02 +00:00
Fabian Affolter
e418f11159 python312Packages.wheel-filename: refactor
(cherry picked from commit 6e7d5974b8)
2025-05-17 22:20:02 +00:00
Fabian Affolter
f447135173 python313Packages.entry-points-txt: refactor
Fix build https://hydra.nixos.org/build/297428192

(cherry picked from commit d961728d54)
2025-05-17 22:20:02 +00:00
Emily
037f2c7692 [Backport release-25.05] maintainers: updated ohheyrj (#408157) 2025-05-17 22:51:47 +01:00
Richard Annand
a9591ff829 maintainers: updated ohheyrj
(cherry picked from commit d97b8fd33a)
2025-05-17 21:41:41 +00:00
Doron Behar
3d56ad5da4 [Backport release-25.05] gnomeExtensions.gsconnect: 58 -> 62 (#408116) 2025-05-18 00:40:11 +03:00
Florian Klink
b45b859d11 [Backport release-25.05] python3Packages.moderngl: fix context detection under NixOS (#408155) 2025-05-18 00:36:52 +03:00
Thomas Watson
1c82291cdd python3Packages.moderngl: fix context detection under NixOS
In certain situations moderngl will also try to directly load
`libGL.so`/`libEGL.so`, and fail to do so. Substitute a direct path like
in glcontext.

(cherry picked from commit f96b36ba52)
2025-05-17 21:36:26 +00:00
Wolfgang Walther
3a0323589f [Backport release-25.05] ci/eval/nix: 2.24 -> ... (#408130) 2025-05-17 21:28:12 +00:00
Wolfgang Walther
c00abe80e0 [Backport release-25.05] ci/eval/compare: manage the "by: package-maintainer" label (#408128) 2025-05-17 21:26:01 +00:00
Martin Weinelt
e96531fcf0 [Backport release-25.05] ty: init at 0.0.1-alpha.5 (#408145) 2025-05-17 23:24:48 +02:00
Wolfgang Walther
439253015c workflows/eval: fix process job with author id argument
(cherry picked from commit 57d8274118)
2025-05-17 23:17:04 +02:00
Benjamin Sparks
71666466ed ty: init at 0.0.1-alpha.5
(cherry picked from commit 73c6a4b92a)
2025-05-17 21:09:46 +00:00
Robert Hensing
b9176e15ca ci/nix: 2.24 -> 2.28
(cherry picked from commit 529143f3d7)
2025-05-17 20:54:30 +00:00
Leah Amelia Chen
4b8b2f3470 snapcraft: make SSL certs available during tests
See https://hydra.nixos.org/build/297090643/nixlog/2

ZHF #403336

(cherry picked from commit 7947814a84)
2025-05-17 20:52:49 +00:00
Winter
f478418afd ci/eval/compare: manage the "by: package-maintainer" label
While OfBorg is still adding these, it takes a much longer time to do so
compared to the eval action. Since we're adding rebuild labels, I think
it'd be nice to just do it within the eval action.

(cherry picked from commit d52066e2b1)
2025-05-17 20:49:33 +00:00
Ramses
ce3af7849d [Backport release-25.05] nixos/specialisation: escape and restrict specialisation names (#408069) 2025-05-17 22:39:49 +02:00
Sarah Clark
4a94acefba python3Packages.aiocache: disable time-sensitive tests on Darwin
(cherry picked from commit d78e808b41)
2025-05-17 20:34:14 +00:00
Sarah Clark
9d17e1645a python3Packages.aiocache: cleanup
(cherry picked from commit 5ac3330d26)
2025-05-17 20:34:14 +00:00
networkException
7cc7b7c639 nixos/tests/vaultwarden: fix UI testing
This patch fixes a failure in the Selenium UI testing
script by waiting for an element to be clickable.
This allows the Angular to render properly.

(cherry picked from commit 94e7e3f350)
2025-05-17 20:23:07 +00:00
R. Ryantm
7f28e17d96 gnomeExtensions.gsconnect: 58 -> 62
(cherry picked from commit 3cc678fad5)
2025-05-17 20:10:51 +00:00
Winter
4a4ef96bf6 [Backport release-25.05] nixos/profiles/nix-builder-vm: allow the system derivation to be substituted (#408109) 2025-05-17 16:10:31 -04:00
Sefa Eyeoglu
ea72416d06 [Backport release-25.05] audiobookshelf: 2.21.0 -> 2.23.0 (#408112) 2025-05-17 22:01:39 +02:00
Adam C. Stephens
18867496f1 audiobookshelf: 2.21.0 -> 2.23.0
https://github.com/advplyr/audiobookshelf/releases/tag/v2.22.0
https://github.com/advplyr/audiobookshelf/releases/tag/v2.23.0
(cherry picked from commit 3a1ff730b0)
2025-05-17 19:50:23 +00:00
Winter
258dca1e95 nixos/profiles/nix-builder-vm: allow the system derivation to be substituted
Consider a user wanting to set up the Linux builder for the first time,
but with a slightly more generous allocation of resources compared to
the default. They'll do something like this:

```
{
  virtualisation.cores = 3;
  virtualisation.darwin-builder = {
    diskSize = 40 * 1024;
    memorySize = 4 * 1024;
  };
}
```

This will fail with an error like this:

```
error: a 'aarch64-linux' with features {} is required to build '/nix/store/3acpgmwqwnk8g2gc5r05ar2lvmn01b8a-builder.pl.drv', but I am a 'aarch64-darwin' with features {apple-virt, benchmark, big-parallel, nixos-test}
```

But why would they have to rebuild the NixOS system?! All they did was
change the arguments passed to QEMU, and nothing those options control
would affect the NixOS configuration itself... right?

`config.system.build.toplevel` is defined with `allowSubstitutes` set to
`false` by default, which makes it so that the toplevel can't be
substituted if Nix is trying to use it "directly." So because the above
example would have to rebuild the VM runner, which references toplevel
directly, Nix refuses to substitute it, unless `always-allow-substitutes
= true` is set as a Nix option. (In the case where the QEMU options
aren't changed at all, Nix just substitutes the runner, which sidesteps
this issue as the runner itself doesn't use toplevel as an input.)

(cherry picked from commit 747c55e702)
2025-05-17 19:40:59 +00:00
emilylange
28d804e625 nixosTests.curl-impersonate: skip failing test
We use a NixOS VM test to execute the upstream tests of curl-impersonate
because they require networking which cannot be mocked easily in the
sandbox.

Of those upstream tests, test_http2_headers spawns nghttpd2, makes
request against it and then tries to parse the logs it emits.
The last step, the parsing of the logs, it extremely fragile and version
dependent. The version of nghttp2 that we carry in nixpkgs is newer than
the one curl-impersonate expects and happens to emit a different log
format.

So to fix the remaining test suite of curl-impersonate, we simply skip
test_http2_headers.

(cherry picked from commit 9266b72424)
2025-05-17 18:40:03 +00:00
Tim Häring
f103e4d695 trilium-server: fix build error
(cherry picked from commit 6e89b5e133)
2025-05-17 18:39:47 +00:00
Martin Weinelt
b7e752c7d9 [Backport release-25.05] evcc: 0.203.5 -> 0.203.6 (#408064) 2025-05-17 20:36:01 +02:00
alyaeanyx
798cf818e8 mapmap: drop
mapmap has been unmaintained for 5 years now, see
https://github.com/mapmapteam/mapmap/blob/develop/README.md.

(cherry picked from commit 15b37c923b)
2025-05-17 18:14:50 +00:00
alyaeanyx
54fd57b389 tilda: fix build
Upstream manually sets the standard to c99 in configure.ac, which makes
the popen and pclose invocations in src/tilda-lock-files.c produce
implicit function declaration errors.

(cherry picked from commit c97f91a5a2)
2025-05-17 18:14:03 +00:00
alyaeanyx
1f0aee9898 salmon: add missing dependency
(cherry picked from commit 21e92ded99)
2025-05-17 18:13:37 +00:00
Wolfgang Walther
442582e6d6 [25.05] workflows/periodic-merge: set custom name for haskell-updates merge (#408072) 2025-05-17 18:09:47 +00:00
Toma
cfc86d51a8 [Backport release-25.05] cinny-desktop: make more dependencies optional, don't double wrap binary (#407852) 2025-05-17 20:09:22 +02:00
Jan Tojnar
189c412728 webkitgtk_6_0: 2.48.1 → 2.48.2
https://github.com/WebKit/WebKit/compare/webkitgtk-2.48.1...webkitgtk-2.48.2
https://webkitgtk.org/2025/05/14/webkitgtk2.48.2-released.html
https://webkitgtk.org/security/WSA-2025-0004.html

CVE-2025-24223, CVE-2025-31204, CVE-2025-31205, CVE-2025-31206, CVE-2025-31215, CVE-2025-31257

(cherry picked from commit dfcb90fcf3)
2025-05-17 18:07:24 +00:00
Yohann Boniface
86dcfbbe9d [Backport release-25.05] pngnq: fix with gcc 14 (#408055) 2025-05-17 20:06:05 +02:00
Toma
73e46c9a84 [Backport release-25.05] rPackages: fix meta.homepage for packages in BiocAnn and BiocExp (#408075) 2025-05-17 20:05:18 +02:00
TomaSajt
13df3e2636 rPackages: fix meta.homepage for packages in BiocAnn and BiocExp
(cherry picked from commit cb44e8f36e)
2025-05-17 18:01:02 +00:00
Wolfgang Walther
8a0d495c13 [Backport release-25.05] ci/eval: allow configuration of the system to eval attrpaths on (#408070) 2025-05-17 17:57:11 +00:00
Wolfgang Walther
442a9a811e workflows/periodic-merge: set custom name for haskell-updates merge
The simple name can lead to confusion. Adding an explicit override to
make it more clear.

(cherry picked from commit 38169112e8)
2025-05-17 19:54:48 +02:00
Maciej Krüger
37f4d53822 [Backport release-25.05] wayfarer: 1.2.4 -> 1.2.4-unstable-2025-04-12 (#408067) 2025-05-17 19:53:11 +02:00
Winter
f309fef2f3 ci/eval: allow configuration of the system to eval attrpaths on
Right now, there are some paths that don't even get exposed to certain
systems (notably Darwin, but some outliers exist for Linux such as the
Darwin-specific Hackage overlay) for one reason or another, usually
because of assertions like `stdenv.isLinux`. To catch these scenarios,
this change implements a way to specify the system to evaluate attrpaths
on, and makes it default to the system that we're evaluating outpaths
for.

(cherry picked from commit 6b18b3d67b)
2025-05-17 17:50:02 +00:00
toborwinner
1b2b3e1ea2 nixos/specialisation: escape and restrict specialisation names
Prevent the specialisation names from containing a forward slash.
Also escape them to allow for spaces in specialisation names.

(cherry picked from commit 2b9fc0ccc5)
2025-05-17 17:48:07 +00:00
Maciej Krüger
27d999ea28 wayfarer: 1.2.4 -> 1.2.4-unstable-2025-04-12
This fixes the package build

(cherry picked from commit 5e15dfdd56)
2025-05-17 17:46:20 +00:00
Martin Weinelt
ac2a1462ea evcc: 0.203.5 -> 0.203.6
https://github.com/evcc-io/evcc/releases/tag/0.203.6
(cherry picked from commit c3954750dd)
2025-05-17 17:36:06 +00:00
R. Ryantm
79071dda94 notmuch-mailmover: 0.6.0 -> 0.7.0
(cherry picked from commit 99655ad7a5)
2025-05-17 17:35:29 +00:00
Grimmauld
aed40c740f pngnq: fix with gcc 14
Various includes are missing.
The zlib include was being patched in before.
The string include is now needed with gcc 14.

(cherry picked from commit f433407a68)
2025-05-17 17:23:37 +00:00
Pavel Sobolev
1201bb64c9 text-engine: remove the json-glib dependency
(cherry picked from commit 25ba6fc463)
2025-05-17 16:06:56 +00:00
Pavel Sobolev
8c7b1e5274 text-engine: 0.1.1 -> 0.1.1-unstable-2024-09-16
(cherry picked from commit 81da8104df)
2025-05-17 16:06:56 +00:00
Pavel Sobolev
221000ded9 text-engine: refactor
(cherry picked from commit 9ba7647102)
2025-05-17 16:06:56 +00:00
Niklas Korz
dba3461752 [Backport release-25.05] scummvm: fix aarch64-darwin ranlib path (#408023) 2025-05-17 17:45:09 +02:00
Emily
06d4b5774d [Backport release-25.05] sourcehut.*: update (#408022) 2025-05-17 17:42:24 +02:00
ash
de09ce1ab6 nixos/doc/rl-2505: Fix wording of users.users subuid allocation note
Co-authored-by: Leona Maroni <dev@leona.is>
(cherry picked from commit 75097de8fb)
2025-05-17 15:36:40 +00:00
Niklas Korz
cd972b65cc scummvm: fix aarch64-darwin ranlib path
(cherry picked from commit a0d202cd8d)
2025-05-17 15:35:58 +00:00
Marcin Serwin
f4668fe0d4 nixos/sourcehut: adapt to new versions
(cherry picked from commit fa148f9b48)
2025-05-17 15:34:17 +00:00
Marcin Serwin
2670b88ba9 srht-gen-oauth-tok: fix html parsing
(cherry picked from commit ea5a3a6d7e)
2025-05-17 15:34:17 +00:00
Marcin Serwin
469317e669 sourcehut.*: use latest sqlalchemy
(cherry picked from commit 1a3b8285af)
2025-05-17 15:34:17 +00:00
Marcin Serwin
95b5581067 sourcehut.todosrht: 0.75.10 -> 0.77.5
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit 8ade1de14b)
2025-05-17 15:34:17 +00:00
Marcin Serwin
2d62b4567b sourcehut.pastesrht: 0.15.4 -> 0.16.1
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit 11aa859305)
2025-05-17 15:34:17 +00:00
Marcin Serwin
8e03048ed3 sourcehut.pagessrht: 0.15.7 -> 0.16.0
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
(cherry picked from commit aa9753baab)
2025-05-17 15:34:17 +00:00
Marcin Serwin
b42dae80f9 sourcehut.metasrht: 0.69.8 -> 0.72.11
(cherry picked from commit 83b3f1d98c)
2025-05-17 15:34:17 +00:00
Marcin Serwin
2caf79ffc1 sourcehut.mansrht: 0.16.5 -> 0.18.1
(cherry picked from commit 0b0a6d144c)
2025-05-17 15:34:17 +00:00
Marcin Serwin
8d5cacf26f sourcehut.listssrht: 0.57.18 -> 0.62.3
(cherry picked from commit b0fdbb362b)
2025-05-17 15:34:17 +00:00
Marcin Serwin
8a3d510d32 sourcehut.hubsrht: 0.17.7 -> 0.20.2
(cherry picked from commit 84bc40a9a4)
2025-05-17 15:34:17 +00:00
Marcin Serwin
634f3f2059 sourcehut.hgsrht: 0.33.0 -> 0.36.1
(cherry picked from commit b23f4dd3c9)
2025-05-17 15:34:17 +00:00
Marcin Serwin
9ea57dd778 sourcehut.gitsrht: 0.85.9 -> 0.88.10
(cherry picked from commit 2200d55432)
2025-05-17 15:34:17 +00:00
Marcin Serwin
4854c2116d sourcehut.buildsrht: 0.89.15 -> 0.95.1
(cherry picked from commit a7e194630a)
2025-05-17 15:34:17 +00:00
Marcin Serwin
b92803f39b sourcehut.scmsrht: 0.22.24 -> 0.22.28
(cherry picked from commit 4c1ad38c74)
2025-05-17 15:34:17 +00:00
Marcin Serwin
00b283d297 sourcehut.srht: 0.71.8 -> 0.76.1
(cherry picked from commit 522711a2c6)
2025-05-17 15:34:16 +00:00
Aleksana
56787b8952 [Backport release-25.05] cde: drop (#408005) 2025-05-17 23:23:37 +08:00
Niklas Korz
3dafab35ed [Backport release-25.05] shibboleth-sp: fix build for Clang >=19 (#407999) 2025-05-17 17:06:40 +02:00
Niklas Korz
72e7dda22d [Backport release-25.05] xalanc: fix Clang 19 and GCC 15 compat (#408003) 2025-05-17 17:04:02 +02:00
Leona Maroni
cfeb72ebc0 cde: drop
Unmaintained for 7 years and broken

(cherry picked from commit 8bc90bcf87)
2025-05-17 14:59:24 +00:00
Niklas Korz
3adc481229 xalanc: fix Clang 19 and GCC 15 compat
(cherry picked from commit 3714001525)
2025-05-17 14:50:50 +00:00
Aleksana
d21ae91816 [25.05] axmldec: mark as broken (#407987) 2025-05-17 22:46:24 +08:00
Benjamin Sparks
dee1799775 shibboleth-sp: fix build for Clang >=19
(cherry picked from commit 4060d5dab7)
2025-05-17 14:45:58 +00:00
Atemu
00082e69e4 [25.05] dbench: mark as broken (#407955) 2025-05-17 16:42:02 +02:00
K900
32f63121a6 [Backport release-25.05] sgrep: drop (#407994) 2025-05-17 17:37:21 +03:00
K900
3865a29a02 [Backport release-25.05] quickbms: drop (#407995) 2025-05-17 17:37:14 +03:00
Benjamin Sparks
97ca458d08 quickbms: drop
(cherry picked from commit 8e888153c6)
2025-05-17 14:36:24 +00:00
Grimmauld
12ade8b9db sgrep: drop
Fails to build with gcc 14 and unmaintained upstream since 1998 [1].

[1] https://www.cs.helsinki.fi/u/jjaakkol/sgrep.html

(cherry picked from commit a160a4c3f9)
2025-05-17 14:36:13 +00:00
Thomas Gerbet
93a889a660 [Backport release-25.05] directvnc: drop (#407934) 2025-05-17 16:33:00 +02:00
Thomas Gerbet
58035462d6 [Backport release-25.05] suidChroot: drop (#407973) 2025-05-17 16:30:44 +02:00
Leona Maroni
5f4e6b02dc axmldec: mark as broken 2025-05-17 16:21:20 +02:00
Martin Weinelt
d20e3f7dbe [Backport release-25.05] kea: disable on darwin (#407946) 2025-05-17 16:18:37 +02:00
Aleksana
d79b77d84f [25.05] python3Packages.push-receiver: mark as broken (#407876) 2025-05-17 22:13:44 +08:00
Aleksana
a10ad4e3d3 afpfs-ng: mark as broken (#407971) 2025-05-17 22:12:17 +08:00
Atemu
16ceb9fce5 [Backport release-25.05] perl540Packages.SDL: fix build (#407894) 2025-05-17 16:03:05 +02:00
Atemu
889b6a5435 [Backport release-25.05] dd_rescue: 1.99.8 -> 1.99.21 (#407909) 2025-05-17 16:02:42 +02:00
isabel
68513a31af [Backport release-25.05] moonlight: 1.3.18 -> 1.3.19 (#407921) 2025-05-17 15:01:42 +01:00
Aleksana
8236f51965 [Backport release-25.05] evolution-ews: fix patch compiler errors (#407976) 2025-05-17 22:00:34 +08:00
Marcel
ce52733508 evolution-ews: fix patch compiler errors
/build/evolution-ews-3.56.1/src/common/e-ews-common-utils.c:211:13: error: 'true' undeclared (first use in this function)
  211 |         if (true) {
      |             ^~~~
/build/evolution-ews-3.56.1/src/common/e-ews-common-utils.c:15:1: note: 'true' is defined in header '<stdbool.h>'; this is probably fixable by adding '#include <stdbool.h>'
   14 | #include "e-ews-common-utils.h"
  +++ |+#include <stdbool.h>
   15 |
/build/evolution-ews-3.56.1/src/common/e-ews-common-utils.c:211:13: note: each undeclared identifier is reported only once for each function it appears in
  211 |         if (true) {
      |             ^~~~

(cherry picked from commit 7128c9546c)
2025-05-17 13:53:40 +00:00
Grimmauld
073a01ae10 suidChroot: drop
The package fails to build with gcc 14.
It has neither maintainer nor homepage link in nixpkgs.
The last commit specifically interacting with `suidChroot` was in 2017,
the last update was in 2015. With no linked repository and no maintenance,
the security of something claiming to be a "Setuid-safe wrapper for chroot" is questionable at best.

(cherry picked from commit 2e6bfdc649)
2025-05-17 13:47:47 +00:00
Leona Maroni
52cc1868e5 afpfs-ng: mark as broken 2025-05-17 15:43:13 +02:00
Leah Amelia Chen
b020a8478b [25.05] libgadu: mark as broken
See #407956
2025-05-17 15:35:04 +02:00
Leona Maroni
d5b2098f59 [Backport release-25.05] python3Packages.pybullet: fix build with GCC 14 (#407893) 2025-05-17 15:29:03 +02:00
Leona Maroni
edbd478b0a dbench: mark as broken 2025-05-17 15:21:40 +02:00
Martin Weinelt
36d055248b [Backport release-25.05] python313Packages.asyncinotify: mark unsupported on darwin (#407940) 2025-05-17 15:08:54 +02:00
Martin Weinelt
b447384d85 [Backport release-25.05] python313Packages.shiboken2: mark broken (#407939) 2025-05-17 15:08:41 +02:00
Martin Weinelt
e2c60e829d [Backport release-25.05] python313Packages.piper-phonemize: fix aarch64-linux build (#407944) 2025-05-17 15:08:06 +02:00
Martin Weinelt
945102941c [Backport release-25.05] python3Packages.slimit: drop (#407942) 2025-05-17 15:08:02 +02:00
Martin Weinelt
ae7af68d65 kea: disable on darwin
Build failure since 2024-12 and I lack interest in debugging this for darwin.

(cherry picked from commit 198377e966)
2025-05-17 13:05:06 +00:00
Adam C. Stephens
88e3cc15e4 [Backport release-25.05] kanidm: add darwin support (#407936) 2025-05-17 09:03:31 -04:00
Martin Weinelt
3e314101b8 python313Packages.piper-phonemize: fix aarch64-linux build
While in the sandbox calls into onnxruntime lead to a coredump.

(cherry picked from commit 5cb66f8889)
2025-05-17 12:59:06 +00:00
Martin Weinelt
0b5b6315dd python3Packages.slimit: drop
(cherry picked from commit 9997a44ddb)
2025-05-17 12:58:52 +00:00
Martin Weinelt
d0b619bf50 pretix: drop dependency on slimit
Was removed some time after 2024.10.

(cherry picked from commit 78029e12b4)
2025-05-17 12:58:52 +00:00
Martin Weinelt
bcbcf2931e python313Packages.vat-moss: disable
Uses the dead and removed cgi battery.

(cherry picked from commit 6fc2efa54e)
2025-05-17 12:58:43 +00:00
Martin Weinelt
3462f52ced python313Packages.asyncinotify: mark unsupported on darwin
```
Check whether the following modules can be imported: asyncinotify
Traceback (most recent call last):
  File "<string>", line 1, in <module>
  File "<string>", line 1, in <lambda>
  File "/nix/store/vfdk6q81hdjqjfiqz8f92hibdck3kmn6-python3-3.12.10/lib/python3.12/importlib/__init__.py", line 90, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "<frozen importlib._bootstrap>", line 1387, in _gcd_import
  File "<frozen importlib._bootstrap>", line 1360, in _find_and_load
  File "<frozen importlib._bootstrap>", line 1331, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 935, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 999, in exec_module
  File "<frozen importlib._bootstrap>", line 488, in _call_with_frames_removed
  File "/nix/store/bk44appr4dabadspjahk3l0ad29vhq8s-python3.12-asyncinotify-4.2.0/lib/python3.12/site-packages/asyncinotify/__init__.py", line 23, in <module>
    from . import _ffi
  File "/nix/store/bk44appr4dabadspjahk3l0ad29vhq8s-python3.12-asyncinotify-4.2.0/lib/python3.12/site-packages/asyncinotify/_ffi.py", line 36, in <module>
    libc.inotify_init.restype = check_return
    ^^^^^^^^^^^^^^^^^
  File "/nix/store/vfdk6q81hdjqjfiqz8f92hibdck3kmn6-python3-3.12.10/lib/python3.12/ctypes/__init__.py", line 392, in __getattr__
    func = self.__getitem__(name)
           ^^^^^^^^^^^^^^^^^^^^^^
  File "/nix/store/vfdk6q81hdjqjfiqz8f92hibdck3kmn6-python3-3.12.10/lib/python3.12/ctypes/__init__.py", line 397, in __getitem__
    func = self._FuncPtr((name_or_ordinal, self))
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AttributeError: dlsym(0x3312f2768, inotify_init): symbol not found
```

(cherry picked from commit 4ca073a957)
2025-05-17 12:58:21 +00:00
Grimmauld
83febaa04d python313Packages.shiboken2: mark broken
The package uses `mkDerivation`+`toPythonModule` in python packages.
This means `disabled` is not an option.

The package already shouldn't work on py 3.12 as per compatibility matrix [1].
While it might be possible to patch this *again*, this poackage is currently a complete mess.

[1] https://wiki.qt.io/Qt_for_Python#Python_compatibility_matrix

(cherry picked from commit 76627c2d55)
2025-05-17 12:57:45 +00:00
Will Gordon
47553f9561 kanidm: add darwin support
Supersedes #402699

(cherry picked from commit 054554bad7)
2025-05-17 12:51:52 +00:00
Grimmauld
ba4dd403c8 directvnc: drop
The package was unmaintained upstream since 2015.
Apart from questionable security (it does not support VNC passwords and is dead upstream),
the build also started to fail since gcc 14.

(cherry picked from commit 529f5be0f6)
2025-05-17 12:51:12 +00:00
Thomas Gerbet
ba44c1f5e5 [Backport release-25.05] brave: 1.78.97 -> 1.78.102 (#407918) 2025-05-17 14:38:23 +02:00
R. Ryantm
3a8de38c27 moonlight: 1.3.18 -> 1.3.19
(cherry picked from commit b94c5fe954)
2025-05-17 12:26:38 +00:00
Sean Buckley
136a017b43 brave: 1.78.97 -> 1.78.102
https://community.brave.com/t/release-channel-1-78-102/618564
(cherry picked from commit 4f97041463)
2025-05-17 12:21:16 +00:00
Martin Weinelt
98b4902624 [Backport release-25.05] home-assistant: 2025.5.1 -> 2025.5.2 (#407841) 2025-05-17 14:04:28 +02:00
Felix Singer
1ba318392e dd_rescue: Set mainProgram to dd_rescue
Signed-off-by: Felix Singer <felixsinger@posteo.net>
(cherry picked from commit 8bf69f4279)
2025-05-17 12:02:50 +00:00
Felix Singer
e9b53bec00 dd_rescue: 1.99.8 -> 1.99.21
Signed-off-by: Felix Singer <felixsinger@posteo.net>
(cherry picked from commit 4fdf69a925)
2025-05-17 12:02:50 +00:00
Grimmauld
e87581acf1 perl540Packages.SDL: fix build
(cherry picked from commit 308a79daab)
2025-05-17 11:11:40 +00:00
Leona Maroni
a94224f33b python3Packages.pybullet: fix build with GCC 14
(cherry picked from commit 295c2bd762)
2025-05-17 11:10:13 +00:00
Aleksana
17f6409a25 [Backport release-25.05] plattenalbum: 2.2.2 -> 2.3.0 (#407864) 2025-05-17 18:18:10 +08:00
Leona Maroni
310d0a163f python3Packages.push-receiver: mark as broken
Issues with protobuf and unmaintained
2025-05-17 12:11:28 +02:00
Martin Weinelt
bd38d2998f [Backport release-25.05] acme: Add csr option (#407854) 2025-05-17 12:10:15 +02:00
Aleksana
47bcfa9279 [Backport release-25.05] curtail: 1.12.0 -> 1.13.0 (#407860) 2025-05-17 17:42:21 +08:00
Aleksana
4098c920bd [Backport release-25.05] ascii-draw: 1.0.0 -> 1.1.0 (#407859) 2025-05-17 17:42:06 +08:00
R. Ryantm
0863c4697f plattenalbum: 2.2.2 -> 2.3.0
(cherry picked from commit c74c886dfd)
2025-05-17 09:38:52 +00:00
R. Ryantm
4bc4ab8a6f fflogs: 8.17.1 -> 8.17.13
(cherry picked from commit 79053f72f4)
2025-05-17 09:36:48 +00:00
R. Ryantm
c7a91607c5 curtail: 1.12.0 -> 1.13.0
(cherry picked from commit 9e08cce04f)
2025-05-17 09:36:20 +00:00
R. Ryantm
714187085b ascii-draw: 1.0.0 -> 1.1.0
(cherry picked from commit d7b9252836)
2025-05-17 09:33:13 +00:00
R. Ryantm
ba0e6ff45d varia: 2025.1.24-1 -> 2025.4.22
(cherry picked from commit 9ea1f044a1)
2025-05-17 09:26:41 +00:00
Lucas Savva
1531a60f75 doc/rl-2505: relnote security.acme changes
(cherry picked from commit 123d134411)
2025-05-17 09:24:50 +00:00
Lucas Savva
6077ac74ae nixos/tests/acme: Add CSR test
(cherry picked from commit eeaa42f670)
2025-05-17 09:24:49 +00:00
C0D3 M4513R
dcc7993ccc acme: Add csr option
Signed-off-by: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com>
(cherry picked from commit 754412b4ae)
2025-05-17 09:24:49 +00:00
Aleksana
848e7b5ee8 [Backport release-25.05] musl-obstack: fix build on darwin (#407846) 2025-05-17 17:18:14 +08:00
Aleksana
5fca624091 [Backport release-25.05] doc/tauri: fix example, make openssl linux-only (#407849) 2025-05-17 17:18:00 +08:00
Aleksana
da83cd318a [Backport release-25.05] whipper: add mainProgram (#407848) 2025-05-17 17:08:50 +08:00
Aleksana
5e1337458e [Backport release-25.05] wayland: Remove meta.mainProgram (#407847) 2025-05-17 17:08:45 +08:00
kuflierl
975f283ba1 shh: rev2 switch to upstreamed patches for strace path fixing, clean up check patch, enable manpages and autocomplete with upstream patches,
update script, make cross-compile possible, make docgen feature and generation optional, add changelog

Signed-off-by: kuflierl <41301536+kuflierl@users.noreply.github.com>
(cherry picked from commit 3dc449dadb)
2025-05-17 09:08:43 +00:00
TomaSajt
fdb1dfbfe6 cinny-desktop: make more dependencies optional, don't double wrap binary
(cherry picked from commit bdefe3b4c3)
2025-05-17 09:08:32 +00:00
Aleksana
34a4af7373 [Backport release-25.05] feishu: add mainProgram (#407845) 2025-05-17 17:08:21 +08:00
Niko Cantero
b280fd97dc matrix-continuwuity: init at 0.5.0-rc.5; nixos/matrix-continuwuity: init
(cherry picked from commit c878ad10fb)
2025-05-17 09:05:49 +00:00
TomaSajt
a105a3b79e doc/tauri: fix example, make openssl linux-only
(cherry picked from commit 0605191248)
2025-05-17 09:04:41 +00:00
Robert Helgesson
0e672d7f1e whipper: add mainProgram
(cherry picked from commit 3e7e1fec67)
2025-05-17 09:04:20 +00:00
Jan Tojnar
04d53b3712 wayland: Remove meta.mainProgram
This has been missed in 921bd99f8d,
when that binary has been split out into an eponymous package.
The package does not contain any executable programs any more.

(cherry picked from commit ba6e8ff3d8)
2025-05-17 09:04:09 +00:00
usertam
2e754a054d musl-obstack: fix build on darwin
(cherry picked from commit dc44a14cd0)
2025-05-17 09:03:57 +00:00
wxt
e1da2e7d9c feishu: add mainProgram
(cherry picked from commit cb441dc8d7)
2025-05-17 09:03:45 +00:00
Martin Weinelt
49521440ea home-assistant.python.pkgs.pytest-homeassistant-custom-component: 0.13.244 -> 0.13.245
https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/refs/tags/0.13.245/CHANGELOG.md
(cherry picked from commit c07e0efd57)
2025-05-17 08:39:39 +00:00
Martin Weinelt
f2fae4bdb8 python313Packages.homeassistant-stubs: 2025.5.1 -> 2025.5.2
https://github.com/KapJI/homeassistant-stubs/releases/tag/2025.5.2
(cherry picked from commit 65d68f45ff)
2025-05-17 08:39:39 +00:00
Martin Weinelt
04909f870d home-assistant: 2025.5.1 -> 2025.5.2
https://github.com/home-assistant/core/releases/tag/2025.5.2
(cherry picked from commit 894d4bc710)
2025-05-17 08:39:39 +00:00
Martin Weinelt
ee4720152f python313Packages.aiodiscover: 2.6.1 -> 2.7.0
https://github.com/bdraco/aiodiscover/releases/tag/v2.7.0
(cherry picked from commit 87b22feba5)
2025-05-17 08:39:39 +00:00
Martin Weinelt
ffac217f45 python313Packages.pysmartthings: 3.2.1 -> 3.2.2
https://github.com/andrewsayre/pysmartthings/releases/tag/v3.2.2
(cherry picked from commit e0d0b2a61b)
2025-05-17 08:39:39 +00:00
Martin Weinelt
3854de6082 python313Packages.pysensibo: 1.1.0 -> 1.2.1
https://github.com/andrey-git/pysensibo/releases/tag/1.2.1
(cherry picked from commit 84d103f9ff)
2025-05-17 08:39:39 +00:00
Martin Weinelt
47694cb024 python313Packages.ical: 9.2.2 -> 9.2.4
https://github.com/allenporter/ical/releases/tag/9.2.4
(cherry picked from commit bad00c9ec5)
2025-05-17 08:39:38 +00:00
Martin Weinelt
488ba64069 python313Packages.deebot-client: 13.1.0 -> 13.2.0
https://github.com/DeebotUniverse/client.py/releases/tag/13.2.0
(cherry picked from commit efe860c6d7)
2025-05-17 08:39:38 +00:00
SchweGELBin
6a66795c9b mautrix-whatsapp: 0.12.0 -> 0.12.1
(cherry picked from commit 5cdb6e4c63)
2025-05-17 08:10:30 +00:00
Arne Keller
2a41154f7a [Backport release-25.05] memos: 0.13.2 -> 0.24.2, move to by-name, adopt (#407826) 2025-05-17 09:14:51 +02:00
kuflierl
3f3d22a7cc memos: 0.13.2 -> 0.24.2, move to by-name, adopt
special thanks to @tecosaur for https://github.com/NixOS/nixpkgs/issues/257131#issuecomment-2643372737, which i used as inspiration for my changes

Co-authored-by: TEC <git@tecosaur.net>
(cherry picked from commit 29373c41f0)
2025-05-17 06:56:10 +00:00
Sarah Clark
3d5992de65 tftui: accept posthog 4
(cherry picked from commit 6174410ae7)
2025-05-16 23:47:44 +00:00
Wolfgang Walther
2e1496bf86 [Backport release-25.05] postgresqlPackages.pg_tle: 1.5.0 -> 1.5.1 (#407723) 2025-05-16 20:51:46 +00:00
R. Ryantm
3fc0ab1767 postgresqlPackages.pg_tle: 1.5.0 -> 1.5.1
(cherry picked from commit 6b52d2e642)
2025-05-16 20:26:49 +00:00
SchweGELBin
e87fc3bfc3 libsignal-ffi: 0.70.0 -> 0.72.1
(cherry picked from commit 9fc2679779)
2025-05-16 19:33:41 +00:00
SchweGELBin
2ff29b5d1f mautrix-signal: 0.8.2 -> 0.8.3
(cherry picked from commit 7ba3fb2cd0)
2025-05-16 19:33:41 +00:00
Mynacol
3bdadfe65b kexec-tools: Set meta.mainProgram to kexec
(cherry picked from commit cb8dcb7793)
2025-05-16 21:23:17 +02:00
Wolfgang Walther
f9e2fbc96b [Backport release-25.05] haskellPackages.postgres-websockets: fix at run-time (#407709) 2025-05-16 19:20:54 +00:00
Wolfgang Walther
1682a0cf73 haskellPackages.postgres-websockets: fix at run-time
Reason for the failure is still unclear and it was not possible to
reproduce outside nixpkgs, yet.

https://github.com/diogob/postgres-websockets/pull/101#issuecomment-2881016449
(cherry picked from commit 4e216d5059)
2025-05-16 19:10:00 +00:00
Vladimír Čunát
c46c1bbaef thunderbird: fix calendar again after icu77 switch (#407684) 2025-05-16 19:49:14 +02:00
Leona Maroni
abf9d678aa beta release 2025-05-16 19:04:43 +02:00
5247 changed files with 119896 additions and 104242 deletions

View File

@@ -266,6 +266,3 @@ a034fb50f79816c6738fb48b48503b09ea3b0132
# treewide: switch instances of lib.teams.*.members to the new meta.teams attribute
05580f4b4433fda48fff30f60dfd303d6ee05d21
# nixos/redmine: Get rid of global lib expansions
d7f1102f04c58b2edfc74c9a1d577e3aebfca775

View File

@@ -34,9 +34,9 @@ body:
> If you are using an older version, please update to the latest stable version and check if the issue persists before continuing this bug report.
options:
- "Please select a version."
- "- Unstable (25.11)"
- "- Stable (25.05)"
- "- Previous Stable (24.11)"
- "- Unstable (25.05)"
- "- Stable (24.11)"
- "- Previous Stable (24.05)"
default: 0
validations:
required: true

View File

@@ -34,9 +34,9 @@ body:
> If you are using an older version, please update to the latest stable version and check if the issue persists before continuing this bug report.
options:
- "Please select a version."
- "- Unstable (25.11)"
- "- Stable (25.05)"
- "- Previous Stable (24.11)"
- "- Unstable (25.05)"
- "- Stable (24.11)"
- "- Previous Stable (24.05)"
default: 0
validations:
required: true

View File

@@ -34,9 +34,9 @@ body:
> If you are using an older version, please [update to the latest stable version](https://nixos.org/download) and check if the issue persists before continuing this bug report.
options:
- "Please select a version."
- "- Unstable (25.11)"
- "- Stable (25.05)"
- "- Previous Stable (24.11)"
- "- Unstable (25.05)"
- "- Stable (24.11)"
- "- Previous Stable (24.05)"
default: 0
validations:
required: true

View File

@@ -35,9 +35,9 @@ body:
> If you are purposefully trying to build an ancient version of a package in an older Nixpkgs, please coordinate with the [NixOS Archivists](https://matrix.to/#/#archivists:nixos.org).
options:
- "Please select a version."
- "- Unstable (25.11)"
- "- Stable (25.05)"
- "- Previous Stable (24.11)"
- "- Unstable (25.05)"
- "- Stable (24.11)"
- "- Previous Stable (24.05)"
default: 0
validations:
required: true

View File

@@ -35,9 +35,9 @@ body:
> If the package has been updated in unstable, but you believe the update should be backported to the stable release of Nixpkgs, please file the '**Request: backport to stable**' form instead.
options:
- "Please select a version."
- "- Unstable (25.11)"
- "- Stable (25.05)"
- "- Previous Stable (24.11)"
- "- Unstable (25.05)"
- "- Stable (24.11)"
- "- Previous Stable (24.05)"
default: 0
validations:
required: true

View File

@@ -34,9 +34,9 @@ body:
> If you are using an older or stable version, please update to the latest **unstable** version and check if the module still does not exist before continuing this request.
options:
- "Please select a version."
- "- Unstable (25.11)"
- "- Stable (25.05)"
- "- Previous Stable (24.11)"
- "- Unstable (25.05)"
- "- Stable (24.11)"
- "- Previous Stable (24.05)"
default: 0
validations:
required: true

View File

@@ -25,9 +25,8 @@ For new packages please briefly describe the package or provide a link to its ho
- 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/`)
- [Nixpkgs 25.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/doc/release-notes/rl-2511.section.md) (or backporting [24.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/release-notes/rl-2411.section.md) and [25.05](https://github.com/NixOS/nixpkgs/blob/master/doc/manual/release-notes/rl-2505.section.md) Nixpkgs Release notes)
- [25.05 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2505.section.md) (or backporting [24.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2411.section.md) and [25.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2505.section.md) Release notes)
- [ ] (Package updates) Added a release notes entry if the change is major or breaking
- [NixOS 25.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2511.section.md) (or backporting [24.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2411.section.md) and [25.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2505.section.md) NixOS Release notes)
- [ ] (Module updates) Added a release notes entry if the change is significant
- [ ] (Module addition) Added a release notes entry if adding a new NixOS module
- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).

View File

@@ -1,88 +0,0 @@
name: Get merge commit
description: 'Checks whether the Pull Request is mergeable and checks out the repo at up to two commits: The result of a temporary merge of the head branch into the target branch ("merged"), and the parent of that commit on the target branch ("target"). Handles push events and merge conflicts gracefully.'
inputs:
merged-as-untrusted:
description: "Whether to checkout the merge commit in the ./untrusted folder."
type: boolean
target-as-trusted:
description: "Whether to checkout the target commit in the ./trusted folder."
type: boolean
outputs:
mergedSha:
description: "The merge commit SHA"
value: ${{ steps.commits.outputs.mergedSha }}
targetSha:
description: "The target commit SHA"
value: ${{ steps.commits.outputs.targetSha }}
runs:
using: composite
steps:
- id: commits
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
script: |
if (context.eventName == 'push') return core.setOutput('mergedSha', context.sha)
for (const retryInterval of [5, 10, 20, 40, 80]) {
console.log("Checking whether the pull request can be merged...")
const prInfo = (await github.rest.pulls.get({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.pull_request.number
})).data
if (prInfo.state != 'open') throw new Error ("PR is not open anymore.")
if (prInfo.mergeable == null) {
console.log(`GitHub is still computing whether this PR can be merged, waiting ${retryInterval} seconds before trying again...`)
await new Promise(resolve => setTimeout(resolve, retryInterval * 1000))
continue
}
let mergedSha, targetSha
if (prInfo.mergeable) {
console.log("The PR can be merged.")
mergedSha = prInfo.merge_commit_sha
targetSha = (await github.rest.repos.getCommit({
owner: context.repo.owner,
repo: context.repo.repo,
ref: prInfo.merge_commit_sha
})).data.parents[0].sha
} else {
console.log("The PR has a merge conflict.")
mergedSha = prInfo.head.sha
targetSha = (await github.rest.repos.compareCommitsWithBasehead({
owner: context.repo.owner,
repo: context.repo.repo,
basehead: `${prInfo.base.sha}...${prInfo.head.sha}`
})).data.merge_base_commit.sha
}
console.log(`Checking the commits:\nmerged:${mergedSha}\ntarget:${targetSha}`)
core.setOutput('mergedSha', mergedSha)
core.setOutput('targetSha', targetSha)
return
}
throw new Error("Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com.")
# Would be great to do the checkouts in git worktrees of the existing spare checkout instead,
# but Nix is broken with them:
# https://github.com/NixOS/nix/issues/6073
- if: inputs.merged-as-untrusted && steps.commits.outputs.mergedSha
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ steps.commits.outputs.mergedSha }}
path: untrusted
- if: inputs.target-as-trusted && steps.commits.outputs.targetSha
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ steps.commits.outputs.targetSha }}
path: trusted

View File

@@ -22,7 +22,7 @@
- doc/**/*
- nixos/doc/**/*
"backport release-25.05":
"backport release-24.11":
- any:
- changed-files:
- any-glob-to-any-file:

2
.github/labeler.yml vendored
View File

@@ -162,7 +162,7 @@
- any-glob-to-any-file:
- doc/languages-frameworks/gnome.section.md
- nixos/modules/services/desktops/gnome/**/*
- nixos/modules/services/desktop-managers/gnome.nix
- nixos/modules/services/x11/desktop-managers/gnome.nix
- nixos/tests/gnome-xorg.nix
- nixos/tests/gnome.nix
- pkgs/desktops/gnome/**/*

View File

@@ -9,9 +9,7 @@ on:
pull_request_target:
types: [closed, labeled]
permissions:
contents: read
pull-requests: write
permissions: {}
jobs:
backport:
@@ -50,8 +48,7 @@ jobs:
- name: "Add 'has: port to stable' label"
if: steps.backport.outputs.created_pull_numbers != ''
env:
# Not the app on purpose to avoid triggering another workflow run after adding this label
GH_TOKEN: ${{ github.token }}
GH_TOKEN: ${{ steps.app-token.outputs.token }}
REPOSITORY: ${{ github.repository }}
NUMBER: ${{ github.event.number }}
run: |

View File

@@ -20,12 +20,11 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
filter: tree:0
path: trusted
filter: blob:none
- name: Check cherry-picks
env:
BASE_SHA: ${{ github.event.pull_request.base.sha }}
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
run: |
./trusted/ci/check-cherry-picks.sh "$BASE_SHA" "$HEAD_SHA"
./maintainers/scripts/check-cherry-picks.sh "$BASE_SHA" "$HEAD_SHA"

View File

@@ -9,17 +9,18 @@ on:
permissions: {}
jobs:
get-merge-commit:
uses: ./.github/workflows/get-merge-commit.yml
nixos:
name: fmt-check
runs-on: ubuntu-24.04-arm
needs: get-merge-commit
if: needs.get-merge-commit.outputs.mergedSha
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: .github/actions
- name: Check if the PR can be merged and checkout the merge commit
uses: ./.github/actions/get-merge-commit
with:
merged-as-untrusted: true
ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
- uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
with:
@@ -30,7 +31,7 @@ jobs:
# Note that it's fine to run this on untrusted code because:
# - There's no secrets accessible here
# - The build is sandboxed
if ! nix-build untrusted/ci -A fmt.check; then
if ! nix-build ci -A fmt.check; then
echo "Some files are not properly formatted"
echo "Please format them by going to the Nixpkgs root directory and running one of:"
echo " nix-shell --run treefmt"

View File

@@ -32,13 +32,9 @@ jobs:
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: .github/actions
- name: Check if the PR can be merged and checkout the merge commit
uses: ./.github/actions/get-merge-commit
with:
merged-as-untrusted: true
ref: refs/pull/${{ github.event.pull_request.number }}/merge
- uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
- name: Build shell
run: nix-build untrusted/ci -A shell
run: nix-build ci -A shell

View File

@@ -37,21 +37,17 @@ env:
DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}
jobs:
get-merge-commit:
if: github.repository_owner == 'NixOS'
uses: ./.github/workflows/get-merge-commit.yml
# Check that code owners is valid
check:
name: Check
runs-on: ubuntu-24.04-arm
if: github.repository_owner == 'NixOS'
needs: get-merge-commit
if: github.repository_owner == 'NixOS' && needs.get-merge-commit.outputs.mergedSha
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: .github/actions
- name: Check if the PR can be merged and checkout the merge and target commits
uses: ./.github/actions/get-merge-commit
with:
merged-as-untrusted: true
target-as-trusted: true
- uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
- uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
@@ -60,8 +56,15 @@ jobs:
name: nixpkgs-ci
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
# Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR itself.
# We later build and run code from the base branch with access to secrets,
# so it's important this is not the PRs code.
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
path: base
- name: Build codeowners validator
run: nix-build trusted/ci -A codeownersValidator
run: nix-build base/ci -A codeownersValidator
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
if: vars.OWNER_RO_APP_ID
@@ -72,16 +75,21 @@ jobs:
permission-administration: read
permission-members: read
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
path: pr
- name: Validate codeowners
if: steps.app-token.outputs.token
run: result/bin/codeowners-validator
env:
OWNERS_FILE: untrusted/${{ env.OWNERS_FILE }}
OWNERS_FILE: pr/${{ env.OWNERS_FILE }}
GITHUB_ACCESS_TOKEN: ${{ steps.app-token.outputs.token }}
REPOSITORY_PATH: untrusted
REPOSITORY_PATH: pr
OWNER_CHECKER_REPOSITORY: ${{ github.repository }}
# Set this to "notowned,avoid-shadowing" to check that all files are owned by somebody
EXPERIMENTAL_CHECKS: "avoid-shadowing"
run: result/bin/codeowners-validator
# Request reviews from code owners
request:
@@ -94,8 +102,6 @@ jobs:
# Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR head.
# This is intentional, because we need to request the review of owners as declared in the base branch.
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
path: trusted
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
if: vars.OWNER_APP_ID
@@ -108,10 +114,10 @@ jobs:
permission-pull-requests: write
- name: Build review request package
run: nix-build trusted/ci -A requestReviews
run: nix-build ci -A requestReviews
- name: Request reviews
if: steps.app-token.outputs.token
run: result/bin/request-code-owner-reviews.sh ${{ github.repository }} ${{ github.event.number }} "$OWNERS_FILE"
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
run: result/bin/request-code-owner-reviews.sh ${{ github.repository }} ${{ github.event.number }} "$OWNERS_FILE"

View File

@@ -9,17 +9,19 @@ on:
permissions: {}
jobs:
get-merge-commit:
uses: ./.github/workflows/get-merge-commit.yml
eval-aliases:
name: Eval nixpkgs with aliases enabled
runs-on: ubuntu-24.04-arm
needs: [ get-merge-commit ]
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Check out the PR at the test merge commit
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: .github/actions
- name: Check if the PR can be merged and checkout the merge commit
uses: ./.github/actions/get-merge-commit
with:
merged-as-untrusted: true
ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
path: nixpkgs
- name: Install Nix
uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
@@ -27,8 +29,8 @@ jobs:
extra_nix_config: sandbox = true
- name: Ensure flake outputs on all systems still evaluate
run: nix flake check --all-systems --no-build ./untrusted
run: nix flake check --all-systems --no-build ./nixpkgs
- name: Query nixpkgs with aliases enabled to check for basic syntax errors
run: |
time nix-env -I ./untrusted -f ./untrusted -qa '*' --option restrict-eval true --option allow-import-from-derivation false >/dev/null
time nix-env -I ./nixpkgs -f ./nixpkgs -qa '*' --option restrict-eval true --option allow-import-from-derivation false >/dev/null

View File

@@ -4,8 +4,8 @@ on:
pull_request:
paths:
- .github/workflows/eval.yml
- .github/workflows/reviews.yml # needs eval results from the same event type
pull_request_target:
types: [opened, ready_for_review, synchronize, reopened]
push:
# Keep this synced with ci/request-reviews/dev-branches.txt
branches:
@@ -19,36 +19,17 @@ on:
permissions: {}
jobs:
prepare:
name: Prepare
runs-on: ubuntu-24.04-arm
outputs:
mergedSha: ${{ steps.get-merge-commit.outputs.mergedSha }}
targetSha: ${{ steps.get-merge-commit.outputs.targetSha }}
systems: ${{ steps.systems.outputs.systems }}
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: |
.github/actions
ci/supportedSystems.json
- name: Check if the PR can be merged and get the test merge commit
uses: ./.github/actions/get-merge-commit
id: get-merge-commit
- name: Load supported systems
id: systems
run: |
echo "systems=$(jq -c <ci/supportedSystems.json)" >> "$GITHUB_OUTPUT"
get-merge-commit:
uses: ./.github/workflows/get-merge-commit.yml
outpaths:
name: Outpaths
runs-on: ubuntu-24.04-arm
needs: [ prepare ]
needs: [ get-merge-commit ]
strategy:
fail-fast: false
matrix:
system: ${{ fromJSON(needs.prepare.outputs.systems) }}
system: ${{ fromJSON(needs.get-merge-commit.outputs.systems) }}
steps:
- name: Enable swap
run: |
@@ -60,8 +41,8 @@ jobs:
- name: Check out the PR at the test merge commit
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ needs.prepare.outputs.mergedSha }}
path: untrusted
ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
path: nixpkgs
- name: Install Nix
uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
@@ -72,26 +53,57 @@ jobs:
env:
MATRIX_SYSTEM: ${{ matrix.system }}
run: |
nix-build untrusted/ci -A eval.singleSystem \
nix-build nixpkgs/ci -A eval.singleSystem \
--argstr evalSystem "$MATRIX_SYSTEM" \
--arg chunkSize 10000 \
--out-link merged
--arg chunkSize 10000
# If it uses too much memory, slightly decrease chunkSize
- name: Upload the output paths and eval stats
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: merged-${{ matrix.system }}
path: merged/*
name: intermediate-${{ matrix.system }}
path: result/*
process:
name: Process
runs-on: ubuntu-24.04-arm
needs: [ outpaths, get-merge-commit ]
outputs:
targetRunId: ${{ steps.targetRunId.outputs.targetRunId }}
steps:
- name: Download output paths and eval stats for all systems
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
pattern: intermediate-*
path: intermediate
- name: Check out the PR at the test merge commit
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
fetch-depth: 2
path: nixpkgs
- name: Install Nix
uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
with:
extra_nix_config: sandbox = true
- name: Combine all output paths and eval stats
run: |
nix-build nixpkgs/ci -A eval.combine \
--arg resultsDir ./intermediate \
-o prResult
- name: Upload the combined results
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: result
path: prResult/*
- name: Get target run id
if: needs.prepare.outputs.targetSha
if: needs.get-merge-commit.outputs.targetSha
id: targetRunId
env:
GH_TOKEN: ${{ github.token }}
MATRIX_SYSTEM: ${{ matrix.system }}
REPOSITORY: ${{ github.repository }}
TARGET_SHA: ${{ needs.prepare.outputs.targetSha }}
run: |
# Get the latest eval.yml workflow run for the PR's target commit
if ! run=$(gh api --method GET /repos/"$REPOSITORY"/actions/workflows/eval.yml/runs \
@@ -103,119 +115,104 @@ jobs:
fi
echo "Comparing against $(jq .html_url <<< "$run")"
runId=$(jq .id <<< "$run")
if ! job=$(gh api --method GET /repos/"$REPOSITORY"/actions/runs/"$runId"/jobs \
--jq ".jobs[] | select (.name == \"Outpaths ($MATRIX_SYSTEM)\")") \
|| [[ -z "$job" ]]; then
echo "Could not find the Outpaths ($MATRIX_SYSTEM) job for workflow run $runId, cannot make comparison"
exit 1
fi
jobId=$(jq .id <<< "$job")
conclusion=$(jq -r .conclusion <<< "$job")
conclusion=$(jq -r .conclusion <<< "$run")
while [[ "$conclusion" == null || "$conclusion" == "" ]]; do
echo "Job not done, waiting 10 seconds before checking again"
echo "Workflow not done, waiting 10 seconds before checking again"
sleep 10
conclusion=$(gh api /repos/"$REPOSITORY"/actions/jobs/"$jobId" --jq '.conclusion')
conclusion=$(gh api /repos/"$REPOSITORY"/actions/runs/"$runId" --jq '.conclusion')
done
if [[ "$conclusion" != "success" ]]; then
echo "Job was not successful (conclusion: $conclusion), cannot make comparison"
echo "Workflow was not successful (conclusion: $conclusion), cannot make comparison"
exit 1
fi
echo "targetRunId=$runId" >> "$GITHUB_OUTPUT"
env:
REPOSITORY: ${{ github.repository }}
TARGET_SHA: ${{ needs.get-merge-commit.outputs.targetSha }}
GH_TOKEN: ${{ github.token }}
- uses: actions/download-artifact@v4
if: steps.targetRunId.outputs.targetRunId
with:
run-id: ${{ steps.targetRunId.outputs.targetRunId }}
name: merged-${{ matrix.system }}
path: target
name: result
path: targetResult
github-token: ${{ github.token }}
merge-multiple: true
- name: Compare outpaths against the target branch
if: steps.targetRunId.outputs.targetRunId
env:
MATRIX_SYSTEM: ${{ matrix.system }}
run: |
nix-build untrusted/ci -A eval.diff \
--arg beforeDir ./target \
--arg afterDir "$(readlink ./merged)" \
--argstr evalSystem "$MATRIX_SYSTEM" \
--out-link diff
- name: Upload outpaths diff and stats
if: steps.targetRunId.outputs.targetRunId
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: diff-${{ matrix.system }}
path: diff/*
compare:
name: Comparison
runs-on: ubuntu-24.04-arm
needs: [ prepare, outpaths ]
if: needs.prepare.outputs.targetSha
permissions:
issues: write # needed to create *new* labels
pull-requests: write
statuses: write
steps:
- name: Download output paths and eval stats for all systems
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
pattern: diff-*
path: diff
merge-multiple: true
- name: Check out the PR at the target commit
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ needs.prepare.outputs.targetSha }}
path: trusted
- name: Install Nix
uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
with:
extra_nix_config: sandbox = true
- name: Combine all output paths and eval stats
run: |
nix-build trusted/ci -A eval.combine \
--arg diffDir ./diff \
--out-link combined
run-id: ${{ steps.targetRunId.outputs.targetRunId }}
- name: Compare against the target branch
env:
AUTHOR_ID: ${{ github.event.pull_request.user.id }}
if: steps.targetRunId.outputs.targetRunId
run: |
git -C trusted fetch --depth 1 origin ${{ needs.prepare.outputs.mergedSha }}
git -C trusted diff --name-only ${{ needs.prepare.outputs.mergedSha }} \
git -C nixpkgs worktree add ../target ${{ needs.get-merge-commit.outputs.targetSha }}
git -C nixpkgs diff --name-only ${{ needs.get-merge-commit.outputs.targetSha }} \
| jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json
# Use the target branch to get accurate maintainer info
nix-build trusted/ci -A eval.compare \
--arg combinedDir "$(realpath ./combined)" \
nix-build target/ci -A eval.compare \
--arg beforeResultDir ./targetResult \
--arg afterResultDir "$(realpath prResult)" \
--arg touchedFilesJson ./touched-files.json \
--argstr githubAuthorId "$AUTHOR_ID" \
--out-link comparison
-o comparison
cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY"
env:
AUTHOR_ID: ${{ github.event.pull_request.user.id }}
- name: Upload the comparison results
- name: Upload the combined results
if: steps.targetRunId.outputs.targetRunId
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: comparison
path: comparison/*
# Separate job to have a very tightly scoped PR write token
tag:
name: Tag
runs-on: ubuntu-24.04-arm
needs: [ get-merge-commit, process ]
if: needs.process.outputs.targetRunId
permissions:
pull-requests: write
statuses: write
steps:
# See ./codeowners-v2.yml, reuse the same App because we need the same permissions
# Can't use the token received from permissions above, because it can't get enough permissions
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
if: vars.OWNER_APP_ID
id: app-token
with:
app-id: ${{ vars.OWNER_APP_ID }}
private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
permission-administration: read
permission-members: read
permission-pull-requests: write
- name: Download process result
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: comparison
path: comparison
- name: Install Nix
uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
# Important: This workflow job runs with extra permissions,
# so we need to make sure to not run untrusted code from PRs
- name: Check out Nixpkgs at the base commit
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ needs.get-merge-commit.outputs.targetSha }}
path: base
sparse-checkout: ci
- name: Build the requestReviews derivation
run: nix-build base/ci -A requestReviews
- name: Labelling pull request
if: ${{ github.event_name == 'pull_request_target' }}
env:
GH_TOKEN: ${{ github.token }}
REPOSITORY: ${{ github.repository }}
NUMBER: ${{ github.event.number }}
if: ${{ github.event_name == 'pull_request_target' && github.repository_owner == 'NixOS' }}
run: |
# Get all currently set labels that we manage
gh api \
@@ -244,12 +241,13 @@ jobs:
-f "labels[]=$toAdd"
done < <(comm -13 before after)
- name: Add eval summary to commit statuses
if: ${{ github.event_name == 'pull_request_target' }}
env:
GH_TOKEN: ${{ github.token }}
PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
REPOSITORY: ${{ github.repository }}
NUMBER: ${{ github.event.number }}
- name: Add eval summary to commit statuses
if: ${{ github.event_name == 'pull_request_target' && github.repository_owner == 'NixOS' }}
run: |
description=$(jq -r '
"Package: added " + (.attrdiff.added | length | tostring) +
@@ -263,13 +261,24 @@ jobs:
-H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" \
"/repos/$GITHUB_REPOSITORY/statuses/$PR_HEAD_SHA" \
-f "context=Eval / Summary" -f "state=success" -f "description=$description" -f "target_url=$target_url"
env:
GH_TOKEN: ${{ github.token }}
PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
NUMBER: ${{ github.event.number }}
reviewers:
name: Reviewers
# No dependency on "compare", so that it can start at the same time.
# We only wait for the "comparison" artifact to be available, which makes the start-to-finish time
# for the eval workflow considerably faster.
needs: [ prepare, outpaths ]
if: needs.prepare.outputs.targetSha
uses: ./.github/workflows/reviewers.yml
secrets: inherit
- name: Requesting maintainer reviews
if: ${{ steps.app-token.outputs.token && github.repository_owner == 'NixOS' }}
run: |
# maintainers.json contains GitHub IDs. Look up handles to request reviews from.
# There appears to be no API to request reviews based on GitHub IDs
jq -r 'keys[]' comparison/maintainers.json \
| while read -r id; do gh api /user/"$id" --jq .login; done \
| GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR"
env:
GH_TOKEN: ${{ github.token }}
REPOSITORY: ${{ github.repository }}
NUMBER: ${{ github.event.number }}
AUTHOR: ${{ github.event.pull_request.user.login }}
# Don't request reviewers on draft PRs
DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}

58
.github/workflows/get-merge-commit.yml vendored Normal file
View File

@@ -0,0 +1,58 @@
name: Get merge commit
on:
pull_request:
paths:
- .github/workflows/get-merge-commit.yml
workflow_call:
outputs:
mergedSha:
description: "The merge commit SHA"
value: ${{ jobs.resolve-merge-commit.outputs.mergedSha }}
targetSha:
description: "The target commit SHA"
value: ${{ jobs.resolve-merge-commit.outputs.targetSha }}
systems:
description: "The supported systems"
value: ${{ jobs.resolve-merge-commit.outputs.systems }}
permissions: {}
jobs:
resolve-merge-commit:
runs-on: ubuntu-24.04-arm
outputs:
mergedSha: ${{ steps.merged.outputs.mergedSha }}
targetSha: ${{ steps.merged.outputs.targetSha }}
systems: ${{ steps.systems.outputs.systems }}
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
path: base
sparse-checkout: ci
- name: Check if the PR can be merged and get the test merge commit
id: merged
env:
GH_TOKEN: ${{ github.token }}
GH_EVENT: ${{ github.event_name }}
run: |
case "$GH_EVENT" in
push)
echo "mergedSha=${{ github.sha }}" >> "$GITHUB_OUTPUT"
;;
pull_request*)
if commits=$(base/ci/get-merge-commit.sh ${{ github.repository }} ${{ github.event.number }}); then
echo -e "Checking the commits:\n$commits"
echo "$commits" >> "$GITHUB_OUTPUT"
else
# Skipping so that no notifications are sent
echo "Skipping the rest..."
fi
;;
esac
- name: Load supported systems
id: systems
run: |
echo "systems=$(jq -c <base/ci/supportedSystems.json)" >> "$GITHUB_OUTPUT"

View File

@@ -10,14 +10,13 @@ on:
permissions:
contents: read
issues: write # needed to create *new* labels
pull-requests: write
jobs:
labels:
name: label-pr
runs-on: ubuntu-24.04-arm
if: "!contains(github.event.pull_request.title, '[skip treewide]')"
if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')"
steps:
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
if: |

View File

@@ -12,17 +12,18 @@ on:
permissions: {}
jobs:
get-merge-commit:
uses: ./.github/workflows/get-merge-commit.yml
nixpkgs-lib-tests:
name: nixpkgs-lib-tests
runs-on: ubuntu-24.04
needs: get-merge-commit
if: needs.get-merge-commit.outputs.mergedSha
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: .github/actions
- name: Check if the PR can be merged and checkout the merge commit
uses: ./.github/actions/get-merge-commit
with:
merged-as-untrusted: true
ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
- uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
with:
@@ -30,4 +31,4 @@ jobs:
- name: Building Nixpkgs lib-tests
run: |
nix-build untrusted/ci -A lib-tests
nix-build ci -A lib-tests

View File

@@ -34,11 +34,7 @@ jobs:
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: .github/actions
- name: Check if the PR can be merged and checkout the merge commit
uses: ./.github/actions/get-merge-commit
with:
merged-as-untrusted: true
ref: refs/pull/${{ github.event.pull_request.number }}/merge
- uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
with:
@@ -52,7 +48,7 @@ jobs:
- name: Build NixOS manual
id: build-manual
run: NIX_PATH=nixpkgs=$(pwd)/untrusted nix-build --option restrict-eval true untrusted/ci -A manual-nixos --argstr system ${{ matrix.system }}
run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true ci -A manual-nixos --argstr system ${{ matrix.system }}
- name: Upload NixOS manual
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

View File

@@ -5,6 +5,8 @@ on:
paths:
- .github/workflows/manual-nixpkgs-v2.yml
pull_request_target:
branches:
- master
paths:
- 'doc/**'
- 'lib/**'
@@ -19,11 +21,7 @@ jobs:
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: .github/actions
- name: Check if the PR can be merged and checkout the merge commit
uses: ./.github/actions/get-merge-commit
with:
merged-as-untrusted: true
ref: refs/pull/${{ github.event.pull_request.number }}/merge
- uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
with:
@@ -36,4 +34,4 @@ jobs:
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Building Nixpkgs manual
run: nix-build untrusted/ci -A manual-nixpkgs -A manual-nixpkgs-tests
run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true ci -A manual-nixpkgs -A manual-nixpkgs-tests

View File

@@ -9,18 +9,18 @@ on:
permissions: {}
jobs:
get-merge-commit:
uses: ./.github/workflows/get-merge-commit.yml
tests:
name: nix-files-parseable-check
runs-on: ubuntu-24.04-arm
if: "!contains(github.event.pull_request.title, '[skip treewide]')"
needs: get-merge-commit
if: "needs.get-merge-commit.outputs.mergedSha && !contains(github.event.pull_request.title, '[skip treewide]')"
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: .github/actions
- name: Check if the PR can be merged and checkout the merge commit
uses: ./.github/actions/get-merge-commit
with:
merged-as-untrusted: true
ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
- uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
with:
@@ -30,4 +30,4 @@ jobs:
- name: Parse all nix files
run: |
# Tests multiple versions at once, let's make sure all of them run, so keep-going.
nix-build untrusted/ci -A parse --keep-going
nix-build ci -A parse --keep-going

View File

@@ -17,29 +17,51 @@ permissions: {}
# There is a feature request for suppressing notifications on concurrency-canceled runs: https://github.com/orgs/community/discussions/13015
jobs:
get-merge-commit:
uses: ./.github/workflows/get-merge-commit.yml
check:
name: nixpkgs-vet
runs-on: ubuntu-24.04-arm
# This needs to be x86_64-linux, because we depend on the tooling being pre-built in the GitHub releases.
runs-on: ubuntu-24.04
# This should take 1 minute at most, but let's be generous. The default of 6 hours is definitely too long.
timeout-minutes: 10
needs: get-merge-commit
if: needs.get-merge-commit.outputs.mergedSha
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: .github/actions
- name: Check if the PR can be merged and checkout merged and target commits
uses: ./.github/actions/get-merge-commit
with:
merged-as-untrusted: true
target-as-trusted: true
ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
# Fetches the merge commit and its parents
fetch-depth: 2
- name: Checking out target branch
run: |
target=$(mktemp -d)
git worktree add "$target" "$(git rev-parse HEAD^1)"
echo "target=$target" >> "$GITHUB_ENV"
- uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
- name: Fetching the pinned tool
# Update the pinned version using ci/nixpkgs-vet/update-pinned-tool.sh
run: |
# The pinned version of the tooling to use.
toolVersion=$(<ci/nixpkgs-vet/pinned-version.txt)
# Fetch the x86_64-linux-specific release artifact containing the gzipped NAR of the pre-built tool.
toolPath=$(curl -sSfL https://github.com/NixOS/nixpkgs-vet/releases/download/"$toolVersion"/x86_64-linux.nar.gz \
| gzip -cd | nix-store --import | tail -1)
# Adds a result symlink as a GC root.
nix-store --realise "$toolPath" --add-root result
- name: Running nixpkgs-vet
env:
# Force terminal colors to be enabled. The library that `nixpkgs-vet` uses respects https://bixense.com/clicolors/
CLICOLOR_FORCE: 1
run: |
if nix-build untrusted/ci -A nixpkgs-vet --arg base "./trusted" --arg head "./untrusted"; then
if result/bin/nixpkgs-vet --base "$target" .; then
exit 0
else
exitCode=$?

View File

@@ -31,7 +31,7 @@ jobs:
into: staging-next-24.11
- from: staging-next-24.11
into: staging-24.11
- from: release-25.05
- from: master
into: staging-next-25.05
- from: staging-next-25.05
into: staging-25.05

View File

@@ -1,98 +0,0 @@
# This workflow will request reviews from the maintainers of each package
# listed in the PR's most recent eval comparison artifact.
name: Reviewers
on:
pull_request:
paths:
- .github/workflows/reviewers.yml
pull_request_target:
types: [ready_for_review]
workflow_call:
permissions: {}
jobs:
request:
name: Request
runs-on: ubuntu-24.04-arm
steps:
- name: Check out the PR at the base commit
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
path: trusted
sparse-checkout: ci
- name: Install Nix
uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
with:
extra_nix_config: sandbox = true
- name: Build the requestReviews derivation
run: nix-build trusted/ci -A requestReviews
# See ./codeowners-v2.yml, reuse the same App because we need the same permissions
# Can't use the token received from permissions above, because it can't get enough permissions
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
if: vars.OWNER_APP_ID
id: app-token
with:
app-id: ${{ vars.OWNER_APP_ID }}
private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
permission-administration: read
permission-members: read
permission-pull-requests: write
# In the regular case, this workflow is called via workflow_call from the eval workflow directly.
# In the more special case, when a PR is undrafted an eval run will have started already.
- name: Wait for comparison to be done
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
script: |
const run_id = (await github.rest.actions.listWorkflowRuns({
owner: context.repo.owner,
repo: context.repo.repo,
workflow_id: 'eval.yml',
event: context.eventName,
head_sha: context.payload.pull_request.head.sha
})).data.workflow_runs[0].id
// Waiting 120 * 5 sec = 10 min. max.
// The extreme case is an Eval run that just started when the PR is undrafted.
// Eval takes max 5-6 minutes, normally.
for (let i = 0; i < 120; i++) {
const result = await github.rest.actions.listWorkflowRunArtifacts({
owner: context.repo.owner,
repo: context.repo.repo,
run_id,
name: 'comparison'
})
if (result.data.total_count > 0) return
await new Promise(resolve => setTimeout(resolve, 5000))
}
throw new Error("No comparison artifact found.")
- name: Download the comparison results
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
pattern: comparison
path: comparison
merge-multiple: true
- name: Requesting maintainer reviews
if: ${{ steps.app-token.outputs.token }}
env:
GH_TOKEN: ${{ github.token }}
REPOSITORY: ${{ github.repository }}
NUMBER: ${{ github.event.number }}
AUTHOR: ${{ github.event.pull_request.user.login }}
# Don't request reviewers on draft PRs
DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}
run: |
# maintainers.json contains GitHub IDs. Look up handles to request reviews from.
# There appears to be no API to request reviews based on GitHub IDs
jq -r 'keys[]' comparison/maintainers.json \
| while read -r id; do gh api /user/"$id" --jq .login; done \
| GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR"

View File

@@ -345,7 +345,7 @@ See [Nix Channel Status](https://status.nixos.org/) for the current channels and
Here's a brief overview of the main Git branches and what channels they're used for:
- `master`: The main branch, used for the unstable channels such as `nixpkgs-unstable`, `nixos-unstable` and `nixos-unstable-small`.
- `release-YY.MM` (e.g. `release-25.11`): The NixOS release branches, used for the stable channels such as `nixos-25.11`, `nixos-25.11-small` and `nixpkgs-25.11-darwin`.
- `release-YY.MM` (e.g. `release-25.05`): The NixOS release branches, used for the stable channels such as `nixos-25.05`, `nixos-25.05-small` and `nixpkgs-25.05-darwin`.
When a channel is updated, a corresponding Git branch is also updated to point to the corresponding commit.
So e.g. the [`nixpkgs-unstable` branch](https://github.com/nixos/nixpkgs/tree/nixpkgs-unstable) corresponds to the Git commit from the [`nixpkgs-unstable` channel](https://channels.nixos.org/nixpkgs-unstable).
@@ -533,7 +533,7 @@ Names of files and directories should be in lowercase, with dashes between words
### Formatting
CI [enforces](./.github/workflows/check-format.yml) all Nix files to be
CI [enforces](./.github/workflows/check-nix-format.yml) all Nix files to be
formatted using the [official Nix formatter](https://github.com/NixOS/nixfmt).
You can ensure this locally using either of these commands:

View File

@@ -1,9 +1,9 @@
<p align="center">
<a href="https://nixos.org">
<picture>
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos.svg">
<source media="(prefers-color-scheme: light)" srcset="https://nixos.org/logo/nixos-hires.png">
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png">
<img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos.svg" width="500px" alt="NixOS logo">
<img src="https://nixos.org/logo/nixos-hires.png" width="500px" alt="NixOS logo">
</picture>
</a>
</p>

View File

@@ -15,7 +15,6 @@
# CI
/.github/*_TEMPLATE* @SigmaSquadron
/.github/actions @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther
/.github/workflows @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther
/.github/workflows/check-format.yml @infinisil @wolfgangwalther
/.github/workflows/codeowners-v2.yml @infinisil @wolfgangwalther
@@ -131,8 +130,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza
/nixos/modules/system/boot/loader/systemd-boot @JulienMalka
# Limine
/nixos/modules/system/boot/loader/limine @lzcunt @phip1611 @programmerlexi @johnrtitor
/nixos/tests/limine @johnrtitor
/nixos/modules/system/boot/loader/limine @lzcunt @phip1611 @programmerlexi
# Images and installer media
/nixos/modules/profiles/installation-device.nix @ElvishJerricco
@@ -165,13 +163,6 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza
## common-updater-scripts
/pkgs/common-updater/scripts/update-source-version @jtojnar
# Android tools, libraries, and environments
/pkgs/development/android* @NixOS/android
/pkgs/development/mobile/android* @NixOS/android
/pkgs/applications/editors/android-studio* @NixOS/android
/doc/languages-frameworks/android* @NixOS/android
/pkgs/by-name/an/android* @NixOS/android
# Python-related code and docs
/doc/languages-frameworks/python.section.md @mweinelt @natsukium
/maintainers/scripts/update-python-libraries @mweinelt @natsukium
@@ -220,7 +211,6 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza
/pkgs/development/compilers/gcc
/pkgs/development/compilers/llvm @alyssais @RossComputerGuy @NixOS/llvm
/pkgs/development/compilers/emscripten @raitobezarius
/doc/toolchains/llvm.chapter.md @alyssais @RossComputerGuy @NixOS/llvm
/doc/languages-frameworks/emscripten.section.md @raitobezarius
# Audio
@@ -250,7 +240,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/pkgs/applications/editors/jetbrains @edwtjo @leona-ya @theCapypara
# Licenses
/lib/licenses.nix @alyssais @emilazy
/lib/licenses.nix @alyssais
# Qt
/pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000 @ttuegel
@@ -477,9 +467,6 @@ pkgs/development/interpreters/erlang/ @NixOS/beam
pkgs/development/interpreters/elixir/ @NixOS/beam
pkgs/development/interpreters/lfe/ @NixOS/beam
# Authelia
pkgs/servers/authelia/ @06kellyjac @dit7ya @nicomem
# OctoDNS
pkgs/by-name/oc/octodns/ @anthonyroussel

View File

@@ -40,3 +40,46 @@ Why not just build the tooling right from the PRs Nixpkgs version?
- Because it makes the CI check very fast, since no Nix builds need to be done, even for mass rebuilds.
- Because it improves security, since we don't have to build potentially untrusted code from PRs.
The tool only needs a very minimal Nix evaluation at runtime, which can work with [readonly-mode](https://nixos.org/manual/nix/stable/command-ref/opt-common.html#opt-readonly-mode) and [restrict-eval](https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-restrict-eval).
## `get-merge-commit.sh GITHUB_REPO PR_NUMBER`
Check whether a PR is mergeable and return the test merge commit as
[computed by GitHub](https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests) and its parent.
Arguments:
- `GITHUB_REPO`: The repository of the PR, e.g. `NixOS/nixpkgs`
- `PR_NUMBER`: The PR number, e.g. `1234`
Exit codes:
- 0: The PR can be merged, the hashes of the test merge commit and the target commit are returned on stdout
- 1: The PR cannot be merged because it's not open anymore
- 2: The PR cannot be merged because it has a merge conflict
- 3: The merge commit isn't being computed, GitHub is likely having internal issues, unknown if the PR is mergeable
### Usage
This script is implemented as a reusable GitHub Actions workflow, and can be used as follows:
```yaml
on: pull_request_target
# We need a token to query the API, but it doesn't need any special permissions
permissions: {}
jobs:
get-merge-commit:
# use the relative path of the get-merge-commit workflow yaml here
uses: ./.github/workflows/get-merge-commit.yml
build:
name: Build
runs-on: ubuntu-24.04
needs: get-merge-commit
steps:
- uses: actions/checkout@<VERSION>
# Add this to _all_ subsequent steps to skip them
if: needs.get-merge-commit.outputs.mergedSha
with:
ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
- ...
```

View File

@@ -82,9 +82,8 @@ in
# CI jobs
lib-tests = import ../lib/tests/release.nix { inherit pkgs; };
manual-nixos = (import ../nixos/release.nix { }).manual.${system} or null;
manual-nixpkgs = (import ../doc { });
manual-nixpkgs-tests = (import ../doc { }).tests;
nixpkgs-vet = pkgs.callPackage ./nixpkgs-vet.nix { };
manual-nixpkgs = (import ../pkgs/top-level/release.nix { }).manual;
manual-nixpkgs-tests = (import ../pkgs/top-level/release.nix { }).manual.tests;
parse = pkgs.lib.recurseIntoAttrs {
latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; };
lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; };

View File

@@ -1,13 +1,14 @@
{
callPackage,
lib,
jq,
runCommand,
writeText,
python3,
...
}:
{
combinedDir,
beforeResultDir,
afterResultDir,
touchedFilesJson,
githubAuthorId,
byName ? false,
@@ -19,7 +20,7 @@ let
---
Inputs:
- beforeDir, afterDir: The evaluation result from before and after the change.
- beforeResultDir, afterResultDir: The evaluation result from before and after the change.
They can be obtained by running `nix-build -A ci.eval.full` on both revisions.
---
@@ -65,6 +66,7 @@ let
Example: { name = "python312Packages.numpy"; platform = "x86_64-linux"; }
*/
inherit (import ./utils.nix { inherit lib; })
diff
groupByKernel
convertToPackagePlatformAttrs
groupByPlatform
@@ -72,10 +74,22 @@ let
getLabels
;
getAttrs =
dir:
let
raw = builtins.readFile "${dir}/outpaths.json";
# The file contains Nix paths; we need to ignore them for evaluation purposes,
# else there will be a "is not allowed to refer to a store path" error.
data = builtins.unsafeDiscardStringContext raw;
in
builtins.fromJSON data;
beforeAttrs = getAttrs beforeResultDir;
afterAttrs = getAttrs afterResultDir;
# Attrs
# - keys: "added", "changed" and "removed"
# - values: lists of `packagePlatformPath`s
diffAttrs = builtins.fromJSON (builtins.readFile "${combinedDir}/combined-diff.json");
diffAttrs = diff beforeAttrs afterAttrs;
rebuilds = diffAttrs.added ++ diffAttrs.changed;
rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs rebuilds;
@@ -113,7 +127,7 @@ let
}
);
maintainers = callPackage ./maintainers.nix { } {
maintainers = import ./maintainers.nix {
changedattrs = lib.attrNames (lib.groupBy (a: a.name) rebuildsPackagePlatformAttrs);
changedpathsjson = touchedFilesJson;
inherit byName;
@@ -135,8 +149,8 @@ runCommand "compare"
maintainers = builtins.toJSON maintainers;
passAsFile = [ "maintainers" ];
env = {
BEFORE_DIR = "${combinedDir}/before";
AFTER_DIR = "${combinedDir}/after";
BEFORE_DIR = "${beforeResultDir}";
AFTER_DIR = "${afterResultDir}";
};
}
''

View File

@@ -1,6 +1,3 @@
{
lib,
}:
# Almost directly vendored from https://github.com/NixOS/ofborg/blob/5a4e743f192fb151915fcbe8789922fa401ecf48/ofborg/src/maintainers.nix
{
changedattrs,
@@ -13,6 +10,7 @@ let
config = { };
overlays = [ ];
};
inherit (pkgs) lib;
changedpaths = builtins.fromJSON (builtins.readFile changedpathsjson);

View File

@@ -93,6 +93,32 @@ rec {
in
uniqueStrings (builtins.map (p: p.name) packagePlatformAttrs);
/*
Computes the key difference between two attrs
{
added: [ <keys only in the second object> ],
removed: [ <keys only in the first object> ],
changed: [ <keys with different values between the two objects> ],
}
*/
diff =
let
filterKeys = cond: attrs: lib.attrNames (lib.filterAttrs cond attrs);
in
old: new: {
added = filterKeys (n: _: !(old ? ${n})) new;
removed = filterKeys (n: _: !(new ? ${n})) old;
changed = filterKeys (
n: v:
# Filter out attributes that don't exist anymore
(new ? ${n})
# Filter out attributes that are the same as the new value
&& (v != (new.${n}))
) old;
};
/*
Group a list of `packagePlatformAttr`s by platforms

View File

@@ -1,10 +1,9 @@
{
callPackage,
lib,
runCommand,
writeShellScript,
writeText,
symlinkJoin,
linkFarm,
time,
procps,
nixVersions,
@@ -73,9 +72,7 @@ let
# The number of attributes per chunk, see ./README.md for more info.
chunkSize,
checkMeta ? true,
# Don't try to eval packages marked as broken.
includeBroken ? false,
includeBroken ? true,
# Whether to just evaluate a single chunk for quick testing
quickTest ? false,
}:
@@ -98,7 +95,7 @@ let
--option restrict-eval true \
--option allow-import-from-derivation false \
--query --available \
--out-path --json \
--no-name --attr-path --out-path \
--show-trace \
--arg chunkSize "$chunkSize" \
--arg myChunk "$myChunk" \
@@ -150,7 +147,7 @@ let
chunkCount=$(( (attrCount - 1) / chunkSize + 1 ))
echo "Chunk count: $chunkCount"
mkdir -p $out/${evalSystem}
mkdir $out
# Record and print stats on free memory and swap in the background
(
@@ -159,11 +156,11 @@ let
freeSwap=$(free -b | grep Swap | awk '{print $4}')
echo "Available memory: $(( availMemory / 1024 / 1024 )) MiB, free swap: $(( freeSwap / 1024 / 1024 )) MiB"
if [[ ! -f "$out/${evalSystem}/min-avail-memory" ]] || (( availMemory < $(<$out/${evalSystem}/min-avail-memory) )); then
echo "$availMemory" > $out/${evalSystem}/min-avail-memory
if [[ ! -f "$out/min-avail-memory" ]] || (( availMemory < $(<$out/min-avail-memory) )); then
echo "$availMemory" > $out/min-avail-memory
fi
if [[ ! -f $out/${evalSystem}/min-free-swap ]] || (( availMemory < $(<$out/${evalSystem}/min-free-swap) )); then
echo "$freeSwap" > $out/${evalSystem}/min-free-swap
if [[ ! -f $out/min-free-swap ]] || (( availMemory < $(<$out/min-free-swap) )); then
echo "$freeSwap" > $out/min-free-swap
fi
sleep 4
done
@@ -179,27 +176,25 @@ let
mkdir "$chunkOutputDir"/{result,stats,timestats,stderr}
seq -w 0 "$seq_end" |
command time -f "%e" -o "$out/${evalSystem}/total-time" \
command time -f "%e" -o "$out/total-time" \
xargs -I{} -P"$cores" \
${singleChunk} "$chunkSize" {} "$evalSystem" "$chunkOutputDir"
cp -r "$chunkOutputDir"/stats $out/${evalSystem}/stats-by-chunk
cp -r "$chunkOutputDir"/stats $out/stats-by-chunk
if (( chunkSize * chunkCount != attrCount )); then
# A final incomplete chunk would mess up the stats, don't include it
rm "$chunkOutputDir"/stats/"$seq_end"
fi
cat "$chunkOutputDir"/result/* | jq -s 'add | map_values(.outputs)' > $out/${evalSystem}/paths.json
cat "$chunkOutputDir"/result/* > $out/paths
'';
diff = callPackage ./diff.nix { };
combine =
{
diffDir,
resultsDir,
}:
runCommand "combined-eval"
runCommand "combined-result"
{
nativeBuildInputs = [
jq
@@ -208,27 +203,40 @@ let
''
mkdir -p $out
# Combine output paths from all systems
cat ${diffDir}/*/diff.json | jq -s '
reduce .[] as $item ({}; {
added: (.added + $item.added),
changed: (.changed + $item.changed),
removed: (.removed + $item.removed)
})
' > $out/combined-diff.json
# Transform output paths to JSON
cat ${resultsDir}/*/paths |
jq --sort-keys --raw-input --slurp '
split("\n") |
map(select(. != "") | split(" ") | map(select(. != ""))) |
map(
{
key: .[0],
value: .[1] | split(";") | map(split("=") |
if length == 1 then
{ key: "out", value: .[0] }
else
{ key: .[0], value: .[1] }
end) | from_entries}
) | from_entries
' > $out/outpaths.json
mkdir -p $out/before/stats
for d in ${diffDir}/before/*; do
cp -r "$d"/stats-by-chunk $out/before/stats/$(basename "$d")
done
mkdir -p $out/stats
mkdir -p $out/after/stats
for d in ${diffDir}/after/*; do
cp -r "$d"/stats-by-chunk $out/after/stats/$(basename "$d")
for d in ${resultsDir}/*; do
cp -r "$d"/stats-by-chunk $out/stats/$(basename "$d")
done
'';
compare = callPackage ./compare { };
compare = import ./compare {
inherit
lib
jq
runCommand
writeText
supportedSystems
python3
;
};
full =
{
@@ -239,26 +247,17 @@ let
quickTest ? false,
}:
let
diffs = symlinkJoin {
name = "diffs";
paths = map (
evalSystem:
let
eval = singleSystem {
inherit quickTest evalSystem chunkSize;
};
in
diff {
inherit evalSystem;
# Local "full" evaluation doesn't do a real diff.
beforeDir = eval;
afterDir = eval;
}
) evalSystems;
};
results = linkFarm "results" (
map (evalSystem: {
name = evalSystem;
path = singleSystem {
inherit quickTest evalSystem chunkSize;
};
}) evalSystems
);
in
combine {
diffDir = diffs;
resultsDir = results;
};
in
@@ -266,7 +265,6 @@ in
inherit
attrpathsSuperset
singleSystem
diff
combine
compare
# The above three are used by separate VMs in a GitHub workflow,

View File

@@ -1,61 +0,0 @@
{
lib,
runCommand,
writeText,
}:
{
beforeDir,
afterDir,
evalSystem,
}:
let
/*
Computes the key difference between two attrs
{
added: [ <keys only in the second object> ],
removed: [ <keys only in the first object> ],
changed: [ <keys with different values between the two objects> ],
}
*/
diff =
let
filterKeys = cond: attrs: lib.attrNames (lib.filterAttrs cond attrs);
in
old: new: {
added = filterKeys (n: _: !(old ? ${n})) new;
removed = filterKeys (n: _: !(new ? ${n})) old;
changed = filterKeys (
n: v:
# Filter out attributes that don't exist anymore
(new ? ${n})
# Filter out attributes that are the same as the new value
&& (v != (new.${n}))
) old;
};
getAttrs =
dir:
let
raw = builtins.readFile "${dir}/${evalSystem}/paths.json";
# The file contains Nix paths; we need to ignore them for evaluation purposes,
# else there will be a "is not allowed to refer to a store path" error.
data = builtins.unsafeDiscardStringContext raw;
in
builtins.fromJSON data;
beforeAttrs = getAttrs beforeDir;
afterAttrs = getAttrs afterDir;
diffAttrs = diff beforeAttrs afterAttrs;
diffJson = writeText "diff.json" (builtins.toJSON diffAttrs);
in
runCommand "diff" { } ''
mkdir -p $out/${evalSystem}
cp -r ${beforeDir} $out/before
cp -r ${afterDir} $out/after
cp ${diffJson} $out/${evalSystem}/diff.json
''

65
ci/get-merge-commit.sh Executable file
View File

@@ -0,0 +1,65 @@
#!/usr/bin/env bash
# See ./README.md for docs
set -euo pipefail
log() {
echo "$@" >&2
}
if (( $# < 2 )); then
log "Usage: $0 GITHUB_REPO PR_NUMBER"
exit 99
fi
repo=$1
prNumber=$2
# Retry the API query this many times
retryCount=5
# Start with 5 seconds, but double every retry
retryInterval=5
while true; do
log "Checking whether the pull request can be merged"
prInfo=$(gh api \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
"/repos/$repo/pulls/$prNumber")
# Non-open PRs won't have their mergeability computed no matter what
state=$(jq -r .state <<< "$prInfo")
if [[ "$state" != open ]]; then
log "PR is not open anymore"
exit 1
fi
mergeable=$(jq -r .mergeable <<< "$prInfo")
if [[ "$mergeable" == "null" ]]; then
if (( retryCount == 0 )); then
log "Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com/"
exit 3
else
(( retryCount -= 1 )) || true
# null indicates that GitHub is still computing whether it's mergeable
# Wait a couple seconds before trying again
log "GitHub is still computing whether this PR can be merged, waiting $retryInterval seconds before trying again ($retryCount retries left)"
sleep "$retryInterval"
(( retryInterval *= 2 )) || true
fi
else
break
fi
done
if [[ "$mergeable" == "true" ]]; then
log "The PR can be merged"
mergedSha="$(jq -r .merge_commit_sha <<< "$prInfo")"
echo "mergedSha=$mergedSha"
targetSha="$(gh api "/repos/$repo/commits/$mergedSha" --jq '.parents[0].sha')"
echo "targetSha=$targetSha"
else
log "The PR has a merge conflict"
exit 2
fi

View File

@@ -1,31 +0,0 @@
{
lib,
nix,
nixpkgs-vet,
runCommand,
}:
{
base ? ../.,
head ? ../.,
}:
let
filtered =
with lib.fileset;
path:
toSource {
fileset = (gitTracked path);
root = path;
};
in
runCommand "nixpkgs-vet"
{
nativeBuildInputs = [
nixpkgs-vet
];
env.NIXPKGS_VET_NIX_PACKAGE = nix;
}
''
nixpkgs-vet --base ${filtered base} ${filtered head}
touch $out
''

View File

@@ -65,5 +65,7 @@ trace -n "Reading pinned nixpkgs-vet version from pinned-version.txt.. "
toolVersion=$(<"$tmp/merged/ci/nixpkgs-vet/pinned-version.txt")
trace -e "\e[34m$toolVersion\e[0m"
trace -n "Building tool.. "
nix-build https://github.com/NixOS/nixpkgs-vet/tarball/"$toolVersion" -o "$tmp/tool" -A build
trace "Running nixpkgs-vet.."
nix-build ci -A nixpkgs-vet --argstr base "$tmp/base" --argstr head "$tmp/merged"
"$tmp/tool/bin/nixpkgs-vet" --base "$tmp/base" "$tmp/merged"

View File

@@ -1,4 +1,4 @@
{
"rev": "3d1f29646e4b57ed468d60f9d286cde23a8d1707",
"sha256": "1wzvc9h9a6l9wyhzh892xb5x88kxmbzxb1k8s7fizyyw2q4nqw07"
"rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1",
"sha256": "132nimgi1g88fbhddk4b8b1qk68jly494x2mnphyk3xa1d2wy9q7"
}

View File

@@ -34,27 +34,7 @@ $ nix-build doc
If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual.html`.
### Development environment
In order to reduce repetition, consider using tools from the provided development environment:
Load it from the Nixpkgs documentation directory with
```ShellSession
$ cd /path/to/nixpkgs/doc
$ nix-shell
```
To load the development utilities automatically when entering that directory, [set up `nix-direnv`](https://nix.dev/guides/recipes/direnv).
Make sure that your local files aren't added to Git history by adding the following lines to `.git/info/exclude` at the root of the Nixpkgs repository:
```
/**/.envrc
/**/.direnv
```
#### `devmode`
### devmode
The shell in the manual source directory makes available a command, `devmode`.
It is a daemon, that:

View File

@@ -795,10 +795,6 @@ Additionally, the following optional arguments can be given:
: Clone the entire repository as opposing to just creating a shallow clone.
This implies `leaveDotGit`.
*`fetchTags`* (Boolean)
: Whether to fetch all tags from the remote repository. This is useful when the build process needs to run `git describe` or other commands that require tag information to be available. This parameter implies `leaveDotGit`, as tags are stored in the `.git` directory.
*`sparseCheckout`* (List of String)
: Prevent git from fetching unnecessary blobs from server.

View File

@@ -37,7 +37,7 @@ let
helloCheckpoint = prepareCheckpointBuild pkgs.hello;
changedHello = pkgs.hello.overrideAttrs (_: {
doCheck = false;
postPatch = ''
patchPhase = ''
sed -i 's/Hello, world!/Hello, Nix!/g' src/hello.c
'';
});

View File

@@ -1,6 +1,6 @@
{
pkgs ? (import ../ci { }).pkgs,
pkgs ? (import ./.. { }),
nixpkgs ? { },
}:
pkgs.callPackage ./doc-support/package.nix { inherit nixpkgs; }
pkgs.nixpkgs-manual.override { inherit nixpkgs; }

View File

@@ -102,8 +102,6 @@ stdenvNoCC.mkDerivation {
];
installPhase = ''
runHook preInstall
cd ..
export NIX_STATE_DIR=$(mktemp -d)
@@ -145,7 +143,5 @@ stdenvNoCC.mkDerivation {
) libsets}
echo '```' >> "$out/index.md"
runHook postInstall
'';
}

View File

@@ -14,8 +14,8 @@
nixpkgs ? { },
markdown-code-runner,
roboto,
treefmt,
}:
stdenvNoCC.mkDerivation (
finalAttrs:
let
@@ -47,8 +47,6 @@ stdenvNoCC.mkDerivation (
postPatch = ''
ln -s ${optionsJSON}/share/doc/nixos/options.json ./config-options.json
ln -s ${treefmt.functionsDoc.markdown} ./packages/treefmt-functions.section.md
ln -s ${treefmt.optionsDoc.optionsJSON}/share/doc/nixos/options.json ./treefmt-options.json
'';
buildPhase = ''
@@ -99,14 +97,14 @@ stdenvNoCC.mkDerivation (
dest="$out/share/doc/nixpkgs"
mkdir -p "$(dirname "$dest")"
mv out "$dest"
cp "$dest/index.html" "$dest/manual.html"
mv "$dest/index.html" "$dest/manual.html"
cp ${roboto.src}/web/Roboto\[ital\,wdth\,wght\].ttf "$dest/Roboto.ttf"
cp ${epub} "$dest/nixpkgs-manual.epub"
mkdir -p $out/nix-support/
echo "doc manual $dest index.html" >> $out/nix-support/hydra-build-products
echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products
echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products
runHook postInstall
@@ -125,7 +123,7 @@ stdenvNoCC.mkDerivation (
let
devmode' = devmode.override {
buildArgs = toString ../.;
open = "/share/doc/nixpkgs/index.html";
open = "/share/doc/nixpkgs/manual.html";
};
nixos-render-docs-redirects' = writeShellScriptBin "redirects" "${lib.getExe nixos-render-docs-redirects} --file ${toString ../redirects.json} $@";
in

View File

@@ -121,8 +121,6 @@ agda.withPackages {
}
```
To install Agda without GHC, use `ghc = null;`.
## Writing Agda packages {#writing-agda-packages}
To write a nix derivation for an Agda library, first check that the library has a `*.agda-lib` file.

View File

@@ -118,13 +118,7 @@ pkgs.stdenv.mkDerivation {
runHook postBuild
'';
installPhase = ''
runHook preInstall
mv gulpdist $out
runHook postInstall
'';
installPhase = "mv gulpdist $out";
}
```

View File

@@ -115,8 +115,8 @@ All new projects should use the CUDA redistributables available in [`cudaPackage
### Updating supported compilers and GPUs {#updating-supported-compilers-and-gpus}
1. Update `nvccCompatibilities` in `pkgs/development/cuda-modules/_cuda/data/nvcc.nix` to include the newest release of NVCC, as well as any newly supported host compilers.
2. Update `cudaCapabilityToInfo` in `pkgs/development/cuda-modules/_cuda/data/cuda.nix` to include any new GPUs supported by the new release of CUDA.
1. Update `nvcc-compatibilities.nix` in `pkgs/development/cuda-modules/` to include the newest release of NVCC, as well as any newly supported host compilers.
2. Update `gpus.nix` in `pkgs/development/cuda-modules/` to include any new GPUs supported by the new release of CUDA.
### Updating the CUDA Toolkit runfile installer {#updating-the-cuda-toolkit}

View File

@@ -192,7 +192,6 @@ pkgs.buildEmscriptenPackage {
cp *.json $out/share
cp *.rng $out/share
cp README.md $doc/share/${name}
runHook postInstall
'';

View File

@@ -69,13 +69,9 @@ script to run it using a JRE. You can use `makeWrapper` for this:
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
makeWrapper ${jre}/bin/java $out/bin/foo \
--add-flags "-cp $out/share/java/foo.jar org.foo.Main"
runHook postInstall
'';
}
```

View File

@@ -690,11 +690,7 @@ The configure phase can sometimes fail because it makes many assumptions which m
```nix
{
configurePhase = ''
runHook preConfigure
ln -s $node_modules node_modules
runHook postConfigure
'';
}
```
@@ -704,12 +700,8 @@ or if you need a writeable node_modules directory:
```nix
{
configurePhase = ''
runHook preConfigure
cp -r $node_modules node_modules
chmod +w node_modules
runHook postConfigure
'';
}
```

View File

@@ -59,11 +59,7 @@ Such a Lisp can be now used e.g. to compile your sources:
```nix
{
buildPhase = ''
runHook preBuild
${sbcl'}/bin/sbcl --load my-build-file.lisp
runHook postBuild
'';
}
```

View File

@@ -59,7 +59,7 @@ For instance, `sqlite-lua` needs `g:sqlite_clib_path` to be set to work. Nixpkgs
- `neovimRcContent`: Extra vimL code sourced by the generated `init.lua`.
- `wrapperArgs`: Extra arguments forwarded to the `makeWrapper` call.
- `wrapRc`: Nix, not being able to write in your `$HOME`, loads the
generated Neovim configuration via the `$VIMINIT` environment variable, i.e. : `export VIMINIT='lua dofile("/nix/store/…-init.lua")'`. This has side effects like preventing Neovim from sourcing your `init.lua` in `$XDG_CONFIG_HOME/nvim` (see bullet 7 of [`:help startup`](https://neovim.io/doc/user/starting.html#startup) in Neovim). Disable it if you want to generate your own wrapper. You can still reuse the generated vimscript init code via `neovim.passthru.initRc`.
generated Neovim configuration via its `-u` argument, i.e. : `-u /nix/store/...generatedInit.lua`. This has side effects like preventing Neovim from reading your config in `$XDG_CONFIG_HOME` (see bullet 7 of [`:help startup`](https://neovim.io/doc/user/starting.html#_initialization) in Neovim). Disable it if you want to generate your own wrapper. You can still reuse while reusing the logic of the nixpkgs wrapper and access the generated config via `neovim.passthru.initRc`.
- `plugins`: A list of plugins to add to the wrapper.
```

View File

@@ -103,13 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
# The helper provides a configure snippet that will prepare all dependencies
# in the correct place, where SwiftPM expects them.
configurePhase = ''
runHook preConfigure
${generated.configure}
runHook postConfigure
'';
configurePhase = generated.configure;
installPhase = ''
runHook preInstall
@@ -174,17 +168,11 @@ with a writable copy:
```nix
{
configurePhase = ''
runHook preConfigure
${generated.configure}
configurePhase = generated.configure ++ ''
# Replace the dependency symlink with a writable copy.
swiftpmMakeMutable swift-crypto
# Now apply a patch.
patch -p1 -d .build/checkouts/swift-crypto -i ${./some-fix.patch}
runHook postConfigure
'';
}
```

View File

@@ -177,7 +177,7 @@ Finally, there are some plugins that are also packaged in nodePackages because t
Run the update script with a GitHub API token that has at least `public_repo` access. Running the script without the token is likely to result in rate-limiting (429 errors). For steps on creating an API token, please refer to [GitHub's token documentation](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token).
```sh
nix-shell -p vimPluginsUpdater --run 'vim-plugins-updater --github-token=mytoken' # or set GITHUB_TOKEN environment variable
nix-shell -p vimPluginsUpdater --run 'vim-plugins-updater --github-token=mytoken' # or set GITHUB_API_TOKEN environment variable
```
Alternatively, set the number of processes to a lower count to avoid rate-limiting.

View File

@@ -9,7 +9,6 @@ preface.chapter.md
using-nixpkgs.md
lib.md
stdenv.md
toolchains.md
build-helpers.md
development.md
contributing.md

View File

@@ -25,7 +25,6 @@ nginx.section.md
opengl.section.md
shell-helpers.section.md
python-tree-sitter.section.md
treefmt.section.md
steam.section.md
cataclysm-dda.section.md
urxvt.section.md

View File

@@ -1,23 +0,0 @@
# treefmt {#treefmt}
[treefmt](https://github.com/numtide/treefmt) streamlines the process of applying formatters to your project, making it a breeze with just one command line.
The [`treefmt` package](https://search.nixos.org/packages?channel=unstable&show=treefmt)
provides functions for configuring treefmt using the module system, which are [documented below](#sec-functions-library-treefmt), along with [their options](#sec-treefmt-options-reference).
Alternatively, treefmt can be configured using [treefmt-nix](https://github.com/numtide/treefmt-nix).
```{=include=} sections auto-id-prefix=auto-generated-treefmt-functions
treefmt-functions.section.md
```
## Options Reference {#sec-treefmt-options-reference}
The following attributes can be passed to [`withConfig`](#pkgs.treefmt.withConfig) or [`evalConfig`](#pkgs.treefmt.evalConfig):
```{=include=} options
id-prefix: opt-treefmt-
list-id: configuration-variable-list
source: ../treefmt-options.json
```

View File

@@ -113,13 +113,9 @@ stdenv.mkDerivation {
"bar.lua"
];
installPhase = ''
runHook preInstall
mkdir $out/share
cp foo.py $out/share
cp bar.lua $out/share
runHook postInstall
'';
}
```

View File

@@ -5,9 +5,6 @@
"chap-release-notes": [
"release-notes.html#chap-release-notes"
],
"chap-toolchains": [
"index.html#chap-toolchains"
],
"cmake-ctest": [
"index.html#cmake-ctest"
],
@@ -69,18 +66,6 @@
"pkgs-replacevarswith": [
"index.html#pkgs-replacevarswith"
],
"part-toolchains": [
"index.html#part-toolchains"
],
"pkgs.treefmt.buildConfig": [
"index.html#pkgs.treefmt.buildConfig"
],
"pkgs.treefmt.evalConfig": [
"index.html#pkgs.treefmt.evalConfig"
],
"pkgs.treefmt.withConfig": [
"index.html#pkgs.treefmt.withConfig"
],
"preface": [
"index.html#preface"
],
@@ -114,15 +99,6 @@
"sec-build-helper-extendMkDerivation": [
"index.html#sec-build-helper-extendMkDerivation"
],
"sec-building-packages-with-llvm": [
"index.html#sec-building-packages-with-llvm"
],
"sec-building-packages-with-llvm-using-clang-stdenv": [
"index.html#sec-building-packages-with-llvm-using-clang-stdenv"
],
"sec-functions-library-treefmt": [
"index.html#sec-functions-library-treefmt"
],
"sec-inkscape": [
"index.html#sec-inkscape"
],
@@ -150,30 +126,6 @@
"chap-overlays": [
"index.html#chap-overlays"
],
"sec-nixpkgs-release-25.11": [
"release-notes.html#sec-nixpkgs-release-25.11"
],
"sec-nixpkgs-release-25.11-highlights": [
"release-notes.html#sec-nixpkgs-release-25.11-highlights"
],
"sec-nixpkgs-release-25.11-incompatibilities": [
"release-notes.html#sec-nixpkgs-release-25.11-incompatibilities"
],
"sec-nixpkgs-release-25.11-lib": [
"release-notes.html#sec-nixpkgs-release-25.11-lib"
],
"sec-nixpkgs-release-25.11-lib-breaking": [
"release-notes.html#sec-nixpkgs-release-25.11-lib-breaking"
],
"sec-nixpkgs-release-25.11-lib-deprecations": [
"release-notes.html#sec-nixpkgs-release-25.11-lib-deprecations"
],
"sec-nixpkgs-release-25.11-lib-additions-improvements": [
"release-notes.html#sec-nixpkgs-release-25.11-lib-additions-improvements"
],
"sec-nixpkgs-release-25.11-notable-changes": [
"release-notes.html#sec-nixpkgs-release-25.11-notable-changes"
],
"sec-nixpkgs-release-25.05": [
"release-notes.html#sec-nixpkgs-release-25.05"
],
@@ -406,9 +358,6 @@
"chap-stdenv": [
"index.html#chap-stdenv"
],
"sec-using-llvm": [
"index.html#sec-using-llvm"
],
"sec-using-stdenv": [
"index.html#sec-using-stdenv"
],
@@ -418,9 +367,6 @@
"sec-tools-of-stdenv": [
"index.html#sec-tools-of-stdenv"
],
"sec-treefmt-options-reference": [
"index.html#sec-treefmt-options-reference"
],
"ssec-cosmic-common-issues": [
"index.html#ssec-cosmic-common-issues"
],
@@ -496,9 +442,6 @@
"tester-testEqualArrayOrMap-return": [
"index.html#tester-testEqualArrayOrMap-return"
],
"treefmt": [
"index.html#treefmt"
],
"typst": [
"index.html#typst",
"doc/languages-frameworks/typst.section.md#typst"

View File

@@ -3,6 +3,5 @@
This section lists the release notes for each stable version of Nixpkgs and current unstable revision.
```{=include=} sections
rl-2511.section.md
rl-2505.section.md
```

View File

@@ -28,7 +28,7 @@
- Applications linked against different Mesa versions than installed on the system should now work correctly going forward (however, applications against older Mesa, e.g. from Nixpkgs releases before 25.05, remain broken)
- Packages that used to depend on Mesa for libgbm or libdri should use `libgbm` or `dri-pkgconfig-stub` as inputs, respectively
- OpenSSH has been updated from 9.9p2 to 10.0p2, dropping support for DSA keys and adding a new `ssh-auth` binary to handle user authentication in a different address space from unauthenticated sessions. See the [full changelog](https://www.openwall.com/lists/oss-security/2025/04/09/1) for more details.
- OpenSSH has been updated from 9.9p2 to 10.0p2, dropping support for DSA keys and adding a new `ssh-auth` binary to handle user authentication in a different address space from unauthenticated sessions. Additionally, we now enable a configure option by default that attempts to lock sshd into RAM to prevent it from being swapped out, which may improve performance if the system is under memory pressure. See the [full changelog](https://www.openwall.com/lists/oss-security/2025/04/09/1) for more details.
- Emacs has been updated to 30.1.
This introduces some backwardsincompatible changes; see the NEWS for details.
@@ -74,7 +74,7 @@
configuration settings. Notably, it now defaults to listening on a socket
rather than a port. See [Migrating from version 1.x](https://github.com/roehling/postsrsd/blob/2.0.10/README.rst#migrating-from-version-1x) and [Postfix Setup](https://github.com/roehling/postsrsd?tab=readme-ov-file#postfix-setup) for details.
- `renovate` was updated to v39. See the [upstream release notes](https://github.com/renovatebot/renovate/releases/tag/39.0.0) for breaking changes.
- `renovate` was updated to v39. See the [upstream release notes](https://docs.renovatebot.com/release-notes-for-major-versions/#version-39) for breaking changes.
Like upstream's docker images, renovate now runs on NodeJS 22.
- The hand written `perlPackages.SearchXapian` bindings have been dropped in favor of the (mostly compatible)
@@ -247,10 +247,6 @@
- `strawberry` has been updated to 1.2, which drops support for the VLC backend and Qt 5. The `strawberry-qt5` package
and `withGstreamer`/`withVlc` override options have been removed due to this.
- `nexusmods-app` has been upgraded from version 0.6.3. If you were running a version older than 0.7.0, then before upgrading, you **must reset all app state** (mods, games, settings, etc). Otherwise, NexusMods.App will crash due to app state files incompatibility.
- Typically, you can can reset to a clean state by running `NexusMods.App uninstall-app`. See Nexus Mod's [how to uninstall the app](https://nexus-mods.github.io/NexusMods.App/users/Uninstall) documentation for more detail and alternative methods.
- This should not be necessary going forward, because loading app state from 0.7.0 or newer is now supported. This is documented in the [0.7.1 changelog](https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.7.1).
- `nezha` and its agent `nezha-agent` have been updated to v1, which contains breaking changes. See the [official wiki](https://nezha.wiki/en_US/) for more details.
- `ps3-disc-dumper` was updated to 4.2.5, which removed the CLI project and now exclusively offers the GUI
@@ -327,6 +323,9 @@
- `tldr` now uses [`tldr-python-client`](https://github.com/tldr-pages/tldr-python-client) instead of [`tldr-c-client`](https://github.com/tldr-pages/tldr-c-client) which is unmaintained.
- `renovate` was updated to v39. See the [upstream release notes](https://docs.renovatebot.com/release-notes-for-major-versions/#version-39) for breaking changes.
Like upstream's docker images, renovate now runs on NodeJS 22.
- The behavior of the `networking.nat.externalIP` and `networking.nat.externalIPv6` options has been changed. `networking.nat.forwardPorts` now only forwards packets destined for the specified IP addresses.
- `python3Packages.bpycv` has been removed due to being incompatible with Blender 4 and unmaintained.
@@ -441,10 +440,6 @@
There is also a breaking change in the handling of CUDA. Instead of using a CUDA compatible jaxlib
as before, you can use plugins like `python3Packages.jax-cuda12-plugin`.
- Added `allowVariants` to gate availability of package sets like `pkgsLLVM`, `pkgsMusl`, `pkgsZig`, etc. This was done in an effort to
decrease evaluation times by limiting the number of instances of nixpkgs to evaluate. The option will be removed in the future as a
new mechanism is in the works for handling cross compilation.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
## Other Notable Changes {#sec-nixpkgs-release-25.05-notable-changes}
@@ -542,6 +537,11 @@
- `ddclient` was updated from 3.11.2 to 4.0.0 [Release notes](https://github.com/ddclient/ddclient/releases/tag/v4.0.0)
- `nexusmods-app` has been upgraded from version 0.6.3 to 0.10.2.
- Before upgrading, you **must reset all app state** (mods, games, settings, etc). NexusMods.App will crash if any state from a version older than 0.7.0 is still present.
- Typically, you can can reset to a clean state by running `NexusMods.App uninstall-app`. See Nexus Mod's [how to uninstall the app](https://nexus-mods.github.io/NexusMods.App/users/Uninstall) documentation for more detail and alternative methods.
- This should not be necessary going forward, because loading app state from 0.7.0 or newer is now supported. This is documented in the [0.7.1 changelog](https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.7.1).
## Nixpkgs Library {#sec-nixpkgs-release-25.05-lib}
### Breaking changes {#sec-nixpkgs-release-25.05-lib-breaking}

View File

@@ -1,13 +1,9 @@
# Nixpkgs 25.11 ("Xantusia", 2025.11/??) {#sec-nixpkgs-release-25.11}
# Nixpkgs 25.11 (2025.11/??) {#sec-nixpkgs-release-25.11}
## Highlights {#sec-nixpkgs-release-25.11-highlights}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- The initial work to support native compilation on LoongArch64 has completed, with further changes currently
in preparation. In accordance with the [Software Development and Build Convention for LoongArch Architectures](https://github.com/loongson/la-softdev-convention),
this release sets the default march level to `la64v1.0`, covering the desktop and server processors of 3X5000
and newer series. However, embedded chips without LSX (Loongson SIMD eXtension), such as 2K0300 SoC, are not
supported. `pkgsCross.loongarch64-linux-embedded` can be used to build software and systems for these platforms.
- Create the first release note entry in this section!
## Backward Incompatibilities {#sec-nixpkgs-release-25.11-incompatibilities}
@@ -37,6 +33,5 @@
### Additions and Improvements {#sec-nixpkgs-release-25.11-lib-additions-improvements}
- `neovim`: Added support for the `vim.o.exrc` option, the `VIMINIT` environment variable, and sourcing of `sysinit.vim`.
- Create the first release note entry in this section!
See the neovim help page [`:help startup`](https://neovim.io/doc/user/starting.html#startup) for more information, as well as [the nixpkgs neovim wrapper documentation](#neovim-custom-configuration).

View File

@@ -1 +1,7 @@
(import ./default.nix { }).shell
let
pkgs = import ../. {
config = { };
overlays = [ ];
};
in
pkgs.nixpkgs-manual.shell

View File

@@ -261,7 +261,7 @@ stdenv.mkDerivation (finalAttrs: {
util-linux
qemu
];
# `checkPhase` elided
checkPhase = ''[elided]'';
})
```

View File

@@ -1,5 +0,0 @@
# Toolchains {#part-toolchains}
```{=include=} chapters
toolchains/llvm.chapter.md
```

View File

@@ -1,35 +0,0 @@
# The LLVM Toolchain {#chap-toolchains}
LLVM is a target-independent optimizer and code generator and serves as the basis for many compilers such as Haskell's GHC, rustc, Zig, and many others. It forms the base tools for Apple's Darwin platform.
## Using LLVM {#sec-using-llvm}
LLVM has two ways of being used. One is by using it across all of Nixpkgs and the other is to compile and build individual packages.
### Building packages with LLVM {#sec-building-packages-with-llvm}
Nixpkgs supports two methods of compiling the world with LLVM. One is via setting `useLLVM` in `crossSystem` while importing. This is the recommended way when cross compiling as it is more expressive. An example of doing `aarch64-linux` cross compilation from `x86_64-linux` with LLVM on the target is the following:
```nix
import <nixpkgs> {
localSystem = {
system = "x86_64-linux";
};
crossSystem = {
useLLVM = true;
linker = "lld";
};
}
```
Note that we set `linker` to `lld`. This is because LLVM has its own linker called "lld". By setting it, we utilize Clang and lld within this new instance of Nixpkgs. There is a shorthand method for building everything with LLVM: `pkgsLLVM`. This is easier to use with `nix-build` (or `nix build`):
```bash
nix-build -A pkgsLLVM.hello
```
This will compile the GNU hello package with LLVM and the lld linker like previously mentioned.
#### Using `clangStdenv` {#sec-building-packages-with-llvm-using-clang-stdenv}
Another simple way is to override the stdenv with `clangStdenv`. This causes a single package to be built with Clang. However, this `stdenv` does not override platform defaults to use compiler-rt, libc++, and libunwind. This is the preferred way to make a single package in Nixpkgs build with Clang. There are cases where just Clang isn't enough. For these situations, there is `libcxxStdenv`, which uses Clang with libc++ and compiler-rt.

View File

@@ -20,24 +20,6 @@
);
in
{
/**
The Nixpkgs repository/flake houses multiple components that provide functions.
These include the Nixpkgs `lib` library, with a larger number of functions for various purposes, as well as the `nixpkgs` (TBD) and `nixos` libraries whose main purpose is to provide configurability for those respective components.
*/
# This attribute set is intentionally not extensible. Its purpose is not dependency injection.
libs = {
/**
[The Nixpkgs library](https://nixos.org/manual/nixpkgs/unstable/#id-1.4)
*/
lib = import ./lib;
/**
Entrypoints into [NixOS](https://nixos.org/manual/nixos/unstable/), including [`runTest`](https://nixos.org/manual/nixos/unstable/#sec-call-nixos-test-outside-nixos).
*/
nixos = import ./nixos/lib { };
};
/**
`nixpkgs.lib` is a combination of the [Nixpkgs library](https://nixos.org/manual/nixpkgs/unstable/#id-1.4), and other attributes
that are _not_ part of the Nixpkgs library, but part of the Nixpkgs flake:

View File

@@ -1 +1 @@
25.11
25.05

View File

@@ -309,7 +309,6 @@ let
stringLength
substring
isString
replaceString
replaceStrings
intersperse
concatStringsSep
@@ -346,7 +345,6 @@ let
upperChars
toLower
toUpper
toCamelCase
toSentenceCase
addContextFrom
splitString

View File

@@ -703,7 +703,7 @@ in
# Type
```
difference :: FileSet -> FileSet -> FileSet
union :: FileSet -> FileSet -> FileSet
```
# Examples

View File

@@ -18,7 +18,7 @@ let
concatStrings
escape
head
replaceString
replaceStrings
;
mkPrimitive = t: v: {
@@ -451,7 +451,7 @@ rec {
mkString =
v:
let
sanitize = s: replaceString "\n" "\\n" (escape [ "'" "\\" ] s);
sanitize = s: replaceStrings [ "\n" ] [ "\\n" ] (escape [ "'" "\\" ] s);
in
mkPrimitive type.string v
// {

View File

@@ -332,41 +332,6 @@ rec {
*/
concatLines = concatMapStrings (s: s + "\n");
/**
Given string `s`, replace every occurrence of the string `from` with the string `to`.
# Inputs
`from`
: The string to be replaced
`to`
: The string to replace with
`s`
: The original string where replacements will be made
# Type
```
replaceString :: string -> string -> string -> string
```
# Examples
:::{.example}
## `lib.strings.replaceString` usage example
```nix
replaceString "world" "Nix" "Hello, world!"
=> "Hello, Nix!"
replaceString "." "_" "v1.2.3"
=> "v1_2_3"
```
:::
*/
replaceString = from: to: replaceStrings [ from ] [ to ];
/**
Repeat a string `n` times,
and concatenate the parts into a new string.
@@ -1173,7 +1138,7 @@ rec {
string = toString arg;
in
if match "[[:alnum:],._+:@%/-]+" string == null then
"'${replaceString "'" "'\\''" string}'"
"'${replaceStrings [ "'" ] [ "'\\''" ] string}'"
else
string;
@@ -1535,63 +1500,6 @@ rec {
addContextFrom str (toUpper firstChar + toLower rest)
);
/**
Converts a string to camelCase. Handles snake_case, PascalCase,
kebab-case strings as well as strings delimited by spaces.
# Inputs
`string`
: The string to convert to camelCase
# Type
```
toCamelCase :: string -> string
```
# Examples
:::{.example}
## `lib.strings.toCamelCase` usage example
```nix
toCamelCase "hello-world"
=> "helloWorld"
toCamelCase "hello_world"
=> "helloWorld"
toCamelCase "hello world"
=> "helloWorld"
toCamelCase "HelloWorld"
=> "helloWorld"
```
:::
*/
toCamelCase =
str:
lib.throwIfNot (isString str) "toCamelCase does only accepts string values, but got ${typeOf str}" (
let
separators = splitStringBy (
prev: curr:
elem curr [
"-"
"_"
" "
]
) false str;
parts = lib.flatten (
map (splitStringBy (
prev: curr: match "[a-z]" prev != null && match "[A-Z]" curr != null
) true) separators
);
first = if length parts > 0 then toLower (head parts) else "";
rest = if length parts > 1 then map toSentenceCase (tail parts) else [ ];
in
concatStrings (map (addContextFrom str) ([ first ] ++ rest))
);
/**
Appends string context from string like object `src` to `target`.

View File

@@ -329,39 +329,6 @@ rec {
"avx512"
"fma"
];
# LoongArch64
# https://github.com/loongson/la-toolchain-conventions
loongarch64 = [
"fpu64"
];
la464 = [
"fpu64"
"lsx"
"lasx"
];
la664 = [
"fpu64"
"lsx"
"lasx"
"div32"
"frecipe"
"lam-bh"
"lamcas"
"ld-seq-sa"
];
"la64v1.0" = [
"fpu64"
"lsx"
];
"la64v1.1" = [
"fpu64"
"lsx"
"div32"
"frecipe"
"lam-bh"
"lamcas"
"ld-seq-sa"
];
# other
armv5te = [ ];
armv6 = [ ];
@@ -519,16 +486,6 @@ rec {
ampere1a = [ "ampere1" ] ++ inferiors.ampere1;
ampere1b = [ "ampere1a" ] ++ inferiors.ampere1a;
# LoongArch64
loongarch64 = [ ];
"la64v1.0" = [ "loongarch64" ];
la464 = [ "la64v1.0" ] ++ inferiors."la64v1.0";
"la64v1.1" = [ "la64v1.0" ] ++ inferiors."la64v1.0";
la664 = withInferiors [
"la464"
"la64v1.1"
];
# other
armv5te = [ ];
armv6 = [ ];
@@ -537,70 +494,6 @@ rec {
loongson2f = [ ];
};
/**
Check whether one GCC architecture has the the other inferior architecture.
# Inputs
`arch1`
: GCC architecture in string
`arch2`
: GCC architecture in string
# Type
```
hasInferior :: string -> string -> bool
```
# Examples
::: {.example}
## `lib.systems.architectures.hasInferior` usage example
```nix
hasInferior "x86-64-v3" "x86-64"
=> true
hasInferior "x86-64" "x86-64-v3"
=> false
hasInferior "x86-64" "x86-64"
=> false
```
*/
hasInferior = arch1: arch2: inferiors ? ${arch1} && lib.elem arch2 inferiors.${arch1};
/**
Check whether one GCC architecture can execute the other.
# Inputs
`arch1`
: GCC architecture in string
`arch2`
: GCC architecture in string
# Type
```
canExecute :: string -> string -> bool
```
# Examples
::: {.example}
## `lib.systems.architectures.canExecute` usage example
```nix
canExecute "x86-64" "x86-64-v3"
=> false
canExecute "x86-64-v3" "x86-64"
=> true
canExecute "x86-64" "x86-64"
=> true
```
*/
canExecute = arch1: arch2: arch1 == arch2 || hasInferior arch1 arch2;
predicates =
let
featureSupport = feature: x: builtins.elem feature features.${x} or [ ];
@@ -617,7 +510,5 @@ rec {
aesSupport = featureSupport "aes";
fmaSupport = featureSupport "fma";
fma4Support = featureSupport "fma4";
lsxSupport = featureSupport "lsx";
lasxSupport = featureSupport "lasx";
};
}

View File

@@ -14,7 +14,7 @@ let
optionalAttrs
optionalString
removeSuffix
replaceString
replaceStrings
toUpper
;
@@ -97,21 +97,7 @@ let
platform:
final.isAndroid == platform.isAndroid
&& parse.isCompatible final.parsed.cpu platform.parsed.cpu
&& final.parsed.kernel == platform.parsed.kernel
&& (
# Only perform this check when cpus have the same type;
# assume compatible cpu have all the instructions included
final.parsed.cpu == platform.parsed.cpu
->
# if both have gcc.arch defined, check whether final can execute the given platform
(
(final ? gcc.arch && platform ? gcc.arch)
-> architectures.canExecute final.gcc.arch platform.gcc.arch
)
# if platform has gcc.arch defined but final doesn't, don't assume it can be executed
|| (platform ? gcc.arch -> !(final ? gcc.arch))
);
&& final.parsed.kernel == platform.parsed.kernel;
isCompatible =
_:
throw "2022-05-23: isCompatible has been removed in favor of canExecute, refer to the 22.11 changelog for details";
@@ -522,7 +508,7 @@ let
#
# https://github.com/rust-lang/cargo/pull/9169
# https://github.com/rust-lang/cargo/issues/8285#issuecomment-634202431
cargoEnvVarTarget = replaceString "-" "_" (toUpper final.rust.cargoShortTarget);
cargoEnvVarTarget = replaceStrings [ "-" ] [ "_" ] (toUpper final.rust.cargoShortTarget);
# True if the target is no_std
# https://github.com/rust-lang/rust/blob/2e44c17c12cec45b6a682b1e53a04ac5b5fcc9d2/src/bootstrap/config.rs#L415-L421
@@ -556,7 +542,7 @@ let
"x86_64" = "amd64";
"wasm32" = "wasm";
}
.${final.parsed.cpu.name} or null;
.${final.parsed.cpu.name} or (throw "Unknown CPU variant ${final.parsed.cpu.name} by Go");
GOOS = if final.isWasi then "wasip1" else final.parsed.kernel.name;
# See https://go.dev/wiki/GoArm

View File

@@ -170,17 +170,9 @@ rec {
libc = "newlib";
};
# https://github.com/loongson/la-softdev-convention/blob/master/la-softdev-convention.adoc#10-operating-system-package-build-requirements
loongarch64-linux = lib.recursiveUpdate platforms.loongarch64-multiplatform {
loongarch64-linux = {
config = "loongarch64-unknown-linux-gnu";
};
loongarch64-linux-embedded = lib.recursiveUpdate platforms.loongarch64-multiplatform {
config = "loongarch64-unknown-linux-gnu";
gcc = {
arch = "loongarch64";
strict-align = true;
};
};
mmix = {
config = "mmix-unknown-mmixware";

View File

@@ -572,27 +572,6 @@ rec {
};
};
loongarch64-multiplatform = {
gcc = {
# https://github.com/loongson/la-softdev-convention/blob/master/la-softdev-convention.adoc#10-operating-system-package-build-requirements
arch = "la64v1.0";
strict-align = false;
# Avoid text sections of large apps exceeding default code model
# Will be default behavior in LLVM 21 and hopefully GCC16
# https://github.com/loongson-community/discussions/issues/43
# https://github.com/llvm/llvm-project/pull/132173
cmodel = "medium";
};
linux-kernel = {
name = "loongarch-multiplatform";
target = "vmlinuz.efi";
autoModules = true;
preferBuiltin = true;
baseConfig = "defconfig";
DTB = true;
};
};
# This function takes a minimally-valid "platform" and returns an
# attrset containing zero or more additional attrs which should be
# included in the platform in order to further elaborate it.
@@ -619,9 +598,6 @@ rec {
else if platform.isAarch64 then
if platform.isDarwin then apple-m1 else aarch64-multiplatform
else if platform.isLoongArch64 then
loongarch64-multiplatform
else if platform.isRiscV then
riscv-multiplatform
@@ -631,8 +607,6 @@ rec {
else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then
powernv
else if platform.isLoongArch64 then
loongarch64-multiplatform
else
{ };
}

View File

@@ -1,6 +1,6 @@
# to run these tests (and the others)
# nix-build nixpkgs/lib/tests/release.nix
# These tests should stay in sync with the comment in maintainers/maintainer-list.nix
# These tests should stay in sync with the comment in maintainers/maintainers-list.nix
{
# The pkgs used for dependencies for the testing itself
pkgs ? import ../.. { },

View File

@@ -91,7 +91,6 @@ let
range
recursiveUpdateUntil
removePrefix
replaceString
replicate
runTests
setFunctionArgs
@@ -498,11 +497,6 @@ runTests {
expected = "/usr/include:/usr/local/include";
};
testReplaceStringString = {
expr = strings.replaceString "." "_" "v1.2.3";
expected = "v1_2_3";
};
testReplicateString = {
expr = strings.replicate 5 "hello";
expected = "hellohellohellohellohello";
@@ -975,28 +969,6 @@ runTests {
testToSentenceCasePath = testingThrow (strings.toSentenceCase ./.);
testToCamelCase = {
expr = strings.toCamelCase "hello world";
expected = "helloWorld";
};
testToCamelCaseFromKebab = {
expr = strings.toCamelCase "hello-world";
expected = "helloWorld";
};
testToCamelCaseFromSnake = {
expr = strings.toCamelCase "hello_world";
expected = "helloWorld";
};
testToCamelCaseFromPascal = {
expr = strings.toCamelCase "HelloWorld";
expected = "helloWorld";
};
testToCamelCasePath = testingThrow (strings.toCamelCase ./.);
testToInt = testAllTrue [
# Naive
(123 == toInt "123")
@@ -1734,11 +1706,6 @@ runTests {
];
};
testReplaceString = {
expr = replaceString "world" "Nix" "Hello, world!";
expected = "Hello, Nix!";
};
testReplicate = {
expr = replicate 3 "a";
expected = [

View File

@@ -439,7 +439,7 @@ in
On each release the first letter is bumped and a new animal is chosen
starting with that new letter.
*/
codeName = "Xantusia";
codeName = "Warbler";
/**
Returns the current nixpkgs version suffix as string.

View File

@@ -40,10 +40,6 @@ In order to do so, add yourself to the
[`maintainer-list.nix`](./maintainer-list.nix), and then to the desired
package's `meta.maintainers` list, and send a PR with the changes.
If you're adding yourself as a maintainer as part of another PR (in which
you become a maintainer of a package, for example), make your change to
`maintainer-list.nix` in a separate commit.
### How to lose maintainer status
Maintainers who have become inactive on a given package can be removed. This

View File

@@ -2135,11 +2135,6 @@
githubId = 56650223;
name = "Artturi N";
};
artur-sannikov = {
name = "Artur Sannikov";
github = "artur-sannikov";
githubId = 40318410;
};
arturcygan = {
email = "arczicygan@gmail.com";
github = "arcz";
@@ -2343,10 +2338,11 @@
githubId = 11548989;
};
atalii = {
email = "me@tali.network";
email = "taliauster@gmail.com";
github = "atalii";
githubId = 120901234;
name = "Tali Auster";
name = "tali auster";
matrix = "@atalii:matrix.org";
};
atar13 = {
name = "Anthony Tarbinian";
@@ -3059,12 +3055,6 @@
github = "benhiemer";
githubId = 16649926;
};
benjajaja = {
name = "Benjamin Große";
email = "ste3ls@gmail.com";
github = "benjajaja";
githubId = 310215;
};
benjaminedwardwebb = {
name = "Ben Webb";
email = "benjaminedwardwebb@gmail.com";
@@ -3486,11 +3476,6 @@
githubId = 50839;
name = "Brian Jones";
};
bokicoder = {
github = "bokicoder";
githubId = 193465580;
name = "bokicoder";
};
boldikoller = {
email = "boldi.koller@wtss.eu";
github = "boldikoller";
@@ -4011,18 +3996,6 @@
githubId = 141733;
name = "Andrew Bruce";
};
Cameo007 = {
name = "Pascal Dietrich";
email = "pascal.1.dietrich@hotmail.com";
matrix = "@cameo007:mintux.de";
github = "Cameo007";
githubId = 80521473;
keys = [
{
fingerprint = "2D62 24B9 1250 86AF E318 12A0 F1D1 5228 0511 FB91";
}
];
};
camerondugan = {
email = "cameron.dugan@protonmail.com";
github = "camerondugan";
@@ -4438,13 +4411,6 @@
githubId = 631802;
keys = [ { fingerprint = "099E 3F97 FA08 3D47 8C75 EBEC E0EB AD78 F019 0BD9"; } ];
};
chillcicada = {
email = "2210227279@qq.com";
name = "chillcicada";
github = "chillcicada";
githubId = 116548943;
keys = [ { fingerprint = "734C 20B3 33C4 FAB3 0BD0 743A 34C2 1231 0A99 754B"; } ];
};
chiroptical = {
email = "chiroptical@gmail.com";
github = "chiroptical";
@@ -5674,12 +5640,6 @@
githubId = 4971975;
name = "Janne Heß";
};
dashietm = {
email = "fabio.lenherr@gmail.com";
github = "DashieTM";
githubId = 72016555;
name = "Fabio Lenherr";
};
dasisdormax = {
email = "dasisdormax@mailbox.org";
github = "dasisdormax";
@@ -6519,12 +6479,6 @@
githubId = 131907205;
name = "David Thievon";
};
dolphindalt = {
email = "dolphindalt@gmail.com";
github = "dolphindalt";
githubId = 13937320;
name = "Dalton Caron";
};
domenkozar = {
email = "domen@dev.si";
github = "domenkozar";
@@ -6554,7 +6508,7 @@
name = "DontEatOreo";
github = "DontEatOreo";
githubId = 57304299;
matrix = "@donteatoreo:matrix.org";
keys = [ { fingerprint = "33CD 5C0A 673C C54D 661E 5E4C 0DB5 361B EEE5 30AB"; } ];
};
dopplerian = {
name = "Dopplerian";
@@ -6606,12 +6560,6 @@
github = "dottybot";
githubId = 12519979;
};
douzebis = {
email = "fred@atlant.is";
github = "douzebis";
githubId = 61088438;
name = "Frédéric Ruget";
};
dpaetzel = {
email = "david.paetzel@posteo.de";
github = "dpaetzel";
@@ -7881,12 +7829,6 @@
github = "hatch01";
githubId = 42416805;
};
ezrizhu = {
name = "Ezri Zhu";
email = "me@ezrizhu.com";
github = "ezrizhu";
githubId = 44515009;
};
f--t = {
email = "git@f-t.me";
github = "f--t";
@@ -8156,12 +8098,6 @@
githubId = 8182846;
name = "Francesco Gazzetta";
};
fgrcl = {
email = "fgrclaberge@gmail.com";
github = "FGRCL";
githubId = 35940434;
name = "Francois LaBerge";
};
fidgetingbits = {
name = "fidgetingbits";
email = "nixpkgs.xe7au@passmail.net";
@@ -10130,12 +10066,6 @@
githubId = 130903;
name = "Ana Hobden";
};
hpfr = {
email = "liam@hpfr.net";
github = "hpfr";
githubId = 44043764;
name = "Liam Hupfer";
};
hqurve = {
email = "hqurve@outlook.com";
github = "hqurve";
@@ -11200,7 +11130,6 @@
name = "Jappie Klooster";
};
jappie3 = {
email = "jappie3+git@jappie.dev";
name = "Jappie3";
matrix = "@jappie:jappie.dev";
github = "Jappie3";
@@ -11531,12 +11460,6 @@
githubId = 30251156;
name = "Jesse Moore";
};
jethair = {
email = "jethair@duck.com";
github = "JetHair";
githubId = 106916147;
name = "JetHair";
};
jethro = {
email = "jethrokuan95@gmail.com";
github = "jethrokuan";
@@ -13037,6 +12960,12 @@
githubId = 843652;
name = "Kim Burgess";
};
kindrowboat = {
email = "hello@kindrobot.ca";
github = "kindrowboat";
githubId = 777773;
name = "Stef Dunlap";
};
kini = {
email = "keshav.kini@gmail.com";
github = "kini";
@@ -13643,12 +13572,6 @@
github = "L0L1P0P1";
githubId = 73695812;
};
l0r3v = {
email = "l0r3v@pasqui.casa";
github = "l0r3v";
githubId = 27364685;
name = "Lorenzo Pasqui";
};
l1npengtul = {
email = "l1npengtul@l1npengtul.lol";
github = "l1npengtul";
@@ -14028,12 +13951,6 @@
github = "LogicalOverflow";
githubId = 5919957;
};
lheintzmann1 = {
email = "lheintzmann1@disroot.org";
github = "lheintzmann1";
githubId = 141759313;
name = "Lucas Heintzmann";
};
lhvwb = {
email = "nathaniel.baxter@gmail.com";
github = "nathanielbaxter";
@@ -15720,16 +15637,6 @@
name = "John McParland";
keys = [ { fingerprint = "39D2 171D D733 C718 DD21 285E B326 E14B 05D8 7A4E"; } ];
};
MCSeekeri = {
email = "mcseekeri@outlook.com";
github = "mcseekeri";
githubId = 20928094;
name = "MCSeekeri";
keys = [
{ fingerprint = "5922 79AB D9D6 85EB 9D16 754C ECDC AD89 5A38 4A12"; }
{ fingerprint = "0762 A387 F160 76F1 116C BF13 3276 6666 6666 6666"; }
];
};
McSinyx = {
email = "cnx@loang.net";
github = "McSinyx";
@@ -16174,12 +16081,6 @@
githubId = 978196;
name = "Michaël Faille";
};
mikehorn = {
email = "mikehornproton@proton.me";
github = "MikeHorn-git";
githubId = 123373126;
name = "Mike Horn";
};
mikesperber = {
email = "sperber@deinprogramm.de";
github = "mikesperber";
@@ -16608,10 +16509,8 @@
moraxyc = {
name = "Moraxyc Xu";
email = "i@qaq.li";
matrix = "@moraxyc:qaq.li";
github = "Moraxyc";
githubId = 69713071;
keys = [ { fingerprint = "7DD1 A4DF 7DD6 AEEB F07B 1108 8296 4F3A B1D9 DE79"; } ];
};
moredread = {
email = "code@apb.name";
@@ -16836,12 +16735,6 @@
githubId = 7026881;
name = "Jarosław Jedynak";
};
msoos = {
email = "soos.mate@gmail.com";
github = "msoos";
githubId = 1334841;
name = "Mate Soos";
};
mstarzyk = {
email = "mstarzyk@gmail.com";
github = "mstarzyk";
@@ -16891,6 +16784,12 @@
githubId = 72663763;
keys = [ { fingerprint = "DB3E A12D B291 594A 79C5 F6B3 10AB 6868 37F6 FA3F"; } ];
};
mtreca = {
email = "maxime.treca@gmail.com";
github = "mtreca";
githubId = 16440823;
name = "Maxime Tréca";
};
mtreskin = {
email = "zerthurd@gmail.com";
github = "Zert";
@@ -17615,7 +17514,7 @@
};
nicoo = {
email = "nicoo@debian.org";
github = "nicoonoclaste";
github = "nbraud";
githubId = 1155801;
name = "nicoo";
keys = [ { fingerprint = "E44E 9EA5 4B8E 256A FB73 49D3 EC9D 3708 72BC 7A8C"; } ];
@@ -18746,12 +18645,6 @@
name = "Philipp Rintz";
matrix = "@philipp:srv.icu";
};
p0lyw0lf = {
email = "p0lyw0lf@protonmail.com";
name = "PolyWolf";
github = "p0lyw0lf";
githubId = 31190026;
};
p3psi = {
name = "Elliot Boo";
email = "p3psi.boo@gmail.com";
@@ -20881,12 +20774,6 @@
githubId = 3302;
name = "Renzo Carbonara";
};
repparw = {
email = "ubritos@gmail.com";
github = "repparw";
githubId = 45952970;
name = "repparw";
};
reputable2772 = {
name = "Reputable2772";
github = "Reputable2772";
@@ -21778,12 +21665,6 @@
githubId = 7309170;
name = "Ryota Kameoka";
};
ryota2357 = {
email = "contact@ryota2357.com";
github = "ryota2357";
githubId = 61523777;
name = "Ryota Otsuki";
};
rypervenche = {
email = "git@ryper.org";
github = "rypervenche";
@@ -22936,11 +22817,6 @@
matrix = "@c3n21:matrix.org";
githubId = 37077738;
};
sinjin2300 = {
name = "Sinjin";
github = "Sinjin2300";
githubId = 35543336;
};
sioodmy = {
name = "Antoni Sokołowski";
github = "sioodmy";
@@ -23454,13 +23330,6 @@
githubId = 16364318;
name = "Jeffrey Harmon";
};
squat = {
matrix = "@squat:beeper.com";
name = "squat";
github = "squat";
githubId = 20484159;
keys = [ { fingerprint = "F246 425A 7650 6F37 0552 BA8D DEA9 C405 09D9 65F5"; } ];
};
srghma = {
email = "srghma@gmail.com";
github = "srghma";
@@ -24083,12 +23952,6 @@
githubId = 40228615;
name = "Taha Yassine";
};
tahlonbrahic = {
email = "tahlonbrahic@proton.me";
github = "tahlonbrahic";
githubId = 104690672;
name = "Tahlon Brahic";
};
taikx4 = {
email = "taikx4@taikx4szlaj2rsdupcwabg35inbny4jk322ngeb7qwbbhd5i55nf5yyd.onion";
github = "taikx4";
@@ -24729,20 +24592,6 @@
githubId = 1220572;
name = "Christian Theune";
};
thevar1able = {
email = "var1able+nixpkgs@var1able.network";
github = "thevar1able";
githubId = 875885;
name = "Konstantin Bogdanov";
keys = [
{ fingerprint = "3221 7A73 EB95 0E9E E550 36A3 DB39 9448 D9FE 52F1"; }
];
};
theverygaming = {
name = "theverygaming";
github = "theverygaming";
githubId = 18639279;
};
thiagokokada = {
email = "thiagokokada@gmail.com";
github = "thiagokokada";
@@ -25802,11 +25651,6 @@
github = "deviant";
githubId = 68829907;
};
vaavaav = {
name = "Pedro Peixoto";
github = "vaavaav";
githubId = 56087034;
};
vaci = {
email = "vaci@vaci.org";
github = "vaci";
@@ -26396,12 +26240,6 @@
github = "waynr";
githubId = 1441126;
};
wcarlsen = {
name = "Willi Carlsen";
email = "carlsenwilli@gmail.com";
github = "wcarlsen";
githubId = 17003032;
};
wchresta = {
email = "wchresta.nix@chrummibei.ch";
github = "wchresta";
@@ -26741,12 +26579,6 @@
githubId = 9132420;
keys = [ { fingerprint = "F943 A0BC 720C 5BEF 73CD E02D B398 93FA 5F65 CAE1"; } ];
};
womeier = {
name = "Wolfgang Meier";
email = "womeier@posteo.de";
github = "womeier";
githubId = 55190123;
};
womfoo = {
email = "kranium@gikos.net";
github = "womfoo";

View File

@@ -16,7 +16,7 @@ a given nixpkgs maintainer, equivalent to `lib.maintainers.${x} // { handle = x;
This allows looking up a maintainer's attrset (including GitHub and Matrix
handles, email address etc.) based on any of their handles, more correctly and
robustly than text search through `maintainer-list.nix`.
robustly than text search through `maintainers-list.nix`.
```
./get-maintainer.sh nicoo

View File

@@ -1,25 +1,17 @@
#!/usr/bin/env bash
# Find alleged cherry-picks
set -eo pipefail
set -e
if [ $# != "2" ] ; then
echo "usage: check-cherry-picks.sh base_rev head_rev"
exit 2
fi
# Make sure we are inside the nixpkgs repo, even when called from outside
cd "$(dirname "${BASH_SOURCE[0]}")"
PICKABLE_BRANCHES="master staging release-??.?? staging-??.?? haskell-updates python-updates staging-next staging-next-??.??"
PICKABLE_BRANCHES=${PICKABLE_BRANCHES:-master staging release-??.?? staging-??.??}
problem=0
# Not everyone calls their remote "origin"
remote="$(git remote -v | grep -i 'NixOS/nixpkgs' | head -n1 | cut -f1 || true)"
commits="$(git rev-list --reverse "$1..$2")"
while read -r new_commit_sha ; do
while read new_commit_sha ; do
if [ -z "$new_commit_sha" ] ; then
continue # skip empty lines
fi
@@ -34,47 +26,30 @@ while read -r new_commit_sha ; do
original_commit_sha=$(
git rev-list --max-count=1 --format=format:%B "$new_commit_sha" \
| grep -Ei -m1 "cherry.*[0-9a-f]{40}" \
| grep -Eoi -m1 '[0-9a-f]{40}' || true
| grep -Eoi -m1 '[0-9a-f]{40}'
)
if [ -z "$original_commit_sha" ] ; then
if [ "$GITHUB_ACTIONS" = 'true' ] ; then
echo ::endgroup::
echo -n "::error ::"
else
echo -n " ✘ "
fi
echo "Couldn't locate original commit hash in message"
echo "Note this should not necessarily be treated as a hard fail, but a reviewer's attention should" \
"be drawn to it and github actions have no way of doing that but to raise a 'failure'"
problem=1
if [ "$?" != "0" ] ; then
echo " ? Couldn't locate original commit hash in message"
[ "$GITHUB_ACTIONS" = 'true' ] && echo ::endgroup::
continue
fi
set -f # prevent pathname expansion of patterns
for pattern in $PICKABLE_BRANCHES ; do
for branch_pattern in $PICKABLE_BRANCHES ; do
set +f # re-enable pathname expansion
# Reverse sorting by refname and taking one match only means we can only backport
# from unstable and the latest stable. That makes sense, because even right after
# branch-off, when we have two supported stable branches, we only ever want to cherry-pick
# **to** the older one, but never **from** it.
# This makes the job significantly faster in the case when commits can't be found,
# because it doesn't need to iterate through 20+ branches, which all need to be fetched.
branches="$(git for-each-ref --sort=-refname --format="%(refname)" \
"refs/remotes/${remote:-origin}/$pattern" | head -n1)"
while read -r picked_branch ; do
if git merge-base --is-ancestor "$original_commit_sha" "$picked_branch" ; then
echo "$original_commit_sha present in branch $picked_branch"
range_diff_common='git --no-pager range-diff
range_diff_common='git range-diff
--no-notes
--creation-factor=100
'"$original_commit_sha~..$original_commit_sha"'
'"$new_commit_sha~..$new_commit_sha"'
'
if $range_diff_common --no-color 2> /dev/null | grep -E '^ {4}[+-]{2}' > /dev/null ; then
if $range_diff_common --no-color | grep -E '^ {4}[+-]{2}' > /dev/null ; then
if [ "$GITHUB_ACTIONS" = 'true' ] ; then
echo ::endgroup::
echo -n "::warning ::"
@@ -97,7 +72,11 @@ while read -r new_commit_sha ; do
# move on to next commit
continue 3
fi
done <<< "$branches"
done <<< "$(
git for-each-ref \
--format="%(refname)" \
"refs/remotes/origin/$branch_pattern"
)"
done
if [ "$GITHUB_ACTIONS" = 'true' ] ; then
@@ -109,6 +88,10 @@ while read -r new_commit_sha ; do
echo "$original_commit_sha not found in any pickable branch"
problem=1
done <<< "$commits"
done <<< "$(
git rev-list \
-E -i --grep="cherry.*[0-9a-f]{40}" --reverse \
"$1..$2"
)"
exit $problem

View File

@@ -558,16 +558,7 @@ class Editor:
}
for plugin_desc, plugin, redirect in fetched:
# Check if plugin is a Plugin object and has normalized_name attribute
if isinstance(plugin, Plugin) and hasattr(plugin, 'normalized_name'):
result[plugin.normalized_name] = (plugin_desc, plugin, redirect)
elif isinstance(plugin, Exception):
# For exceptions, we can't determine the normalized_name
# Just log the error and continue
log.error(f"Error fetching plugin {plugin_desc.name}: {plugin!r}")
else:
# For unexpected types, log the issue
log.error(f"Unexpected plugin type for {plugin_desc.name}: {type(plugin)}")
result[plugin.normalized_name] = (plugin_desc, plugin, redirect)
return list(result.values())
@@ -624,9 +615,9 @@ class Editor:
"--github-token",
"-t",
type=str,
default=os.getenv("GITHUB_TOKEN"),
default=os.getenv("GITHUB_API_TOKEN"),
help="""Allows to set --proc to higher values.
Uses GITHUB_TOKEN environment variables as the default value.""",
Uses GITHUB_API_TOKEN environment variables as the default value.""",
)
common.add_argument(
"--no-commit",

View File

@@ -63,6 +63,7 @@ with lib.maintainers;
shortName = "apm employees";
# Edits to this list should only be done by an already existing member.
members = [
wolfgangwalther
DutchGerman
];
};
@@ -1191,12 +1192,7 @@ with lib.maintainers;
};
systemd = {
members = [
flokli
arianvp
elvishjerricco
aanderse
];
members = [ ];
githubTeams = [ "systemd" ];
scope = "Maintain systemd for NixOS.";
shortName = "systemd";

View File

@@ -29,7 +29,7 @@ Thus you should pick one or more of the following lines:
{
services.xserver.desktopManager.plasma5.enable = true;
services.xserver.desktopManager.xfce.enable = true;
services.desktopManager.gnome.enable = true;
services.xserver.desktopManager.gnome.enable = true;
services.xserver.desktopManager.mate.enable = true;
services.xserver.windowManager.xmonad.enable = true;
services.xserver.windowManager.twm.enable = true;
@@ -46,7 +46,7 @@ alternative one by picking one of the following lines:
```nix
{
services.displayManager.sddm.enable = true;
services.displayManager.gdm.enable = true;
services.xserver.displayManager.gdm.enable = true;
}
```

View File

@@ -17,28 +17,6 @@ There's also [a convenient development daemon](https://nixos.org/manual/nixpkgs/
The above instructions don't deal with the appendix of available `configuration.nix` options, and the manual pages related to NixOS. These are built, and written in a different location and in a different format, as explained in the next sections.
## Development environment {#sec-contributing-development-env}
In order to reduce repetition, consider using tools from the provided development environment:
Load it from the NixOS documentation directory with
```ShellSession
$ cd /path/to/nixpkgs/nixos/doc/manual
$ nix-shell
```
To load the development utilities automatically when entering that directory, [set up `nix-direnv`](https://nix.dev/guides/recipes/direnv).
Make sure that your local files aren't added to Git history by adding the following lines to `.git/info/exclude` at the root of the Nixpkgs repository:
```
/**/.envrc
/**/.direnv
```
You might want to also use [`devmode`](https://github.com/NixOS/nixpkgs/blob/master/doc/README.md#devmode) while editing the manual.
## Testing redirects {#sec-contributing-redirects}
Once you have a successful build, you can open the relevant HTML (path mentioned above) in a browser along with the anchor, and observe the redirection.

View File

@@ -4,9 +4,7 @@ The best way to keep your NixOS installation up to date is to use one of
the NixOS *channels*. A channel is a Nix mechanism for distributing Nix
expressions and associated binaries. The NixOS channels are updated
automatically from NixOS's Git repository after certain tests have
passed and a selection of packages has been built successfully
(see `nixos/release-combined.nix` and `nixos/release-small.nix`).
These channels are:
passed and all packages have been built. These channels are:
- *Stable channels*, such as [`nixos-25.05`](https://channels.nixos.org/nixos-25.05).
These only get conservative bug fixes and package upgrades. For

View File

@@ -50,12 +50,6 @@
"module-services-crab-hole-upstream-options": [
"index.html#module-services-crab-hole-upstream-options"
],
"module-services-opencloud": [
"index.html#module-services-opencloud"
],
"module-services-opencloud-basic-usage": [
"index.html#module-services-opencloud-basic-usage"
],
"module-services-strfry": [
"index.html#module-services-strfry"
],
@@ -77,9 +71,6 @@
"ch-installation": [
"index.html#ch-installation"
],
"sec-contributing-development-env": [
"index.html#sec-contributing-development-env"
],
"sec-mattermost": [
"index.html#sec-mattermost"
],
@@ -1988,21 +1979,6 @@
"ch-release-notes": [
"release-notes.html#ch-release-notes"
],
"sec-release-25.11": [
"release-notes.html#sec-release-25.11"
],
"sec-release-25.11-highlights": [
"release-notes.html#sec-release-25.11-highlights"
],
"sec-release-25.11-new-modules": [
"release-notes.html#sec-release-25.11-new-modules"
],
"sec-release-25.11-incompatibilities": [
"release-notes.html#sec-release-25.11-incompatibilities"
],
"sec-release-25.11-notable-changes": [
"release-notes.html#sec-release-25.11-notable-changes"
],
"sec-release-25.05": [
"release-notes.html#sec-release-25.05"
],

View File

@@ -3,7 +3,6 @@
This section lists the release notes for each stable version of NixOS and current unstable revision.
```{=include=} sections
rl-2511.section.md
rl-2505.section.md
rl-2411.section.md
rl-2405.section.md

View File

@@ -20,7 +20,7 @@ Alongside many enhancements to NixOS modules and general system improvements, th
- GNOME has been updated to version 48.
- `decibels` music player is now installed by default. You can disable it using [](#opt-environment.gnome.excludePackages).
- `gnome-shell-extensions` extension collection (which included GNOME Classic extensions, Apps Menu, and User Themes, among others) are no longer installed by default. You can install them again with {option}`services.xserver.desktopManager.gnome.sessionPath`.
- `gnome-shell-extensions` extension collection (which included GNOME Classic extensions, Apps Menu, and User Themes, among others) are no longer installed by default. You can install them again with [](#opt-services.xserver.desktopManager.gnome.sessionPath).
- Option [](#opt-services.gnome.core-developer-tools.enable) now also installs `sysprof` and `d-spy`.
- Option `services.gnome.core-utilities.enable` has been renamed to [](#opt-services.gnome.core-apps.enable).
- `cantarell-fonts`, `source-code-pro` and `source-sans` fonts are no longer installed by default. They have been replaced by `adwaita-fonts`.
@@ -48,43 +48,43 @@ Alongside many enhancements to NixOS modules and general system improvements, th
- [scanservjs](https://github.com/sbs20/scanservjs/), a web UI for SANE scanners. Available at [services.scanservjs](#opt-services.scanservjs.enable).
- [Kimai](https://www.kimai.org/), a web-based multi-user time-tracking application. Available as [services.kimai](#opt-services.kimai.sites).
- [Kimai](https://www.kimai.org/), a web-based multi-user time-tracking application. Available as [services.kimai](options.html#opt-services.kimai).
- [Kismet](https://www.kismetwireless.net/), a Wi-Fi, Bluetooth, and RF monitoring application supporting a wide range of hardware. Available as [services.kismet](#opt-services.kismet.enable).
- [vwifi](https://github.com/Raizo62/vwifi), a Wi-Fi simulator daemon leveraging the `mac80211_hwsim` and `vhost_vsock` kernel modules for efficient simulation of multi-node Wi-Fi networks. Available as [services.vwifi](#opt-services.vwifi.client.enable).
- [Oncall](https://oncall.tools), a web-based calendar tool designed for scheduling and managing on-call shifts. Available as [services.oncall](#opt-services.oncall.enable).
- [Oncall](https://oncall.tools), a web-based calendar tool designed for scheduling and managing on-call shifts. Available as [services.oncall](options.html#opt-services.oncall).
- [Homer](https://homer-demo.netlify.app/), a very simple static homepage for your server. Available as [services.homer](#opt-services.homer.enable).
- [Homer](https://homer-demo.netlify.app/), a very simple static homepage for your server. Available as [services.homer](options.html#opt-services.homer).
- [Ghidra](https://ghidra-sre.org/), a software reverse engineering (SRE) suite of tools. Available as [programs.ghidra](#opt-programs.ghidra.enable).
- [Ghidra](https://ghidra-sre.org/), a software reverse engineering (SRE) suite of tools. Available as [programs.ghidra](options.html#opt-programs.ghidra).
- [Omnom](https://github.com/asciimoo/omnom), a webpage bookmarking and snapshotting service. Available as [services.omnom](#opt-services.omnom.enable).
- [Omnom](https://github.com/asciimoo/omnom), a webpage bookmarking and snapshotting service. Available as [services.omnom](options.html#opt-services.omnom.enable).
- [Yggdrasil-Jumper](https://github.com/one-d-wide/yggdrasil-jumper), an independent project that aims to transparently reduce latency of a connection over Yggdrasil network, utilizing NAT traversal to automatically bypass intermediary nodes. Available as [services.yggdrasil-jumper](#opt-services.yggdrasil-jumper.enable).
- [xpad-noone](https://github.com/medusalix/xpad-noone) is the original upstream xpad driver from the Linux kernel with support for Xbox One controllers removed — especially useful for people who want to use an XBox One controller under the `xone` driver and an Xbox 360 controller under the `xpad` driver at the same time. Available as [hardware.xpad-noone](#opt-hardware.xpad-noone.enable).
- [xpad-noone](https://github.com/medusalix/xpad-noone) is the original upstream xpad driver from the Linux kernel with support for Xbox One controllers removed — especially useful for people who want to use an XBox One controller under the `xone` driver and an Xbox 360 controller under the `xpad` driver at the same time. Available as [hardware.xpad-noone](options.html#hardware.xpad-noone).
- [uMurmur](https://umurmur.net), minimalistic Mumble server primarily targeted to run on embedded computers. Available as [services.umurmur](#opt-services.umurmur.enable).
- [uMurmur](https://umurmur.net), minimalistic Mumble server primarily targeted to run on embedded computers. Available as [services.umurmur](options.html#opt-services.umurmur).
- [Zenoh](https://zenoh.io/), a pub/sub/query protocol with low overhead. The Zenoh router daemon is available as [services.zenohd](#opt-services.zenohd.enable).
- [Zenoh](https://zenoh.io/), a pub/sub/query protocol with low overhead. The Zenoh router daemon is available as [services.zenohd](options.html#opt-services.zenohd.enable).
- [ytdl-sub](https://github.com/jmbannon/ytdl-sub), a tool that downloads media via yt-dlp and prepares it for your favorite media player, including Kodi, Jellyfin, Plex, Emby, and modern music players. Available as [services.ytdl-sub](#opt-services.ytdl-sub.instances).
- [ytdl-sub](https://github.com/jmbannon/ytdl-sub), a tool that downloads media via yt-dlp and prepares it for your favorite media player, including Kodi, Jellyfin, Plex, Emby, and modern music players. Available as [services.ytdl-sub](options.html#opt-services.ytdl-sub.instances).
- [MaryTTS](https://github.com/marytts/marytts), an open-source, multilingual text-to-speech synthesis system written in pure Java. Available as [services.marytts](#opt-services.marytts.enable).
- [MaryTTS](https://github.com/marytts/marytts), an open-source, multilingual text-to-speech synthesis system written in pure Java. Available as [services.marytts](options.html#opt-services.marytts).
- [Continuwuity](https://continuwuity.org/), a federated chat server implementing the Matrix protocol, forked from Conduwuit. Available as [services.matrix-continuwuity](#opt-services.matrix-continuwuity.enable).
- [Reposilite](https://reposilite.com), a lightweight and easy-to-use repository manager for Maven-based artifacts in the JVM ecosystem. Available as [services.reposilite](#opt-services.reposilite.enable).
- [Reposilite](https://reposilite.com), a lightweight and easy-to-use repository manager for Maven-based artifacts in the JVM ecosystem. Available as [services.reposilite](options.html#opt-services.reposilite).
- [networking.modemmanager](#opt-networking.modemmanager.enable) has been split out of [networking.networkmanager](#opt-networking.networkmanager.enable). NetworkManager still enables ModemManager by default, but options exist now to run NetworkManager without ModemManager.
- [networking.modemmanager](options.html#opt-networking.modemmanager) has been split out of [networking.networkmanager](options.html#opt-networking.networkmanager). NetworkManager still enables ModemManager by default, but options exist now to run NetworkManager without ModemManager.
- [Routinator 3000](https://nlnetlabs.nl/projects/routing/routinator/), a full-featured RPKI Relying Party software package that runs as a service which periodically downloads and verifies RPKI data. Available as [services.routinator](#opt-services.routinator.enable).
- [Routinator 3000](https://nlnetlabs.nl/projects/routing/routinator/), a full-featured RPKI Relying Party software package that runs as a service which periodically downloads and verifies RPKI data.
- [doh-server](https://github.com/m13253/dns-over-https), a high performance DNS over HTTPS server. Available as [services.doh-server](#opt-services.doh-server.enable).
- [doh-server](https://github.com/m13253/dns-over-https), a high performance DNS over HTTPS server. Available as [services.doh-server](options.html#opt-services.doh-server.enable).
- [ncps](https://github.com/kalbasit/ncps), a Nix binary cache proxy service implemented in Go using [go-nix](https://github.com/nix-community/go-nix). Available as [services.ncps](#opt-services.ncps.enable).
- [ncps](https://github.com/kalbasit/ncps), a Nix binary cache proxy service implemented in Go using [go-nix](https://github.com/nix-community/go-nix). Available as [services.ncps](options.html#opt-services.ncps.enable).
- [Readeck](https://readeck.org/), a read-it later web-application. Available as [services.readeck](#opt-services.readeck.enable).
@@ -102,21 +102,21 @@ Alongside many enhancements to NixOS modules and general system improvements, th
- [Pinchflat](https://github.com/kieraneglin/pinchflat), a selfhosted YouTube media manager used to track channels and download videos on release. Available as [services.pinchflat](#opt-services.pinchflat.enable).
- [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](#opt-services.amazon-cloudwatch-agent.enable).
- [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](options.html#opt-services.amazon-cloudwatch-agent.enable).
- [Fluent Bit](https://github.com/fluent/fluent-bit), a fast Log, Metrics and Traces Processor and Forwarder. Available as [services.fluent-bit](#opt-services.fluent-bit.enable).
- [Bat](https://github.com/sharkdp/bat), a {manpage}`cat(1)` clone with wings. Available as [programs.bat](#opt-programs.bat.enable).
- [Bat](https://github.com/sharkdp/bat), a {manpage}`cat(1)` clone with wings. Available as [programs.bat](options.html#opt-programs.bat).
- [Autotier](https://github.com/45Drives/autotier), a passthrough FUSE filesystem. Available as [services.autotierfs](#opt-services.autotierfs.enable).
- [Autotier](https://github.com/45Drives/autotier), a passthrough FUSE filesystem. Available as [services.autotierfs](options.html#opt-services.autotierfs.enable).
- [PostgREST](https://postgrest.org), a standalone web server that turns your PostgreSQL database directly into a RESTful API. Available as [services.postgrest](#opt-services.postgrest.enable).
- [PostgREST](https://postgrest.org), a standalone web server that turns your PostgreSQL database directly into a RESTful API. Available as [services.postgrest](options.html#opt-services.postgrest.enable).
- [postgres-websockets](https://github.com/diogob/postgres-websockets), a middleware that adds websockets capabilities on top of PostgreSQL's asynchronous notifications using LISTEN and NOTIFY commands. Available as [services.postgres-websockets](#opt-services.postgres-websockets.enable).
- [postgres-websockets](https://github.com/diogob/postgres-websockets), a middleware that adds websockets capabilities on top of PostgreSQL's asynchronous notifications using LISTEN and NOTIFY commands. Available as [services.postgres-websockets](options.html#opt-services.postgres-websockets.enable).
- [µStreamer](https://github.com/pikvm/ustreamer), a lightweight MJPEG-HTTP streamer. Available as [services.ustreamer](#opt-services.ustreamer.enable).
- [µStreamer](https://github.com/pikvm/ustreamer), a lightweight MJPEG-HTTP streamer. Available as [services.ustreamer](options.html#opt-services.ustreamer).
- [Whoogle Search](https://github.com/benbusby/whoogle-search), a self-hosted, ad-free, privacy-respecting metasearch engine. Available as [services.whoogle-search](#opt-services.whoogle-search.enable).
- [Whoogle Search](https://github.com/benbusby/whoogle-search), a self-hosted, ad-free, privacy-respecting metasearch engine. Available as [services.whoogle-search](options.html#opt-services.whoogle-search.enable).
- [autobrr](https://autobrr.com), a modern download automation tool for torrents and usenets. Available as [services.autobrr](#opt-services.autobrr.enable).
@@ -124,31 +124,31 @@ Alongside many enhancements to NixOS modules and general system improvements, th
- [Froide-Govplan](https://github.com/okfde/froide-govplan), a web application government planer. Available as [services.froide-govplan](#opt-services.froide-govplan.enable).
- [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](#opt-services.agorakit.enable).
- [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](options.html#opt-services.agorakit.enable).
- [vivid](https://github.com/sharkdp/vivid), a generator for `LS_COLOR`. Available as [programs.vivid](#opt-programs.vivid.enable).
- [matrix-alertmanager](https://github.com/jaywink/matrix-alertmanager), a bot to receive Alertmanager webhook events and forward them to chosen Matrix rooms. Available as [services.matrix-alertmanager](#opt-services.matrix-alertmanager.enable).
- [matrix-alertmanager](https://github.com/jaywink/matrix-alertmanager), a bot to receive Alertmanager webhook events and forward them to chosen Matrix rooms. Available as [services.matrix-alertmanager](options.html#opt-services.matrix-alertmanager.enable).
- [waagent](https://github.com/Azure/WALinuxAgent), the Microsoft Azure Linux Agent (waagent) manages Linux provisioning and VM interaction with the Azure Fabric Controller. Available with [services.waagent](#opt-services.waagent.enable).
- [waagent](https://github.com/Azure/WALinuxAgent), the Microsoft Azure Linux Agent (waagent) manages Linux provisioning and VM interaction with the Azure Fabric Controller. Available with [services.waagent](options.html#opt-services.waagent.enable).
- [nfc-nci](https://github.com/StarGate01/ifdnfc-nci), an alternative NFC stack and PC/SC driver for the NXP PN54x chipset, commonly found in Lenovo systems as NXP1001 (NPC300). Available as [hardware.nfc-nci](#opt-hardware.nfc-nci.enable).
- [grav](https://getgrav.org/), a modern flat-file CMS. Available with [services.grav](#opt-services.grav.enable).
- [grav](https://getgrav.org/), a modern flat-file CMS. Available with [services.grav](options.html#opt-services.grav.enable).
- [duckdns](https://www.duckdns.org), free dynamic DNS. Available with [services.duckdns](#opt-services.duckdns.enable).
- [duckdns](https://www.duckdns.org), free dynamic DNS. Available with [services.duckdns](options.html#opt-services.duckdns.enable).
- [Zoxide](https://github.com/ajeetdsouza/zoxide), a smarter cd command, inspired by z and autojump. Available as [programs.zoxide](#opt-programs.zoxide.enable).
- [Zoxide](https://github.com/ajeetdsouza/zoxide), a smarter cd command, inspired by z and autojump. Available as [programs.zoxide](options.html#opt-programs.zoxide.enable).
- [victorialogs](https://docs.victoriametrics.com/victorialogs/), log database from VictoriaMetrics. Available as [services.victorialogs](#opt-services.victorialogs.enable).
- [gokapi](https://github.com/Forceu/Gokapi), Lightweight selfhosted Firefox Send alternative without public upload. AWS S3 supported. Available with [services.gokapi](#opt-services.gokapi.enable).
- [gokapi](https://github.com/Forceu/Gokapi), Lightweight selfhosted Firefox Send alternative without public upload. AWS S3 supported. Available with [services.gokapi](options.html#opt-services.gokapi.enable).
- [nostr-rs-relay](https://git.sr.ht/~gheartsfield/nostr-rs-relay/), This is a nostr relay, written in Rust. Available as [services.nostr-rs-relay](#opt-services.nostr-rs-relay.enable).
- [nostr-rs-relay](https://git.sr.ht/~gheartsfield/nostr-rs-relay/), This is a nostr relay, written in Rust. Available as [services.nostr-rs-relay](options.html#opt-services.nostr-rs-relay.enable).
- [haven](https://github.com/bitvora/haven), is a high availability vault for events on nostr. Available as [services.haven](#opt-services.haven.enable).
- [haven](https://github.com/bitvora/haven), is a high availability vault for events on nostr. Available as [services.haven](options.html#opt-services.haven.enable).
- [strfry](https://github.com/hoytech/strfry), a relay for the nostr protocol. Available as [services.strfry](#opt-services.strfry.enable).
- [strfry](https://github.com/hoytech/strfry), a relay for the nostr protocol. Available as [services.strfry](options.html#opt-services.strfry.enable).
- [Prometheus Node Cert Exporter](https://github.com/amimof/node-cert-exporter), a prometheus exporter to check for SSL cert expiry. Available as [services.prometheus.exporters.node-cert](#opt-services.prometheus.exporters.node-cert.enable).
@@ -172,9 +172,9 @@ Alongside many enhancements to NixOS modules and general system improvements, th
- [Fider](https://fider.io/), an open platform to collect and prioritize feedback. Available as [services.fider](#opt-services.fider.enable).
- [PDS](https://github.com/bluesky-social/pds), Personal Data Server for [bsky](https://bsky.social/). Available as [services.pds](#opt-services.pds.enable).
- [PDS](https://github.com/bluesky-social/pds), Personal Data Server for [bsky](https://bsky.social/). Available as [services.pds](option.html#opt-services.pds).
- [Anubis](https://github.com/TecharoHQ/anubis), a scraper defense software. Available as [services.anubis](#opt-services.anubis.defaultOptions).
- [Anubis](https://github.com/TecharoHQ/anubis), a scraper defense software. Available as [services.anubis](options.html#opt-services.anubis).
- [synapse-auto-compressor](https://github.com/matrix-org/rust-synapse-compress-state?tab=readme-ov-file#automated-tool-synapse_auto_compressor), a rust-based matrix-synapse state compressor for postgresql. Available as [services.synapse-auto-compressor](#opt-services.synapse-auto-compressor.enable).
@@ -196,23 +196,21 @@ Alongside many enhancements to NixOS modules and general system improvements, th
- [`g3proxy`](https://github.com/bytedance/g3), an open source enterprise forward proxy from ByteDance, similar to Squid or tinyproxy. Available as [services.g3proxy](#opt-services.g3proxy.enable).
- [OpenCloud](https://opencloud.eu/), an open-source, modern file-sync and sharing platform. It is a fork of oCIS, a ground-up rewrite of the well-known PHP-based NextCloud server. Available as [services.opencloud](#opt-services.opencloud.enable).
- [echoip](https://github.com/mpolden/echoip), a simple service for looking up your IP address. Available as [services.echoip](#opt-services.echoip.enable).
- [whoami](https://github.com/traefik/whoami), a tiny Go server that prints OS information and HTTP request to output. Available as [services.whoami](#opt-services.whoami.enable).
- [LiteLLM](https://github.com/BerriAI/litellm), a LLM Gateway to provide model access, fallbacks and spend tracking across 100+ LLMs. All in the OpenAI format. Available as [services.litellm](#opt-services.litellm.enable).
- [Buffyboard](https://gitlab.postmarketos.org/postmarketOS/buffybox/-/tree/master/buffyboard), a framebuffer on-screen keyboard. Available as [services.buffyboard](#opt-services.buffyboard.enable).
- [Buffyboard](https://gitlab.postmarketos.org/postmarketOS/buffybox/-/tree/master/buffyboard), a framebuffer on-screen keyboard. Available as [services.buffyboard](option.html#opt-services.buffyboard).
- [KanBoard](https://github.com/kanboard/kanboard), a project management tool that focuses on the Kanban methodology. Available as [services.kanboard](#opt-services.kanboard.enable).
- [git-worktree-switcher](https://github.com/mateusauler/git-worktree-switcher), switch between git worktrees with speed. Available as [programs.git-worktree-switcher](#opt-programs.git-worktree-switcher.enable).
- [GLPI-Agent](https://github.com/glpi-project/glpi-agent), GLPI Agent. Available as [services.glpiAgent](#opt-services.glpiAgent.enable).
- [GLPI-Agent](https://github.com/glpi-project/glpi-agent), GLPI Agent. Available as [services.glpiAgent](options.html#opt-services.glpiAgent.enable).
- [pgBackRest](https://pgbackrest.org), a reliable backup and restore solution for PostgreSQL. Available as [services.pgbackrest](#opt-services.pgbackrest.enable).
- [pgBackRest](https://pgbackrest.org), a reliable backup and restore solution for PostgreSQL. Available as [services.pgbackrest](options.html#opt-services.pgbackrest.enable).
- [Recyclarr](https://github.com/recyclarr/recyclarr) a TRaSH Guides synchronizer for Sonarr and Radarr. Available as [services.recyclarr](#opt-services.recyclarr.enable).
@@ -232,7 +230,7 @@ Alongside many enhancements to NixOS modules and general system improvements, th
- [bitbox-bridge](https://github.com/BitBoxSwiss/bitbox-bridge), a bridge software that connects BitBox hardware wallets to computers & web wallets like [Rabby](https://rabby.io/). Allows one to interact & transact with smart contracts, Web3 websites & financial services without storing private keys anywhere other than the hardware wallet. Available as [services.bitbox-bridge](#opt-services.bitbox-bridge.enable).
- [GoDNS](https://github.com/TimothyYe/godns), a dynamic DNS client written in Go, which supports multiple DNS providers. Available as [services.godns](#opt-services.godns.enable).
- [GoDNS](https://github.com/TimothyYe/godns), a dynamic DNS client written in Go, which supports multiple DNS providers. Available as [services.godns](option.html#opt-services.godns.enable).
- [CookCLI](https://cooklang.org/cli/) Server, a web UI for cooklang recipes. Available as [services.cook-cli](#opt-services.cook-cli.enable).
@@ -258,7 +256,7 @@ Alongside many enhancements to NixOS modules and general system improvements, th
- If [`services.nextcloud.package`](#opt-services.nextcloud.package) is specified explicitly, this package will be installed (**recommended**)
- If [`system.stateVersion`](#opt-system.stateVersion) is >=24.11, `pkgs.nextcloud30` will be installed by default.
- If [`system.stateVersion`](#opt-system.stateVersion) is >=24.05, `pkgs.nextcloud31` will be installed by default.
- Please note that an upgrade from v29 (or older) to v31 directly is not possible. Please upgrade to `nextcloud30` (or earlier) first. Nextcloud prohibits skipping major versions while upgrading. You can upgrade by declaring [`services.nextcloud.package = pkgs.nextcloud30;`](#opt-services.nextcloud.package).
- Please note that an upgrade from v29 (or older) to v31 directly is not possible. Please upgrade to `nextcloud30` (or earlier) first. Nextcloud prohibits skipping major versions while upgrading. You can upgrade by declaring [`services.nextcloud.package = pkgs.nextcloud30;`](options.html#opt-services.nextcloud.package).
- `services.cloudflare-dyndns.apiTokenFile` now must be just your Cloudflare api token. Previously it was supposed to be a file of the form `CLOUDFLARE_API_TOKEN=...`.
@@ -446,7 +444,7 @@ Alongside many enhancements to NixOS modules and general system improvements, th
- [`system.stateVersion`](#opt-system.stateVersion) is now validated and must be in the `"YY.MM"` format, ideally corresponding to a prior NixOS release.
- [`hardware.xone`](#opt-hardware.xone.enable) will also enable [`hardware.xpad-noone`](#opt-hardware.xpad-noone.enable) to provide Xbox 360 driver by default.
- [`hardware.xone`](options.html#opt-hardware.xone.enable) will also enable [`hardware.xpad-noone`](options.html#opt-hardware.xpad-noone.enable) to provide Xbox 360 driver by default.
- `services.mysql` now supports easy cluster setup via [`services.mysql.galeraCluster`](#opt-services.mysql.galeraCluster.enable) option.
@@ -515,8 +513,6 @@ Alongside many enhancements to NixOS modules and general system improvements, th
- `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries.
- The [Starship](https://starship.rs) module now automatically loads the starship prompt when using [`xonsh`](https://xon.sh).
- [`services.mongodb.enableAuth`](#opt-services.mongodb.enableAuth) now uses the newer [mongosh](https://github.com/mongodb-js/mongosh) shell instead of the legacy shell to configure the initial superuser. You can configure the mongosh package to use through the [`services.mongodb.mongoshPackage`](#opt-services.mongodb.mongoshPackage) option.
- There is a new set of NixOS test tools for testing virtual Wi-Fi networks in many different topologies. See the {option}`services.vwifi` module, {option}`services.kismet` NixOS test, and [manual](https://nixos.org/manual/nixpkgs/unstable/#sec-nixos-test-wifi) for documentation and examples.
@@ -525,7 +521,7 @@ Alongside many enhancements to NixOS modules and general system improvements, th
- Exposed the `paperless-manage` script package via the `services.paperless.manage` read-only option.
- New options for the declarative configuration of the user space part of ALSA have been introduced under [hardware.alsa](#opt-hardware.alsa.enable), including setting the default capture and playback device, defining sound card aliases and volume controls.
- New options for the declarative configuration of the user space part of ALSA have been introduced under [hardware.alsa](options.html#opt-hardware.alsa.enable), including setting the default capture and playback device, defining sound card aliases and volume controls.
Note: these are intended for users not running a sound server like PulseAudio or PipeWire, but having ALSA as their only sound system.
- `services.k3s` now provides the `autoDeployCharts` option that allows to automatically deploy Helm charts via the k3s Helm controller.
@@ -543,11 +539,6 @@ Alongside many enhancements to NixOS modules and general system improvements, th
- A toggle has been added under `users.users.<name>.enable` to allow toggling individual users conditionally. If set to false, the user account will not be created.
- New hooks were added:
- `writableTmpDirAsHomeHook`: This setup hook ensures that the directory specified by the `HOME` environment variable is writable.
- `addBinToPathHook`: This setup hook checks if the `bin/` directory exists in the `$out` output path and, if so, adds it to the `PATH` environment variable.
- `gitSetupHook`: This setup hook sets up a valid Git configuration, including the `user.name` and `user.email` fields.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
## NixOS Wiki {#sec-release-25.05-wiki}

View File

@@ -1,10 +1,10 @@
# Release 25.11 ("Xantusia", 2025.11/??) {#sec-release-25.11}
# Release 25.11 (2025.11/??) {#sec-release-25.11}
## Highlights {#sec-release-25.11-highlights}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- Secure boot support can now be enabled for the Limine bootloader through {option}`boot.loader.limine.secureBoot.enable`. Bootloader install script signs the bootloader, then kernels are hashed during system rebuild and written to a config. This allows Limine to boot only the kernels installed through NixOS system.
- Create the first release note entry in this section!
## New Modules {#sec-release-25.11-new-modules}
@@ -12,28 +12,14 @@
- [gtklock](https://github.com/jovanlanik/gtklock), a GTK-based lockscreen for Wayland. Available as [programs.gtklock](#opt-programs.gtklock.enable).
- [FileBrowser](https://filebrowser.org/), a web application for managing and sharing files. Available as [services.filebrowser](#opt-services.filebrowser.enable).
- [LACT](https://github.com/ilya-zlobintsev/LACT), a GPU monitoring and configuration tool, can now be enabled through [services.lact.enable](#opt-services.lact.enable).
Note that for LACT to work properly on AMD GPU systems, you need to enable [hardware.amdgpu.overdrive.enable](#opt-hardware.amdgpu.overdrive.enable).
- [SuiteNumérique Docs](https://github.com/suitenumerique/docs), a collaborative note taking, wiki and documentation web platform and alternative to Notion or Outline. Available as [services.lasuite-docs](#opt-services.lasuite-docs.enable).
## Backward Incompatibilities {#sec-release-25.11-incompatibilities}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- The `services.polipo` module has been removed as `polipo` is unmaintained and archived upstream.
- The Pocket ID module ([`services.pocket-id`][#opt-services.pocket-id.enable]) and package (`pocket-id`) has been updated to 1.0.0. Some environment variables have been changed or removed, see the [migration guide](https://pocket-id.org/docs/setup/migrate-to-v1/).
- `renovate` was updated to v40. See the [upstream release notes](https://github.com/renovatebot/renovate/releases/tag/40.0.0) for breaking changes.
- Create the first release note entry in this section!
## Other Notable Changes {#sec-release-25.11-notable-changes}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- `services.clamsmtp` is unmaintained and was removed from Nixpkgs.
- `amdgpu` kernel driver overdrive mode can now be enabled by setting [hardware.amdgpu.overdrive.enable](#opt-hardware.amdgpu.overdrive.enable) and customized through [hardware.amdgpu.overdrive.ppfeaturemask](#opt-hardware.amdgpu.overdrive.ppfeaturemask).
This allows for fine-grained control over the GPU's performance and maybe required by overclocking softwares like Corectrl and Lact. These new options replace old options such as {option}`programs.corectrl.gpuOverclock.enable` and {option}`programs.tuxclocker.enableAMD`.
- Create the first release note entry in this section!

View File

@@ -39,14 +39,6 @@
This partition layout is unsuitable for UEFI.
#### `legacy+boot`
The image is partitioned using MBR and:
- creates a FAT32 BOOT partition from 1MiB to specified `bootSize` parameter (256MiB by default), set it bootable ;
- creates a primary ext4 partition starting after the boot partition and extending to the full disk image
This partition layout is unsuitable for UEFI.
#### `legacy+gpt`
This partition table type uses GPT and:
@@ -114,7 +106,7 @@
additionalSpace ? "512M",
# size of the boot partition, is only used if partitionTableType is
# either "efi", "hybrid", or "legacy+boot"
# either "efi" or "hybrid"
# This will be undersized slightly, as this is actually the offset of
# the end of the partition. Generally it will be 1MiB smaller.
bootSize ? "256M",
@@ -205,7 +197,6 @@
assert (
lib.assertOneOf "partitionTableType" partitionTableType [
"legacy"
"legacy+boot"
"legacy+gpt"
"efi"
"efixbootldr"
@@ -269,7 +260,6 @@ let
{
# switch-case
legacy = "1";
"legacy+boot" = "2";
"legacy+gpt" = "2";
efi = "2";
efixbootldr = "3";
@@ -286,14 +276,6 @@ let
mkpart primary ext4 1MiB 100% \
print
'';
"legacy+boot" = ''
parted --script $diskImage -- \
mklabel msdos \
mkpart primary fat32 1MiB $bootSizeMiB \
set 1 boot on \
mkpart primary ext4 $bootSizeMiB 100% \
print
'';
"legacy+gpt" = ''
parted --script $diskImage -- \
mklabel gpt \
@@ -558,12 +540,6 @@ let
# Add the 1MiB aligned reserved space (includes MBR)
reservedSpace=$(( mebibyte ))
''
else if partitionTableType == "legacy+boot" then
''
# The explanation from the above "efi" case applies here too,
# but gptSpace is not needed without a GPT.
reservedSpace=$(( bootSize ))
''
else
''
reservedSpace=0
@@ -718,11 +694,6 @@ let
${lib.optionalString touchEFIVars "mount -t efivarfs efivarfs /sys/firmware/efi/efivars"}
''}
${lib.optionalString (partitionTableType == "legacy+boot") ''
mkdir -p /mnt/boot
mkfs.vfat -n BOOT /dev/vda1
mount /dev/vda1 /mnt/boot
''}
# Install a configuration.nix
mkdir -p /mnt/etc/nixos
@@ -731,28 +702,19 @@ let
''}
${lib.optionalString installBootLoader ''
# In this throwaway resource, we only have /dev/vda, but the actual VM may refer to another disk for bootloader, e.g. /dev/vdb
# Use this option to create a symlink from vda to any arbitrary device you want.
${lib.optionalString (config.boot.loader.grub.enable) (
lib.concatMapStringsSep " " (
device:
lib.optionalString (device != "/dev/vda") ''
mkdir -p "$(dirname ${device})"
ln -s /dev/vda ${device}
''
) config.boot.loader.grub.devices
)}
${
let
limine = config.boot.loader.limine;
in
lib.optionalString (limine.enable && limine.biosSupport && limine.biosDevice != "/dev/vda") ''
mkdir -p "$(dirname ${limine.biosDevice})"
ln -s /dev/vda ${limine.biosDevice}
''
}
# In this throwaway resource, we only have /dev/vda, but the actual VM may refer to another disk for bootloader, e.g. /dev/vdb
# Use this option to create a symlink from vda to any arbitrary device you want.
${lib.optionalString (config.boot.loader.grub.enable) (
lib.concatMapStringsSep " " (
device:
lib.optionalString (device != "/dev/vda") ''
mkdir -p "$(dirname ${device})"
ln -s /dev/vda ${device}
''
) config.boot.loader.grub.devices
)}
# Set up core system link, bootloader (sd-boot, GRUB, uboot, etc.), etc.
# Set up core system link, bootloader (sd-boot, GRUB, uboot, etc.), etc.
# NOTE: systemd-boot-builder.py calls nix-env --list-generations which
# clobbers $HOME/.nix-defexpr/channels/nixos This would cause a folder

View File

@@ -55,8 +55,7 @@ stdenv.mkDerivation {
+ ''
# Generate the squashfs image.
# We have to set SOURCE_DATE_EPOCH to 0 here for reproducibility (https://github.com/NixOS/nixpkgs/issues/390696)
SOURCE_DATE_EPOCH=0 mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $imgPath ${pseudoFilesArgs} \
mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $imgPath ${pseudoFilesArgs} \
-no-hardlinks ${lib.optionalString noStrip "-no-strip"} -keep-as-directory -all-root -b 1048576 ${compFlag} \
-processors $NIX_BUILD_CORES -root-mode 0755
''

View File

@@ -71,7 +71,7 @@ in
defaultChannel = mkOption {
internal = true;
type = types.str;
default = "https://nixos.org/channels/nixos-unstable";
default = "https://nixos.org/channels/nixos-25.05";
description = "Default NixOS channel to which the root user is subscribed.";
};
};

View File

@@ -277,7 +277,6 @@ in
# avoid this race condition.
after = [ "systemd-modules-load.service" ];
wantedBy = [ "${realDevice'}.swap" ];
requiredBy = lib.optionals sw.randomEncryption.enable [ "${realDevice'}.swap" ];
before = [
"${realDevice'}.swap"
"shutdown.target"

View File

@@ -477,7 +477,7 @@ let
(mkIf config.isNormalUser {
group = mkDefault "users";
createHome = mkDefault true;
home = mkDefault "${cfg.defaultUserHome}/${config.name}";
home = mkDefault "/home/${config.name}";
homeMode = mkDefault "700";
useDefaultShell = mkDefault true;
isSystemUser = mkDefault false;
@@ -753,14 +753,6 @@ in
'';
};
users.defaultUserHome = mkOption {
type = types.str;
default = "/home";
description = ''
The default home directory for normal users.
'';
};
# systemd initrd
boot.initrd.systemd.users = mkOption {
description = ''

Some files were not shown because too many files have changed in this diff Show More