From fb1ea0c84f1a59ac898fd28ef6fc214e2eae5d36 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 8 Jul 2024 10:45:55 +0200 Subject: [PATCH 1/2] rio: add missing MetalKit darwin dependency + mark as broken --- pkgs/applications/terminal-emulators/rio/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index 48f175e67e7c..fc56c5df2a51 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -32,6 +32,7 @@ let darwin.libobjc darwin.apple_sdk_11_0.frameworks.AppKit darwin.apple_sdk_11_0.frameworks.AVFoundation + darwin.apple_sdk_11_0.frameworks.MetalKit darwin.apple_sdk_11_0.frameworks.Vision ] else [ (lib.getLib gcc-unwrapped) @@ -118,5 +119,11 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.unix; changelog = "https://github.com/raphamorim/rio/blob/v${version}/CHANGELOG.md"; mainProgram = "rio"; + # ---- corcovado/src/sys/unix/eventedfd.rs - sys::unix::eventedfd::EventedFd (line 31) stdout ---- + # Test executable failed (exit status: 101). + # stderr: + # thread 'main' panicked at corcovado/src/sys/unix/eventedfd.rs:24:16: + # called `Result::unwrap()` on an `Err` value: Os { code: 1, kind: PermissionDenied, message: "Operation not permitted" } + broken = stdenv.isDarwin; }; } From 0263009dce441e6d98265d9448637c4c9058f8cb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 6 Jul 2024 12:20:20 +0200 Subject: [PATCH 2/2] rio: 0.1.0 -> 0.1.1 Diff: https://github.com/raphamorim/rio/compare/v0.1.0...v0.1.1 Changelog: https://github.com/raphamorim/rio/blob/v0.1.1/CHANGELOG.md --- .../terminal-emulators/rio/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index fc56c5df2a51..178677af6011 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -26,6 +26,9 @@ , withWayland ? !stdenv.isDarwin , wayland + +, testers +, rio }: let rlinkLibs = if stdenv.isDarwin then [ @@ -52,16 +55,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; - rev = "v${version}"; - hash = "sha256-Jp8f8u9CkY+pz6QaoWp6P6+OqsIjhzXH0eeoBiSDR0k="; + rev = "refs/tags/v${version}"; + hash = "sha256-Hll9QpCN0/NDJ3tgJFnmNjfIotppGg5/BrHMxGmxOTo="; }; - cargoHash = "sha256-3FirYpHxTRvXgRQACVvmwlaCNTyJ8dLbZ258qv5vbsc="; + cargoHash = "sha256-yyxJi0kK2d2I+9GncYHcRKbdngYSltDjsTuChqaDG/U="; nativeBuildInputs = [ ncurses @@ -108,7 +111,10 @@ rustPlatform.buildRustPackage rec { extraArgs = [ "--version-regex" "v([0-9.]+)" ]; }; - tests.test = nixosTests.terminal-emulators.rio; + tests = { + test = nixosTests.terminal-emulators.rio; + version = testers.testVersion { package = rio; }; + }; }; meta = {