github-actions[bot]
11f817ede9
Merge release-21.05 into staging-next-21.05
2021-07-07 06:02:39 +00:00
Delan Azabani
e77385a232
bore: init at 0.3.3 ( #129295 )
...
(cherry picked from commit 8eb54b8e0907ce37ba0eeeacfb67676d42d857bc)
2021-07-07 11:49:22 +08:00
Maximilian Bosch
b65f5d48a6
gitea: 1.14.3 -> 1.14.4
...
ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.14.4
(cherry picked from commit 1e7417a55285407c8d57f79c78477c2d16ea4b95)
2021-07-07 03:22:20 +00:00
Sandro
133a81c2ec
Merge pull request #129476 from unclechu/backport-psi-plus-bugfix-missed-gstreamer-dependencies-to-release-21.05
2021-07-07 03:00:26 +02:00
github-actions[bot]
82b9af92b4
Merge staging-next-21.05 into staging-21.05
2021-07-07 00:03:17 +00:00
github-actions[bot]
beef5b5c63
Merge release-21.05 into staging-next-21.05
2021-07-07 00:02:41 +00:00
Ben Siraphob
a5a9936a60
electron-cash: fix build on darwin
...
(cherry picked from commit a2c311fc1d178fe59c6296a2ef8901e11defa5cf)
2021-07-06 20:57:02 +00:00
Viacheslav Lotsmanov
654d8f9971
psi-plus: bugfix for missing gstreamer dependencies
...
Voice messages don’t work without gstreamer “base” and “good” plugins.
This change adds a an override for GST_PLUGIN_SYSTEM_PATH_1_0
environment variable providing necessary dependencies.
(cherry picked from commit 20d4e8bd392ac12a9942fe6a21d2d73ed39231ea)
2021-07-06 23:12:05 +03:00
Vladimír Čunát
9d1350d9d5
Merge #129412 : makeself: disable tests for now
...
Also improve the busybox-sandbox-shell.
(cherry picked from commit 00c86ad14639887ec495b92ada9cd93a75317686)
The makeself problem is blocking the nixos-21.05 channel now.
2021-07-06 21:55:52 +02:00
github-actions[bot]
c4534a22dc
Merge staging-next-21.05 into staging-21.05
2021-07-06 06:02:45 +00:00
github-actions[bot]
d0f8cc4c65
Merge release-21.05 into staging-next-21.05
2021-07-06 06:02:13 +00:00
Robert Schütz
d3ebf03151
python2Packages.certifi: init at 2019.11.28
...
We use the sources from 2019.11.28 to build, but inherit the cert bundle
from the maintained Python3-only version of certifi.
Co-authored-by: adisbladis <adisbladis@gmail.com>
(cherry picked from commit ada27b88e23eef9d59f52a30abea0ea02523a3f8)
2021-07-05 21:27:18 -07:00
github-actions[bot]
d3526b9312
Merge staging-next-21.05 into staging-21.05
2021-07-06 00:03:10 +00:00
github-actions[bot]
2cba83ecca
Merge release-21.05 into staging-next-21.05
2021-07-06 00:02:35 +00:00
fortuneteller2k
3cd12115c5
linux_xanmod: 5.12.12 -> 5.12.13
...
(cherry picked from commit 419e4299a6a393fb514048dfe57a391f939a721b)
2021-07-05 14:55:17 -07:00
Martin Weinelt
03d3dc1666
libuv: add patch for CVE-2021-22918
...
> libuv was vulnerable to out-of-bounds reads in the uv__idna_toascii()
> function which is used to convert strings to ASCII. This is called by
> the DNS resolution function and can lead to information disclosures or
> crashes.
b7466e31e4
Fixes: CVE-2021-22918
(cherry picked from commit 742b8f71f7e101bf3ecd48f28af9eda67591339e)
2021-07-05 14:49:55 -07:00
Maximilian Bosch
7ebf2d4f9b
Merge pull request #129271 from NixOS/backport-129252-to-release-21.05
...
[Backport release-21.05] tcpdump: 4.99.0 -> 4.99.1
2021-07-05 20:22:50 +02:00
Yurii Matsiuk
d06db41bb7
linux/hardened/patches/5.4: 5.4.127-hardened1 -> 5.4.129-hardened1
...
(cherry picked from commit 338286e6b05edee0faabbf0685b05dc6f2a5be44)
2021-07-05 18:13:10 +00:00
Yurii Matsiuk
24d3d7b72c
linux/hardened/patches/5.12: 5.12.12-hardened1 -> 5.12.14-hardened1
...
(cherry picked from commit 6643bf87ae69a2e3edcbc47f2dc841246e02372e)
2021-07-05 18:13:09 +00:00
Yurii Matsiuk
faa6d6b9b1
linux/hardened/patches/5.10: 5.10.45-hardened1 -> 5.10.47-hardened1
...
(cherry picked from commit 344bf9c20e10e5484a72d3dc1a77d31d1aed9e84)
2021-07-05 18:13:09 +00:00
Yurii Matsiuk
99d53a0c89
linux/hardened/patches/4.19: 4.19.195-hardened1 -> 4.19.196-hardened1
...
(cherry picked from commit 5a058ab3846b568ee71b6356fa35d1e383e6ce27)
2021-07-05 18:13:09 +00:00
Yurii Matsiuk
15f8e24bc6
linux/hardened/patches/4.14: 4.14.237-hardened1 -> 4.14.238-hardened1
...
(cherry picked from commit c7323350678a84f0557d475e94887fe94005086b)
2021-07-05 18:13:09 +00:00
Yurii Matsiuk
926c9aabc7
linux: 5.4.127 -> 5.4.129
...
(cherry picked from commit 5da58d1f67170c3dd5da6fc86d38f0d28abe4f12)
2021-07-05 18:13:08 +00:00
Yurii Matsiuk
b0214fccfb
linux: 5.12.12 -> 5.12.14
...
(cherry picked from commit d28212b0842fea0e03376247320f7b41da4abef1)
2021-07-05 18:13:08 +00:00
Yurii Matsiuk
a18dea6fb6
linux: 5.10.45 -> 5.10.47
...
(cherry picked from commit f52103a4e69179631828d453ba0ca68add15952c)
2021-07-05 18:13:08 +00:00
Yurii Matsiuk
dc34cf70c8
linux: 4.9.273 -> 4.9.274
...
(cherry picked from commit 24a5777be9e967bef974fb769b386665b671a6af)
2021-07-05 18:13:07 +00:00
Yurii Matsiuk
e168b5bcc9
linux: 4.4.273 -> 4.4.274
...
(cherry picked from commit ffdd1ac7768c9eb5a1f0a134adc0e5ce473ca3a5)
2021-07-05 18:13:07 +00:00
Yurii Matsiuk
d638fb5525
linux: 4.19.195 -> 4.19.196
...
(cherry picked from commit a5394f31e8cc9f24a549d6070ee6153e1f946537)
2021-07-05 18:13:07 +00:00
Yurii Matsiuk
78ff5dfec2
linux: 4.14.237 -> 4.14.238
...
(cherry picked from commit 1c15f4eef1c304e8d89a2f42554c503c4925e1cf)
2021-07-05 18:13:06 +00:00
Yurii Matsiuk
bc1ca1fa6b
Revert "linux: fix regression in bridge VLAN configuration"
...
This reverts commit 24a08441d52480cf3332a100e24fdf9b83a8351a.
(cherry picked from commit 2f0d1e41e254e55e2668f19faf2f307598e43f6e)
2021-07-05 18:13:06 +00:00
github-actions[bot]
e6d2640290
Merge staging-next-21.05 into staging-21.05
2021-07-05 18:02:58 +00:00
github-actions[bot]
956c0c163d
Merge release-21.05 into staging-next-21.05
2021-07-05 18:02:21 +00:00
Thomas Gerbet
c57281c274
trafficserver: 9.0.1 -> 9.0.2
...
Fixes CVE-2021-32566 and CVE-2021-32567.
(cherry picked from commit d41e86c67ff65b898be3952bf66f803a121cd083)
2021-07-05 16:07:35 +00:00
Bjørn Forsman
688f6ec8d7
nixos/hamster: fix programs.hamster.enable text
...
mkEnableOption already adds "Whether to enable" and ends with a ".", so
remove that duplication from the help text.
Also reword it slightly while at it.
(cherry picked from commit 5d3dca497ba7d20c662e8144c0bedb69433a9e4a)
2021-07-05 14:32:16 +02:00
Fabian Affolter
b77d450779
tcpdump: 4.99.0 -> 4.99.1
...
(cherry picked from commit 228adbbf7151ba2aad2cc8a4f103001d2bd20107)
2021-07-04 20:29:05 +00:00
github-actions[bot]
e2056bc4b2
Merge staging-next-21.05 into staging-21.05
2021-07-04 00:03:23 +00:00
github-actions[bot]
013ea05e19
Merge release-21.05 into staging-next-21.05
2021-07-04 00:02:39 +00:00
Aaron Andersen
806c01c9f9
Merge pull request #128840 from NixOS/backport-126284-to-release-21.05
...
[Backport release-21.05] zabbixAgent: add bash to $PATH
2021-07-03 15:12:06 -04:00
github-actions[bot]
a581dcb108
Merge staging-next-21.05 into staging-21.05
2021-07-03 18:02:47 +00:00
github-actions[bot]
b657e42102
Merge release-21.05 into staging-next-21.05
2021-07-03 18:02:14 +00:00
Jörg Thalheim
9143023abb
Merge pull request #129159 from NixOS/backport-129155-to-release-21.05
...
[Backport release-21.05] doc: point out that nixos-21.05 has gnuradio 3.9
2021-07-03 18:58:39 +01:00
Jörg Thalheim
7001c0cf15
Merge pull request #129158 from NixOS/backport-129153-to-release-21.05
...
[Backport release-21.05] doc: fix link to kodi-19.0 announcement
2021-07-03 18:58:16 +01:00
Bjørn Forsman
5ca9576f49
doc: point out that nixos-21.05 has gnuradio 3.9
...
Logically re-apply 64c70a8c4c ("doc: point out that nixos-21.05 has gnuradio
3.9"), because it was lost in the conversion from docbook to markdown, in
commit 32c2dd304d ("docs: nixos release notes to CommonMark (2105)").
(Apparently we have both .md and .xml release notes now, and CI fails
unless they have the same content (after .md processing), so update the
.xml file to match...)
(cherry picked from commit cfe8c3a75eaa427f48bc93b15c65b826c00d7401)
2021-07-03 17:44:27 +00:00
Bjørn Forsman
950142c900
doc: fix link to kodi-19.0 announcement
...
Logically re-apply 7afaacf9a8 ("doc: fix link to kodi-19.0 announcement"),
because it was lost in the conversion from docbook to markdown, in commit
32c2dd304d ("docs: nixos release notes to CommonMark (2105)").
(Hm, apparently we have *both* docbook and markdown? CI failed before I
updated the .xml file.)
(cherry picked from commit c2a3ff28be9712b598d84cdc94a7894ca59c772c)
2021-07-03 17:44:02 +00:00
Vladimír Čunát
fdaa714f38
Merge branch 'staging-next-21.05' into release-21.05
2021-07-03 15:17:49 +02:00
davidak
883e7d81a2
Merge pull request #128707 from NixOS/backport-128316-to-release-21.05
...
[Backport release-21.05] pantheon.notes-up: 2.0.2 -> unstable-2020-12-29
2021-07-03 15:02:15 +02:00
github-actions[bot]
d2c547f5b3
Merge staging-next-21.05 into staging-21.05
2021-07-03 12:03:13 +00:00
github-actions[bot]
f69d5bc5d0
Merge release-21.05 into staging-next-21.05
2021-07-03 12:02:32 +00:00
Jörg Thalheim
2a0b054afa
Merge pull request #124935 from NixOS/backport-124690-to-release-21.05
...
[Backport release-21.05] bitwarden: 1.24.6 -> 1.26.4
2021-07-03 11:17:49 +01:00
Jörg Thalheim
9cc09d4302
Merge pull request #129078 from NixOS/backport-129012-to-release-21.05
...
[Backport release-21.05] python3Packages.django_3: 3.2.4 -> 3.2.5
2021-07-03 07:47:04 +01:00