summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* openmw: add wrapQtAppsHook•••dontWrapQtApps was blanket added in 5590e365e4775f138610b1036a75f8886921843e (cherry picked from commit 854265777ced27a1d0b1bdead26463ce021bb779) origin/backport-132131-to-release-21.05Artturin2021-07-311-3/+2
* Merge pull request #132073 from NixOS/backport-132046-to-release-21.05•••[Backport release-21.05] nix(Stable): 2.3.14 -> 2.3.15Samuel Dionne-Riel2021-07-301-2/+2
|\
| * nix(Stable): 2.3.14 -> 2.3.15•••(cherry picked from commit 9bd0be76b2219e8984566340e26a0f85caeb89cd) Vladimír Čunát2021-07-301-2/+2
* | Merge pull request #132162 from NixOS/backport-132100-to-release-21.05•••[Backport release-21.05] linux/common-config.nix: disable LPAE on armv7l-linuxSamuel Dionne-Riel2021-07-301-2/+0
|\ \
| * | linux/common-config.nix: disable LPAE on armv7l-linux•••LPAE was enabled to support native armv7l builders running in QEMU on aarch64, but this option disables support for processors which don't support LPAE, which are still relatively common. In particular, Beaglebones use the Cortex-A8, which doesn't support LPAE. Also, if you attempt to boot an LPAE kernel on a CPU that doesn't support it, it fails before even earlycon is initialized. This makes the problem difficult to debug without enabling CONFIG_DEBUG_LL or using a hardware debugger. (cherry picked from commit 988c12faed96159fd5902f3bc372739c111206ef) Ben Wolsieffer2021-07-301-2/+0
|/ /
* | Merge pull request #132088 from NixOS/backport-131864-to-release-21.05•••[Backport release-21.05] rott: init at 1.1.2Sander van der Burg2021-07-302-0/+60
|\ \ | |/ |/|
| * rott: init at 1.1.2•••(cherry picked from commit 946ad968ffcb623d6473228c4390bf4262024e91) Sander van der Burg2021-07-302-0/+60
|/
* Merge pull request #132028 from NixOS/backport-132011-to-release-21.05•••[Backport release-21.05] nixos/bird: fix bird/bird6 descriptionJörg Thalheim2021-07-301-2/+2
|\
| * nixos/bird: fix bird/bird6 description•••(cherry picked from commit d902365913fd65abc2d5d5298c2b9b0beda2f2ca) Martin Weinelt2021-07-301-2/+2
* | Merge pull request #131588 from NixOS/staging-next-21.05Martin Weinelt2021-07-3019-34/+133
|\ \
| * | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-303-7/+7
| |\|
| * | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-293-11/+11
| |\ \
| * \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-292-2/+2
| |\ \ \
| * \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-291-2/+2
| |\ \ \ \
| * \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-298-13/+184
| |\ \ \ \ \
| * \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-283-6/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-282-2/+10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-281-4/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-282-0/+54
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-274-6/+14
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-271-3/+10
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-274-2/+71
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-274-9/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-262-10/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #131231 from NixOS/backport-130547-to-staging-21.05•••[Backport staging-21.05] imagemagick: 7.1.0-2 -> 7.1.0-4Martin Weinelt2021-07-261-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | imagemagick: 7.1.0-2 -> 7.1.0-4•••(cherry picked from commit 937dae1dad9437d59c175d7c05f3e0bbc860bc41) Kerstin Humm2021-07-231-2/+2
| * | | | | | | | | | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-07-2611-427/+1002
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-2611-427/+1002
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-07-261-2/+2
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-261-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-07-261-2/+2
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-261-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-07-257-72/+42
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-257-72/+42
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-07-2521-140/+157
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-2521-140/+157
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge #130786: mesa: 21.0.1 -> 21.1.4 (into staging-21.05)Vladimír Čunát2021-07-252-10/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | mesa: 21.1.3 -> 21.1.4Michael Weiss2021-07-201-2/+2
| | * | | | | | | | | | | | | | | | | | | | | | mesa: 21.1.2 -> 21.1.3•••I've also updated the URL for the RISC-V patch in case the content of the old URL will change (not sure if that's possible after a merge request is merged but now that the patch is upstream it seems like a good idea regardless; and the content has actually already changed so the old hash wasn't correct anymore). Michael Weiss2021-07-201-4/+5
| | * | | | | | | | | | | | | | | | | | | | | | mesa: Add patch for RISC-V driver selectionZhaofeng Li2021-07-201-0/+5
| | * | | | | | | | | | | | | | | | | | | | | | mesa: fix darwin buildJonathan Ringer2021-07-201-1/+2
| | * | | | | | | | | | | | | | | | | | | | | | mesa: 21.1.1 -> 21.1.2Michael Weiss2021-07-201-2/+2
| | * | | | | | | | | | | | | | | | | | | | | | mesa: 21.0.3 -> 21.1.1•••Note: This update likely causes some issues when running an application that has a direct dependency on Mesa (e.g. Sway and XWayland) and was compiled against a different Nixpkgs revision. See 7106fca0fe4 for more details regarding that issue. Michael Weiss2021-07-202-8/+8
| | * | | | | | | | | | | | | | | | | | | | | | mesa: 21.0.1 -> 21.0.3•••Note: The update to Mesa 21.0.2 was reverted (25ae1fd29f8) because it caused major issues with Sway (segfault on startup [0]). This is still the case and might affect all packages that directly depend on "mesa" (for libgbm or libglapi) but it only causes issues when the package depends on a "mesa" version that differs from "mesa.drivers" used for "/run/opengl-driver/". I've noticed this while testing Mesa updates with the NixOS option "hardware.opengl.package" (as usual) instead of rebuilding my whole system (which would work). Unfortunately this can/will likely also cause issues when mixing different channels, using Flakes/Overlays, etc. The cause of this should be similar to [1] ("mesa" updates now cause the same issues that "glibc" updates already do, maybe triggered by certain Mesa changes) and some additional discussions is in [2],[3]. Note: Don't backport this to NixOS 21.05, at least not without careful consideration. [0]: https://github.com/NixOS/nixpkgs/pull/118753#issuecomment-818950977 [1]: https://github.com/NixOS/nixpkgs/issues/95808 [2]: https://github.com/NixOS/nixpkgs/pull/120325 [3]: https://github.com/NixOS/nixpkgs/pull/119558 Michael Weiss2021-07-201-2/+2
| | * | | | | | | | | | | | | | | | | | | | | | mesa: Cleanup enableRadv (not used anymore)Michael Weiss2021-07-201-1/+0
| * | | | | | | | | | | | | | | | | | | | | | | mesa: fix datadir location•••(cherry picked from commit 9bf469e6488b5835ac83ccc5ca7f7f63c1f7a0dd) ash lea2021-07-241-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-07-242-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-242-0/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-07-242-7/+7
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-242-7/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \