293987 Commits

Author SHA1 Message Date
Marc Seeger
c752f9e15d [21.05] gtk3: replace bugzilla patch with local file. 2021-08-13 15:56:18 -07:00
github-actions[bot]
37c6e07f24
Merge staging-next-21.05 into staging-21.05 2021-08-13 18:03:01 +00:00
github-actions[bot]
502ca77191
Merge release-21.05 into staging-next-21.05 2021-08-13 18:02:26 +00:00
Artturi
a445f58298
Merge pull request #133654 from Artturin/backport-130515 2021-08-13 17:33:30 +03:00
github-actions[bot]
fd0ab00ca0
Merge staging-next-21.05 into staging-21.05 2021-08-13 12:03:03 +00:00
github-actions[bot]
aba2b21a65
Merge release-21.05 into staging-next-21.05 2021-08-13 12:02:30 +00:00
Michael Raskin
5ece35e8b4
Merge pull request #133748 from NixOS/backport-133619-to-release-21.05
[Backport release-21.05] liberation-circuit: init at 1.3
2021-08-13 11:47:18 +00:00
Angus Trau
c21331c85e liberation-circuit: init at 1.3
(cherry picked from commit 005f28eca8a755d750e49ddea348d14074310592)
2021-08-13 11:09:53 +00:00
Angus Trau
8f3bacf3d9 allegro5: fix native dialog addon
(cherry picked from commit 72cfa909f4b5960de92388be66aaee5467355575)
2021-08-13 11:09:52 +00:00
github-actions[bot]
e308a26a04
Merge staging-next-21.05 into staging-21.05 2021-08-13 00:03:10 +00:00
github-actions[bot]
852906c677
Merge release-21.05 into staging-next-21.05 2021-08-13 00:02:35 +00:00
Artturi
6de09630fb
Merge pull request #133682 from NixOS/backport-133666-to-release-21.05
[Backport release-21.05] nomacs: fix animated WebP support
2021-08-13 02:55:54 +03:00
Timothy DeHerrera
3222d2415c
Merge pull request #133684 from NixOS/backport-133678-to-release-21.05
[Backport release-21.05] signal-desktop: 5.12.2 -> 5.13.0
2021-08-12 16:35:36 -06:00
Michael Weiss
920934d188 signal-desktop: 5.12.2 -> 5.13.0
(cherry picked from commit 31a187510673af588984b5f2a4591e34ce7cfc64)
2021-08-12 21:56:27 +00:00
TredwellGit
d64de005c0 nomacs: fix animated WebP support
(cherry picked from commit e7e995ec2f50b5ecf202dba4eab65f4a919fec4a)
2021-08-12 21:54:18 +00:00
Artturi
7bd542a5e9
Merge pull request #133563 from NixOS/backport-133204-to-release-21.05
[Backport release-21.05] nixos/xserver: fix a display-manager race condition
2021-08-13 00:32:27 +03:00
Artturi
63eb5399c8
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 redundant
2021-08-13 00:31:57 +03:00
Artturi
3376676de0
Merge pull request #133171 from NixOS/backport-127493-to-release-21.05
[Backport release-21.05] gnomeExtensions.gsconnect: 46 -> 47
2021-08-13 00:07:33 +03:00
Ivan Malison
54b8add427 git-sync: unstable-2015-10-24 -> unstable-2021-07-14 (#130306)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-08-12 22:04:27 +03:00
Jörg Thalheim
ff0fa55543 git-sync: use postFixup instead of fixupPhase
(cherry picked from commit d804b24b6be14c2d264b7381e32d02401fef3327)
2021-08-12 22:04:24 +03:00
Ivan Malison
ef37ea7fe8 git-sync: Wrap both binaries
(cherry picked from commit 633993eee29d4a0092ea12b58741c108718a7308)
2021-08-12 22:04:20 +03:00
Artturi
a996e2ce32
Merge pull request #133590 from NixOS/backport-133456-to-release-21.05 2021-08-12 21:50:00 +03:00
Artturi
c20adcfd62
Merge pull request #133630 from NixOS/backport-133398-to-release-21.05
[Backport release-21.05] zoom-us: Do not apply screen scaling twice
2021-08-12 21:48:26 +03:00
github-actions[bot]
09a4e06850
Merge staging-next-21.05 into staging-21.05 2021-08-12 18:02:57 +00:00
github-actions[bot]
0d050f6b48
Merge release-21.05 into staging-next-21.05 2021-08-12 18:02:25 +00:00
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
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