summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* nixos/mautrix-telegram: loosen umask to keep `config.json` writable•••This is needed because `mautrix-telegram --generate-registration` appears to need write-access to `config.json` as well. Closes #135884 (cherry picked from commit bae65a3c06ae03c17edc91be35bfbf067d27ed23) origin/backport-135891-to-release-21.05Maximilian Bosch2021-08-281-1/+1
* gitlab: Enable puma's systemd notify support•••(cherry picked from commit 3dd17ae22f17fb2f5f3bcf99437fe899d727beac) talyz2021-08-285-2/+16
* gitlab: 14.1.2 -> 14.2.1•••(cherry picked from commit 99387372d5af951fa7ab1cad970b7bef83b6b91c) talyz2021-08-2814-320/+263
* Merge pull request #135991 from NixOS/backport-135952-to-release-21.05•••[Backport release-21.05] vintagestory: init at 1.15.5Artturi2021-08-282-0/+87
|\
| * vintagestory: init at 1.15.5•••(cherry picked from commit 176705c2953c17d6f7c703745d926c053e59e9f1) Artturin2021-08-282-0/+87
|/
* Merge pull request #135933 from NixOS/backport-135844-to-release-21.05•••[Backport release-21.05] Kernels 2021-08-26Maximilian Bosch2021-08-2810-31/+37
|\
| * linux/hardened/patches/5.4: 5.4.142-hardened1 -> 5.4.143-hardened1•••(cherry picked from commit e2fbc79e446ce1695b09da9521e339d6e3e2a5d0) TredwellGit2021-08-271-3/+3
| * linux/hardened/patches/5.13: init at 5.13.13-hardened1•••(cherry picked from commit b9f854004e76fd448ca8f41e444593038eaefdff) TredwellGit2021-08-271-0/+6
| * linux/hardened/patches/5.10: 5.10.60-hardened1 -> 5.10.61-hardened1•••(cherry picked from commit efcb008ba44845e3aec2a3d2d44e53f2ea4dac26) TredwellGit2021-08-271-3/+3
| * linux/hardened/patches/4.19: 4.19.204-hardened1 -> 4.19.205-hardened1•••(cherry picked from commit 885a18686b2ba40d527b27c12a2e72d3b1ecda19) TredwellGit2021-08-271-3/+3
| * linux/hardened/patches/4.14: 4.14.244-hardened1 -> 4.14.245-hardened1•••(cherry picked from commit d002bb6e6f35cbb4de3df5e41d53906c5d983e2f) TredwellGit2021-08-271-3/+3
| * linux_latest-libre: 18239 -> 18260•••(cherry picked from commit 5b94350a90c86c69d2d8e2bea14dc490d3b219e8) TredwellGit2021-08-271-2/+2
| * linux-rt_5_10: 5.10.56-rt49 -> 5.10.59-rt52•••(cherry picked from commit 0adbd0852faa0baf26e4be9e1a23e9819431fcf9) TredwellGit2021-08-271-3/+3
| * linux: 5.4.142 -> 5.4.143•••(cherry picked from commit 48183dde30f12435bc59f92d9de3ca0cbcfddb7c) TredwellGit2021-08-271-2/+2
| * linux: 5.13.12 -> 5.13.13•••(cherry picked from commit ca0b7b4e189583f44b0e53eb029dab45e45f03c6) TredwellGit2021-08-271-2/+2
| * linux: 5.10.60 -> 5.10.61•••(cherry picked from commit 78eea2b5d20e33616492242ba82966f9b2609036) TredwellGit2021-08-271-2/+2
| * linux: 4.9.280 -> 4.9.281•••(cherry picked from commit 4442d7b8ddd5c826baad3c541d16a317be447e54) TredwellGit2021-08-271-2/+2
| * linux: 4.4.281 -> 4.4.282•••(cherry picked from commit 083c38da7abd7956a3ed47df3b0b2da75d124c0f) TredwellGit2021-08-271-2/+2
| * linux: 4.19.204 -> 4.19.205•••(cherry picked from commit 88be0cc40c26eb5152443d0d3f542a1c5aea8954) TredwellGit2021-08-271-2/+2
| * linux: 4.14.244 -> 4.14.245•••(cherry picked from commit 637878c8af79298ad8e3d905d95907488f7f1696) TredwellGit2021-08-271-2/+2
* | Merge pull request #135927 from prusnak/electron-21.05•••[21.05] Electron updatesPavol Rusnak2021-08-271-16/+16
|\ \
| * | electron_12: 12.0.16 -> 12.0.17•••https://github.com/electron/electron/releases/tag/v12.0.17 (cherry picked from commit 0e6f0724c6dae128fa1e7ffcf34a8b4bc9e51aa6) TredwellGit2021-08-271-8/+8
| * | electron_11: 11.4.11 -> 11.4.12•••https://github.com/electron/electron/releases/tag/v11.4.12 (cherry picked from commit 032baedc9777520ffdeaeac5bc3c378deef275f1) TredwellGit2021-08-271-8/+8
| |/
* | Merge pull request #135940 from TredwellGit/release-21.05_go-ethereum•••[Urgent] [Backport release-21.05] go-ethereum: 1.10.6 -> 1.10.8adisbladis2021-08-271-4/+5
|\ \ | |/ |/|
| * go-ethereum: 1.10.6 -> 1.10.8•••https://www.coindesk.com/tech/2021/08/27/ethereum-faces-chain-split-as-node-operators-fail-to-update-geth-hotfix/ Backport of: https://github.com/NixOS/nixpkgs/pull/127060 https://github.com/NixOS/nixpkgs/pull/133745 https://github.com/NixOS/nixpkgs/pull/135065 https://github.com/NixOS/nixpkgs/pull/135629 TredwellGit2021-08-271-4/+5
|/
* Merge pull request #135917 from NixOS/backport-135910-to-release-21.05•••[Backport release-21.05] signal-desktop: 5.14.0 -> 5.15.0Michael Weiss2021-08-271-2/+2
|\
| * signal-desktop: 5.14.0 -> 5.15.0•••(cherry picked from commit b49afb3fe6096f6b2047dba6730c6f6b6d4c3473) Michael Weiss2021-08-271-2/+2
|/
* Merge pull request #135896 from NixOS/backport-135773-to-release-21.05•••[Backport release-21.05] vorta: 0.7.7 -> 0.7.8Maximilian Bosch2021-08-271-2/+2
|\
| * vorta: 0.7.7 -> 0.7.8•••ChangeLog: https://github.com/borgbase/vorta/releases/tag/v0.7.8 (cherry picked from commit 5ab6a61ada45e9d2299869cbef15a7416de46a06) Maximilian Bosch2021-08-271-2/+2
|/
* ocamlPackages.vlq: init at 0.2.1•••(cherry picked from commit 91a55816dda6ac8caef47bfa3ff4bcf832ff4b3b) Joachim Breitner2021-08-272-0/+27
* Merge pull request #135766 from NixOS/backport-135032-to-release-21.05•••[Backport release-21.05] tor-browser-bundle-bin: 10.5.2 -> 10.5.5Maximilian Bosch2021-08-261-3/+3
|\
| * tor-browser-bundle-bin: 10.5.2 -> 10.5.5•••(cherry picked from commit bd6f316efa000fd6e8ebc38e599c1fb7efae186f) origin/backport-135032-to-release-21.05Lux2021-08-261-3/+3
|/
* Merge pull request #135700 from risicle/ris-icinga2-2.12.6-r21.05•••[21.05] icinga2: 2.12.4 -> 2.12.6Martin Weinelt2021-08-261-2/+2
|\
| * icinga2: 2.12.4 -> 2.12.6Robert Scott2021-08-251-2/+2
* | Merge pull request #135713 from NixOS/backport-135706-to-release-21.05Martin Weinelt2021-08-261-9/+20
|\ \
| * | flexoptix-app: 5.9.0 -> 5.11.0 and fixes•••This update is required because the autoupdater prevents the app from running without being updated (which is not possible because it is a store path). So this updates the app and patches out the updater (essentially it never thinks it needs to update, even though it prints on the command line that it should). Also fix the desktop item. (cherry picked from commit 9aa05d18b77b20ecea5046fac4987a5130d9dfef) Janne Heß2021-08-251-9/+20
|/ /
* | unixODBC: Add additional URL•••(cherry picked from commit 811af99f75f55097207020678d4dd0ec479040ca) Marc Seeger2021-08-251-1/+4
* | Merge pull request #135648 from NixOS/backport-135592-to-release-21.05•••[Backport release-21.05] haproxy: 2.3.10 -> 2.3.13Robert Scott2021-08-251-2/+2
|\ \ | |/ |/|
| * haproxy: 2.3.10 -> 2.3.13•••(cherry picked from commit b919ded180a5c72b26a523197c5d9444b25db4f7) Robert Scott2021-08-251-2/+2
* | eagle: put the desktop icon where it can be found•••Apparently $out/share/icons/ doesn't work anymore, but $out/share/pixmaps/ do. (cherry picked from commit 7f6cb5a22675f9b0d8217d44ffad252e1714b473) Bjørn Forsman2021-08-251-2/+2
* | Merge pull request #135318 from NixOS/backport-132347-to-release-21.05•••[Backport release-21.05] captive-browser: fix empty string in interface argsFlorian Klink2021-08-251-6/+6
|\ \
| * | captive-browser: fix empty string in interface args•••Fixes nmcli being passed an empty string before the interface name, which would stop captive-browser from starting up. (cherry picked from commit 910f233fb7120c51cb8cbbaed4fab4caa6e5d751) origin/backport-132347-to-release-21.05Ankit Pandey2021-08-221-6/+6
* | | Merge pull request #135595 from NixOS/backport-134671-to-release-21.05•••[Backport release-21.05] matrix-synapse: 1.40.0 -> 1.41.0Maximilian Bosch2021-08-251-2/+2
|\ \ \ | |_|/ |/| |
| * | matrix-synapse: 1.40.0 -> 1.41.0•••(cherry picked from commit 2f1030b3ade598afa5594bb519b49216561bbd10) Sumner Evans2021-08-241-2/+2
* | | Merge pull request #135591 from Ma27/fix-mautrix-telegram•••[21.05] mautrix-telegram: fix crashMaximilian Bosch2021-08-251-0/+7
|\ \ \ | |/ / |/| |
| * | mautrix-telegram: fix crash•••The previous backport of `mautrix-telegram`[1] appears to be a mistake of mine (sorry for that!), unfortunately v0.9 isn't forward-compatible due to a database migration, so this change can't be reversed. The primary issue was that `telethon` was too old, so I decided to upgrade it to 1.21 which is what I had on my 21.05-based tracking branch while using `mautrix-telegram` anyways, so that's proven to work. Closes #135583 [1] e1042038ac15ad7cf447fa1ed23a3746ee5d8331 / cd84b8ad8b2f64f6ccf1f27b910bcdd274585fb0 Maximilian Bosch2021-08-241-0/+7
* | | Merge pull request #135587 from NixOS/backport-135582-to-release-21.05•••[Backport release-21.05] acpi_call: 1.2.1 -> 1.2.2Michael Raskin2021-08-241-2/+2
|\ \ \
| * | | acpi_call: 1.2.1 -> 1.2.2•••(cherry picked from commit 016e8cf78c8009f65d81fbd6c32b00803f3b1f3c) origin/backport-135582-to-release-21.05Julian Stecklina2021-08-241-2/+2
|/ / /
* | | Merge pull request #134072 from risicle/ris-openvswitch-CVE-2021-36980-r21.05•••[21.05] openvswitch: add patch for CVE-2021-36980Martin Weinelt2021-08-241-3/+16
|\ \ \
| * | | openvswitch: add patch for CVE-2021-36980Robert Scott2021-08-141-3/+16