summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* nodejs: Fix setup-hook addNodePath quoting•••The argument to addNodePath previously wasn't being quoted, leading to problems when the argument contains characters interpreted specially by bash (cherry picked from commit e975c5650174f472bad14e946cdb34e5e1ea6874) origin/backport-163694-to-release-21.11Silvan Mosberger2022-03-181-1/+1
* Merge pull request #164484 from NixOS/backport-164467-to-release-21.11•••[Backport release-21.11] chromium: 99.0.4844.51 -> 99.0.4844.74Michael Weiss2022-03-171-7/+7
|\
| * chromium: 99.0.4844.51 -> 99.0.4844.74•••https://chromereleases.googleblog.com/2022/03/stable-channel-update-for-desktop_15.html This update includes 11 security fixes. CVEs: CVE-2022-0971 CVE-2022-0972 CVE-2022-0973 CVE-2022-0974 CVE-2022-0975 CVE-2022-0976 CVE-2022-0977 CVE-2022-0978 CVE-2022-0979 CVE-2022-0980 (cherry picked from commit d1f0959dbc85757f31a6c27e6cb85863212e9e0b) Michael Weiss2022-03-161-7/+7
* | bind: 9.16.25 -> 9.16.27•••https://downloads.isc.org/isc/bind9/9.16.27/RELEASE-NOTES-bind-9.16.27.html Fixes: CVE-2021-25220, CVE-2022-0396 Martin Weinelt2022-03-171-2/+2
* | Merge pull request #164553 from Ma27/backport-mautrix-whatsapp•••[21.11] mautrix-whatsapp: 0.2.4 -> 0.3.0Maximilian Bosch2022-03-171-3/+3
|\ \
| * | mautrix-whatsapp: 0.2.4 -> 0.3.0•••(cherry picked from commit 6eaadbe4c3bba6d9471c890faffa276b4e957088) Charlotte Van Petegem2022-03-171-3/+3
|/ /
* | Merge pull request #164513 from NixOS/backport-164498-to-release-21.11•••[Backport release-21.11] brave: 1.36.112 -> 1.36.116 TredwellGit2022-03-171-2/+2
|\ \
| * | brave: 1.36.112 -> 1.36.116•••https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#136116 (cherry picked from commit 6004e84b8b69f15f1538b5ca969aaae40b0554cd) TredwellGit2022-03-161-2/+2
* | | Merge pull request #164496 from NixOS/backport-164456-to-release-21.11•••[Backport release-21.11] Linux kernels 2022-03-16 TredwellGit2022-03-168-16/+16
|\ \ \ | |/ / |/| |
| * | linux_latest-libre: 18627 -> 18635•••(cherry picked from commit 39e2856eb6e7833fd94f9a0c4a21b9aaf981a2b1) TredwellGit2022-03-161-2/+2
| * | linux: 5.4.184 -> 5.4.185•••(cherry picked from commit ae3bcac97af97f567c55e92099efc906d2b49efe) TredwellGit2022-03-161-2/+2
| * | linux: 5.16.14 -> 5.16.15•••(cherry picked from commit 79699f61a287eab59a0a19f60057943e2b14e91f) TredwellGit2022-03-161-2/+2
| * | linux: 5.15.28 -> 5.15.29•••(cherry picked from commit 6ddf7b574c6458dc8be2eb131add69cc076068e4) TredwellGit2022-03-161-2/+2
| * | linux: 5.10.105 -> 5.10.106•••(cherry picked from commit 48b578d278ecd8d690c5706d7bd2dfec8fa86de0) TredwellGit2022-03-161-2/+2
| * | linux: 4.9.306 -> 4.9.307•••(cherry picked from commit 7ea40efa4deb381d19bc39295709727495b00032) TredwellGit2022-03-161-2/+2
| * | linux: 4.19.234 -> 4.19.235•••(cherry picked from commit 111be9fee33d45ff5892cdbc71aaadf05010e610) TredwellGit2022-03-161-2/+2
| * | linux: 4.14.271 -> 4.14.272•••(cherry picked from commit 19fe4b6872b9a276fd178e1c730d1965adb12eab) TredwellGit2022-03-161-2/+2
| |/
* | Merge pull request #164459 from NixOS/backport-163723-to-release-21.11•••[Backport release-21.11] brave: 1.36.111 -> 1.36.112 TredwellGit2022-03-161-2/+2
|\ \ | |/ |/|
| * brave: 1.36.111 -> 1.36.112•••(cherry picked from commit 5975271884736446379000cf697779d8f107b1db) R. Ryantm2022-03-161-2/+2
|/
* Merge pull request #164322 from NixOS/backport-164300-to-release-21.11•••[Backport release-21.11] Bump DisnixOS version and apply compatibility fixesSander van der Burg2022-03-163-6/+8
|\
| * DisnixWebService: compile with OpenJDK8 to retain compatibility with Tomcat 9.x•••(cherry picked from commit 4206a9bbbafa5bf8af82ae89d58c097e32ee79b5) Sander van der Burg2022-03-151-1/+3
| * disnixos: 0.9.2 -> 0.9.3•••(cherry picked from commit 216e5571b102ca49f0cf214f5dc2ed3c2ac13ab6) Sander van der Burg2022-03-151-2/+2
| * dysnomia: replace deprecated mysql reference by mariadb•••(cherry picked from commit 253ab0296c5fc51456442e1909fd4bcd9fcd1ce6) Sander van der Burg2022-03-151-3/+3
* | Merge pull request #163965 from NixOS/backport-163636-to-release-21.11•••[Backport release-21.11] vscode: 1.65.1 -> 1.65.2Bobby Rong2022-03-161-6/+6
|\ \ | |/ |/|
| * vscode: 1.65.1 -> 1.65.2•••(cherry picked from commit 2a6d6397059ed67714764c4642a14e8a33650495) nixpkgs-upkeep-bot2022-03-131-6/+6
* | Merge branch 'staging-21.11' into release-21.11•••It's very simple change, so let's utilize the fact that we're rebuilding due to openssl already. Vladimír Čunát2022-03-151-2/+2
|\ \
| * \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-158-35/+85
| |\ \
| | * \ Merge release-21.11 into staging-next-21.11github-actions[bot]2022-03-158-35/+85
| | |\ \
| * | \ \ Merge pull request #163984 from NixOS/backport-155261-to-staging-21.11Sandro2022-03-141-2/+2
| |\ \ \ \
| | * | | | udisks: move util-linux to buildInputs•••This fixes cross compilation. (cherry picked from commit 9742335d83c2784980d8adb5630689efd87e6c5b) Joerie de Gram2022-03-131-2/+2
| * | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-145-5/+33
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-03-145-5/+33
| | |\ \ \
| * | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-1324-1249/+1178
| |\| | | |
| | * | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-03-1324-1249/+1178
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| * | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-1211-32/+32
| |\| | | |
| * | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-1122-285/+291
| |\ \ \ \ \
| * \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-105-405/+405
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-095-10/+44
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-0811-286/+372
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-077-54/+66
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-0622-709/+749
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-055-17/+17
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-047-134/+18
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-0342-37/+2458
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-024-26/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-0137-394/+505
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge #164303: openssl*: 1.1.1m -> 1.1.1.n; 3.0.1 -> 3.0.2•••...into release-21.11. High-severity security fixes. Vladimír Čunát2022-03-151-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | openssl_1_1: 1.1.1m -> 1.1.1n•••https://github.com/openssl/openssl/blob/OpenSSL_1_1_1n/CHANGES#L10 Fixes: CVE-2022-0778 (cherry picked from commit 72bb369245a84beaa5596f8ed551be470a20d6b2) Martin Weinelt2022-03-151-2/+2
| * | | | | | | | | | | | | | | | | openssl_3_0: 3.0.1 -> 3.0.2•••https://github.com/openssl/openssl/blob/openssl-3.0.2/CHANGES.md#changes-between-301-and-302-15-mar-2022 Fixes: CVE-2022-0778 (cherry picked from commit 384a708e6dca86ceda3d4867233153e781ad052c) Martin Weinelt2022-03-151-2/+2
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #164250 from NixOS/backport-164108-to-release-21.11•••[Backport release-21.11] wiki-js: 2.5.274 -> 2.5.276Maximilian Bosch2022-03-151-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \