summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* nextcloud28: 28.0.2 -> 28.0.3•••Changelog: https://github.com/nextcloud/server/releases/tag/v28.0.3 (cherry picked from commit acf6041a4f8da0561c7406bcab85abc211d9c2d0) origin/backport-292343-to-release-23.11Marian Hammer2024-03-011-2/+2
* Merge #291328: staging-next-23.11 iteration 5•••...into release-23.11 Vladimír Čunát2024-03-0127-77/+153
|\
| * Merge #292428: diffoscope: 252 ->257•••...into staging-next-23.11 Vladimír Čunát2024-03-011-6/+21
| |\
| | * diffoscope: 254 -> 257•••Changes: - https://diffoscope.org/news/diffoscope-255-released/ - https://diffoscope.org/news/diffoscope-256-released/ - https://diffoscope.org/news/diffoscope-257-released/ (cherry picked from commit 9b4795a6abea10f893feaa48788c036248b7c2eb) Sergei Trofimovich2024-02-291-2/+2
| | * diffoscope: 253 -> 254•••Changes: https://diffoscope.org/news/diffoscope-254-released/ (cherry picked from commit 9c13e10574582c0f2e8f256751fb0c76fb6a2510) Sergei Trofimovich2024-02-291-2/+2
| | * diffoscope: disable broken tests on darwin•••(cherry picked from commit 32d613548ee37bbf6e9e6778e529fa9d494ec264) Jade Lovelace2024-02-291-0/+9
| | * diffoscope: fix on aarch64-darwin•••This was comparing stdenv.hostPlatform (an attr set) to a string. This comparison always returned not-equal, which resulted in trying to evaluate the broken gnumeric on macOS. This change fixes that to compare the "system" string as was intended originally. (cherry picked from commit 5d238d0d637c69c3a6fe77df87124c69192bdad3) Jade Lovelace2024-02-291-1/+1
| | * diffoscope: organize better missing tools and explain why docx2txt cannot be ...•••docx2txt is *IN* nixpkgs but cannot be used. lipo, otool are theoretically available in darling… but I doubt they would work. (cherry picked from commit 4e9e090585ae52dc7b836477dc83c7107052d66b) Raito Bezarius2024-02-291-1/+7
| | * diffoscope: 252 -> 253•••https://diffoscope.org/news/diffoscope-253-released/ (cherry picked from commit 61da111d6f3cce9f81103d584ccf183ab867f463) Raito Bezarius2024-02-291-3/+2
| | * diffoscope: add `acl` in the minimal package•••`acl` is a pretty ubiquitious package on Linux and provides `getfacl`. (cherry picked from commit c1cd33667c5eaa0eec5d9fe1453ab2ab7c86c8f7) Raito Bezarius2024-02-291-1/+2
| * | Merge release-23.11 into staging-next-23.11github-actions[bot]2024-03-0120-853/+1279
| |\ \ | | |/ | |/|
| * | python311Packages.pegen: disable failing test•••(cherry picked from commit 65c9353ad3dc7064d83e70f54f350971b7e32c22) https://hydra.nixos.org/build/251234946/nixlog/4/tail Fabian Affolter2024-02-291-1/+4
| * | python311Packages.python3-saml: disable failing tests•••This cherry-picks parts of 5ead65aa8720b3c0cecc57e23530cf2048fe67e5 https://hydra.nixos.org/build/251204010/nixlog/3/tail Vladimír Čunát2024-02-291-0/+14
| * | Merge release-23.11 into staging-next-23.11github-actions[bot]2024-02-2926-103/+200
| |\ \
| * \ \ Merge release-23.11 into staging-next-23.11github-actions[bot]2024-02-289-13/+59
| |\ \ \
| * \ \ \ Merge release-23.11 into staging-next-23.11github-actions[bot]2024-02-2711-56/+139
| |\ \ \ \
| * \ \ \ \ Merge release-23.11 into staging-next-23.11github-actions[bot]2024-02-2613-16/+130
| |\ \ \ \ \
| * | | | | | python311Packages.sphinx: disable racy tests•••(cherry picked from commit 9ec4f90d9c63f6df78bada4296af915415918068) Martin Weinelt2024-02-251-0/+5
| * | | | | | Merge branch 'staging-23.11' into staging-next-23.11Vladimír Čunát2024-02-2523-70/+109
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge staging-next-23.11 into staging-23.11github-actions[bot]2024-02-2523-85/+582
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge release-23.11 into staging-next-23.11github-actions[bot]2024-02-2523-85/+582
| |\ \ \ \ \ \ \
| | | * \ \ \ \ \ Merge #291034: c-ares: apply patch for CVE-2024-25629•••...into staging-23.11 Vladimír Čunát2024-02-242-0/+36
| | | |\ \ \ \ \ \
| | | | * | | | | | c-ares: apply patch for CVE-2024-25629Thomas Gerbet2024-02-242-0/+36
| | | * | | | | | | Merge #290956: dav1d: add patch for CVE-2024-1580•••...into staging-23.11 Vladimír Čunát2024-02-241-1/+9
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | dav1d: add patch for CVE-2024-1580Robert Scott2024-02-231-1/+9
| | | * | | | | | | Merge staging-next-23.11 into staging-23.11github-actions[bot]2024-02-2479-412/+422
| | | |\ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge release-23.11 into staging-next-23.11github-actions[bot]2024-02-2479-412/+422
| |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge staging-next-23.11 into staging-23.11github-actions[bot]2024-02-2317-115/+182
| | | | |\ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge release-23.11 into staging-next-23.11github-actions[bot]2024-02-2317-115/+182
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | | | * | | | | | Merge #289666: go: 1.21.5 -> 1.21.6•••...into staging-23.11 Vladimír Čunát2024-02-221-2/+2
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | go: 1.21.5 -> 1.21.6•••Changelog: https://go.dev/doc/devel/release#go1.21 Signed-off-by: Harsh Thakur <harshthakur9030@gmail.com> (cherry picked from commit 1332fa0d74e3b403d8540640cb185203e5994ec4) Harsh Thakur2024-02-181-2/+2
| | | | | * | | | | | | Merge #290704: unbound: 1.19.0 -> 1.19.1•••...into staging-23.11 Vladimír Čunát2024-02-221-2/+2
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | unbound: 1.19.0 -> 1.19.1•••Fixes CVE-2023-50387 and CVE-2023-50868. Changes: https://nlnetlabs.nl/news/2024/Feb/13/unbound-1.19.1-released/ (cherry picked from commit 062ee05a5784dfb8be2e7c951f4f5e3ea575b158) Thomas Gerbet2024-02-221-2/+2
| | | | | |/ / / / / / /
| | | | | * | | | | | | Merge #288818: unbound: 1.18.0 -> 1.19.0•••...into staging-23.11 Vladimír Čunát2024-02-222-23/+14
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | nixos/unbound: Fix deprecation warnings•••(cherry picked from commit 61f957f87617d6a7c14a815346fc2a91b4ed0ce6) Ashish SHUKLA2024-02-141-8/+8
| | | | | | * | | | | | | unbound: 1.18.0 -> 1.19.0•••- switch to finalAttrs - remove the patch from upstream (cherry picked from commit ebb42ada24c4641d6a2efc8d8fd7aa5baf96710a) Ashish SHUKLA2024-02-141-15/+6
| | | | | * | | | | | | | Merge #288794: haskellPackages.pandoc-cli: install man pages•••...into staging-23.11 Vladimír Čunát2024-02-221-1/+5
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | haskellPackages.pandoc-cli: install man pagesrnhmjoj2024-02-141-1/+5
| | | | | | |/ / / / / / /
| | | | | * | | | | | | | Merge #290702: alsa-ucm-conf: drop conflicting upstream patch•••...into staging-23.11 Vladimír Čunát2024-02-221-11/+1
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | alsa-ucm-conf: drop conflicting upstream patch•••Without the change the build fails on `staging` as: alsa-ucm-conf> Running phase: patchPhase alsa-ucm-conf> applying patch /nix/store/m1yxcbpkxrqjp7kml9ij2x4i1y5zc0m2-alsa-ucm-conf-splitpcm-device-argument-fix.patch alsa-ucm-conf> patching file ucm2/common/pcm/split.conf alsa-ucm-conf> Reversed (or previously applied) patch detected! Assume -R? [n] alsa-ucm-conf> Apply anyway? [n] alsa-ucm-conf> Skipping patch. alsa-ucm-conf> 1 out of 1 hunk ignored -- saving rejects to file ucm2/common/pcm/split.conf.rej (cherry picked from commit 0e64c89ef1432e683cd1f755863e6f139cdbb67d) Sergei Trofimovich2024-02-221-11/+1
| | | | | * | | | | | | | | Merge #288568: alsa-ucm-conf: 1.2.10 -> 1.2.11•••...into staging-23.11 Vladimír Čunát2024-02-221-2/+2
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | |/| | | | | | | |
| | | | | | * | | | | | | | alsa-ucm-conf: 1.2.10 -> 1.2.11•••(cherry picked from commit 1733c6d51ab08775262c42c20dcc0b18a203377a) R. Ryantm2024-02-131-2/+2
| | | | | * | | | | | | | | Merge #288416: stdenv: disregard xz exit status•••...into staging-23.11 Vladimír Čunát2024-02-221-1/+5
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | stdenv: disregard xz exit status in order to fix subtle decompression issues•••There is a subtle bug with unpacking `tar.xz` archives which seems to happen only on some setups, and sometimes not in a reproducible manner (https://github.com/NixOS/nixpkgs/issues/278130, https://github.com/NixOS/nixpkgs/issues/20950). On the last occurrence, it could be tracked down to `xz` failing from a `SIGPIPE`, which can happen when it's connected to `tar` through a pipe and `tar` exits earlier (see e.g. https://www.linuxquestions.org/questions/slackware-14/%5Bpatch%5D-tar-issuing-a-sigpipe-in-installpkg-4175637923/ or https://bugs.gentoo.org/573642#c5). Since `tar` should be able by itself to detect whether the archive is complete, I suggest to disregard the exit code from the `xz` invocation, done in this PR. Fixes https://github.com/NixOS/nixpkgs/issues/278130 (script tested here: https://github.com/NixOS/nixpkgs/pull/286579) Probably also fixes https://github.com/NixOS/nixpkgs/issues/20950 (issue not reproduced here, feedback therefore welcome) Isidor Zeuner2024-02-131-1/+5
| | | | | * | | | | | | | | | Merge #287203: mdbook: 0.4.36 -> 0.4.37•••...into staging-23.11 Vladimír Čunát2024-02-221-3/+3
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | mdbook: 0.4.36 -> 0.4.37•••(cherry picked from commit 49b3d040c5405a23f81e18b2d12730a0d2ba5eb8) R. Ryantm2024-02-081-3/+3
| | | | | * | | | | | | | | | | Merge #273802: python311: 3.11.6 -> 3.11.8•••...into staging-23.11 Vladimír Čunát2024-02-222-4/+11
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | python312: 3.12.1 -> 3.12.2•••https://docs.python.org/release/3.11.8/whatsnew/changelog.html (cherry picked from commit 45fd60685fdae3907d36dbfdb5224e978a886150) Martin Weinelt2024-02-091-2/+2
| | | | | | * | | | | | | | | | | python311: 3.11.7 -> 3.11.8•••https://docs.python.org/release/3.11.8/whatsnew/changelog.html (cherry picked from commit 8751812a3bc87bd5240245ef5b1dc22a97eece4f) Martin Weinelt2024-02-091-2/+2
| | | | | | * | | | | | | | | | | python311Packages.pytest-mock: disable failing test•••(cherry picked from commit 7649aa56b9624f355174a5879221bd5740ecd712) origin/backport-273692-to-staging-23.11natsukium2023-12-121-0/+7