summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* signal-desktop: 5.18.0 -> 5.18.1•••(cherry picked from commit d98ed0520bbc858398e6385a22e3e1591ffebf62) origin/backport-140659-to-release-21.05Michael Weiss2021-10-051-2/+2
* 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) Alyssa Ross2021-10-051-4/+2
* Merge pull request #140656 from Ma27/mautrix-telegram-2105-evalSandro2021-10-051-1/+1
|\
| * mautrix-telegram: fix evalMaximilian Bosch2021-10-051-1/+1
|/
* Merge pull request #140633 from NixOS/backport-140592-to-release-21.05•••[Backport release-21.05] mautrix-telegram: add `prometheus-client` for metricsMaximilian Bosch2021-10-051-0/+1
|\
| * 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) Maximilian Bosch2021-10-051-0/+1
|/
* Merge pull request #140449 from michaeladler/backport-140203-to-release-21.05•••[21.05] brave: 1.25.68 -> 1.30.87Bobby Rong2021-10-051-3/+5
|\
| * brave: 1.25.68 -> 1.30.87•••this fixes many high-severity CVEs (cherry picked from commit b2f46b6e80c80953a64927bb9333cdef94ccbffe) Michael Adler2021-10-041-3/+5
* | Merge pull request #140491 from NixOS/backport-140482-to-release-21.05•••[Backport release-21.05] redis: 6.2.5 -> 6.2.6Mario Rodas2021-10-041-2/+2
|\ \
| * | redis: 6.2.5 -> 6.2.6•••https://github.com/redis/redis/releases/tag/6.2.6 (cherry picked from commit 6ea41eaabb48dd8401d0d30b85fb7004a615a320) Mario Rodas2021-10-041-2/+2
* | | Merge pull request #140518 from sternenseemann/hls-fix-stable•••[21.05] haskell-language-server: remove ghc8107 from the wrappermaralorn2021-10-042-2/+2
|\ \ \
| * | | 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. sternenseemann2021-10-042-2/+2
|/ / /
* | | Merge pull request #140507 from obsidiansystems/newlib-nano-21.05•••[backport release 21.05]: newlib: Add parameter for "nano" variantJohn Ericson2021-10-042-4/+29
|\ \ \
| * | | 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) John Ericson2021-10-041-1/+10
| * | | newlib: Add parameter for "nano" variantJohn Ericson2021-09-291-3/+19
* | | | gitlab: 14.3.1 -> 14.3.2•••(cherry picked from commit b00924518c5b580ffec242e4c7ee8521ce041ac7) Lara2021-10-044-11/+11
| |/ / |/| |
* | | Merge pull request #140454 from NixOS/backport-140133-to-release-21.05•••[Backport release-21.05] discourse: Make sure the notification email setting appliesKim Lindberger2021-10-042-0/+21
|\ \ \ | |_|/ |/| |
| * | 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) talyz2021-10-042-0/+21
|/ /
* | 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