Marc Seeger
2fcab17583
unixODBC: Add additional URL
...
(cherry picked from commit 811af99f75f55097207020678d4dd0ec479040ca)
2021-08-25 22:49:29 +02:00
Robert Scott
7255b8c354
Merge pull request #135648 from NixOS/backport-135592-to-release-21.05
...
[Backport release-21.05] haproxy: 2.3.10 -> 2.3.13
2021-08-25 20:42:28 +01:00
Bjørn Forsman
e887706c1f
eagle: put the desktop icon where it can be found
...
Apparently $out/share/icons/ doesn't work anymore, but
$out/share/pixmaps/ do.
(cherry picked from commit 7f6cb5a22675f9b0d8217d44ffad252e1714b473)
2021-08-25 19:13:01 +02:00
Florian Klink
e24074676b
Merge pull request #135318 from NixOS/backport-132347-to-release-21.05
...
[Backport release-21.05] captive-browser: fix empty string in interface args
2021-08-25 16:20:05 +02:00
Robert Scott
f74adda653
haproxy: 2.3.10 -> 2.3.13
...
(cherry picked from commit b919ded180a5c72b26a523197c5d9444b25db4f7)
2021-08-25 08:30:58 +00:00
Maximilian Bosch
bc1a0f5681
Merge pull request #135595 from NixOS/backport-134671-to-release-21.05
...
[Backport release-21.05] matrix-synapse: 1.40.0 -> 1.41.0
2021-08-25 10:28:02 +02:00
Maximilian Bosch
ba6124b621
Merge pull request #135591 from Ma27/fix-mautrix-telegram
...
[21.05] mautrix-telegram: fix crash
2021-08-25 00:22:07 +02:00
Sumner Evans
7da0e25749
matrix-synapse: 1.40.0 -> 1.41.0
...
(cherry picked from commit 2f1030b3ade598afa5594bb519b49216561bbd10)
2021-08-24 20:36:45 +00:00
Michael Raskin
64fa98757b
Merge pull request #135587 from NixOS/backport-135582-to-release-21.05
...
[Backport release-21.05] acpi_call: 1.2.1 -> 1.2.2
2021-08-24 20:03:50 +00:00
Julian Stecklina
4462377467
acpi_call: 1.2.1 -> 1.2.2
...
(cherry picked from commit 016e8cf78c8009f65d81fbd6c32b00803f3b1f3c)
2021-08-24 19:37:18 +00:00
Maximilian Bosch
4aa2488fd1
mautrix-telegram: fix crash
...
The previous backport of `mautrix-telegram`[1] appears to be a mistake
of mine (sorry for that!), unfortunately v0.9 isn't forward-compatible
due to a database migration, so this change can't be reversed.
The primary issue was that `telethon` was too old, so I decided to
upgrade it to 1.21 which is what I had on my 21.05-based tracking
branch while using `mautrix-telegram` anyways, so that's proven to work.
Closes #135583
[1] e1042038ac
/ cd84b8ad8b
2021-08-24 21:28:15 +02:00
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
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
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
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
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
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
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
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
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
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
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
ajs124
6c74fc118a
linuxPackages_hardened: fix update.py
...
this is kind of hack, idk how this worked before, tbh
(cherry picked from commit e82f9673c5ec76b71409b3ec7e5c99043df63976)
2021-08-22 09:48:58 +00:00
Robert Scott
938357ce19
python3Packages.yamale: 3.0.4 -> 3.0.8
...
(cherry picked from commit 58078da425264785882e120edd5b28f6a9b92ea6)
2021-08-22 07:22:05 +00:00
Robert Scott
422b95f54f
Merge pull request #135086 from risicle/ris-radare2-CVE-2021-3673
...
[21.05] radare2: add patch for CVE-2021-3673
2021-08-21 23:38:55 +01:00
Robert Scott
0be4a28183
Merge pull request #135001 from jasonrm/backport/134767-to-21.05
...
[21.05] mysql80: fix build on darwin
2021-08-21 23:22:06 +01:00
Wael Nasreddine
11e6372341
Merge pull request #135092 from NixOS/backport-134764-to-release-21.05
...
[Backport release-21.05] onlykey-agent: init at 1.0.2
2021-08-21 12:43:19 -07:00
Kim Lindberger
c37b973071
Merge pull request #135096 from NixOS/backport-135090-to-release-21.05
...
[Backport release-21.05] nomachine-client: 7.4.1 -> 7.6.2
2021-08-21 20:07:03 +02:00
talyz
d6e092c25f
nomachine-client: 7.4.1 -> 7.6.2
...
(cherry picked from commit 73bae61cda32b0aa20fd844b45387b8a50de5e20)
2021-08-21 17:58:15 +00:00
Wael M. Nasreddine
5794e35b25
onlykey-agent: init at 1.0.2
...
(cherry picked from commit 8b8cd493ef8e70cdb97d05ce95ba37e75cdea431)
2021-08-21 17:14:04 +00:00