summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge release-22.11 into staging-next-22.11origin/staging-next-22.11github-actions[bot]2023-07-043-7/+35
|\
| * Merge pull request #234621 from risicle/ris-mutagen-0.16.6-r22.11•••[22.11] mutagen: 0.16.0 -> 0.16.6, mutagen-compose: 0.16.2 -> 0.16.5 & add patch for CVE-2023-30844origin/release-22.11origin/nixpkgs-22.11-darwinorigin/nixos-22.11-smallorigin/nixos-22.11Martin Weinelt2023-07-033-7/+35
| |\
| | * mutagen-compose: add patch for CVE-2023-30844Robert Scott2023-05-282-1/+29
| | * mutagen-compose: 0.16.2 -> 0.16.5Robert Scott2023-05-281-3/+3
| | * mutagen: 0.16.0 -> 0.16.6Robert Scott2023-05-281-4/+4
* | | Merge release-22.11 into staging-next-22.11github-actions[bot]2023-07-0113-48/+72
|\| |
| * | Merge pull request #240594 from Ma27/linux-kernel-backports-2211•••[22.11] Linux kernel updates 2023-06-28Maximilian Bosch2023-06-3012-46/+70
| |\ \
| | * | linux_6_3: fix hardenedMaximilian Bosch2023-06-291-2/+2
| | * | linux_6_3_hardened: expose package•••(cherry picked from commit 0b4e493e58bf92b9784f5c0d562489364d0733e7) Maximilian Bosch2023-06-293-0/+5
| | * | linux_5_15: apply patch to fix amdgpu•••Closes #240017 (cherry picked from commit f193e0b8207e36fb3c6cc647fd441c11c6d22b98) Maximilian Bosch2023-06-292-0/+9
| | * | linux/hardened/patches/6.3: init at 6.3.1-hardened1•••(cherry picked from commit 325188d713c6a45049e472a9f860ce76f6878358) Maximilian Bosch2023-06-291-0/+10
| | * | linux/hardened/patches/6.1: 6.1.33-hardened1 -> 6.1.35-hardened1•••(cherry picked from commit 469e88115c85de122a921281bae77734766d1337) Maximilian Bosch2023-06-291-5/+5
| | * | linux/hardened/patches/5.4: 5.4.246-hardened1 -> 5.4.248-hardened1•••(cherry picked from commit 8af3229fca60ba300aae88c8e195523a05f0827a) Maximilian Bosch2023-06-291-5/+5
| | * | linux/hardened/patches/5.15: 5.15.116-hardened1 -> 5.15.118-hardened1•••(cherry picked from commit 8346a0e03c962a52625b9c89ecd673464877cfb7) Maximilian Bosch2023-06-291-5/+5
| | * | linux/hardened/patches/5.10: 5.10.183-hardened1 -> 5.10.185-hardened1•••(cherry picked from commit 15cf6dd4e39e83887f452dcc9f5ff14a90aa4db0) Maximilian Bosch2023-06-291-5/+5
| | * | linux/hardened/patches/4.19: 4.19.285-hardened1 -> 4.19.287-hardened1•••(cherry picked from commit ead6ae067d94f0994dcaa7853d95aab1128f36f1) Maximilian Bosch2023-06-291-5/+5
| | * | linux/hardened/patches/4.14: 4.14.317-hardened1 -> 4.14.319-hardened1•••(cherry picked from commit bd33b62b991bb9517c049f2d2ae8d14020033f70) Maximilian Bosch2023-06-291-5/+5
| | * | linux: 6.3.9 -> 6.3.10•••(cherry picked from commit c94a1a1f2708c9c5d289d64664e70e3b4903ae8b) Maximilian Bosch2023-06-291-2/+2
| | * | linux: 6.1.35 -> 6.1.36•••(cherry picked from commit 5c5284f1a247b9c60434635268a94dab022d3c79) Maximilian Bosch2023-06-291-2/+2
| | * | linux: 5.4.248 -> 5.4.249•••(cherry picked from commit 540219fde7a27f67988de9b1d7ff08301b0cf73b) Maximilian Bosch2023-06-291-2/+2
| | * | linux: 5.15.118 -> 5.15.119•••(cherry picked from commit 624ea64be10ab8bc7ca81612b7cd4be5192e6130) Maximilian Bosch2023-06-291-2/+2
| | * | linux: 5.10.185 -> 5.10.186•••(cherry picked from commit 52f402477b6964b113ac30bd121aaadb7f1a321c) Maximilian Bosch2023-06-291-2/+2
| | * | linux: 4.19.287 -> 4.19.288•••(cherry picked from commit 2e27cec09322fc5e79c514adc2a32c22d4913e3b) Maximilian Bosch2023-06-291-2/+2
| | * | linux: 4.14.319 -> 4.14.320•••(cherry picked from commit 9abe1bb6824bf6d70f03ed91d8e6003c52f6457b) Maximilian Bosch2023-06-291-2/+2
| * | | Merge pull request #240492 from NixOS/backport-240398-to-release-22.11•••[Backport release-22.11] brave: 1.52.126 -> 1.52.129Nick Cao2023-06-301-2/+2
| |\ \ \
| | * | | brave: 1.52.126 -> 1.52.129•••https://community.brave.com/t/release-channel-1-52-129/494007/1 (cherry picked from commit c1ecfffb818e213c8008db82c27ee079ceebd0c5) origin/backport-240398-to-release-22.11Sean Buckley2023-06-291-2/+2
* | | | | Merge release-22.11 into staging-next-22.11github-actions[bot]2023-06-306-19/+20
|\| | | |
| * | | | Merge pull request #240389 from NixOS/backport-240224-to-release-22.11•••[Backport release-22.11] chromium: 114.0.5735.133 -> 114.0.5735.198Emily2023-06-291-3/+3
| |\ \ \ \
| | * | | | chromium: 114.0.5735.133 -> 114.0.5735.198•••https://chromereleases.googleblog.com/2023/06/stable-channel-update-for-desktop_26.html This update includes 4 security fixes. CVEs: CVE-2023-3420 CVE-2023-3421 CVE-2023-3422 (cherry picked from commit 251bcbf1a2763c835d3bd1b94aa20cb38b39ad9e) origin/backport-240224-to-release-22.11Michael Weiss2023-06-281-3/+3
| | |/ / /
| * | | | Merge pull request #240529 from NixOS/backport-240476-to-release-22.11•••[Backport release-22.11] imagemagick: 7.1.1-11 -> 7.1.1-12Kerstin2023-06-291-2/+2
| |\ \ \ \
| | * | | | imagemagick: 7.1.1-11 -> 7.1.1-12•••Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.1-11...7.1.1-12 (cherry picked from commit e0334495f78fd862cbb6985b25b41dd197bb462c) Robert Schütz2023-06-291-2/+2
| * | | | | Merge pull request #240494 from NixOS/backport-240350-to-release-22.11Janik2023-06-291-5/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | ungoogled-chromium: 114.0.5735.133 -> 114.0.5735.198•••https://chromereleases.googleblog.com/2023/06/stable-channel-update-for-desktop_26.html This update includes 4 security fixes. CVEs: CVE-2023-3420 CVE-2023-3421 CVE-2023-3422 (cherry picked from commit dd96e7a2d7d438938011f38788c649278eaed2c3) origin/backport-240350-to-release-22.11networkException2023-06-291-5/+5
| | |/ / /
| * | | | gitlab: 15.11.9 -> 15.11.10 (#240505)•••https://gitlab.com/gitlab-org/gitlab/-/blob/v15.11.10-ee/CHANGELOG.mdYaya2023-06-293-9/+9
| * | | | Merge pull request #240513 from NixOS/backport-235003-to-release-22.11•••[Backport release-22.11] python3Packages.scikit-optimize: mark brokenDoron Behar2023-06-291-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | python3Packages.scikit-optimize: mark broken•••This library has not been updated since Oct 12, 2021 and has not kept up with numpy updates. (cherry picked from commit 172f721a57b5235b828d1f4cfee546ce3ecc7627) natsukium2023-06-291-0/+1
| |/ / /
* | | | Merge release-22.11 into staging-next-22.11github-actions[bot]2023-06-292-0/+50
|\| | |
| * | | sexp: init at 0.8.6 (#240252)•••This is a dependency of the [next version](https://github.com/rnpgp/rnp/releases/tag/v0.17.0) of [rnp](https://github.com/NixOS/nixpkgs/blob/a04b45f10eddb02352574d95c7d0a76bfbfc11dc/pkgs/tools/security/rnp/default.nix#L17). (cherry picked from commit d8c6a48180ef9ad587149eac65e554cf773b302b) Co-authored-by: Jeffrey Lau <jeffrey.lau@ribose.com>github-actions[bot]2023-06-282-0/+50
* | | | Merge release-22.11 into staging-next-22.11github-actions[bot]2023-06-285-15/+63
|\| | |
| * | | Merge pull request #228448 from andersk/22.11-openafs-kernel-6.3Janik2023-06-271-0/+48
| |\ \ \
| | * | | openafs: Patch for Linux kernel 6.3 (#228217)•••Signed-off-by: Anders Kaseorg <andersk@mit.edu> (cherry picked from commit 8e3b64db39f2aaa14b35ee5376bd6a2e707cadc2) Anders Kaseorg2023-04-261-0/+10
| | * | | openafs: Patch for Linux kernel 6.2•••Signed-off-by: Anders Kaseorg <andersk@mit.edu> (cherry picked from commit d768bedd3f8a48040de0c04808ea1c6a13b07170) Anders Kaseorg2023-04-261-0/+38
| * | | | Merge pull request #240161 from NixOS/backport-240111-to-release-22.11Janik2023-06-271-2/+2
| |\ \ \ \
| | * | | | mullvad-browser: 12.0.7 -> 12.5•••(cherry picked from commit 06707cf89660ce60e45344d353c552fff1a0e709) origin/backport-240111-to-release-22.11Felix Schröter2023-06-271-2/+2
| |/ / / /
| * | | | Merge pull request #239975 from NixOS/backport-239779-to-release-22.11•••[Backport release-22.11] linux_xanmod, linux_xanmod_latest: 2023-06-25Nick Cao2023-06-271-4/+4
| |\ \ \ \
| | * | | | linux_xanmod: 6.1.31 -> 6.1.35•••(cherry picked from commit 986c78a3819e020c139ca4e11bfd29ecd61a7318) Atemu2023-06-261-2/+2
| | * | | | linux_xanmod_latest: 6.3.5 -> 6.3.9•••(cherry picked from commit 3364233f46fd5b87b6a9bbf1fdb45d902a93c6ac) Atemu2023-06-261-2/+2
| * | | | | Merge pull request #239571 from LeSuisse/22.11-vault-1.12.7•••[22.11] vault, vault-bin: 1.12.5 -> 1.12.7Nick Cao2023-06-272-9/+9
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | vault: 1.12.5 -> 1.12.7•••Fixes CVE-2023-2121 Advisory: https://discuss.hashicorp.com/t/hcsec-2023-17-vault-s-kv-diff-viewer-allowed-html-injection/54814 Changelog: https://github.com/hashicorp/vault/blob/v1.12.7/CHANGELOG.md Thomas Gerbet2023-06-241-3/+3
| | * | | | vault-bin: 1.12.5 -> 1.12.7•••Fixes CVE-2023-2121 Advisory: https://discuss.hashicorp.com/t/hcsec-2023-17-vault-s-kv-diff-viewer-allowed-html-injection/54814 Changelog: https://github.com/hashicorp/vault/blob/v1.12.7/CHANGELOG.md Thomas Gerbet2023-06-241-6/+6