From 6169eeed6ee6e07f1b64c58c82e0657d51197eee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 05:16:27 +0000 Subject: [PATCH 01/15] komodo: 1.18.4 -> 1.19.0 --- pkgs/by-name/ko/komodo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ko/komodo/package.nix b/pkgs/by-name/ko/komodo/package.nix index b648e57a0776..bae83422e8bc 100644 --- a/pkgs/by-name/ko/komodo/package.nix +++ b/pkgs/by-name/ko/komodo/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "komodo"; - version = "1.18.4"; + version = "1.19.0"; src = fetchFromGitHub { owner = "moghtech"; repo = "komodo"; tag = "v${version}"; - hash = "sha256-allGKoeI3mlMWbF9WsDbX/4eGdBT/eoF71uAk5iK0e4="; + hash = "sha256-KwxR5LKd82KAOxM8YTWbovTXR4eA/O49BmWemsNF1Yw="; }; - cargoHash = "sha256-nlCGrPlH+AZNz7BYDcoU0WBHBft4DnO4WfqGD5wVLmQ="; + cargoHash = "sha256-NkAkGM2FqYdSMmRZVJ4ryJR3vabLSj3OEyuL+8mopIY="; # disable for check. document generation is fail # > error: doctest failed, to rerun pass `-p komodo_client --doc` From 976ca8e76238b5681eb7acd9223ee8a44af5b706 Mon Sep 17 00:00:00 2001 From: misilelab Date: Tue, 19 Aug 2025 22:34:39 +0900 Subject: [PATCH 02/15] pixi: 0.52.0 -> 0.53.0 https://github.com/prefix-dev/pixi/releases/tag/v0.53.0 Signed-off-by: misilelab --- pkgs/by-name/pi/pixi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index 98224216e377..0211bdc9c551 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pixi"; - version = "0.52.0"; + version = "0.53.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; tag = "v${finalAttrs.version}"; - hash = "sha256-zmFoIoyTYq/xqPNBuy90aK/Ao1DGx+3Jb1zzatNY7+Q="; + hash = "sha256-cWoepvnolVyUyDlYakxQLNkOOP9ZbBwe5EaWbYTz+Gs="; }; - cargoHash = "sha256-FWjZiBMSUFBIi+Sx5FTp2UZa12b+pmtx1eqVETHQWEQ="; + cargoHash = "sha256-3Sd+EjpSYbexmnUAwLps/Hrj7anpyurbzZlVs2hZk4E="; nativeBuildInputs = [ pkg-config From 5bf001f262ee6a0262c8486d18d6ac204ca1f7a8 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 19 Aug 2025 21:52:57 -0500 Subject: [PATCH 03/15] yaziPlugins: update on 2025-08-19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - lazygit: 0-unstable-2025-03-31 → 0-unstable-2025-08-06 - mediainfo: 25.5.31-unstable-2025-07-19 → 25.5.31-unstable-2025-08-06 - mount: 25.5.31-unstable-2025-07-02 → 25.5.31-unstable-2025-08-11 - restore: 25.5.31-unstable-2025-07-11 → 25.5.31-unstable-2025-08-12 Signed-off-by: Austin Horstman --- pkgs/by-name/ya/yazi/plugins/lazygit/default.nix | 6 +++--- pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix | 6 +++--- pkgs/by-name/ya/yazi/plugins/mount/default.nix | 6 +++--- pkgs/by-name/ya/yazi/plugins/restore/default.nix | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ya/yazi/plugins/lazygit/default.nix b/pkgs/by-name/ya/yazi/plugins/lazygit/default.nix index 69dab6a2bab7..c9e5c8ab2e99 100644 --- a/pkgs/by-name/ya/yazi/plugins/lazygit/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/lazygit/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "lazygit.yazi"; - version = "0-unstable-2025-03-31"; + version = "0-unstable-2025-08-06"; src = fetchFromGitHub { owner = "Lil-Dank"; repo = "lazygit.yazi"; - rev = "7a08a0988c2b7481d3f267f3bdc58080e6047e7d"; - hash = "sha256-OJJPgpSaUHYz8a9opVLCds+VZsK1B6T+pSRJyVgYNy8="; + rev = "8f37dc5795f165021098b17d797c7b8f510aeca9"; + hash = "sha256-rR7SMTtQYrvQjhkzulDaNH/LAA77UnXkcZ50WwBX2Uw="; }; meta = { diff --git a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix index c18f8748f624..3cbdeeb4b1b4 100644 --- a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "mediainfo.yazi"; - version = "25.5.31-unstable-2025-07-19"; + version = "25.5.31-unstable-2025-08-06"; src = fetchFromGitHub { owner = "boydaihungst"; repo = "mediainfo.yazi"; - rev = "f89605ce7ca33181ee6770e641d80ec4673093e0"; - hash = "sha256-NloChkZWKo9JL636d+G7vgEY/HX24udngYftw/Ydzk4="; + rev = "0e2ae47cfb2b7c7a32d714c753b1cebbaa75d127"; + hash = "sha256-CHigaujMHd1BuYyyxzI5B4ZYQhuH2YZptVVJToq39sY="; }; meta = { diff --git a/pkgs/by-name/ya/yazi/plugins/mount/default.nix b/pkgs/by-name/ya/yazi/plugins/mount/default.nix index 981696ffc335..4da00adcaff1 100644 --- a/pkgs/by-name/ya/yazi/plugins/mount/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/mount/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "mount.yazi"; - version = "25.5.31-unstable-2025-07-02"; + version = "25.5.31-unstable-2025-08-11"; src = fetchFromGitHub { owner = "yazi-rs"; repo = "plugins"; - rev = "e5f00e2716fd177b0ca0d313f1a6e64f01c12760"; - hash = "sha256-DLcmzCmITybWrYuBpTyswtoGUimpagkyeVUWmbKjarY="; + rev = "e95c7b384e7b0a9793fe1471f0f8f7810ef2a7ed"; + hash = "sha256-TUS+yXxBOt6tL/zz10k4ezot8IgVg0/2BbS8wPs9KcE="; }; meta = { diff --git a/pkgs/by-name/ya/yazi/plugins/restore/default.nix b/pkgs/by-name/ya/yazi/plugins/restore/default.nix index 8174d3a505be..139dab6fffa0 100644 --- a/pkgs/by-name/ya/yazi/plugins/restore/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/restore/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "restore.yazi"; - version = "25.5.31-unstable-2025-07-11"; + version = "25.5.31-unstable-2025-08-12"; src = fetchFromGitHub { owner = "boydaihungst"; repo = "restore.yazi"; - rev = "84f1921806c49b7b20af26cbe57cb4fd286142e2"; - hash = "sha256-pEQZ/2Z4XVYlfzqtCz51bIgE9KzkDF/qyX8vThhlWGI="; + rev = "2a2ba2fbaee72f88054a43723becf66c3cfb892e"; + hash = "sha256-FqvQuKNH3jjXQ/7N7MsUsOoh9DTreZTjpdQ4lrr2iLk="; }; meta = { From d416416015943eb0b191fbe37b3e7e4046f5cc60 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 4 Aug 2025 13:58:23 +0800 Subject: [PATCH 04/15] sing-box: 1.11.15 -> 1.12.3 --- pkgs/by-name/si/sing-box/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index 6f558689e0d5..465ec13501a4 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -10,27 +10,26 @@ buildGoModule (finalAttrs: { pname = "sing-box"; - version = "1.11.15"; + version = "1.12.3"; src = fetchFromGitHub { owner = "SagerNet"; repo = "sing-box"; tag = "v${finalAttrs.version}"; - hash = "sha256-uqPV3PGk3hFpV1B8+htBG9x58RVWew0sBDUItpxyv8Q="; + hash = "sha256-OHhCC+tSDZRSDN9i3L6NtwgarBKHv+KGNyPhHttqo4g="; }; - vendorHash = "sha256-qZlnY0MxB4/ttgjuAroTfqGWqGRea549EyIjSxPAlOI="; + vendorHash = "sha256-Y/UP2rbee4WSctelk9QddMXciucz5dNLOLDDWtEFfLU="; tags = [ "with_quic" "with_dhcp" "with_wireguard" - "with_ech" "with_utls" - "with_reality_server" "with_acme" "with_clash_api" "with_gvisor" + "with_tailscale" ]; subPackages = [ @@ -50,6 +49,9 @@ buildGoModule (finalAttrs: { --replace-fail "/usr/bin/sing-box" "$out/bin/sing-box" \ --replace-fail "/bin/kill" "${coreutils}/bin/kill" install -Dm444 -t "$out/lib/systemd/system/" release/config/sing-box{,@}.service + + install -Dm444 release/config/sing-box.rules $out/share/polkit-1/rules.d/sing-box.rules + install -Dm444 release/config/sing-box-split-dns.xml $out/share/dbus-1/system.d/sing-box-split-dns.conf ''; passthru = { From 40ba3d54ddad824865135b5e269fd1485d5459e1 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 4 Aug 2025 14:15:09 +0800 Subject: [PATCH 05/15] nixos/sing-box: add prince213 to maintainers --- nixos/modules/services/networking/sing-box.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/sing-box.nix b/nixos/modules/services/networking/sing-box.nix index 104c75c8105c..3daffb4ca4ca 100644 --- a/nixos/modules/services/networking/sing-box.nix +++ b/nixos/modules/services/networking/sing-box.nix @@ -12,7 +12,10 @@ in { meta = { - maintainers = with lib.maintainers; [ nickcao ]; + maintainers = with lib.maintainers; [ + nickcao + prince213 + ]; }; options = { From b69da1bd4f60ffaf3a054626c3e6f5f0c3916731 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 4 Aug 2025 14:15:09 +0800 Subject: [PATCH 06/15] nixos/sing-box: add user and group --- .../modules/services/networking/sing-box.nix | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/sing-box.nix b/nixos/modules/services/networking/sing-box.nix index 3daffb4ca4ca..5910dadd5878 100644 --- a/nixos/modules/services/networking/sing-box.nix +++ b/nixos/modules/services/networking/sing-box.nix @@ -62,15 +62,27 @@ in } ]; + # for polkit rules + environment.systemPackages = [ cfg.package ]; + services.dbus.packages = [ cfg.package ]; systemd.packages = [ cfg.package ]; systemd.services.sing-box = { - preStart = utils.genJqSecretsReplacementSnippet cfg.settings "/run/sing-box/config.json"; serviceConfig = { + User = "sing-box"; + Group = "sing-box"; StateDirectory = "sing-box"; StateDirectoryMode = "0700"; RuntimeDirectory = "sing-box"; RuntimeDirectoryMode = "0700"; + ExecStartPre = + let + script = pkgs.writeShellScript "sing-box-pre-start" '' + ${utils.genJqSecretsReplacementSnippet cfg.settings "/run/sing-box/config.json"} + chown --reference=/run/sing-box /run/sing-box/config.json + ''; + in + "+${script}"; ExecStart = [ "" "${lib.getExe cfg.package} -D \${STATE_DIRECTORY} -C \${RUNTIME_DIRECTORY} run" @@ -78,6 +90,13 @@ in }; wantedBy = [ "multi-user.target" ]; }; - }; + users = { + users.sing-box = { + isSystemUser = true; + group = "sing-box"; + }; + groups.sing-box = { }; + }; + }; } From cfea340786d003721290b680d8b6ac1d6bf8cb8c Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 4 Aug 2025 14:24:41 +0800 Subject: [PATCH 07/15] nixosTests.sing-box: add prince213 to maintainers --- nixos/tests/sing-box.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/tests/sing-box.nix b/nixos/tests/sing-box.nix index 8e48031d1224..33720d08f673 100644 --- a/nixos/tests/sing-box.nix +++ b/nixos/tests/sing-box.nix @@ -111,7 +111,10 @@ in name = "sing-box"; meta = { - maintainers = with lib.maintainers; [ nickcao ]; + maintainers = with lib.maintainers; [ + nickcao + prince213 + ]; }; nodes = { From 664e9fc074f89566725af1cc137e9d01f74d56b1 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 4 Aug 2025 14:35:19 +0800 Subject: [PATCH 08/15] nixosTests.sing-box: migrate config --- nixos/tests/sing-box.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/nixos/tests/sing-box.nix b/nixos/tests/sing-box.nix index 33720d08f673..26ac949f270d 100644 --- a/nixos/tests/sing-box.nix +++ b/nixos/tests/sing-box.nix @@ -439,26 +439,19 @@ in dns = { final = "dns:default"; independent_cache = true; - fakeip = { - enabled = true; - inet4_range = "198.18.0.0/16"; - }; servers = [ { - detour = "outbound:direct"; + type = "udp"; tag = "dns:default"; - address = hosts."${target_host}"; + server = hosts."${target_host}"; } { + type = "fakeip"; tag = "dns:fakeip"; - address = "fakeip"; + inet4_range = "198.18.0.0/16"; } ]; rules = [ - { - outbound = [ "any" ]; - server = "dns:default"; - } { query_type = [ "A" @@ -482,6 +475,7 @@ in } ]; route = { + default_domain_resolver = "dns:default"; default_interface = "eth1"; final = "outbound:direct"; rules = [ From 9cc0e0ee20b899e47d3b2628619df62fe7d4f753 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Thu, 14 Aug 2025 10:25:41 +0800 Subject: [PATCH 09/15] nixosTests.sing-box: add resolved --- nixos/tests/sing-box.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/tests/sing-box.nix b/nixos/tests/sing-box.nix index 26ac949f270d..0825684e0bed 100644 --- a/nixos/tests/sing-box.nix +++ b/nixos/tests/sing-box.nix @@ -450,6 +450,12 @@ in tag = "dns:fakeip"; inet4_range = "198.18.0.0/16"; } + { + type = "resolved"; + tag = "dns:resolved"; + service = "service:resolved"; + accept_default_resolvers = true; + } ]; rules = [ { @@ -488,6 +494,12 @@ in } ]; }; + services = [ + { + type = "resolved"; + tag = "service:resolved"; + } + ]; }; }; }; From 5bcb1aca6fbbbc18874f3f0291e06d57310e4889 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 4 Aug 2025 14:47:57 +0800 Subject: [PATCH 10/15] nixos/doc/manual/release-notes/rl-2511: add sing-box --- nixos/doc/manual/release-notes/rl-2511.section.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index e89953885137..8a1d6d65a661 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -103,6 +103,9 @@ - The non-LTS Forgejo package (`forgejo`) has been updated to 12.0.0. This release contains breaking changes, see the [release blog post](https://forgejo.org/2025-07-release-v12-0/) for all the details and how to ensure smooth upgrades. +- `sing-box` has been updated to 1.12.3, which includes a number of breaking changes, old configurations may need updating or they will cause the tool to fail to run. + See the [change log](https://sing-box.sagernet.org/changelog/#1123) for details and [migration](https://sing-box.sagernet.org/migration/#1120) for how to update old configurations. + - The Pocket ID module ([`services.pocket-id`][#opt-services.pocket-id.enable]) and package (`pocket-id`) has been updated to 1.0.0. Some environment variables have been changed or removed, see the [migration guide](https://pocket-id.org/docs/setup/migrate-to-v1/). - The `zigbee2mqtt` package was updated to version 2.x, which contains breaking changes. See the [discussion](https://github.com/Koenkk/zigbee2mqtt/discussions/24198) for further information. From 6cec4af21a4117c46776476b2ae74b49f01c5dbd Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 21 Aug 2025 20:42:52 +0100 Subject: [PATCH 11/15] ncdu: 2.9 -> 2.9.1 Changes: https://dev.yorhel.nl/ncdu/changes2 --- pkgs/by-name/nc/ncdu/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix index 90e3869f525c..630dca3a9331 100644 --- a/pkgs/by-name/nc/ncdu/package.nix +++ b/pkgs/by-name/nc/ncdu/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ncdu"; - version = "2.9"; + version = "2.9.1"; src = fetchurl { url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz"; - hash = "sha256-dfCsO85PwBLoGYtyUY21F56QMHmFjvzgi5EtXcxwlNM="; + hash = "sha256-v9EJThQA7onP1ZIA6rlA8CXM3AwjgGcQXJhKPEhXv34="; }; nativeBuildInputs = [ From 9036b632786e69e6029aa264357aac2d3caaac5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 20:31:53 +0000 Subject: [PATCH 12/15] irust: 1.76.0 -> 1.76.1 --- pkgs/by-name/ir/irust/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ir/irust/package.nix b/pkgs/by-name/ir/irust/package.nix index 05445ae66713..437b4f92c9c5 100644 --- a/pkgs/by-name/ir/irust/package.nix +++ b/pkgs/by-name/ir/irust/package.nix @@ -21,16 +21,16 @@ rustPlatform.buildRustPackage rec { pname = "irust"; - version = "1.76.0"; + version = "1.76.1"; src = fetchFromGitHub { owner = "sigmaSd"; repo = "IRust"; rev = "irust@${version}"; - hash = "sha256-VCuXqOE4XQvfXxpDe8kSrTkiBAa4eU5m5Xv85+NZuFE="; + hash = "sha256-rNPB+POWDT6DKoqowHFmojNluFWjd+lXzYYsc9I6ebU="; }; - cargoHash = "sha256-I1IiyMvJXccIqRnmL9IWMQT/uyGUN/knn6RXTM8YN60="; + cargoHash = "sha256-OGK5CzDuA1sWmZgh2OCQBiTvGLdTjMALFnPXM5pYZo4="; nativeBuildInputs = [ makeWrapper ]; From 9db25b08a28b517a6cc3ea0eeb5c668b27daed30 Mon Sep 17 00:00:00 2001 From: FlameFlag <57304299+FlameFlag@users.noreply.github.com> Date: Thu, 21 Aug 2025 19:39:12 +0300 Subject: [PATCH 13/15] warp-terminal: 0.2025.08.06.08.12.stable_02 -> 0.2025.08.13.08.12.stable_02 Changelog: https://docs.warp.dev/getting-started/changelog#id-2025.08.13-v0.2025.08.13.08.12 --- pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 2f52dbc180bf..d6a1d7141aaf 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-wO3xE8cSSMaYVc6eoswDcR3acBzWwB/BHbins8ciM4Y=", - "version": "0.2025.08.06.08.12.stable_02" + "hash": "sha256-B9Qhh+1vvisdpE9XYQRbJ87Ilo4Qmy9Uvd7Zn4+TLxg=", + "version": "0.2025.08.13.08.12.stable_02" }, "linux_x86_64": { - "hash": "sha256-/Nhy0fyslK8h5zzhwlDJT+6nhNmdBowj/jGOTCunX4w=", - "version": "0.2025.08.06.08.12.stable_02" + "hash": "sha256-x87HElhBSrh00LiCcKX9AnWiROVN4SEZTqu7D1R72LI=", + "version": "0.2025.08.13.08.12.stable_02" }, "linux_aarch64": { - "hash": "sha256-Jqm2aUg11nrIZUofcLDYZ7BQtaSPx7KrrM91i0bc+ig=", - "version": "0.2025.08.06.08.12.stable_02" + "hash": "sha256-+lv8dpx5fi12rhG258zSj0att/vTi7DidKCYlUCIbvo=", + "version": "0.2025.08.13.08.12.stable_02" } } From 4abfb5d48e29bdc05c2946925ebb5e22b2d82697 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 05:18:27 +0000 Subject: [PATCH 14/15] hyprutils: 0.8.2 -> 0.8.3 --- pkgs/by-name/hy/hyprutils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix index aefb3383ec63..442a68e6c30b 100644 --- a/pkgs/by-name/hy/hyprutils/package.nix +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprutils"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprutils"; tag = "v${finalAttrs.version}"; - hash = "sha256-W0xgXsaqGa/5/7IBzKNhf0+23MqGPymYYfqT7ECqeTE="; + hash = "sha256-PosTxeL39YrLvCX5MqqPA6NNWQ4T5ea5K55nmN7ju9Q="; }; nativeBuildInputs = [ From 0951589765779edcc80bb2a664889f6a537d27c3 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 22 Aug 2025 00:05:20 +0300 Subject: [PATCH 15/15] kdePackages.kwayland-integration: fix build, use in Plasma 6 This is still the Qt5 version, but we deleted the old Qt5 version along with the rest of Plasma 5 so we need this now. --- .../services/desktop-managers/plasma6.nix | 2 +- .../plasma/kwayland-integration/default.nix | 43 +++++++++++++++++-- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 12bdb2a6db69..529734bd503f 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -183,7 +183,7 @@ in ++ lib.optionals config.services.desktopManager.plasma6.enableQt5Integration [ breeze.qt5 plasma-integration.qt5 - pkgs.plasma5Packages.kwayland-integration + kwayland-integration ( # Only symlink the KIO plugins, so we don't accidentally pull any services # like KCMs or kcookiejar diff --git a/pkgs/kde/plasma/kwayland-integration/default.nix b/pkgs/kde/plasma/kwayland-integration/default.nix index 8de6d3fae8be..1f4790f09a29 100644 --- a/pkgs/kde/plasma/kwayland-integration/default.nix +++ b/pkgs/kde/plasma/kwayland-integration/default.nix @@ -1,6 +1,41 @@ -{ mkKdeDerivation }: -mkKdeDerivation { +{ + stdenv, + sources, + + cmake, + pkg-config, + libsForQt5, + wayland-scanner, + + plasma-wayland-protocols, + wayland, + wayland-protocols, +}: +# not mkKdeDerivation because this is Qt5 land +stdenv.mkDerivation rec { pname = "kwayland-integration"; - # FIXME(qt5) - meta.broken = true; + inherit (sources.${pname}) version; + + src = sources.${pname}; + + nativeBuildInputs = [ + cmake + pkg-config + libsForQt5.extra-cmake-modules + ]; + + buildInputs = [ + libsForQt5.qtbase + libsForQt5.qtwayland + + libsForQt5.kwayland + libsForQt5.kwindowsystem + + plasma-wayland-protocols + wayland + wayland-protocols + wayland-scanner + ]; + + dontWrapQtApps = true; }