summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ptcollab: 0.4.1 -> 0.4.2•••(cherry picked from commit 8ed936a10b734e9ceb5b762a273d3c1bddabdf54) origin/backport-135260-to-release-21.05R. RyanTM2021-08-221-2/+2
* Merge pull request #135086 from risicle/ris-radare2-CVE-2021-3673•••[21.05] radare2: add patch for CVE-2021-3673Robert Scott2021-08-211-0/+9
|\
| * radare2: add patch for CVE-2021-3673Robert Scott2021-08-211-0/+9
* | Merge pull request #135001 from jasonrm/backport/134767-to-21.05•••[21.05] mysql80: fix build on darwinRobert Scott2021-08-212-3/+3
|\ \
| * | mysql80: fix build on darwin•••sw_vers is called during build since 8.0.26 - https://github.com/mysql/mysql-server/commit/83b87ae7f8b0849cca20778ab0e34f2026619c1e Fixes #132288 (cherry picked from commit 5c452f15af7d11a1609f25ac14b42b82d0185a37) Jason R. McNeil2021-08-202-3/+3
* | | Merge pull request #135092 from NixOS/backport-134764-to-release-21.05•••[Backport release-21.05] onlykey-agent: init at 1.0.2Wael Nasreddine2021-08-213-0/+65
|\ \ \
| * | | onlykey-agent: init at 1.0.2•••(cherry picked from commit 8b8cd493ef8e70cdb97d05ce95ba37e75cdea431) Wael M. Nasreddine2021-08-213-0/+65
| | |/ | |/|
* | | Merge pull request #135096 from NixOS/backport-135090-to-release-21.05•••[Backport release-21.05] nomachine-client: 7.4.1 -> 7.6.2Kim Lindberger2021-08-211-6/+5
|\ \ \ | |/ / |/| |
| * | nomachine-client: 7.4.1 -> 7.6.2•••(cherry picked from commit 73bae61cda32b0aa20fd844b45387b8a50de5e20) talyz2021-08-211-6/+5
|/ /
* | Merge pull request #135074 from NixOS/backport-134616-to-release-21.05•••[Backport release-21.05] Fix Jetbrains on NixOS: Add e2fsprogsMaciej Krüger2021-08-211-2/+2
|\ \
| * | Add e2fsprogs to jetbrains•••Without this dependency JetBrains editors, on NixOS, will throw errors about a missing object file: java.lang.UnsatisfiedLinkError: libe2p.so (cherry picked from commit 70f3763e146432eca9cf7d792e7d2d12684e1c5f) Florian Beeres2021-08-211-2/+2
|/ /
* | Merge branch 'staging-21.05' into release-21.05•••ffmpeg isn't such a huge rebuild, so let's do this directly. Vladimír Čunát2021-08-214-6/+44
|\ \
| * \ Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-212-11/+7
| |\ \
| | * \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-212-11/+7
| | |\ \ | |_|/ / |/| | |
* | | | nixos/gitea: init/migrate db in startup script•••(cherry picked from commit 99d8d553da44fb065f9cb8bb54e2e93b85417fab) Zane van Iperen2021-08-211-0/+3
* | | | nixos/gitea: use gitea to refresh hooks and keys•••Gitea now provides this functionality as an admin command. Is significantly faster, especially on slow disks. (cherry picked from commit c854b8570285ac4c14282a5efa0f8334a520ac8d) Zane van Iperen2021-08-211-9/+2
* | | | Merge pull request #135022 from NixOS/backport-134363-to-release-21.05•••[Backport release-21.05] warzone2100: 4.1.1 -> 4.1.3Luke Granger-Brown2021-08-211-2/+2
|\ \ \ \
| * | | | 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 #135025 from NixOS/backport-134726-to-staging-21.05•••[Backport staging-21.05] ffmpeg, ffmpeg-full: enable basic testsLuke Granger-Brown2021-08-213-2/+18
| |\ \ \
| | * | | ffmpeg-full: enable basic tests•••(cherry picked from commit 4b658eda801752204f8be29a8f8db343d12572dc) Robert Scott2021-08-211-0/+8
| | * | | ffmpeg: enable basic tests•••(cherry picked from commit 649f0ed1a88f6e4cf00705b1cb2f1fbdf1fb780c) Robert Scott2021-08-212-2/+10
| |/ / /
| * | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-212-9/+21
| |\| |
| | * | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-212-9/+21
| | |\ \ | |_|/ / |/| | |
* | | | 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 staging-next-21.05 into staging-21.05github-actions[bot]2021-08-2016-18/+195
| | | |\|
| | | | * Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-2016-18/+195
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | 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 staging-next-21.05 into staging-21.05github-actions[bot]2021-08-201-16/+16
| | | |\|
| | | | * Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-201-16/+16
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | 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