summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pythonPackages.pillow-simd: revert update to 8.1.2•••(cherry picked from commit d4cd4061d4600d36e5b9c1727c5ba860018420c1) origin/backport-129194-to-release-21.05Sandro Jäckel2021-08-231-4/+5
* Merge pull request #135431 from nomeata/unbreak-haskell-ci-release•••[21.05] haskell-ci: no longer mark as brokenmaralorn2021-08-232-3/+0
|\
| * haskell-ci: no longer mark as broken•••haskell-ci just builds (again?) without any necessary changes (cherry picked from commit 1be4cb6748318e7a6e0f96908b095ea6fef5ac6c) sternenseemann2021-08-232-3/+0
|/
* Merge pull request #135305 from NixOS/backport-135250-to-release-21.05•••[Backport release-21.05] python3Packages.markdown2: 2.4.0 -> 2.4.1Robert Scott2021-08-221-2/+2
|\
| * python3Packages.markdown2: 2.4.0 -> 2.4.1•••(cherry picked from commit 5b4b1cbfc41d0354645059b10df547a82905eb1e) Fabian Affolter2021-08-221-2/+2
* | Merge pull request #135327 from NixOS/backport-135228-to-release-21.05•••[Backport release-21.05] ungoogled-chromium: 92.0.4515.131 -> 92.0.4515.159Michael Weiss2021-08-221-5/+5
|\ \ | |/ |/|
| * ungoogled-chromium: 92.0.4515.131 -> 92.0.4515.159•••(cherry picked from commit 76ab90294e4014a3a1e887f1099fc1f674385b94) origin/backport-135228-to-release-21.05Michael Weiss2021-08-221-5/+5
|/
* Merge #135245: linux_*_hardened: update (into release-21.05)Vladimír Čunát2021-08-222-13/+13
|\
| * linuxPackages_5_4_hardened: 5.4.141 -> 5.4.142•••(cherry picked from commit 565973316564594fe9a572a8a4c48567375c2f19) ajs1242021-08-221-3/+3
| * linuxPackages_5_10_hardened: 5.10.59 -> 5.10.60•••(cherry picked from commit 883db296a2603d42074db9118323667e335e186e) ajs1242021-08-221-3/+3
| * linuxPackages_5_4_hardened: 5.4.139 -> 5.4.141•••(cherry picked from commit b9b1fc1b383fb583721474498d3360a56f5501d5) ajs1242021-08-221-3/+3
| * linuxPackages_5_10_hardened: 5.10.57 -> 5.10.59•••(cherry picked from commit 580d4b687ffad6101e23466789a2f97935bc5c40) ajs1242021-08-221-3/+3
| * linuxPackages_4_19_hardened: 4.19.202 -> 4.19.204•••(cherry picked from commit a438b96c9e52113fef9ec1ac3cd694bb97bb3caf) ajs1242021-08-221-3/+3
| * linuxPackages_4_14_hardened: 4.14.243 -> 4.14.244•••(cherry picked from commit 1120eafa972180641006d425d6e9e9b76aa4ee3f) ajs1242021-08-221-3/+3
| * linuxPackages_hardened: fix update.py•••this is kind of hack, idk how this worked before, tbh (cherry picked from commit e82f9673c5ec76b71409b3ec7e5c99043df63976) ajs1242021-08-221-1/+1
|/
* 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
generated by cgit v1.2.3 (git 2.52.0) at 2026-01-17 03:08:28 +0000