summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* apache-jena: 4.2.0 -> 4.3.1; apache-jena-fuseki: 4.2.0 -> 4.3.1•••Fixes CVE-2021-44228. See #150288. (cherry picked from commit d2d9d4c862b37eb85358d9bc8c1b869e131cd341) origin/backport-150610-to-release-21.11Joerie de Gram2021-12-142-6/+6
* Merge pull request #150619 from NixOS/backport-149946-to-release-21.11•••[Backport release-21.11] latte-dock: 0.10.0 -> 0.10.4Bobby Rong2021-12-141-2/+2
|\
| * latte-dock: 0.10.0 -> 0.10.4•••(cherry picked from commit 8713ef19486f88cd82c6860a72fc98ad9a136ae0) leo602282021-12-141-2/+2
|/
* Merge pull request #150161 from risicle/ris-mahotas-freeimage-r21.11•••[21.11] python3Packages.mahotas: fix freeimage supportRobert Scott2021-12-141-2/+30
|\
| * python3Packages.mahotas: fix freeimage support•••use a much stronger binding to our specific freeimage that works reliably on linux. previously it didn't and the tests covering freeimage support were just being skipped as they assumed it to be disabled. once the binding works it reveals slight breakage in the tests themselves, mostly fixed with an upstream patch (skipping one remaining breakage). these breakages were already revealing themselves on darwin as the freeimage binding was "working" there. (cherry picked from c81cf6a24297fcde7783d01cf4b8d87b8920c693 with modifications) Robert Scott2021-12-111-2/+30
* | Merge pull request #150599 from NixOS/backport-150507-to-release-21.11•••[Backport release-21.11] emacs: Add sqlite support introduced in Emacs 29Thiago Kenji Okada2021-12-131-1/+3
|\ \
| * | emacs: Add sqlite support introduced in Emacs 29•••(cherry picked from commit 7c8fae3b8b03d54af48e23de80189622dd4f4970) Brian Leung2021-12-131-1/+3
* | | Merge pull request #150523 from Ma27/signald-cve-2021-44228-21.11•••[21.11] signald: incorporate log4j update for CVE-2021-44228Maximilian Bosch2021-12-131-4/+14
|\ \ \ | |/ / |/| |
| * | signald: incorporate log4j update for CVE-2021-44228•••Equivalent to 79ab6a83828ecee660e362e6c97384ff0489f9b2 on `master`, but against 0.14.1. Relevant for #150288 Maximilian Bosch2021-12-131-4/+14
* | | Merge pull request #150594 from NixOS/backport-150511-to-release-21.11•••[Backport release-21.11] graylog: 3.3.14 -> 3.3.150x4A6F2021-12-131-2/+2
|\ \ \
| * | | graylog: 3.3.14 -> 3.3.15•••This release included a fix for the Log4j vulnerability. https://www.graylog.org/post/graylog-update-for-log4j (cherry picked from commit 6dd67c31d2828ec8483c60fe54d8fc10af225fc8) origin/backport-150511-to-release-21.11Thomas Gerbet2021-12-131-2/+2
|/ / /
* | | Merge pull request #150406 from NixOS/backport-150289-to-release-21.11•••[Backport release-21.11] zap: 2.11.0 -> 2.11.1Robert Scott2021-12-131-2/+2
|\ \ \
| * | | zap: 2.11.0 -> 2.11.1•••Fixes CVE-2021-44228 #150288 (cherry picked from commit be4883e2181a7f9e1513be091ea573f9f2411c81) Joerie de Gram2021-12-121-2/+2
* | | | Merge pull request #150310 from xfix/metabase-for-21.11•••[21.11] metabase: 0.38.0 -> 0.38.6Robert Scott2021-12-131-3/+6
|\ \ \ \
| * | | | metabase: add passthru tests•••(cherry picked from commit 9eee84f9f067195c9901326f30f39bc0c0b680a2) Konrad Borowski2021-12-111-1/+4
| * | | | metabase: 0.38.0 -> 0.38.6Konrad Borowski2021-12-111-2/+2
* | | | | foot: 1.10.2 -> 1.10.3•••https://codeberg.org/dnkl/foot/releases/tag/1.10.3 (cherry picked from commit 3c855f2fd4006a61d5e37aa46fa1d7553fffec15) sternenseemann2021-12-131-2/+2
* | | | | Merge pull request #150582 from NixOS/backport-150550-to-release-21.11•••[Backport release-21.11] olm: 3.2.6 -> 3.2.8Franz Pletz2021-12-131-2/+2
|\ \ \ \ \
| * | | | | olm: 3.2.6 -> 3.2.8•••This security release fixes a "high severity issue" that has not yet been further described. https://matrix.org/blog/2021/12/03/pre-disclosure-upcoming-security-release-of-libolm-and-matrix-js-sdk (cherry picked from commit 74ca17a777e2f1bb58e8c1aa7566c55e838853c1) Alvar Penning2021-12-131-2/+2
* | | | | | Merge pull request #150578 from NixOS/backport-150558-to-release-21.11•••[Backport release-21.11] element-*: 1.9.6 -> 1.9.7Franz Pletz2021-12-132-6/+6
|\ \ \ \ \ \
| * | | | | | element-*: 1.9.6 -> 1.9.7•••(cherry picked from commit 691111d99ff41e0e1bf70d4199302fe305919b73) Philipp2021-12-132-6/+6
| |/ / / / /
* | | | | | Merge pull request #150581 from NixOS/backport-150562-to-release-21.11•••[Backport release-21.11] schildichat: 1.9.0-sc.1 -> 1.9.7-sc.1Franz Pletz2021-12-131-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | schildichat: 1.9.0-sc.1 -> 1.9.7-sc.1•••(cherry picked from commit 127a5753d338663f25ec04de7b84fe066d80f57e) Yureka2021-12-131-4/+4
|/ / / / /
* | | | | jackline: use default version of OCaml•••(cherry picked from commit a106f705050b5ecbc70d2e1d753429efa9db8198) Vincent Laporte2021-12-131-3/+1
* | | | | Merge pull request #150425 from pennae/backport-150329-to-release-21.11Janne Heß2021-12-132-2/+3
|\ \ \ \ \
| * | | | | nixos/unifi: Apply log4j2 mitigation•••(cherry picked from commit e992604bf0b4afb4c3e8ccad04d6ea69bba49681) Zhaofeng Li2021-12-131-0/+1
| * | | | | unifi6: 6.4.54 -> 6.5.54•••(cherry picked from commit 48feb21a3c2118c7eea3c28169c9a7349b556e74) Zhaofeng Li2021-12-131-2/+2
| | |/ / / | |/| | |
* | | | | why3.withProvers: add dontUnpack•••(cherry picked from commit 6e0bc1f976829203e37cd35205b9ff58341c619d) Felix Buehler2021-12-131-1/+3
* | | | | camlp4: add new versions•••(cherry picked from commit f389b36d2681b6b06508de8e26ca5dfee88aed55) Yestin L. Harrison2021-12-131-1/+16
| |_|/ / |/| | |
* | | | Merge pull request #150442 from NixOS/backport-150413-to-release-21.11•••[Backport release-21.11] shattered-pixel-dungeon: 1.0.0 -> 1.1.0Thiago Kenji Okada2021-12-121-4/+4
|\ \ \ \
| * | | | shattered-pixel-dungeon: 1.0.0 -> 1.1.0•••(cherry picked from commit 4c764d4dbf217e48b2eaf54da4ec62c558f6cfd5) Francesco Gazzetta2021-12-121-4/+4
| |/ / /
* | | | Merge pull request #150462 from NixOS/backport-150276-to-release-21.11•••[Backport release-21.11] drogon: 1.7.3 -> 1.7.4Thiago Kenji Okada2021-12-121-2/+2
|\ \ \ \
| * | | | drogon: 1.7.3 -> 1.7.4•••(cherry picked from commit f9610acae1d04179f178fe57d6f2cc758d75101f) urlordjames2021-12-121-2/+2
* | | | | Merge pull request #150465 from NixOS/backport-149620-to-release-21.11•••[Backport release-21.11] Kernels 2021-12-08Maximilian Bosch2021-12-1210-44/+44
|\ \ \ \ \
| * | | | | linux/hardened/patches/5.4: 5.4.163-hardened1 -> 5.4.164-hardened1•••(cherry picked from commit dc7d9307aeeb3a295a0c2000f8524f2a8ec44827) TredwellGit2021-12-121-5/+5
| * | | | | linux/hardened/patches/5.15: 5.15.6-hardened1 -> 5.15.7-hardened1•••(cherry picked from commit 935a3eb77bc2d77d65174afd5a5e6c33fb059a25) TredwellGit2021-12-121-5/+5
| * | | | | linux/hardened/patches/5.10: 5.10.83-hardened1 -> 5.10.84-hardened1•••(cherry picked from commit 4e28ad878000166be5501f50e90a1791b36899cd) TredwellGit2021-12-121-5/+5
| * | | | | linux/hardened/patches/4.19: 4.19.219-hardened1 -> 4.19.220-hardened1•••(cherry picked from commit ac0487fe56431489238bc17c47065dc5568dc451) TredwellGit2021-12-121-5/+5
| * | | | | linux/hardened/patches/4.14: 4.14.256-hardened1 -> 4.14.257-hardened1•••(cherry picked from commit 8448ac947fa457e20ed7cee9a8dfae0fcd42943d) TredwellGit2021-12-121-5/+5
| * | | | | linux-rt_5_4: 5.4.161-rt66 -> 5.4.161-rt67•••(cherry picked from commit 7f32450344ffaf16f875478e19dfb7e3460b1397) TredwellGit2021-12-121-2/+2
| * | | | | linux-rt_5_10: 5.10.78-rt56 -> 5.10.83-rt58•••(cherry picked from commit 79528537498a7c13ef38c8d60f2331da37258cfe) TredwellGit2021-12-121-3/+3
| * | | | | linux: 5.4.163 -> 5.4.164•••(cherry picked from commit 21de99d456b749dac5dcd87a97cdaf999526bd4b) TredwellGit2021-12-121-2/+2
| * | | | | linux: 5.15.6 -> 5.15.7•••(cherry picked from commit 935be58f5c80c02c48256406dc8df04e75fb52be) TredwellGit2021-12-121-2/+2
| * | | | | linux: 5.10.83 -> 5.10.84•••(cherry picked from commit 2e7590e84fd630f1b55505322d68c46cd4e2120e) TredwellGit2021-12-121-2/+2
| * | | | | linux: 4.9.291 -> 4.9.292•••(cherry picked from commit ad844d0a89e063c5f4da639d820e592d4dc5af30) TredwellGit2021-12-121-2/+2
| * | | | | linux: 4.4.293 -> 4.4.294•••(cherry picked from commit 0d0bc6032d1cb029e916c0906beb3b0570691a80) TredwellGit2021-12-121-2/+2
| * | | | | linux: 4.19.219 -> 4.19.220•••(cherry picked from commit 8a9c48a65da92f8cdfcd05706af5427aa339af3f) TredwellGit2021-12-121-2/+2
| * | | | | linux: 4.14.256 -> 4.14.257•••(cherry picked from commit 9cc83854e04fb67ac832a8c0f81b7973cc2f5515) TredwellGit2021-12-121-2/+2
* | | | | | Merge pull request #149896 from symphorien/ocaml-lsp-ocaml-4.13•••[21.11] ocamlPackages.jsonrpc: 1.8.3 → 1.9Guillaume Girol2021-12-122-4/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | ocamlPackages.jsonrpc: 1.8.3 → 1.9•••(cherry picked from commit 8f7e8ee23d9e24806faf07078b2702dc19cb9b53) edited to not upgrade ocaml-lsp to 1.9 on ocaml < 4.12 Guillaume Girol2021-12-092-4/+9