summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* protonmail-bridge: 1.6.9 -> 1.8.7•••(cherry picked from commit 398a3226726dd6b2d269e32c6a1a87e337a6fd99) origin/backport-134460-to-release-21.05R. RyanTM2021-09-031-3/+3
* Merge pull request #136494 from NixOS/backport-136228-to-release-21.05•••[Backport release-21.05] qt5.qt3d: init moduleadisbladis2021-09-024-3/+13
|\
| * qt5.qt3d: init module•••(cherry picked from commit a7432ad3115c153a901cd49da24e7b766cce1e21) adisbladis2021-09-024-3/+13
|/
* Revert "chromium: 92.0.4515.159 -> 93.0.4577.63"•••This reverts commit acf91fbac724fbb6763297aac8bf7b24ba1e514d. Reason: I didn't pay enough attention, this lacks additional backports, sorry! Michael Weiss2021-09-021-9/+9
* Merge pull request #136386 from NixOS/backport-136373-to-release-21.05•••[Backport release-21.05] chromium: 92.0.4515.159 -> 93.0.4577.63Michael Weiss2021-09-021-9/+9
|\
| * chromium: 92.0.4515.159 -> 93.0.4577.63•••https://chromereleases.googleblog.com/2021/08/stable-channel-update-for-desktop_31.html This update includes 27 security fixes. CVEs: CVE-2021-30606 CVE-2021-30607 CVE-2021-30608 CVE-2021-30609 CVE-2021-30610 CVE-2021-30611 CVE-2021-30612 CVE-2021-30613 CVE-2021-30614 CVE-2021-30615 CVE-2021-30616 CVE-2021-30617 CVE-2021-30618 CVE-2021-30619 CVE-2021-30620 CVE-2021-30621 CVE-2021-30622 CVE-2021-30623 CVE-2021-30624 (cherry picked from commit d04f44f7e8d6f475e91e5539becf156676caff5c) Michael Weiss2021-09-011-9/+9
* | Merge pull request #136424 from NixOS/backport-136382-to-release-21.05•••[Backport release-21.05] palemoon: 29.4.0.1 -> 29.4.0.2Anderson Torres2021-09-021-2/+2
|\ \
| * | palemoon: 29.4.0.1 -> 29.4.0.2•••(cherry picked from commit 080b1486041d214754cf25f4f1e94e05cba36184) OPNA26082021-09-011-2/+2
* | | Merge pull request #134492 from NixOS/backport-134335-to-release-21.05•••[Backport release-21.05] element-{web,desktop}: 1.7.34 -> 1.8.1Maximilian Bosch2021-09-024-19/+356
|\ \ \
| * | | element-{web,desktop}: 1.7.34 -> 1.8.1•••(cherry picked from commit dba043d448fef9a882e6cccb0a681baa45d6ff84) origin/backport-134335-to-release-21.05Sumner Evans2021-08-174-19/+356
* | | | Merge pull request #136458 from mweinelt/21.05/fix-httplib2Martin Weinelt2021-09-021-0/+9
|\ \ \ \
| * | | | python3Packages.httplib2: fix tests•••(cherry picked from commit f019d3adb27c2754f1c122ea945aa51ea4347819) Robert Schütz2021-09-021-0/+9
| | |/ / | |/| |
* | | | Merge pull request #136450 from LeSuisse/mosquitto-2.0.12-21.05Martin Weinelt2021-09-021-2/+12
|\ \ \ \ | |/ / / |/| | |
| * | | mosquitto: 2.0.11 -> 2.0.12•••https://github.com/eclipse/mosquitto/blob/v2.0.12/ChangeLog.txt (cherry picked from commit d4c75580c18c78bdf81810dc73aab76e10754190) Thomas Gerbet2021-09-021-2/+2
| * | | mosquitto: 2.0.10 -> 2.0.11•••Fixes CVE-2021-34431. https://github.com/eclipse/mosquitto/blob/v2.0.11/ChangeLog.txt (cherry picked from commit ded0f0ede6c5ebda4eb88e8158a4115b2780a9fe) Thomas Gerbet2021-09-021-2/+12
|/ / /
* | | Merge branch 'staging-next-21.05' into release-21.05•••There's not even half of all binaries yet, but let's move this forward and get the -small channel going with secure openssl. Vladimír Čunát2021-09-0115-42/+113
|\ \ \
| * \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-09-011-2/+2
| |\ \ \ | | | |/ | | |/|
| * | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-09-012-40/+94
| |\ \ \
| * \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-312-3/+3
| |\ \ \ \
| * \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-318-294/+287
| |\ \ \ \ \
| * \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-311-3/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-303-0/+64
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge #136118: ffmpeg*: revert backport of doCheck = trueVladimír Čunát2021-08-303-18/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Revert "[Backport staging-21.05] ffmpeg, ffmpeg-full: enable basic tests"Robert Scott2021-08-293-18/+2
| |/ / / / / / / /
| * | | | | | | | Merge #135990: openssl: 1.1.1k -> 1.1.1l (into staging-next-21.05)Vladimír Čunát2021-08-292-2/+60
| |\ \ \ \ \ \ \ \
| | * | | | | | | | openssl: 1.1.1k -> 1.1.1l•••(cherry picked from commit 174868d4fa8452c0dc7ebcaf5548376351fa280a) Martin Weinelt2021-08-282-2/+60
| * | | | | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-294-9/+34
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-2815-322/+279
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-282-0/+87
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-2812-51/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-271-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-273-2/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-261-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-264-14/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-252-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-251-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-252-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-2412-39/+191
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #134858 from NixOS/backport-134751-to-staging-21.05•••[Backport staging-21.05] c-ares: enable parallel buildingMartin Weinelt2021-08-241-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | c-ares: enable parallel building•••(cherry picked from commit b2ae763c42df36baa6d84420cf3ae9234c72fd7f) origin/backport-134751-to-staging-21.05TredwellGit2021-08-191-0/+2
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #133252 from mweinelt/21.05/cpython/updateMartin Weinelt2021-08-243-10/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | cpython: fix permissions on venv activation scripts•••Previously these ended up without u+w permissions which meant they could not be regenerated, which was hugely annoying when these venvs were for example created and recreated in a nix-shell. (cherry picked from commit 4fa69858d951409426c5b080fbdaf342fe790877) Martin Weinelt2021-08-092-0/+17
| | * | | | | | | | | | | | | | | | | | | | | python310: 3.10.0b3 -> 3.10.0rc1•••(cherry picked from commit ebc4dae8cb65706c5d91afe3dc39d1f6c0f17e5e) Martin Weinelt2021-08-091-2/+2
| | * | | | | | | | | | | | | | | | | | | | | python37: 3.7.10 -> 3.7.11•••(cherry picked from commit b322c5ecaab811090690b026e1db857de6523e64) Martin Weinelt2021-08-091-2/+2
| | * | | | | | | | | | | | | | | | | | | | | python36: 3.6.13 -> 3.6.14•••(cherry picked from commit e1e245f203e2d1b568b730eb363026ea81fdfc1e) Martin Weinelt2021-08-091-2/+2
| | * | | | | | | | | | | | | | | | | | | | | python39: 3.9.5 -> 3.9.6•••(cherry picked from commit 360c50f11d675f0a19e2245e3ebfa1179ff28360) Martin Weinelt2021-08-091-2/+2
| | * | | | | | | | | | | | | | | | | | | | | python38: 3.8.10 -> 3.8.11•••(cherry picked from commit 250f0514f2cfbf1c4f099870c329eb6ecc6a0115) Martin Weinelt2021-08-091-2/+2
| | * | | | | | | | | | | | | | | | | | | | | python310: 3.10.0a5 -> 3.10.0b3•••(cherry picked from commit bb696403b0334d1fd3dee195751f99f9e2b0270f) Martin Weinelt2021-08-091-2/+2
| | * | | | | | | | | | | | | | | | | | | | | python39: 3.9.4 -> 3.9.5•••(cherry picked from commit 7ca18ab93f802dead800d76e3913eda1a8bbc705) Martin Weinelt2021-08-091-2/+2
| | * | | | | | | | | | | | | | | | | | | | | python38: 3.8.9 -> 3.8.10•••(cherry picked from commit 3898eb189762f5e83ed4b617c58711ceae29e9fa) Martin Weinelt2021-08-091-2/+2