summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* firmwareLinuxNonfree: 2021-07-16 -> 2021-08-18•••(cherry picked from commit 3239c7bc8dababb8583b2d1f0eb801d82ff1064e) origin/backport-134648-to-release-21.05Yurii Matsiuk2021-08-191-4/+4
* 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
* | Merge pull request #134414 from NixOS/backport-134409-to-release-21.05•••[Backport release-21.05] chromium: 92.0.4515.131 -> 92.0.4515.159Michael Weiss2021-08-191-3/+3
|\ \
| * | 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) origin/backport-134409-to-release-21.05Michael Weiss2021-08-171-3/+3
* | | Merge pull request #134719 from NixOS/backport-134704-to-release-21.05•••[Backport release-21.05] signal-desktop: 5.13.1 -> 5.14.0Michael Weiss2021-08-191-2/+2
|\ \ \
| * | | signal-desktop: 5.13.1 -> 5.14.0•••(cherry picked from commit 8a4a84c83a62b1f8d5a0c94d0ea411ad7ee5825f) origin/backport-134704-to-release-21.05Michael Weiss2021-08-181-2/+2
* | | | Merge pull request #134759 from NixOS/backport-124815-to-release-21.05•••[Backport release-21.05] config.hardware.onlykey: update the udev rules for onlykeyWael Nasreddine2021-08-184-5/+19
|\ \ \ \
| * | | | 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) Wael M. Nasreddine2021-08-191-0/+14
| * | | | config.hardware.onlykey: move the module into its own folder•••(cherry picked from commit 1f9e0192603f335e2bf29e7bb2a67acd5c4cb3c9) Wael M. Nasreddine2021-08-193-1/+1
|/ / / /
* | | | Merge pull request #134299 from NixOS/backport-124942-to-release-21.05•••[Backport release-21.05] gitui: 0.15.0 -> 0.16.0Maximilian Bosch2021-08-191-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | gitui: 0.15.0 -> 0.16.0•••(cherry picked from commit a8daff8b1a95d7a00bd177d682454194713deb6b) Antonio Yang2021-08-161-3/+3
* | | | Merge #134298: linux_5_12: remove (into release-21.05)Vladimír Čunát2021-08-184-36/+1
|\ \ \ \
| * | | | linux_5_12: remove•••https://lwn.net/ml/linux-kernel/1626791065147152@kroah.com/ (cherry picked from commit 957f0485dab604c493d7683b8a57c0679b19e35f) TredwellGit2021-08-164-36/+1
| |/ / /
* | | / Merge #134354: gpgme: fix failing patch download•••(cherry picked from commit 91b178c3f00c23eb8b47bb540262faf5646da75d) Vladimír Čunát2021-08-181-1/+4
| |_|/ |/| |
* | | Merge pull request #134504 from NixOS/backport-134493-to-release-21.05•••[Backport release-21.05] monotone: fix key encryptionMichael Raskin2021-08-172-1/+19
|\ \ \ | |_|/ |/| |
| * | monotone: fix key encryption•••(cherry picked from commit 5dd7c7a079e0b0c9799c5275714de5699fb0ffc3) origin/backport-134493-to-release-21.05Michael Raskin2021-08-172-1/+19
|/ /
* | Merge pull request #134406 from NixOS/backport-134340-to-release-21.05•••[Backport release-21.05] nixos: fix release notes about linux_latest versionJörg Thalheim2021-08-172-2/+2
|\ \
| * | nixos: fix release notes about linux_latest version•••It's version 5.13, not 5.12. (cherry picked from commit a37965f7c5d26938774677e97b9f6c9e35bce701) Bjørn Forsman2021-08-172-2/+2
* | | Merge pull request #134405 from NixOS/backport-134402-to-release-21.05•••[Backport release-21.05] nixos-generators: 1.3.0 -> 1.4.0Jörg Thalheim2021-08-171-2/+2
|\ \ \ | |/ / |/| |
| * | nixos-generators: 1.3.0 -> 1.4.0•••(cherry picked from commit e701bc3bfbc82e3e6bd3321c3999a085cb6fba1c) lassulus2021-08-171-2/+2
|/ /
* | drawpile,drawpile-server-headless: 2.1.17 -> 2.1.19•••(cherry picked from commit 5919a4254607dd6a08c964aaaf0a180c6cd6214d)github-actions[bot]2021-08-162-12/+4
* | Merge pull request #134200 from primeos/security-backports-for-21.05•••[21.05] glances: 3.1.7 -> 3.2.3Michael Weiss2021-08-161-4/+5
|\ \
| * | glances: 3.2.2 -> 3.2.3•••(cherry picked from commit 98d8f2e8fed3ef69b4e9adb904a423822ac99407) R. RyanTM2021-08-151-2/+2
| * | glances: 3.2.1 -> 3.2.2•••(cherry picked from commit f1561b7f4dfa78288ef470724377f94a7e56efe3) R. RyanTM2021-08-151-2/+2
| * | glances: 3.2.0 -> 3.2.1•••(cherry picked from commit c05bef5bc56325032f4602a9d5025551653bcc5c) Michael Weiss2021-08-151-3/+4
| * | glances: 3.1.7 -> 3.2.0•••(cherry picked from commit 035ba51146398b4ada9a89bd6246cd35e14b837e) Michael Weiss2021-08-151-3/+3
* | | Merge pull request #134013 from NixOS/backport-131867-to-release-21.05•••[Backport release-21.05] traefik: 2.4.8 -> 2.4.13Robert Scott2021-08-162-3/+5
|\ \ \
| * | | nixos/traefik: wait for first success•••possible fix for #115418 (cherry picked from commit 34add8ca5994dd594e1070ae93c0f503fd0661bc) Maxine Aubrey2021-08-141-0/+2
| * | | traefik: 2.4.8 -> 2.4.13•••(cherry picked from commit 4a97603613ae0c9ef776517f287a45c185eb33c8) Maxine Aubrey2021-08-141-3/+3
* | | | Merge pull request #134083 from NixOS/backport-134001-to-release-21.05•••[Backport release-21.05] redmine: 4.2.1 -> 4.2.2Robert Scott2021-08-164-120/+121
|\ \ \ \
| * | | | redmine: 4.2.1 -> 4.2.2•••(cherry picked from commit 23c541189c0782ad0fb60d26171480012670209d) Aaron Andersen2021-08-154-120/+121
| | |/ / | |/| |
* | | | Merge pull request #134297 from NixOS/backport-134205-to-release-21.05•••[Backport release-21.05] Kernels 2021-08-15Maximilian Bosch2021-08-163-6/+6
|\ \ \ \