summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* imagemagick: 7.1.0-34 -> 7.1.0-35•••(cherry picked from commit be58bfab7b762fcd5b725b85c66c042d49ff4faf) origin/backport-173672-to-release-21.11Robert Schütz2022-05-201-2/+2
* Merge pull request #173680 from NixOS/backport-173642-to-release-21.11•••[Backport release-21.11] Linux kernel updatesMaximilian Bosch2022-05-2011-52/+52
|\
| * linux/hardened/patches/5.4: 5.4.193-hardened1 -> 5.4.195-hardened1•••(cherry picked from commit 82273adfcd53a9f3ba5401ae642a6b11c5ffa065) Maximilian Bosch2022-05-191-5/+5
| * linux/hardened/patches/5.17: 5.17.7-hardened1 -> 5.17.9-hardened1•••(cherry picked from commit 5c9571087e7ec83d9bf6f30b0a1c98417dec5843) Maximilian Bosch2022-05-191-5/+5
| * linux/hardened/patches/5.15: 5.15.39-hardened1 -> 5.15.41-hardened1•••(cherry picked from commit 7f512f715339d6a197d3b093d09f10e0eafa0da8) Maximilian Bosch2022-05-191-5/+5
| * linux/hardened/patches/5.10: 5.10.115-hardened1 -> 5.10.117-hardened1•••(cherry picked from commit 240e2247834fbd3188ed0be96f50b0826187a55f) Maximilian Bosch2022-05-191-5/+5
| * linux/hardened/patches/4.19: 4.19.242-hardened1 -> 4.19.244-hardened1•••(cherry picked from commit 28a954cabf6a9d9b52776cb977653fe9f8cb0133) Maximilian Bosch2022-05-191-5/+5
| * linux/hardened/patches/4.14: 4.14.278-hardened1 -> 4.14.280-hardened1•••(cherry picked from commit eea0f09983cfa986de0d8e057e5c55db5b021793) Maximilian Bosch2022-05-191-5/+5
| * linux_latest-libre: 18713 -> 18738•••(cherry picked from commit 3edcbfce898010ded1b2a97fca2a699d21952e68) Maximilian Bosch2022-05-191-2/+2
| * linux-rt_5_4: 5.4.188-rt73 -> 5.4.193-rt74•••(cherry picked from commit 1f98b560c8ffec12d100ae1e7c498eeda6eb0e26) Maximilian Bosch2022-05-191-3/+3
| * linux-rt_5_10: 5.10.109-rt65 -> 5.10.115-rt67•••(cherry picked from commit c49791b3261b94a72b0e0b87a42822452d8f0bf9) Maximilian Bosch2022-05-191-3/+3
| * linux: 5.4.193 -> 5.4.195•••(cherry picked from commit d56829b5febff16f60880244b6a6e9244769c2fa) Maximilian Bosch2022-05-191-2/+2
| * linux: 5.17.7 -> 5.17.9•••(cherry picked from commit cfb71b715e561785c8178b9ce2d2fdcbed63cdaf) Maximilian Bosch2022-05-191-2/+2
| * linux: 5.15.39 -> 5.15.41•••(cherry picked from commit 8935b4d5334c1c43793f7137c22664edfcf6ee9d) Maximilian Bosch2022-05-191-2/+2
| * linux: 5.10.115 -> 5.10.117•••(cherry picked from commit 1b81fcd6780ea47873512dc97c488a1a0a2b264d) Maximilian Bosch2022-05-191-2/+2
| * linux: 4.9.313 -> 4.9.315•••(cherry picked from commit 4072349a31d8fbdc1bad9c0fe78021f14e235d88) Maximilian Bosch2022-05-191-2/+2
| * linux: 4.19.242 -> 4.19.244•••(cherry picked from commit a7d95e31bc4fae38dd12e16ccb17313f046a8d00) Maximilian Bosch2022-05-191-2/+2
| * linux: 4.14.278 -> 4.14.280•••(cherry picked from commit 3431806dfa89c6bc26230e3519c40b8db190ad95) Maximilian Bosch2022-05-191-2/+2
* | jasmin-compiler: 21.0 → 2022.04.0•••(cherry picked from commit aee00ac405cbafc234e6b8f0b5e60f9cb5d9914e) Vincent Laporte2022-05-201-2/+2
|/
* Merge pull request #173614 from NixOS/backport-173022-to-release-21.11•••[Backport release-21.11] wiki-js: 2.5.279 -> 2.5.282Maximilian Bosch2022-05-191-2/+2
|\
| * wiki-js: 2.5.279 -> 2.5.282•••ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.280 ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.281 ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.282 (cherry picked from commit 2c0b81666dbe761e567444ea6f6f587aac9fd55d) Maximilian Bosch2022-05-191-2/+2
|/
* Merge pull request #173545 from NixOS/backport-172351-to-release-21.11•••[Backport release-21.11] spidermonkey_91: 91.8.0 -> 91.9.0ajs1242022-05-191-2/+2
|\
| * spidermonkey_91: 91.8.0 -> 91.9.0•••(cherry picked from commit bbb27f8eb3f11b634c9dce12113407af9a290f78) Will2022-05-181-2/+2
* | Merge #173574: python3Packages.deepdiff: skip a broken test•••...into release-21.11 Vladimír Čunát2022-05-191-0/+5
|\ \
| * | python3Packages.deepdiff: skip a broken testVladimír Čunát2022-05-191-0/+5
|/ /
* | Merge #173174: staging-next-21.11: iteration 14Vladimír Čunát2022-05-196-15/+570
|\ \
| * | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-05-197-8/+14
| |\|
| * | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-05-185-33/+39
| |\ \
| * \ \ Merge release-21.11 into staging-next-21.11github-actions[bot]2022-05-178-20/+100
| |\ \ \
| * \ \ \ Merge release-21.11 into staging-next-21.11github-actions[bot]2022-05-162-5/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'staging-21.11' into staging-next-21.11Vladimír Čunát2022-05-156-15/+570
| |\ \ \ \ \
| | * \ \ \ \ Merge #172640: curl: patch CVE-2022-27781 & CVE-2022-27782•••...into staging-21.11 Vladimír Čunát2022-05-154-0/+550
| | |\ \ \ \ \
| | | * | | | | curl: add patches for CVE-2022-27781 & CVE-2022-27782Robert Scott2022-05-124-0/+550
| | * | | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-05-1513-60/+60
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-05-1513-60/+60
| |\ \ \ \ \ \ \
| | | * \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-05-142-11/+24
| | | |\ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-05-142-11/+24
| |\ \ \ \ \ \ \ \
| | | | * | | | | | e2fsprogs: patch for CVE-2022-1304•••Did a basic smoke test of e2fsck. (cherry picked from commit 49d0a5afdc03a7bf276e455c1875fd571ca0711b) Alyssa Ross2022-05-131-5/+10
| | | | * | | | | | Merge pull request #172797 from NixOS/backport-172781-to-staging-21.11•••[Backport staging-21.11] postgresql: 10.20 -> 10.21, 11.15 -> 11.16, 12.10 -> 12.11, 13.6 -> 13.7, 14.2 -> 14.3Mario Rodas2022-05-121-10/+10
| | | | |\ \ \ \ \ \
| | | | | * | | | | | postgresql_14: 14.2 -> 14.3•••https://www.postgresql.org/docs/release/14.3/ (cherry picked from commit 242c4aaf39096a2ed9e7022adbf51ccee102fd80) Mario Rodas2022-05-131-2/+2
| | | | | * | | | | | postgresql_13: 13.6 -> 13.7•••https://www.postgresql.org/docs/release/13.7/ (cherry picked from commit 84e86fc9ee92e7214e07e685ff87312b5a66da15) Mario Rodas2022-05-131-2/+2
| | | | | * | | | | | postgresql_12: 12.10 -> 12.11•••https://www.postgresql.org/docs/release/12.11/ (cherry picked from commit 9d599ca124c568db7e348ba5ff6bbd12559a4e03) Mario Rodas2022-05-131-2/+2
| | | | | * | | | | | postgresql_11: 11.15 -> 11.16•••https://www.postgresql.org/docs/release/11.16/ (cherry picked from commit 74707e7b120750c9ca2668b3c3abd1bc5a787722) Mario Rodas2022-05-131-2/+2
| | | | | * | | | | | postgresql_10: 10.20 -> 10.21•••https://www.postgresql.org/docs/release/10.21/ (cherry picked from commit 5a19730b5d346134bd7e8bc64185d5d430790cd3) Mario Rodas2022-05-131-2/+2
| | | | |/ / / / / /
| | | | * | | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-05-133-10/+20
| | | | |\ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | / / / / / | | | | |/ / / / /
| * | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-05-133-10/+20
| |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-05-1210-62/+57
| | | | | |\ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-05-1210-62/+57
| |\ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-05-115-14/+33
| | | | | | |\ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-05-115-14/+33
| |\ \ \ \ \ \ \ \ \ \