From cbd2361d6520988ba7ae87f75a58e3f6802900ec Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 28 May 2025 13:33:16 +0200 Subject: [PATCH 01/28] lomiri.lomiri-content-hub: 2.0.0 -> 2.1.0 (cherry picked from commit 7b9e61f19fd528af5a172ff55e4dfc271097e710) --- .../services/lomiri-content-hub/default.nix | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix index 406022b7074e..395d1dc0c7eb 100644 --- a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix @@ -2,7 +2,9 @@ stdenv, lib, fetchFromGitLab, + fetchpatch, gitUpdater, + nixosTests, testers, cmake, cmake-extras, @@ -31,13 +33,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-content-hub"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-content-hub"; rev = finalAttrs.version; - hash = "sha256-eA5oCoAZB7fWyWm0Sy6wXh0EW+h76bdfJ2dotr7gUC0="; + hash = "sha256-S/idjDdcRvqZqKmflkYJyQckz4/9k/8JY6eRDACk9Ag="; }; outputs = [ @@ -47,9 +49,18 @@ stdenv.mkDerivation (finalAttrs: { "examples" ]; + patches = [ + # Remove when version > 2.1.0 + (fetchpatch { + name = "0001-lomiri-content-hub-treewide-Add-missing-LDM-include-dirs.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-content-hub/-/commit/cdd3371714c183d4caf166157082288c022bb98d.patch"; + hash = "sha256-Uubd425T+0KxPR9lJW6+ejO2fFzcDwEIpJATSZ9jYD4="; + }) + ]; + postPatch = '' substituteInPlace import/*/Content/CMakeLists.txt \ - --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" # Look for peer files in running system substituteInPlace src/com/lomiri/content/service/registry-updater.cpp \ @@ -101,6 +112,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "GSETTINGS_COMPILE" true) (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true) + (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6")) (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "ENABLE_DOC" true) (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" true) # in case something still depends on it @@ -145,7 +157,12 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + # Tests content-hub functionality, up to the point where one app receives a content exchange request + # from another and changes into a mode to pick the content to send + vm = nixosTests.lomiri.desktop-appinteractions; + }; updateScript = gitUpdater { }; }; From 5106751c472940080a67dfe79463f71e6a94c3ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 04:48:15 +0000 Subject: [PATCH 02/28] homebank: 5.9.1 -> 5.9.2 (cherry picked from commit 0944ebab3833d3a978da66a0170e4e0bf70b25f9) --- pkgs/by-name/ho/homebank/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ho/homebank/package.nix b/pkgs/by-name/ho/homebank/package.nix index 5af7e16e7eb0..7b402cff2828 100644 --- a/pkgs/by-name/ho/homebank/package.nix +++ b/pkgs/by-name/ho/homebank/package.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { pname = "homebank"; - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-s1Dtw6bjIUFObCb4VQ4rLBMNwftFlmlVa2H/1+jy44A="; + hash = "sha256-63WHr9yUuNx3s2pNvTSPTLwQ2M+757Mr++Yfocb6G8c="; }; nativeBuildInputs = [ From 011a4662a7b23fba4296fa51e834b4c7db84cadc Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Fri, 6 Jun 2025 15:35:10 +0300 Subject: [PATCH 03/28] teleport_16: 16.5.10 -> 16.5.11 Changelog: https://github.com/gravitational/teleport/releases/tag/v16.5.11 Diff: https://github.com/gravitational/teleport/compare/v16.5.10...v16.5.11 (cherry picked from commit ef984d1859b1ba6d35d5813dba26d59aee22c3c9) --- pkgs/by-name/te/teleport_16/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix index 8011f843ac44..e33ad9171a3a 100644 --- a/pkgs/by-name/te/teleport_16/package.nix +++ b/pkgs/by-name/te/teleport_16/package.nix @@ -2,9 +2,9 @@ teleport, }: teleport.override { - version = "16.5.10"; - hash = "sha256-i+2IK+X0Opyv2tQPpj2XhY64aQGdbylS/C7LsTykuXI="; - vendorHash = "sha256-DdVBtMwz0AIGCYj/QLczG8GPP9mqKrdF+M0NqmM6J0I="; + version = "16.5.11"; + hash = "sha256-uLis1oRTr5J2bKaJtnVAIQ0ixYT8BYLo4jQPcdFp82s="; + vendorHash = "sha256-OcVHckqxpTVz6Gaemt3+9WxBQc5D5QBxb3IMGOMq4LI="; pnpmHash = "sha256-JQca2eFxcKJDHIaheJBg93ivZU95UWMRgbcK7QE4R10="; cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I="; } From 6a9000786029998d6c2f0ce22d988835b81da7ec Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 5 Jun 2025 23:37:43 +0200 Subject: [PATCH 04/28] palemoon-bin: 33.7.1 -> 33.7.2 https://www.palemoon.org/releasenotes.shtml#v33.7.2 (cherry picked from commit 1e422c37983d81e275d9b005b2791dafc61f9530) --- pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 5defd3f14dd5..476f8c8d9dbd 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.7.1"; + version = "33.7.2"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -174,11 +174,11 @@ stdenv.mkDerivation (finalAttrs: { { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-80L93pQaozdyqMnIswWnS+gNo+xVYv5eFVNnLiK/rcU="; + hash = "sha256-GE45GZ+OmNNwRLTD2pcZpqRA66k4q/+lkQnGJG+z6nQ="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-dnDQKRCqADzdotJRUeETqaGV+S+M6/de5LuBgMYYvPE="; + hash = "sha256-yJPmmQ9IkGzort9OPPWzv+LSeJci8VNoso3NLYev51Q="; }; }; From fce8cd453ab5e0bd7dd26cb9a35e589c42cab4b2 Mon Sep 17 00:00:00 2001 From: Peter Lehmann Date: Sat, 7 Jun 2025 14:12:59 +0200 Subject: [PATCH 05/28] nixos/pdns-recursor: reload service on config change (cherry picked from commit c586196e1739b21b378d27df691a764e7928c06b) --- nixos/modules/services/networking/pdns-recursor.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix index 42f609128b95..04ae59b7fca9 100644 --- a/nixos/modules/services/networking/pdns-recursor.nix +++ b/nixos/modules/services/networking/pdns-recursor.nix @@ -287,7 +287,10 @@ in systemd.packages = [ pkgs.pdns-recursor ]; - systemd.services.pdns-recursor.wantedBy = [ "multi-user.target" ]; + systemd.services.pdns-recursor = { + restartTriggers = [ config.environment.etc."/pdns-recursor/recursor.yml".source ]; + wantedBy = [ "multi-user.target" ]; + }; users.users.pdns-recursor = { isSystemUser = true; From 6ab9284719364a380aed14c0d31ddab94bd7d497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 5 Jun 2025 15:37:37 +0000 Subject: [PATCH 06/28] osu-lazer-bin: 2025.424.0 -> 2025.605.3 (cherry picked from commit 027e00a5ae15d76e44fb8607e28edaafab505105) --- pkgs/by-name/os/osu-lazer-bin/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix index ff542b27c083..c1a2302b59f3 100644 --- a/pkgs/by-name/os/osu-lazer-bin/package.nix +++ b/pkgs/by-name/os/osu-lazer-bin/package.nix @@ -10,23 +10,23 @@ let pname = "osu-lazer-bin"; - version = "2025.424.0"; + version = "2025.605.3"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-fgG3SnltGxOYHwos8BTngaW4YrRdpOdURxd73sz0t7o="; + hash = "sha256-TN0TnwY4lXsKHeCYBKmYSenuBZIt0n0bbEw1BVWwDZc="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-0K+uAH4f8JOfzG4J37aGaStpEkH5tdUfHEqsogMtN2I="; + hash = "sha256-vFqow+G8Ebzgnau9c6TYit7SKDMIeJJOKI0DXAevBXY="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-8nOoSkNbzEFpDj0FivCYI20tZzT02YHcKZblfEfh+Zo="; + hash = "sha256-k09fyaSfGZgC7VoDp68+xb5wxiXGQllXKqCpz+7k0So="; }; } .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported."); From 6fc6ad5fd424e7f11995316e30838961d5162bab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 5 Jun 2025 15:38:21 +0000 Subject: [PATCH 07/28] osu-lazer: 2025.424.0 -> 2025.605.3 (cherry picked from commit b4b768e44e9d7aa1024614ec0f3835469a48c4a0) --- pkgs/by-name/os/osu-lazer/deps.json | 8 ++++---- pkgs/by-name/os/osu-lazer/package.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json index 18dd9bca29e3..b78a98c0bd35 100644 --- a/pkgs/by-name/os/osu-lazer/deps.json +++ b/pkgs/by-name/os/osu-lazer/deps.json @@ -651,8 +651,8 @@ }, { "pname": "ppy.osu.Framework", - "version": "2025.419.0", - "hash": "sha256-fsuEdzD4pzBID7I7DNAYs4JGrCkm/ALtZkEu5/QgKVQ=" + "version": "2025.604.1", + "hash": "sha256-TnxNneBVR6YYuaUbU1sHewwVzy15qmCpudSopHol1tM=" }, { "pname": "ppy.osu.Framework.NativeLibs", @@ -666,8 +666,8 @@ }, { "pname": "ppy.osu.Game.Resources", - "version": "2025.321.0", - "hash": "sha256-vjNwUVBSOrWEc8z8QXD+CPSZMj9BCKuKIQZXxqaXldc=" + "version": "2025.605.0", + "hash": "sha256-t9uNvlimF81LNECTBnhLidSmN8cOXi3Sn0rqI3na3zQ=" }, { "pname": "ppy.osuTK.NS20", diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix index f24e49e6ca3e..49bff7b68c97 100644 --- a/pkgs/by-name/os/osu-lazer/package.nix +++ b/pkgs/by-name/os/osu-lazer/package.nix @@ -22,13 +22,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2025.424.0"; + version = "2025.605.3"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; tag = version; - hash = "sha256-+r7YeaNrUkoYoMzGqhqT+bqdO1UohvJRlAcAskF7vn4="; + hash = "sha256-hzD2OX+bnJ4cvq09wXQ1rINZ3DI97BwSrZ/yxyjWKoM="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; From b7bda8910fb7c4c5b6eb16d8b27a24b673f9c5a2 Mon Sep 17 00:00:00 2001 From: vys Date: Fri, 6 Jun 2025 17:54:34 -0400 Subject: [PATCH 08/28] osu-lazer{,-bin}: 2025.605.3 -> 2025.607.0 osu-lazer: 2025.605.3 -> 2025.607.0 osu-lazer-bin: 2025.605.3 -> 2025.607.0 chore: formatted files fixed review conflicts (cherry picked from commit 6686a3e463cf1615d8ea6d6560b69b6509594684) --- pkgs/by-name/os/osu-lazer-bin/package.nix | 8 ++++---- pkgs/by-name/os/osu-lazer/package.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix index c1a2302b59f3..8de4bd8475d9 100644 --- a/pkgs/by-name/os/osu-lazer-bin/package.nix +++ b/pkgs/by-name/os/osu-lazer-bin/package.nix @@ -10,23 +10,23 @@ let pname = "osu-lazer-bin"; - version = "2025.605.3"; + version = "2025.607.0"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-TN0TnwY4lXsKHeCYBKmYSenuBZIt0n0bbEw1BVWwDZc="; + hash = "sha256-rfWP6vF68mE+pnKvJjSgkxzTBj3sWDRlB9NZZkPOYOE="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-vFqow+G8Ebzgnau9c6TYit7SKDMIeJJOKI0DXAevBXY="; + hash = "sha256-FpMugHVyhpyzCRp+EH/RSQDsgoUEQrAuIVCaMTucz88="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-k09fyaSfGZgC7VoDp68+xb5wxiXGQllXKqCpz+7k0So="; + hash = "sha256-jG3KedllnVNd5TLSkKYae2V8CzN90g5lJhT4EKI+nuk="; }; } .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported."); diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix index 49bff7b68c97..057b16df671e 100644 --- a/pkgs/by-name/os/osu-lazer/package.nix +++ b/pkgs/by-name/os/osu-lazer/package.nix @@ -22,13 +22,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2025.605.3"; + version = "2025.607.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; tag = version; - hash = "sha256-hzD2OX+bnJ4cvq09wXQ1rINZ3DI97BwSrZ/yxyjWKoM="; + hash = "sha256-qAKtINbWbC76a4vhEFIE6WnEtn/0brcIPp5WXBGQoEI="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; From f78de8559bc2630627a60816fcd8cff77f1de107 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Fri, 16 May 2025 20:49:57 +0200 Subject: [PATCH 09/28] zed-editor: 0.186.8 -> 0.186.9 (cherry picked from commit 4c417b6be1ecd9eee7eca22cbef2ed6626ff0f4a) --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 3009a0529cf1..5417fbc18484 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.186.8"; + version = "0.186.9"; outputs = [ "out" ] @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-oSmwEtF8VWSKcBlL11MMThBAJFisXwWQjZAzcNIptt0="; + hash = "sha256-z3QHD1EfJfhgLZwUv805RHCEKiBm1wCpJG1GAS9OJgE="; }; patches = [ @@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-WH6cQa6DChkUtqh+irIz2hJd5/RW/oln+TZPHunEmNk="; + cargoHash = "sha256-qGHUO25a2288hp4+DcQJabauOVGYn7CXtDqWGB6diO8="; nativeBuildInputs = [ From 4823bfd55309287758e8c64810f5ba70e264e454 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Wed, 21 May 2025 22:32:12 +0200 Subject: [PATCH 10/28] zed-editor: 0.186.9 -> 0.187.6 Diff: https://github.com/zed-industries/zed/compare/v0.186.9...v0.187.6 Changelog: https://github.com/zed-industries/zed/releases/tag/v0.187.6 (cherry picked from commit a91b85443ca96a1a0be3c76eda7c940e4454feee) --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 5417fbc18484..71171c8a6106 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.186.9"; + version = "0.187.6"; outputs = [ "out" ] @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-z3QHD1EfJfhgLZwUv805RHCEKiBm1wCpJG1GAS9OJgE="; + hash = "sha256-aib6RJPkNQQmK+zVfNvf/LwfKuloj6xHN4tT8p0yPZo="; }; patches = [ @@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-qGHUO25a2288hp4+DcQJabauOVGYn7CXtDqWGB6diO8="; + cargoHash = "sha256-fIOgakr2Wni8BJB7VD63worcHEwnL0WKI88kjJ4YTMg="; nativeBuildInputs = [ From 89b290070b2ce3c5904ffeec88c44a88eae2dd08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 May 2025 19:50:42 +0000 Subject: [PATCH 11/28] zed-editor: 0.187.6 -> 0.187.9 (cherry picked from commit 4f081b542669e986df05cf7006a701de736200ee) --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 71171c8a6106..c38458f5b57a 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.187.6"; + version = "0.187.9"; outputs = [ "out" ] @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-aib6RJPkNQQmK+zVfNvf/LwfKuloj6xHN4tT8p0yPZo="; + hash = "sha256-BWn36z6EoyYRGtYZjWmTbu77M2wYNNBQ76u6MhKlkY4="; }; patches = [ @@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-fIOgakr2Wni8BJB7VD63worcHEwnL0WKI88kjJ4YTMg="; + cargoHash = "sha256-kXE+brvG8Z70Bla5SXGwRVX+fP8PtIPOkYXLhyJa4l8="; nativeBuildInputs = [ From 0ff2bea43eadc9bb15765c3f230be6a26eb4225c Mon Sep 17 00:00:00 2001 From: seeker Date: Thu, 29 May 2025 18:26:04 +0800 Subject: [PATCH 12/28] zed-editor: 0.186.9 -> 0.188.3 (cherry picked from commit f76714dc442ea29f07d9f4d7426ffb0a54e353c2) --- pkgs/by-name/ze/zed-editor/0001-linux-linker.patch | 8 ++++---- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/0001-linux-linker.patch b/pkgs/by-name/ze/zed-editor/0001-linux-linker.patch index 4529e038dc2f..5deef7339a72 100644 --- a/pkgs/by-name/ze/zed-editor/0001-linux-linker.patch +++ b/pkgs/by-name/ze/zed-editor/0001-linux-linker.patch @@ -1,5 +1,5 @@ diff --git a/.cargo/config.toml b/.cargo/config.toml -index 07cbc23195..b3c4d43e0f 100644 +index 717c5e1..0bb7b6c 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -5,14 +5,6 @@ rustflags = ["-C", "symbol-mangling-version=v0", "--cfg", "tokio_unstable"] @@ -14,6 +14,6 @@ index 07cbc23195..b3c4d43e0f 100644 -linker = "clang" -rustflags = ["-C", "link-arg=-fuse-ld=mold"] - - [target.aarch64-apple-darwin] - rustflags = ["-C", "link-args=-Objc -all_load"] - + [target.'cfg(target_os = "windows")'] + rustflags = [ + "--cfg", diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index c38458f5b57a..1730a70423c0 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.187.9"; + version = "0.188.3"; outputs = [ "out" ] @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-BWn36z6EoyYRGtYZjWmTbu77M2wYNNBQ76u6MhKlkY4="; + hash = "sha256-ZyKFzb6/kVw/uLTmhnyrwmgyTHTwgu/WbOga409eZvg="; }; patches = [ @@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-kXE+brvG8Z70Bla5SXGwRVX+fP8PtIPOkYXLhyJa4l8="; + cargoHash = "sha256-0Nwdw20YdezGvUCkFw6ZV55qsebIhtnIoPoHd4tgIyA="; nativeBuildInputs = [ From b5f7015d520e2822d46882560bd39114919d6727 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 7 Jun 2025 18:38:22 +0200 Subject: [PATCH 13/28] zed-editor: 0.188.3 -> 0.189.5 Diff: https://github.com/zed-industries/zed/compare/refs/tags/v0.188.3...v0.189.5 Changelog: https://github.com/zed-industries/zed/releases/tag/v0.189.5 (cherry picked from commit 9e783da4169c27243a2234a459f25583273a52f6) --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 1730a70423c0..9a0787af7f57 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.188.3"; + version = "0.189.5"; outputs = [ "out" ] @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZyKFzb6/kVw/uLTmhnyrwmgyTHTwgu/WbOga409eZvg="; + hash = "sha256-d1d3WgUVamrYWVosljQiEPZGNNDldtM1YwZhxseX4+w="; }; patches = [ @@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-0Nwdw20YdezGvUCkFw6ZV55qsebIhtnIoPoHd4tgIyA="; + cargoHash = "sha256-YhdwCNTbBphWugguoWQqrGf2fRB5Jv40MElW6hbcxtk="; nativeBuildInputs = [ From dbe4ed865c18a3b3ec67dc7660471568c2b91e21 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Wed, 12 Mar 2025 18:27:54 +0100 Subject: [PATCH 14/28] [Backport release-25.05] nixosTests.keepassxc: enable dconf Manual backport of https://github.com/NixOS/nixpkgs/pull/389288 to `release-25.05`. simply doing a cherry-pick of e91a6f4594d13abb104f3b3e8c92c9d51f310559 not possible due to conflicts --- nixos/tests/keepassxc.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/keepassxc.nix b/nixos/tests/keepassxc.nix index c2d68e29b798..aff1790f6eac 100644 --- a/nixos/tests/keepassxc.nix +++ b/nixos/tests/keepassxc.nix @@ -18,6 +18,7 @@ import ./make-test-python.nix ( ]; services.xserver.enable = true; + programs.dconf.enable = true; # for better OCR environment.etc."icewm/prefoverride".text = '' From ef54e8654c7a768aa0e081ffa1720b5536f8588f Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 6 Jun 2025 22:42:46 +0800 Subject: [PATCH 15/28] clapper: fix opening files (cherry picked from commit 83e1d008b8b4506fd6a8f72498c53af20cc934c3) --- pkgs/by-name/cl/clapper/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/cl/clapper/package.nix b/pkgs/by-name/cl/clapper/package.nix index 596b03a94cd0..e1c0393e23ea 100644 --- a/pkgs/by-name/cl/clapper/package.nix +++ b/pkgs/by-name/cl/clapper/package.nix @@ -29,6 +29,11 @@ stdenvNoCC.mkDerivation { mkdir -p $out lndir $src $out + dbusfile=share/dbus-1/services/com.github.rafostar.Clapper.service + rm $out/$dbusfile + cp $src/$dbusfile $out/$dbusfile + substituteInPlace $out/$dbusfile \ + --replace-fail $src/bin/clapper $out/bin/clapper runHook postInstall ''; From 3a78cdec7afcf6a5397a2b7fda88a237bf7656de Mon Sep 17 00:00:00 2001 From: Lennart Kolmodin Date: Fri, 6 Jun 2025 14:29:09 +0200 Subject: [PATCH 16/28] svtplay-dl: 4.109 -> 4.113 (cherry picked from commit 32919c5e8f024082c27b0b61bc159e10d2d529b2) --- pkgs/by-name/sv/svtplay-dl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sv/svtplay-dl/package.nix b/pkgs/by-name/sv/svtplay-dl/package.nix index 50628c70abf5..cc13a0b6b0b8 100644 --- a/pkgs/by-name/sv/svtplay-dl/package.nix +++ b/pkgs/by-name/sv/svtplay-dl/package.nix @@ -21,7 +21,7 @@ let requests-mock ; - version = "4.109"; + version = "4.113"; in @@ -34,7 +34,7 @@ buildPythonApplication { owner = "spaam"; repo = "svtplay-dl"; rev = version; - hash = "sha256-ApoAcYaqPIurgDM+ctyyx9+OyUmhJ+1fjdGj0ln6v7w="; + hash = "sha256-Yiw76PDnOpK4HAnO9VqmvmqdT4PdxAgu1MwbZ15pEyM="; }; build-system = [ setuptools ]; From dbbafec041cdefbdb870dfbc301a51b53ab25aec Mon Sep 17 00:00:00 2001 From: oddlama Date: Sat, 7 Jun 2025 11:05:59 +0200 Subject: [PATCH 17/28] kanidm-provision: 1.2.1 -> 1.3.0 (cherry picked from commit b7f5fce1cacaee5fe9636d45c18c35a1d990787c) --- pkgs/by-name/ka/kanidm-provision/package.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ka/kanidm-provision/package.nix b/pkgs/by-name/ka/kanidm-provision/package.nix index f7a603dba55c..4b1bd354e566 100644 --- a/pkgs/by-name/ka/kanidm-provision/package.nix +++ b/pkgs/by-name/ka/kanidm-provision/package.nix @@ -2,7 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - yq, versionCheckHook, nix-update-script, nixosTests, @@ -10,25 +9,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kanidm-provision"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "oddlama"; repo = "kanidm-provision"; tag = "v${finalAttrs.version}"; - hash = "sha256-kwxGrLz59Zk8PSsfQzPUeA/xWQZrV1NWlS5/yuqfIyI="; + hash = "sha256-m3bF4wFPVRc2E+E/pZc3js9T4rYbTejo/FFpysytWKw="; }; - postPatch = '' - tomlq -ti '.package.version = "${finalAttrs.version}"' Cargo.toml - ''; - useFetchCargoVendor = true; - cargoHash = "sha256-uo/TGyfNChq/t6Dah0HhXhAwktyQk0V/wewezZuftNk="; - - nativeBuildInputs = [ - yq # for `tomlq` - ]; + cargoHash = "sha256-dPTrIc/hTbMlFDXYMk/dTjqaNECazldfW43egDOwyLM="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; From 7ce5e5aa0f6db84c22284854c61f301c1c82b7cf Mon Sep 17 00:00:00 2001 From: oddlama Date: Sat, 7 Jun 2025 11:34:48 +0200 Subject: [PATCH 18/28] nixos/kanidm: add option and tests for imperative group management (cherry picked from commit 5f833b1008e4d101e985648dd0b558e2ad46b010) --- nixos/modules/services/security/kanidm.nix | 11 +++++++++++ nixos/tests/kanidm-provisioning.nix | 19 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index 67b219595458..bb56d5a44797 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -465,6 +465,17 @@ in apply = unique; default = [ ]; }; + + overwriteMembers = mkOption { + description = '' + Whether the member list should be overwritten each time (true) or appended + (false). Append mode allows interactive group management in addition to the + declared members. Also, future member removals cannot be reflected + automatically in append mode. + ''; + type = types.bool; + default = true; + }; }; config.members = concatLists ( flip mapAttrsToList cfg.provision.persons ( diff --git a/nixos/tests/kanidm-provisioning.nix b/nixos/tests/kanidm-provisioning.nix index 8f0ca0ec0859..7b40675aacd2 100644 --- a/nixos/tests/kanidm-provisioning.nix +++ b/nixos/tests/kanidm-provisioning.nix @@ -74,6 +74,10 @@ import ./make-test-python.nix ( }; groups.testgroup1 = { }; + groups.imperative = { + overwriteMembers = false; + members = [ "testuser1" ]; + }; persons.testuser1 = { displayName = "Test User"; @@ -134,6 +138,11 @@ import ./make-test-python.nix ( }; groups.testgroup1 = { }; + groups.imperative = { + overwriteMembers = false; + # Will be retained: + # members = [ "testuser1" ]; + }; persons.testuser1 = { displayName = "Test User (changed)"; @@ -329,6 +338,10 @@ import ./make-test-python.nix ( out = provision.succeed("kanidm group get testgroup1") assert_contains(out, "name: testgroup1") + out = provision.succeed("kanidm group get imperative") + assert_contains(out, "name: imperative") + assert_contains(out, "member: testuser1") + out = provision.succeed("kanidm group get supergroup1") assert_contains(out, "name: supergroup1") assert_contains(out, "member: testgroup1") @@ -339,6 +352,7 @@ import ./make-test-python.nix ( assert_contains(out, "legalname: Jane Doe") assert_contains(out, "mail: jane.doe@example.com") assert_contains(out, "memberof: testgroup1") + assert_contains(out, "memberof: imperative") assert_contains(out, "memberof: service1-access") out = provision.succeed("kanidm person get testuser2") @@ -383,6 +397,10 @@ import ./make-test-python.nix ( out = provision.succeed("kanidm group get testgroup1") assert_contains(out, "name: testgroup1") + out = provision.succeed("kanidm group get imperative") + assert_contains(out, "name: imperative") + assert_contains(out, "member: testuser1") + out = provision.succeed("kanidm group get supergroup1") assert_contains(out, "name: supergroup1") assert_lacks(out, "member: testgroup1") @@ -394,6 +412,7 @@ import ./make-test-python.nix ( assert_contains(out, "mail: jane.doe@example.com") assert_contains(out, "mail: second.doe@example.com") assert_lacks(out, "memberof: testgroup1") + assert_contains(out, "memberof: imperative") assert_contains(out, "memberof: service1-access") out = provision.succeed("kanidm person get testuser2") From f774b03b1e75f22c79487cc6714d3906bd767b36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 May 2025 07:20:08 +0000 Subject: [PATCH 19/28] mergiraf: 0.8.0 -> 0.8.1 (cherry picked from commit 5d599101f53e88579a9fe35355b4f13b1015acbc) --- pkgs/by-name/me/mergiraf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index 4d60d995b184..3642d9f256e3 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage rec { pname = "mergiraf"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "mergiraf"; repo = "mergiraf"; rev = "refs/tags/v${version}"; - hash = "sha256-CQriH0vZ+ZBSIZcj0MKQEojpugS2g4sCuDICmwLCUBE="; + hash = "sha256-HtIrl9q64JLV/ufJ2g9OrQDDOkcwvyn4+l6/dUqwXkw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nsWRysIupGC3w0L7OMChcgPPTHSwnmcKv58BTn51cY4="; + cargoHash = "sha256-xe+JbXKOfxj0XSUM3zW0cYkWo22nyTOp+mOudv3UbE4="; nativeCheckInputs = [ git From 774a860fab50082fe321abae5dcb9b7fdedd1bab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Jun 2025 09:15:39 +1000 Subject: [PATCH 20/28] mergiraf: 0.8.1 -> 0.10.0 (#413571) https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.9.0 https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.10.0 (cherry picked from commit 14ec05570d5336bde2bad5ae56416cbb3ef39850) --- pkgs/by-name/me/mergiraf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index 3642d9f256e3..64df812e3231 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage rec { pname = "mergiraf"; - version = "0.8.1"; + version = "0.10.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "mergiraf"; repo = "mergiraf"; rev = "refs/tags/v${version}"; - hash = "sha256-HtIrl9q64JLV/ufJ2g9OrQDDOkcwvyn4+l6/dUqwXkw="; + hash = "sha256-wnXOl7KzSvvxQP4CebOJ+fEIn7fQDKTmO2PkGMRA4t4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-xe+JbXKOfxj0XSUM3zW0cYkWo22nyTOp+mOudv3UbE4="; + cargoHash = "sha256-jShWfd3m9g6YlUFLOzlMPFtuXAAfjh+sBujCJ9F2Uj0="; nativeCheckInputs = [ git From a6990d5ac1322064c55bec8c497a056c8aa98f82 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 8 Jun 2025 18:44:05 +0200 Subject: [PATCH 21/28] mergiraf: remove unused argument (cherry picked from commit 07d2ebcb015b4a0d92631c35d05fe0b304d36116) --- pkgs/by-name/me/mergiraf/package.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index 64df812e3231..07518fd42c72 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromGitea, rustPlatform, @@ -24,14 +23,10 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-jShWfd3m9g6YlUFLOzlMPFtuXAAfjh+sBujCJ9F2Uj0="; - nativeCheckInputs = [ - git - ]; + nativeCheckInputs = [ git ]; doInstallCheck = true; - nativeInstallCheckInputs = [ - versionCheckHook - ]; + nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; From cf4b7a7ce095bb776c9c89b156afbe8d7461656f Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 8 Jun 2025 18:44:05 +0200 Subject: [PATCH 22/28] mergiraf: use finalAttrs pattern (cherry picked from commit f384930aabe1adcb6e9529fd75bcdf64d562ad3c) --- pkgs/by-name/me/mergiraf/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index 07518fd42c72..ad5121780063 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -8,7 +8,7 @@ versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "mergiraf"; version = "0.10.0"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { domain = "codeberg.org"; owner = "mergiraf"; repo = "mergiraf"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-wnXOl7KzSvvxQP4CebOJ+fEIn7fQDKTmO2PkGMRA4t4="; }; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Syntax-aware git merge driver for a growing collection of programming languages and file formats"; homepage = "https://mergiraf.org/"; - changelog = "https://codeberg.org/mergiraf/mergiraf/releases/tag/v${version}"; + changelog = "https://codeberg.org/mergiraf/mergiraf/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ zimbatm @@ -41,4 +41,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "mergiraf"; }; -} +}) From f3f504ba8437da54148f832ffacec7f1a63f6983 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 8 Jun 2025 18:45:23 +0200 Subject: [PATCH 23/28] mergiraf: use tag in fetchFromGitea (cherry picked from commit f50c275feef9af838afc74cc00074f0608fcb57e) --- pkgs/by-name/me/mergiraf/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index ad5121780063..a0578e7295de 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { domain = "codeberg.org"; owner = "mergiraf"; repo = "mergiraf"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wnXOl7KzSvvxQP4CebOJ+fEIn7fQDKTmO2PkGMRA4t4="; }; From 16ed9a5b74c66ba6961fb7f989e7e77ffa8a9641 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 8 Jun 2025 18:47:36 +0200 Subject: [PATCH 24/28] mergiraf: add updateScript (cherry picked from commit b27e729739d302b9ef59a3687f9f8304580a3270) --- pkgs/by-name/me/mergiraf/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index a0578e7295de..b68794033f6f 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -2,6 +2,7 @@ lib, fetchFromGitea, rustPlatform, + nix-update-script, # native check inputs git, @@ -30,6 +31,8 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckProgramArg = "--version"; + passthru.updateScript = nix-update-script { }; + meta = { description = "Syntax-aware git merge driver for a growing collection of programming languages and file formats"; homepage = "https://mergiraf.org/"; From 2b72e2d7066024e0ca59ba18a625b830d70de08f Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 8 Jun 2025 18:46:33 +0200 Subject: [PATCH 25/28] mergiraf: add meta.downloadPage (cherry picked from commit 8a4403a17e241be9e17539d0ad2bd6c4d9ae1889) --- pkgs/by-name/me/mergiraf/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index b68794033f6f..9b6e1f3cabd4 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -36,6 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Syntax-aware git merge driver for a growing collection of programming languages and file formats"; homepage = "https://mergiraf.org/"; + downloadPage = "https://codeberg.org/mergiraf/mergiraf"; changelog = "https://codeberg.org/mergiraf/mergiraf/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ From 7bc9567dd2e4e3a66157fd76fccf3f6b33b2c328 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 8 Jun 2025 18:47:03 +0200 Subject: [PATCH 26/28] mergiraf: add defelo as maintainer (cherry picked from commit 213d22801443c0529c184818332a73100fc97554) --- pkgs/by-name/me/mergiraf/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index 9b6e1f3cabd4..005043b4e71a 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -42,6 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ zimbatm genga898 + defelo ]; mainProgram = "mergiraf"; }; From 00ef19af0feade355920c020ddb04ffca16ea456 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 8 Jun 2025 13:00:04 +0200 Subject: [PATCH 27/28] tokei: fix failed downcast to NumberFormatStyle when parsing argument (cherry picked from commit e5681b84f595f3e4192460fac4ea5fdc9ee76296) --- pkgs/by-name/to/tokei/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/to/tokei/package.nix b/pkgs/by-name/to/tokei/package.nix index 42e0ba450c75..a19d2761feae 100644 --- a/pkgs/by-name/to/tokei/package.nix +++ b/pkgs/by-name/to/tokei/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, rustPlatform, + fetchpatch2, libiconv, zlib, }: @@ -18,6 +19,14 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-jCI9VM3y76RI65E5UGuAPuPkDRTMyi+ydx64JWHcGfE="; }; + patches = [ + (fetchpatch2 { + # https://github.com/XAMPPRocky/tokei/pull/1209 + url = "https://github.com/XAMPPRocky/tokei/commit/ce8d8535276a2e41878981a8199232986ab96c6b.patch"; + hash = "sha256-1tb+WmjVsTxs8Awf1mbKOBIhJ3ddoOT8ZjBKA2BMocg="; + }) + ]; + useFetchCargoVendor = true; cargoHash = "sha256-LzlyrKaRjUo6JnVLQnHidtI4OWa+GrhAc4D8RkL+nmQ="; From 881a31616ec3eca363913bf96e5de33cb6262f8b Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 8 Jun 2025 21:49:42 +0200 Subject: [PATCH 28/28] nixos/olivetin: use yq-go to merge config files (cherry picked from commit f71748184cd859ac15a46115b45bd4a38a43906c) --- nixos/modules/services/web-apps/olivetin.nix | 28 +++++--------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/nixos/modules/services/web-apps/olivetin.nix b/nixos/modules/services/web-apps/olivetin.nix index 5facc7eb7a56..718c732e3c5a 100644 --- a/nixos/modules/services/web-apps/olivetin.nix +++ b/nixos/modules/services/web-apps/olivetin.nix @@ -102,30 +102,16 @@ in inherit (cfg) path; preStart = '' - tmp="$(mktemp -d)" - trap 'rm -rf "$tmp"' EXIT - cd "$tmp" + shopt -s nullglob - cp ${settingsFormat.generate "olivetin-config.yaml" cfg.settings} config.yaml - chmod +w config.yaml - for ((i=0; i < ${toString (lib.length cfg.extraConfigFiles)}; i++)); do - ${lib.getExe pkgs.yq} -yi ' - def merge($y): - . as $x | - if ($x | type == "object") and ($y | type == "object") then - $x + $y + with_entries(select(.key | in($y)) | .key as $key | .value |= merge($y[$key])) - elif ($x | type == "array") and ($y | type == "array") then - $x + $y - else - $y - end; - merge($f | fromjson) - ' config.yaml --rawfile f <(${lib.getExe pkgs.yq} -c . "$CREDENTIALS_DIRECTORY/config-$i.yaml") - done - chmod -w config.yaml + tmp="$(mktemp)" + ${lib.getExe pkgs.yq-go} eval-all '. as $item ireduce ({}; . *+ $item)' \ + ${settingsFormat.generate "olivetin-config.yaml" cfg.settings} \ + $CREDENTIALS_DIRECTORY/config-*.yaml > "$tmp" + chmod -w "$tmp" mkdir -p /run/olivetin/config - mv config.yaml /run/olivetin/config/config.yaml + mv "$tmp" /run/olivetin/config/config.yaml ''; serviceConfig = {