summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ungoogled-chromium: 102.0.5005.61 -> 102.0.5005.115•••(cherry picked from commit 69c4953f4b6bf2ed6df453a20be9537d52ceee29) origin/backport-177330-to-release-21.11Michael Weiss2022-06-121-5/+5
* Merge pull request #177223 from NixOS/backport-176986-to-release-21.11Martin Weinelt2022-06-124-1181/+1181
|\
| * firefox-devedition-bin-unwrapped: 102.0b1 -> 102.0b5•••(cherry picked from commit 26ca0d1901ae0a7f55406d34c413281f8ea0ee68) Martin Weinelt2022-06-101-393/+393
| * firefox-beta-bin-unwrapped: 102.0b1 -> 102.0b5•••(cherry picked from commit 439a7369aea23ec6eb6d70121480a62b8bb1a74c) Martin Weinelt2022-06-101-393/+393
| * firefox-bin-unwrapped: 101.0 -> 101.0.1•••https://www.mozilla.org/en-US/firefox/101.0.1/releasenotes/ (cherry picked from commit d373d1b66bf68ae6c20ee22a8afd03bbb714d0da) Martin Weinelt2022-06-101-393/+393
| * firefox-unwrapped: 101.0 -> 101.0.1•••https://www.mozilla.org/en-US/firefox/101.0.1/releasenotes/ (cherry picked from commit 3a852683aa3365f5628cc4435249da394dba50cd) R. Ryantm2022-06-101-2/+2
* | Merge pull request #177210 from NixOS/backport-177204-to-release-21.11•••[Backport release-21.11] chromium: 102.0.5005.61 -> 102.0.5005.115Mario Rodas2022-06-101-7/+7
|\ \ | |/ |/|
| * chromium: 102.0.5005.61 -> 102.0.5005.115•••https://chromereleases.googleblog.com/2022/06/stable-channel-update-for-desktop.html This update includes 7 security fixes. CVEs: CVE-2022-2007 CVE-2022-2008 CVE-2022-2010 CVE-2022-2011 (cherry picked from commit 41c362c9d16c623b5b4b936832a96a34b61595be) Michael Weiss2022-06-101-7/+7
* | Merge pull request #177175 from NixOS/backport-177112-to-release-21.11•••[Backport release-21.11] vscode: 1.67.2 -> 1.68.0maxine [they]2022-06-101-6/+6
|\ \ | |/ |/|
| * vscode: 1.67.2 -> 1.68.0•••(cherry picked from commit df118d7a7a3fbe365673be84d54bf400c6dbb3a9) nixpkgs-upkeep-bot2022-06-101-6/+6
* | Merge pull request #177185 from NixOS/backport-177181-to-release-21.11Martin Weinelt2022-06-101-2/+2
|\ \ | |/ |/|
| * apacheHttpd: 2.4.53 -> 2.4.54•••https://downloads.apache.org/httpd/CHANGES_2.4.54 Fixes: CVE-2022-31813, CVE-2022-30556, CVE-2022-30522, CVE-2022-29404, CVE-2022-28615, CVE-2022-28614, CVE-2022-28330, CVE-2022-26377 (cherry picked from commit 35c7173cf5392522d632cb6469298e1e73360929) Fabian Affolter2022-06-101-2/+2
|/
* python2Packages.pyjwt: mark insecure•••(cherry picked from commit 007ffa606906411323ef32448ea97c005cffe597) Robert Schütz2022-06-091-0/+3
* poetry: mark insecure•••The version of urllib3 in poetry.lock (1.25.11) is vulnerable to CVE-2021-33503. Robert Schütz2022-06-091-0/+3
* qarte: 4.15.1 → 4.17.1•••(cherry picked from commit a6494aad0bddfb46e3d5ac6be37408bdbdbea3e0) Vincent Laporte2022-06-081-4/+4
* Merge pull request #176814 from dotlambda/rmfuse-0.2.3•••[21.11] rmfuse: 0.2.1 -> 0.2.3adisbladis2022-06-083-198/+264
|\
| * rmfuse: Re-lock dependencies•••So Pillow is bumped https://pillow.readthedocs.io/en/stable/releasenotes/9.1.1.html. Closes #175600 (cherry picked from commit 4537ba53c00ce2bc072f5c2981f737ed254757be) adisbladis2022-06-071-103/+105
| * rmfuse: 0.2.1 -> 0.2.3•••(cherry picked from commit 9ea7bd4e67cc2bc3069b8961914cd80cc55037fa) adisbladis2022-06-073-198/+262
|/
* python2Packages.urllib3: mark insecure•••(cherry picked from commit ac4fc73abc159cd8860ce7b61844306335fb3578) Robert Schütz2022-06-071-0/+3
* Merge pull request #176357 from NixOS/backport-168882-to-release-21.11•••[Backport release-21.11] vscode: fix auto encoding detection crashing editor windowBobby Rong2022-06-071-3/+9
|\
| * vscode: fix auto encoding detection crashing editor window•••Closes #152939 (cherry picked from commit 2ca1c986175e864bb67a955a4189f7acf51f8b1b) Sandro Jäckel2022-06-051-0/+6
| * vscode: move asar to nativeBuildInputs•••(cherry picked from commit 92fe27da603271baf3495a8496a9d917c639329d) Sandro Jäckel2022-06-051-3/+3
* | Merge pull request #176358 from LeSuisse/21.11-argocd-2.1.15•••[21.11] argocd: 2.1.6 -> 2.1.15Thiago Kenji Okada2022-06-061-4/+4
|\ \
| * | argocd: 2.1.6 -> 2.1.15•••Fixes CVE-2022-29165, CVE-2022-24904, CVE-2022-24905, CVE-2022-1025 and CVE-2022-24348. https://github.com/argoproj/argo-cd/releases/tag/v2.1.15 https://github.com/argoproj/argo-cd/releases/tag/v2.1.14 https://github.com/argoproj/argo-cd/releases/tag/v2.1.13 https://github.com/argoproj/argo-cd/releases/tag/v2.1.12 https://github.com/argoproj/argo-cd/releases/tag/v2.1.11 https://github.com/argoproj/argo-cd/releases/tag/v2.1.10 https://github.com/argoproj/argo-cd/releases/tag/v2.1.9 https://github.com/argoproj/argo-cd/releases/tag/v2.1.8 https://github.com/argoproj/argo-cd/releases/tag/v2.1.7 Thomas Gerbet2022-06-051-4/+4
| |/
* | Merge #176511: python3Packages.black: disable test on aarch64-linux•••...into release-21.11 Vladimír Čunát2022-06-061-0/+3
|\ \
| * | python3Packages.black: disable test on aarch64-linux•••This test reproducibly triggers the max open files limit on our aarch64 hydra builders. Disable it for now to make tests work again but this can't be the final solution. https://hydra.nixos.org/build/179001754 (cherry picked from commit 3fcf9f18ddfdbf108b371637410821b6f388ef67) Martin Weinelt2022-06-061-0/+3
|/ /
* | Merge pull request #176468 from NixOS/backport-176415-to-release-21.11•••[Backport release-21.11] imagemagick: 7.1.0-36 -> 7.1.0-37Kerstin2022-06-051-2/+2
|\ \
| * | imagemagick: 7.1.0-36 -> 7.1.0-37•••(cherry picked from commit 2badffbd9983350effe3a5fae7e46f2644e26d3d) origin/backport-176415-to-release-21.11Robert Schütz2022-06-051-2/+2
|/ /
* | Merge #175627: staging-next-21.11: iteration 16Vladimír Čunát2022-06-053-2/+27
|\ \
| * \ Merge release-21.11 into staging-next-21.11github-actions[bot]2022-06-056-14/+14
| |\ \
| * \ \ Merge release-21.11 into staging-next-21.11github-actions[bot]2022-06-021-0/+3
| |\ \ \
| * \ \ \ Merge release-21.11 into staging-next-21.11github-actions[bot]2022-06-0112-1196/+1275
| |\ \ \ \
| * \ \ \ \ Merge branch 'staging-21.11' into staging-next-21.11Vladimír Čunát2022-05-313-2/+27
| |\ \ \ \ \
| | * \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-05-314-22/+16
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-05-314-22/+16
| |\ \ \ \ \ \
| | | * \ \ \ \ Merge pull request #175143 from NixOS/backport-173327-to-staging-21.11•••[Backport staging-21.11] libtiff: add patches for CVE-2022-1354 & CVE-2022-1355Robert Scott2022-05-301-0/+10
| | | |\ \ \ \ \
| | | | * | | | | libtiff: add patches for CVE-2022-1354 & CVE-2022-1355•••(cherry picked from commit 8d8b43cb3c5069e6a90b011e3882dd27a91e63bb) Robert Scott2022-05-281-0/+10
| | | * | | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-05-303-13/+11
| | | |\ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-05-303-13/+11
| |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-05-291-3/+3
| | | | |\ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | / / / / / | | | | |/ / / / /
| * | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-05-291-3/+3
| |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ Merge pull request #174901 from LeSuisse/cups-CVE-2022-26691-21.11Martin Weinelt2022-05-281-0/+15
| | | | | |\ \ \ \ \
| | | | | | * | | | | cups: fixes CVE-2022-26691Thomas Gerbet2022-05-271-0/+15
| | | | | * | | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-05-2818-161/+272
| | | | | |\ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | / / / / / | | | | | |/ / / / /
| * | | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-05-2812-130/+109
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge release-21.11 into staging-next-21.11github-actions[bot]2022-05-276-31/+163
| |\ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-05-266-10/+62
| | | | | | | |\ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-05-266-10/+62
| |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-05-2510-14/+95
| | | | | | | | |\ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-05-2510-14/+95
| |\ \ \ \ \ \ \ \ \ \ \ \