summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* gtk4: 4.6.5 -> 4.6.6•••(cherry picked from commit f797cceab2dccde19d2a86f3e0f09af9506861a1) origin/backport-179975-to-release-22.05R. Ryantm2022-07-031-2/+2
* Merge pull request #179787 from NixOS/backport-179264-to-release-22.05•••[Backport release-22.05] signal-desktop: fix missing tray iconSandro2022-07-031-0/+1
|\
| * signal-desktop: fix missing tray icon•••Fixes: #178892 (cherry picked from commit c22a517b752dd7e8c059c5f92b9cc467d246c5d6) teutat3s2022-07-011-0/+1
* | Merge pull request #179547 from NixOS/backport-179477-to-release-22.05•••[Backport release-22.05] Linux kernel updates 2022-06-28Maximilian Bosch2022-07-038-44/+44
|\ \
| * | linux/hardened/patches/5.4: 5.4.200-hardened1 -> 5.4.201-hardened1•••(cherry picked from commit 7d58f625e2bf0306255174aa0319f280b32f88b0) Maximilian Bosch2022-06-291-5/+5
| * | linux/hardened/patches/5.18: 5.18.6-hardened1 -> 5.18.7-hardened1•••(cherry picked from commit 57d38001ad6b0c64ee9c83d5d24ec1464fc343ce) Maximilian Bosch2022-06-291-5/+5
| * | linux/hardened/patches/5.15: 5.15.49-hardened1 -> 5.15.50-hardened1•••(cherry picked from commit d7973cd50258a26105c42111894d53192f5f4705) Maximilian Bosch2022-06-291-5/+5
| * | linux/hardened/patches/5.10: 5.10.124-hardened1 -> 5.10.125-hardened1•••(cherry picked from commit 3cf33ad016f3aeba8aba13cf68228ada4798924b) Maximilian Bosch2022-06-291-5/+5
| * | linux/hardened/patches/4.19: 4.19.248-hardened1 -> 4.19.249-hardened1•••(cherry picked from commit 14479c95a203204f6b82d956ebb657ba7ef3ca28) Maximilian Bosch2022-06-291-5/+5
| * | linux/hardened/patches/4.14: 4.14.284-hardened1 -> 4.14.285-hardened1•••(cherry picked from commit 299b49b53941cccf42aaf32e3bd2e1d75d71f847) Maximilian Bosch2022-06-291-5/+5
| * | linux: 5.4.200 -> 5.4.201•••(cherry picked from commit dfc38c7baa9ed3d107921f444de6a76f1a3c5cbd) Maximilian Bosch2022-06-291-2/+2
| * | linux: 5.18.6 -> 5.18.7•••(cherry picked from commit a13afa2d90d98c3005032e5e7df9002b31134339) Maximilian Bosch2022-06-291-2/+2
| * | linux: 5.15.49 -> 5.15.50•••(cherry picked from commit 17996e10f9cccb35fc16e86d8f9dd2c12fc78130) Maximilian Bosch2022-06-291-2/+2
| * | linux: 5.10.124 -> 5.10.126•••(cherry picked from commit 48f604ef690b2845ff20c0ac63134cfecff5724b) Maximilian Bosch2022-06-291-2/+2
| * | linux: 4.9.319 -> 4.9.320•••(cherry picked from commit 21c39a09698ce94f0be180027520c3b5169fb68d) Maximilian Bosch2022-06-291-2/+2
| * | linux: 4.19.248 -> 4.19.249•••(cherry picked from commit 34fe04da8e4ee12c72e7481fa3ac6506657f826b) Maximilian Bosch2022-06-291-2/+2
| * | linux: 4.14.284 -> 4.14.285•••(cherry picked from commit 2b50639f43b52134385da802d188f52846936223) Maximilian Bosch2022-06-291-2/+2
* | | Merge pull request #179524 from NixOS/backport-179453-to-release-22.05•••[Backport release-22.05] python310Packages.niapy: init at 2.0.2Fabian Affolter2022-07-032-0/+49
|\ \ \
| * | | python310Packages.niapy: init at 2.0.2•••(cherry picked from commit ae4623b2961cef70dfc449b68e51d32a812908d6) Fabian Affolter2022-06-292-0/+49
* | | | Merge pull request #179916 from NixOS/backport-179907-to-release-22.05•••[Backport release-22.05] freecad: fix crash when selecting color of a solidAnderson Torres2022-07-021-0/+2
|\ \ \ \
| * | | | freecad: fix crash when selecting color of a solid•••FreeCAD crashes when user wants to select color of a solid with following console message (long lines wrapped): $ nix run nixpkgs#freecad FreeCAD 0.20, Libs: 0.20RUnknown © Juergen Riegel, Werner Mayer, Yorik van Havre and others 2001-2022 FreeCAD is free and open-source software licensed under the terms of LGPL2+ license. FreeCAD wouldn't be possible without FreeCAD community. ##### #### ### #### # # # # # # # ## #### #### # # # # # #### # # # # # # # ##### # # # # #### #### # # # # # # # # # # # # # # ## ## ## # # #### #### ### # # #### ## ## ## (freecad:19737): GLib-GIO-ERROR **: 14:33:02.511: Settings schema 'org.gtk.Settings.ColorChooser' is not installed fish: Job 1, 'nix run nixpkgs#freecad' terminated by signal SIGTRAP (Trace or breakpoint trap) This patch adds hooks for GApps to relevant places in order to make FreeCAD finding the Color Chooser dialog schema effectively preventing crash from happening. (cherry picked from commit 269b50007315c08ebb9a86d778fca2e39ed6ac21) Juraj Hercek2022-07-021-0/+2
* | | | | Merge pull request #179917 from NixOS/backport-179715-to-release-22.05•••[Backport release-22.05] trackma: init at 0.8.4Anderson Torres2022-07-023-0/+76
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | trackma: init at 0.8.4•••(cherry picked from commit a2403ed37f4e8bb2f581b7ad0bb25a9e30fb435a) WeebSorceress2022-07-023-0/+76
|/ / / /
* | | | rustc: mark broken for dynamic Musl target•••(cherry picked from commit 9e103d03dcd3db6b26ea67da04a9fc1c62aa0787) Alyssa Ross2022-07-021-0/+3
* | | | Merge #179251: staging-next-22.05 - iteration 3Vladimír Čunát2022-07-028-42/+96
|\ \ \ \
| * | | | Merge #179882: thrift: fix expired certs in tests•••(cherry picked from commit 36888aa839276fb1fa3d1c41ff5d882435f487c0) Vladimír Čunát2022-07-021-0/+6
| * | | | Merge release-22.05 into staging-next-22.05github-actions[bot]2022-07-0210-12/+500
| |\ \ \ \
| * \ \ \ \ Merge release-22.05 into staging-next-22.05github-actions[bot]2022-07-0117-81/+171
| |\ \ \ \ \
| * \ \ \ \ \ Merge release-22.05 into staging-next-22.05github-actions[bot]2022-06-3013-1453/+1544
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge release-22.05 into staging-next-22.05github-actions[bot]2022-06-2910-4/+110
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge release-22.05 into staging-next-22.05github-actions[bot]2022-06-285-12/+25
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge release-22.05 into staging-next-22.05github-actions[bot]2022-06-275-16/+29
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'staging-22.05' into staging-next-22.05Vladimír Čunát2022-06-267-42/+90
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge staging-next-22.05 into staging-22.05github-actions[bot]2022-06-2618-208/+443
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge release-22.05 into staging-next-22.05github-actions[bot]2022-06-2618-208/+443
| |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge staging-next-22.05 into staging-22.05github-actions[bot]2022-06-2518-310/+342
| | | |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge release-22.05 into staging-next-22.05github-actions[bot]2022-06-2518-310/+342
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge staging-next-22.05 into staging-22.05github-actions[bot]2022-06-2433-1236/+2161
| | | | |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge release-22.05 into staging-next-22.05github-actions[bot]2022-06-2433-1236/+2161
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge pull request #178765 from NixOS/backport-178755-to-staging-22.05•••[Backport staging-22.05] Fix pkgsStatic.libzipEelco Dolstra2022-06-241-0/+4
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | libzip: Fix static build•••Don't build the regression tests because they don't build with pkgsStatic and are not executed anyway. (cherry picked from commit b97f46c807a4fafab450be0384a866ccf243fe35) Eelco Dolstra2022-06-231-0/+4
| | | | | |/ / / / / / / / / /
| | | | | * | | | | | | | | | Merge pull request #178635 from NixOS/backport-178462-to-staging-22.05Lassulus2022-06-231-4/+4
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | openssl_3_0: 3.0.3 -> 3.0.4•••Fixes additional sanitization issues in the c_rehash script. https://mta.openssl.org/pipermail/openssl-announce/2022-June/000227.html Fixes: CVE-2022-2068 (cherry picked from commit deb8ef11623db2127133293642a8719f71f76b82) Martin Weinelt2022-06-221-2/+2
| | | | | | * | | | | | | | | | openssl_1_1: 1.1.1o -> 1.1.1p•••Fixes additional sanitization issues in the c_rehash script. https://mta.openssl.org/pipermail/openssl-announce/2022-June/000226.html Fixes: CVE-2022-2068 (cherry picked from commit 0c213829222e20c83eb2044c36ff205854a583b9) Martin Weinelt2022-06-221-2/+2
| | | | | * | | | | | | | | | | python310Packages.bottle: 0.12.19 -> 0.12.21•••fixes CVE-2022-31799 (cherry picked from commit a4afd6aa1e0120a1867b601e301e3c0132c13f64) Robert Schütz2022-06-231-6/+23
| | | | | * | | | | | | | | | | Merge staging-next-22.05 into staging-22.05github-actions[bot]2022-06-2319-92/+125
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | / / / / / / / / / / | | | | | |/ / / / / / / / / /
| * | | | | | | | | | | | | | Merge release-22.05 into staging-next-22.05github-actions[bot]2022-06-2319-92/+125
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ Merge staging-next-22.05 into staging-22.05github-actions[bot]2022-06-2213-83/+114
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | Merge staging-next-22.05 into staging-22.05github-actions[bot]2022-06-2123-78/+294
| | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ Merge staging-next-22.05 into staging-22.05github-actions[bot]2022-06-2011-41/+191
| | | | | | |\ \ \ \ \ \ \ \ \ \ \