summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* gitlab: 14.3.1 -> 14.3.2•••(cherry picked from commit b00924518c5b580ffec242e4c7ee8521ce041ac7) origin/backport-140437-to-release-21.05Lara2021-10-044-11/+11
* Merge pull request #140269 from NixOS/backport-140219-to-release-21.05•••[Backport release-21.05] vscodium: 1.60.1 -> 1.60.2Bobby Rong2021-10-041-5/+5
|\
| * vscodium: 1.60.1 -> 1.60.2•••(cherry picked from commit 4da83b53d92714a51e9211eec7059f32046ca154) nixpkgs-upkeep-bot2021-10-021-5/+5
* | gitlab: 14.2.4 -> 14.3.1•••(cherry picked from commit fbd051169d315593042344b1b1b6438db91914ce) Lara2021-10-0310-1203/+910
* | Merge pull request #140395 from NixOS/backport-140371-to-release-21.05•••[Backport release-21.05] openssh_hpn/openssh_gssapi: Add CVE-2021-41617ajs1242021-10-031-0/+2
|\ \
| * | openssh_hpn/openssh_gssapi: Add CVE-2021-41617•••(cherry picked from commit bc56346bcdeec61a13c0b44310b3236a2ef0e440) Janne Heß2021-10-031-0/+2
* | | Merge pull request #138803 from NixOS/backport-138020-to-release-21.05•••[Backport release-21.05] tor-browser-bundle-bin: 10.5.5 -> 10.5.6Maximilian Bosch2021-10-031-3/+3
|\ \ \
| * | | tor-browser-bundle-bin: 10.5.5 -> 10.5.6•••(cherry picked from commit 582e0a4926b435715cf4c2b339f458e8917c979f) origin/backport-138020-to-release-21.05FliegendeWurst2021-09-211-3/+3
* | | | Merge pull request #140391 from nlewo/foremanSandro2021-10-031-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | foreman: bundled with 2.1.4•••The version update has been cherrypicked from master where bundle has been updated to 2.2.20. It was then failing to run with: ./result/bin/foreman Warning: the running version of Bundler (2.1.4) is older than the version that created the lockfile (2.2.20). We suggest you to upgrade to the version that created the lockfile by running `gem install bundler:2.2.20`. Traceback (most recent call last): 2: from ./result/bin/foreman:20:in `<main>' 1: from /nix/store/ggqacj06n6qfm1iww0bih9ph0j89wcna-bundler-2.1.4/lib/ruby/gems/2.7.0/gems/bundler-2.1.4/lib/bundler/rubygems_integration.rb:413:in `block in replace_bin_path' /nix/store/ggqacj06n6qfm1iww0bih9ph0j89wcna-bundler-2.1.4/lib/ruby/gems/2.7.0/gems/bundler-2.1.4/lib/bundler/rubygems_integration.rb:374:in `block in replace_bin_path': can't find executable foreman for gem foreman. foreman is not currently included in the bundle, perhaps you meant to add it to your Gemfile? (Gem::Exception) Antoine Eiche2021-10-031-2/+2
|/ / /
* | | Merge pull request #140384 from NixOS/backport-139925-to-release-21.05•••[Backport release-21.05] psi-notify: move systemd unit to $out/libfigsoda2021-10-031-1/+1
|\ \ \
| * | | psi-notify: move systemd unit to $out/lib•••In $out/share it is NOT picked up into /etc/systemd/... when psi-notify is added to configuration.systemd.packages . (Originally put in $out/share b/c a hook copies from $out/lib into there ... so why not just put there? This is why.) (cherry picked from commit a774af3605a86719f813ccb80e9f8a5bdef2ee0a) Eduard Bachmakov2021-10-031-1/+1
|/ / /
* | | xfce.xfce4-notifyd: enable starting the daemon via DBus•••Start daemon via DBus instead of regular session autostart (which is the default) (cherry picked from commit b81ba2e9195c5959ced35ffa0857ffedf2a1df7c) José Romildo2021-10-031-2/+6
* | | Merge pull request #140262 from NixOS/backport-140195-to-release-21.05•••[Backport release-21.05] ungoogled-chromium: 94.0.4606.61 -> 94.0.4606.71Michael Weiss2021-10-031-5/+5
|\ \ \
| * | | ungoogled-chromium: 94.0.4606.61 -> 94.0.4606.71•••(cherry picked from commit 360707c5d67a16b26a881237024da3b9305f38aa) origin/backport-140195-to-release-21.05Michael Weiss2021-10-021-5/+5
| | |/ | |/|
* | | Merge pull request #140084 from NixOS/backport-139931-to-release-21.05•••[Backport release-21.05] exim: 4.94.2 -> 4.95Lassulus2021-10-031-2/+2
|\ \ \
| * | | exim: 4.94.2 -> 4.95•••(cherry picked from commit cc9e7f0b047cbf2d9928edc387754c0bccfc525c) ajs1242021-09-301-2/+2
* | | | Merge pull request #138795 from NixOS/backport-138761-to-release-21.05•••[Backport release-21.05] webkitgtk: 2.32.3 -> 2.32.4maxine [they]2021-10-021-2/+2
|\ \ \ \
| * | | | webkitgtk: 2.32.3 -> 2.32.4•••https://webkitgtk.org/security/WSA-2021-0005.html (cherry picked from commit 7e7a4021e87fd18b575864ad1d539825d5e4787d) origin/backport-138761-to-release-21.05ajs1242021-09-211-2/+2
* | | | | [Backport release-21.05] analog: Fix substitution so it can find its language...•••Co-authored-by: Sandro <sandro.jaeckel@gmail.com> Co-authored-by: Philippe Hürlimann <p@hurlimann.org> Co-authored-by: Artturi <Artturin@artturin.com>github-actions[bot]2021-10-021-1/+1
* | | | | Merge #140243: Revert "fragments: init at 1.5"•••...into release-21.05 Vladimír Čunát2021-10-026-169/+2
|\ \ \ \ \
| * | | | | Revert part of "Merge #140069: transmission: fixes ..."•••This reverts commit ff12d5283210f1879053725cfba37f892db40e55, reversing changes made to 92609f3d9bc3acffbdbe54fa1c591a885612aa73 (partially). Vladimír Čunát2021-10-021-1/+1
| * | | | | Revert "[Backport release-21.05] fragments: init at 1.5"Vladimír Čunát2021-10-026-168/+1
* | | | | | Merge pull request #140187 from Ma27/backport-php•••[21.05] php: 7.4.23 -> 7.4.24, 8.0.10 -> 8.0.11Maximilian Bosch2021-10-022-4/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | php80: 8.0.10 -> 8.0.11•••ChangeLog: https://www.php.net/ChangeLog-8.php#8.0.11 (cherry picked from commit 6b9eefb85f59c6d0d91b26180c9e1a2b42cb9f7f) Maximilian Bosch2021-10-011-2/+2
| * | | | | php74: 7.4.23 -> 7.4.24•••ChangeLog: https://www.php.net/ChangeLog-7.php#7.4.24 (cherry picked from commit 13d37ebb64a5e314aad5895c98da886b64886d25) Maximilian Bosch2021-10-011-2/+3
* | | | | | Merge pull request #140251 from NixOS/backport-140194-to-release-21.05•••[Backport release-21.05] chromium: 94.0.4606.61 -> 94.0.4606.71Michael Weiss2021-10-021-6/+6
|\ \ \ \ \ \
| * | | | | | chromium: 94.0.4606.61 -> 94.0.4606.71•••https://chromereleases.googleblog.com/2021/09/stable-channel-update-for-desktop_30.html This update includes 4 security fixes. Google is aware the exploits for CVE-2021-37975 and CVE-2021-37976 exist in the wild. CVEs: CVE-2021-37974 CVE-2021-37975 CVE-2021-37976 (cherry picked from commit ce50eda3949fa3149aea4f0f556dbb63f48e4288) origin/backport-140194-to-release-21.05Michael Weiss2021-10-021-6/+6
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #140215 from NixOS/backport-140110-to-release-21.05•••[Backport release-21.05] Kernels 2021-09-30Maximilian Bosch2021-10-024-15/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | linux/hardened/patches/5.4: 5.4.149-hardened1 -> 5.4.150-hardened1•••(cherry picked from commit 642ca73937decde097a6c83205f48a5ac081fe94) TredwellGit2021-10-011-3/+3
| * | | | | linux/hardened/patches/5.14: 5.14.8-hardened1 -> 5.14.9-hardened1•••(cherry picked from commit dd93aec4c4905c17f17020658ed1f5858c9d6b81) TredwellGit2021-10-011-3/+3
| * | | | | linux/hardened/patches/5.10: 5.10.69-hardened1 -> 5.10.70-hardened1•••(cherry picked from commit f178ff4a04c8d4e2ed43e6538a1aac336bfa891c) TredwellGit2021-10-011-3/+3
| * | | | | linux: 5.4.149 -> 5.4.150•••(cherry picked from commit 6937daff0d376cfe33ec7945f768a66beaee0eaf) TredwellGit2021-10-011-2/+2
| * | | | | linux: 5.14.8 -> 5.14.9•••(cherry picked from commit b540e8b5a9082f8150fb3de37e793bc5cef25388) TredwellGit2021-10-011-2/+2
| * | | | | linux: 5.10.69 -> 5.10.70•••(cherry picked from commit 8417ed79d87f44c35af2e698921988c6525eedb1) TredwellGit2021-10-011-2/+2
|/ / / / /
* | | | | Merge pull request #139662 from NixOS/backport-139658-to-release-21.05•••[Backport release-21.05] Kernels 2021-09-27Maximilian Bosch2021-10-011-15/+15
|\ \ \ \ \
| * | | | | linux/hardened/patches/5.4: 5.4.148-hardened1 -> 5.4.149-hardened1•••(cherry picked from commit a92a208a9d8eaba19a5d985f567387adea455687) TredwellGit2021-09-271-3/+3
| * | | | | linux/hardened/patches/5.14: 5.14.7-hardened1 -> 5.14.8-hardened1•••(cherry picked from commit 05ed561fb6de4fce668d5c5d1c2c7ae18ab8aff5) TredwellGit2021-09-271-3/+3
| * | | | | linux/hardened/patches/5.10: 5.10.68-hardened1 -> 5.10.69-hardened1•••(cherry picked from commit c4ea02fc5c468ebd06f9575eb764ad4d08c8fdd6) TredwellGit2021-09-271-3/+3
| * | | | | linux/hardened/patches/4.19: 4.19.207-hardened1 -> 4.19.208-hardened1•••(cherry picked from commit 9e78068b041dfebbac36958d6745bc3ef2415d5d) TredwellGit2021-09-271-3/+3
| * | | | | linux/hardened/patches/4.14: 4.14.247-hardened1 -> 4.14.248-hardened1•••(cherry picked from commit 1e05c4eae9ec704b7057dcec87cf5007d6a081ac) TredwellGit2021-09-271-3/+3
* | | | | | Merge pull request #140188 from NixOS/backport-140159-to-release-21.05•••[Backport release-21.05] nextcloud: misc changesMaximilian Bosch2021-10-015-12/+45
|\ \ \ \ \ \
| * | | | | | nixos/nextcloud: run tests against each Nextcloud instance•••(cherry picked from commit 10703a8c926e182311cdf538937517db33f4261c) Maximilian Bosch2021-10-014-11/+32
| * | | | | | nixos/nextcloud: use php8 where possible•••(cherry picked from commit 66edc1e84625ed5b4bed5868f4093a570a822c2e) Maximilian Bosch2021-10-011-1/+13
|/ / / / / /
* | | | | | Merge pull request #140183 from NixOS/backport-140172-to-release-21.05•••[Backport release-21.05] rxvt-unicode: fix terminfo pathMichele Guerini Rocco2021-10-011-1/+1
|\ \ \ \ \ \
| * | | | | | rxvt-unicode: fix terminfo path•••(cherry picked from commit 937f349b5f6ed47591fc373017175efb9cf4d13e) Artturin2021-10-011-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #139522 from NixOS/backport-136079-to-release-21.05•••[Backport release-21.05] libaom: disable NEON on armv7lGuillaume Girol2021-10-011-0/+4
|\ \ \ \ \ \
| * | | | | | libaom: disable NEON on armv7l•••(cherry picked from commit b7066a57deb8bb3f13ab7f2ef5e389c0559edac0) origin/backport-136079-to-release-21.05Kranium Gikos Mendoza2021-09-261-0/+4
* | | | | | | Merge pull request #140181 from yayayayaka/backport-140089-to-release-21.05•••[Backport release-21.05] nextcloud: 20.0.12 -> 20.0.13, 21.0.4 -> 21.0.5, 22.1.1 -> 22.2.0Maximilian Bosch2021-10-013-7/+41
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | nixos/nextcloud: temp fix for MariaDB >=10.6•••The MariaDB version 10.6 doesn't seem supported with current Nextcloud versions and the test fails with the following error[1]: nextcloud # [ 14.950034] nextcloud-setup-start[1001]: Error while trying to initialise the database: An exception occurred while executing a query: SQLSTATE[HY000]: General error: 4047 InnoDB refuses to write tables with ROW_FORMAT=COMPRESSED or KEY_BLOCK_SIZE. According to a support-thread in upstream's Discourse[2] this is because of a missing support so far. Considering that we haven't received any bugreports so far - even though the issue already exists on master - and the workaround[3] appears to work fine, an evaluation warning for administrators should be sufficient. [1] https://hydra.nixos.org/build/155015223 [2] https://help.nextcloud.com/t/update-to-next-cloud-21-0-2-has-get-an-error/117028/15 [3] setting `innodb_read_only_compressed=0` (cherry picked from commit 675e262f5a03eb9aa6b0500434ee30a9d6b882a0) Maximilian Bosch2021-10-012-1/+35