summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* linux_xanmod: 6.1.3 -> 6.1.7•••(cherry picked from commit d0a31fabed3d57e807c0b8eb1d443238002cc057) origin/backport-211902-to-release-22.11dhancock@camelot.network2023-01-231-2/+2
* linux_xanmod: 5.15.84 -> 5.15.89•••(cherry picked from commit 92d917ec334c2d96dff710b9a2b2d33ae1c1e4ec) Daniel Hancock2023-01-231-2/+2
* 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
| * | | | | | | | Merge #210961: libepoxy: disable more cgl tests on x86_64-darwin•••(cherry picked from commit 978d992880115da251d40bba10498e72e3adae02) https://hydra.nixos.org/build/205231923 No idea how the issue originates; it doesn't seem like anyone's willing to investigate this deeper. Vladimír Čunát2023-01-181-1/+4
| * | | | | | | | Merge #211286: git: 2.38.1 → 2.38.3•••CVE-2022-23521 and CVE-2022-41903 - both "critical" ...into staging-next-22.11 Vladimír Čunát2023-01-181-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | git: 2.38.1 → 2.38.3•••Advisories: - https://github.blog/2023-01-17-git-security-vulnerabilities-announced-2/ CVEs: - CVE-2022-23521 - CVE-2022-41903 - CVE-2022-41953 Fabián Heredia Montiel2023-01-171-2/+2
| * | | | | | | | | Merge release-22.11 into staging-next-22.11github-actions[bot]2023-01-188-419/+434
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "libcamera: 0.0.1 -> 0.0.3"•••This reverts commit 389e2645548d0242289e53db526bf8d27e049f9f. The libcamera upgrade is incompatible with the pipewire 0.3.60. ``` g++ -Ispa/plugins/libcamera/libspa-libcamera.so.p -Ispa/plugins/libcamera -I../spa/plugins/libcamera -Ispa/include -I../spa/include -I/nix/store/p48bnpv5d4kb8giv8gng3cpd3cdlkj88-systemd-minimal-251.10-dev/include -I/nix/store/mca50785p1aa780c4c46h47f8c6356qx-libcamera-0.0.3/include/libcamera -I/nix/store/hvg7m930kyhrdksg5z5p9jijhmay7isq-libdrm-2.4.113-dev/include -I/nix/store/hvg7m930kyhrdksg5z5p9jijhmay7isq-libdrm-2.4.113-dev/include/libdrm -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wnon-virtual-dtor -Wextra -Wpedantic -std=c++17 -fvisibility=hidden -fno-strict-aliasing -Werror=suggest-attribute=format -Wsign-compare -Wpointer-arith -Wformat -Wformat-security -Wimplicit-fallthrough -Wmissing-braces -Wtype-limits -Wvariadic-macros -Wmaybe-uninitialized -Wno-missing-field-initializers -Wno-unused-parameter -Wno-pedantic -Wdeprecated-declarations -Wunused-result -fPIC -pthread -MD -MQ spa/plugins/libcamera/libspa-libcamera.so.p/libcamera-source.cpp.o -MF spa/plugins/libcamera/libspa-libcamera.so.p/libcamera-source.cpp.o.d -o spa/plugins/libcamera/libspa-libcamera.so.p/libcamera-source.cpp.o -c ../spa/plugins/libcamera/libcamera-source.cpp In file included from ../spa/plugins/libcamera/libcamera-source.cpp:205: ../spa/plugins/libcamera/libcamera-utils.cpp: In function 'void spa_libcamera_get_config({anonymous}::impl*)': ../spa/plugins/libcamera/libcamera-utils.cpp:77:18: error: 'VideoRecording' was not declared in this scope; did you mean 'libcamera::StreamRole::VideoRecording'? 77 | roles.push_back(VideoRecording); | ^~~~~~~~~~~~~~ | libcamera::StreamRole::VideoRecording In file included from /nix/store/mca50785p1aa780c4c46h47f8c6356qx-libcamera-0.0.3/include/libcamera/libcamera/camera.h:22, from ../spa/plugins/libcamera/libcamera-source.cpp:55: /nix/store/mca50785p1aa780c4c46h47f8c6356qx-libcamera-0.0.3/include/libcamera/libcamera/stream.h:68:2: note: 'libcamera::StreamRole::VideoRecording' declared here 68 | VideoRecording, | ^~~~~~~~~~~~~~ [234/780] Compiling C++ object spa/plugins/aec/libspa-aec-webrtc.so.p/aec-webrtc.cpp.o ninja: build stopped: subcommand failed. ``` Martin Weinelt2023-01-181-2/+2
| * | | | | | | | | | Merge release-22.11 into staging-next-22.11github-actions[bot]2023-01-1726-937/+992
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge release-22.11 into staging-next-22.11github-actions[bot]2023-01-1634-142/+257
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | python3Packages.cffi: Disable failing test on darwin•••(cherry picked from commit 08d449ce6df035fcf7a5c6efb525c32ac0a9e355) https://hydra.nixos.org/build/205299696 Martin Weinelt2023-01-151-0/+6