summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* perlPackages.CPAN: 2.28 -> 2.29•••Fixes CVE-2020-16156 https://metacpan.org/release/ANDK/CPAN-2.29/source/Changes (cherry picked from commit e6d73949cff6d45522a2c539686c06b0056e13f2) origin/backport-157176-to-release-21.11Thomas Gerbet2022-01-291-4/+4
* Merge #156696: staging-next: 21.11 iteration 6Vladimír Čunát2022-01-2919-33/+218
|\
| * Merge release-21.11 into staging-next-21.11github-actions[bot]2022-01-292-4/+4
| |\
| * \ Merge branch 'release-21.11' into staging-next-21.11Vladimír Čunát2022-01-2814-27/+49
| |\ \
| * \ \ Merge #156128: webkitgtk: 2.34.3 -> 2.34.4•••...into staging-next-21.11 Vladimír Čunát2022-01-281-2/+2
| |\ \ \
| | * | | webkitgtk: 2.34.3 -> 2.34.4•••https://webkitgtk.org/security/WSA-2022-0001.html (cherry picked from commit a574ff9929f906208cd42827c7d3a0256bd18705) Martin Weinelt2022-01-221-2/+2
| * | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-01-2821-469/+484
| |\ \ \ \
| * \ \ \ \ Merge #156939: go: 1.16.9 -> 1.16.13 (into staging-next-21.11)Vladimír Čunát2022-01-271-2/+2
| |\ \ \ \ \
| | * | | | | go_1_16: 1.16.12 -> 1.16.13•••(cherry picked from commit d50b6bff8956e674ff4091f2ff27e965c078b215) zowoq2022-01-261-2/+2
| | * | | | | go_1_16: 1.16.11 -> 1.16.12•••(cherry picked from commit 5d33b5183b2efa38002cf3eff5ff8b352cfa5c19) zowoq2022-01-261-2/+2
| | * | | | | go_1_16: 1.16.10 -> 1.16.11•••(cherry picked from commit 2100043ba9c5d173c7b2213e3ef7ca6c693f35e9) zowoq2022-01-261-2/+2
| | * | | | | go_1_16: 1.16.9 -> 1.16.10•••(cherry picked from commit cc8cade9bab34326e9c191782718ae4bf9b3867d) zowoq2022-01-261-2/+2
| * | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-01-276-16/+31
| |\| | | | |
| * | | | | | libredirect: fix build for aarch64-darwin (PR #156839)•••(cherry picked from commit 4bde5a3a68d8d7095017f57c831b6f9540848e16 / PR #156460) Co-authored-by: Jonathan Ringer <jonringer117@gmail.com> Co-authored-by: Vladimír Čunát <v@cunat.cz>github-actions[bot]2022-01-261-1/+7
| * | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-01-2638-1347/+1518
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'staging-21.11' into staging-next-21.11Vladimír Čunát2022-01-258-6/+101
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge #156692: glibc: 2.33-71 -> 2.33-78 (into staging-21.11)Vladimír Čunát2022-01-252-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | glibc: 2.33-71 -> 2.33-78 (security)•••https://www.openwall.com/lists/oss-security/2022/01/24/4 (cherry picked from commit 13ab7d097f2e9b94e7c7544dde9bf29c0e19a7b2) Vladimír Čunát2022-01-252-1/+1
| | |/ / / / / / /
| | * | | | | | | Merge pull request #156683 from NixOS/backport-156607-to-staging-21.11Martin Weinelt2022-01-253-0/+87
| | |\ \ \ \ \ \ \
| | | * | | | | | | expat: add patches for CVE-2022-23852•••(cherry picked from commit 4292c49b93cd018c300cd8321151afa0cd051387) Robert Scott2022-01-253-0/+87
| | * | | | | | | | Merge pull request #156452 from FliegendeWurst/vim-4186-21.11Martin Weinelt2022-01-251-2/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | vim: 8.2.3877 -> 8.2.4186•••(cherry picked from commit ea5a1dd5e7c0afb3c14e1a27e3d2ebfaef9ff52b) FliegendeWurst2022-01-241-2/+2
| | | * | | | | | | vim: 8.2.3848 -> 8.2.3877•••(cherry picked from commit f0cf6c39189976806ea553ddf65de29a63c4fea1) R. Ryantm2022-01-241-2/+2
| | | * | | | | | | vim: 8.2.3451 -> 8.2.3848•••(cherry picked from commit 134376e2561c027a9588db76ba300fc4c28dced7) legendofmiracles2022-01-241-2/+2
| | * | | | | | | | gnutls: patch a security issue (low severity)•••On NixPkgs master it's instead addressed by update, PR #156588. The upstream patch is really simple; it seems worthwhile for staging-21.11. Vladimír Čunát2022-01-251-1/+9
| | * | | | | | | | Merge #156676: util-linux: 2.37.2 -> 2.37.3 (into staging-21.11)•••Two CVEs get fixed, no other changes: https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/v2.37.3-ReleaseNotes Vladimír Čunát2022-01-251-2/+2
| |/| | | | | | | |
| | * | | | | | | | util-linux: 2.37.2 -> 2.37.3•••(cherry picked from commit 87f2bae5ee8b5167eecc71267a1aeb72a83599b6) Martin Weinelt2022-01-251-2/+2
| |/ / / / / / / /
| * | | | | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-01-255-12/+21
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-01-255-12/+21
| | |\ \ \ \ \ \ \
| * | | | | | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-01-245-12/+14
| |\| | | | | | | |
| | * | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-01-245-12/+14
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge #156176: python3Packages.ipython: patch CVE-2022-21699•••...into staging-21.11 Vladimír Čunát2022-01-231-4/+16
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | python3Packages.ipython: add patch for CVE-2022-21699•••add a hacky checkPhase just covering this fix Robert Scott2022-01-221-4/+16
| * | | | | | | | | | | Merge #156087: mesa: 21.2.5 - > 21.2.6 (into staging-21.11)Vladimír Čunát2022-01-231-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | mesa: 21.2.5 -> 21.2.6•••(cherry picked from commit 63a370df6fed838d8850d6d874342c69a91ccf10) Michael Weiss2022-01-221-2/+2
| * | | | | | | | | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-01-2311-415/+435
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-01-2311-415/+435
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge #155880: rustc: patch CVE-2022-21658 (into staging-21.11)Vladimír Čunát2022-01-221-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | rustc: add patch for CVE-2022-21658Konrad Borowski2022-01-211-0/+18
| * | | | | | | | | | | | | | Merge #155507: e2fsprogs: 1.46.4 -> 1.46.5 (into staging-21.11)Vladimír Čunát2022-01-221-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | e2fsprogs: add meta.changelog•••(cherry picked from commit 3b8dc52c3f6fb59e32f7c66dd73b45733480dc3f) Alyssa Ross2022-01-181-0/+1
| | * | | | | | | | | | | | | e2fsprogs: 1.46.4 -> 1.46.5•••(cherry picked from commit 7cb7d96e3ebe8d3805f339c796a94402678ac42d) Alyssa Ross2022-01-181-2/+2
| * | | | | | | | | | | | | | Merge #156149: expat: 2.4.2 -> 2.4.3 (security, into staging-21.11)Vladimír Čunát2022-01-221-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | expat: 2.4.2 -> 2.4.3 (security)•••(cherry picked from commit 890ea19c1b74a68f4f3937048403136e5598933f) Sebastian Pipping2022-01-221-2/+2
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge #153917: libredirect: build fat library on darwin•••... for x86_64, arm64, arm64e (into staging-21.11) Vladimír Čunát2022-01-221-8/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | libredirect: build fat library for x86_64, arm64, arm64e on darwin•••macOS's dyld can be rather picky as to what dylib it accepts. This even changes across macOS versions. Therefore we now build a fat dylib with all three architectures (x86_64, arm64, arm64e). This should then be compatible with pretty much any macOS's dyld. (cherry picked from commit a655bc02a78cbfdb6a87148503a0f2031efdd49a) origin/backport-153441-to-staging-21.11Moritz Angermann2022-01-071-8/+26
| * | | | | | | | | | | | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-01-2219-443/+709
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-01-2219-443/+709
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #155866 from NixOS/backport-154984-to-staging-21.11•••[Backport staging-21.11] glibc: 2.33-62 -> 2.33-71Maximilian Bosch2022-01-212-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | glibc: 2.33-62 -> 2.33-71•••https://sourceware.org/bugzilla/show_bug.cgi?id=22542 https://nvd.nist.gov/vuln/detail/CVE-2022-23219 https://sourceware.org/bugzilla/show_bug.cgi?id=28768 https://nvd.nist.gov/vuln/detail/CVE-2022-23218 (cherry picked from commit 8dd2546e75caa3cefb147a4443eac68019d4d988) TredwellGit2022-01-202-2/+2
| | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |