From 15562307c850e374ebc339dd13823a8d39253e66 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 11:55:25 +0100 Subject: [PATCH 1/6] ripasso-cursive: format --- pkgs/tools/security/ripasso/cursive.nix | 53 +++++++++++++------------ 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index fe216b91ff91..21641754374b 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -1,18 +1,19 @@ -{ stdenv -, lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, python3 -, openssl -, libgpg-error -, gpgme -, xorg -, nettle -, clang -, AppKit -, Security -, installShellFiles +{ + stdenv, + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + python3, + openssl, + libgpg-error, + gpgme, + xorg, + nettle, + clang, + AppKit, + Security, + installShellFiles, }: rustPlatform.buildRustPackage rec { @@ -43,16 +44,18 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = [ - openssl - libgpg-error - gpgme - xorg.libxcb - nettle - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Security - ]; + buildInputs = + [ + openssl + libgpg-error + gpgme + xorg.libxcb + nettle + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + AppKit + Security + ]; preCheck = '' export HOME=$TMPDIR From 7376feb6bb2312d952e80ec5c996218d0c382476 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 11:56:23 +0100 Subject: [PATCH 2/6] ripasso-cursive: move to by-name --- .../ri/ripasso-cursive}/fix-tests.patch | 0 .../ri/ripasso-cursive/package.nix} | 22 ++++++------------- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 7 insertions(+), 19 deletions(-) rename pkgs/{tools/security/ripasso => by-name/ri/ripasso-cursive}/fix-tests.patch (100%) rename pkgs/{tools/security/ripasso/cursive.nix => by-name/ri/ripasso-cursive/package.nix} (83%) diff --git a/pkgs/tools/security/ripasso/fix-tests.patch b/pkgs/by-name/ri/ripasso-cursive/fix-tests.patch similarity index 100% rename from pkgs/tools/security/ripasso/fix-tests.patch rename to pkgs/by-name/ri/ripasso-cursive/fix-tests.patch diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix similarity index 83% rename from pkgs/tools/security/ripasso/cursive.nix rename to pkgs/by-name/ri/ripasso-cursive/package.nix index 21641754374b..a595a724de2b 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/by-name/ri/ripasso-cursive/package.nix @@ -1,5 +1,4 @@ { - stdenv, lib, rustPlatform, fetchFromGitHub, @@ -11,8 +10,6 @@ xorg, nettle, clang, - AppKit, - Security, installShellFiles, }: @@ -44,18 +41,13 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - [ - openssl - libgpg-error - gpgme - xorg.libxcb - nettle - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Security - ]; + buildInputs = [ + openssl + libgpg-error + gpgme + xorg.libxcb + nettle + ]; preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7c3a0a6b7b0..8926c2fe0980 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2696,10 +2696,6 @@ with pkgs; razergenie = libsForQt5.callPackage ../applications/misc/razergenie { }; - ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix { - inherit (darwin.apple_sdk.frameworks) AppKit Security; - }; - roundcube = callPackage ../servers/roundcube { }; roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { }); From 1a2282008d5ae22857f5967e5c64d78a2aa0aea1 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 11:58:22 +0100 Subject: [PATCH 3/6] ripasso-cursive: remove unneeded clang dependency --- pkgs/by-name/ri/ripasso-cursive/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ri/ripasso-cursive/package.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix index a595a724de2b..73627babc845 100644 --- a/pkgs/by-name/ri/ripasso-cursive/package.nix +++ b/pkgs/by-name/ri/ripasso-cursive/package.nix @@ -9,7 +9,6 @@ gpgme, xorg, nettle, - clang, installShellFiles, }: @@ -37,7 +36,6 @@ rustPlatform.buildRustPackage rec { gpgme python3 installShellFiles - clang rustPlatform.bindgenHook ]; From 32d9748602625aa7595a460905dd2258b6843c2f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 11:59:37 +0100 Subject: [PATCH 4/6] ripasso-cursive: cosmetic changes --- pkgs/by-name/ri/ripasso-cursive/package.nix | 34 ++++++++++++--------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ri/ripasso-cursive/package.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix index 73627babc845..fa75bd01726f 100644 --- a/pkgs/by-name/ri/ripasso-cursive/package.nix +++ b/pkgs/by-name/ri/ripasso-cursive/package.nix @@ -2,14 +2,18 @@ lib, rustPlatform, fetchFromGitHub, + + # nativeBuildInputs + gpgme, + installShellFiles, pkg-config, python3, - openssl, + + # buildInputs libgpg-error, - gpgme, - xorg, nettle, - installShellFiles, + openssl, + xorg, }: rustPlatform.buildRustPackage rec { @@ -19,7 +23,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "cortex"; repo = "ripasso"; - rev = "release-${version}"; + rev = "refs/tags/release-${version}"; hash = "sha256-j98X/+UTea4lCtFfMpClnfcKlvxm4DpOujLc0xc3VUY="; }; @@ -32,35 +36,35 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p ripasso-cursive" ]; nativeBuildInputs = [ - pkg-config gpgme - python3 installShellFiles + pkg-config + python3 rustPlatform.bindgenHook ]; buildInputs = [ - openssl - libgpg-error gpgme - xorg.libxcb + libgpg-error nettle + openssl + xorg.libxcb ]; preCheck = '' - export HOME=$TMPDIR + export HOME=$(mktemp -d) ''; postInstall = '' installManPage target/man-page/cursive/ripasso-cursive.1 ''; - meta = with lib; { + meta = { description = "Simple password manager written in Rust"; mainProgram = "ripasso-cursive"; homepage = "https://github.com/cortex/ripasso"; - license = licenses.gpl3; - maintainers = with maintainers; [ sgo ]; - platforms = platforms.unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ sgo ]; + platforms = lib.platforms.unix; }; } From bba37efe584e545396a4e56fa6a32a32691af254 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 13:30:08 +0100 Subject: [PATCH 5/6] ripasso-cursive: add update script --- pkgs/by-name/ri/ripasso-cursive/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ri/ripasso-cursive/package.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix index fa75bd01726f..151a909de23d 100644 --- a/pkgs/by-name/ri/ripasso-cursive/package.nix +++ b/pkgs/by-name/ri/ripasso-cursive/package.nix @@ -14,6 +14,8 @@ nettle, openssl, xorg, + + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -59,6 +61,10 @@ rustPlatform.buildRustPackage rec { installManPage target/man-page/cursive/ripasso-cursive.1 ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Simple password manager written in Rust"; mainProgram = "ripasso-cursive"; From 178f5f70becc76eedf8b432d6ba2f1ce3e96d3e0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 13:54:32 +0100 Subject: [PATCH 6/6] ripasso-cursive: skip failing test on darwin --- pkgs/by-name/ri/ripasso-cursive/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ri/ripasso-cursive/package.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix index 151a909de23d..62d3ba3cac83 100644 --- a/pkgs/by-name/ri/ripasso-cursive/package.nix +++ b/pkgs/by-name/ri/ripasso-cursive/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, @@ -57,6 +58,13 @@ rustPlatform.buildRustPackage rec { export HOME=$(mktemp -d) ''; + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + # Fails in the darwin sandbox with: + # Attempted to create a NULL object. + # event loop thread panicked + "--skip=pass::pass_tests::test_add_recipient_not_in_key_ring" + ]; + postInstall = '' installManPage target/man-page/cursive/ripasso-cursive.1 '';