Commit Graph

294117 Commits

Author SHA1 Message Date
Artturin 2fac4b6d00 nixos/gdm: disable the gdm services as it is redundant
and causes issues

(cherry picked from commit 47f6591706dcfb699b0e0d9f09a5a10648198d40)
2021-08-12 17:44:00 +00:00
TredwellGit 1cd2856e04 linux-rt_5_4: 5.4.129-rt61 -> 5.4.138-rt62
(cherry picked from commit 89a50ded986523e04028e8ebc1b12274c52ea96d)
2021-08-12 17:27:20 +00:00
TredwellGit 08b33c754d linux: 5.13.9 -> 5.13.10
(cherry picked from commit ff1408d8b0d0baadb5e61f93904b820d0232bbbb)
2021-08-12 17:27:20 +00:00
TredwellGit ad40c4059c linux: 4.4.279 -> 4.4.280
(cherry picked from commit 20ed07939ee194195f1b5ded634ae0bc7252dbf4)
2021-08-12 17:27:19 +00:00
Thomas Tuegel 7aa7a4dcae zoom-us: Do not apply screen scaling twice
(cherry picked from commit 445f8c544cb9216d09f04863e211115f3177fc1b)
2021-08-12 16:01:35 +00:00
Martin Weinelt ad6e733d63
Merge pull request #133613 from NixOS/backport-133571-to-release-21.05
[Backport release-21.05] firefox: fix enableOfficialBranding
2021-08-12 15:48:50 +02:00
Sean Buckley 8139ad25a3 firefox: fix enableOfficialBranding
(cherry picked from commit 92908738385789d50b9a1f863f977631de41e92b)
2021-08-12 11:04:07 +00:00
taku0 df5b7b3312 thunderbird-bin: 78.12.0 -> 78.13.0
(cherry picked from commit 676a38befc0d9162a8c9c35c3bd2372b89cf5678)
2021-08-12 06:40:08 +00:00
taku0 9d123427c9 thunderbird-bin: fix parameter of updateScript
(cherry picked from commit df5e0bb678875e1b10f2e2e59399630b2db2dc89)
2021-08-12 06:40:08 +00:00
taku0 a8de6d1fdc thunderbird: 78.12.0 -> 78.13.0
(cherry picked from commit 13a68b47c4d36d38b692b1f3ed6cf28bbdabd74f)
2021-08-12 06:40:07 +00:00
github-actions[bot] b6f18f52d2
Merge staging-next-21.05 into staging-21.05 2021-08-12 06:02:37 +00:00
github-actions[bot] 31e10ca1aa
Merge release-21.05 into staging-next-21.05 2021-08-12 06:02:06 +00:00
Artturi ae9890eb6a
Merge pull request #131926 from NixOS/backport-131609-to-staging-21.05
[Backport staging-21.05] aspell: fix buffer overflow in objstack
2021-08-12 05:01:36 +03:00
Artturi e14fad1ad5
Merge pull request #133526 from NixOS/backport-133286-to-release-21.05
[Backport release-21.05] linux_zen: 5.13.7 -> 5.13.9
2021-08-12 04:59:04 +03:00
Artturi 76f688cc39
Merge pull request #127360 from NixOS/backport-127335-to-release-21.05 2021-08-12 04:49:40 +03:00
Artturi 1f9945566e
Merge pull request #133524 from NixOS/backport-133502-to-release-21.05
[Backport release-21.05] fwupd: 1.5.7 -> 1.5.12
2021-08-12 04:47:28 +03:00
Artturi b684f30fd3
Merge pull request #133477 from NixOS/backport-133462-to-release-21.05
[Backport release-21.05] sparse: add perl to buildInputs
2021-08-12 04:44:55 +03:00
Artturi b6f76e22d7
Merge pull request #133564 from NixOS/backport-133528-to-release-21.05
[Backport release-21.05] libspf2: Fix CVE-2021-20314
2021-08-12 04:43:14 +03:00
Janne Heß 2fd6748972 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)
2021-08-12 00:43:36 +00:00
Johannes Arnold 8404ac09e7 nixos/xserver: fix a display-manager race condition
(cherry picked from commit 358ab44a457aba9b227764742badbf1882028676)
2021-08-12 00:40:15 +00:00
github-actions[bot] fd0652d86a
Merge staging-next-21.05 into staging-21.05 2021-08-12 00:03:19 +00:00
github-actions[bot] 275de75c6b
Merge release-21.05 into staging-next-21.05 2021-08-12 00:02:45 +00:00
Sandro 658f8be372
Merge pull request #133548 from angustrau/backport-maintainer 2021-08-11 23:52:18 +02:00
Angus Trau 27d72aa5fa maintainers: add angustrau 2021-08-12 07:21:13 +10:00
Aaron Andersen 8df67e7b59
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.0
2021-08-11 14:42:12 -04:00
github-actions[bot] 56c80ce384
Merge staging-next-21.05 into staging-21.05 2021-08-11 18:02:58 +00:00
github-actions[bot] af7ef2e741
Merge release-21.05 into staging-next-21.05 2021-08-11 18:02:24 +00:00
Roman Volosatovs 9485d3ab3b linux_zen: 5.13.7 -> 5.13.9
(cherry picked from commit a9bf9c44e516f1097cb3d13e62293bf14669560c)
2021-08-11 16:55:23 +00:00
Maxine Aubrey 2f24078a01 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)
2021-08-11 16:28:42 +00:00
Timothy DeHerrera 927ce1afc1
Merge pull request #133518 from NixOS/backport-133482-to-release-21.05
[Backport release-21.05] hydra-unstable: add missing perl deps
2021-08-11 09:46:16 -06:00
Timothy DeHerrera dca7265b6d
Merge pull request #133519 from NixOS/backport-132739-to-release-21.05
[Backport release-21.05] nixUnstable: 2.4pre20210707_02dd6bb -> 2.4pre20210802_47e96bb
2021-08-11 09:46:03 -06:00
happysalada e6591fd024 hydra-unstable: 2021-05-03 -> 2021-08-11
(cherry picked from commit 25722c43d12b2331676157ee5e9247f21c436000)
2021-08-11 15:35:11 +00:00
happysalada 1d182a795d nixUnstable: 2.4pre20210707_02dd6bb -> 2.4pre20210802_47e96bb
(cherry picked from commit f578589a2ba19a17f468dba84a7b2e14b91d3a6e)
2021-08-11 15:35:11 +00:00
Maximilian Bosch 8e23fff674 perlPackages: update newly introduced libraries for catalyst-prometheus to latest versions
* 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)
2021-08-11 15:35:06 +00:00
Maximilian Bosch 7742dc6e0e hydra-unstable: add missing perl deps
(cherry picked from commit 9c6dc5d264d8d9aa7b49ebc5664798a799d637ce)
2021-08-11 15:35:06 +00:00
Maximilian Bosch f251b6b264 perlPackages/CatalystPluginPrometheusTiny: init at 0.005
(cherry picked from commit c0bc42310bcb4ac798b889f073de9d61daf0187e)
2021-08-11 15:35:05 +00:00
sternenseemann f6551e1efa 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.
2021-08-11 15:43:58 +02:00
Aaron Andersen cc07aecb10 apacheHttpdPackages.mod_auth_mellon: 0.17.0 -> 0.18.0
(cherry picked from commit 3f4692120b6b6285f147c6adb431ea39b9020dad)
2021-08-11 13:35:20 +00:00
github-actions[bot] 40bd2e2f24
Merge staging-next-21.05 into staging-21.05 2021-08-11 12:02:49 +00:00
github-actions[bot] d67e6cf39a
Merge release-21.05 into staging-next-21.05 2021-08-11 12:02:14 +00:00
Niklas Hambüchen 2da6605a52
Merge pull request #133468 from rski/release-21.05
CONTRIBUTING.md: Move to repo root, where it is more visible.
2021-08-11 14:01:51 +02:00
Emil Karlson 8ad9b064fd 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)
2021-08-11 08:13:43 +00:00
Niklas Hambüchen d76b42c680 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
2021-08-11 09:42:10 +03:00
github-actions[bot] 87eac968ec
Merge staging-next-21.05 into staging-21.05 2021-08-10 18:03:15 +00:00
github-actions[bot] 28cf122744
Merge release-21.05 into staging-next-21.05 2021-08-10 18:02:38 +00:00
Martin Weinelt 2d6ab6c6b9
Merge pull request #133390 from NixOS/backport-133388-to-release-21.05 2021-08-10 17:01:02 +02:00
Vladimír Čunát 5cd415124f 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)
2021-08-10 14:34:09 +00:00
Martin Weinelt ca4d6bc0e1
Merge pull request #133367 from NixOS/backport-133216-to-release-21.05
[Backport release-21.05] gpsd: 3.22 -> 3.23
2021-08-10 15:04:03 +02:00
TredwellGit 0701d20ed9
electron_12: 12.0.15 -> 12.0.16
https://github.com/electron/electron/releases/tag/v12.0.16
(cherry picked from commit 4f7a4bd0fe213f3f4baa6c1dafeb55b3f26e339f)
2021-08-10 13:45:34 +01:00
TredwellGit 821a567bf8
electron_11: 11.4.10 -> 11.4.11
https://github.com/electron/electron/releases/tag/v11.4.11
(cherry picked from commit 79744f0ea04aff8d206e9312da2e4a24fd83f3c3)
2021-08-10 13:44:52 +01:00