summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rss-glx: fix build•••(cherry picked from commit 8b501a1089c346ea6efcddd6de18015512467493) origin/backport-175287-to-release-22.05Azat Bahawi2022-06-233-3/+31
* Merge pull request #178745 from NixOS/backport-178709-to-release-22.05•••[Backport release-22.05] Linux kernel updates 2022-06-23Maximilian Bosch2022-06-2315-90/+53
|\
| * linux_testing_bcachefs: mark as broken•••Doesn't build with Linux 5.18, but we have to remove 5.17 now because it's EOL. (cherry picked from commit 7ff7153c2292a6fe8f8d93b2b7b7314595e70b68) Maximilian Bosch2022-06-231-0/+1
| * linux_5_17: remove•••(cherry picked from commit f0e3e983776b148dc7a950a952865600ed7a43b2) Maximilian Bosch2022-06-236-44/+6
| * linux/hardened/patches/5.4: 5.4.198-hardened1 -> 5.4.200-hardened1•••(cherry picked from commit 1d833f1783b39edda0352e3a30f31813105cfad9) Maximilian Bosch2022-06-231-5/+5
| * linux/hardened/patches/5.18: 5.18.3-hardened1 -> 5.18.6-hardened1•••(cherry picked from commit 80caa726020f11dbacfa748677543776f2cebdab) Maximilian Bosch2022-06-231-5/+5
| * linux/hardened/patches/5.15: 5.15.47-hardened1 -> 5.15.49-hardened1•••(cherry picked from commit 14ad08aee47d2f9e31ab34a5085c49a66bfd8f5c) Maximilian Bosch2022-06-231-5/+5
| * linux/hardened/patches/5.10: 5.10.122-hardened1 -> 5.10.124-hardened1•••(cherry picked from commit 500dff12fe6943aa4464b60b38d06fb5621fa53c) Maximilian Bosch2022-06-231-5/+5
| * linux/hardened/patches/4.19: 4.19.247-hardened1 -> 4.19.248-hardened1•••(cherry picked from commit d450bf294a2302ef6e4f1cfc5708fbfe99797cc2) Maximilian Bosch2022-06-231-5/+5
| * linux/hardened/patches/4.14: 4.14.283-hardened1 -> 4.14.284-hardened1•••(cherry picked from commit 0fc1333d759e4c2a34977da96183ffacdd111700) Maximilian Bosch2022-06-231-5/+5
| * linux_latest-libre: 18777 -> 18798•••(cherry picked from commit efdcc5f6a874b284cde8a0e7341b84628a8e01b8) Maximilian Bosch2022-06-231-2/+2
| * linux: 5.4.198 -> 5.4.200•••(cherry picked from commit 4051ac2d8ee0334f4a5bf6bc7f01a2984b4a4dac) Maximilian Bosch2022-06-231-2/+2
| * linux: 5.18.4 -> 5.18.6•••(cherry picked from commit a266f7808ba7f9ca72a132dec24accd6cf4f0cd9) Maximilian Bosch2022-06-231-2/+2
| * linux: 5.15.47 -> 5.15.49•••(cherry picked from commit ca439ff6a6ebdd7437825b8016bc02a51d41c8bc) Maximilian Bosch2022-06-231-2/+2
| * linux: 5.10.122 -> 5.10.124•••(cherry picked from commit 66e572d98441a555e12b1ef17cc9fe270d799241) Maximilian Bosch2022-06-231-2/+2
| * linux: 4.9.318 -> 4.9.319•••(cherry picked from commit 34952774df2cf4fccc45632f826b6628401ff120) Maximilian Bosch2022-06-231-2/+2
| * linux: 4.19.247 -> 4.19.248•••(cherry picked from commit 2341a8672d9083e23f68ed0be53f4e6ddba05ad4) Maximilian Bosch2022-06-231-2/+2
| * linux: 4.14.283 -> 4.14.284•••(cherry picked from commit d7c1e34aa0a2182337d96d351734192552b02ed8) Maximilian Bosch2022-06-231-2/+2
* | Merge pull request #178769 from NixOS/backport-178731-to-release-22.05•••[Backport release-22.05] Fix isabelle on darwinShea Levy2022-06-235-11/+28
|\ \ | |/ |/|
| * isabelle: Fix build on darwin•••(cherry picked from commit c4f2260cdbfdcedc57337821110eb6c1071a9b6d) Shea Levy2022-06-231-4/+12
| * z3_4_4_0: Fix build on darwin.•••(cherry picked from commit 4d781f329ded7a99d0225e4f01fc56303b1d18ab) Shea Levy2022-06-232-1/+3
| * gcc49: Fix build on darwin•••(cherry picked from commit 8e6206f9c9324d0a4ae151d1ed1d099ba76cc5ee) Shea Levy2022-06-233-6/+13
|/
* Merge pull request #178618 from NixOS/backport-177673-to-release-22.05•••[Backport release-22.05] discord-sh: init at unstable-2022-05-19Bobby Rong2022-06-232-0/+52
|\
| * discord-sh: init at unstable-2022-05-19•••Co-authored-by: Sandro <sandro.jaeckel@gmail.com> (cherry picked from commit b96b41d2a818c4b997b8e6a647b960a01c7f046c) matthewcroughan2022-06-222-0/+52
* | Merge pull request #178619 from NixOS/backport-172373-to-release-22.05•••[Backport release-22.05] tinystatus: init at unstable-2021-07-09Bobby Rong2022-06-232-0/+60
|\ \
| * | tinystatus: init at unstable-2021-07-09•••Co-authored-by: j-k <dev@j-k.io> Co-authored-by: ckie <25263210+ckiee@users.noreply.github.com> (cherry picked from commit 294742618e5348c54b6eb2cbc77fa783699835de) matthewcroughan2022-06-222-0/+60
| |/
* | Merge pull request #178663 from NixOS/backport-178524-to-release-22.05•••[Backport release-22.05] gnome.aisleriot: update source sha256Bobby Rong2022-06-231-1/+1
|\ \
| * | gnome.aisleriot: update source sha256•••Upstream re-tagged 3.22.23 and 3.22.24: - https://gitlab.gnome.org/GNOME/aisleriot/-/issues/937 A direct comparison: - 3.22.23: https://github.com/GNOME/aisleriot/compare/730f7feb480e1b69cce0a7b333c998db6cf9b4c5..9c89b6866289e21d10e2cfe29ae958f25a5c0183 - 3.22.24: https://github.com/GNOME/aisleriot/compare/21a6d3c8e60d05bc11b77e912db12966661bdc6b..b9cd13873bf8d203623d5a5f9f808c0f78c6df78 The following commits are no longer presented on 3.22.24: - https://gitlab.gnome.org/GNOME/aisleriot/-/compare/9c89b6866289e21d10e2cfe29ae958f25a5c0183...c18c1797d43353f5419448247b5a1a1177dabdce - https://gitlab.gnome.org/GNOME/aisleriot/-/compare/e4e55fd282a23f2093996cc5d906e85b190900e2...730f7feb480e1b69cce0a7b333c998db6cf9b4c5 - https://gitlab.gnome.org/GNOME/aisleriot/-/compare/7ed4c8c9a371e2737f857f982acba1e8bf0bd354...21a6d3c8e60d05bc11b77e912db12966661bdc6b The following commits are no longer part of 3.22.23 but still part of 3.22.24: - https://gitlab.gnome.org/GNOME/aisleriot/-/compare/301fa2700dec22e725db41f4c91094265703be2a...78c53b7aeaf5ed7d2dfd9d44510a5acfac2cbabf (cherry picked from commit 2573b8bcc587eedc196d017bbf1d31acb66ee298) R. Ryantm2022-06-231-1/+1
* | | Merge pull request #178033 from MrTarantoga/backport-177021-to-release-22.05•••[Backport release-22.05] RStudio: 1.4.1717 -> 2022.02.3+492Mario Rodas2022-06-227-1077/+1956
|\ \ \ | |/ / |/| |
| * | Fix not FHS paths•••Create explicit nix path replacement of hard coded FHS paths for pandoc and nodejs. (cherry picked from commit f4c5c86fbbe264d67e4eb416add0a7eee17d3f49) Goetz2022-06-173-3/+15
| * | Remove Quarto patch•••Follow review in https://github.com/NixOS/nixpkgs/pull/177021#pullrequestreview-1007625773 (cherry picked from commit c758d73537a0eb256f5b069dbd3200cef75c3b76) Goetz2022-06-172-23/+1
| * | RStudio: 1.4.1717 -> 2022.02.3+492•••The old version does not compile with gcc11. Also the used nixos-22.05 libraries (R interpreter) have changed their interfaces that have to be also patched. Updating RStudio is usefull. (cherry picked from commit bbfc6883de78c44c1d59221668e4e6b396377389) Goetz2022-06-177-1076/+1965
* | | Merge pull request #178636 from NixOS/backport-178627-to-release-22.05•••[Backport release-22.05] veriT: Fix build on macosShea Levy2022-06-222-2/+3
|\ \ \
| * | | veriT: Fix build on macos•••(cherry picked from commit ef22f5fd93c754d433e1bdc5c9dba5c8b211d465) origin/backport-178627-to-release-22.05Hernan Rajchert2022-06-222-2/+3
* | | | Merge pull request #178503 from NixOS/backport-178489-to-release-22.05•••[Backport release-22.05] chromium: 102.0.5005.115 -> 103.0.5060.53Michael Weiss2022-06-231-10/+10
|\ \ \ \
| * | | | chromium: 102.0.5005.115 -> 103.0.5060.53•••https://chromereleases.googleblog.com/2022/06/stable-channel-update-for-desktop_21.html This update includes 14 security fixes. CVEs: CVE-2022-2156 CVE-2022-2157 CVE-2022-2158 CVE-2022-2160 CVE-2022-2161 CVE-2022-2162 CVE-2022-2163 CVE-2022-2164 CVE-2022-2165 (cherry picked from commit de0f40f35b78999d3dcfbef9650a34c57c044d64) origin/backport-178489-to-release-22.05Michael Weiss2022-06-211-10/+10
* | | | | prs: 0.3.2 -> 0.3.4•••https://gitlab.com/timvisee/prs/-/blob/v0.3.4/CHANGELOG.md fixes: CVE-2020-36205, CVE-2021-45707 (cherry picked from commit c777fbbf5d03a2395ad50f79c9907fc5835eba7b) Robert Schütz2022-06-221-3/+3
* | | | | Merge pull request #178602 from NixOS/backport-174022-to-release-22.05•••[Backport release-22.05] panotools: 2.9.20 -> 2.9.21ajs1242022-06-221-3/+4
|\ \ \ \ \
| * | | | | panotools: 2.9.20 -> 2.9.21•••Fixes CVE-2021-33293 https://sourceforge.net/projects/panotools/files/libpano13/libpano13-2.9.21/ (cherry picked from commit c3182eace3fe93b30e4e245254bd0503c6bd183f) Thomas Gerbet2022-06-221-3/+4
* | | | | | Merge pull request #178595 from NixOS/backport-178403-to-release-22.05•••[Backport release-22.05] rt: 5.0.1 -> 5.0.2ajs1242022-06-222-5/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | rt: 5.0.1 -> 5.0.2•••(cherry picked from commit 5301f373925eafde470cb148fe3b3f5fa86ced84) Gary Wan2022-06-222-5/+6
| |/ / / /
* | | | | Merge pull request #178577 from NixOS/backport-178404-to-release-22.05•••[Backport release-22.05] nextcloud: 23.0.5 -> 23.0.6, 24.0.1 -> 24.0.2Pascal Bach2022-06-221-4/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | nextcloud: 23.0.5 -> 23.0.6, 24.0.1 -> 24.0.2•••(cherry picked from commit 376dfe8766d20706eda0a97d8d6228d22ed61a95) Robbert Gurdeep Singh2022-06-221-4/+4
* | | | | Merge pull request #178607 from NixOS/backport-177077-to-release-22.05•••[Backport release-22.05] nixos/bitlbee: allow writing to configDirLassulus2022-06-221-0/+1
|\ \ \ \ \
| * | | | | nixos/bitlbee: allow writing to configDir•••(cherry picked from commit a12e52541099e5239d645018daf26a02cc60dd5d) origin/backport-177077-to-release-22.05lassulus2022-06-221-0/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #178604 from NixOS/backport-178314-to-release-22.05•••[Backport release-22.05] ergochat: 2.9.1 -> 2.10.0Lassulus2022-06-222-3/+5
|\ \ \ \ \
| * | | | | ergochat: 2.9.1 -> 2.10.0•••(cherry picked from commit 7e68dc4d9b02c42da54083e9b9c869168644966f) origin/backport-178314-to-release-22.05lassulus2022-06-222-3/+5
| |/ / / /
* | | | | Merge pull request #178608 from NixOS/backport-177536-to-release-22.05•••[Backport release-22.05] nixos/hedgedoc: Do not set StateDirectory to an absolute pathLassulus2022-06-221-1/+2
|\ \ \ \ \
| * | | | | nixos/hedgedoc: Do not set StateDirectory to an absolute path•••Commit 8109d8a set the `StateDirectory=` option of the systemd service configuration to the value of `cfg.workDir` which is wrong, according to dasJ [1]. This commit resolves this issue by stripping the `/var/lib/` prefix from `cfg.workDir`. [1] https://github.com/NixOS/nixpkgs/pull/172824#issuecomment-1130350412 (cherry picked from commit becff585796094f75d0ccbe1df5418ef873897ac) origin/backport-177536-to-release-22.05M. A2022-06-221-1/+2
| |/ / / /
* | | | | Merge #177716: staging-next-22.05 - iteration 2Vladimír Čunát2022-06-2211-47/+303
|\ \ \ \ \ | |/ / / / |/| | | |