Commit Graph

294177 Commits

Author SHA1 Message Date
github-actions[bot] 7326883996
Merge release-21.05 into staging-next-21.05 2021-08-23 18:02:13 +00:00
Sandro 983bd5b78c
Merge pull request #135436 from NixOS/backport-129194-to-release-21.05
[Backport release-21.05] pythonPackages.pillow-simd: revert update to 8.1.2
2021-08-23 15:59:03 +02:00
github-actions[bot] fcc8fc6323
Merge release-21.05 into staging-next-21.05 2021-08-23 12:02:40 +00:00
Sandro Jäckel 364e84d0fc pythonPackages.pillow-simd: revert update to 8.1.2
(cherry picked from commit d4cd4061d4600d36e5b9c1727c5ba860018420c1)
2021-08-23 11:20:27 +00:00
maralorn dcb27f623f
Merge pull request #135431 from nomeata/unbreak-haskell-ci-release
[21.05] haskell-ci: no longer mark as broken
2021-08-23 12:47:56 +02:00
sternenseemann c367ee7bda haskell-ci: no longer mark as broken
haskell-ci just builds (again?) without any necessary changes

(cherry picked from commit 1be4cb6748318e7a6e0f96908b095ea6fef5ac6c)
2021-08-23 12:17:29 +02:00
github-actions[bot] e4d36f95cb
Merge release-21.05 into staging-next-21.05 2021-08-23 00:02:38 +00:00
Robert Scott 871e8c4d58
Merge pull request #135305 from NixOS/backport-135250-to-release-21.05
[Backport release-21.05] python3Packages.markdown2: 2.4.0 -> 2.4.1
2021-08-22 23:57:30 +01:00
Michael Weiss 835bdf1b65
Merge pull request #135327 from NixOS/backport-135228-to-release-21.05
[Backport release-21.05] ungoogled-chromium: 92.0.4515.131 -> 92.0.4515.159
2021-08-22 21:33:54 +02:00
Michael Weiss fe10697bd0 ungoogled-chromium: 92.0.4515.131 -> 92.0.4515.159
(cherry picked from commit 76ab90294e4014a3a1e887f1099fc1f674385b94)
2021-08-22 19:13:31 +00:00
github-actions[bot] 7f5fb8d345
Merge release-21.05 into staging-next-21.05 2021-08-22 18:02:09 +00:00
Fabian Affolter fe6b8c4b0f python3Packages.markdown2: 2.4.0 -> 2.4.1
(cherry picked from commit 5b4b1cbfc41d0354645059b10df547a82905eb1e)
2021-08-22 15:13:49 +00:00
Vladimír Čunát 4e749dc0a1
Merge #135245: linux_*_hardened: update (into release-21.05) 2021-08-22 16:29:57 +02:00
ajs124 7e07a7e299 linuxPackages_5_4_hardened: 5.4.141 -> 5.4.142
(cherry picked from commit 565973316564594fe9a572a8a4c48567375c2f19)
2021-08-22 09:49:01 +00:00
ajs124 9690490f18 linuxPackages_5_10_hardened: 5.10.59 -> 5.10.60
(cherry picked from commit 883db296a2603d42074db9118323667e335e186e)
2021-08-22 09:49:01 +00:00
ajs124 9bb174c59e linuxPackages_5_4_hardened: 5.4.139 -> 5.4.141
(cherry picked from commit b9b1fc1b383fb583721474498d3360a56f5501d5)
2021-08-22 09:49:00 +00:00
ajs124 329105e4a9 linuxPackages_5_10_hardened: 5.10.57 -> 5.10.59
(cherry picked from commit 580d4b687ffad6101e23466789a2f97935bc5c40)
2021-08-22 09:49:00 +00:00
ajs124 676c5aa6bf linuxPackages_4_19_hardened: 4.19.202 -> 4.19.204
(cherry picked from commit a438b96c9e52113fef9ec1ac3cd694bb97bb3caf)
2021-08-22 09:48:59 +00:00
ajs124 0cdce1e22b linuxPackages_4_14_hardened: 4.14.243 -> 4.14.244
(cherry picked from commit 1120eafa972180641006d425d6e9e9b76aa4ee3f)
2021-08-22 09:48:59 +00:00
ajs124 6c74fc118a linuxPackages_hardened: fix update.py
this is kind of hack, idk how this worked before, tbh

(cherry picked from commit e82f9673c5ec76b71409b3ec7e5c99043df63976)
2021-08-22 09:48:58 +00:00
github-actions[bot] ffa9f6e94e
Merge release-21.05 into staging-next-21.05 2021-08-22 00:02:47 +00:00
Robert Scott 422b95f54f
Merge pull request #135086 from risicle/ris-radare2-CVE-2021-3673
[21.05] radare2: add patch for CVE-2021-3673
2021-08-21 23:38:55 +01:00
Robert Scott 0be4a28183
Merge pull request #135001 from jasonrm/backport/134767-to-21.05
[21.05] mysql80: fix build on darwin
2021-08-21 23:22:06 +01:00
Wael Nasreddine 11e6372341
Merge pull request #135092 from NixOS/backport-134764-to-release-21.05
[Backport release-21.05] onlykey-agent: init at 1.0.2
2021-08-21 12:43:19 -07:00
Kim Lindberger c37b973071
Merge pull request #135096 from NixOS/backport-135090-to-release-21.05
[Backport release-21.05] nomachine-client: 7.4.1 -> 7.6.2
2021-08-21 20:07:03 +02:00
github-actions[bot] 761da7d723
Merge release-21.05 into staging-next-21.05 2021-08-21 18:02:40 +00:00
talyz d6e092c25f nomachine-client: 7.4.1 -> 7.6.2
(cherry picked from commit 73bae61cda32b0aa20fd844b45387b8a50de5e20)
2021-08-21 17:58:15 +00:00
Wael M. Nasreddine 5794e35b25 onlykey-agent: init at 1.0.2
(cherry picked from commit 8b8cd493ef8e70cdb97d05ce95ba37e75cdea431)
2021-08-21 17:14:04 +00:00
Robert Scott 12a8c6cdce radare2: add patch for CVE-2021-3673 2021-08-21 17:09:51 +01:00
Maciej Krüger d3fbdb26a2
Merge pull request #135074 from NixOS/backport-134616-to-release-21.05
[Backport release-21.05] Fix Jetbrains on NixOS: Add e2fsprogs
2021-08-21 16:26:52 +02:00
Florian Beeres 9295a53afc Add e2fsprogs to jetbrains
Without this dependency JetBrains editors, on NixOS, will throw errors
about a missing object file:
java.lang.UnsatisfiedLinkError: libe2p.so

(cherry picked from commit 70f3763e146432eca9cf7d792e7d2d12684e1c5f)
2021-08-21 12:36:34 +00:00
github-actions[bot] e590a93591
Merge release-21.05 into staging-next-21.05 2021-08-21 12:03:01 +00:00
Vladimír Čunát 219a77ea26
Merge branch 'staging-21.05' into release-21.05
ffmpeg isn't such a huge rebuild, so let's do this directly.
2021-08-21 09:38:38 +02:00
github-actions[bot] fa539d9341
Merge staging-next-21.05 into staging-21.05 2021-08-21 06:02:59 +00:00
github-actions[bot] e3954ffd47
Merge release-21.05 into staging-next-21.05 2021-08-21 06:02:16 +00:00
Luke Granger-Brown 275cdcb119
Merge pull request #135025 from NixOS/backport-134726-to-staging-21.05
[Backport staging-21.05] ffmpeg, ffmpeg-full: enable basic tests
2021-08-21 04:39:26 +01:00
Zane van Iperen bd84f4a6ed nixos/gitea: init/migrate db in startup script
(cherry picked from commit 99d8d553da44fb065f9cb8bb54e2e93b85417fab)
2021-08-21 12:24:40 +09:00
Zane van Iperen 9d0618433a nixos/gitea: use gitea to refresh hooks and keys
Gitea now provides this functionality as an admin command.
Is significantly faster, especially on slow disks.

(cherry picked from commit c854b8570285ac4c14282a5efa0f8334a520ac8d)
2021-08-21 12:24:40 +09:00
Robert Scott 1c8ff5cfc7 ffmpeg-full: enable basic tests
(cherry picked from commit 4b658eda801752204f8be29a8f8db343d12572dc)
2021-08-21 02:46:00 +00:00
Robert Scott 7361aaeb5e ffmpeg: enable basic tests
(cherry picked from commit 649f0ed1a88f6e4cf00705b1cb2f1fbdf1fb780c)
2021-08-21 02:46:00 +00:00
Luke Granger-Brown 84b0bedef2
Merge pull request #135022 from NixOS/backport-134363-to-release-21.05
[Backport release-21.05] warzone2100: 4.1.1 -> 4.1.3
2021-08-21 03:33:49 +01:00
Francesco Gazzetta 9e28807d03 warzone2100: 4.1.1 -> 4.1.3
(cherry picked from commit 4b5f0bfa393e45e9f9c2704d000e07dc689b4e51)
2021-08-21 00:24:37 +00:00
github-actions[bot] 124ccc3fcd
Merge staging-next-21.05 into staging-21.05 2021-08-21 00:03:23 +00:00
github-actions[bot] ee693ed5f1
Merge release-21.05 into staging-next-21.05 2021-08-21 00:02:49 +00:00
Anderson Torres f5c2a9a8de
Merge pull request #134844 from NixOS/backport-134591-to-release-21.05
[Backport release-21.05] palemoon: 29.3.0 -> 29.4.0.1
2021-08-20 19:33:38 -03:00
Maximilian Bosch b86db7692f
Merge pull request #134933 from Ma27/backport-mautrix-telegram
[21.05] mautrix telegram: 0.10.0 -> 0.10.1
2021-08-21 00:06:56 +02:00
Jason R. McNeil 698d69b2f5 mysql80: fix build on darwin
sw_vers is called during build since 8.0.26

- 83b87ae7f8

Fixes #132288

(cherry picked from commit 5c452f15af7d11a1609f25ac14b42b82d0185a37)
2021-08-20 13:59:15 -07:00
github-actions[bot] 90fe936535
Merge staging-next-21.05 into staging-21.05 2021-08-20 18:02:52 +00:00
github-actions[bot] 45315a0f53
Merge release-21.05 into staging-next-21.05 2021-08-20 18:02:19 +00:00
Maximilian Bosch 1dc32d71d5
Merge pull request #134947 from NixOS/backport-134692-to-release-21.05
[Backport release-21.05] Kernels 2021-08-18
2021-08-20 18:50:37 +02:00