Commit Graph

293121 Commits

Author SHA1 Message Date
Timothy DeHerrera a37709b232 zsh: remove conflicting nixUnstable completions
(cherry picked from commit d687fe88fdbb00b89f4e5b82824c7b187659d648)
2021-07-22 14:29:13 +00:00
Michael Weiss fd6da5164a
Merge pull request #131056 from NixOS/backport-131053-to-release-21.05
[Backport release-21.05] signal-desktop: 5.9.0 -> 5.10.0
2021-07-22 13:47:52 +02:00
Mario Rodas 153334b225
Merge pull request #131052 from NixOS/backport-131015-to-release-21.05
[Backport release-21.05] redis: 6.2.4 -> 6.2.5
2021-07-22 06:36:23 -05:00
Michael Weiss bdf036229a signal-desktop: 5.9.0 -> 5.10.0
(cherry picked from commit 8c1f8ac915ec379872a88b2613718723dc7f6c35)
2021-07-22 10:50:12 +00:00
Sandro 2b651977aa
Merge pull request #131010 from asbachb/backport/openjdk11 2021-07-22 12:21:30 +02:00
Mario Rodas 43c41565f7 redis: 6.2.4 -> 6.2.5
https://github.com/redis/redis/releases/tag/6.2.5
(cherry picked from commit b155b06e1dc296b471f0e43e02400c8d9c5af70d)
2021-07-22 10:05:13 +00:00
Robert Hensing 348a2aaee0
Merge pull request #130952 from NixOS/backport-129574-to-release-21.05
[Backport release-21.05] nixUnstable: 2.4pre20210601_5985b8b -> 2.4pre20210707_02dd6bb
2021-07-22 09:09:24 +02:00
Benjamin Asbach cd0a0d23e3 openjdk: 11.0.11+9 -> 11.0.12+7 2021-07-21 19:48:18 -06:00
Benjamin Asbach e1a569f341 openjdk: 11.0.10+11 -> 11.0.11+9
fixes #128407
2021-07-21 19:48:14 -06:00
Alyssa Ross 677b13b2c5 linuxPackages_latest: 5.12.12 -> 5.13
Fixes: 367a53a82b0 ("linux_5_13: init at 5.13")
(cherry picked from commit 0c21d0fd7035d65e48d561a64d1ad1454c640aff)
2021-07-21 22:24:17 +02:00
Janne Heß 8fe750c560 systemd: Patch CVE-2021-33910
(cherry picked from commit b361dcf0bd3610d1fea6b44d72404add188da51d)
2021-07-21 21:56:15 +02:00
TredwellGit 2822d00c6a linux/hardened/patches/5.4: 5.4.133-hardened1 -> 5.4.134-hardened1
(cherry picked from commit ac887a4abc6529cf7817539db2709107cfbad573)
2021-07-21 21:54:48 +02:00
TredwellGit 454e3fc4af linux/hardened/patches/5.12: 5.12.18-hardened1 -> 5.12.19-hardened1
(cherry picked from commit a718b4ae916113e98a4a113ffc52c53106d1bd97)
2021-07-21 21:54:48 +02:00
TredwellGit d528d58746 linux/hardened/patches/5.10: 5.10.51-hardened1 -> 5.10.52-hardened1
(cherry picked from commit 60e9f5c2d76c7892b1031884723a6a3f45e7552e)
2021-07-21 21:54:48 +02:00
TredwellGit 3e9e9473cb linux/hardened/patches/4.19: 4.19.197-hardened1 -> 4.19.198-hardened1
(cherry picked from commit 8bf83e8c874642b020169c201866817bc1c8d402)
2021-07-21 21:54:48 +02:00
TredwellGit 0a96eec012 linux/hardened/patches/4.14: 4.14.239-hardened1 -> 4.14.240-hardened1
(cherry picked from commit 02f4b95e1dfde6c71e230e9b4f17ab4323c306dd)
2021-07-21 21:54:48 +02:00
TredwellGit dacef47f62 linux: 5.4.133 -> 5.4.134
(cherry picked from commit ebd057e9efd8e8810c011b0dba9840109bab65f3)
2021-07-21 21:54:48 +02:00
TredwellGit 6b8d902600 linux: 5.13.3 -> 5.13.4
(cherry picked from commit 5b3a23670c3bdbd3a4ad7e7fe62c4e4c9e0132d9)
2021-07-21 21:54:48 +02:00
TredwellGit 33f224ada6 linux: 5.12.18 -> 5.12.19
(cherry picked from commit a703195804f27720118120bf80fda99531969fe2)
2021-07-21 21:54:48 +02:00
TredwellGit 243d04c444 linux: 5.10.51 -> 5.10.52
(cherry picked from commit f61350ac8916d99611aaf5b8fcb6be120114c7e9)
2021-07-21 21:54:48 +02:00
TredwellGit 6f6efc8dda linux: 4.9.275 -> 4.9.276
(cherry picked from commit c6eff0d2f599621fa4936e2c605823e3489a7044)
2021-07-21 21:54:48 +02:00
TredwellGit 8e34af05ab linux: 4.4.275 -> 4.4.276
(cherry picked from commit 067c21c9647fcc9e38b77b67ad932672374f098f)
2021-07-21 21:54:48 +02:00
TredwellGit 0df57cdc24 linux: 4.19.197 -> 4.19.198
(cherry picked from commit 9c153cccd2e1dbae481ac1578c36017b742adbd2)
2021-07-21 21:54:48 +02:00
TredwellGit 21c1bbc973 linux: 4.14.239 -> 4.14.240
(cherry picked from commit 82af4b58ee24caaec68e3803763c0e6dbedf3784)
2021-07-21 21:54:48 +02:00
Sander van der Burg 8b42f57303
Merge pull request #130957 from svanderburg/backport-arj
[Backport release-21.05] arj: init at 3.10.22
2021-07-21 20:15:44 +02:00
Sander van der Burg 33574c5708 arj: init at 3.10.22
(cherry picked from commit 37601fd76d96a8c83a980061adda9529d665d5b9)
2021-07-21 18:29:19 +02:00
Robert Hensing 648f26faa4 boehmgc_{nix,nixUnstable}: Move into {nix,nixUnstable}.passthru
Do not pollute top-level, but do provide allow the derivations to
be accessed for debugging and reuse if necessary.

(cherry picked from commit 2c2e1db91db465d7a83593d9322aa204c0fa4b43)
2021-07-21 16:07:46 +00:00
Robert Hensing 60370d7133 nixUnstable: patch boehmgc (nix#4944)
As has been done in https://github.com/NixOS/nix/pull/4944

This introduces the boehmgc_nix and boehmgc_nixUnstable attributes
which are useful for external packages that link with Nix and its
boehmgc.

(cherry picked from commit 596ac242af767b38e48af9076887b206dc72e472)
2021-07-21 16:07:45 +00:00
Jonathan Ringer 12e0c5c76c nixUnstable: 2.4pre20210601_5985b8b -> 2.4pre20210707_02dd6bb
(cherry picked from commit 2d1568561b80205b89a5b47e892e636441c26720)
2021-07-21 16:07:45 +00:00
Oleksii Filonenko 50df1c4a23
Merge pull request #130784 from NixOS/backport-128568-to-release-21.05
[Backport release-21.05] hugo: 0.84.1 -> 0.84.2
2021-07-21 18:00:49 +03:00
Thomas Tuegel 7e3eed28fe
Merge pull request #130155 from LeSuisse/kimages-CVE-2021-36083-21.05
[21.05] libsForQt5.kimageformats: fix CVE-2021-36083
2021-07-21 09:49:04 -05:00
Maximilian Bosch 5aefc30fb8
Merge pull request #130797 from NixOS/backport-130538-to-release-21.05
[Backport release-21.05] nixStable: 2.3.12 -> 2.3.14
2021-07-21 13:35:42 +02:00
Maximilian Bosch 5eac9206a5
Merge pull request #130798 from NixOS/backport-130603-to-release-21.05
[Backport release-21.05] strace: 5.12 -> 5.13
2021-07-21 13:35:00 +02:00
Maximilian Bosch 4025281959
Merge pull request #130879 from NixOS/backport-130635-to-release-21.05
[Backport release-21.05] Kernels 2021-07-19
2021-07-21 13:22:43 +02:00
Jan Tojnar 63ee5cd99a nixos/ddccontrol: init
(cherry picked from commit fc1e0e863c60dc9740304de36ffa883cbaddd760)
2021-07-20 22:32:07 -04:00
Jan Tojnar 24ca69c906 ddccontrol: install systemd service
(cherry picked from commit 27b9fe1e53e0ce21f29cc4c351db67911f941017)
2021-07-20 22:32:07 -04:00
TredwellGit ba6476e992 linux/hardened/patches/5.4: 5.4.132-hardened1 -> 5.4.133-hardened1
(cherry picked from commit e87737ca6026c81e81514e447f2a82c7ca56c8a2)
2021-07-20 22:50:51 +00:00
TredwellGit 94ff9e7b2d linux/hardened/patches/5.12: 5.12.17-hardened1 -> 5.12.18-hardened1
(cherry picked from commit 9e10f08e102e10a2a70401dbe1a5707099f61954)
2021-07-20 22:50:51 +00:00
TredwellGit 0d3b5af09e linux/hardened/patches/5.10: 5.10.50-hardened1 -> 5.10.51-hardened1
(cherry picked from commit 8e75e31ae4f6b98cf68d68bdb1ce9ecd6d24a807)
2021-07-20 22:50:50 +00:00
TredwellGit 09c21c10fc linux: 5.4.132 -> 5.4.133
(cherry picked from commit 1e8af69febc3205e403209caa7f0c711d92c2463)
2021-07-20 22:50:50 +00:00
TredwellGit 612d04e1d6 linux: 5.13.2 -> 5.13.3
(cherry picked from commit 72bcb1ace3cfe336d18342d6540733d8e69083a5)
2021-07-20 22:50:50 +00:00
TredwellGit 720802452a linux: 5.12.17 -> 5.12.18
(cherry picked from commit 72d6452921296dda48c531f465c5e37fa91c7c3f)
2021-07-20 22:50:49 +00:00
TredwellGit f1a0f33c5f linux: 5.10.50 -> 5.10.51
(cherry picked from commit a5ee0aede3e3ffacc1bf8f3fb3a9970523cce79e)
2021-07-20 22:50:49 +00:00
Maximilian Bosch 46f9b120e8
Merge pull request #130292 from NixOS/backport-130281-to-release-21.05
[Backport release-21.05] Kernels 2021-07-15
2021-07-20 23:57:39 +02:00
Robert Scott f3414d7d2b qemu: add patches for CVE-2021-3545 & CVE-2021-3546
(cherry picked from commit cddea297f28ab67d1f2bf0902bfdcc95ec29a8a0)
2021-07-20 16:39:04 +00:00
Maximilian Bosch b52c349b48 strace: 5.12 -> 5.13
ChangeLog: https://github.com/strace/strace/releases/tag/v5.13
(cherry picked from commit 3ed08b05552b41cb7ea3b6ab4a45bca9ae5621be)
2021-07-20 15:13:32 +00:00
Maximilian Bosch 792c0160c6 nixStable: 2.3.12 -> 2.3.14
Changes: https://github.com/NixOS/nix/compare/2.3.12...2.3.14

Since this is a bugfix release that wasn't pushed to `nixpkgs`, I
decided to take care of it.

As it's usually done in `upload-release.pl`[1], I updated the
fallback-paths accordingly and used eval `1687468`[2] for this with Nix
2.3.14.

Also added a fallback-path for `aarch64-darwin` as Nix 2.3.14 seems to
support this now[3].

[1] https://github.com/NixOS/nix/blob/2.3-maintenance/maintainers/upload-release.pl
[2] https://hydra.nixos.org/eval/1687468
[3] 14262b86cc

(cherry picked from commit e66237af154f63998eaf45233763b2e535b78b95)
2021-07-20 15:13:18 +00:00
R. RyanTM 10d8aa8003 hugo: 0.84.1 -> 0.84.2
(cherry picked from commit 0432fe1034f8780170157e86b0383f68cb4e2c5e)
2021-07-20 13:48:17 +00:00
Oleksii Filonenko 8ee0dfbfd3
Merge pull request #130775 from NixOS/backport-128095-to-release-21.05
[Backport release-21.05] hugo: 0.84.0 -> 0.84.1
2021-07-20 16:39:44 +03:00
Eelco Dolstra 10e32cce2a copy-tarballs.pl: Handle SRI hashes
This should fix

  Jul 20 07:16:12 bastion mirror-tarballs-start[21663]: Use of uninitialized value $algo in concatenation (.) or string at ./maintainers/scripts/copy-tarballs.pl line 80.
  Jul 20 07:16:12 bastion mirror-tarballs-start[21663]: Use of uninitialized value in subroutine entry at ./maintainers/scripts/copy-tarballs.pl line 185.
  Jul 20 07:16:13 bastion mirror-tarballs-start[21663]: error: unknown hash algorithm '' at ./maintainers/scripts/copy-tarballs.pl line 185.

(cherry picked from commit c48be3c17d2754d396790fb30405d625a562d1a5)
2021-07-20 14:52:31 +02:00