summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge staging-next-23.05 into staging-23.05origin/staging-23.05github-actions[bot]2024-01-232-6/+8
|\
| * Merge release-23.05 into staging-next-23.05origin/staging-next-23.05github-actions[bot]2024-01-232-6/+8
| |\
| | * Merge pull request #279435 from eyeinsky/backport-keybase-23.05•••keybase: 6.0.2 -> 6.2.4; keybase-gui: 6.0.2 -> 6.2.4; backport to 23.05origin/release-23.05Nick Cao2024-01-222-6/+8
| | |\
| | | * keybase: mark as broken on x86_64-darwin•••Error from CI job "OfBorg / keybase, keybase-gui, keybase-gui.passthru.tests, keybase.passthru.tests on x86_64-darwin": ``` > In file included from /nix/store/xxbz3p03wa8wlbhb8c91ndh3f2rad1jp-apple-framework-CoreMedia/Library/Frameworks/CoreMedia.framework/Headers/CMSampleBuffer.h:56: > In file included from /nix/store/xxbz3p03wa8wlbhb8c91ndh3f2rad1jp-apple-framework-CoreMedia/Library/Frameworks/CoreMedia.framework/Headers/CMFormatDescription.h:27: > /nix/store/bvqircp5apqaqyk57r8m4z38hfbdabfq-apple-framework-AudioToolbox/Library/Frameworks/AudioToolbox.framework/Headers/AudioFormat.h:161:8: error: redefinition of 'AudioFormatListItem' > struct AudioFormatListItem > ^ > /nix/store/a67qmarhk5cca9a4s19r0ys3q99kyndp-apple-framework-CoreAudioTypes-11.0.0/Library/Frameworks/CoreAudioTypes.framework/Headers/CoreAudioBaseTypes.h:1412:8: note: previous definition is here > struct AudioFormatListItem > ^ > 1 error generated. For full logs, run 'nix log /nix/store/2avqqjb3svdzmnqn608vm79z2w9vx8zj-keybase-6.2.4.drv'. ``` From: https://github.com/NixOS/nixpkgs/pull/279435/checks?check_run_id=20351324899 Markus Läll2024-01-181-0/+2
| | | * keybase-gui: 6.0.2 -> 6.2.4Markus Läll2024-01-181-3/+3
| | | * keybase: 6.0.2 -> 6.2.4R. Ryantm2024-01-181-3/+3
* | | | Merge staging-next-23.05 into staging-23.05github-actions[bot]2024-01-132-17/+23
|\| | |
| * | | Merge release-23.05 into staging-next-23.05github-actions[bot]2024-01-132-17/+23
| |\| |
| | * | Merge pull request #280330 from obsidiansystems/rapidcheck-23.05••• [Backport release-23.05] rapidcheck: Simplify installation, update, pkg-configorigin/nixpkgs-23.05-darwinorigin/nixos-23.05-smallJohn Ericson2024-01-112-17/+23
| | |\ \
| | | * | rapidcheck: Add `meta.pkgConfigModules` and test•••The last update added pkg-config support. Co-authored-by: Robert Hensing <roberth@users.noreply.github.com> (cherry picked from commit a7447f9e338fbaa12aeda5849041a39e04dd4b11) (cherry picked from commit 96d3c843d3f859b5d26f1102843ca2a4ef1aa4cf) John Ericson2024-01-111-4/+17
| | | * | rapidcheck: unstable-2023-04-16 -> unstable-2023-12-14•••(cherry picked from commit 789df4b46d8c43e30999f8d41f52ab9149427b5b) (cherry picked from commit bf66898be06827ba1a403b9efaf296b8b62ec12c) John Ericson2024-01-111-3/+3
| | | * | rapidcheck: Use stock installation, multiple outputs•••We had neglected to nice `RC_INSTALL_ALL_EXTRAS`, which will take care of installing the "extras" for us. Now that they are in a standard directory, we don't need to smuggle in the extra `-I` for Nix's tests either. (cherry picked from commit ab8cf01579ce0eba0202b0c84a71fd54ccfe4fc2) (cherry picked from commit 0acb4d6350b81f2d8276f1dd22a7ae7cec515a37) John Ericson2024-01-112-10/+3
| | |/ /
* | | | Merge staging-next-23.05 into staging-23.05github-actions[bot]2024-01-122-8/+108
|\| | |
| * | | Merge release-23.05 into staging-next-23.05github-actions[bot]2024-01-122-8/+108
| |\| |
| | * | Merge pull request #280150 from obsidiansystems/readline-windows-23.05•••[Backport 23.05]: Readline support for WindowsJohn Ericson2024-01-112-8/+108
| | |\ \ | | | |/ | | |/|
| | | * readline: Temporarily use older version of the patch•••d6162d7857e76cf07fa5313451e7e8936f894594 did the "proper" work of fixing the MinGW readline build, but won't work without 9cc3559a406209a55b4a78ae473214b378a8a029 which adds upstream-provided patches but is only `staging-23.11`. The older version of this patch however doesn't rely on p2-p7 so it will work for now. `staging-23.11` will revert this because it does have those patches. The urgency is because this blocks Nix Windows development. (cherry picked from commit cd76713d42c93b125e4b935e9e3a133754056d90) John Ericson2024-01-101-2/+2
| | | * readline: Support building for Windows with MinGW•••This commit is specifically designed to avoid a mass rebuild. I'll make a follow-up PR to staging which will make the patches unconditional, etc. Co-Authored-By: Weijia Wang <9713184+wegank@users.noreply.github.com> (cherry picked from commit 49d6a6ed8d8839c4d4d43f1ff16c011f638ad8dd) (cherry picked from commit d6162d7857e76cf07fa5313451e7e8936f894594) John Ericson2024-01-101-8/+41
| | | * termcap: init at 1.3.1•••(cherry picked from commit 77b22b043cc7a2787e2683bd594020f8a1356972) Weijia Wang2024-01-101-0/+67
| | |/
* | | Merge staging-next-23.05 into staging-23.05github-actions[bot]2024-01-042-3/+2
|\| |
| * | Merge release-23.05 into staging-next-23.05github-actions[bot]2024-01-042-3/+2
| |\|
| | * Merge pull request #275587 from flyingcircusio/leona/23.05-openssh-9.6p1•••[Backport release-23.05] openssh: 9.3p2 -> 9.6p1origin/nixos-23.05Robert Scott2024-01-032-3/+2
| | |\
| | | * openssh: 9.5p1 -> 9.6p1•••(cherry picked from commit 7d565226df0b818af851c810ecf46f4dc39dd900) Sandro Jäckel2023-12-242-3/+2
| | | * openssh: 9.4p1 -> 9.5p1•••(cherry picked from commit 2d99e37a9b78efe8aefdc77d2c7e6cb50896e70a) Janne Heß2023-12-241-2/+2
| | | * openssh: 9.3p2 -> 9.4p1•••(cherry picked from commit df8ba791834285019d6a66c0830a290bd8c111c3) Janne Heß2023-12-241-2/+2
* | | | Merge staging-next-23.05 into staging-23.05github-actions[bot]2024-01-010-0/+0
|\| | |
| * | | Merge release-23.05 into staging-next-23.05github-actions[bot]2024-01-010-0/+0
| |\| |
| | * | Merge #273936: staging-next-23.05 iteration 11•••...into release-23.05 Vladimír Čunát2023-12-3146-217/+1571
| | |\ \ | | |/ / | |/| |
* | | | Merge staging-next-23.05 into staging-23.05github-actions[bot]2023-12-317-11/+17
|\| | |
| * | | Merge release-23.05 into staging-next-23.05github-actions[bot]2023-12-317-11/+17
| |\| |
| | * | Merge pull request #263840 from NixOS/backport-263739-to-release-23.05•••[Backport release-23.05] plasma-workspace: 5.27.9 -> 5.27.9.1Nick Cao2023-12-301-4/+4
| | |\ \
| | | * | plasma-workspace: 5.27.9 -> 5.27.9.1•••(cherry picked from commit a0a37f3bb848ebdf696ffa075a7170e794d1b059) origin/backport-263739-to-release-23.05Peter Hoeg2023-10-271-4/+4
| | * | | Merge pull request #269760 from witkamp/release-23.05•••[23.05] python310Packages.twisted: update patch URLsNick Cao2023-12-301-1/+2
| | |\ \ \
| | | * | | python310Packages.twisted: update patch URLs•••(cherry picked from commit df9490d1d34aa815479be8998e842ac02a318bbb) Robert Schütz2023-11-241-1/+2
| | * | | | Merge pull request #265821 from NixOS/backport-265543-to-release-23.05•••[Backport release-23.05] syncoid: disable PrivateUsers in systemd unitNick Cao2023-12-301-1/+1
| | |\ \ \ \
| | | * | | | syncoid: disable PrivateUsers in systemd unit•••* leaving PrivateUsers=true appears to break when using zfs-2.2.0 (cherry picked from commit 15ebe5b7c0d8b65568854b26ae068beaf81eda89) origin/backport-265543-to-release-23.05Ivan Petkov2023-11-061-1/+1
| | * | | | | Merge pull request #273638 from LeSuisse/moodle-4.1.7•••[23.05] moodle: 4.1.4 -> 4.1.7Nick Cao2023-12-301-2/+2
| | |\ \ \ \ \
| | | * | | | | moodle: 4.1.4 -> 4.1.7•••Fixes a bunch of security issues. https://moodledev.io/general/releases/4.1/4.1.7 https://moodledev.io/general/releases/4.1/4.1.6 https://moodledev.io/general/releases/4.1/4.1.5 Thomas Gerbet2023-12-111-2/+2
| | * | | | | | Merge pull request #274955 from NixOS/backport-273640-to-release-23.05•••[Backport release-23.05] filebot: 5.1.1 -> 5.1.2Nick Cao2023-12-301-2/+2
| | |\ \ \ \ \ \
| | | * | | | | | filebot: 5.1.1 -> 5.1.2•••(cherry picked from commit 3145307809f845b3d1c940afc14b45cb61587818) R. Ryantm2023-12-171-2/+2
| | * | | | | | | Merge pull request #272572 from RRvW/fix-vaultwarden-version-info•••[Release 23.05] vaultwarden: Add VW_VERSION env to fix version detectionNick Cao2023-12-301-0/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | vaultwarden: Add VW_VERSION env to fix version detection•••At build time, vaultwarden looks at the VW_VERSION env variable to embed it's own version string. When this is unset, it still compiles, but responds with "null" as version info under `/api/config`, which leads to issues like https://github.com/dani-garcia/vaultwarden/discussions/3996 Under Nix, this variable is unset, so this commit properly forces it RRvW2023-12-071-0/+4
| | * | | | | | | | Merge pull request #262868 from NixOS/backport-262688-to-release-23.05•••[Backport release-23.05] mpd: add soxr resampler supportNick Cao2023-12-301-1/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | mpd: add soxr resampler support•••(cherry picked from commit 219e235433d51b682f8a34760aa6661f86609344) origin/backport-262688-to-release-23.05Daniel Hill2023-10-231-1/+2
* | | | | | | | | | | Merge staging-next-23.05 into staging-23.05github-actions[bot]2023-12-308-53/+53
|\| | | | | | | | | |
| * | | | | | | | | | Merge release-23.05 into staging-next-23.05github-actions[bot]2023-12-308-53/+53
| |\| | | | | | | | |
| | * | | | | | | | | perlPackages.SpreadsheetParseExcel: 0.65 -> 0.66•••(cherry picked from commit ce065c6a81cfcf7c1222a5275fa6e32607d19406) Stig Palmquist2023-12-291-3/+3
| | * | | | | | | | | Merge pull request #277569 from alyssais/release-23.05-linux-5.15.154•••23.05 kernel backportsFabián Heredia Montiel2023-12-295-45/+45
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | linux/hardened/patches/5.15: 5.15.144-hardened1 -> 5.15.145-hardened1•••(cherry picked from commit cfdb96ec524972f313210874744d79393c757111) Alyssa Ross2023-12-291-5/+5
| | | * | | | | | | | | linux_latest-libre: 19441 -> 19453•••(cherry picked from commit 0f52666e61f4bca1f6c134db9ef99d796837d1b2) Alyssa Ross2023-12-291-2/+2
| | | * | | | | | | | | linux-rt_5_10: 5.10.201-rt98 -> 5.10.204-rt100•••(cherry picked from commit 269e0c31e9f8eeeb91e0cd7afae8f497ad4f9197) Alyssa Ross2023-12-291-3/+3
generated by cgit v1.2.3 (git 2.52.0) at 2026-01-17 02:58:58 +0000