Commit Graph
294260 Commits
Author SHA1 Message Date
github-actions[bot] ba4aef5a48 Merge staging-next-21.05 into staging-21.05 2021-08-26 00:03:26 +00:00
github-actions[bot] 98962e17c4 Merge release-21.05 into staging-next-21.05 2021-08-26 00:02:52 +00:00
Martin Weinelt 51a53aea36 Merge pull request #135700 from risicle/ris-icinga2-2.12.6-r21.05
[21.05] icinga2: 2.12.4 -> 2.12.6
2021-08-26 01:56:34 +02:00
Martin Weinelt b199038e38 Merge pull request #135713 from NixOS/backport-135706-to-release-21.05 2021-08-26 01:20:36 +02:00
Janne Heß dacd1104f6 flexoptix-app: 5.9.0 -> 5.11.0 and fixes
This update is required because the autoupdater prevents the app from
running without being updated (which is not possible because it is a
store path).
So this updates the app and patches out the updater (essentially it
never thinks it needs to update, even though it prints on the command
line that it should).

Also fix the desktop item.

(cherry picked from commit 9aa05d18b77b20ecea5046fac4987a5130d9dfef)
2021-08-25 23:00:19 +00:00
Marc Seeger 2fcab17583 unixODBC: Add additional URL
(cherry picked from commit 811af99f75f55097207020678d4dd0ec479040ca)
2021-08-25 22:49:29 +02:00
Robert Scott 6a01d735d9 icinga2: 2.12.4 -> 2.12.6 2021-08-25 21:39:25 +01: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
github-actions[bot] 99f20e24c7 Merge staging-next-21.05 into staging-21.05 2021-08-25 18:02:53 +00:00
github-actions[bot] 3bac9b7b8a Merge release-21.05 into staging-next-21.05 2021-08-25 18:02:18 +00: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
github-actions[bot] 570e6260ae Merge staging-next-21.05 into staging-21.05 2021-08-25 12:03:15 +00:00
github-actions[bot] 0fbbb4e6ff Merge release-21.05 into staging-next-21.05 2021-08-25 12:02:40 +00: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
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
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
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