summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* nixos/nextcloud: update warning for MariaDB >= 10.6•••(cherry picked from commit 7c43256291e39d95ffd814f5d211ac2ac82698ba) origin/backport-150527-to-release-21.11Malte2021-12-131-2/+2
* 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
* | | | Merge pull request #149489 from NixOS/backport-147446-to-release-21.11•••[Backport release-21.11] Kernels 2021-12-01Maximilian Bosch2021-12-1215-89/+47
|\ \ \ \
| * | | | linux_5_14: remove•••https://lwn.net/ml/linux-kernel/1637500331152110@kroah.com/ https://github.com/openzfs/zfs/issues/12786 (cherry picked from commit dae043cacae9dd43e74cb76a9709a250b584c074) TredwellGit2021-12-086-45/+3
| * | | | linux/hardened/patches/5.4: 5.4.160-hardened1 -> 5.4.163-hardened1•••(cherry picked from commit 3bb4418f19665d58957641ca442ed59f85ade75e) TredwellGit2021-12-081-5/+5
| * | | | linux/hardened/patches/5.15: 5.15.3-hardened1 -> 5.15.6-hardened1•••(cherry picked from commit 5c8d2f4fdb2f7a101a445d4da8fc2da18a62f21a) TredwellGit2021-12-081-5/+5
| * | | | linux/hardened/patches/5.10: 5.10.80-hardened1 -> 5.10.83-hardened1•••(cherry picked from commit 3084c7289538fa4e2b68dce329051e8b891c885d) TredwellGit2021-12-081-5/+5
| * | | | linux/hardened/patches/4.19: 4.19.217-hardened1 -> 4.19.219-hardened1•••(cherry picked from commit e0069f5cc1e01305f93b2cda25d9d5a376d97348) TredwellGit2021-12-081-5/+5
| * | | | linux/hardened/patches/4.14: 4.14.255-hardened1 -> 4.14.256-hardened1•••(cherry picked from commit 0f0e9a2a7cde85de7dcfca2e41cf0d207c72dc07) TredwellGit2021-12-081-5/+5
| * | | | linux-rt_5_4: 5.4.154-rt65 -> 5.4.161-rt66•••(cherry picked from commit ced6cfdc53ba7630570f3779ec3607aef4757234) TredwellGit2021-12-081-3/+3
| * | | | linux-rt_5_10: 5.10.78-rt55 -> 5.10.78-rt56•••(cherry picked from commit 396a5f074f1dbbc334bd5d50fa8586e076bfcbf7) TredwellGit2021-12-081-2/+2
| * | | | linux: 5.4.161 -> 5.4.163•••(cherry picked from commit 316f926d4488f29d3596ef55758694812e3c4f25) TredwellGit2021-12-081-2/+2
| * | | | linux: 5.15.4 -> 5.15.6•••(cherry picked from commit 43df89f381d1c0c19780bd89934a06a642fd9317) TredwellGit2021-12-081-2/+2
| * | | | linux: 5.10.81 -> 5.10.83•••(cherry picked from commit a98d42b3106451de30ab9738098c69b31f981c8d) TredwellGit2021-12-081-2/+2
| * | | | linux: 4.9.290 -> 4.9.291•••(cherry picked from commit e6d513660c26edb94f12e29e2007b8d3f91810be) TredwellGit2021-12-081-2/+2
| * | | | linux: 4.4.292 -> 4.4.293•••(cherry picked from commit a1cfb71863ce71f6e194012da2daa44d234dbee5) TredwellGit2021-12-081-2/+2
| * | | | linux: 4.19.217 -> 4.19.219•••(cherry picked from commit b9170e6ce5043d81beefa4f8f97854dd90259884) TredwellGit2021-12-081-2/+2
| * | | | linux: 4.14.255 -> 4.14.256•••(cherry picked from commit 7a779a23845fcdb6cbf980c0fac6f285d078d44a) TredwellGit2021-12-081-2/+2
* | | | | Merge pull request #150452 from NixOS/backport-150410-to-release-21.11•••[Backport release-21.11] grafana: 8.3.1 -> 8.3.2, fix CVE-2021-43813, CVE-2021-43815Maximilian Bosch2021-12-121-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | grafana: 8.3.1 -> 8.3.2, fix CVE-2021-43813, CVE-2021-43815•••ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.3.2 (cherry picked from commit 3c8f6c5407aab5b872892f24fdf82ef8076b2ec5) Maximilian Bosch2021-12-121-3/+3
| | |_|/ | |/| |
* | | | Merge pull request #150459 from NixOS/backport-149929-to-release-21.11Artturi2021-12-121-0/+10
|\ \ \ \ | |/ / / |/| | |
| * | | libsidplayfp: fix tests on x86_64-darwin•••(cherry picked from commit 875ea5d71bc28581dacd84edf49c71f44ee98a15) OPNA26082021-12-121-0/+10
|/ / /
* | | Merge #149835: thunderbird: 91.3.2 -> 91.4.0 (into release-21.11)Vladimír Čunát2021-12-121-2/+2
|\ \ \
| * | | thunderbird-unwrapped: 91.3.2 -> 91.4.0•••(cherry picked from commit 901064350e08305b86129ecf7c84ad12e7fc137b) R. Ryantm2021-12-091-2/+2