Commit Graph
294119 Commits
Author SHA1 Message Date
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
Maximilian Bosch b86db7692f Merge pull request #134933 from Ma27/backport-mautrix-telegram
[21.05] mautrix telegram: 0.10.0 -> 0.10.1
2021-08-21 00:06:56 +02:00
Maximilian Bosch 1dc32d71d5 Merge pull request #134947 from NixOS/backport-134692-to-release-21.05
[Backport release-21.05] Kernels 2021-08-18
2021-08-20 18:50:37 +02:00
Wael Nasreddine 46bb19ea0f Merge pull request #134859 from kalbasit/update-onlykey-cli
[Backport release-21.05] onlykey-cli: 1.2.2 -> 1.2.5
2021-08-20 09:15:30 -07:00
Kim Lindberger 64f5c7c6fd Merge pull request #134799 from NixOS/backport-132475-to-release-21.05
[Backport release-21.05] discourseAllPlugins: init discourse-ldap-auth
2021-08-20 18:06:54 +02:00
TredwellGit 68a87a1d8e linux_latest-libre: 18210 -> 18239
(cherry picked from commit 4512ae304413d1fd26f329bd1c8b9dcd208d32b2)
2021-08-20 12:12:15 +00:00
TredwellGit d91ef03f45 linux-rt_5_10: 5.10.56-rt48 -> 5.10.56-rt49
(cherry picked from commit 10472677e1acd74e25b4e582dcbe66b618f9a5b4)
2021-08-20 12:12:15 +00:00
TredwellGit 552f2172c6 linux: 5.4.139 -> 5.4.142
(cherry picked from commit 0055f787369b73a59e99d34ace503bb263c92f98)
2021-08-20 12:12:14 +00:00
TredwellGit 6953c465cc linux: 5.13.11 -> 5.13.12
(cherry picked from commit 7ff40c8d9ec1eeb1d7846aef866d2f162bf375a0)
2021-08-20 12:12:14 +00:00
TredwellGit 0c0320e4b9 linux: 5.10.57 -> 5.10.60
(cherry picked from commit ab311a8b253460aaae8a0096545df80b9b65cafc)
2021-08-20 12:12:13 +00:00
TredwellGit 4f323dd3cb linux: 4.19.202 -> 4.19.204
(cherry picked from commit b7a564432b9b941caf4646ebde1f5c88db4bfc7a)
2021-08-20 12:12:13 +00:00
TredwellGit 637741d8e1 linux: 4.14.243 -> 4.14.244
(cherry picked from commit 2b71c4caac5acec35d51ee5de59b65f9a8e217b2)
2021-08-20 12:12:13 +00:00
Pavol Rusnak bd21f646da Merge pull request #133371 from prusnak/electron-21.05
[21.05] Update electron_{11,12}
2021-08-20 13:50:50 +02:00
Maximilian Bosch 05e5b69ac8 mautrix-telegram: override mautrix to version 0.10.4
This is needed since 0.10.1 of mautrix-telegram, but it'd be a breaking
change of mautrix, which can be used for any kind of matrix client, so I
don't really want to break it.
2021-08-20 11:17:04 +02:00
Maximilian Bosch e1042038ac mautrix-telegram: 2021-08-12 -> 0.10.1
ChangeLog: https://github.com/mautrix/telegram/releases/tag/v0.10.1
(cherry picked from commit dd39ec87f41db66ae4b9cb68e40cea811f863ebc)
2021-08-20 11:10:53 +02:00
Fabian Affolter cd84b8ad8b mautrix-telegram: 0.10.0 -> unstable-2021-08-12
(cherry picked from commit 682f35087a1baef814620cfcb9e99b068a5cd65f)
2021-08-20 11:10:49 +02:00
Vladimír Čunát 50d17a4663 Merge #134651: firefox*: patch updates (into release-21.05) 2021-08-20 07:39:38 +02:00
Vladimír Čunát 7cacb795a9 Merge branch 'staging-next-21.05' into release-21.05
https://hydra.nixos.org/eval/1697302
2021-08-20 07:38:11 +02:00
Wael M. Nasreddine b64d6f2d3c onlykey-cli: update 1.2.2 -> 1.2.5
(cherry picked from commit 98f344f0da6fd9fab5dda98bb0269af8f2b61f7f)
2021-08-19 12:48:53 -07:00
Wael M. Nasreddine 50d1f373a3 python3Packages.onlykey-solo-python: init at 0.0.28
(cherry picked from commit d136766caa50ddca210491230884365bf485457a)
2021-08-19 12:47:40 -07:00
github-actions[bot] 0325df84d0 Merge release-21.05 into staging-next-21.05 2021-08-19 18:02:16 +00:00
Ryan Mulligan 6feba8ac10 discourseAllPlugins: init discourse-ldap-auth
(cherry picked from commit 70d29c5cf4c0561b22f8934db0c5b2dd1bf6484c)
2021-08-19 13:32:24 +00:00
Kim Lindberger a1007637ce Merge pull request #133624 from talyz/discourse-backports
[21.05] discourse: 2.7.5 -> 2.7.7, plugins and fixes
2021-08-19 15:27:08 +02:00
github-actions[bot] 3a81d95bdf Merge release-21.05 into staging-next-21.05 2021-08-19 12:02:42 +00:00
Michael Weiss f9698c475d Merge pull request #134414 from NixOS/backport-134409-to-release-21.05
[Backport release-21.05] chromium: 92.0.4515.131 -> 92.0.4515.159
2021-08-19 10:59:51 +02:00
Michael Weiss d64c771c8e Merge pull request #134719 from NixOS/backport-134704-to-release-21.05
[Backport release-21.05] signal-desktop: 5.13.1 -> 5.14.0
2021-08-19 10:36:36 +02:00
Vladimír Čunát 46c853dfc2 Merge #134714: gpgme: move flaky patch URL to local file
(cherry picked from commit 4c88dc6a7035089ab3a311bfd09a790ea3ff5d35)
2021-08-19 09:56:11 +02:00
github-actions[bot] 57607e810f Merge staging-next-21.05 into staging-21.05 2021-08-19 06:02:49 +00:00
github-actions[bot] 119d0ca33a Merge release-21.05 into staging-next-21.05 2021-08-19 06:02:14 +00:00
Wael Nasreddine c7315b77ef Merge pull request #134759 from NixOS/backport-124815-to-release-21.05
[Backport release-21.05] config.hardware.onlykey: update the udev rules for onlykey
2021-08-18 21:07:04 -07:00
Wael M. Nasreddine dff77786cf config.hardware.onlykey: update the udev rules for onlykey
The udev rules were updated upstream without an explanation as you can
see in [this comment][commit].

[commit]: https://github.com/trustcrypto/trustcrypto.github.io/commit/0bcf928adaea559e75efa02ebd1040f0a15f611d

(cherry picked from commit eab36fabf6168f8fdbb2b835ce3ab689b9902ab1)
2021-08-19 03:25:13 +00:00
Wael M. Nasreddine 6c50c69d97 config.hardware.onlykey: move the module into its own folder
(cherry picked from commit 1f9e0192603f335e2bf29e7bb2a67acd5c4cb3c9)
2021-08-19 03:25:13 +00:00
github-actions[bot] dad73ee885 Merge staging-next-21.05 into staging-21.05 2021-08-19 00:03:51 +00:00
github-actions[bot] 2311e122d4 Merge release-21.05 into staging-next-21.05 2021-08-19 00:02:39 +00:00
Maximilian Bosch 7bbafa9a3c Merge pull request #134299 from NixOS/backport-124942-to-release-21.05
[Backport release-21.05] gitui: 0.15.0 -> 0.16.0
2021-08-19 01:09:53 +02:00
Michael Weiss da2591ed04 signal-desktop: 5.13.1 -> 5.14.0
(cherry picked from commit 8a4a84c83a62b1f8d5a0c94d0ea411ad7ee5825f)
2021-08-18 21:25:02 +00:00
Martin Weinelt 7d0ad48e23 firefox-bin: 91.0 -> 91.0.1
(cherry picked from commit 027b2ac2eb415d4efc49a044b596f01c5d0125ae)
2021-08-18 15:37:42 +02:00
Martin Weinelt ba1de1358b firefox-esr-78: 78.12.0esr -> 78.13.0esr
(cherry picked from commit ab44b4dea728b10916311a590e0cca2351d08c51)
2021-08-18 15:37:42 +02:00
Martin Weinelt 5f63cddc87 firefox-esr-91: 91.0esr -> 91.0.1esr
(cherry picked from commit 2ad22bbb52ddadb275e4889ed0f960a24ed47aab)
2021-08-18 15:37:42 +02:00
Martin Weinelt 5fe44d0661 firefox: 91.0 -> 91.0.1
(cherry picked from commit 010a3169667ed0bfff8c092dd707c1d619f0d0c5)
2021-08-18 15:37:41 +02:00
github-actions[bot] 008f7e4f05 Merge staging-next-21.05 into staging-21.05 2021-08-18 12:03:03 +00:00
github-actions[bot] 8b74ece217 Merge release-21.05 into staging-next-21.05 2021-08-18 12:02:26 +00:00
Vladimír Čunát 7bbca9877c Merge #134298: linux_5_12: remove (into release-21.05) 2021-08-18 09:26:59 +02:00
github-actions[bot] 739352cb60 Merge staging-next-21.05 into staging-21.05 2021-08-18 06:04:28 +00:00
github-actions[bot] 9b9c8e4fda Merge release-21.05 into staging-next-21.05 2021-08-18 06:03:41 +00:00
Vladimír Čunát 4050fb937f Merge #134354: gpgme: fix failing patch download
(cherry picked from commit 91b178c3f00c23eb8b47bb540262faf5646da75d)
2021-08-18 07:31:39 +02:00
github-actions[bot] 6772be8a5d Merge staging-next-21.05 into staging-21.05 2021-08-18 00:03:17 +00:00
github-actions[bot] 4955c065ca Merge release-21.05 into staging-next-21.05 2021-08-18 00:02:34 +00:00
talyz 18902d1e12 discourse: update.py: Remove native platforms in plugin lock files..
...and add ruby.

(cherry picked from commit 12ff4b79e48d9c4aa5660d2ec7ce52a21806d8e4)
2021-08-17 23:16:54 +02:00
talyz ba5434c984 discourse.mkDiscoursePlugin: Handle repos with gems directories
Some plugin repos already have a `gems` directory. This lets the
packager choose whether it should be kept and the nix packaged ruby
gems should be copied into it or if it should be removed in favor of
our ruby gems.

(cherry picked from commit 04e6b03fa91603c7f1961cfcdcf5880c91fe6b05)
2021-08-17 23:16:47 +02:00