summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* adwsteamgtk: init at 0.6.9•••(cherry picked from commit 4e949b80155c45de77ea8e0b4fb34fced07ced75) origin/backport-280103-to-release-23.11Reed2024-03-021-0/+52
* Merge pull request #292626 from NixOS/backport-292573-to-release-23.11•••[Backport release-23.11] Kernel updates for 2024-03-01K9002024-03-013-20/+20
|\
| * linux-rt_6_6: 6.6.15-rt22 -> 6.6.18-rt23•••(cherry picked from commit c60dafe6b735c3da2cbc6c438330d5d5ab0a9d0f) origin/backport-292573-to-release-23.11K9002024-03-011-3/+3
| * linux-rt_6_1: 6.1.77-rt24 -> 6.1.79-rt25•••(cherry picked from commit 39f3ac14a4ac25ddb6a3778bea9b9b903ea0e097) K9002024-03-011-3/+3
| * linux_4_19: 4.19.307 -> 4.19.308•••(cherry picked from commit 72f4920f2f4e250c6fcc4d946467995f47f45d46) K9002024-03-011-2/+2
| * linux_5_4: 5.4.269 -> 5.4.270•••(cherry picked from commit 01a3cfdf71e3565e78478fc9451850d8230affa3) K9002024-03-011-2/+2
| * linux_5_10: 5.10.210 -> 5.10.211•••(cherry picked from commit 26856a40a8c120246d64ac5b93471c142a355efe) K9002024-03-011-2/+2
| * linux_5_15: 5.15.149 -> 5.15.150•••(cherry picked from commit 3a05b894f646905ac4932db2befd02daa29bab2e) K9002024-03-011-2/+2
| * linux_6_1: 6.1.79 -> 6.1.80•••(cherry picked from commit dc81b2ea9ec340b6147fad82b35c7a3b742cb75c) K9002024-03-011-2/+2
| * linux_6_6: 6.6.18 -> 6.6.19•••(cherry picked from commit e5adec46da5803ba373beb931923b591099df7c2) K9002024-03-011-2/+2
| * linux_6_7: 6.7.6 -> 6.7.7•••(cherry picked from commit a190a93d59548fcf8ffa66bb6f6a9a9ea572cd46) K9002024-03-011-2/+2
|/
* Merge pull request #292605 from K900/add-linux-rt-66-backport•••[backport 23.11] linux-rt_6_6: init at 6.6.15-rt22K9002024-03-012-1/+55
|\
| * linux-rt_6_6: init at 6.6.15-rt22Orivej Desh2024-03-012-1/+55
* | Merge pull request #292474 from NixOS/backport-279265-to-release-23.11•••[Backport release-23.11] Add Brother mfcj880dw driverArtturi2024-03-013-0/+149
|\ \
| * | mfcj880dw: init at 1.0.0-1•••(cherry picked from commit 8f0ce83807107efd3d483b816efa9b4336833556) 65432024-03-012-0/+140
| * | maintainers: add 6543•••(cherry picked from commit 5c74739ab5d5e4745bdd4095fdc8e37766ba443b) 65432024-03-011-0/+9
* | | Merge #291328: staging-next-23.11 iteration 5•••...into release-23.11 Vladimír Čunát2024-03-0127-77/+153
|\ \ \ | |_|/ |/| |
| * | Merge #292428: diffoscope: 252 ->257•••...into staging-next-23.11 Vladimír Čunát2024-03-011-6/+21
| |\ \
| | * | diffoscope: 254 -> 257•••Changes: - https://diffoscope.org/news/diffoscope-255-released/ - https://diffoscope.org/news/diffoscope-256-released/ - https://diffoscope.org/news/diffoscope-257-released/ (cherry picked from commit 9b4795a6abea10f893feaa48788c036248b7c2eb) Sergei Trofimovich2024-02-291-2/+2
| | * | diffoscope: 253 -> 254•••Changes: https://diffoscope.org/news/diffoscope-254-released/ (cherry picked from commit 9c13e10574582c0f2e8f256751fb0c76fb6a2510) Sergei Trofimovich2024-02-291-2/+2
| | * | diffoscope: disable broken tests on darwin•••(cherry picked from commit 32d613548ee37bbf6e9e6778e529fa9d494ec264) Jade Lovelace2024-02-291-0/+9
| | * | diffoscope: fix on aarch64-darwin•••This was comparing stdenv.hostPlatform (an attr set) to a string. This comparison always returned not-equal, which resulted in trying to evaluate the broken gnumeric on macOS. This change fixes that to compare the "system" string as was intended originally. (cherry picked from commit 5d238d0d637c69c3a6fe77df87124c69192bdad3) Jade Lovelace2024-02-291-1/+1
| | * | diffoscope: organize better missing tools and explain why docx2txt cannot be ...•••docx2txt is *IN* nixpkgs but cannot be used. lipo, otool are theoretically available in darling… but I doubt they would work. (cherry picked from commit 4e9e090585ae52dc7b836477dc83c7107052d66b) Raito Bezarius2024-02-291-1/+7
| | * | diffoscope: 252 -> 253•••https://diffoscope.org/news/diffoscope-253-released/ (cherry picked from commit 61da111d6f3cce9f81103d584ccf183ab867f463) Raito Bezarius2024-02-291-3/+2
| | * | diffoscope: add `acl` in the minimal package•••`acl` is a pretty ubiquitious package on Linux and provides `getfacl`. (cherry picked from commit c1cd33667c5eaa0eec5d9fe1453ab2ab7c86c8f7) Raito Bezarius2024-02-291-1/+2
| * | | Merge release-23.11 into staging-next-23.11github-actions[bot]2024-03-0120-853/+1279
| |\ \ \ | | |/ / | |/| / | | |/
| * | python311Packages.pegen: disable failing test•••(cherry picked from commit 65c9353ad3dc7064d83e70f54f350971b7e32c22) https://hydra.nixos.org/build/251234946/nixlog/4/tail Fabian Affolter2024-02-291-1/+4
| * | python311Packages.python3-saml: disable failing tests•••This cherry-picks parts of 5ead65aa8720b3c0cecc57e23530cf2048fe67e5 https://hydra.nixos.org/build/251204010/nixlog/3/tail Vladimír Čunát2024-02-291-0/+14
| * | Merge release-23.11 into staging-next-23.11github-actions[bot]2024-02-2926-103/+200
| |\ \
| * \ \ Merge release-23.11 into staging-next-23.11github-actions[bot]2024-02-289-13/+59
| |\ \ \
| * \ \ \ Merge release-23.11 into staging-next-23.11github-actions[bot]2024-02-2711-56/+139
| |\ \ \ \
| * \ \ \ \ Merge release-23.11 into staging-next-23.11github-actions[bot]2024-02-2613-16/+130
| |\ \ \ \ \
| * | | | | | python311Packages.sphinx: disable racy tests•••(cherry picked from commit 9ec4f90d9c63f6df78bada4296af915415918068) Martin Weinelt2024-02-251-0/+5
| * | | | | | Merge branch 'staging-23.11' into staging-next-23.11Vladimír Čunát2024-02-2523-70/+109
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge staging-next-23.11 into staging-23.11github-actions[bot]2024-02-2523-85/+582
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge release-23.11 into staging-next-23.11github-actions[bot]2024-02-2523-85/+582
| |\ \ \ \ \ \ \
| | | * \ \ \ \ \ Merge #291034: c-ares: apply patch for CVE-2024-25629•••...into staging-23.11 Vladimír Čunát2024-02-242-0/+36
| | | |\ \ \ \ \ \
| | | | * | | | | | c-ares: apply patch for CVE-2024-25629Thomas Gerbet2024-02-242-0/+36
| | | * | | | | | | Merge #290956: dav1d: add patch for CVE-2024-1580•••...into staging-23.11 Vladimír Čunát2024-02-241-1/+9
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | dav1d: add patch for CVE-2024-1580Robert Scott2024-02-231-1/+9
| | | * | | | | | | Merge staging-next-23.11 into staging-23.11github-actions[bot]2024-02-2479-412/+422
| | | |\ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge release-23.11 into staging-next-23.11github-actions[bot]2024-02-2479-412/+422
| |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge staging-next-23.11 into staging-23.11github-actions[bot]2024-02-2317-115/+182
| | | | |\ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge release-23.11 into staging-next-23.11github-actions[bot]2024-02-2317-115/+182
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | | | * | | | | | Merge #289666: go: 1.21.5 -> 1.21.6•••...into staging-23.11 Vladimír Čunát2024-02-221-2/+2
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | go: 1.21.5 -> 1.21.6•••Changelog: https://go.dev/doc/devel/release#go1.21 Signed-off-by: Harsh Thakur <harshthakur9030@gmail.com> (cherry picked from commit 1332fa0d74e3b403d8540640cb185203e5994ec4) Harsh Thakur2024-02-181-2/+2
| | | | | * | | | | | | Merge #290704: unbound: 1.19.0 -> 1.19.1•••...into staging-23.11 Vladimír Čunát2024-02-221-2/+2
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | unbound: 1.19.0 -> 1.19.1•••Fixes CVE-2023-50387 and CVE-2023-50868. Changes: https://nlnetlabs.nl/news/2024/Feb/13/unbound-1.19.1-released/ (cherry picked from commit 062ee05a5784dfb8be2e7c951f4f5e3ea575b158) Thomas Gerbet2024-02-221-2/+2
| | | | | |/ / / / / / /
| | | | | * | | | | | | Merge #288818: unbound: 1.18.0 -> 1.19.0•••...into staging-23.11 Vladimír Čunát2024-02-222-23/+14
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | nixos/unbound: Fix deprecation warnings•••(cherry picked from commit 61f957f87617d6a7c14a815346fc2a91b4ed0ce6) Ashish SHUKLA2024-02-141-8/+8