summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update nixos/modules/services/misc/gollum.nix•••Co-authored-by: Kerstin <kerstin@erictapen.name> (cherry picked from commit 05885a166b4ee787693d28ce1b7f7c8ccdd79e71) origin/backport-203621-to-release-22.11jooooscha2023-06-271-1/+1
* nixos/gollum: <add option for user and group options>•••(cherry picked from commit 52e9ddd3457998c0dd6d7c694d303adb0a4f6cad) Joscha Loos2023-06-271-5/+17
* 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
* | Merge pull request #239922 from NixOS/backport-239876-to-release-22.11•••[Backport release-22.11] knot-dns: 3.2.7 -> 3.2.8Nick Cao2023-06-261-8/+2
|\ \
| * | knot-dns: 3.2.7 -> 3.2.8•••https://gitlab.nic.cz/knot/knot-dns/-/releases/v3.2.8 (cherry picked from commit 8870371562828a4f18bdda5b559fcdbeeede6a3e) Vladimír Čunát2023-06-261-8/+2
|/ /
* | Merge pull request #239471 from NixOS/backport-239329-to-release-22.11•••[Backport release-22.11] tor-browser-bundle-bin: 12.0.7 -> 12.5Nick Cao2023-06-251-4/+4
|\ \ | |/ |/|
| * tor-browser-bundle-bin: 12.0.7 -> 12.5•••(cherry picked from commit 7d7547e38ab38269800ef188c7033b31d07ddcd9) Felix Schröter2023-06-231-4/+4
* | Merge pull request #239432 from NixOS/backport-239368-to-release-22.11•••[Backport release-22.11] nextcloud: 25.0.7 -> 25.0.8, 26.0.2 -> 26.0.3Maximilian Bosch2023-06-241-4/+4
|\ \ | |/ |/|
| * nextcloud: 25.0.7 -> 25.0.8, 26.0.2 -> 26.0.3•••ChangeLog: https://nextcloud.com/changelog/#26-0-3 ChangeLog: https://nextcloud.com/changelog/#25-0-8 (cherry picked from commit 0b39fed16340bf85686542326efceb77e023af3f) Maximilian Bosch2023-06-231-4/+4
* | Merge pull request #239356 from Ma27/backport-grafana-cve-2023-3128-to-2211Franz Pletz2023-06-231-3/+3
|\ \ | |/ |/|
| * grafana: 9.4.12 -> 9.4.13, fix CVE-2023-3128•••ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.4.13 https://grafana.com/blog/2023/06/22/grafana-security-release-for-cve-2023-3128/?pg=graf&plcmt=top-promo-banner Maximilian Bosch2023-06-231-3/+3
* | pkgsStatic.libargon2: fix build•••By default, LIBRARIES includes both $(LIB_SH) (the shared library), and $(LIB_ST) (the static library). (cherry picked from commit d6660fa81bb6c14c2b6565ccada1b459ae25d9df) Alyssa Ross2023-06-231-0/+2
* | Merge pull request #239089 from NixOS/backport-239020-to-release-22.11•••[Backport release-22.11] Linux kernel updates 2023-06-21Maximilian Bosch2023-06-239-19/+19
|\ \
| * | linux_latest-libre: 19331 -> 19337•••(cherry picked from commit 786896e22900d7b5c4904997365333e83865defc) Maximilian Bosch2023-06-221-2/+2
| * | linux-rt_5_10: 5.10.78-rt55 -> 5.10.184-rt90•••(cherry picked from commit 5fcaa94255cc52c0039a16253ab5663301c5ee25) Maximilian Bosch2023-06-221-3/+3
| * | linux: 6.3.8 -> 6.3.9•••(cherry picked from commit 1b038dbb7a74ec550b91233ed22f7df2a8400a98) Maximilian Bosch2023-06-221-2/+2
| * | linux: 6.1.34 -> 6.1.35•••(cherry picked from commit a90ca2ad2b521f759ba8d7a5af79ad1395639071) Maximilian Bosch2023-06-221-2/+2
| * | linux: 5.4.247 -> 5.4.248•••(cherry picked from commit bf2aa164604966cc2c22bf607c5e224dfb2dda7a) Maximilian Bosch2023-06-221-2/+2
| * | linux: 5.15.117 -> 5.15.118•••(cherry picked from commit 00b1db98acc7238f37b6bb4889ecca20853fd001) Maximilian Bosch2023-06-221-2/+2
| * | linux: 5.10.184 -> 5.10.185•••(cherry picked from commit 9b063660201564e0e27f5b6bcfc1e038eabfc8af) Maximilian Bosch2023-06-221-2/+2
| * | linux: 4.19.286 -> 4.19.287•••(cherry picked from commit 0557763fc6faa87b00469cab51a8667f9d5016be) Maximilian Bosch2023-06-221-2/+2
| * | linux: 4.14.318 -> 4.14.319•••(cherry picked from commit 93c6573133bc24d85b1ba8f2e74bee6451a8a2d8) Maximilian Bosch2023-06-221-2/+2
* | | Merge pull request #239164 from NixOS/backport-239024-to-release-22.11•••[Backport release-22.11] knot-resolver: respect doInstallCheck even in wrapperNick Cao2023-06-231-3/+3
|\ \ \ | |/ / |/| |
| * | knot-resolver: respect doInstallCheck even in wrapper•••The main point is to avoid it when cross-compiling. (cherry picked from commit 962e2323a2d9e0d61b9c26e0a1fbef26028ebe1a) Vladimír Čunát2023-06-221-3/+3
|/ /
* | Merge #238445: staging-next-22.11 - iteration 10•••...into release-22.11 Vladimír Čunát2023-06-2117-21/+124
|\ \
| * \ Merge branch 'release-22.11' into staging-next-22.11Vladimír Čunát2023-06-216-412/+485
| |\ \ | |/ / |/| |
* | | Merge pull request #238861 from NixOS/backport-238852-to-release-22.11•••[Backport release-22.11] firefox-unwrapped: 114.0.1 -> 114.0.2Martin Weinelt2023-06-212-407/+407
|\ \ \
| * | | firefox-bin-unwrapped: 114.0.1 -> 114.0.2•••https://www.mozilla.org/en-US/firefox/114.0.2/releasenotes/ (cherry picked from commit 51b1bd2dc23c23d46978b7ffe89f33614c438290) Martin Weinelt2023-06-211-405/+405
| * | | firefox-unwrapped: 114.0.1 -> 114.0.2•••https://www.mozilla.org/en-US/firefox/114.0.2/releasenotes/ (cherry picked from commit 62c269496c449d3ac1e62d663725f6461434f4ab) Martin Weinelt2023-06-211-2/+2
* | | | Merge pull request #238844 from NixOS/backport-238794-to-release-22.11•••[Backport release-22.11] matrix-synapse: 1.85.2 -> 1.86.0Nick Cao2023-06-201-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | matrix-synapse: 1.85.2 -> 1.86.0•••https://github.com/matrix-org/synapse/releases/tag/v1.86.0 Signed-off-by: Sumner Evans <me@sumnerevans.com> (cherry picked from commit 51bd2aca103a777b346915155458942618839c91) Sumner Evans2023-06-201-3/+3
* | | | Merge pull request #238840 from mweinelt/22.11/nss-3.90•••[release-22.11] nss: 3.89.1 -> 3.90Martin Weinelt2023-06-213-2/+75
|\ \ \ \ | |/ / / |/| | |
| * | | nss_latest: remove curve25519 support•••Was enabled unconditionally, but causes SIGILL on machines that do not support the Intel ADX instruction extensions. (cherry picked from commit 2e5b94de00fa9735d6fe8d4892c8bee113f7a726) Martin Weinelt2023-06-212-0/+73
| * | | nss: 3.89.1 -> 3.90•••https://github.com/nss-dev/nss/blob/NSS_3_90_BRANCH/doc/rst/releases/nss_3_90.rst (cherry picked from commit 871fd1b210130a903985d61444c8a7903d3b3b8d) ajs1242023-06-211-2/+2
|/ / /
| * | jami: fixup build of the custom ffmpeg•••Same issue as addressed in the parent commit, apparently. Vladimír Čunát2023-06-211-1/+7
| * | handbrake: fixup build•••The patch was dropped when updating ffmpeg in e634295ef, but handbrake overrides version so it still needs this patch. Vladimír Čunát2023-06-211-0/+6
| * | Merge release-22.11 into staging-next-22.11github-actions[bot]2023-06-213-5/+4
| |\ \ | |/ / |/| |
* | | Merge pull request #238724 from NixOS/backport-235510-to-release-22.11•••[Backport release-22.11] mysql80: unpin opensslNick Cao2023-06-201-1/+0
|\ \ \
| * | | mysql80: unpin openssl•••(cherry picked from commit 72f132d06d97cdfba6c4851edf704339ef289027) Aaron Jheng2023-06-201-1/+0
|/ / /
* | | Merge pull request #238570 from NixOS/backport-238559-to-release-22.11•••[Backport release-22.11] thunderbird-unwrapped: 102.11.2 -> 102.12.0Nick Cao2023-06-191-2/+2
|\ \ \
| * | | thunderbird-unwrapped: 102.11.2 -> 102.12.0•••(cherry picked from commit f3ccc82a1bfe9b9931f210de0bc22ed2fc5a09c3) R. Ryantm2023-06-191-2/+2
* | | | Merge pull request #238614 from NixOS/backport-228772-to-release-22.11•••[Backport release-22.11] aprutil: 1.6.1 -> 1.6.3Nick Cao2023-06-191-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | aprutil: 1.6.1 -> 1.6.3•••(cherry picked from commit 61c9ea32ec216355bedfd3c6b173054387572068) R. Ryantm2023-06-191-2/+2
|/ / /
| * | Revert Merge #234602: qt5: update patches•••This reverts commit b5198bc72bf08b65d04fe69f6484d47b109a8b47, reversing changes made to a1fc45e735ccbeb57914de0cc6b47110767c9118. It wouldn't build and noone seems willing to investigate deeper. Vladimír Čunát2023-06-191-82/+82
| * | Merge release-22.11 into staging-next-22.11github-actions[bot]2023-06-195-2/+6850
| |\ \ | |/ / |/| |