summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge pull request #134344 from NixOS/backport-132559-to-release-21.05•••[Backport release-21.05] matrix-synapse: 1.39.0 -> 1.40.0Maximilian Bosch2021-08-243-27/+36
|\ \ \ \
| * | | | matrix-synapse: fix startup•••(cherry picked from commit 5a01d3ac1f1ea31b9b2635eb2ae1d9f6cd860230) origin/backport-132559-to-release-21.05Maximilian Bosch2021-08-163-25/+34
| * | | | Revert "matrix-synapse: fix homeserver script"•••This reverts commit 4444860f074e4530c25217a528748786f9334308. (cherry picked from commit 21eb8c5b37c6bcc18ecd2ebaeaf4a4fabe9c0f36) Maximilian Bosch2021-08-162-13/+28
| * | | | matrix-synapse: fix homeserver script•••(cherry picked from commit 4444860f074e4530c25217a528748786f9334308) Sumner Evans2021-08-162-28/+13
| * | | | matrix-synapse: 1.39.0 -> 1.40.0•••(cherry picked from commit 6f434ed48ce3ea9f5458bd58c81c68472a6103fb) Sumner Evans2021-08-161-2/+2
* | | | | Merge pull request #135549 from Prillan/emacs-elpa-fetcher•••emacs: Add custom elpa fetcher (backport)adisbladis2021-08-243-3/+27
|\ \ \ \ \
| * | | | | emacs.pkgs.elpaPackages: Use custom elpa fetcheradisbladis2021-08-242-3/+6
| * | | | | emacs: Add custom elpa fetcher•••Elpa only serves the latest version of a given package uncompressed. Once that release is no longer the latest & greatest it gets archived and compressed meaning that both the URL and the hash changes. To work around this issue we fall back to the URL with the .lz suffix and if that's the one we downloaded we uncompress the file to ensure the hash matches regardless of compression. adisbladis2021-08-241-0/+21
* | | | | | Merge pull request #135215 from NixOS/backport-135125-to-release-21.05•••[Backport release-21.05] python3Packages.yamale: 3.0.4 -> 3.0.8Martin Weinelt2021-08-241-2/+3
|\ \ \ \ \ \
| * | | | | | python3Packages.yamale: 3.0.4 -> 3.0.8•••(cherry picked from commit 58078da425264785882e120edd5b28f6a9b92ea6) origin/backport-135125-to-release-21.05Robert Scott2021-08-221-2/+3
* | | | | | | Merge pull request #134222 from NixOS/backport-117235-to-release-21.05Martin Weinelt2021-08-241-2/+2
|\ \ \ \ \ \ \
| * | | | | | | postsrsd: 1.10 -> 1.11•••(cherry picked from commit 6c81f568877c7cac80d8b8b168950c42d8fc604b) origin/backport-117235-to-release-21.05R. RyanTM2021-08-151-2/+2
* | | | | | | | Merge pull request #134260 from risicle/ris-ndpi-CVE-2021-36082-r21.05•••[21.05] ndpi: add patch for CVE-2021-36082Martin Weinelt2021-08-242-0/+105
|\ \ \ \ \ \ \ \
| * | | | | | | | ndpi: add patch for CVE-2021-36082Robert Scott2021-08-152-0/+105
| |/ / / / / / /
* | | | | | | | Merge pull request #134062 from NixOS/backport-132984-to-release-21.05•••[Backport release-21.05] folly: 2021.01.25.00 -> 2021.08.02.00Martin Weinelt2021-08-241-2/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | folly: 2021.01.25.00 -> 2021.08.02.00•••(cherry picked from commit 34892123a4edf8479c1d93e5b0c96feacf86a6a2) origin/backport-132984-to-release-21.05R. RyanTM2021-08-141-2/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #134966 from NixOS/backport-134838-to-release-21.05•••[Backport release-21.05] onlykey: init at 5.3.3Wael Nasreddine2021-08-236-0/+7806
|\ \ \ \ \ \ \
| * | | | | | | onlykey: parse the version from package.json•••(cherry picked from commit 7c27d012ae4d9906c601098c61f444fbe326c04a) origin/backport-134838-to-release-21.05Wael M. Nasreddine2021-08-201-1/+11
| * | | | | | | onlykey: npm install ignore scripts instead of hacking nw urlbase•••(cherry picked from commit 5a1a8df251242a1730bf298d715883742ae44100) Wael M. Nasreddine2021-08-201-33/+4
| * | | | | | | onlykey: init at 5.3.3•••Co-authored-by: Sandro <sandro.jaeckel@gmail.com> (cherry picked from commit f4498d111821fd5db927fdf2fe297c9241a81c31) Wael M. Nasreddine2021-08-206-0/+7825
* | | | | | | | Merge pull request #135296 from mguentner/backport_21_05_twisted_21_07_for_ma...•••[Backport 21.05] override twisted 20.3.0 -> 21.7.0 for matrix-synapseMaximilian Bosch2021-08-232-5/+120
|\ \ \ \ \ \ \ \
| * | | | | | | | matrix-synapse: override twisted 20.3.0 -> 21.7.0•••see upstream issues: https://github.com/twisted/twisted/pull/1225#issuecomment-788560006 https://github.com/matrix-org/synapse/issues/6211 Maximilian Güntner2021-08-221-4/+16
| * | | | | | | | nixos/tests/matrix-synapse: add email regression test case•••twisted is used in matrix-synapse for smtp handling. Mostly this is used for password resets, but also notifications are delivered that way. older versions of twisted require the e-mail server to have TLS1.0 enabled. Obviously, quite a lot of servers have this disabled which means synapse won't be able to deliver mails using such servers. matrix-synapse issue: https://github.com/matrix-org/synapse/issues/6211 Maximilian Güntner2021-08-221-1/+104
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #135466 from risicle/ris-tor-0.4.5.10-r21.05•••[21.05] tor: 0.4.5.9 -> 0.4.5.10Pavol Rusnak2021-08-231-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | tor: 0.4.5.9 -> 0.4.5.10Robert Scott2021-08-231-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #135436 from NixOS/backport-129194-to-release-21.05•••[Backport release-21.05] pythonPackages.pillow-simd: revert update to 8.1.2Sandro2021-08-231-4/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
| | |_|_|_|_|_|/ | |/| | | | | |