Commit Graph
292974 Commits
Author SHA1 Message Date
github-actions[bot] 9ed221b890 Merge staging-next-21.05 into staging-21.05 2021-07-13 00:02:58 +00:00
github-actions[bot] a784de8a26 Merge release-21.05 into staging-next-21.05 2021-07-13 00:02:25 +00:00
upkeep-bot a7512bb64b vscodium: 1.57.1 -> 1.58.0
(cherry picked from commit 2201e7d8ce73625b65b481feeea7b62cac7f970b)
2021-07-13 04:13:06 +09:00
upkeep-bot e2f293ddf6 vscodium: 1.57.0 -> 1.57.1
(cherry picked from commit 955df64c44eee780c71fd4da5bcabda553c94f7a)
2021-07-13 04:13:06 +09:00
upkeep-bot cc6ae106aa vscodium: 1.56.2 -> 1.57.0
(cherry picked from commit 39fd960ee100ffc63d53c40d65d081a3c18af3fe)
2021-07-13 04:13:06 +09:00
github-actions[bot] 0dc09a8693 Merge staging-next-21.05 into staging-21.05 2021-07-12 12:03:17 +00:00
github-actions[bot] f3b0b41bd0 Merge release-21.05 into staging-next-21.05 2021-07-12 12:02:42 +00:00
Linus Heckemann 92802efe42 Merge pull request #130000 from Ma27/backport-wlroots
[21.05] wlroots: 0.14.0 -> 0.14.1
2021-07-12 10:43:02 +02:00
Michael Weiss 46667847c0 wlroots: 0.14.0 -> 0.14.1
(cherry picked from commit 7632ba310eb4fcb249abbaf67c4094afafd17c18)
2021-07-12 10:11:43 +02:00
github-actions[bot] ed7a470f93 Merge staging-next-21.05 into staging-21.05 2021-07-12 06:06:34 +00:00
github-actions[bot] b9fbdb6b8f Merge release-21.05 into staging-next-21.05 2021-07-12 06:03:29 +00:00
Dmitry Kalinkin 07909ad7f4 blender: 2.93.0 -> 2.93.1
(cherry picked from commit 520c2971d1da6936c706138bdbe6b339f888d1c7)
2021-07-11 21:13:38 -04:00
github-actions[bot] acdd2da56e Merge staging-next-21.05 into staging-21.05 2021-07-12 00:03:17 +00:00
github-actions[bot] cd1654a4ee Merge release-21.05 into staging-next-21.05 2021-07-12 00:02:36 +00:00
Martin Weinelt 79d92ab090 Merge pull request #129778 from NixOS/staging-next-21.05 2021-07-11 23:41:19 +02:00
ajs124 a18e883c9b Merge pull request #127730 from NixOS/backport-127705-to-release-21.05
[Backport release-21.05] nginxModules.rtmp: 1.2.1 -> 1.2.2
2021-07-11 22:25:09 +02:00
github-actions[bot] 8c2dd05bac Merge staging-next-21.05 into staging-21.05 2021-07-11 18:08:39 +00:00
github-actions[bot] 597a6aad6d Merge release-21.05 into staging-next-21.05 2021-07-11 18:03:22 +00:00
Gabriel Ebner f130eb0777 Merge pull request #129944 from NixOS/backport-129223-to-release-21.05
[Backport release-21.05] ccls: set resource directory
2021-07-11 18:18:50 +02:00
Gabriel Ebner 7f255c6b23 ccls: set resource directory
Fixes #126936

(cherry picked from commit db37a86453abb88c8b35924a9392f31a936597d0)
2021-07-11 14:44:40 +00:00
github-actions[bot] 842f4277ee Merge staging-next-21.05 into staging-21.05 2021-07-10 18:02:47 +00:00
github-actions[bot] c1f5dd7be2 Merge release-21.05 into staging-next-21.05 2021-07-10 18:02:00 +00:00
Mario Rodas ee7d443869 Merge pull request #129814 from NixOS/backport-128936-to-staging-21.05
[Backport staging-21.05] pythonPackages.pillow: 8.2.0 -> 8.3.1
2021-07-10 08:42:54 -05:00
markuskowa cf59fbd539 Merge pull request #129842 from NixOS/backport-129839-to-release-21.05
[Backport release-21.05] linuxptp: 3.1 -> 3.1.1
2021-07-10 14:18:49 +02:00
github-actions[bot] aa67f6896b Merge staging-next-21.05 into staging-21.05 2021-07-10 12:05:43 +00:00
github-actions[bot] 6500937b9b Merge release-21.05 into staging-next-21.05 2021-07-10 12:02:59 +00:00
Markus Kowalewski a49908946c linuxptp: 3.1 -> 3.1.1
fixes CVEs 2021-3570 and 2021-3571

(cherry picked from commit 4d881f91494fed25350ec77239a7d06ff08fa91a)
2021-07-10 11:29:04 +00:00
Jörg Thalheim 54db964a8b Merge pull request #125159 from NixOS/backport-125121-to-release-21.05
[Backport release-21.05] nixos/lib/make-ext4-fs: Fix: `resize2fs -M' can leave insufficient slack
2021-07-10 09:28:17 +01:00
github-actions[bot] ad632ccb0a Merge staging-next-21.05 into staging-21.05 2021-07-10 06:07:46 +00:00
github-actions[bot] e0f1b871c3 Merge release-21.05 into staging-next-21.05 2021-07-10 06:06:04 +00:00
Mario Rodas 07dd884d4c python38Packages.pillow: 8.3.0 -> 8.3.1
https://pillow.readthedocs.io/en/stable/releasenotes/8.3.1.html
(cherry picked from commit 6635489576e4ef70a819d6dd8a355977841ecf64)
2021-07-10 02:35:49 +00:00
Evan Stoll c40e9cc00a pythonPackages.pillow: 8.2.0 -> 8.3.0
add support for defusedxml

(cherry picked from commit e202771a892e8d2156bed2ec1c085dbeeda6faa1)
2021-07-10 02:35:48 +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] 4cdb9a0cc3 Merge staging-next-21.05 into staging-21.05 2021-07-10 00:03:10 +00: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 https://github.com/jitsi/jicofo/commit/c1945ea6cb3dd7c815e963768abc9a3fab57101e
	- 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 https://github.com/jitsi/jitsi-meet/commit/b6f7f8fba7ba81c5a0ab5477a1d103b7279bf38f

(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] dbe6c02d1b Merge staging-next-21.05 into staging-21.05 2021-07-09 18:03:04 +00: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