637741d8e1
linux: 4.14.243 -> 4.14.244
...
(cherry picked from commit 2b71c4caac5acec35d51ee5de59b65f9a8e217b2)
2021-08-20 12:12:13 +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
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
0325df84d0
Merge release-21.05 into staging-next-21.05
2021-08-19 18:02:16 +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
3a81d95bdf
Merge release-21.05 into staging-next-21.05
2021-08-19 12:02:42 +00: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
af15cbe6b0
discourse: Change the path to the auto generated plugin assets
...
Change the path to the auto generated plugin assets, which defaults to
the plugin's directory and isn't writable at the time of asset
generation.
(cherry picked from commit 443b318ee9c614d480a2ecb0120b52806d6fbb3b)
2021-08-17 23:16:28 +02:00
080e4e43fb
discourse.tests: Test the appropriate discourse package
...
Perform the tests on the package that the `tests` attribute is a child
of, i.e. if `discourseAllPlugins.tests` is built, the tests will run
with the `discourseAllPlugins` package, not the `discourse` package as
previously.
(cherry picked from commit 6fd5a40ccaf0b4da1362803a387bf46d381dd66a)
2021-08-17 23:16:18 +02:00
639e1d9639
discourse: Remove leftover link to unused plugins directory
...
(cherry picked from commit bb14315d51a1c35304dfd82ff5c1faeaaf2c450c)
2021-08-17 23:13:55 +02:00
202c17a806
discourse.plugins.discourse-data-explorer: Update
...
(cherry picked from commit 6f2652735817e22c55de3b6e137faf7cdbc3fd2a)
2021-08-17 23:13:49 +02:00
700cfb0fc3
discourse.plugins.discourse-solved: Update
...
(cherry picked from commit 92b758266e61b2efe078973a3d020b3d1a2c363d)
2021-08-17 23:13:43 +02:00
fddb277d03
discourse.plugins.discourse-canned-replies: Update
...
(cherry picked from commit 5d94e3bfc94637f6876b9957471fc571646867b0)
2021-08-17 23:13:36 +02:00
4a30a10e62
discourse.plugins.discourse-calendar: Update
...
(cherry picked from commit d1a63bf19c6c75430393dab94f5e939b258ffdb6)
2021-08-17 23:13:30 +02:00
f2533d47c8
discourse: 2.7.5 -> 2.7.7
...
(cherry picked from commit c97ae4ad8e782765b333840d8d1aa83903f82b7f)
2021-08-17 23:13:23 +02:00
c193cf6ed9
discourse.mkDiscoursePlugin: remove phases
...
(cherry picked from commit 4f62b051375b0fdaa01ba37e915cfaaa7de40d80)
2021-08-17 23:12:50 +02:00
8b8ccc0fd8
discourseAllPlugins: add discourse-calendar
...
(cherry picked from commit 858b0157e56426ee0d56faae393fc85b361ffd90)
2021-08-17 23:12:44 +02:00
48f779f37d
discourse/update.py: add missing plugins
...
(cherry picked from commit 32e24e792caefa1de46bf20da2ba4d8fbbf035dc)
2021-08-17 23:12:39 +02:00
a9358e80fc
discourseAllPlugins: init discourse-migratepassword
...
(cherry picked from commit 85d7eb75c968421ea233f4c8a5b05886733c2dec)
2021-08-17 23:12:33 +02:00
d0064e3868
discourseAllPlugins: init discourse-data-explorer
...
(cherry picked from commit 601db31c264f3008c25f3fb13f1968a543a9cfe6)
2021-08-17 23:12:28 +02:00
3c3cd97025
discourseAllPlugins: init discourse-checklist
...
(cherry picked from commit eb02dc0c4a14d5a15f3443567bc12abf631c300a)
2021-08-17 23:12:19 +02:00
97c5d0cbe7
Merge pull request #134504 from NixOS/backport-134493-to-release-21.05
...
[Backport release-21.05] monotone: fix key encryption
2021-08-17 18:44:23 +00:00
TredwellGit
Pavol Rusnak
Vladimír Čunát
github-actions[bot]
Kim Lindberger
Michael Weiss
Wael Nasreddine
Maximilian Bosch
Martin Weinelt
Felix Buehler
Ryan Mulligan
Michael Raskin