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
f037cc9ff4
monotone: fix key encryption
...
(cherry picked from commit 5dd7c7a079e0b0c9799c5275714de5699fb0ffc3)
2021-08-17 18:02:17 +00:00
c1e5f0fe3c
Merge staging-next-21.05 into staging-21.05
2021-08-17 12:03:22 +00:00
98c6091c14
Merge release-21.05 into staging-next-21.05
2021-08-17 12:02:47 +00:00
587b190c8a
chromium: 92.0.4515.131 -> 92.0.4515.159
...
https://chromereleases.googleblog.com/2021/08/stable-channel-update-for-desktop.html
This update includes 9 security fixes.
CVEs:
CVE-2021-30598 CVE-2021-30599 CVE-2021-30600 CVE-2021-30601
CVE-2021-30602 CVE-2021-30603 CVE-2021-30604
(cherry picked from commit 1c476a2b6dda4bef88270f0285cac5363712c980)
2021-08-17 08:55:42 +00:00
8c3b502c7c
Merge pull request #134406 from NixOS/backport-134340-to-release-21.05
...
[Backport release-21.05] nixos: fix release notes about linux_latest version
2021-08-17 08:28:55 +01:00
dad2c73c36
Merge pull request #134405 from NixOS/backport-134402-to-release-21.05
...
[Backport release-21.05] nixos-generators: 1.3.0 -> 1.4.0
2021-08-17 08:28:22 +01:00
991e12bfdb
nixos: fix release notes about linux_latest version
...
It's version 5.13, not 5.12.
(cherry picked from commit a37965f7c5d26938774677e97b9f6c9e35bce701)
2021-08-17 07:12:42 +00:00
05e6f69901
nixos-generators: 1.3.0 -> 1.4.0
...
(cherry picked from commit e701bc3bfbc82e3e6bd3321c3999a085cb6fba1c)
2021-08-17 07:04:35 +00:00
95dde93451
Merge staging-next-21.05 into staging-21.05
2021-08-17 06:03:01 +00:00
c3f08e6146
Merge release-21.05 into staging-next-21.05
2021-08-17 06:02:28 +00:00
8ac4e2037a
drawpile,drawpile-server-headless: 2.1.17 -> 2.1.19
...
(cherry picked from commit 5919a4254607dd6a08c964aaaf0a180c6cd6214d)
2021-08-16 21:54:13 -04:00
1220237519
Merge staging-next-21.05 into staging-21.05
2021-08-17 00:03:42 +00:00
444e630f23
Merge release-21.05 into staging-next-21.05
2021-08-17 00:02:41 +00:00
543d4ecac2
Merge pull request #134200 from primeos/security-backports-for-21.05
...
[21.05] glances: 3.1.7 -> 3.2.3
2021-08-16 22:36:55 +02:00
6d41a79a0e
Merge pull request #134013 from NixOS/backport-131867-to-release-21.05
...
[Backport release-21.05] traefik: 2.4.8 -> 2.4.13
2021-08-16 20:40:19 +01:00
c44b9fa44b
Merge pull request #134083 from NixOS/backport-134001-to-release-21.05
...
[Backport release-21.05] redmine: 4.2.1 -> 4.2.2
2021-08-16 20:39:41 +01:00
94c989365d
Merge pull request #134297 from NixOS/backport-134205-to-release-21.05
...
[Backport release-21.05] Kernels 2021-08-15
2021-08-16 20:48:48 +02:00
9c7404d96f
Merge pull request #134004 from NixOS/backport-132689-to-staging-21.05
...
[Backport staging-21.05] libsndfile: 1.0.30 -> 1.0.31
2021-08-16 19:12:29 +01:00
0d8777fc55
Merge staging-next-21.05 into staging-21.05
2021-08-16 18:02:59 +00:00
62d737b061
Merge release-21.05 into staging-next-21.05
2021-08-16 18:02:26 +00:00
8f311b4f5e
Merge pull request #134291 from yu-re-ka/feature/21-05-thunderbird-91
...
[21.05] thunderbird-91: init at 91.0
2021-08-16 17:02:29 +00:00
e81def80a4
Merge pull request #134308 from NixOS/backport-121693-to-release-21.05
...
[Backport release-21.05] llvm_11: disable failing 'dependent-libraries.test' on armv7l
2021-08-16 15:47:23 +01:00
62750a0b34
Merge staging-next-21.05 into staging-21.05
2021-08-16 12:04:20 +00:00
0f0eda905a
Merge release-21.05 into staging-next-21.05
2021-08-16 12:03:37 +00:00
49f3fda496
llvm_11: disable failing 'dependent-libraries.test' on armv7l
...
(cherry picked from commit 23ab12364036aebff032bdb4343312ebea0dbcaf)
2021-08-16 10:39:28 +00:00
b3743e6325
haskellPackages.readline: fix Setup.hs to work with Cabal 3
...
See https://github.com/NixOS/nixpkgs/pull/111985/ for previous discussion
(cherry picked from commit b950ecaf3a49662ba92e6c978aa472155eddd47f)
2021-08-16 12:12:46 +02:00
a54234df3a
gitui: 0.15.0 -> 0.16.0
...
(cherry picked from commit a8daff8b1a95d7a00bd177d682454194713deb6b)
2021-08-16 09:19:12 +00:00
aa1af91878
linux_5_12: remove
...
https://lwn.net/ml/linux-kernel/1626791065147152@kroah.com/
(cherry picked from commit 957f0485dab604c493d7683b8a57c0679b19e35f)
2021-08-16 09:12:57 +00:00
b77e4da370
linux: 5.13.10 -> 5.13.11
...
(cherry picked from commit f2e78916b9b72d6e4bb00197f9e79abe1c7b2952)
2021-08-16 09:11:43 +00:00
52d43e083d
linux: 4.9.279 -> 4.9.280
...
(cherry picked from commit 9e9933a76be27acf86a9a0573f6d5bf794ae5cd8)
2021-08-16 09:11:43 +00:00
github-actions[bot]
talyz
Felix Buehler
Ryan Mulligan
Michael Raskin
Michael Weiss
Jörg Thalheim
Bjørn Forsman
lassulus
Robert Scott
Maximilian Bosch
Bernardo Meurer
misuzu
Samuel Rivas
Antonio Yang
TredwellGit