Commit Graph
295173 Commits
Author SHA1 Message Date
Michael Weiss 4600fc24a2 signal-desktop: 5.18.1 -> 5.19.0
(cherry picked from commit b9bc0b9480b619d3d41cd0ad38d0850ccd3294ae)
2021-10-06 19:07:32 +00:00
Michael Weiss 36a05ec28e Merge pull request #140680 from NixOS/backport-140659-to-release-21.05
[Backport release-21.05] signal-desktop: 5.18.0 -> 5.18.1
2021-10-06 19:15:06 +02:00
Vladimír Čunát e81d8c1fdc Merge branch 'staging-next-21.05' into release-21.05 2021-10-06 18:36:09 +02:00
Martin Weinelt 980a9792cd Merge pull request #140653 from alyssais/firefox-bin-21.05 2021-10-06 14:55:29 +02:00
github-actions[bot] abc23b9979 Merge release-21.05 into staging-next-21.05 2021-10-06 12:03:51 +00:00
Aaron Andersen 6bef9f9f85 Merge pull request #140631 from NixOS/backport-140606-to-release-21.05
[Backport release-21.05] apacheHttpd: 2.4.49 -> 2.4.50
2021-10-06 05:52:41 -04:00
github-actions[bot] 511690c873 Merge release-21.05 into staging-next-21.05 2021-10-06 00:02:54 +00:00
Michael Weiss 991271a13e signal-desktop: 5.18.0 -> 5.18.1
(cherry picked from commit d98ed0520bbc858398e6385a22e3e1591ffebf62)
2021-10-05 20:57:06 +00:00
Alyssa Ross a73053ed88 firefox-bin: fix license
The Mozilla Trademark Policy is not a license, and applies equally to
our own source builds of Firefox, so it doesn't make sense to mark the
package as unfree because of that.

Quoting <about:license>:

> Binaries of this product have been made available to you by the
> Mozilla Project under the Mozilla Public License 2.0 (MPL).

Since all this does is download a large binary and wrap it, there's
still no point in it ending up in cache.nixos.org, so disable it on
Hydra now that Hydra would otherwise try to build it.

(cherry picked from commit 6a71c7eb1acc70e5cc023dc7e1c9d1a144b9ca82)
2021-10-05 20:02:37 +00:00
Sandro 16de7c2931 Merge pull request #140656 from Ma27/mautrix-telegram-2105-eval 2021-10-05 20:13:55 +02:00
Maximilian Bosch 3100e48e86 mautrix-telegram: fix eval 2021-10-05 20:07:02 +02:00
github-actions[bot] 77d8348f02 Merge release-21.05 into staging-next-21.05 2021-10-05 18:02:33 +00:00
Alyssa Ross 9177707228 firefox-bin: 92.0 -> 92.0.1
(cherry picked from commit b256715457b6078d729c64bf91596f808a67e28e)
2021-10-05 17:52:04 +00:00
Tim Steinbach da7dc9f0fe firefox-bin-unwrapped: 91.0.2 -> 92.0
(cherry picked from commit 0247d6f9228789ee440d89ac60c3dd81d80e64c6)
2021-10-05 17:51:02 +00:00
Maximilian Bosch 4f7121d8d0 Merge pull request #140633 from NixOS/backport-140592-to-release-21.05
[Backport release-21.05] mautrix-telegram: add `prometheus-client` for metrics
2021-10-05 17:41:28 +02:00
Maximilian Bosch e484541615 mautrix-telegram: add prometheus-client for metrics
With this change I can do

    metrics:
        enabled: true
        listen_port: 8080

and retrieve metrics from `localhost:8080` for the telegram bridge.

(cherry picked from commit 9f9e32238b200716a622bd743e6859495aa83db1)
2021-10-05 15:38:32 +00:00
Aaron Andersen 7c8412bccc apacheHttpd: 2.4.49 -> 2.4.50
(cherry picked from commit b17c155720092dd04a2be0d096f43dae8c80d46f)
2021-10-05 15:34:06 +00:00
github-actions[bot] c031c9869f Merge staging-next-21.05 into staging-21.05 2021-10-05 12:02:52 +00:00
github-actions[bot] 4c04a989b3 Merge release-21.05 into staging-next-21.05 2021-10-05 12:02:15 +00:00
Bobby Rong aff647e270 Merge pull request #140449 from michaeladler/backport-140203-to-release-21.05
[21.05] brave: 1.25.68 -> 1.30.87
2021-10-05 16:29:02 +08:00
github-actions[bot] 97c6ed64eb Merge staging-next-21.05 into staging-21.05 2021-10-05 00:03:31 +00:00
github-actions[bot] 7d0d1045a0 Merge release-21.05 into staging-next-21.05 2021-10-05 00:02:51 +00:00
Mario Rodas 89c71aa978 Merge pull request #140491 from NixOS/backport-140482-to-release-21.05
[Backport release-21.05] redis: 6.2.5 -> 6.2.6
2021-10-04 18:26:10 -05:00
maralorn 9590b4283d Merge pull request #140518 from sternenseemann/hls-fix-stable
[21.05] haskell-language-server: remove ghc8107 from the wrapper
2021-10-04 22:02:08 +02:00
sternenseemann 849fed9f96 haskell-language-server: remove ghc8107 from the wrapper
GHC 8.10.7 is only in 21.05 for bootstrapping GHCJS, so it shouldn't be
included in the hls wrapper. This change was a result of an overeager
backport and we'll revert it here.

Also rollback some unnecessary change to release-haskell.nix, so it can
be used for testing evaluation still.
2021-10-04 21:31:30 +02:00
John Ericson 6314733b4e Merge pull request #140507 from obsidiansystems/newlib-nano-21.05
[backport release 21.05]: newlib: Add parameter for "nano" variant
2021-10-04 15:21:22 -04:00
Lara 6d0ceff09d gitlab: 14.3.1 -> 14.3.2
(cherry picked from commit b00924518c5b580ffec242e4c7ee8521ce041ac7)
2021-10-04 20:55:06 +02:00
John Ericson 92162ff87f newlib-nano: Init
This ensures CI tests the nano variant. It also makes it easier to use
with `libc = "newlib-nano";` in a platform description.

(cherry picked from commit e3ff6189f6aa641e108876de32ad83a542259b60)
2021-10-04 13:53:03 -04:00
Mario Rodas 4c4cc6f430 redis: 6.2.5 -> 6.2.6
https://github.com/redis/redis/releases/tag/6.2.6
(cherry picked from commit 6ea41eaabb48dd8401d0d30b85fb7004a615a320)
2021-10-04 14:52:52 +00:00
github-actions[bot] 7d30fb1ad9 Merge staging-next-21.05 into staging-21.05 2021-10-04 12:03:11 +00:00
github-actions[bot] 905a205f48 Merge release-21.05 into staging-next-21.05 2021-10-04 12:02:33 +00:00
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