summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* innernet: only package systemd units for linux•••(cherry picked from commit 6b9080d336945a00344b1ec20ce8bc6e1122d28b) origin/backport-174135-to-release-22.05Josh Robson Chase2022-07-231-1/+2
* innernet: package systemd units•••(cherry picked from commit 31c82b62ff71115d93e5d71279229235d8f6099f) Josh Robson Chase2022-07-231-0/+2
* Merge pull request #182597 from NixOS/backport-182579-to-release-22.05•••[Backport release-22.05] carla: 2.4.3 -> 2.5.0Mario Rodas2022-07-231-2/+2
|\
| * carla: 2.4.3 -> 2.5.0•••(cherry picked from commit 69036df904c92bdd73bf3e689956dcbcdd02045c) Minijackson2022-07-231-2/+2
|/
* Merge pull request #182515 from risicle/ris-mediawiki-1.37.4-r22.05•••[22.05] mediawiki: 1.37.2 -> 1.37.4Stig2022-07-231-2/+2
|\
| * mediawiki: 1.37.2 -> 1.37.4Robert Scott2022-07-221-2/+2
* | Merge pull request #182582 from NixOS/backport-182570-to-release-22.05Lassulus2022-07-231-3/+11
|\ \
| * | nixos/syncthing: don't leak the secret API key in process listings•••(cherry picked from commit 65399c47424c7b33d90c6a3b581b38ed2f66b859) Bjørn Forsman2022-07-231-3/+11
|/ /
* | Merge pull request #182192 from NixOS/backport-181580-to-release-22.05•••[Backport release-22.05] ptcollab: 0.6.1.0 -> 0.6.1.1Bobby Rong2022-07-231-2/+2
|\ \
| * | ptcollab: 0.6.1.0 -> 0.6.1.1•••(cherry picked from commit 419b730533581305692bd8b244035fd46917b6f6) R. Ryantm2022-07-201-2/+2
* | | Merge pull request #182509 from NixOS/backport-182458-to-release-22.05•••[Backport release-22.05] Linux kernel updates 2022-07-22Maximilian Bosch2022-07-238-34/+34
|\ \ \ | |_|/ |/| |
| * | linux/hardened/patches/5.4: 5.4.205-hardened1 -> 5.4.206-hardened1•••(cherry picked from commit 7a3f99fa70188fd53823a4063cb6692d1271d66d) Maximilian Bosch2022-07-221-5/+5
| * | linux/hardened/patches/5.18: 5.18.11-hardened1 -> 5.18.12-hardened1•••(cherry picked from commit 5d94d1543da30c51caf0fcc6b789848e5a442744) Maximilian Bosch2022-07-221-5/+5
| * | linux/hardened/patches/5.15: 5.15.54-hardened1 -> 5.15.55-hardened1•••(cherry picked from commit fec96c54354b658263b32fb8fee4667c0b96429f) Maximilian Bosch2022-07-221-5/+5
| * | linux/hardened/patches/5.10: 5.10.130-hardened1 -> 5.10.131-hardened1•••(cherry picked from commit cef3263da6b97dc43f725a017d6ac5d113eb6236) Maximilian Bosch2022-07-221-5/+5
| * | linux: 5.4.206 -> 5.4.207•••(cherry picked from commit 61fa750911c1b489f5d28e4bfab3073bc893f3fd) Maximilian Bosch2022-07-221-2/+2
| * | linux: 5.18.12 -> 5.18.13•••(cherry picked from commit a368cce1a5e79f2724bfd33541b5083aa630b1b7) Maximilian Bosch2022-07-221-2/+2
| * | linux: 5.15.55 -> 5.15.56•••(cherry picked from commit 98215a7f78828d01d7db30485679adf742404454) Maximilian Bosch2022-07-221-2/+2
| * | linux: 5.10.131 -> 5.10.132•••(cherry picked from commit d91bda3b8303d6f7a86a5c5819c7cfbddfc7f6a0) Maximilian Bosch2022-07-221-2/+2
| * | linux: 4.9.323 -> 4.9.324•••(cherry picked from commit 225a653b7d1a3ec8dfef403798431d5b77cf8a00) Maximilian Bosch2022-07-221-2/+2
| * | linux: 4.19.252 -> 4.19.253•••(cherry picked from commit ae6aa45e319300789df41f89679e6056b71f8904) Maximilian Bosch2022-07-221-2/+2
| * | linux: 4.14.288 -> 4.14.289•••(cherry picked from commit 9e6fcd6f07c62a787693a7779d93a1a4c9df2cf3) Maximilian Bosch2022-07-221-2/+2
* | | Merge pull request #182307 from NixOS/backport-181755-to-release-22.05•••[Backport release-22.05] epson-escpr2: 1.1.48 -> 1.1.49Maximilian Bosch2022-07-221-3/+3
|\ \ \ | |/ / |/| |
| * | epson-escpr2: 1.1.48 -> 1.1.49•••(cherry picked from commit 0c0befe2c33874c2e65fb2b2e1cc6ba6790cdbdb) Shawn89012022-07-211-3/+3
* | | Merge pull request #182474 from NixOS/backport-182272-to-release-22.05•••[Backport release-22.05] hydrus: 491 -> 492Bobby Rong2022-07-221-2/+2
|\ \ \
| * | | hydrus: 491 -> 492•••(cherry picked from commit bed33cb4a5a7fdaa17fd534e3a4f1e3adefbfb62) Daniel Olsen2022-07-221-2/+2
* | | | Merge pull request #181927 from Elinvention/backport179459•••[Backport release-22.05] obs-studio-plugins.obs-pipewire-audio-capture: init at 1.0.4 (#179459)Bobby Rong2022-07-223-0/+39
|\ \ \ \
| * | | | obs-studio-plugins.obs-pipewire-audio-capture: init at 1.0.3 (#179459)•••Co-authored-by: Sandro <sandro.jaeckel@gmail.com> (cherry picked from commit 22cc20eba8cd24397482305eb50172d5bf3a4c1e) Elia Argentieri2022-07-183-0/+39
* | | | | Merge pull request #182086 from NixOS/backport-181945-to-release-22.05•••[Backport release-22.05] shellhub-agent: 0.9.3 -> 0.9.4Bobby Rong2022-07-221-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | shellhub-agent: 0.9.3 -> 0.9.4•••Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> (cherry picked from commit 088df050d8c296b5e797e73fe0d0f8cf06d4475c) Otavio Salvador2022-07-191-2/+2
* | | | | Merge pull request #182461 from NixOS/backport-182441-to-release-22.05•••[Backport release-22.05] services/web-apps/lemmy.nix: Remove space that causes a type errorBobby Rong2022-07-221-1/+1
|\ \ \ \ \
| * | | | | services/web-apps/lemmy.nix: Remove space that causes a type error•••(cherry picked from commit d0617a58e226a267eebeef431b8f3eb45c04f949) Ilan Joselevich2022-07-221-1/+1
* | | | | | Merge pull request #182455 from NixOS/backport-182267-to-release-22.05•••[Backport release-22.05] nixos/confluence: store crowd SSO password securelyMaximilian Bosch2022-07-222-16/+52
|\ \ \ \ \ \
| * | | | | | nixos/confluence: store crowd SSO password securely•••Basically the same as the JIRA change[1], but I figured that we can actually implement that in a backwards compatible manner. [1] https://github.com/NixOS/nixpkgs/pull/181715 (cherry picked from commit 258060c37d1f4b973aa6293485ad3594a9e88233) Maximilian Bosch2022-07-222-16/+52
* | | | | | | Merge pull request #182146 from obsidiansystems/22.05-rust-1.61•••[Backport release-22.05] rust 1.61.0: InitMaximilian Bosch2022-07-222-0/+69
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | rust 1.61.0: Init•••(Based on commit 55c8e2729042bfab9b91bc01b14a504cbf2702e2) Luka Blašković2022-07-192-0/+69
* | | | | | | Merge pull request #181140 from NixOS/backport-174162-to-release-22.05•••[Backport release-22.05] waybar: 0.9.12 -> 0.9.13Maximilian Bosch2022-07-221-10/+13
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | waybar: 0.9.12 -> 0.9.13•••added upower support, enabled by default (cherry picked from commit ffe324d8bd63cb03f8cfaaa8f4de61efb4bb6ec3) Minijackson2022-07-111-10/+13
* | | | | | | Merge pull request #182396 from NixOS/backport-182341-to-release-22.05Martin Weinelt2022-07-221-2/+2
|\ \ \ \ \ \ \
| * | | | | | | nss_latest: 3.80 -> 3.81•••https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_81.rst (cherry picked from commit 20ada9a6c75ab9a904a0629d3900d43af06722f5) ajs1242022-07-211-2/+2
* | | | | | | | Merge pull request #182420 from NixOS/backport-182402-to-release-22.05•••[Backport release-22.05] sshs: 3.2.0 -> 3.3.0Winter2022-07-221-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | sshs: 3.2.0 -> 3.3.0•••(cherry picked from commit 91f9185dfbd63a0f65cda3217f89e2c41e2195df) Michal2022-07-221-3/+3
| |/ / / / / / /
* / / / / / / / [Backport release-22.05] dart: 2.17.0 -> 2.17.3 (#182425)•••(cherry picked from commit 2d372784634e224c5a629d80a19705af655fbc7d) Co-authored-by: nanashi0x74 <rian.lindenberger@gmail.com>github-actions[bot]2022-07-221-7/+7
|/ / / / / / /
* | | | | | | [Backport release-22.05] nixos/minecraft-server: let server shutdown cleanly ...•••(cherry picked from commit e2b34f0f11ed8ad83d9ec9c14260192c3bcccb0d) Co-authored-by: Sofi <sofi+git@mailbox.org>github-actions[bot]2022-07-212-1/+30
* | | | | | | Merge pull request #182346 from NixOS/backport-181745-to-release-22.05•••[Backport release-22.05] pivy: 0.6.6 -> 0.6.7Winter2022-07-211-2/+2
|\ \ \ \ \ \ \
| * | | | | | | pivy: 0.6.6 -> 0.6.7•••When attempting to do certain operations in FreeCAD, I ran into this error: 12:24:32 Traceback (most recent call last): 12:24:32 File "/nix/store/y43dl4mv61lvzpdvwpwpsazj6b3ii87l-freecad-0.20/Mod/Image/ImageTools/_CommandImageScaling.py", line 181, in getmousepoint 12:24:32 event = event_cb.getEvent() 12:24:32 File "/nix/store/dq8yly6isjzq6imm0i0qjxkang5rcq84-python3.10-pivy-0.6.6/lib/python3.10/site-packages/pivy/coin.py", line 49384, in getEvent 12:24:32 return _coin.SoEventCallback_getEvent(self) 12:24:32 SystemError: <built-in function SoEventCallback_getEvent> returned a result with an exception set 12:24:33 <class 'SystemError'> 12:24:33 SystemError: PY_SSIZE_T_CLEAN macro must be defined for '#' formats 12:24:33 The above exception was the direct cause of the following exception: This macro was defined in https://github.com/coin3d/pivy/commit/2f049c19200ab4a3a1e4740268450496c12359f9, well after 0.6.6 was released, implying that FreeCAD depends on 0.6.7. (cherry picked from commit d5642e3491ff5d79e6836e86944bead8fb7f6022) Michael Alan Dorman2022-07-211-2/+2
* | | | | | | | Merge pull request #182305 from LibreCybernetics/backport-metals•••[22.05] metals: 0.11.5 → 0.11.7Winter2022-07-211-17/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | metals: remove client specific wrappers•••(cherry picked from commit f49a09b5a2effde9bc1cdbab8133935a9ab3b9ea) Kevin Rauscher2022-07-211-15/+0
| * | | | | | | | metals: 0.11.6 -> 0.11.7•••(cherry picked from commit e84435878ca0555f927c00c54f83c0de179d0c2a) Kevin Rauscher2022-07-211-2/+2
| * | | | | | | | metals: 0.11.5 -> 0.11.6•••(cherry picked from commit 56048394040202e92c5720a03eace36f1dc8d10b) Filipe Regadas2022-07-211-2/+2