3961e9ebfa
Merge release-21.05 into staging-next-21.05
2021-08-20 12:02:35 +00:00
bd21f646da
Merge pull request #133371 from prusnak/electron-21.05
...
[21.05] Update electron_{11,12}
2021-08-20 13:50:50 +02:00
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
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
cd84b8ad8b
mautrix-telegram: 0.10.0 -> unstable-2021-08-12
...
(cherry picked from commit 682f35087a1baef814620cfcb9e99b068a5cd65f)
2021-08-20 11:10:49 +02:00
3ddfcfc8d7
Merge pull request #134788 from Ma27/backport-ffmpeg
...
[21.05] ffmpeg: apply patches for CVE-2021-3811{4,5} & incorrect segment length
2021-08-20 11:05:59 +02:00
daff3827c7
Merge staging-next-21.05 into staging-21.05
2021-08-20 06:03:18 +00:00
8622928256
Merge release-21.05 into staging-next-21.05
2021-08-20 06:02:38 +00:00
50d17a4663
Merge #134651 : firefox*: patch updates (into release-21.05)
2021-08-20 07:39:38 +02:00
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
b64d6f2d3c
onlykey-cli: update 1.2.2 -> 1.2.5
...
(cherry picked from commit 98f344f0da6fd9fab5dda98bb0269af8f2b61f7f)
2021-08-19 12:48:53 -07:00
50d1f373a3
python3Packages.onlykey-solo-python: init at 0.0.28
...
(cherry picked from commit d136766caa50ddca210491230884365bf485457a)
2021-08-19 12:47:40 -07:00
80505d1a07
palemoon: 29.4.0 -> 29.4.0.1
...
(cherry picked from commit 1875fba4c4fefdc0f283c53d42c817a969133679)
2021-08-19 18:54:25 +00:00
3f828fea6e
palemoon: 29.3.0 -> 29.4.0
...
(cherry picked from commit aa08cc4290ceb23e21a3d40168e719c9e9dd99e4)
2021-08-19 18:54:25 +00:00
74f8b36dee
Merge staging-next-21.05 into staging-21.05
2021-08-19 18:02:52 +00:00
0325df84d0
Merge release-21.05 into staging-next-21.05
2021-08-19 18:02:16 +00:00
6feba8ac10
discourseAllPlugins: init discourse-ldap-auth
...
(cherry picked from commit 70d29c5cf4c0561b22f8934db0c5b2dd1bf6484c)
2021-08-19 13:32:24 +00:00
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
38b1b1de47
Merge staging-next-21.05 into staging-21.05
2021-08-19 12:03:49 +00:00
3a81d95bdf
Merge release-21.05 into staging-next-21.05
2021-08-19 12:02:42 +00:00
568b939c3e
ffmpeg: patch CVE-2021-33815 and CVE-2021-38114
...
https://nvd.nist.gov/vuln/detail/CVE-2021-33815
https://nvd.nist.gov/vuln/detail/CVE-2021-38114
(cherry picked from commit a83f82576b578531eb2894e0d7b279b59af23cd6)
2021-08-19 13:19:25 +02:00
81ed9fd47b
ffmpeg_4: fix incorrect segment length in hls
...
(cherry picked from commit ae8dd3c149b4d49e683f1414d417801b80b283e2)
2021-08-19 13:19:20 +02:00
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
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
46c853dfc2
Merge #134714 : gpgme: move flaky patch URL to local file
...
(cherry picked from commit 4c88dc6a7035089ab3a311bfd09a790ea3ff5d35)
2021-08-19 09:56:11 +02:00
57607e810f
Merge staging-next-21.05 into staging-21.05
2021-08-19 06:02:49 +00:00
119d0ca33a
Merge release-21.05 into staging-next-21.05
2021-08-19 06:02:14 +00:00
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
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]: 0bcf928ada
2021-08-19 03:25:13 +00:00
6c50c69d97
config.hardware.onlykey: move the module into its own folder
...
(cherry picked from commit 1f9e0192603f335e2bf29e7bb2a67acd5c4cb3c9)
2021-08-19 03:25:13 +00:00
dad73ee885
Merge staging-next-21.05 into staging-21.05
2021-08-19 00:03:51 +00:00
2311e122d4
Merge release-21.05 into staging-next-21.05
2021-08-19 00:02:39 +00:00
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
da2591ed04
signal-desktop: 5.13.1 -> 5.14.0
...
(cherry picked from commit 8a4a84c83a62b1f8d5a0c94d0ea411ad7ee5825f)
2021-08-18 21:25:02 +00:00
7d0ad48e23
firefox-bin: 91.0 -> 91.0.1
...
(cherry picked from commit 027b2ac2eb415d4efc49a044b596f01c5d0125ae)
2021-08-18 15:37:42 +02:00
ba1de1358b
firefox-esr-78: 78.12.0esr -> 78.13.0esr
...
(cherry picked from commit ab44b4dea728b10916311a590e0cca2351d08c51)
2021-08-18 15:37:42 +02:00
5f63cddc87
firefox-esr-91: 91.0esr -> 91.0.1esr
...
(cherry picked from commit 2ad22bbb52ddadb275e4889ed0f960a24ed47aab)
2021-08-18 15:37:42 +02:00
5fe44d0661
firefox: 91.0 -> 91.0.1
...
(cherry picked from commit 010a3169667ed0bfff8c092dd707c1d619f0d0c5)
2021-08-18 15:37:41 +02:00
008f7e4f05
Merge staging-next-21.05 into staging-21.05
2021-08-18 12:03:03 +00:00
8b74ece217
Merge release-21.05 into staging-next-21.05
2021-08-18 12:02:26 +00:00
7bbca9877c
Merge #134298 : linux_5_12: remove (into release-21.05)
2021-08-18 09:26:59 +02:00
739352cb60
Merge staging-next-21.05 into staging-21.05
2021-08-18 06:04:28 +00:00
9b9c8e4fda
Merge release-21.05 into staging-next-21.05
2021-08-18 06:03:41 +00:00
4050fb937f
Merge #134354 : gpgme: fix failing patch download
...
(cherry picked from commit 91b178c3f00c23eb8b47bb540262faf5646da75d)
2021-08-18 07:31:39 +02:00
6772be8a5d
Merge staging-next-21.05 into staging-21.05
2021-08-18 00:03:17 +00:00
4955c065ca
Merge release-21.05 into staging-next-21.05
2021-08-18 00:02:34 +00:00
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
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
fd169abf9b
discourse.plugins: Make the updater able to package plugins
...
Let the update.py script handle the initial, repetitive task of
packaging new plugins. With this in place, the plugin only needs to be
added to the list in `update-plugins` and most of the work will be
done automatically when the script is run. Metadata still needs to be
filled in manually and some packages may of course require additional
work/patching.
(cherry picked from commit f8096460bd15d4f13a01cfddf0a30798921fdb42)
2021-08-17 23:16:41 +02:00
08fde82d77
discourse.plugins.discourse-github: Update
...
(cherry picked from commit 4197b6dd146c395f1caec3b086334a2b0eff623a)
2021-08-17 23:16:34 +02:00
github-actions[bot]
Pavol Rusnak
Maximilian Bosch
Fabian Affolter
Vladimír Čunát
Wael M. Nasreddine
OPNA2608
Ryan Mulligan
Kim Lindberger
TredwellGit
Izorkin
Michael Weiss
Martin Weinelt