From a197baaa112b50b2809b784b5453260539a8164a Mon Sep 17 00:00:00 2001 From: mksafavi Date: Sun, 23 Feb 2025 19:42:38 +0330 Subject: [PATCH 1/2] turnon: fixed crashing due to missing settings gschema --- pkgs/by-name/tu/turnon/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tu/turnon/package.nix b/pkgs/by-name/tu/turnon/package.nix index 37c4a04ed449..f297baccc013 100644 --- a/pkgs/by-name/tu/turnon/package.nix +++ b/pkgs/by-name/tu/turnon/package.nix @@ -8,6 +8,7 @@ libadwaita, blueprint-compiler, wrapGAppsHook4, + gsettings-desktop-schemas, }: rustPlatform.buildRustPackage rec { @@ -34,13 +35,18 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libadwaita + gsettings-desktop-schemas ]; strictDeps = true; - preBuild = '' - blueprint-compiler format resources/**/*.blp - ''; + postInstall = + # The build.rs compiles the settings schema and writes the compiled file next to the .xml file. + # This copies the compiled file to a path that can be detected by gsettings-desktop-schemas + '' + mkdir -p "$out/share/glib-2.0/schemas" + cp "schemas/gschemas.compiled" "$out/share/glib-2.0/schemas" + ''; meta = { description = "Turn on devices in your local network"; From c32ee9b0bdf50152429b8a56b64098eda68643bc Mon Sep 17 00:00:00 2001 From: mksafavi Date: Sun, 23 Feb 2025 19:41:31 +0330 Subject: [PATCH 2/2] turnon: 2.3.1 -> 2.3.4 turnon: skipped network ping tests --- pkgs/by-name/tu/turnon/package.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tu/turnon/package.nix b/pkgs/by-name/tu/turnon/package.nix index f297baccc013..3a582fd21167 100644 --- a/pkgs/by-name/tu/turnon/package.nix +++ b/pkgs/by-name/tu/turnon/package.nix @@ -13,17 +13,26 @@ rustPlatform.buildRustPackage rec { pname = "turnon"; - version = "2.3.1"; + version = "2.3.4"; src = fetchFromGitHub { owner = "swsnr"; repo = "turnon"; rev = "v${version}"; - hash = "sha256-Dl0uTPXy57W18WBxHpytL6Nq9tTrzYOdC3u1O4Dnm3w="; + hash = "sha256-eKJRyQMZOa/QRUW0VQ0EkXbJSMcYHfCC9wTs0YEB1yo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-EL7xLXtOzvitVMsDeMUcLR9hdvM2wjBZBEgJPJLanUE="; + cargoHash = "sha256-SjENjQjdg5Vrpd911QOcH9lmW7+BACaN4a/oGb2miI4="; + + doCheck = true; + + checkFlags = [ + # Skipped due to "Permission denied (os error 13)" + "--skip=net::ping::tests::ping_loopback_ipv4" + "--skip=net::ping::tests::ping_loopback_ipv6" + "--skip=net::ping::tests::ping_with_timeout_unroutable" + ]; nativeBuildInputs = [ cairo