summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* palemoon: 29.4.0.2 -> 29.4.1•••(cherry picked from commit 0597172c121a1d63d4fab62b52136b4bcb490a32) origin/backport-138298-to-release-21.05OPNA26082021-09-181-9/+6
* Merge pull request #138320 from NixOS/backport-138305-to-release-21.05•••[Backport release-21.05] cc-wrapper: Add support for -mthumb / -marmJohn Ericson2021-09-171-0/+3
|\
| * cc-wrapper: Add support for -mthumb / -marm•••(cherry picked from commit d3407f1a3bab0dd8c139272ee354175c0b489903) John Ericson2021-09-171-0/+3
|/
* Merge pull request #138276 from NeQuissimus/2105_hardened_backport•••[21.05] Hardened kernels backportsajs1242021-09-171-12/+12
|\
| * linux/hardened/patches/5.14: 5.14.4-hardened1 -> 5.14.5-hardened1•••(cherry picked from commit 9f34448a98ecc21726dd5e87b7a61daf76f954de) ajs1242021-09-171-3/+3
| * linux/hardened/patches/5.4: 5.4.146-hardened1 -> 5.4.147-hardened1•••(cherry picked from commit 36e21638f5f308d8985035bca9c14595c0a3b65f) ajs1242021-09-171-3/+3
| * linux/hardened/patches/5.13: 5.13.17-hardened1 -> 5.13.18-hardened1•••(cherry picked from commit 7c04d2e390a7dbb87a428f625839db42071b7b99) ajs1242021-09-171-3/+3
| * linux/hardened/patches/5.10: 5.10.65-hardened1 -> 5.10.66-hardened1•••(cherry picked from commit 031afe4faa1e390ebdc10eb145aaeab9be978cea) ajs1242021-09-171-3/+3
* | Merge pull request #138282 from NixOS/backport-138114-to-release-21.05•••[Backport release-21.05] wireguard-tools: 1.0.20210424 -> 1.0.20210914Maximilian Bosch2021-09-171-2/+2
|\ \ | |/ |/|
| * wireguard-tools: 1.0.20210424 -> 1.0.20210914•••ChangeLog: https://lists.zx2c4.com/pipermail/wireguard/2021-September/007049.html This doesn't seem to have any implications for NixOS users, but appears to have a few fixes that seem relevant to Darwin users including: wg-quick: darwin: account for "link#XX" gateways On macOS, under specific configurations, the `netstat -nr -f inet` and `netstat -nr -f inet6` outputs break gateway collection. (cherry picked from commit d37ab4d0ee6aeb3187a0f0042cfca966c3ef2f78) Maximilian Bosch2021-09-171-2/+2
* | Merge pull request #138162 from NixOS/backport-138149-to-release-21.05•••[Backport release-21.05] Kernels 2021-09-16Maximilian Bosch2021-09-175-20/+20
|\ \ | |/ |/|
| * linux/hardened/patches/5.4: 5.4.144-hardened1 -> 5.4.146-hardened1•••(cherry picked from commit 00c500e9fc975957b4357ce46d5f10e8bf2cd1ba) TredwellGit2021-09-161-3/+3
| * linux/hardened/patches/5.14: 5.14.2-hardened1 -> 5.14.4-hardened1•••(cherry picked from commit 60b711316445f580345d815cfd04be592b136b8a) TredwellGit2021-09-161-3/+3
| * linux/hardened/patches/5.13: 5.13.15-hardened1 -> 5.13.17-hardened1•••(cherry picked from commit a8de1dcd2b5896d141bc89e0fc2cc665cd9581d7) TredwellGit2021-09-161-3/+3
| * linux/hardened/patches/5.10: 5.10.63-hardened1 -> 5.10.65-hardened1•••(cherry picked from commit 48e902a2efa3bb149d4526125e57c1429af95014) TredwellGit2021-09-161-3/+3
| * linux: 5.4.145 -> 5.4.147•••(cherry picked from commit 100f0569b54abaf1ed49ed8f525678a7eb02ab9a) TredwellGit2021-09-161-2/+2
| * linux: 5.14.3 -> 5.14.5•••(cherry picked from commit 4a05e7297cc766a2e295725bb991a50605cebbea) TredwellGit2021-09-161-2/+2
| * linux: 5.13.16 -> 5.13.18•••(cherry picked from commit 4954336e2b81ebcc108ffae0bf3a0a39d301030b) TredwellGit2021-09-161-2/+2
| * linux: 5.10.64 -> 5.10.66•••(cherry picked from commit 6c829ce0830528f8e0ea78acfedec8a345b1f81b) TredwellGit2021-09-161-2/+2
* | vscodium: fix sha256 on linux•••(cherry picked from commit 65a010bcead26c971fe5b01bb02c4a9f02d02271) happysalada2021-09-171-1/+1
* | vscodium: 1.60.0 -> 1.60.1•••(cherry picked from commit 4828eb7ae4f1105dcebf7245f453c607b9c77c1d) nixpkgs-upkeep-bot2021-09-171-5/+5
* | Merge pull request #137988 from prusnak/electron-21.05•••[21.05] electron_12: 12.1.0 -> 12.1.1Pavol Rusnak2021-09-171-8/+8
|\ \
| * | electron_12: 12.1.0 -> 12.1.1•••https://github.com/electron/electron/releases/tag/v12.1.1 (cherry picked from commit 40d83a9a2159809d2d47fc6598665c184578f1cf) TredwellGit2021-09-151-8/+8
* | | Merge pull request #138171 from NixOS/backport-136194-to-release-21.05•••[Backport release-21.05] apr: add patch for CVE-2021-35940Luke Granger-Brown2021-09-161-2/+10
|\ \ \
| * | | apr: add patch for CVE-2021-35940•••(cherry picked from commit c6c39b5944d1ebc7f294ea9b78350beec67b21a8) Robert Scott2021-09-161-2/+10
| | |/ | |/|
* | | Merge pull request #138170 from NixOS/backport-138136-to-release-21.05•••[Backport release-21.05] apacheHttpd: 2.4.48 -> 2.4.49Luke Granger-Brown2021-09-161-2/+2
|\ \ \ | |/ / |/| |
| * | apacheHttpd: 2.4.48 -> 2.4.49•••(cherry picked from commit 0518560cf13e1a08a93de6b562d6326c19a3294f) Aaron Andersen2021-09-161-2/+2
|/ /
* | Merge pull request #137439 from NixOS/backport-137328-to-release-21.05Patrick Hilhorst2021-09-161-5/+5
|\ \
| * | vscodium: 1.59.1 -> 1.60.0•••(cherry picked from commit 93fea775e17c1266d0ff592dc63e0bfdc252be6c) origin/backport-137328-to-release-21.05nixpkgs-upkeep-bot2021-09-111-5/+5
* | | Merge pull request #137984 from NixOS/backport-137673-to-release-21.05•••[Backport release-21.05] github-runner: 2.281.1 -> 2.282.0, prevent self-updateJörg Thalheim2021-09-153-31/+34
|\ \ \ | |_|/ |/| |
| * | github-runner: 2.281.1 -> 2.282.0•••(cherry picked from commit cd641476cfcf8d5494e661debac9a3fe40f4cf32) Vincent Haupert2021-09-151-2/+2
| * | github-runner: prevent self-updates•••As of yet, a patch caused the runner to discard update messages. Unfortunately, GitHub keeps sending update messages to outdated runners causing them to no longer pick up jobs. This commit causes the runner to send a high version to GitHub which should be more recent for quite a time. That way, GitHub does not send update message and keeps scheduling jobs even for outdated runners. Naturally, an oudated runner can still break at any time as GitHub's current approach assumes that all runners are always up-to-date. We should still strive for quick nixpkgs updates but this patch should give us some time. (cherry picked from commit e8bbcc79fd07014b146835dfd7f5eba2079d9a55) Vincent Haupert2021-09-153-26/+28
| * | github-runner: use dummy SHA-1 as `GitInfoCommitHash`•••The runner only references `GitInfoCommitHash`/`CommitHash` to print informational log entries. To allow for just referencing the tag of a version instead of the commit hash, this commit sets the value of the `GitInfoCommitHash` to a static dummy value. (cherry picked from commit cc5c902fdf94b798c3b68e55ebb7e1a1185113a1) Vincent Haupert2021-09-151-3/+4
|/ /
* | Merge pull request #137162 from NixOS/backport-136988-to-release-21.05•••[Backport release-21.05] github-runner: 2.279.0 -> 2.281.1Jörg Thalheim2021-09-151-52/+53
|\ \
| * | github-runner: adapt to latest lttng-ust•••ref: ab2501bd171f2c930ebd3f3bf6b6a1a228477a08 (cherry picked from commit 1614fc6eb63d012b704cbb34b9c53c823d51c32c) origin/backport-136988-to-release-21.05Vincent Haupert2021-09-091-0/+4
| * | github-runner: 2.279.0 -> 2.281.1•••(cherry picked from commit ebcf2468ac67b473821946a6d5539c001861b465) Vincent Haupert2021-09-091-3/+3
| * | github-runner: make derivation easier to override•••(cherry picked from commit 0d1e42786e6bc5249248e50793f9f8537aaad857) Vincent Haupert2021-09-091-50/+47
* | | Merge pull request #137889 from NixOS/backport-137759-to-release-21.05•••[Backport release-21.05] signal-desktop: 5.17.0 -> 5.17.1Michael Weiss2021-09-151-2/+2
|\ \ \
| * | | signal-desktop: 5.17.0 -> 5.17.1•••(cherry picked from commit e3c0374da4ff8c9a0ad65a429c6ab030e4ae8cc3) R. RyanTM2021-09-141-2/+2
* | | | Merge branch 'staging-next-21.05' into release-21.05Vladimír Čunát2021-09-1422-53/+102
|\ \ \ \ | |/ / / |/| | |
| * | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-09-144-6/+23
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #137311 from symphorien/evolution-stable-update•••[21.05] evolution, evolution-ews, evolution-data-server: backport patch release bumpsGuillaume Girol2021-09-143-6/+6
|\ \ \ \
| * | | | evolution-data-server: 3.40.3 -> 3.40.4Ilan Joselevich2021-09-091-2/+2
| * | | | evolution-data-server: 3.40.2 -> 3.40.3R. RyanTM2021-09-091-2/+2
| * | | | evolution-ews: 3.40.1 -> 3.40.3R. RyanTM2021-09-091-2/+2
| * | | | evolution: 3.40.1 -> 3.40.3R. RyanTM2021-09-091-2/+2
* | | | | Merge pull request #137683 from NixOS/backport-137671-to-release-21.05•••[Backport release-21.05] firefox-unwrapped: workaround issues on non-Gnome wayland WM's on FF 92Bernardo Meurer2021-09-141-0/+17
|\ \ \ \ \
| * | | | | firefox-unwrapped: workaround issues on non-Gnome wayland WM's on FF 92•••Closes: #137649 (cherry picked from commit dfccb3045e76872eda32cdfa338dbe6aae8ccfcb) Bernardo Meurer2021-09-131-0/+17
| | | * | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-09-141-1/+8
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | element-desktop: apply patch to run on Wayland (#137666)•••See upstream PR#261[1] for further reference. Previously, the `enable-features`-setting was entirely discarded due to an earlier regression resulting in an attempt to start `element-desktop` in Wayland-mode without all necessary components. Closes #137377 [1] https://github.com/vector-im/element-desktop/pull/261 (cherry picked from commit 5a0d0ec1cf90aae4354a97a2afaff079605ffc82) Maximilian Bosch2021-09-141-1/+8