Martin Weinelt
ae2717f11b
Merge pull request #134072 from risicle/ris-openvswitch-CVE-2021-36980-r21.05
...
[21.05] openvswitch: add patch for CVE-2021-36980
2021-08-24 19:49:01 +02:00
Maximilian Bosch
9001cc3080
Merge pull request #134344 from NixOS/backport-132559-to-release-21.05
...
[Backport release-21.05] matrix-synapse: 1.39.0 -> 1.40.0
2021-08-24 19:02:50 +02:00
adisbladis
3b049d720a
Merge pull request #135549 from Prillan/emacs-elpa-fetcher
...
emacs: Add custom elpa fetcher (backport)
2021-08-24 10:42:17 -05:00
Martin Weinelt
47d1b12472
Merge pull request #134858 from NixOS/backport-134751-to-staging-21.05
...
[Backport staging-21.05] c-ares: enable parallel building
2021-08-24 16:49:31 +02:00
Martin Weinelt
6a54c3357f
Merge pull request #133252 from mweinelt/21.05/cpython/update
2021-08-24 16:48:58 +02:00
Kerstin Humm
ea4cbf4b3a
imagemagick: 7.1.0-4 -> 7.1.0-5
...
(cherry picked from commit 042229148d725151a89727bf70cd117250945f9f)
2021-08-24 15:36:47 +02:00
Martin Weinelt
3209ef6364
Merge pull request #135215 from NixOS/backport-135125-to-release-21.05
...
[Backport release-21.05] python3Packages.yamale: 3.0.4 -> 3.0.8
2021-08-24 15:24:52 +02:00
Martin Weinelt
4b16abddba
Merge pull request #134839 from risicle/ris-rsync-CVE-2020-14387-r21.05
2021-08-24 15:13:03 +02:00
Martin Weinelt
a4463ff45c
Merge pull request #134222 from NixOS/backport-117235-to-release-21.05
2021-08-24 15:10:53 +02:00
Martin Weinelt
b2c5035d6e
Merge pull request #134260 from risicle/ris-ndpi-CVE-2021-36082-r21.05
...
[21.05] ndpi: add patch for CVE-2021-36082
2021-08-24 15:08:44 +02:00
Martin Weinelt
d818c9fd75
Merge pull request #134278 from NixOS/backport-133375-to-staging-21.05
...
[Backport staging-21.05] c-ares: 1.17.1 -> 1.17.2
2021-08-24 15:03:30 +02:00
Martin Weinelt
f0a1234576
Merge pull request #134062 from NixOS/backport-132984-to-release-21.05
...
[Backport release-21.05] folly: 2021.01.25.00 -> 2021.08.02.00
2021-08-24 14:42:18 +02:00
adisbladis
6a5fc6beca
emacs.pkgs.elpaPackages: Use custom elpa fetcher
2021-08-24 14:26:57 +02:00
adisbladis
66966119f3
emacs: Add custom elpa fetcher
...
Elpa only serves the latest version of a given package uncompressed.
Once that release is no longer the latest & greatest it gets archived and compressed
meaning that both the URL and the hash changes.
To work around this issue we fall back to the URL with the .lz suffix and if that's the
one we downloaded we uncompress the file to ensure the hash matches regardless of compression.
2021-08-24 14:26:44 +02:00
github-actions[bot]
cf43eb79df
Merge staging-next-21.05 into staging-21.05
2021-08-24 06:07:33 +00:00
github-actions[bot]
a05256d07a
Merge release-21.05 into staging-next-21.05
2021-08-24 06:03:27 +00:00
Wael Nasreddine
d5aadbefd6
Merge pull request #134966 from NixOS/backport-134838-to-release-21.05
...
[Backport release-21.05] onlykey: init at 5.3.3
2021-08-23 19:38:43 -07:00
github-actions[bot]
8c2f34ae9d
Merge staging-next-21.05 into staging-21.05
2021-08-24 00:03:10 +00:00
github-actions[bot]
1b3e2491d5
Merge release-21.05 into staging-next-21.05
2021-08-24 00:02:29 +00:00
Maximilian Bosch
4fc6d88dc7
Merge pull request #135296 from mguentner/backport_21_05_twisted_21_07_for_matrix_synapse
...
[Backport 21.05] override twisted 20.3.0 -> 21.7.0 for matrix-synapse
2021-08-23 23:19:57 +02:00
Maximilian Bosch
0f22a1d8b1
Merge pull request #135448 from EggBaconAndSpam/glibc-2.32-54
...
glibc: 2.32-48 -> 2.32-54
2021-08-23 22:41:06 +02:00
Pavol Rusnak
c85312506e
Merge pull request #135466 from risicle/ris-tor-0.4.5.10-r21.05
...
[21.05] tor: 0.4.5.9 -> 0.4.5.10
2021-08-23 22:28:12 +02:00
Robert Scott
2bafc080b4
tor: 0.4.5.9 -> 0.4.5.10
2021-08-23 19:43:53 +01:00
github-actions[bot]
4f299d6ab6
Merge staging-next-21.05 into staging-21.05
2021-08-23 18:02:44 +00:00
github-actions[bot]
7326883996
Merge release-21.05 into staging-next-21.05
2021-08-23 18:02:13 +00:00
Sandro
983bd5b78c
Merge pull request #135436 from NixOS/backport-129194-to-release-21.05
...
[Backport release-21.05] pythonPackages.pillow-simd: revert update to 8.1.2
2021-08-23 15:59:03 +02:00
Frederik Ramcke
3ecbe36e8d
glibc: 2.32-48 -> 2.32-54
2021-08-23 15:41:52 +02:00
github-actions[bot]
04e6f86cda
Merge staging-next-21.05 into staging-21.05
2021-08-23 12:04:11 +00:00
github-actions[bot]
fcc8fc6323
Merge release-21.05 into staging-next-21.05
2021-08-23 12:02:40 +00:00
Sandro Jäckel
364e84d0fc
pythonPackages.pillow-simd: revert update to 8.1.2
...
(cherry picked from commit d4cd4061d4600d36e5b9c1727c5ba860018420c1)
2021-08-23 11:20:27 +00:00
maralorn
dcb27f623f
Merge pull request #135431 from nomeata/unbreak-haskell-ci-release
...
[21.05] haskell-ci: no longer mark as broken
2021-08-23 12:47:56 +02:00
sternenseemann
c367ee7bda
haskell-ci: no longer mark as broken
...
haskell-ci just builds (again?) without any necessary changes
(cherry picked from commit 1be4cb6748318e7a6e0f96908b095ea6fef5ac6c)
2021-08-23 12:17:29 +02:00
github-actions[bot]
4b6bb2fd52
Merge staging-next-21.05 into staging-21.05
2021-08-23 00:03:25 +00:00
github-actions[bot]
e4d36f95cb
Merge release-21.05 into staging-next-21.05
2021-08-23 00:02:38 +00:00
Robert Scott
871e8c4d58
Merge pull request #135305 from NixOS/backport-135250-to-release-21.05
...
[Backport release-21.05] python3Packages.markdown2: 2.4.0 -> 2.4.1
2021-08-22 23:57:30 +01:00
Michael Weiss
835bdf1b65
Merge pull request #135327 from NixOS/backport-135228-to-release-21.05
...
[Backport release-21.05] ungoogled-chromium: 92.0.4515.131 -> 92.0.4515.159
2021-08-22 21:33:54 +02:00
Michael Weiss
fe10697bd0
ungoogled-chromium: 92.0.4515.131 -> 92.0.4515.159
...
(cherry picked from commit 76ab90294e4014a3a1e887f1099fc1f674385b94)
2021-08-22 19:13:31 +00:00
github-actions[bot]
200313cca5
Merge staging-next-21.05 into staging-21.05
2021-08-22 18:02:39 +00:00
github-actions[bot]
7f5fb8d345
Merge release-21.05 into staging-next-21.05
2021-08-22 18:02:09 +00:00
Ankit Pandey
66e129b194
captive-browser: fix empty string in interface args
...
Fixes nmcli being passed an empty string before the interface name,
which would stop captive-browser from starting up.
(cherry picked from commit 910f233fb7120c51cb8cbbaed4fab4caa6e5d751)
2021-08-22 17:44:31 +00:00
Fabian Affolter
fe6b8c4b0f
python3Packages.markdown2: 2.4.0 -> 2.4.1
...
(cherry picked from commit 5b4b1cbfc41d0354645059b10df547a82905eb1e)
2021-08-22 15:13:49 +00:00
Maximilian Güntner
e9d616380b
matrix-synapse: override twisted 20.3.0 -> 21.7.0
...
see upstream issues:
https://github.com/twisted/twisted/pull/1225#issuecomment-788560006
https://github.com/matrix-org/synapse/issues/6211
2021-08-22 16:46:45 +02:00
Maximilian Güntner
e6e8fe7633
nixos/tests/matrix-synapse: add email regression test case
...
twisted is used in matrix-synapse for smtp handling.
Mostly this is used for password resets, but also notifications
are delivered that way.
older versions of twisted require the e-mail server to
have TLS1.0 enabled.
Obviously, quite a lot of servers have this disabled which means
synapse won't be able to deliver mails using such servers.
matrix-synapse issue:
https://github.com/matrix-org/synapse/issues/6211
2021-08-22 16:46:44 +02:00
Vladimír Čunát
4e749dc0a1
Merge #135245 : linux_*_hardened: update (into release-21.05)
2021-08-22 16:29:57 +02:00
ajs124
7e07a7e299
linuxPackages_5_4_hardened: 5.4.141 -> 5.4.142
...
(cherry picked from commit 565973316564594fe9a572a8a4c48567375c2f19)
2021-08-22 09:49:01 +00:00
ajs124
9690490f18
linuxPackages_5_10_hardened: 5.10.59 -> 5.10.60
...
(cherry picked from commit 883db296a2603d42074db9118323667e335e186e)
2021-08-22 09:49:01 +00:00
ajs124
9bb174c59e
linuxPackages_5_4_hardened: 5.4.139 -> 5.4.141
...
(cherry picked from commit b9b1fc1b383fb583721474498d3360a56f5501d5)
2021-08-22 09:49:00 +00:00
ajs124
329105e4a9
linuxPackages_5_10_hardened: 5.10.57 -> 5.10.59
...
(cherry picked from commit 580d4b687ffad6101e23466789a2f97935bc5c40)
2021-08-22 09:49:00 +00:00
ajs124
676c5aa6bf
linuxPackages_4_19_hardened: 4.19.202 -> 4.19.204
...
(cherry picked from commit a438b96c9e52113fef9ec1ac3cd694bb97bb3caf)
2021-08-22 09:48:59 +00:00
ajs124
0cdce1e22b
linuxPackages_4_14_hardened: 4.14.243 -> 4.14.244
...
(cherry picked from commit 1120eafa972180641006d425d6e9e9b76aa4ee3f)
2021-08-22 09:48:59 +00:00