Commit Graph

292995 Commits

Author SHA1 Message Date
github-actions[bot] e0f1b871c3
Merge release-21.05 into staging-next-21.05 2021-07-10 06:06:04 +00:00
aszlig 9376bf7b34
ip2unix: 2.1.3 -> 2.1.4
Upstream changes:

  * Fix ordering between systemd socket file descriptor names and rules.
  * Fix usage of C library path as discovered by Meson.

Signed-off-by: aszlig <aszlig@nix.build>
(cherry picked from commit 8b7f8e2e6970f21d9f180887b91c979b41450fe8)
2021-07-10 02:17:18 +02:00
github-actions[bot] 9b0fff08dc
Merge release-21.05 into staging-next-21.05 2021-07-10 00:02:34 +00:00
illustris 8b5fcedfc9 nixos/jitsi-meet: update nixos tests
- remove check for `connected .JID: focus@auth.server` because
	- log format was changed in c1945ea6cb
	- connection.getUser() in jicofo also appears to be broken, returning null instead of username
	- testing for this log line shouldn't be necessary, as we also test for "Authenticated as focus@auth.server"

- remove check for `External component successfully authenticated` because
	- [JVB no longer uses component](https://community.jitsi.org/t/jvb-not-connecting/91157/2)

- increase VM memory

(cherry picked from commit 85aa4bf92b34a4774f7443a87ab3524bfd152002)
2021-07-10 00:02:59 +02:00
illustris fa8a6d7e0a nixos/jitsi-meet: include jitsi prosody plugins in prosody extraPluginPaths
(cherry picked from commit e0089c38ca2f9f2b9a46ffcf74a9908f53d51459)
2021-07-10 00:02:59 +02:00
illustris 0e73108529 jitsi-meet-prosody: init at 1.0.5056
(cherry picked from commit 5e49c97d29455e39ba820228dc7ff7b034ecc6fb)
2021-07-10 00:02:59 +02:00
illustris 27d38294c6 nixos/jitsi-meet: Update jitsi prosody configs
Changes made as per b6f7f8fba7

(cherry picked from commit 34b9ba2e6161e68febe4312c96c089d707472d5e)
2021-07-10 00:02:59 +02:00
illustris df1e470c4b jicofo: 1.0-690 -> 1.0-756
(cherry picked from commit aea0f9ce1f5deb8c3e425dfe6876810effd22b29)
2021-07-10 00:02:59 +02:00
illustris 2df327ab56 jitsi-videobridge: 2.1-416 -> 2.1-508
(cherry picked from commit d0d7946c0307ee4417e989ebceb9d28ac2aa4414)
2021-07-10 00:02:59 +02:00
illustris f58e00875d jitsi-meet: stable/jitsi-meet_5390 -> stable/jitsi-meet_5963
(cherry picked from commit a415ec434fc8f4aa8d5ff7dadea6f8e196c74d5c)
2021-07-10 00:02:59 +02:00
github-actions[bot] 86455fbb91
Merge release-21.05 into staging-next-21.05 2021-07-09 18:02:31 +00:00
Maximilian Bosch f5a0ce0b99
Merge pull request #129745 from NixOS/backport-129699-to-release-21.05
[Backport release-21.05] Kernels 2021-07-08
2021-07-09 19:59:10 +02:00
Robert Hensing 65ccaa51c7 cacert: Add Haskell x509-system compatibility
This allows cacert to be used with Haskell-based fetchers like
you would with regular OpenSSL-based fetchers:

  buildInputs = [ cacert ];

(cherry picked from commit 5d57104d848ef0e997fd436c220801165a669862)
2021-07-09 10:34:15 -07:00
Vladimír Čunát e8b7ccc8f9
Merge #129505: openexr: 2.5.3 -> 2.5.7 (into staging-21.05) 2021-07-09 19:18:00 +02:00
github-actions[bot] 33fe7f083b
Merge staging-next-21.05 into staging-21.05 2021-07-09 12:03:13 +00:00
github-actions[bot] a81246cf88
Merge release-21.05 into staging-next-21.05 2021-07-09 12:02:37 +00:00
Maximilian Bosch ca09581e5e
Merge pull request #129626 from NixOS/backport-129618-to-release-21.05
[Backport release-21.05] vagrant: 2.2.16 -> 2.2.17
2021-07-09 13:24:12 +02:00
TredwellGit cf4327321a linux/hardened/patches/5.4: 5.4.129-hardened1 -> 5.4.130-hardened1
(cherry picked from commit 43fba78fec7c1f00ca8766e27894537fdd3eeb47)
2021-07-09 10:48:18 +00:00
TredwellGit 50cc793e18 linux/hardened/patches/5.12: 5.12.14-hardened1 -> 5.12.15-hardened1
(cherry picked from commit 9af983cd004bb51a80c05945eddf922c56359ccd)
2021-07-09 10:48:18 +00:00
TredwellGit 84cb8b4796 linux/hardened/patches/5.10: 5.10.47-hardened1 -> 5.10.48-hardened1
(cherry picked from commit b36d829bb1af3c8fdd38d2f217d31450b02b8526)
2021-07-09 10:48:18 +00:00
TredwellGit 2e9e07c10b linux-rt_5_10: 5.10.41-rt42 -> 5.10.47-rt45
(cherry picked from commit 25b73ac6a2422711dda132bf88ad510a37df95f2)
2021-07-09 10:48:17 +00:00
TredwellGit 2d453b51a6 linux: 5.4.129 -> 5.4.130
(cherry picked from commit 32235d48681bf913b9d5435c518494b77d63f933)
2021-07-09 10:48:17 +00:00
TredwellGit f0b011fd73 linux: 5.13 -> 5.13.1
(cherry picked from commit ea4cb239528062ac52fc1d4aa2bbf115df9105dc)
2021-07-09 10:48:17 +00:00
TredwellGit fef417a726 linux: 5.12.14 -> 5.12.15
(cherry picked from commit e0f9f09c1740d0d80ead4002016bd3df0fc1b197)
2021-07-09 10:48:16 +00:00
TredwellGit d7353f445e linux: 5.10.47 -> 5.10.48
(cherry picked from commit 9462b074a8f2f34f3a4dd6b56ff22f760a8301f0)
2021-07-09 10:48:16 +00:00
github-actions[bot] 78c11731b4
Merge staging-next-21.05 into staging-21.05 2021-07-08 18:02:44 +00:00
github-actions[bot] a49cebfd6a
Merge release-21.05 into staging-next-21.05 2021-07-08 18:02:12 +00:00
Maximilian Bosch 6056345805
Merge pull request #129349 from NixOS/backport-128538-to-release-21.05
[Backport release-21.05] Kernels 2021-06-28
2021-07-08 19:56:38 +02:00
Anderson Torres 5436a1fd65
Merge pull request #128459 from Ma27/backport-sway
[21.05] sway: 1.6 -> 1.6.1, wlroots: 0.13.0 -> 0.14.0
2021-07-08 11:30:06 -03:00
Michael Weiss a6e07df310
Merge pull request #129641 from NixOS/backport-129633-to-release-21.05
[Backport release-21.05] signal-desktop: 5.7.1 -> 5.8.0
2021-07-08 14:46:11 +02:00
Michael Weiss 0f88b5e546 signal-desktop: 5.7.1 -> 5.8.0
(cherry picked from commit 5a5d6a785a4ccf5ca00c44ba4a6902830c082434)
2021-07-08 12:12:56 +00:00
github-actions[bot] 455ec36268
Merge staging-next-21.05 into staging-21.05 2021-07-08 12:03:13 +00:00
github-actions[bot] ca802b75e7
Merge release-21.05 into staging-next-21.05 2021-07-08 12:02:35 +00:00
Maximilian Bosch 628768830b vagrant: 2.2.16 -> 2.2.17
ChangeLog: https://github.com/hashicorp/vagrant/blob/v2.2.17/CHANGELOG.md#2217-july-7-2021
(cherry picked from commit adc9b2b4398d7e20737329694cf90877c2b05cdd)
2021-07-08 09:11:40 +00:00
Jörg Thalheim dc3497f188
Merge pull request #129495 from delan/backport/bore-0.3.3
[Backport release-21.05] bore: init at 0.3.3 (#129295)
2021-07-08 07:48:37 +01:00
Jörg Thalheim fa5cb7a31d
Merge pull request #129605 from NixOS/backport-129590-to-release-21.05
[Backport release-21.05] turbovnc: Fix that setting JAVA_HOME breaks vncviewer. Fixes #129582
2021-07-08 07:12:12 +01:00
Jörg Thalheim 7a41876e2e
Merge pull request #129568 from NixOS/backport-127917-to-release-21.05
[Backport release-21.05] linux-kernel: Add dell drivers on 5.12+
2021-07-08 07:09:19 +01:00
Jörg Thalheim 0fe1422ff0
Merge pull request #129525 from NixOS/backport-129258-to-release-21.05
[Backport release-21.05] zen-kernels: 5.12.9 -> 5.12.14
2021-07-08 07:08:45 +01:00
github-actions[bot] 7760054b64
Merge staging-next-21.05 into staging-21.05 2021-07-08 06:03:30 +00:00
github-actions[bot] bb1de8d8cd
Merge release-21.05 into staging-next-21.05 2021-07-08 06:02:39 +00:00
Jörg Thalheim 2e8702c21e
Merge pull request #129494 from NixOS/backport-129446-to-release-21.05
[Backport release-21.05] gitea: 1.14.3 -> 1.14.4
2021-07-08 06:26:39 +01:00
Niklas Hambüchen cdf6905e25 turbovnc: Fix that setting JAVA_HOME breaks vncviewer. Fixes #129582
(cherry picked from commit b7dd636f2475cd199d12cce672390f998f8c81bd)
2021-07-08 05:22:46 +00:00
Jörg Thalheim bc8e2b283c
Merge pull request #129603 from NixOS/backport-129581-to-release-21.05
[Backport release-21.05] nixos/doc: Fix synopsis for nixos-rebuild(8)
2021-07-08 06:12:13 +01:00
Lara b7853679fc nixos/doc: Fix synopsis for nixos-rebuild(8)
(cherry picked from commit 22a78740241d8c35bf8c43c4731bc5b84386b5ea)
2021-07-08 04:48:04 +00:00
Mario Rodas cbac932542
Merge pull request #129599 from NixOS/backport-129586-to-release-21.05
[Backport release-21.05] ruby: 2.6.7 -> 2.6.8, 2.7.3 -> 2.7.4, 3.0.1 -> 3.0.2
2021-07-07 22:36:21 -05:00
Mario Rodas 752d341f68 ruby_3_0: 3.0.1 -> 3.0.2
https://www.ruby-lang.org/en/news/2021/07/07/ruby-3-0-2-released/
(cherry picked from commit afd61a60693e1ad936b8e90bf3f88d438fcafd79)
2021-07-08 03:11:51 +00:00
Mario Rodas 3e4c3a12d8 ruby_2_7: 2.7.3 -> 2.7.4
https://www.ruby-lang.org/en/news/2021/07/07/ruby-2-7-4-released/
(cherry picked from commit 5f9f17cc11caa07e4a9faa68d308d86e16d0f930)
2021-07-08 03:11:51 +00:00
Mario Rodas 94496bd7da ruby_2_6: 2.6.7 -> 2.6.8
https://www.ruby-lang.org/en/news/2021/07/07/ruby-2-6-8-released/
(cherry picked from commit 2d420c15598e5eb65e9a1b8419d5ba00778e30da)
2021-07-08 03:11:50 +00:00
Mario Rodas b97454a2e5 ruby: update RVM patchsets
(cherry picked from commit 6d4b46a56d98c2d8601dedecf1542dda3df51774)
2021-07-08 03:11:50 +00:00
Mario Rodas 977b522d31
Merge pull request #129588 from NixOS/backport-125696-to-release-21.05
[Backport release-21.05] nixos/postgresqlBackup: only replace if successful
2021-07-07 19:06:31 -05:00