Commit Graph
295533 Commits
Author SHA1 Message Date
github-actions[bot] 1955284241 Merge staging-next-21.05 into staging-21.05 2021-09-23 00:05:26 +00:00
github-actions[bot] 73118ee56b Merge release-21.05 into staging-next-21.05 2021-09-23 00:03:46 +00:00
Robert Scott 5c8efd0034 Merge pull request #137369 from NixOS/backport-134007-to-release-21.05
[Backport release-21.05] fragments: init at 1.5
2021-09-22 21:32:21 +01:00
github-actions[bot] 44a5bf6583 Merge staging-next-21.05 into staging-21.05 2021-09-22 18:02:55 +00:00
github-actions[bot] 46a071899f Merge release-21.05 into staging-next-21.05 2021-09-22 18:02:19 +00:00
TredwellGit e04cf3d707 linux: 5.4.147 -> 5.4.148
(cherry picked from commit 3fac07b82827c4cfa33892e09484e6406805dd57)
2021-09-22 14:01:36 +00:00
TredwellGit 4fb126fd16 linux: 5.14.6 -> 5.14.7
(cherry picked from commit 1c9f17fb9a1f3d47c393c19e1f8ca511ca6003be)
2021-09-22 14:01:36 +00:00
TredwellGit 4c482c8806 linux: 5.10.67 -> 5.10.68
(cherry picked from commit a70237df86464ed69b12bdbf178ac8d0ddc1004e)
2021-09-22 14:01:35 +00:00
TredwellGit 08a2d25f1b linux: 4.9.282 -> 4.9.283
(cherry picked from commit 49a443bd0a5f5f884e32bc3a67b5580a718a73df)
2021-09-22 14:01:34 +00:00
TredwellGit 9a87d91efa linux: 4.4.283 -> 4.4.284
(cherry picked from commit cd0d8fe6ee5c3c83f1814ac6dc57ff8e3e95d0c8)
2021-09-22 14:01:33 +00:00
TredwellGit ebf6ced326 linux: 4.19.206 -> 4.19.207
(cherry picked from commit e4d0654060fb7321ec18f2d3e60c28ae816ac900)
2021-09-22 14:01:32 +00:00
TredwellGit c1aefa39a4 linux: 4.14.246 -> 4.14.247
(cherry picked from commit 5e7bea92a24e5627817d0ad245fe09a0c1b48afd)
2021-09-22 14:01:31 +00:00
Pavol Rusnak e42f91e090 Merge pull request #138930 from NixOS/backport-138927-to-release-21.05
[Backport release-21.05] electron_12: 12.1.1 -> 12.1.2
2021-09-22 14:10:52 +02:00
github-actions[bot] caef8694df Merge staging-next-21.05 into staging-21.05 2021-09-22 12:03:23 +00:00
github-actions[bot] 3ab20e4ba4 Merge release-21.05 into staging-next-21.05 2021-09-22 12:02:42 +00:00
TredwellGit 4f0a4caae0 electron_12: 12.1.1 -> 12.1.2
https://github.com/electron/electron/releases/tag/v12.1.2
(cherry picked from commit e39bc2d9af19bf99628f59b8c7d370c7c3973d23)
2021-09-22 11:09:27 +00:00
Jörg Thalheim 83413f4780 Merge pull request #138828 from hmenke/zfs
[21.05] zfs: Linux 5.14 compatibility
2021-09-22 07:20:06 +01:00
Artturi 9e819a3383 Merge pull request #138755 from NixOS/backport-136493-to-staging-21.05
[Backport staging-21.05] qt5.qtbase: Enable parallel building
2021-09-22 06:54:02 +03:00
github-actions[bot] 9e4aee2133 Merge staging-next-21.05 into staging-21.05 2021-09-22 00:03:02 +00:00
github-actions[bot] 47a6b7ccf4 Merge release-21.05 into staging-next-21.05 2021-09-22 00:02:28 +00:00
Robert Scott 2216c1b659 Merge pull request #138851 from NixOS/revert-138557-backport-138417-to-staging-21.05
Revert "[Backport staging-21.05] gd: 2.3.0 -> 2.3.3"
2021-09-22 00:39:19 +01:00
Robert Scott e0bcfe1ae3 Revert "[Backport staging-21.05] gd: 2.3.0 -> 2.3.3" 2021-09-22 00:31:09 +01:00
Artturi 12f3f58f48 Merge pull request #138796 from NixOS/backport-138762-to-release-21.05
[Backport release-21.05] nginx: fix URLs by taking from a specific commit
2021-09-21 23:47:31 +03:00
Maximilian Bosch 30442ab6d4 Merge pull request #138835 from NixOS/backport-138705-to-release-21.05
[Backport release-21.05] matrix-synapse: 1.42.0 -> 1.43.0
2021-09-21 22:41:04 +02:00
Sumner Evans 8d6407e5a4 matrix-synapse: 1.42.0 -> 1.43.0
(cherry picked from commit a8fbb745723062d99b64f34292f86e0ef4361921)
2021-09-21 19:46:20 +00:00
Henri Menke 6c840afdc5 zfsUnstable: 2.1.0 -> 2.1.1 2021-09-21 20:33:02 +02:00
Henri Menke 2179499ba7 zfs: 2.0.5 -> 2.0.6 2021-09-21 20:32:48 +02:00
Maximilian Bosch 543cf1d543 Merge pull request #138804 from Ma27/backport-matrix-test
[21.05] matrix-synapse: enable parallel tests
2021-09-21 20:05:27 +02:00
github-actions[bot] e872581176 Merge staging-next-21.05 into staging-21.05 2021-09-21 18:02:58 +00:00
github-actions[bot] 045a7ba01b Merge release-21.05 into staging-next-21.05 2021-09-21 18:02:23 +00:00
embr 04c2339cc1 nixos/mastodon: Add configurable web- and streaming concurrency
Might as well do this while I'm at it.

(cherry picked from commit 0d719125baee88e2e8d29e6bb2ff3100ba1b2da0)
2021-09-21 19:41:32 +02:00
embr 4f8927c417 nixos/mastodon: Fix sidekiq's DB_POOL, add configurable concurrency
The `services.mastodon` module currently hardcodes sidekiq's concurrency
to 25, but doesn't set a DB pool size, which defaults to 5 or the number
of configured web threads.

(This behaviour is very strange, and arguably a mastodon bug.)

This also makes sidekiq's concurrency configurable, because 25 is a tad
high for the hardware I'm running it on.

(cherry picked from commit e8fd7792d1eeb4ea4943cc34525da1159ab50bc9)
2021-09-21 19:41:32 +02:00
FliegendeWurst 64da7fe56f tor-browser-bundle-bin: 10.5.5 -> 10.5.6
(cherry picked from commit 582e0a4926b435715cf4c2b339f458e8917c979f)
2021-09-21 12:13:16 +00:00
pennae 5c7c36a483 matrix-synapse: enable parallel tests
(cherry picked from commit 7574cf28fefffa5b76dba22eb76e03dafd22aaca)
2021-09-21 14:11:37 +02:00
Maximilian Bosch cb996bbf84 Merge pull request #138794 from NixOS/backport-138481-to-release-21.05
[Backport release-21.05] Kernels 2021-09-18
2021-09-21 14:06:14 +02:00
github-actions[bot] da098cd9b9 Merge staging-next-21.05 into staging-21.05 2021-09-21 12:03:16 +00:00
github-actions[bot] 199a113b66 Merge release-21.05 into staging-next-21.05 2021-09-21 12:02:38 +00:00
Lara eb24e2e6b1 gitlab: 14.2.3 -> 14.2.4
(cherry picked from commit e5f70272c5ebe77cea9f045f8cac1d934d6a7ca5)
2021-09-21 13:22:10 +02:00
James Kay a53682d9f3 nginx: fix URLs by taking from a specific commit
I'm not sure this is the best way to get these patches, but it's better than `master` (at commit `e9617f553284b170a8b520d051ac1fc1b83cff30` on `nginx` these patches moved into a `nginx` subdirectory, breaking the build unless the patches are cached).

(cherry picked from commit c5d876511301cdcb8a3d4de8c09a681fa128e172)
2021-09-21 11:18:24 +00:00
ajs124 c52baeabe2 webkitgtk: 2.32.3 -> 2.32.4
https://webkitgtk.org/security/WSA-2021-0005.html
(cherry picked from commit 7e7a4021e87fd18b575864ad1d539825d5e4787d)
2021-09-21 11:12:41 +00:00
TredwellGit b752e7829b linux/hardened/patches/5.14: 5.14.5-hardened1 -> 5.14.6-hardened1
(cherry picked from commit b8b772a1da76d38e3c4446c875326fa939d815e1)
2021-09-21 10:52:24 +00:00
TredwellGit 0731d03f57 linux/hardened/patches/5.13: 5.13.18-hardened1 -> 5.13.19-hardened1
(cherry picked from commit a41022ed40d070bb23a365e4c3ee80618a3bb2cd)
2021-09-21 10:52:23 +00:00
TredwellGit 174c38c553 linux/hardened/patches/5.10: 5.10.66-hardened1 -> 5.10.67-hardened1
(cherry picked from commit 4a9ffb82aedee82a456268e402c714966adbbf2e)
2021-09-21 10:52:23 +00:00
TredwellGit 16e4fb1aad linux-rt_5_10: 5.10.59-rt52 -> 5.10.65-rt53
(cherry picked from commit 3e87ddbf57a85ca4f06f10f8579ed9c4a54768b0)
2021-09-21 10:52:22 +00:00
TredwellGit 76bdc20f22 linux: 5.14.5 -> 5.14.6
(cherry picked from commit 51b0e44980a4939b21a6431d652169426840a335)
2021-09-21 10:52:21 +00:00
TredwellGit 4dcfb25299 linux: 5.13.18 -> 5.13.19
(cherry picked from commit 748679c0d3ab550ce8dbac4e5797e3b5d0064c76)
2021-09-21 10:52:21 +00:00
TredwellGit 02e05becea linux: 5.10.66 -> 5.10.67
(cherry picked from commit 66760dcbd5e30eb8950f79be847c052fe5de51f2)
2021-09-21 10:52:20 +00:00
github-actions[bot] 7a7495bcb8 Merge staging-next-21.05 into staging-21.05 2021-09-21 00:03:22 +00:00
github-actions[bot] 9990b7618f Merge release-21.05 into staging-next-21.05 2021-09-21 00:02:47 +00:00
sternenseemann 3397f0ede9 gitit: 0.13.0.0 -> 0.15.0.0
Resolves #138664
2021-09-21 00:15:21 +02:00