Commit Graph
294243 Commits
Author SHA1 Message Date
Ben Wolsieffer 9b1ef47ae3 spidermonkey_78: fix build on armv7l
Adds a patch from Debian to fix a build failure on armv7l.

(cherry picked from commit 1b1e681d77dc0452c4b557aa6e10f2e02e0650ca)
2021-08-25 10:18:56 +00:00
github-actions[bot] 35a048c8bc Merge staging-next-21.05 into staging-21.05 2021-08-25 00:03:46 +00:00
github-actions[bot] 97b39a6dc2 Merge release-21.05 into staging-next-21.05 2021-08-25 00:03:07 +00: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
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
github-actions[bot] 7956bcb2f5 Merge staging-next-21.05 into staging-21.05 2021-08-24 18:03:04 +00:00
github-actions[bot] f90cf6b7f8 Merge release-21.05 into staging-next-21.05 2021-08-24 18:02:30 +00: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 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
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