From f2e2e99ef4aa5d2a70ca12cd8bf27d2e91d01b83 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 28 Jul 2025 17:22:09 +0200 Subject: [PATCH 1/2] ripasso-cursive: switch to `finalAttrs` pattern --- pkgs/by-name/ri/ripasso-cursive/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ri/ripasso-cursive/package.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix index 76ff51e97c61..482d62fdfc58 100644 --- a/pkgs/by-name/ri/ripasso-cursive/package.nix +++ b/pkgs/by-name/ri/ripasso-cursive/package.nix @@ -19,14 +19,14 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { version = "0.7.0"; pname = "ripasso-cursive"; src = fetchFromGitHub { owner = "cortex"; repo = "ripasso"; - tag = "release-${version}"; + tag = "release-${finalAttrs.version}"; hash = "sha256-j98X/+UTea4lCtFfMpClnfcKlvxm4DpOujLc0xc3VUY="; }; @@ -81,4 +81,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ sgo ]; platforms = lib.platforms.unix; }; -} +}) From 63eee198a63516dd2dc09c6a10664777340d206b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 28 Jul 2025 17:24:14 +0200 Subject: [PATCH 2/2] ripasso-cursive: use `writableTmpDirAsHomeHook` --- pkgs/by-name/ri/ripasso-cursive/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ri/ripasso-cursive/package.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix index 482d62fdfc58..b3ea8c3a235c 100644 --- a/pkgs/by-name/ri/ripasso-cursive/package.nix +++ b/pkgs/by-name/ri/ripasso-cursive/package.nix @@ -9,6 +9,7 @@ installShellFiles, pkg-config, python3, + writableTmpDirAsHomeHook, # buildInputs libgpg-error, @@ -44,6 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pkg-config python3 rustPlatform.bindgenHook + writableTmpDirAsHomeHook ]; buildInputs = [ @@ -54,10 +56,6 @@ rustPlatform.buildRustPackage (finalAttrs: { xorg.libxcb ]; - preCheck = '' - export HOME=$(mktemp -d) - ''; - checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # Fails in the darwin sandbox with: # Attempted to create a NULL object.