293809 Commits

Author SHA1 Message Date
Robert Scott
5de44c1575
Merge pull request #125621 from etu/backport-php-upgrades
[21.05] php: php upgrades
2021-06-05 20:40:48 +01:00
Maximilian Bosch
54305f13e8
Merge pull request #125807 from NixOS/backport-123657-to-release-21.05
[Backport release-21.05] Kernels 2021-05-26
2021-06-05 20:38:21 +02:00
talyz
a60818cacd treewide: Fix mysql alias deprecation breakage
62733b37b4a866cabafe1fc8bb7415240126eb0b broke evaluation in all
places `pkgs.mysql` was used. Fix this by changing all occurrences to
`pkgs.mariadb`.

(cherry picked from commit 59e0120aa5c1241d48048afa615e25c65d7e366d)
2021-06-05 17:11:40 +00:00
Martin Weinelt
4a7770bfd6 postgresql_9_6: 9.6.21 -> 9.6.22
Fixes: CVE-2021-32027, CVE-2021-32028
(cherry picked from commit 062e1e595fe8bde889c73c2954fb2c5617dcf42c)
2021-06-05 17:09:24 +00:00
Martin Weinelt
731e67c871 postgresql_10: 10.16 -> 10.17
Fixes: CVE-2021-32027, CVE-2021-32028
(cherry picked from commit 376197bc5e9501febea4b6ab46b8073374d52c08)
2021-06-05 17:09:24 +00:00
Martin Weinelt
8d97696b86 postgresql_11: 11.11 -> 11.12
Fixes: CVE-2021-32027, CVE-2021-32028, CVE-2021-32029
(cherry picked from commit daedf20fa605c859a3c4b4c60d1ad0ba88261d4e)
2021-06-05 17:09:24 +00:00
Martin Weinelt
942a01e232 postgresql_12: 12.6 -> 12.7
Fixes: CVE-2021-32027, CVE-2021-32028, CVE-2021-32029
(cherry picked from commit b786157de875702c9a40b0945597ba25e83d918c)
2021-06-05 17:09:23 +00:00
Martin Weinelt
894d6ab2de postgresql_13: 13.2 -> 13.3
Fixes: CVE-2021-32027, CVE-2021-32028, CVE-2021-32029
(cherry picked from commit 3318a937ef800d2ba7818dc50be01bc4319dc0ad)
2021-06-05 17:09:23 +00:00
Jan Tojnar
e3ede71a0f
teams: remove jtojnar on stable 2021-06-05 18:27:16 +02:00
Aaron Janse
d5dc09b57b gnome-boxes: add qemu as dependency
(cherry picked from commit 795021ada5e70447f4c5fddb71532b0f9594c0f7)
2021-06-05 16:22:41 +00:00
Jörg Thalheim
1dfa9b73db buildFhsUserenv: don't leak mounts to other processes
If run as root we were leaking mounts to the parent namespace,
which lead to an error when removing the temporary mountroot.
To fix this we remount the whole tree as private as soon as we created
the new mountenamespace.

(cherry picked from commit 43908f4c1d8489ca284c47fb835ec3fa348016b0)
2021-06-05 16:06:56 +00:00
Stefan Frijters
db819f1626 openrgb: Fix udev rules with hardcoded /bin/chmod
New rules introduced in openrgb 0.6.

openrgb: Implement nixpkgs-review suggestions

* warning: missing-phase-hooks
* warning: unclear-gpl
* warning: unnecessary-parallel-building

(cherry picked from commit 84dc04c2db2f45237658e1178f22057f49a6b95f)
2021-06-05 08:26:00 -07:00
Yurii Matsiuk
099d0e5cb2 linux/hardened/patches/5.4: 5.4.121-hardened1 -> 5.4.122-hardened1
(cherry picked from commit 1ce119e9bb3ada25ad7f9fcfb7565194a4faffdb)
2021-06-05 15:07:38 +00:00
Yurii Matsiuk
5e4a63c145 linux/hardened/patches/5.12: 5.12.6-hardened1 -> 5.12.7-hardened1
(cherry picked from commit cdc6a4cc1e858d299e20e4cb90df427ac15411cc)
2021-06-05 15:07:37 +00:00
Yurii Matsiuk
45c9ea8fdb linux/hardened/patches/5.10: 5.10.39-hardened1 -> 5.10.40-hardened1
(cherry picked from commit 46ca914a5e4b8aa4cd184cd5a514200f224a5d06)
2021-06-05 15:07:37 +00:00
Yurii Matsiuk
10afabfad5 linux/hardened/patches/4.19: 4.19.191-hardened1 -> 4.19.192-hardened1
(cherry picked from commit 938ea32339ada0492d545542123e68e8833986c7)
2021-06-05 15:07:37 +00:00
Yurii Matsiuk
f5fa39d4a1 linux/hardened/patches/4.14: 4.14.233-hardened1 -> 4.14.234-hardened1
(cherry picked from commit 52e8c2d1650de8760c2cd93f67f45f559e00cdfe)
2021-06-05 15:07:37 +00:00
Yurii Matsiuk
79115d6a82 linux: 5.4.121 -> 5.4.122
(cherry picked from commit c16011b1d9f92d6bf68064fc0e12b66b4c6ad48f)
2021-06-05 15:07:36 +00:00
Yurii Matsiuk
d0d7b4af7e linux: 5.12.6 -> 5.12.7
(cherry picked from commit 01cc705d4a07ef89a8aa7806fdf2366360237c3e)
2021-06-05 15:07:36 +00:00
Yurii Matsiuk
a5c46f1388 linux: 5.10.39 -> 5.10.40
(cherry picked from commit bed18f50193d35c43408682837c7f96f30717c22)
2021-06-05 15:07:36 +00:00
Yurii Matsiuk
55be7efd2e linux: 4.9.269 -> 4.9.270
(cherry picked from commit 7d57471efa5d1b36f44084709e77c087ee8629f7)
2021-06-05 15:07:36 +00:00
Yurii Matsiuk
e8c17e37ea linux: 4.4.269 -> 4.4.270
(cherry picked from commit 819f6a5d8cf82857e9cc4f17879a68c944747bdf)
2021-06-05 15:07:35 +00:00
Yurii Matsiuk
876f1db8eb linux: 4.19.191 -> 4.19.192
(cherry picked from commit bd12ba96439e67cf75ec94773b7b2b5fc5f6079b)
2021-06-05 15:07:35 +00:00
Yurii Matsiuk
cd8ea3fcd0 linux: 4.14.233 -> 4.14.234
(cherry picked from commit 91233c46e36ef775e0ef92b4be0b810598d9b800)
2021-06-05 15:07:35 +00:00
Yurii Matsiuk
a361101945 linux/hardened/patches/5.12: init at 5.12.6-hardened1
(cherry picked from commit 6c6f9a5abfdc601d1d5ade71e8b667ed9cdc5fcd)
2021-06-05 15:07:35 +00:00
Yurii Matsiuk
9b91d0c98a linux/hardened/patches/5.4: 5.4.119-hardened1 -> 5.4.121-hardened1
(cherry picked from commit 63f5c51430ba45904bd3ffa915c045cb746a4d20)
2021-06-05 15:07:34 +00:00
Yurii Matsiuk
8c3ed02c5b linux/hardened/patches/5.11: 5.11.21-hardened1 -> 5.11.22-hardened1
(cherry picked from commit ac7c67ea0c13e60d1a39d658b2418ce616e4ccc6)
2021-06-05 15:07:34 +00:00
Yurii Matsiuk
3270f6e74f linux/hardened/patches/5.10: 5.10.37-hardened1 -> 5.10.39-hardened1
(cherry picked from commit f8df946b8b6b37a6d05d9cac7728709593c774ae)
2021-06-05 15:07:34 +00:00
Yurii Matsiuk
1537b18b66 linux/hardened/patches/4.19: 4.19.190-hardened1 -> 4.19.191-hardened1
(cherry picked from commit 38a17bf83560749fab96d595c3ac10b2d4b922ad)
2021-06-05 15:07:33 +00:00
Yurii Matsiuk
641eac3f62 linux/hardened/patches/4.14: 4.14.232-hardened1 -> 4.14.233-hardened1
(cherry picked from commit 96806043e7e73bb98d2362b5c14f3eb6dee2b514)
2021-06-05 15:07:33 +00:00
Yurii Matsiuk
8d3861572f linux_latest-libre: 18063 -> 18096
(cherry picked from commit be8af32578742a2940eb0aa0f3437bfdb43a515d)
2021-06-05 15:07:33 +00:00
Yurii Matsiuk
ff2eb0479e linux: 5.4.120 -> 5.4.121
(cherry picked from commit 44ed8b845d762581ca84ab4dd6baab89a0674d79)
2021-06-05 15:07:33 +00:00
Yurii Matsiuk
17c7ef67ea linux: 5.12.5 -> 5.12.6
(cherry picked from commit 6485d14e6de1ce89d39367d3d8b7eac5fdae684c)
2021-06-05 15:07:32 +00:00
Yurii Matsiuk
a8f69347be linux: 5.10.38 -> 5.10.39
(cherry picked from commit 43730b18ea08d7bf93aee23f47c2683f7a93e945)
2021-06-05 15:07:32 +00:00
Yurii Matsiuk
537d97790b linux: 4.9.268 -> 4.9.269
(cherry picked from commit e51c114dfeab0f7f7655edb3bb045c775982c5c6)
2021-06-05 15:07:32 +00:00
Yurii Matsiuk
853bb573e9 linux: 4.4.268 -> 4.4.269
(cherry picked from commit 7d15d507177349feee82e225a2ddbb09a9830d47)
2021-06-05 15:07:32 +00:00
Yurii Matsiuk
5e4829822c linux: 4.19.190 -> 4.19.191
(cherry picked from commit be7fc1bdee8bc3907f1089f37570ece1938532ba)
2021-06-05 15:07:31 +00:00
Yurii Matsiuk
747ca0c87f linux: 4.14.232 -> 4.14.233
(cherry picked from commit c5545b7e423869aaabc1232e9f339a5cb18398db)
2021-06-05 15:07:31 +00:00
Yurii Matsiuk
73710f8803 linux: 5.4.119 -> 5.4.120
(cherry picked from commit ce48d2c5932b307c22b418a7cced203ffc438b15)
2021-06-05 15:07:31 +00:00
Yurii Matsiuk
1e4ff1a71e linux: 5.12.4 -> 5.12.5
(cherry picked from commit a76a720665423d32db1edaf44915287c5860d536)
2021-06-05 15:07:31 +00:00
Yurii Matsiuk
64809ba107 linux: 5.11.21 -> 5.11.22
(cherry picked from commit 701282a87a96bc14d1996b43c057394b4dc70510)
2021-06-05 15:07:30 +00:00
Yurii Matsiuk
07dd7d248d linux: 5.10.37 -> 5.10.38
(cherry picked from commit 9a0a33f6b1ca2ae2c70e0c01722e3c359d667578)
2021-06-05 15:07:30 +00:00
Aaron Andersen
373aeac41f zabbix.agent2: create a symlink which is compatible with the zabbixAgent module
(cherry picked from commit 99e37419573318a1882ec5930c1dd6aec4512940)
2021-06-05 15:03:09 +00:00
Sandro
f00749660d
Merge pull request #125528 from wizeman/u/fix-gitrepo-backport
[21.05] gitRepo: Add import to ssl module to avoid runtime error (#125373)
2021-06-05 16:52:59 +02:00
Robert Hensing
1fe3b399a3
Merge pull request #125783 from NixOS/backport-125625-to-release-21.05
[Backport release-21.05] doc: Fix make in nix-shell
2021-06-05 15:14:54 +02:00
Robert Scott
f0f9b4ef89
Merge pull request #125782 from NixOS/backport-125645-to-release-21.05
[Backport release-21.05] wireshark: 3.4.5 -> 3.4.6
2021-06-05 13:53:35 +01:00
Robert Scott
ee7d49b968
Merge pull request #125784 from NixOS/backport-125566-to-release-21.05
[Backport release-21.05] pam_u2f: 1.1.0 -> 1.1.1
2021-06-05 13:34:11 +01:00
Maximilian Bosch
01ec377896
Merge pull request #125786 from NixOS/backport-125732-to-release-21.05
[Backport release-21.05] rambox: unmaintain & mark as insecure
2021-06-05 14:08:35 +02:00
Maximilian Bosch
d54d20e1c1
Merge pull request #125787 from NixOS/backport-125723-to-release-21.05
[Backport release-21.05] ferdi: 5.6.0-beta.5 -> 5.6.0-beta.6, improve XWayland support
2021-06-05 14:08:24 +02:00
Ilan Joselevich
b7833a0724 jitsi-meet-electron: 2.8.5 -> 2.8.6
(cherry picked from commit 29c70d515a827c043fcef37ddbb675cd620f9301)
2021-06-05 14:05:15 +02:00