summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* openafs: Add upstream patches for Linux kernel 5.12•••Signed-off-by: Anders Kaseorg <andersk@mit.edu> (cherry picked from commit 5fa1186df790309671910ccf58f4f01204b2fd23) origin/backport-125047-to-release-21.05Anders Kaseorg2021-06-051-0/+10
* gitAndTools.tig: 2.5.3 -> 2.5.4•••ChangeLog: https://github.com/jonas/tig/releases/tag/tig-2.5.4 (cherry picked from commit cd7a26eb8c415e63f8333897db19d3b8697c6373) Maximilian Bosch2021-06-051-2/+2
* Merge pull request #125621 from etu/backport-php-upgrades•••[21.05] php: php upgradesRobert Scott2021-06-053-6/+6
|\
| * php80: 8.0.6 -> 8.0.7•••https://www.php.net/ChangeLog-8.php#8.0.7 (cherry picked from commit 6b7b002544a8c0f907a37eeb4fd77eecd8c7eb67) Elis Hirwing2021-06-041-2/+2
| * phpPackages.composer: 2.1.0 -> 2.1.1•••https://github.com/composer/composer/releases/tag/2.1.1 (cherry picked from commit 5ae9ac3e88ee9ecfde695c83ddfd7ca42d8d5f09) Thomas Gerbet2021-06-041-2/+2
| * php.packages.composer: 2.0.13 -> 2.1.0•••(cherry picked from commit 5880c1c4bf29b4040d4464c592bc1d0b75adbfcf) Elis Hirwing2021-06-041-2/+2
| * php80: 8.0.5 -> 8.0.6•••https://www.php.net/ChangeLog-8.php#8.0.6 (cherry picked from commit a3c966cc7aefe169fc0d6a73dd2f0d765177c23b) Elis Hirwing2021-06-041-2/+2
| * php74: 7.4.18 -> 7.4.20•••https://www.php.net/ChangeLog-7.php#7.4.19 https://www.php.net/ChangeLog-7.php#7.4.20 (cherry picked from commit 23548b255290bdeb90f5caebb1ac306a1b323e28) Elis Hirwing2021-06-041-2/+2
* | Merge pull request #125807 from NixOS/backport-123657-to-release-21.05•••[Backport release-21.05] Kernels 2021-05-26Maximilian Bosch2021-06-0510-33/+39
|\ \
| * | linux/hardened/patches/5.4: 5.4.121-hardened1 -> 5.4.122-hardened1•••(cherry picked from commit 1ce119e9bb3ada25ad7f9fcfb7565194a4faffdb) Yurii Matsiuk2021-06-051-3/+3
| * | linux/hardened/patches/5.12: 5.12.6-hardened1 -> 5.12.7-hardened1•••(cherry picked from commit cdc6a4cc1e858d299e20e4cb90df427ac15411cc) Yurii Matsiuk2021-06-051-3/+3
| * | linux/hardened/patches/5.10: 5.10.39-hardened1 -> 5.10.40-hardened1•••(cherry picked from commit 46ca914a5e4b8aa4cd184cd5a514200f224a5d06) Yurii Matsiuk2021-06-051-3/+3
| * | linux/hardened/patches/4.19: 4.19.191-hardened1 -> 4.19.192-hardened1•••(cherry picked from commit 938ea32339ada0492d545542123e68e8833986c7) Yurii Matsiuk2021-06-051-3/+3
| * | linux/hardened/patches/4.14: 4.14.233-hardened1 -> 4.14.234-hardened1•••(cherry picked from commit 52e8c2d1650de8760c2cd93f67f45f559e00cdfe) Yurii Matsiuk2021-06-051-3/+3
| * | linux: 5.4.121 -> 5.4.122•••(cherry picked from commit c16011b1d9f92d6bf68064fc0e12b66b4c6ad48f) Yurii Matsiuk2021-06-051-2/+2
| * | linux: 5.12.6 -> 5.12.7•••(cherry picked from commit 01cc705d4a07ef89a8aa7806fdf2366360237c3e) Yurii Matsiuk2021-06-051-2/+2
| * | linux: 5.10.39 -> 5.10.40•••(cherry picked from commit bed18f50193d35c43408682837c7f96f30717c22) Yurii Matsiuk2021-06-051-2/+2
| * | linux: 4.9.269 -> 4.9.270•••(cherry picked from commit 7d57471efa5d1b36f44084709e77c087ee8629f7) Yurii Matsiuk2021-06-051-2/+2
| * | linux: 4.4.269 -> 4.4.270•••(cherry picked from commit 819f6a5d8cf82857e9cc4f17879a68c944747bdf) Yurii Matsiuk2021-06-051-2/+2
| * | linux: 4.19.191 -> 4.19.192•••(cherry picked from commit bd12ba96439e67cf75ec94773b7b2b5fc5f6079b) Yurii Matsiuk2021-06-051-2/+2
| * | linux: 4.14.233 -> 4.14.234•••(cherry picked from commit 91233c46e36ef775e0ef92b4be0b810598d9b800) Yurii Matsiuk2021-06-051-2/+2
| * | linux/hardened/patches/5.12: init at 5.12.6-hardened1•••(cherry picked from commit 6c6f9a5abfdc601d1d5ade71e8b667ed9cdc5fcd) Yurii Matsiuk2021-06-051-0/+6
| * | linux/hardened/patches/5.4: 5.4.119-hardened1 -> 5.4.121-hardened1•••(cherry picked from commit 63f5c51430ba45904bd3ffa915c045cb746a4d20) Yurii Matsiuk2021-06-051-3/+3
| * | linux/hardened/patches/5.11: 5.11.21-hardened1 -> 5.11.22-hardened1•••(cherry picked from commit ac7c67ea0c13e60d1a39d658b2418ce616e4ccc6) Yurii Matsiuk2021-06-051-3/+3
| * | linux/hardened/patches/5.10: 5.10.37-hardened1 -> 5.10.39-hardened1•••(cherry picked from commit f8df946b8b6b37a6d05d9cac7728709593c774ae) Yurii Matsiuk2021-06-051-3/+3
| * | linux/hardened/patches/4.19: 4.19.190-hardened1 -> 4.19.191-hardened1•••(cherry picked from commit 38a17bf83560749fab96d595c3ac10b2d4b922ad) Yurii Matsiuk2021-06-051-3/+3
| * | linux/hardened/patches/4.14: 4.14.232-hardened1 -> 4.14.233-hardened1•••(cherry picked from commit 96806043e7e73bb98d2362b5c14f3eb6dee2b514) Yurii Matsiuk2021-06-051-3/+3
| * | linux_latest-libre: 18063 -> 18096•••(cherry picked from commit be8af32578742a2940eb0aa0f3437bfdb43a515d) Yurii Matsiuk2021-06-051-2/+2
| * | linux: 5.4.120 -> 5.4.121•••(cherry picked from commit 44ed8b845d762581ca84ab4dd6baab89a0674d79) Yurii Matsiuk2021-06-051-2/+2
| * | linux: 5.12.5 -> 5.12.6•••(cherry picked from commit 6485d14e6de1ce89d39367d3d8b7eac5fdae684c) Yurii Matsiuk2021-06-051-2/+2
| * | linux: 5.10.38 -> 5.10.39•••(cherry picked from commit 43730b18ea08d7bf93aee23f47c2683f7a93e945) Yurii Matsiuk2021-06-051-2/+2
| * | linux: 4.9.268 -> 4.9.269•••(cherry picked from commit e51c114dfeab0f7f7655edb3bb045c775982c5c6) Yurii Matsiuk2021-06-051-2/+2
| * | linux: 4.4.268 -> 4.4.269•••(cherry picked from commit 7d15d507177349feee82e225a2ddbb09a9830d47) Yurii Matsiuk2021-06-051-2/+2
| * | linux: 4.19.190 -> 4.19.191•••(cherry picked from commit be7fc1bdee8bc3907f1089f37570ece1938532ba) Yurii Matsiuk2021-06-051-2/+2
| * | linux: 4.14.232 -> 4.14.233•••(cherry picked from commit c5545b7e423869aaabc1232e9f339a5cb18398db) Yurii Matsiuk2021-06-051-2/+2
| * | linux: 5.4.119 -> 5.4.120•••(cherry picked from commit ce48d2c5932b307c22b418a7cced203ffc438b15) Yurii Matsiuk2021-06-051-2/+2
| * | linux: 5.12.4 -> 5.12.5•••(cherry picked from commit a76a720665423d32db1edaf44915287c5860d536) Yurii Matsiuk2021-06-051-2/+2
| * | linux: 5.11.21 -> 5.11.22•••(cherry picked from commit 701282a87a96bc14d1996b43c057394b4dc70510) Yurii Matsiuk2021-06-051-2/+2
| * | linux: 5.10.37 -> 5.10.38•••(cherry picked from commit 9a0a33f6b1ca2ae2c70e0c01722e3c359d667578) Yurii Matsiuk2021-06-051-2/+2
* | | teams: remove jtojnar on stableJan Tojnar2021-06-051-2/+1
* | | 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) Stefan Frijters2021-06-051-4/+9
|/ /
* | Merge pull request #125528 from wizeman/u/fix-gitrepo-backport•••[21.05] gitRepo: Add import to ssl module to avoid runtime error (#125373)Sandro2021-06-052-3/+34
|\ \
| * | gitRepo: Add import to ssl module to avoid runtime error (#125373)•••Co-authored-by: Ricardo M. Correia <rcorreia@wizy.org> (cherry picked from commit 8f166b95c9ee10743039d1f2b1c21f9edee5da88) Otavio Salvador2021-06-032-3/+34
* | | Merge pull request #125783 from NixOS/backport-125625-to-release-21.05•••[Backport release-21.05] doc: Fix make in nix-shellRobert Hensing2021-06-052-5/+4
|\ \ \
| * | | doc: Fix make in nix-shell•••When running make manually, makeFlags will not be passed. Let’s just use an environment variable. (cherry picked from commit 034a9c0e16aab12978bb4a1c1f0e86c64778b388) origin/backport-125625-to-release-21.05Jan Tojnar2021-06-052-5/+4
* | | | Merge pull request #125782 from NixOS/backport-125645-to-release-21.05•••[Backport release-21.05] wireshark: 3.4.5 -> 3.4.6Robert Scott2021-06-051-2/+3
|\ \ \ \
| * | | | wireshark: 3.4.5 -> 3.4.6•••https://www.wireshark.org/docs/relnotes/wireshark-3.4.6.html (cherry picked from commit 15974f58b8c216cf268f8c2302b036db701b31cd) TredwellGit2021-06-051-2/+3
| |/ / /
* | | | Merge pull request #125784 from NixOS/backport-125566-to-release-21.05•••[Backport release-21.05] pam_u2f: 1.1.0 -> 1.1.1Robert Scott2021-06-051-2/+10
|\ \ \ \
| * | | | pam_u2f: 1.1.0 -> 1.1.1•••Fixes CVE-2021-31924 https://www.yubico.com/support/security-advisories/ysa-2021-03/ Changelog: https://github.com/Yubico/pam-u2f/blob/pam_u2f-1.1.1/NEWS (cherry picked from commit b5afbd350dc54553376bfa29e693b680be3c39bd) Thomas Gerbet2021-06-051-2/+10
| |/ / /
* | | | Merge pull request #125786 from NixOS/backport-125732-to-release-21.05•••[Backport release-21.05] rambox: unmaintain & mark as insecureMaximilian Bosch2021-06-051-1/+4
|\ \ \ \