summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* libtar: apply patches for CVE-2021-33640, CVE-2021-33643, CVE-2021-33644, CVE...•••https://nvd.nist.gov/vuln/detail/CVE-2021-33640 https://nvd.nist.gov/vuln/detail/CVE-2021-33643 https://nvd.nist.gov/vuln/detail/CVE-2021-33644 https://nvd.nist.gov/vuln/detail/CVE-2021-33645 https://nvd.nist.gov/vuln/detail/CVE-2021-33646 One of the existing patch that was pulled from Debian has been replaced by the Fedora version to be able to apply the CVE-2021-33645/CVE-2021-33646/CVE-2021-33640 patch without changes. (cherry picked from commit ed8834484642abebfcbfdb5e28458644c206679a) origin/backport-210915-to-release-22.11Thomas Gerbet2023-01-231-1/+15
* Merge pull request #211094 from NixOS/backport-210142-to-release-22.11•••[Backport release-22.11] zotero: 6.0.18 -> 6.0.20Nick Cao2023-01-231-2/+2
|\
| * zotero: 6.0.19 -> 6.0.20•••(cherry picked from commit 086afb8f9799fb0bedc1c799ca366de8e714d97e) Steven Kou2023-01-161-2/+2
| * zotero: 6.0.18 -> 6.0.19•••(cherry picked from commit e832a068c065b316ccaebd7f0dbe3e3c76159946) Steven Kou2023-01-161-2/+2
* | Merge pull request #211109 from NixOS/backport-210742-to-release-22.11•••[Backport release-22.11] wireshark: 4.0.1 -> 4.0.2Nick Cao2023-01-231-2/+2
|\ \
| * | wireshark: 4.0.1 -> 4.0.2•••(cherry picked from commit de8a327954d866959503a0a79f592051baa911f4) Robert Scott2023-01-161-2/+2
* | | Merge pull request #211195 from NixOS/backport-207748-to-release-22.11•••[Backport release-22.11] nixos/wiki-js: Add git and openssh to the wiki-js service path to enable git backups.Nick Cao2023-01-231-1/+7
|\ \ \
| * | | nixos/wiki-js: Add git and openssh to enable git backups.•••(cherry picked from commit eef1f70919005ee80f396b546a56351fe0ad8fe3) Tom Jankauski2023-01-171-1/+7
* | | | Merge #212221: python3Packages.python-http-client: Disable test•••...into release-22.11 Vladimír Čunát2023-01-231-0/+5
|\ \ \ \
| * | | | python3Packages.python-http-client: Disable failing test•••(cherry picked from commit afa8c47666496f2aa813e599bb7545e4c9ff2ab0) But don't update pname like the original commit does. Martin Weinelt2023-01-231-0/+5
|/ / / /
* | | | Merge pull request #211029 from NixOS/backport-210737-to-release-22.11•••[Backport release-22.11] xivlauncher: 1.0.2 -> 1.0.3Sandro2023-01-232-3/+12
|\ \ \ \
| * | | | xivlauncher: remove ashkitten as maintainer•••Requested in https://github.com/NixOS/nixpkgs/pull/210737#issuecomment-1382894954 (cherry picked from commit 2556ba08eef139bc7f4d51b049f50320f5fa8568) Winter2023-01-161-1/+1
| * | | | xivlauncher: add witchof0x20 as maintainer•••(cherry picked from commit 95cd72f7315d092fccd8a5b7552f0376f61555d0) Jade2023-01-161-1/+1
| * | | | maintainers: add witchof0x20 as maintainer•••(cherry picked from commit b791880e4b0a928c2ddf3767d454c3c887f0dcfa) Jade2023-01-161-0/+9
| * | | | xivlauncher: 1.0.2 -> 1.0.3•••(cherry picked from commit 6a55b415ba096a05d48cd17911ec18e5b1711753) Jade2023-01-161-2/+2
* | | | | Merge pull request #212195 from NixOS/backport-211569-to-release-22.11•••[Backport release-22.11] prometheus: 2.40.3 -> 2.41.0Nick Cao2023-01-231-4/+4
|\ \ \ \ \
| * | | | | prometheus: 2.40.3 -> 2.41.0•••prometheus 2.40.x is out of support since 12/2022 therefore the update to 2.41.0 between those two releases security critical patches have been added both to prometheus codebase and upstream dependecies, see: * 2.40.6 / 2022-12-09 https://github.com/prometheus/prometheus/pull/11690 [SECURITY] Security upgrade from go and upstream dependencies that include security fixes to the net/http and os packages. #11691 * 2.40.4 / 2022-11-29 https://github.com/advisories/GHSA-7rg2-cxvp-9p7p https://github.com/advisories/GHSA-4v48-4q5m-8vx4 [SECURITY] Fix basic authentication bypass vulnerability (CVE-2022-46146) GHSA-4v48-4q5m-8vx4 (cherry picked from commit bfac961c8cc623557a421512a99def1e3784c61e) Marian Hammer2023-01-231-4/+4
|/ / / / /
* | | | | Merge pull request #211745 from NixOS/backport-211563-to-release-22.11•••[Backport release-22.11] vscode-extensions.davidanson.vscode-markdownlint: 0.48.1 -> 0.49.0Nick Cao2023-01-231-2/+2
|\ \ \ \ \
| * | | | | vscode-extensions.davidanson.vscode-markdownlint: 0.48.1 -> 0.49.0•••(cherry picked from commit 95ab55f851da3c65d4953c7346dd2f749fd91e40) datafoo2023-01-201-2/+2
* | | | | | Merge pull request #211746 from NixOS/backport-211562-to-release-22.11•••[Backport release-22.11] vscode-extensions.esbenp.prettier-vscode: 9.10.3 -> 9.10.4Nick Cao2023-01-231-2/+2
|\ \ \ \ \ \
| * | | | | | vscode-extensions.esbenp.prettier-vscode: 9.10.3 -> 9.10.4•••(cherry picked from commit 5b8a88106f8d1a4eb341a46048b4742198bc454a) datafoo2023-01-201-2/+2
| |/ / / / /
* | | | | | Merge pull request #212048 from NixOS/backport-211945-to-release-22.11•••[Backport release-22.11] ticker: 4.5.4 -> 4.5.5Nick Cao2023-01-231-5/+8
|\ \ \ \ \ \
| * | | | | | ticker: add changelog to meta•••(cherry picked from commit 087b38754583e3f1f661ccd14b9b1084d24c871c) Fabian Affolter2023-01-221-3/+6
| * | | | | | ticker: 4.5.4 -> 4.5.5•••(cherry picked from commit c0bb9519d797d7b4cdeda7060eb06e4477dd4ea4) R. Ryantm2023-01-221-3/+3
* | | | | | | Merge pull request #212147 from NixOS/backport-211894-to-release-22.11•••[Backport release-22.11] nixos/grafana-image-renderer: use grafana freeform settings in provisioningNick Cao2023-01-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | nixos/grafana-image-renderer: use grafana freeform settings in provisioning•••(cherry picked from commit f8a3c4e94fb526d108fa8564fbe1fc1b416eea5e) Charlotte Van Petegem2023-01-221-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #209189 from NixOS/backport-204669-to-release-22.11•••[Backport release-22.11] nixos/installer/cd-dvd/iso-image: honor EFI boot timeoutRyan Lahfa2023-01-221-1/+9
|\ \ \ \ \ \ \
| * | | | | | | nixos/installer/cd-dvd/iso-image: Honor boot.loader.timeout for EFI•••EFI boot timeout is currently a static 10 whereas syslinux uses boot.loader.timeout. This changes the EFI config to match. Some discussion at https://discourse.nixos.org/t/how-to-override-let-variables/23741/2 (cherry picked from commit 7e1a3e4a8f6cf85cd39d460222e52fe041a95c1c) origin/backport-204669-to-release-22.11Nathan Henrie2023-01-051-1/+9
* | | | | | | | Merge pull request #212122 from NixOS/backport-211272-to-release-22.11•••[Backport release-22.11] libcue: broaden platformsMario Rodas2023-01-221-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | libcue: broaden platforms•••Builds fine for FreeBSD and NetBSD. (cherry picked from commit 11e5444ba52b7f4f71c0ef10080fb0cc0a83f57b) Alyssa Ross2023-01-221-1/+1
| * | | | | | | | libcue: clarify license•••(cherry picked from commit 39ca460d26bef32fe010f49e6a18fb511e060b06) Alyssa Ross2023-01-221-1/+1
| * | | | | | | | libcue: update homepage•••(cherry picked from commit 29dfae7f7b1b39bebb654c9af0876f32411a2564) Alyssa Ross2023-01-221-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #211773 from NixOS/backport-211591-to-release-22.11•••[Backport release-22.11] gitlab-runner: 15.7.2 -> 15.8.0Mario Rodas2023-01-221-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | gitlab-runner: 15.7.2 -> 15.8.0•••https://gitlab.com/gitlab-org/gitlab-runner/blob/v15.8.0/CHANGELOG.md (cherry picked from commit d073bbfdc3a3c5f629b64e904a27a3584a848428) Yaya2023-01-201-3/+3
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #211822 from NixOS/backport-211283-to-release-22.11•••[Backport release-22.11] fossil: fix crossNick Cao2023-01-221-0/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | fixup! fossil: fix cross•••Co-authored-by: Artturi <Artturin@artturin.com> (cherry picked from commit 1456df9742b1a63284abd639371e68a39b277a4a) Alyssa Ross2023-01-201-0/+1
| * | | | | | | fossil: fix cross•••(cherry picked from commit f625f66664464cd6bdc17038a249050b67a6fea1) Alyssa Ross2023-01-201-0/+3
* | | | | | | | Merge pull request #211904 from NixOS/backport-211292-to-release-22.11•••[Backport release-22.11] bazel_6: 6.0.0-pre.20220720.3 -> 6.0.0Uri Baghin2023-01-222-173/+393
|\ \ \ \ \ \ \ \
| * | | | | | | | bazel_6: 6.0.0-pre.20220720.3 -> 6.0.0•••(cherry picked from commit ec57cb615bd61f6388455923563a94ec76ba4027) origin/backport-211292-to-release-22.11Uri Baghin2023-01-212-173/+393
* | | | | | | | | Merge pull request #212028 from NixOS/backport-207271-to-release-22.11•••[Backport release-22.11] keepassxc: fix build on darwinWeijia Wang2023-01-221-4/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | keepassxc: fix build on darwin•••(cherry picked from commit 4bd291f5d432695cba9957b2a57b0341c49a0dac) Weijia Wang2023-01-221-4/+7
|/ / / / / / / / /
* | | | | | | | | Merge pull request #212014 from NixOS/revert-211064-backport-210471-to-releas...•••Revert "[Backport release-22.11] nheko: 0.10.2 -> 0.11.0"Nick Cao2023-01-223-60/+53
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "[Backport release-22.11] nheko: 0.10.2 -> 0.11.0"Nick Cao2023-01-223-60/+53
|/ / / / / / / / /
* | | | | | | | | Merge pull request #212013 from NixOS/revert-211073-backport-211068-to-releas...•••Revert "[Backport release-22.11] nheko: 0.11.0 -> 0.11.1"Nick Cao2023-01-221-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "[Backport release-22.11] nheko: 0.11.0 -> 0.11.1"Nick Cao2023-01-221-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge #210066: staging-next-22.11 - iteration 3•••...into release-22.11 Vladimír Čunát2023-01-2118-24/+167
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge release-22.11 into staging-next-22.11github-actions[bot]2023-01-217-13/+29
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge release-22.11 into staging-next-22.11github-actions[bot]2023-01-2016-61/+116
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge release-22.11 into staging-next-22.11github-actions[bot]2023-01-1913-28/+352
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | python3Packages.psutil: disable a test more often•••This brings the expression closer to nixpkgs master. The test just fails on almost all Hydra builders and is annoying: https://hydra.nixos.org/build/205213788#tabs-buildsteps Vladimír Čunát2023-01-181-2/+2