summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* warzone2100: 4.1.1 -> 4.1.3•••(cherry picked from commit 4b5f0bfa393e45e9f9c2704d000e07dc689b4e51) origin/backport-134363-to-release-21.05Francesco Gazzetta2021-08-211-2/+2
* Merge pull request #134844 from NixOS/backport-134591-to-release-21.05•••[Backport release-21.05] palemoon: 29.3.0 -> 29.4.0.1Anderson Torres2021-08-201-2/+2
|\
| * palemoon: 29.4.0 -> 29.4.0.1•••(cherry picked from commit 1875fba4c4fefdc0f283c53d42c817a969133679) origin/backport-134591-to-release-21.05OPNA26082021-08-191-2/+2
| * palemoon: 29.3.0 -> 29.4.0•••(cherry picked from commit aa08cc4290ceb23e21a3d40168e719c9e9dd99e4) OPNA26082021-08-191-2/+2
* | Merge pull request #134933 from Ma27/backport-mautrix-telegram•••[21.05] mautrix telegram: 0.10.0 -> 0.10.1Maximilian Bosch2021-08-211-7/+19
|\ \
| * | 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. Maximilian Bosch2021-08-201-4/+14
| * | mautrix-telegram: 2021-08-12 -> 0.10.1•••ChangeLog: https://github.com/mautrix/telegram/releases/tag/v0.10.1 (cherry picked from commit dd39ec87f41db66ae4b9cb68e40cea811f863ebc) Maximilian Bosch2021-08-201-3/+3
| * | mautrix-telegram: 0.10.0 -> unstable-2021-08-12•••(cherry picked from commit 682f35087a1baef814620cfcb9e99b068a5cd65f) Fabian Affolter2021-08-201-4/+6
* | | Merge pull request #134947 from NixOS/backport-134692-to-release-21.05•••[Backport release-21.05] Kernels 2021-08-18Maximilian Bosch2021-08-207-14/+14
|\ \ \
| * | | linux_latest-libre: 18210 -> 18239•••(cherry picked from commit 4512ae304413d1fd26f329bd1c8b9dcd208d32b2) TredwellGit2021-08-201-2/+2
| * | | linux-rt_5_10: 5.10.56-rt48 -> 5.10.56-rt49•••(cherry picked from commit 10472677e1acd74e25b4e582dcbe66b618f9a5b4) TredwellGit2021-08-201-2/+2
| * | | linux: 5.4.139 -> 5.4.142•••(cherry picked from commit 0055f787369b73a59e99d34ace503bb263c92f98) TredwellGit2021-08-201-2/+2
| * | | linux: 5.13.11 -> 5.13.12•••(cherry picked from commit 7ff40c8d9ec1eeb1d7846aef866d2f162bf375a0) TredwellGit2021-08-201-2/+2
| * | | linux: 5.10.57 -> 5.10.60•••(cherry picked from commit ab311a8b253460aaae8a0096545df80b9b65cafc) TredwellGit2021-08-201-2/+2
| * | | linux: 4.19.202 -> 4.19.204•••(cherry picked from commit b7a564432b9b941caf4646ebde1f5c88db4bfc7a) TredwellGit2021-08-201-2/+2
| * | | linux: 4.14.243 -> 4.14.244•••(cherry picked from commit 2b71c4caac5acec35d51ee5de59b65f9a8e217b2) TredwellGit2021-08-201-2/+2
* | | | Merge pull request #134859 from kalbasit/update-onlykey-cli•••[Backport release-21.05] onlykey-cli: 1.2.2 -> 1.2.5Wael Nasreddine2021-08-203-4/+51
|\ \ \ \
| * | | | onlykey-cli: update 1.2.2 -> 1.2.5•••(cherry picked from commit 98f344f0da6fd9fab5dda98bb0269af8f2b61f7f) Wael M. Nasreddine2021-08-191-4/+14
| * | | | python3Packages.onlykey-solo-python: init at 0.0.28•••(cherry picked from commit d136766caa50ddca210491230884365bf485457a) Wael M. Nasreddine2021-08-192-0/+37
| | |_|/ | |/| |
* | | | Merge pull request #134799 from NixOS/backport-132475-to-release-21.05•••[Backport release-21.05] discourseAllPlugins: init discourse-ldap-authKim Lindberger2021-08-206-0/+130
|\ \ \ \ | |_|/ / |/| | |
| * | | discourseAllPlugins: init discourse-ldap-auth•••(cherry picked from commit 70d29c5cf4c0561b22f8934db0c5b2dd1bf6484c) Ryan Mulligan2021-08-196-0/+130
| |/ /
* | | Merge pull request #133371 from prusnak/electron-21.05•••[21.05] Update electron_{11,12}Pavol Rusnak2021-08-201-16/+16
|\ \ \ | |_|/ |/| |
| * | electron_12: 12.0.15 -> 12.0.16•••https://github.com/electron/electron/releases/tag/v12.0.16 (cherry picked from commit 4f7a4bd0fe213f3f4baa6c1dafeb55b3f26e339f) TredwellGit2021-08-101-8/+8
| * | electron_11: 11.4.10 -> 11.4.11•••https://github.com/electron/electron/releases/tag/v11.4.11 (cherry picked from commit 79744f0ea04aff8d206e9312da2e4a24fd83f3c3) TredwellGit2021-08-101-8/+8
* | | Merge #134651: firefox*: patch updates (into release-21.05)Vladimír Čunát2021-08-202-399/+399
|\ \ \
| * | | firefox-bin: 91.0 -> 91.0.1•••(cherry picked from commit 027b2ac2eb415d4efc49a044b596f01c5d0125ae) Martin Weinelt2021-08-181-393/+393
| * | | firefox-esr-78: 78.12.0esr -> 78.13.0esr•••(cherry picked from commit ab44b4dea728b10916311a590e0cca2351d08c51) Martin Weinelt2021-08-181-2/+2
| * | | firefox-esr-91: 91.0esr -> 91.0.1esr•••(cherry picked from commit 2ad22bbb52ddadb275e4889ed0f960a24ed47aab) Martin Weinelt2021-08-181-2/+2
| * | | firefox: 91.0 -> 91.0.1•••(cherry picked from commit 010a3169667ed0bfff8c092dd707c1d619f0d0c5) Martin Weinelt2021-08-181-2/+2
* | | | Merge branch 'staging-next-21.05' into release-21.05•••https://hydra.nixos.org/eval/1697302 Vladimír Čunát2021-08-206-18/+60
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-1922-38/+387
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #133624 from talyz/discourse-backports•••[21.05] discourse: 2.7.5 -> 2.7.7, plugins and fixesKim Lindberger2021-08-1922-38/+387
|\ \ \ \
| * | | | discourse: update.py: Remove native platforms in plugin lock files..•••...and add ruby. (cherry picked from commit 12ff4b79e48d9c4aa5660d2ec7ce52a21806d8e4) talyz2021-08-171-4/+15
| * | | | 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) talyz2021-08-171-4/+14
| * | | | 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) talyz2021-08-172-3/+65
| * | | | discourse.plugins.discourse-github: Update•••(cherry picked from commit 4197b6dd146c395f1caec3b086334a2b0eff623a) talyz2021-08-173-13/+25
| * | | | 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) talyz2021-08-172-0/+23
| * | | | 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) talyz2021-08-172-5/+5
| * | | | discourse: Remove leftover link to unused plugins directory•••(cherry picked from commit bb14315d51a1c35304dfd82ff5c1faeaaf2c450c) talyz2021-08-172-2/+0
| * | | | discourse.plugins.discourse-data-explorer: Update•••(cherry picked from commit 6f2652735817e22c55de3b6e137faf7cdbc3fd2a) talyz2021-08-171-2/+2
| * | | | discourse.plugins.discourse-solved: Update•••(cherry picked from commit 92b758266e61b2efe078973a3d020b3d1a2c363d) talyz2021-08-171-2/+2
| * | | | discourse.plugins.discourse-canned-replies: Update•••(cherry picked from commit 5d94e3bfc94637f6876b9957471fc571646867b0) talyz2021-08-171-2/+2
| * | | | discourse.plugins.discourse-calendar: Update•••(cherry picked from commit d1a63bf19c6c75430393dab94f5e939b258ffdb6) talyz2021-08-173-3/+6
| * | | | discourse: 2.7.5 -> 2.7.7•••(cherry picked from commit c97ae4ad8e782765b333840d8d1aa83903f82b7f) talyz2021-08-171-2/+2
| * | | | discourse.mkDiscoursePlugin: remove phases•••(cherry picked from commit 4f62b051375b0fdaa01ba37e915cfaaa7de40d80) Felix Buehler2021-08-171-1/+2
| * | | | discourseAllPlugins: add discourse-calendar•••(cherry picked from commit 858b0157e56426ee0d56faae393fc85b361ffd90) Ryan Mulligan2021-08-175-0/+127
| * | | | discourse/update.py: add missing plugins•••(cherry picked from commit 32e24e792caefa1de46bf20da2ba4d8fbbf035dc) Ryan Mulligan2021-08-171-0/+4
| * | | | discourseAllPlugins: init discourse-migratepassword•••(cherry picked from commit 85d7eb75c968421ea233f4c8a5b05886733c2dec) Ryan Mulligan2021-08-175-0/+62
| * | | | discourseAllPlugins: init discourse-data-explorer•••(cherry picked from commit 601db31c264f3008c25f3fb13f1968a543a9cfe6) Ryan Mulligan2021-08-172-0/+18
| * | | | discourseAllPlugins: init discourse-checklist•••(cherry picked from commit eb02dc0c4a14d5a15f3443567bc12abf631c300a) Ryan Mulligan2021-08-172-0/+18