summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* maintainers/teams: Add dandellion to matrix team•••(cherry picked from commit 44a982a00657ffd7997fd69100c49186d429ce6c) origin/backport-128048-to-release-21.05Daniel Olsen2021-06-261-0/+1
* matrix-synapse: Add txredisapi as dependency when using redis•••(cherry picked from commit 55e325032b7ae77198715136f51f38ea0fbabbbe) Daniel Olsen2021-06-261-1/+1
* pythonPackages.txredisapi: Add unit test•••(cherry picked from commit f7f52a4fbf9cce72ec5be144ac5e665071f0da61) Daniel Olsen2021-06-263-0/+30
* pythonPackages.txredisapi: init at 1.4.7•••(cherry picked from commit 6d90bc1c110dc4bb06d253210be51ea97633fac9) Daniel Olsen2021-06-262-0/+28
* Merge pull request #128142 from NixOS/backport-128082-to-release-21.05•••[Backport release-21.05] nixos/sdcard: make firmware partition offset configurableFlorian Klink2021-06-251-1/+17
|\
| * nixos/sdcard: make firmware partition offset configurable•••Different boards using u-boot SPL require to write to different locations. Sometimes, the 8MiB gap isn't sufficient - rk3399 boards write to 0x16384 for example, which is at 8MiB, thus overriding the fat32 partition with the SPL. (cherry picked from commit 1db54a5522a2d523e406ce8713bfe88bb9e3f657) Florian Klink2021-06-251-1/+17
|/
* audit: use hostPlatform.isStatic instead of targetPlatform.isStatic•••(cherry picked from commit 0034539abab37c4cfbc281a084cf111a16e8a21d) Marco A L Barbosa2021-06-251-1/+1
* Merge pull request #128110 from NixOS/backport-128108-to-release-21.05•••[Backport release-21.05] blueman: 2.1.4 -> 2.2.1Domen Kožar2021-06-251-14/+2
|\
| * blueman: 2.1.4 -> 2.2.1•••(cherry picked from commit 1bb478f5be6f707fd0b2491eef26a4e3e7e99893) Domen Kožar2021-06-251-14/+2
|/
* Merge pull request #128100 from NixOS/backport-128091-to-release-21.05•••[Backport release-21.05] signal-desktop: 5.6.1 -> 5.6.2Michael Weiss2021-06-251-2/+2
|\
| * signal-desktop: 5.6.1 -> 5.6.2•••(cherry picked from commit 07fdb0c37551c5549bff1cfc57b7bda55b718d30) Michael Weiss2021-06-251-2/+2
|/
* Merge pull request #126743 from etu/backport-21.05-php-extensions-updates•••[Backport 21.05] php.extensions: Updates to multiple extensionsElis Hirwing2021-06-2510-38/+21
|\
| * php.extensions.swoole: 4.6.4 -> 4.6.7•••(cherry picked from commit 2fc95948446d0b3ef0284956fc62b9e968dc9376) Elis Hirwing2021-06-131-2/+2
| * php.extensions.maxminddb: 1.10.0 -> 1.10.1•••(cherry picked from commit 9e12aefc411d846b1fe2d909dff08d28bf24b5ee) Elis Hirwing2021-06-131-2/+2
| * php.extensions.event: 3.0.2 -> 3.0.4•••(cherry picked from commit b169c6d5e8338b7d9ed4f2dc7bc83c7d5c184b7b) Elis Hirwing2021-06-131-2/+2
| * php.extensions.ast: 1.0.10 -> 1.0.12•••(cherry picked from commit c082df8e6284b668b2e19bb40e69d782f14afc7a) Elis Hirwing2021-06-131-2/+2
| * php.extensions.igbinary: 3.2.1 -> 3.2.2•••(cherry picked from commit 8307e75f8056e72b89ee444bf20399982cbf3c76) Elis Hirwing2021-06-131-2/+2
| * php.extensions.mongodb: 1.9.0 -> 1.9.1•••(cherry picked from commit 06ea32f7bf0153575fb03519c38a0bd9151c7e38) Elis Hirwing2021-06-131-2/+2
| * php.extensions.pcov: 1.0.8 -> 1.0.9•••(cherry picked from commit 8a5d4b63280a8e08589c676a108fe1fd64885c0a) Elis Hirwing2021-06-131-2/+2
| * php.extensions.protobuf: 3.14.0 -> 3.17.2•••(cherry picked from commit c79d977ca15016d3aafab6633b178ad042e696c2) Elis Hirwing2021-06-131-20/+3
| * php.extensions.redis: 5.3.3 -> 5.3.4•••(cherry picked from commit 867a4d38d709853595f8472179df5c781b5d3135) Elis Hirwing2021-06-131-2/+2
| * php.extensions.xdebug: 3.0.3 -> 3.0.4•••(cherry picked from commit a4e774d3b066572b5e76055d04dd1e9ca5cee651) Elis Hirwing2021-06-131-2/+2
* | consul: 1.9.6 -> 1.9.7•••(cherry picked from commit 0fdfa3172d6918124370af8dc3fc394bc8b7dbdd) Maxine Aubrey2021-06-241-3/+3
* | consul: 1.9.5 -> 1.9.6•••(cherry picked from commit 35ea60a0ff7e1c1a1bc7bc10515ce22c35c88ad8) R. RyanTM2021-06-241-3/+3
* | zfs: 2.0.4 -> 2.0.5•••https://github.com/openzfs/zfs/releases/tag/zfs-2.0.5 (cherry picked from commit ec8dbc11aac4b4d7f6e9c8329952bd03dbfc98bf) Robert Schütz2021-06-241-3/+3
* | Merge pull request #128045 from NixOS/backport-128025-to-release-21.05•••[Backport release-21.05] stellarium: 0.21.0 -> 0.21.1Maximilian Bosch2021-06-241-2/+2
|\ \
| * | stellarium: 0.21.0 -> 0.21.1•••ChangeLog: https://github.com/Stellarium/stellarium/releases/tag/v0.21.1 (cherry picked from commit ea56e08d624bdfdf271d9ee8deaa5a06d010ea24) Maximilian Bosch2021-06-241-2/+2
|/ /
* | entr: fix segfault on darwin•••(cherry picked from commit 23e36778a13ca70c16535fbbd47590ec4205178d) Mario Rodas2021-06-241-1/+11
* | Merge pull request #127928 from Ma27/bump-grafana-7-21.05•••[21.05] grafana: 7.5.7 -> 7.5.9Sandro2021-06-241-4/+4
|\ \
| * | grafana: 7.5.7 -> 7.5.9•••ChangeLog: https://github.com/grafana/grafana/releases/tag/v7.5.8 ChangeLog: https://github.com/grafana/grafana/releases/tag/v7.5.9 While I don't think we should backport Grafana 8 to 21.05 without a good reason, it still makes sense to apply patch-updates of v7 here. Maximilian Bosch2021-06-231-4/+4
* | | Merge pull request #127992 from prusnak/electron-21.05Sandro2021-06-241-16/+16
|\ \ \
| * | | electron_12: 12.0.11 -> 12.0.12•••https://github.com/electron/electron/releases/tag/v12.0.12 (cherry picked from commit c1f9347282486be406bf0a226bba076dbaab5d69) TredwellGit2021-06-241-8/+8
| * | | electron_11: 11.4.8 -> 11.4.9•••https://github.com/electron/electron/releases/tag/v11.4.9 (cherry picked from commit 942f13fb873b1ad5ac6de464133b6b5f2b12be49) TredwellGit2021-06-241-8/+8
* | | | Merge pull request #127877 from NixOS/backport-126014-to-release-21.05•••[Backport release-21.05] all Jetbrains products: update to latest versionJörg Thalheim2021-06-242-13/+14
|\ \ \ \ | |/ / / |/| | |
| * | | all Jetbrains products: update to latest version•••clion: 2020.2.1 -> 2021.1.2 datagrip: 2020.2.2 -> 2021.1.2 goland: 2020.2.2 -> 2021.1.2 idea-community: 2020.2.1 -> 2021.1.2 idea-ultimate: 2020.2.1 -> 2021.1.2 mps: 2020.1.4 -> 2021.1 phpstorm: 2020.2.1 -> 2021.1.3 pycharm-community: 2020.2.1 -> 2021.1.2 pycharm-professional: 2020.2.1 -> 2021.1.2 rider: 2020.2.1 -> 2021.1.3 ruby-mine: 2020.2.1 -> 2021.1.2 webstorm: 2020.2.1 -> 2021.1.2 These updates have all been generated with the newly fixed update.pl script. The script update.pl, which gets the latest versions from upstream web server, has been failing for roughly half a year. It failed to handle the new url pattern of MPS. The script and the url pattern is updated to work with the latest version. The clion specific postFixup hook had to be adapted, because names of shared libraries changed. (cherry picked from commit 8593496928ebacc8d0779ff5706b8d511dbc0177) (cherry picked from commit a887b48e1d666ae2742bf86010aa1a1372b9ecbd) Jean-Marie Gaillourdet2021-06-232-13/+14
* | | | terraform-providers.grafana: Fix download URL.•••Apologies for the pushes straight to release without PR, I will follow the new workflow moving forward. Unfortunately my last push broke the package in a way that was invisible locally due to the source already being downloaded... A perfect example of why we should let ofborg build! Shea Levy2021-06-231-1/+2
* | | | terraform-providers.grafana: 1.10.0 -> 1.12.0•••Requires backport due to https://github.com/grafana/terraform-provider-grafana/issues/212 (cherry picked from commit 08931215f4574af3bf9bebdd1f87b9dd4baf2341) Shea Levy2021-06-231-3/+4
* | | | Merge pull request #127238 from NixOS/backport-126616-to-release-21.05•••[Backport release-21.05] pass: 1.7.3 -> 1.7.4Maximilian Bosch2021-06-234-153/+24
|\ \ \ \
| * | | | pass: 1.7.3 -> 1.7.4•••Mostly bug fixes, the following changes were required in the package: * set-correct-program-name-for-sleep.patch needed to be rebased, b08781e2a6e183986eb1c24f51cdeff879b7a6af partially implemented the changes done in this patch, so we don't need to touch password-store.sh anymore. * Remove wayland patch since it is part of the release now * Reworked assert logic wrt to x11-/wayland- and dmenuSupport: passmenu now supports wayland as well via dmenu-wayland. Sadly the choice of menu is not changeable, pending https://lists.zx2c4.com/pipermail/password-store/2021-January/004363.html * Rebased no-darwin-getopt.patch * Note that f.el is no longer required Reviews would be appreciated, I might've missed something. (cherry picked from commit 9b794eb21af842bda137bf9f1ecc95c2d2affc8c) sternenseemann2021-06-174-153/+24
* | | | | Merge pull request #127831 from NixOS/backport-127699-to-release-21.05•••[Backport release-21.05] element-{desktop,web}: 1.7.30 -> 1.7.31Maximilian Bosch2021-06-234-256/+248
|\ \ \ \ \
| * | | | | element-{desktop,web}: 1.7.30 -> 1.7.31•••https://github.com/vector-im/element-web/blob/v1.7.31/CHANGELOG.md https://github.com/vector-im/element-desktop/blob/v1.7.31/CHANGELOG.md (cherry picked from commit 3eb0354b76e858abe8dc757a9727f67e259a8613) TredwellGit2021-06-224-256/+248
* | | | | | Merge pull request #127366 from NixOS/backport-127340-to-release-21.05•••[Backport release-21.05] appgate-sdp: 5.4.0 -> 5.4.2Martin Weinelt2021-06-231-2/+2
|\ \ \ \ \ \
| * | | | | | appgate-sdp: 5.4.0 -> 5.4.2•••(cherry picked from commit 8c6c14f7a6fd81f1c6b66514aca8718ede68ee1a) R. RyanTM2021-06-181-2/+2
* | | | | | | Merge pull request #127939 from ryantm/backport-21.05-release-notes•••[backport 21.05] docs: nixos release notes to CommonMark (2105)Ryan Mulligan2021-06-234-1258/+1994
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | docs: nixos release notes to CommonMark (2105)•••docs: nixos release notes (revise code blocks) docs: nixos release notes (fix opt links outside of code blocks) docs: nixos release notes (fix opt links inside of code blocks) went fishing with: ```console rg -A1 \ --multiline \ --multiline-dotall \ '<programlisting>[^</programlisting>]+' \ | rg linkend ``` docs: nixos release notes (prettier) docs: nixos release notes (restore admonition from prettier destriction) docs: nixos release notes (recreate xml files) docs: nixos release notes (fix code block indentation) docs: nixos release notes (diff after converting with https://github.com/NixOS/nixpkgs/pull/127270) (cherry picked from commit 32c2dd304d5e1b2a48a0772f906d0cc86332992e) David Arnold2021-06-234-1258/+1994
|/ / / / / /
* | | | | | Merge pull request #127789 from fortuneteller2k/backport-xanmod•••[21.05] linux_xanmod: 5.12.5 -> 5.12.12Maximilian Bosch2021-06-231-20/+17
|\ \ \ \ \ \
| * | | | | | linux_xanmod: 5.12.5 -> 5.12.12•••(cherry picked from commit 4fa80ae13ab707bd11074cf18d6203f15d65f613) fortuneteller2k2021-06-221-20/+17
* | | | | | | Merge pull request #127772 from NixOS/backport-127428-to-release-21.05•••[Backport release-21.05] Kernels 2021-06-18Maximilian Bosch2021-06-237-17/+30
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | linux: fix regression in bridge VLAN configuration•••(cherry picked from commit 24a08441d52480cf3332a100e24fdf9b83a8351a) TredwellGit2021-06-222-0/+13
| * | | | | | linux/hardened/patches/5.4: 5.4.126-hardened1 -> 5.4.127-hardened1•••(cherry picked from commit df60fdef552ef8a1aaaf3b63a0e7941165a2e893) TredwellGit2021-06-221-3/+3