Commit Graph

295350 Commits

Author SHA1 Message Date
Kim Lindberger 751110a6f6
Merge pull request #140454 from NixOS/backport-140133-to-release-21.05
[Backport release-21.05] discourse: Make sure the notification email setting applies
2021-10-04 11:37:43 +02:00
talyz 1c5946027c discourse: Make sure the notification email setting applies
Discourse normally overrides the default notification email setting,
which makes the `notificationEmailAddress` setting ineffective. Add a
patch to remove this override.

Fixes #140114.

(cherry picked from commit 917a0cfe47bad420a894fe8ca35d7dd95ebb5a7c)
2021-10-04 08:03:15 +00:00
Michael Adler a3903d58c2 brave: 1.25.68 -> 1.30.87
this fixes many high-severity CVEs

(cherry picked from commit b2f46b6e80c80953a64927bb9333cdef94ccbffe)
2021-10-04 08:56:59 +02:00
github-actions[bot] d551e4d6c7
Merge staging-next-21.05 into staging-21.05 2021-10-04 06:03:05 +00:00
github-actions[bot] 2e93bc0a52
Merge release-21.05 into staging-next-21.05 2021-10-04 06:02:28 +00:00
Bobby Rong 2406a0b2b8
Merge pull request #140269 from NixOS/backport-140219-to-release-21.05
[Backport release-21.05] vscodium: 1.60.1 -> 1.60.2
2021-10-04 13:32:38 +08:00
github-actions[bot] dba3b2add4
Merge staging-next-21.05 into staging-21.05 2021-10-04 00:03:51 +00:00
github-actions[bot] 19307fbe2b
Merge release-21.05 into staging-next-21.05 2021-10-04 00:03:14 +00:00
Lara 8df64b01d9 gitlab: 14.2.4 -> 14.3.1
(cherry picked from commit fbd051169d315593042344b1b1b6438db91914ce)
2021-10-03 23:38:12 +02:00
ajs124 80c3715e2c
Merge pull request #140395 from NixOS/backport-140371-to-release-21.05
[Backport release-21.05] openssh_hpn/openssh_gssapi: Add CVE-2021-41617
2021-10-03 22:26:07 +02:00
github-actions[bot] 28796cd12c
Merge staging-next-21.05 into staging-21.05 2021-10-03 18:03:08 +00:00
github-actions[bot] 14d9fbcd6c
Merge release-21.05 into staging-next-21.05 2021-10-03 18:02:13 +00:00
Maximilian Bosch 9de38b8522
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.6
2021-10-03 19:55:46 +02:00
Sandro d550d4ebd5
Merge pull request #140391 from nlewo/foreman 2021-10-03 19:06:41 +02:00
Janne Heß eeb23319ec openssh_hpn/openssh_gssapi: Add CVE-2021-41617
(cherry picked from commit bc56346bcdeec61a13c0b44310b3236a2ef0e440)
2021-10-03 16:26:23 +00:00
Antoine Eiche cbc3b23cf0 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)
2021-10-03 17:38:08 +02:00
figsoda 7aa0a65b00
Merge pull request #140384 from NixOS/backport-139925-to-release-21.05
[Backport release-21.05] psi-notify: move systemd unit to $out/lib
2021-10-03 11:16:13 -04:00
Eduard Bachmakov 336da77eac 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)
2021-10-03 15:13:17 +00:00
José Romildo 7daf35532d 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)
2021-10-03 15:32:46 +02:00
github-actions[bot] 937e114200
Merge staging-next-21.05 into staging-21.05 2021-10-03 12:03:05 +00:00
github-actions[bot] 58ba3deac4
Merge release-21.05 into staging-next-21.05 2021-10-03 12:02:32 +00:00
Michael Weiss 7bc4490174
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.71
2021-10-03 13:50:59 +02:00
TredwellGit 13834caa45
electron_12: 12.1.2 -> 12.2.1
https://github.com/electron/electron/releases/tag/v12.2.0
https://github.com/electron/electron/releases/tag/v12.2.1
(cherry picked from commit 8ce19c9399370cb9c173af1b15bf970004946258)
2021-10-03 09:55:17 +02:00
github-actions[bot] 87ae26dcc8
Merge staging-next-21.05 into staging-21.05 2021-10-03 00:04:01 +00:00
github-actions[bot] 1b5f78eb1e
Merge release-21.05 into staging-next-21.05 2021-10-03 00:03:22 +00:00
Lassulus 966add9f99
Merge pull request #140084 from NixOS/backport-139931-to-release-21.05
[Backport release-21.05] exim: 4.94.2 -> 4.95
2021-10-03 01:07:55 +02:00
maxine [they] 8686a8f1f8
Merge pull request #138795 from NixOS/backport-138761-to-release-21.05
[Backport release-21.05] webkitgtk: 2.32.3 -> 2.32.4
2021-10-02 23:03:49 +02:00
github-actions[bot] f3cbc81608
[Backport release-21.05] analog: Fix substitution so it can find its language files (#140313)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Philippe Hürlimann <p@hurlimann.org>
Co-authored-by: Artturi <Artturin@artturin.com>
2021-10-02 23:24:44 +03:00
github-actions[bot] b7f5285467
Merge staging-next-21.05 into staging-21.05 2021-10-02 18:02:51 +00:00
github-actions[bot] ab96577bde
Merge release-21.05 into staging-next-21.05 2021-10-02 18:02:19 +00:00
Vladimír Čunát 400994665e
Merge #140243: Revert "fragments: init at 1.5"
...into release-21.05
2021-10-02 18:49:48 +02:00
Maximilian Bosch 520179f220
Merge pull request #140187 from Ma27/backport-php
[21.05] php: 7.4.23 -> 7.4.24, 8.0.10 -> 8.0.11
2021-10-02 14:07:58 +02:00
nixpkgs-upkeep-bot 87d735ca6b vscodium: 1.60.1 -> 1.60.2
(cherry picked from commit 4da83b53d92714a51e9211eec7059f32046ca154)
2021-10-02 12:05:14 +00:00
github-actions[bot] 7150f605ae
Merge staging-next-21.05 into staging-21.05 2021-10-02 12:02:45 +00:00
github-actions[bot] 3b675b8346
Merge release-21.05 into staging-next-21.05 2021-10-02 12:02:12 +00:00
Michael Weiss 438faef08c ungoogled-chromium: 94.0.4606.61 -> 94.0.4606.71
(cherry picked from commit 360707c5d67a16b26a881237024da3b9305f38aa)
2021-10-02 10:16:06 +00:00
Michael Weiss 0d47c5af6d
Merge pull request #140251 from NixOS/backport-140194-to-release-21.05
[Backport release-21.05] chromium: 94.0.4606.61 -> 94.0.4606.71
2021-10-02 12:11:23 +02:00
Maximilian Bosch 31dc6d3c50
Merge pull request #140215 from NixOS/backport-140110-to-release-21.05
[Backport release-21.05] Kernels 2021-09-30
2021-10-02 11:08:07 +02:00
Vladimír Čunát c3e1395498
Revert part of "Merge #140069: transmission: fixes ..."
This reverts commit ff12d52832, reversing
changes made to 92609f3d9b (partially).
2021-10-02 11:06:48 +02:00
Michael Weiss 670ee4d5b6 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)
2021-10-02 08:07:36 +00:00
Vladimír Čunát 7dc32438a8
Revert "[Backport release-21.05] fragments: init at 1.5" 2021-10-02 08:58:27 +02:00
github-actions[bot] 7b5bae994e
Merge staging-next-21.05 into staging-21.05 2021-10-02 00:09:53 +00:00
github-actions[bot] 9734485fcc
Merge release-21.05 into staging-next-21.05 2021-10-02 00:09:08 +00:00
TredwellGit 60ca87841f linux/hardened/patches/5.4: 5.4.149-hardened1 -> 5.4.150-hardened1
(cherry picked from commit 642ca73937decde097a6c83205f48a5ac081fe94)
2021-10-01 23:34:04 +00:00
TredwellGit 068683802e linux/hardened/patches/5.14: 5.14.8-hardened1 -> 5.14.9-hardened1
(cherry picked from commit dd93aec4c4905c17f17020658ed1f5858c9d6b81)
2021-10-01 23:34:04 +00:00
TredwellGit 925681abe4 linux/hardened/patches/5.10: 5.10.69-hardened1 -> 5.10.70-hardened1
(cherry picked from commit f178ff4a04c8d4e2ed43e6538a1aac336bfa891c)
2021-10-01 23:34:03 +00:00
TredwellGit 6f5e339c3d linux: 5.4.149 -> 5.4.150
(cherry picked from commit 6937daff0d376cfe33ec7945f768a66beaee0eaf)
2021-10-01 23:34:02 +00:00
TredwellGit c124a09c04 linux: 5.14.8 -> 5.14.9
(cherry picked from commit b540e8b5a9082f8150fb3de37e793bc5cef25388)
2021-10-01 23:34:01 +00:00
TredwellGit 433135b468 linux: 5.10.69 -> 5.10.70
(cherry picked from commit 8417ed79d87f44c35af2e698921988c6525eedb1)
2021-10-01 23:34:01 +00:00
Maximilian Bosch e134154396
Merge pull request #139662 from NixOS/backport-139658-to-release-21.05
[Backport release-21.05] Kernels 2021-09-27
2021-10-01 22:34:24 +02:00