summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* viber: add 'QML2_IMPORT_PATH' to the wrap•••(cherry picked from commit 3209d25fd2355dbb68bf231ee1c1b3b442d42e86) origin/backport-132213-to-release-21.05cas1no2021-08-011-1/+2
* Merge pull request #132002 from sumnerevans/backport-130808-to-release-21.05•••matrix-synapse: 1.38.1 -> 1.39.0Maximilian Bosch2021-07-311-2/+2
|\
| * matrix-synapse: 1.38.1 -> 1.39.0•••(cherry picked from commit 2044dcf1bb36206027624f7531cfe45545e4f36c) Sumner Evans2021-07-291-2/+2
* | Merge pull request #131923 from NixOS/backport-131898-to-release-21.05•••[Backport release-21.05] fetchmail: 6.4.16 -> 6.4.20Robert Scott2021-07-311-2/+2
|\ \
| * | fetchmail: 6.4.16 -> 6.4.20•••Fixes: CVE-2021-36386 (cherry picked from commit 975a9d2e4b14574ba1ec80c46acc6b4c471f3a70) Martin Weinelt2021-07-291-2/+2
* | | gitlab: 14.0.5 -> 14.1.0•••(cherry picked from commit ac20e17cc83cba8599266ba2268054e62c2b7803) Yureka2021-07-3110-457/+501
* | | Merge #131892: nix-fallback-paths.nix: 2.3.14 -> 2.3.15•••... into release-21.05 as a part of fixing #126141. (I think; I don't know how often the fallback gets used in practice.) Vladimír Čunát2021-07-311-5/+5
|\ \ \
| * | | nix-fallback-paths.nix: Update to 2.3.15•••(cherry picked from commit 512ee6db3997920c51b2a15c3510683aac934b31) Eelco Dolstra2021-07-281-5/+5
* | | | Merge pull request #129343 from NixOS/backport-129332-to-release-21.05•••[Backport release-21.05] pijul: 1.0.0-alpha.48 → 1.0.0-alpha.50Vlad M2021-07-311-3/+3
|\ \ \ \
| * | | | pijul: 1.0.0-alpha.48 → 1.0.0-alpha.50•••(cherry picked from commit bb6bdc62ecf396387e8b2ddd9fe89c66667e8ef1) origin/backport-129332-to-release-21.05Fabián Heredia Montiel2021-07-051-3/+3
* | | | | openmw: add wrapQtAppsHook•••dontWrapQtApps was blanket added in 5590e365e4775f138610b1036a75f8886921843e (cherry picked from commit 854265777ced27a1d0b1bdead26463ce021bb779) Artturin2021-07-301-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