Commit Graph

293853 Commits

Author SHA1 Message Date
github-actions[bot] 5bb3f62a52
Merge staging-next-21.05 into staging-21.05 2021-08-08 18:02:47 +00:00
github-actions[bot] 9c8a139d61
Merge release-21.05 into staging-next-21.05 2021-08-08 18:02:14 +00:00
Robert Scott 348bc5de8b
Merge pull request #133111 from NixOS/backport-125133-to-release-21.05
[Backport release-21.05] vhd2vl: fix build error
2021-08-08 13:55:51 +01:00
Martin Weinelt e78cb53f25
Merge pull request #133000 from NixOS/backport-132735-to-release-21.05
[Backport release-21.05] nixos/victoriametrics: set LimitNOFILE=1048576 to fix panic and restart loop
2021-08-08 14:36:00 +02:00
github-actions[bot] f15cd760a5
Merge staging-next-21.05 into staging-21.05 2021-08-08 12:02:43 +00:00
github-actions[bot] 36f97cd5de
Merge release-21.05 into staging-next-21.05 2021-08-08 12:02:07 +00:00
Sander van der Burg 90a001a7b8
Merge pull request #133038 from svanderburg/backport-add-desktopitems
[Backport release-21.05] add desktopitems
2021-08-08 13:22:23 +02:00
Jörg Thalheim d6aa85f7ff vhd2vl: apply linting suggestions
(cherry picked from commit e7235d863c397c51715a1588865f1996ecc63608)
2021-08-08 10:16:10 +00:00
sophrosyne97 0c6243e00f vhd2vl: fix build error
(cherry picked from commit 0c2c7038919a0e4a5802ab04a12302d4c73b13b2)
2021-08-08 10:16:10 +00:00
Jörg Thalheim 7174a61367
Merge pull request #130269 from NixOS/backport-125205-to-release-21.05
[Backport release-21.05] k3s: token file
2021-08-08 11:09:03 +01:00
Yuka 3a5ff18d64 mautrix-telegram: add inputs for E2BE support (#132979)
https://docs.mau.fi/bridges/general/end-to-bridge-encryption.html
(cherry picked from commit f1d1ed4f0221d89d5e221c26114a14fe138e8982)
2021-08-08 11:09:23 +02:00
github-actions[bot] 8c47337f31
Merge staging-next-21.05 into staging-21.05 2021-08-08 06:02:59 +00:00
github-actions[bot] 07e5ffa19f
Merge release-21.05 into staging-next-21.05 2021-08-08 06:02:25 +00:00
André Vitor de Lima Matos 6ae8e459f5 nvidia_x11: fix suspend script paths since 470.57.02 (#131838)
nvidia 470.57.02 changed the path of `nvidia-sleep.sh` and systemd
scripts, making `builder.sh` miss them and suspend-to-ram on systems
where `hardware.nvidia.powerManagement.enable = true` is set fail.

(cherry picked from commit 3f4bb8ff5a8da1d5b2407e0d6cfb2acfc5bb7f90)
2021-08-07 22:41:22 -07:00
Herman Fries 253365e354 nvidia_x11: 460.73.01 -> 470.57.02
(cherry picked from commit 03100da5a714a2b6c5210ceb6af092073ba4fce5)

Reason: Fixes driver build failures for the 5.13 kernel
2021-08-07 22:41:22 -07:00
Artturi 688f1ab9c5
Merge pull request #130330 from unclechu/backport-129710-to-release-21.05
psi-plus: backport “add more build options” to release-21.05
2021-08-08 08:28:59 +03:00
Martin Weinelt 5b252d8e07
Merge pull request #133065 from NixOS/backport-133057-to-release-21.05
[Backport release-21.05] lynx: add patch for CVE-2021-38165
2021-08-08 02:24:45 +02:00
Artturi 7e43079af9
Merge pull request #133062 from NixOS/backport-132966-to-release-21.05
[Backport release-21.05] blueman: 2.2.1 -> 2.2.2
2021-08-08 03:04:57 +03:00
github-actions[bot] 3801c0f13b
Merge staging-next-21.05 into staging-21.05 2021-08-08 00:03:44 +00:00
github-actions[bot] 238870ee1c
Merge release-21.05 into staging-next-21.05 2021-08-08 00:03:04 +00:00
matthewcroughan 7030245979 lynx: add patch for CVE-2021-38165
Co-authored-by: nixinator <33lockdown33@protonmail.com>
Co-authored-by: John Bargman <darthpjb@gmail.com>
Co-authored-by: Martin Weinelt <hexa@darmstadt.ccc.de>
(cherry picked from commit ddce0ec126f1c92504761bd8ece98548a40aa44f)
2021-08-07 23:45:48 +00:00
R. RyanTM 6741d9501e blueman: 2.2.1 -> 2.2.2
(cherry picked from commit 7f3755e67a3f147d8627f35030470e14aac62a42)
2021-08-07 23:39:23 +00:00
Artturi 43acb01642
Merge pull request #133040 from NixOS/backport-124452-to-release-21.05
[Backport release-21.05] SDL_Pango: fix darwin build
2021-08-07 23:26:26 +03:00
Maximilian Bosch ab5a244050
Merge pull request #133041 from NixOS/backport-133015-to-release-21.05
[Backport release-21.05] mautrix-whatsapp: 0.1.7 -> 0.1.8
2021-08-07 21:47:24 +02:00
Charlotte Van Petegem a9c04292f2 mautrix-whatsapp: specify agpl3plus license
e.g. f4a7394b67/bridgestate.go
mentions the option of using a later version.

(cherry picked from commit a6692271eb99c51137e8604d4c4a58b2e71bb7d0)
2021-08-07 19:29:15 +00:00
Charlotte Van Petegem 598282f8ed mautrix-whatsapp: update repository location
(cherry picked from commit 57e621437054555b6b1e563208badec390e4efea)
2021-08-07 19:29:15 +00:00
Charlotte Van Petegem 0fe73dc3bb mautrix-whatsapp: 0.1.7 -> 0.1.8
(cherry picked from commit bb550a67d820bc581a58cf96e1e4dff3ad6f4ce9)
2021-08-07 19:29:14 +00:00
Stéphan Kochen 72f3f8cc82 SDL_Pango: fix darwin build
(cherry picked from commit 056d7221aadbca98a23fdadb3b2963d43433ac2d)
2021-08-07 19:15:25 +00:00
Sander van der Burg 22f37f4aee dhewm: add desktop item
(cherry picked from commit f7ae4163e027ad6269e6f51a7f9d0726a97be96b)
2021-08-07 20:36:20 +02:00
Sander van der Burg b6e71616f8 quakespasm: add desktop item
(cherry picked from commit 55c21071de9d58498166ad96ddb157a4f5051702)
2021-08-07 20:36:02 +02:00
Sander van der Burg 07d959d0b0 gzdoom: add desktop item
(cherry picked from commit 246ac3167d82c7adafed4a861ddb71817810586c)
2021-08-07 20:34:08 +02:00
github-actions[bot] cf38c80016
Merge staging-next-21.05 into staging-21.05 2021-08-07 18:02:47 +00:00
github-actions[bot] f2268420f0
Merge release-21.05 into staging-next-21.05 2021-08-07 18:02:13 +00:00
Maximilian Bosch d25508ce3a
Merge pull request #133025 from avdv/backport-132043-to-release-21.05
jetbrains: Fix update.pl script for MPS and update [21.05 backport]
2021-08-07 18:08:36 +02:00
Maximilian Bosch fa27de52c7
Merge pull request #133023 from NixOS/backport-132920-to-release-21.05
[Backport release-21.05] nextcloud: 20.0.11 -> 20.0.12, 21.0.3 -> 21.0.4, 22.0.0 -> 22.1.0
2021-08-07 17:40:42 +02:00
Maximilian Bosch 8d3bc3ae55 nextcloud22: 22.0.0 -> 22.1.0
ChangeLog: https://nextcloud.com/changelog/#22-1-0
(cherry picked from commit 985d9f39aeffc4c882417f44f95b468497b98901)
2021-08-07 15:09:49 +00:00
Maximilian Bosch 7c1e6bd61f nextcloud21: 21.0.3 -> 21.0.4
ChangeLog: https://nextcloud.com/changelog/#21-0-4
(cherry picked from commit 20707acda8d7b8491deb35ad7e2b2fa1334d16ce)
2021-08-07 15:09:49 +00:00
Maximilian Bosch 06c9e35f11 nextcloud20: 20.0.11 -> 20.0.12
ChangeLog: https://nextcloud.com/changelog/#20-0-12
(cherry picked from commit be5d310839d72c8a3742ff8e1a9fd30d187ca969)
2021-08-07 15:09:48 +00:00
Artturi e60eb84b7c
Merge pull request #132999 from NixOS/backport-132945-to-release-21.05
[Backport release-21.05] stdenv/check-meta: add maxSilent
2021-08-07 15:05:22 +03:00
Ivan Kozik b047dfa13d nixos/victoriametrics: set LimitNOFILE=1048576 to fix panic and restart loop
This fixes:

```
systemd[1]: Started VictoriaMetrics time series database.
victoria-metrics[379550]: 2021-08-04T19:33:39.833Z        panic        VictoriaMetrics/lib/storage/partition.go:954        FATAL: unrecoverable error when merging small parts in the partition "/var/lib/victoriametrics/data/small/2021_08": cannot open source part for merging: cannot open metaindex file in stream mode: cannot open file "/var/lib/victoriametrics/data/small/2021_08/1228_1228_20210804184120.712_20210804184121.899_16982E83CD7A763A/metaindex.bin": open /var/lib/victoriametrics/data/small/2021_08/1228_1228_20210804184120.712_20210804184121.899_16982E83CD7A763A/metaindex.bin: too many open files
victoria-metrics[379550]: panic: FATAL: unrecoverable error when merging small parts in the partition "/var/lib/victoriametrics/data/small/2021_08": cannot open source part for merging: cannot open metaindex file in stream mode: cannot open file "/var/lib/victoriametrics/data/small/2021_08/1228_1228_20210804184120.712_20210804184121.899_16982E83CD7A763A/metaindex.bin": open /var/lib/victoriametrics/data/small/2021_08/1228_1228_20210804184120.712_20210804184121.899_16982E83CD7A763A/metaindex.bin: too many open files
victoria-metrics[379550]: goroutine 629 [running]:
victoria-metrics[379550]: github.com/VictoriaMetrics/VictoriaMetrics/lib/logger.logMessage(0xbb3ea1, 0x5, 0xc001113800, 0x1e7, 0x4)
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/logger/logger.go:270 +0xc69
victoria-metrics[379550]: github.com/VictoriaMetrics/VictoriaMetrics/lib/logger.logLevelSkipframes(0x1, 0xbb3ea1, 0x5, 0xbe3f8b, 0x4b, 0xc000bb3f88, 0x2, 0x2)
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/logger/logger.go:138 +0xd1
victoria-metrics[379550]: github.com/VictoriaMetrics/VictoriaMetrics/lib/logger.logLevel(...)
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/logger/logger.go:130
victoria-metrics[379550]: github.com/VictoriaMetrics/VictoriaMetrics/lib/logger.Panicf(...)
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/logger/logger.go:126
victoria-metrics[379550]: github.com/VictoriaMetrics/VictoriaMetrics/lib/storage.(*partition).smallPartsMerger(0xc0014d7980)
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/storage/partition.go:954 +0x145
victoria-metrics[379550]: github.com/VictoriaMetrics/VictoriaMetrics/lib/storage.(*partition).startMergeWorkers.func1(0xc0014d7980)
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/storage/partition.go:933 +0x2b
victoria-metrics[379550]: created by github.com/VictoriaMetrics/VictoriaMetrics/lib/storage.(*partition).startMergeWorkers
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/storage/partition.go:932 +0x6c
systemd[1]: victoriametrics.service: Main process exited, code=exited, status=2/INVALIDARGUMENT
systemd[1]: victoriametrics.service: Failed with result 'exit-code'.
systemd[1]: victoriametrics.service: Consumed 587ms CPU time, received 6.5K IP traffic, sent 1.7K IP traffic.
systemd[1]: victoriametrics.service: Scheduled restart job, restart counter is at 2064.
systemd[1]: Stopped VictoriaMetrics time series database.
systemd[1]: victoriametrics.service: Consumed 587ms CPU time, received 6.5K IP traffic, sent 1.7K IP traffic.
systemd[1]: Starting VictoriaMetrics time series database...
```

(cherry picked from commit fb6fbcb85cd0167c9759b82f16013777327c07e5)
2021-08-07 10:39:13 +00:00
Artturin afcc2a1bed stdenv/check-meta: add maxSilent
Hydra supports it
https://github.com/NixOS/hydra/blob/master/src/hydra-eval-jobs/hydra-eval-jobs.cc#L172

(cherry picked from commit 40944bbab7f0bb3f76b8c789c2a0cbe7dafcb7cc)
2021-08-07 10:35:21 +00:00
Claudio Bley 8163847c78 jetbrains: Check for 64 bit specific fsnotifier
In April, 2021, Jetbrains announced the end of support for 32-bit OS
IntelliJ-based IDEs[1]:

> The final major version that will be guaranteed to run on a 32-bit OS will be
> v2021.1 for all IntelliJ-based IDEs, including AppCode, Clion, DataGrip, GoLand,
> IntelliJ IDEA, PhpStorm, PyCharm, Rider, RubyMine, and WebStorm.

[1]: https://blog.jetbrains.com/idea/2021/04/end-of-support-for-32-bit-operating-systems-in-intellij-based-ides/

(cherry picked from commit 147d36b4748f58d06bb813bd98f7287de82f92e2)
2021-08-07 09:26:07 +02:00
Claudio Bley 149875adc2 jetbrains: Update
clion               : 2021.1.2 -> 2021.2
datagrip            : 2021.1.3 -> 2021.2
goland              : 2021.1.3 -> 2021.2
idea-community      : 2021.1.3 -> 2021.2
idea-ultimate       : 2021.1.3 -> 2021.2
mps                 : 2021.1   -> 2021.1.1
phpstorm            : 2021.1.4 -> 2021.2
pycharm-community   : 2021.1.3 -> 2021.2
pycharm-professional: 2021.1.3 -> 2021.2
rider               : 2021.1.3 -> 2021.1.5
ruby-mine           : 2021.1.2 -> 2021.2
webstorm            : 2021.1.2 -> 2021.2
(cherry picked from commit 544e20e24bcb8473c289e8189c22b14727e8e126)
2021-08-07 09:26:07 +02:00
Claudio Bley 887bf8b20a jetbrains: Fix update.pl script for MPS
Jetbrains seems to have deviated from the usual URL pattern of
`/<product>/<version>/<name>-<version>.<ext>` by only using the major.minor part
of the version number in the first URL segment for MPS.

(cherry picked from commit 597f94bd8a1a9e469eeb8458bb815a350f5df4cc)
2021-08-07 09:26:02 +02:00
github-actions[bot] eeaf5b3a23
Merge staging-next-21.05 into staging-21.05 2021-08-07 00:03:22 +00:00
github-actions[bot] d4458f0116
Merge release-21.05 into staging-next-21.05 2021-08-07 00:02:41 +00:00
Artturi e06ef38b52
Merge pull request #130470 from NixOS/backport-130397-to-release-21.05
[Backport release-21.05] firmwareLinuxNonfree: 2021-05-11 -> 2021-07-16
2021-08-07 01:49:56 +03:00
Artturi cb0ce8db8a
Merge pull request #131500 from NixOS/backport-130681-to-release-21.05
[Backport release-21.05] containerd: 1.5.2 -> 1.5.4
2021-08-07 01:46:38 +03:00
Artturi 97369376e1
Merge pull request #127901 from NixOS/backport-127884-to-release-21.05
[Backport release-21.05] clamav: 0.103.2 -> 0.103.3
2021-08-07 01:45:16 +03:00
Artturi ae1773ad51
Merge pull request #125814 from NixOS/backport-125804-to-release-21.05
[Backport release-21.05] buildFhsUserenv: don't leak mounts to other processes
2021-08-07 01:37:50 +03:00