summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* sydbox: 3.37.2 -> 3.37.6origin/backport-432577-to-release-25.05R. Ryantm2025-08-111-3/+3
| | | | (cherry picked from commit aa4eb4912e55fb79a3d8081b3421c85d16600999)
* [Backport release-25.05] ed-odyssey-materials-helper: 2.199 -> 2.223 (#432361)origin/release-25.05origin/nixos-25.05-smallYohann Boniface2025-08-112-175/+166
|\
| * ed-odyssey-materials-helper: 2.199 -> 2.223R. Ryantm2025-08-092-175/+166
| | | | | | | | (cherry picked from commit cb0f932205d3d21e50df393f8cf000d67377f8b3)
* | linuxPackages.openafs: Patch for Linux kernel 6.16Anders Kaseorg2025-08-111-22/+54
| | | | | | | | | | Signed-off-by: Anders Kaseorg <andersk@mit.edu> (cherry picked from commit f273a07dffcf96d69644ab12457341205312aaf7)
* | [Backport release-25.05] apacheKafka: 3_9: 3.9.0 → 3.9.1, 3_7: 3.7.1 → ↵Sarah Brofeldt2025-08-101-4/+4
|\ \ | | | | | | | | | 3.7.2 (#432187)
| * | apacheKafka: 3_7: 3.7.1 → 3.7.2Jonathan Davies2025-08-091-2/+2
| | | | | | | | | | | | (cherry picked from commit fd0d2966078485ae9635eb3a9293fc4c96fd152c)
| * | apacheKafka: 3_9: 3.9.0 → 3.9.1Jonathan Davies2025-08-091-2/+2
| | | | | | | | | | | | (cherry picked from commit 1b5c7c7ee869655f2aa10a83c9b2211722f179f4)
* | | [25.05] vmware-workstation: 17.6.3 -> 17.6.4 (#427802)Thomas Gerbet2025-08-101-3/+3
|\ \ \
| * | | vmware-workstation: 17.6.3 -> 17.6.4Jon Hermansen2025-07-231-3/+3
| | | | | | | | | | | | | | | | (cherry picked from commit dafc39e986e9bcf03ac72bf97dc3aeb3790c08c6)
* | | | [Backport release-25.05] apacheHttpd: 2.6.62 -> 2.6.65 (#431944)Thomas Gerbet2025-08-101-2/+2
|\ \ \ \
| * | | | apacheHttpd: 2.6.62 -> 2.6.65Thomas Gerbet2025-08-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CVE-2025-53020, CVE-2025-49812, CVE-2025-49630, CVE-2025-23048, CVE-2024-47252, CVE-2024-43204 and CVE-2024-42516. https://dlcdn.apache.org/httpd/CHANGES_2.4.64 https://dlcdn.apache.org/httpd/CHANGES_2.4.65 (cherry picked from commit 29b0c5917810b65a71c6cb75960dac182a7bdeec)
* | | | | google-chrome: 138.0.7204.183 -> 139.0.7258.66R. Ryantm2025-08-101-5/+5
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 29cf5a68873e29dda61efcf6fe508e5987e48984)
* | | | | [Backport release-25.05] nebula: 1.9.5 -> 1.9.6 (#428960)Wolfgang Walther2025-08-101-2/+2
|\ \ \ \ \
| * | | | | nebula: 1.9.5 -> 1.9.6R. Ryantm2025-07-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 4f441fc808ffa2161f83da6b015065ab74d0e055)
* | | | | | Backport 431468 to release 25.05 (#432383)David McFarland2025-08-1010-1045/+1057
|\ \ \ \ \ \
| * | | | | | dotnetCorePackages.dotnet_9.vmr: 9.0.7 -> 9.0.8David McFarland2025-08-094-221/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 283f9c0ab16f4039f9d93142655fa55bb37dd559)
| * | | | | | dotnetCorePackages.dotnet_8.vmr: 8.0.18 -> 8.0.19David McFarland2025-08-094-309/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 5b8f2fb93b1834af9a0ac3bcc87cdf5cb4716eef)
| * | | | | | dotnetCorePackages.sdk_9_0-bin: 9.0.303 -> 9.0.304David McFarland2025-08-091-205/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 6ff2be3db6dc074b8c8a10a511f1f0bc0de778e8)
| * | | | | | dotnetCorePackages.sdk_8_0-bin: 8.0.412 -> 8.0.413David McFarland2025-08-091-310/+310
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | (cherry picked from commit 15e0c31db6973e7678650d97a0980232ff605ba4)
* | | | | | [Backport release-25.05] postgresqlPackages.pg_net: 0.19.4 -> 0.19.5 (#432545)Wolfgang Walther2025-08-101-2/+2
|\ \ \ \ \ \
| * | | | | | postgresqlPackages.pg_net: 0.19.4 -> 0.19.5R. Ryantm2025-08-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d23fa320a4ea66e71b0343876ff5915b2324d396)
* | | | | | | [Backport release-25.05] protoc-gen-grpc-java: init at 1.73.0 (#429617)Wolfgang Walther2025-08-103-0/+134
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | protoc-gen-grpc-java: init at 1.73.0 (#415329)Petr Portnov | PROgrm_JARvis2025-07-303-0/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit dbae6575d6b114bc87414b7676b7660791ecf2e3)
* | | | | | | [Backport release-25.05] workflows/pr: run in pull_request context to test ↵Wolfgang Walther2025-08-101-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | actions/get-merge-commit (#432538)
| * | | | | | | workflows/pr: run in pull_request context to test actions/get-merge-commitWolfgang Walther2025-08-101-0/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This must run in the pull_request context, otherwise changes to the actions are not tested. (cherry picked from commit a2a9984ed95a5a008ad1f176044d9da9c1d955a3)
* | | | | | | [25.05] ollama: 0.9.6 -> 0.11.4 (#432486)Pavol Rusnak2025-08-101-5/+7
|\ \ \ \ \ \ \
| * | | | | | | ollama: unbreak on darwin by using apple-sdk_15Pavol Rusnak2025-08-101-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit a188ff8f04c416199643f4941c7aaeb0ac6d7ad1)
| * | | | | | | ollama: 0.11.3 -> 0.11.4R. Ryantm2025-08-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 7a7e6e3bdf31856d84dcba749fc5232e9fb4b554)
| * | | | | | | ollama: mark as broken on darwineveeifyeve2025-08-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marking this as broken for now, as this is a upstream issue and it's not worth creating a patch when they fix it upstream. See issue #431464 for more details. (cherry picked from commit cbb7f7a46a1c5ec4e7c0cb9fd1ee58fb2a6a4658)
| * | | | | | | ollama: 0.11.0 -> 0.11.3Pavol Rusnak2025-08-101-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 6c5f7adf5360eacb5320b5763d2996400d843880)
| * | | | | | | ollama: fix source hash for version 0.11.0Bas Nijholt2025-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current hash in package.nix doesn't match the actual v0.11.0 source, causing build failures with hash mismatch errors. Update hash from sha256-fBoSt/chnxnlD6/HsWeMX9TR7Du7RCOmWcqCKamyK7A= to sha256-po7BxJAj9eOpOaXsLDmw6/1RyjXPtXza0YUv0pVojZ0= This follows nixpkgs conventions: - PR title: package: brief description - Commit message: explains what and why, with specific details about the hash change (cherry picked from commit 49a95e445e8f29b6f60cfca13b7d86d809b71264)
| * | | | | | | ollama: 0.10.0 -> 0.11.0Ben Siraphob2025-08-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit abe860e8d220dbe92b11ce6334571d1a147ff050)
| * | | | | | | ollama: 0.9.6 -> 0.10.0R. Ryantm2025-08-101-3/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 72dee395b1dcb9a42dfc72ada88378e210fde1e0)
* | / / / / / linuxKernel.kernels.linux_zen: 6.15.8 -> 6.16R. Ryantm2025-08-101-2/+2
| |/ / / / / |/| | | | | | | | | | | | | | | | | (cherry picked from commit d2e0ffe571c58c3cf1017d0e5216576bc38f74f6)
* | | | | | libucontext: 1.2 -> 1.3.2 (#432332)origin/nixpkgs-25.05-darwinorigin/nixos-25.05jade2025-08-091-5/+13
|\ \ \ \ \ \
| * | | | | | libucontext: 1.2 -> 1.3.2Jade Lovelace2025-08-091-5/+13
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The package was previously busted: there were random things in result/usr, which is very much wrong. I rewrote it to use the meson build since the makefile is pretty highly busted. (cherry picked from commit cea61254193cb5cf80832183883e0c0fa509005b)
* | | | | | [Backport release-25.05] Revert "workflows/eval: disable swap" (#432328)Wolfgang Walther2025-08-0910-5/+23
|\ \ \ \ \ \
| * | | | | | .github/workflows: set timeoutsWolfgang Walther2025-08-0910-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | None of our jobs is expected to run for 6 hours, the GitHub limit. These limits are generous and take into accounts that some jobs need to wait for others. If jobs exceed these times, most likely something else is wrong and needs investigation. (cherry picked from commit 436d54174dd639cf13c51d46f774822f4d60148f)
| * | | | | | Revert "workflows/eval: disable swap"Wolfgang Walther2025-08-091-4/+9
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f2648b263b69aecca529c14fd5441503850a7c0d. While the idea to never use swap was fine, in practice this meant that when nix ran OOM, some other process was killed instead. This lead to the job not being possible to be cancelled anymore and thus needing to timeout, before subsequent jobs could be scheduled. This can take up to 6 hours for GitHub Actions by default. Re-enabling the swap file to catch this case more gracefully. It's still the goal to never actually *use* the swap file during Eval and just a safeguard. Keeping the changed chunkSize and not reverting it - this makes it slightly less likely to hit the swap file when running with Lix. (cherry picked from commit 9cde368b4ca0da1979ab3454b0c1dca64c69a2e5)
* | | | | | [Backport release-25.05] mongodb-7_0: 7.0.16 -> 7.0.21 (#426481)Wolfgang Walther2025-08-091-2/+2
|\ \ \ \ \ \
| * | | | | | mongodb-7_0: 7.0.16 -> 7.0.21qubitnano2025-07-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: CVE-2025-6706 Fixes: CVE-2025-6707 Fixes: CVE-2025-6709 Fixes: CVE-2025-6710 Fixes: CVE-2025-6711 Fixes: CVE-2025-6713 Fixes: CVE-2025-6714 (cherry picked from commit e16b3be6a04ecc4c752f4885d18b9d260dd6dda2)
* | | | | | | [Backport release-25.05] lixPackageSets.git: ↵jade2025-08-094-18/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2.94.0-pre-20250704_362bfd827f52 -> 2.94.0-pre-20250711_ae00b1298353 (#432256)
| * | | | | | | lixPackageSets.git: 2.94.0-pre-20250704_362bfd827f52 -> ↵Alois Wohlschlager2025-08-093-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.94.0-pre-20250807_8bbd5e1d0df9 (cherry picked from commit 28a8bb174002617a6263777ae956bb609addd494)
| * | | | | | | lixPackageSets.*.lix: use buildPackages.python3 instead of ↵Alois Wohlschlager2025-08-091-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | python3.pythonOnBuildForHost The former seems to exhibit fewer subtle issues breaking cross (in particular static) builds, for reasons I have not yet understood. (cherry picked from commit cf6821c8f84fe12f6e6120bcad28295ae2d9f291)
| * | | | | | | lixPackageSets.*.lix: omit unneeded Python packages when !doInstallCheckAlois Wohlschlager2025-08-091-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 098e2ec4ecd08f1927a477d7d06aec7060434fd6)
| * | | | | | | lixPackageSets.*.lix: stop copying unnecessary boost librariesAlois Wohlschlager2025-08-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is basically the same as https://gerrit.lix.systems/c/lix/+/3767 upstream. (cherry picked from commit dbe04a0b0c4ab20b199c22b51bf4663d1048fd88)
| * | | | | | | capnproto: fix platform offsetAlois Wohlschlager2025-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the wrong platform offset, buildPackages.capnproto would inappropriately depend on empty-libgcc_eh when building with dynamic build platform and static host platform. In turn the build would fail due to the archiver not being found. (cherry picked from commit 8b0263aba578e2fa611a528bedcfc5cf4d5a687c)
* | | | | | | | ananicy-rules-cachyos: 0-unstable-2025-07-06 -> 0-unstable-2025-08-06R. Ryantm2025-08-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 5db8ee9dbd4d2b394a408c74527968e7a09b0747)
* | | | | | | | ananicy-rules-cachyos: 0-unstable-2025-03-19 -> 0-unstable-2025-07-06R. Ryantm2025-08-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 90c068fb42aafd0b5df779cece0c176a9bb55c07)
* | | | | | | | [Backport release-25.05] microsoft-edge: 138.0.3351.121 -> 139.0.3405.86 ↵Wolfgang Walther2025-08-091-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | (#432273)