summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* signal-desktop: 5.12.2 -> 5.13.0•••(cherry picked from commit 31a187510673af588984b5f2a4591e34ce7cfc64) origin/backport-133678-to-release-21.05Michael Weiss2021-08-121-2/+2
* Merge pull request #133563 from NixOS/backport-133204-to-release-21.05•••[Backport release-21.05] nixos/xserver: fix a display-manager race conditionArtturi2021-08-131-1/+1
|\
| * nixos/xserver: fix a display-manager race condition•••(cherry picked from commit 358ab44a457aba9b227764742badbf1882028676) origin/backport-133204-to-release-21.05Johannes Arnold2021-08-121-1/+1
* | Merge pull request #133642 from NixOS/backport-133304-to-release-21.05•••[Backport release-21.05] nixos/gdm: disable the gdm services as it is redundantArtturi2021-08-131-0/+5
|\ \
| * | nixos/gdm: disable the gdm services as it is redundant•••and causes issues (cherry picked from commit 47f6591706dcfb699b0e0d9f09a5a10648198d40) Artturin2021-08-121-0/+5
* | | Merge pull request #133171 from NixOS/backport-127493-to-release-21.05•••[Backport release-21.05] gnomeExtensions.gsconnect: 46 -> 47Artturi2021-08-131-2/+2
|\ \ \
| * | | gnomeExtensions.gsconnect: 46 -> 47•••(cherry picked from commit 3cd3aa74ba1955fb100c4f93c7032aa4cd8ef4cd) origin/backport-127493-to-release-21.05R. RyanTM2021-08-081-2/+2
* | | | Merge pull request #133590 from NixOS/backport-133456-to-release-21.05Artturi2021-08-123-268/+268
|\ \ \ \
| * | | | thunderbird-bin: 78.12.0 -> 78.13.0•••(cherry picked from commit 676a38befc0d9162a8c9c35c3bd2372b89cf5678) origin/backport-133456-to-release-21.05taku02021-08-121-265/+265
| * | | | thunderbird-bin: fix parameter of updateScript•••(cherry picked from commit df5e0bb678875e1b10f2e2e59399630b2db2dc89) taku02021-08-121-1/+1
| * | | | thunderbird: 78.12.0 -> 78.13.0•••(cherry picked from commit 13a68b47c4d36d38b692b1f3ed6cf28bbdabd74f) taku02021-08-121-2/+2
* | | | | Merge pull request #133630 from NixOS/backport-133398-to-release-21.05•••[Backport release-21.05] zoom-us: Do not apply screen scaling twiceArtturi2021-08-121-2/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | zoom-us: Do not apply screen scaling twice•••(cherry picked from commit 445f8c544cb9216d09f04863e211115f3177fc1b) Thomas Tuegel2021-08-121-2/+3
|/ / / /
* | | | Merge pull request #133613 from NixOS/backport-133571-to-release-21.05•••[Backport release-21.05] firefox: fix enableOfficialBrandingMartin Weinelt2021-08-121-6/+5
|\ \ \ \ | |/ / / |/| | |
| * | | firefox: fix enableOfficialBranding•••(cherry picked from commit 92908738385789d50b9a1f863f977631de41e92b) origin/backport-133571-to-release-21.05Sean Buckley2021-08-121-6/+5
|/ / /
* | | Merge pull request #133526 from NixOS/backport-133286-to-release-21.05•••[Backport release-21.05] linux_zen: 5.13.7 -> 5.13.9Artturi2021-08-121-2/+2
|\ \ \
| * | | linux_zen: 5.13.7 -> 5.13.9•••(cherry picked from commit a9bf9c44e516f1097cb3d13e62293bf14669560c) Roman Volosatovs2021-08-111-2/+2
* | | | Merge pull request #127360 from NixOS/backport-127335-to-release-21.05Artturi2021-08-122-5/+23
|\ \ \ \
| * | | | bluejeans: 2.21.3.2 -> 2.22.0.87•••(cherry picked from commit 3601c66133d63a213e5c43c4956585c0fb90c2da) origin/backport-127335-to-release-21.05Yurii Matsiuk2021-06-181-2/+2
| * | | | bluejeans: add update script•••(cherry picked from commit ba379085a0c36a853979a4bdc0b42b0482318276) Yurii Matsiuk2021-06-182-4/+22
* | | | | Merge pull request #133524 from NixOS/backport-133502-to-release-21.05•••[Backport release-21.05] fwupd: 1.5.7 -> 1.5.12Artturi2021-08-121-3/+2
|\ \ \ \ \
| * | | | | fwupd: 1.5.7 -> 1.5.12•••- https://github.com/fwupd/fwupd/releases/tag/1.5.8 - https://github.com/fwupd/fwupd/releases/tag/1.5.9 - https://github.com/fwupd/fwupd/releases/tag/1.5.10 - https://github.com/fwupd/fwupd/releases/tag/1.5.11 - https://github.com/fwupd/fwupd/releases/tag/1.5.12 (cherry picked from commit 2f3e3c788e071ec3c8b3b7e743f07b453248803e) Maxine Aubrey2021-08-111-3/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #133477 from NixOS/backport-133462-to-release-21.05•••[Backport release-21.05] sparse: add perl to buildInputsArtturi2021-08-121-2/+2
|\ \ \ \ \
| * | | | | sparse: add perl to buildInputs•••cgcc command has shebang of /usr/bin/perl, which obviously does not work for nixos, adding perl to buildInputs seems to make all the magic happen, as per usual. (cherry picked from commit e7836bc5a5a2a2257afd515e3e221c8ff5d67b97) Emil Karlson2021-08-111-2/+2
* | | | | | Merge pull request #133564 from NixOS/backport-133528-to-release-21.05•••[Backport release-21.05] libspf2: Fix CVE-2021-20314Artturi2021-08-121-0/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | libspf2: Fix CVE-2021-20314•••There is no new release yet (see mailing list post on oss-security), so I'm picking the commit that fixes the CVE. There is another security flaw (without a CVE number) that is also mentioned in the oss-security announcement but it is not explained which commit patches the problem. (cherry picked from commit 46b7a5be1ced0280951d1a5736b0316de92a53f2) Janne Heß2021-08-121-0/+5
|/ / / / /
* | | | | Merge pull request #133548 from angustrau/backport-maintainerSandro2021-08-111-0/+6
|\ \ \ \ \
| * | | | | maintainers: add angustrauAngus Trau2021-08-121-0/+6
|/ / / / /
* | | | | Merge pull request #133506 from NixOS/backport-133499-to-release-21.05•••[Backport release-21.05] apacheHttpdPackages.mod_auth_mellon: 0.17.0 -> 0.18.0Aaron Andersen2021-08-112-41/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | apacheHttpdPackages.mod_auth_mellon: 0.17.0 -> 0.18.0•••(cherry picked from commit 3f4692120b6b6285f147c6adb431ea39b9020dad) Aaron Andersen2021-08-112-41/+3
* | | | | Merge pull request #133518 from NixOS/backport-133482-to-release-21.05•••[Backport release-21.05] hydra-unstable: add missing perl depsTimothy DeHerrera2021-08-112-0/+76
|\ \ \ \ \
| * | | | | perlPackages: update newly introduced libraries for catalyst-prometheus to la...•••* CatalystPluginPrometheusTiny: 0.005 -> 0.006 * PrometheusTiny: 0.007 -> 0.008 * PrometheusTinyShared: 0.023 -> 0.024 Co-authored-by: Stig <stig@stig.io> (cherry picked from commit 94a5b4ecf73c942a5fd9ab547182cbb2f4aa4843) origin/backport-133482-to-release-21.05Maximilian Bosch2021-08-111-9/+9
| * | | | | hydra-unstable: add missing perl deps•••(cherry picked from commit 9c6dc5d264d8d9aa7b49ebc5664798a799d637ce) Maximilian Bosch2021-08-111-0/+2
| * | | | | perlPackages/CatalystPluginPrometheusTiny: init at 0.005•••(cherry picked from commit c0bc42310bcb4ac798b889f073de9d61daf0187e) Maximilian Bosch2021-08-111-0/+74
* | | | | | Merge pull request #133519 from NixOS/backport-132739-to-release-21.05•••[Backport release-21.05] nixUnstable: 2.4pre20210707_02dd6bb -> 2.4pre20210802_47e96bb Timothy DeHerrera2021-08-112-6/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | hydra-unstable: 2021-05-03 -> 2021-08-11•••(cherry picked from commit 25722c43d12b2331676157ee5e9247f21c436000) origin/backport-132739-to-release-21.05happysalada2021-08-111-3/+3
| * | | | | nixUnstable: 2.4pre20210707_02dd6bb -> 2.4pre20210802_47e96bb•••(cherry picked from commit f578589a2ba19a17f468dba84a7b2e14b91d3a6e) happysalada2021-08-111-3/+3
|/ / / / /
* / / / / clojure: fix clj script•••At some point the clj script stopped just calling clojure, but instead $bin_dir/clojure. As a result we now need to additionally substitute BINDIR in the clj script. sternenseemann2021-08-111-0/+1
|/ / / /
* | | | Merge pull request #133468 from rski/release-21.05•••CONTRIBUTING.md: Move to repo root, where it is more visible.Niklas Hambüchen2021-08-113-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | CONTRIBUTING.md: Move to repo root, where it is more visible.•••We found that many users found it difficult to locate this document. Github supports it in the root, see: https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/setting-guidelines-for-repository-contributors (cherry picked from commit 3c29ced243cc032806f680ae67845b9b3a879183) This fixes the links on the nixos.org website, the stable branch docs point to master on github, so both master and the release branch need to have the file in the same location. fixes https://github.com/NixOS/nixos-homepage/issues/736 Niklas Hambüchen2021-08-113-3/+3
|/ / /
* | | Merge pull request #133390 from NixOS/backport-133388-to-release-21.05Martin Weinelt2021-08-101-0/+1
|\ \ \
| * | | nixos/tests: unbreak the tested job•••I expect it suffices that the channel only blocks on one firefox ESR test - the one for the default ESR. I didn't want to have the information about the default in two places, so either of the tests will be evaluated twice (but to the same *.drv I hope). (cherry picked from commit c0097aa84adb19a9e5d947487c118505faf98bc0) Vladimír Čunát2021-08-101-0/+1
|/ / /
* | | Merge pull request #133367 from NixOS/backport-133216-to-release-21.05•••[Backport release-21.05] gpsd: 3.22 -> 3.23Martin Weinelt2021-08-101-23/+55
|\ \ \
| * | | gpsd: 3.22 -> 3.23•••Clean up unnecessary dependencies, update license. Add todo to generate asciidoctor documentation. (cherry picked from commit 65db4268d056afefac988705bae2f65651b1f7c2) R. RyanTM2021-08-101-23/+55
|/ / /
* | | Merge #132834: go security bumps (into release-21.05)Vladimír Čunát2021-08-102-4/+4
|\ \ \
| * | | go_1_16: 1.16.6 -> 1.16.7•••(cherry picked from commit 869e4a894e7436441bdcb084846c60ae07a1dddd) zowoq2021-08-051-2/+2
| * | | go_1_15: 1.15.14 -> 1.15.15•••(cherry picked from commit 1d3f4cd77fd7ce68cc80f2dd33bd678a5633af93) zowoq2021-08-051-2/+2
* | | | Merge branch 'staging-next-21.05' into release-21.05•••https://hydra.nixos.org/eval/1694658 Vladimír Čunát2021-08-104-33/+62
|\ \ \ \
| * \ \ \ Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-08-107-406/+452
| |\ \ \ \
| | * \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-08-107-406/+452
| | |\ \ \ \