summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mysql80: 8.0.37 -> 8.0.38•••(cherry picked from commit 0702caaa2e1abbcd1747d4ebeb961a4fc0b476b4) origin/backport-327365-to-release-24.05Alyssa Ross2024-07-191-2/+2
* Merge pull request #328479 from NixOS/backport-322199-to-release-24.05•••[Backport release-24.05] firefly-iii: Streamlined DerivationPol Dellaiera2024-07-201-19/+50
|\
| * firefly-iii: Streamlined derivation•••- Removed firefly-iii-assets package and compressed build into one - Added PatrickDaG as maintainer in addition to myself - Added update script (cherry picked from commit 42b1bc89a230a74d5cf7a7db6d60a78621a0b036) Savyasachee Jha2024-07-191-19/+50
* | Merge pull request #328518 from NixOS/backport-328109-to-release-24.05•••[Backport release-24.05] brave: 1.67.123 -> 1.67.134Thomas Gerbet2024-07-201-6/+6
|\ \
| * | brave: 1.67.123 -> 1.67.134•••(cherry picked from commit bdf81d0b5fc871872bffe1a650994e0a2d9c1374) R. Ryantm2024-07-191-6/+6
* | | Merge pull request #328521 from NixOS/backport-317785-to-release-24.05•••[Backport release-24.05] nixos/boot: use `--replace-fail`Will Fancher2024-07-191-1/+1
|\ \ \ | |/ / |/| |
| * | nixos/boot: use `--replace-fail`•••(cherry picked from commit f2318b9d581cb5a066428297371fe83b7e7cdee4) Pol Dellaiera2024-07-191-1/+1
|/ /
* | Merge #326357: staging-next-24.05 iteration 2 - 2024-07-11•••...into release-24.05 Vladimír Čunát2024-07-1940-137/+777
|\ \ | |/ |/|
| * Merge release-24.05 into staging-next-24.05github-actions[bot]2024-07-1917-49/+183
| |\
| * \ Merge release-24.05 into staging-next-24.05github-actions[bot]2024-07-1827-365/+612
| |\ \
| * \ \ Merge release-24.05 into staging-next-24.05github-actions[bot]2024-07-1736-243/+768
| |\ \ \
| * \ \ \ Merge release-24.05 into staging-next-24.05github-actions[bot]2024-07-1644-318/+311
| |\ \ \ \
| * \ \ \ \ Merge release-24.05 into staging-next-24.05github-actions[bot]2024-07-159-14/+227
| |\ \ \ \ \
| * \ \ \ \ \ Merge release-24.05 into staging-next-24.05github-actions[bot]2024-07-147-24/+24
| |\ \ \ \ \ \
| * | | | | | | gss: drop a crashing test•••https://hydra.nixos.org/build/266280498/nixlog/1/tail In the test sources I see lines hinting at the moment it started failing name:endtime type:GENERALIZED_TIME value:20240711155558Z but I was unable to find a fix quickly. (cherry picked from commit f6f5b1fde533c28780adad9144177b0626f1568b) Vladimír Čunát2024-07-131-0/+4
| * | | | | | | Merge release-24.05 into staging-next-24.05github-actions[bot]2024-07-1316-127/+237
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge #325550: nodejs recent updates•••...into staging-next-24.05 Vladimír Čunát2024-07-1210-49/+216
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nodejs*: avoid adding "test-ci-js"Vladimír Čunát2024-07-121-1/+3
| | * | | | | | | | nodejs_22: 22.4.0 -> 22.4.1•••(cherry picked from commit e11b071dbc4aa5b59a94dabbb5f7379dc43e46aa) Antoine du Hamel2024-07-111-2/+2
| | * | | | | | | | nodejs_20: 20.15.0 -> 20.15.1 (#325616)•••(cherry picked from commit 149c046f4d6772bf6148ceaa30659d3d67986158) Antoine du Hamel2024-07-111-2/+2
| | * | | | | | | | nodejs_18: 18.20.3 -> 18.20.4•••(cherry picked from commit 2f1765713f65e84aadc3f87cc0e577c0e5813efd) Antoine du Hamel2024-07-111-2/+2
| | * | | | | | | | nodejs: disable JS test suite on Darwin•••This was recently enabled in #313982. It seems to be much too flaky on Darwin currently, especially x86; see: * <https://hydra.nixos.org/build/264860513/nixlog/8> * <https://hydra.nixos.org/build/264956149/nixlog/3> * <https://hydra.nixos.org/build/265094929/nixlog/3> * <https://hydra.nixos.org/build/264901296/nixlog/3> Disable these tests on macOS for now as the broken Node.js package is holding up a lot of builds. Fixes: b26563aae2a1fce011ac52e28ff23a460866e82f (cherry picked from commit d25d9b6a2dc90773039864bbf66c3229b6227cde) Emily2024-07-111-2/+2
| | * | | | | | | | nodejs_20: 20.14.0 -> 20.15.0 (#321292)•••(cherry picked from commit 92bc04eae7292d566b53453b00cb81de7e7c784a) Antoine du Hamel2024-07-081-2/+2
| | * | | | | | | | nodejs: add testVersion to passthru.tests•••(cherry picked from commit 97240ea0ac7bfec5aed52b1899ce371b85436edc) Ivan Trubach2024-07-081-0/+8
| | * | | | | | | | nodejs: fix sandboxed build on darwin•••(cherry picked from commit ce685a84225f553a22a47b79abbf7e7e009a8e26) Ivan Trubach2024-07-087-7/+128
| | * | | | | | | | nodejs: remove unused bypass-xcodebuild.diff•••(cherry picked from commit 5bf99d06948c6e6dc7de7dff3d7518d207f442e0) Ivan Trubach2024-07-081-28/+0
| | * | | | | | | | nodejs_22: 22.3.0 -> 22.4.0 (#323982)•••(cherry picked from commit 87327df1061ee068d2a1d1b2d8bd72a68e010cc5) Antoine du Hamel2024-07-081-8/+2
| | * | | | | | | | nodejs_22: fix missing /bin/bash in tests•••(cherry picked from commit 1404cb5c7b9a0278f4e24575fda0e1c24e5ed8be) Ivan Trubach2024-07-082-0/+15
| | * | | | | | | | nodejs_22: fix build with openssl 3.0.14•••(cherry picked from commit bb3a4880463e576975020e097fdc80c0187d48b6) Ivan Trubach2024-07-081-2/+4
| | * | | | | | | | nodejs: fix impure configure phase•••When running configurePhase from impure build environment (i.e. nix develop), default ./configure script was selecting wrong, impure Python installation. https://github.com/nodejs/node/blob/d57af10d1be390f4e33e6efe596133de9da36c86/configure#L7-L15 (cherry picked from commit f2f7ea87e8e97e20ea21b8125eda3d6845ebcdcb) Ivan Trubach2024-07-081-2/+5
| | * | | | | | | | nodejs_20: 20.12.2 -> 20.14.0 (#316258)•••(cherry picked from commit 892f509d6ccb040eb6b63e63577f47e00bd12455) Antoine du Hamel2024-07-081-3/+2
| | * | | | | | | | nodejs-slim_22: 22.2.0 -> 22.3.0•••(cherry picked from commit dd1ea8f3077098b09d0f57deb8b04b5a8f6e0838) R. Ryantm2024-07-081-2/+2
| | * | | | | | | | nodejs: add bash shell completion•••Fixes #316507 (cherry picked from commit f8d01a8da313ac470d3871f158f0c9efd29b17df) superherointj2024-07-081-1/+7
| | * | | | | | | | nodejs: run JS test suite as part of the checks•••(cherry picked from commit b26563aae2a1fce011ac52e28ff23a460866e82f) Antoine du Hamel2024-07-085-5/+50
| * | | | | | | | | Merge release-24.05 into staging-next-24.05github-actions[bot]2024-07-1211-48/+53
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'staging-24.05' into staging-next-24.05Vladimír Čunát2024-07-1129-88/+557
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge #326356: openssl: fix CVE-2024-5535•••...into staging-24.05 Vladimír Čunát2024-07-112-0/+114
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | openssl: fix CVE-2024-5535•••Upstream commit: https://github.com/openssl/openssl/commit/e86ac436f0 This patch fixes the ALPN negotiation in OpenSSL. It applies to all used versions >= 3.0, but was taken from the 3.3 branch. Therefore I added it to the 3.3 directory. Signed-off-by: Markus Theil <theil.markus@gmail.com> (cherry picked from commit 90b11e4031a6d1236657d7509ff0790ea4285712) Markus Theil2024-07-112-0/+114
| | * | | | | | | | | | | Merge #326195: python3Packages.django_4: 4.2.12 -> 4.2.14•••...into staging-24.05 Vladimír Čunát2024-07-112-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | python312Packages.django-storages: 1.14.2 -> 1.14.4•••https://github.com/jschneier/django-storages/blob/1.14.4/CHANGELOG.rst (cherry picked from commit eb8d90ecec8363f67b1531a9b0813e5f51e0c8d8) Martin Weinelt2024-07-101-2/+2
| | | * | | | | | | | | | python312Packages.django_4: 4.2.12 -> 4.2.14•••https://docs.djangoproject.com/en/4.2/releases/4.2.14/ https://www.djangoproject.com/weblog/2024/jul/09/security-releases/ Fixes: CVE-2024-38875, CVE-2024-39329, CVE-2024-39330, CVE-2024-39614 (cherry picked from commit 9b544959d9190152bb21bf2c72756fd9359d6bfe) Martin Weinelt2024-07-101-2/+2
| | * | | | | | | | | | | Merge pull request #326229 from NixOS/backport-325662-to-staging-24.05•••[Backport staging-24.05] ffmpeg_4, ffmpeg_5: add patch for CVE-2023-51794Atemu2024-07-111-0/+10
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | ffmpeg_4: add patch for CVE-2023-51794•••(cherry picked from commit 0aded3256340f896837cbd03496acbd80114b8ec) Robert Scott2024-07-111-0/+5
| | | * | | | | | | | | | | ffmpeg_5: add patch for CVE-2023-51794•••(cherry picked from commit 3e99b5aec1668549bf4f608e74e84f18d4eb8375) Robert Scott2024-07-111-0/+5
| | * | | | | | | | | | | | Merge pull request #326178 from alyssais/24.05-meson-1.4.1•••[24.05] meson: 1.4.0 -> 1.4.1Masum Reza2024-07-112-12/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | meson: 1.4.0 -> 1.4.1•••(cherry picked from commit 9d76da314b9262ae22086f859f4a815e7b33a54d) Alyssa Ross2024-07-102-12/+13
| | | |/ / / / / / / / / /
| | * | | | | | | | | | | Merge staging-next-24.05 into staging-24.05github-actions[bot]2024-07-1123-162/+368
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| / / / / / / / / / / | | |/ / / / / / / / / /
| * | | | | | | | | | | Merge release-24.05 into staging-next-24.05github-actions[bot]2024-07-1123-162/+368
| |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge #316074: libiconv-darwin: fix crash and add support for static builds•••...into staging-24.05 Vladimír Čunát2024-07-107-29/+325
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | libiconv-darwin: fix ISO-2022 with escape sequences crash•••This appears to be fixed in macOS 14.5, but the source release is not yet available. (cherry picked from commit edfc324c7a5f9f44d51dd8768b927882e5f2df78) Randy Eckenrode2024-05-313-1/+80
generated by cgit v1.2.3 (git 2.52.0) at 2026-01-17 03:08:25 +0000