ripasso-cursive: cosmetic changes (#361736)

This commit is contained in:
Gaétan Lepage 2024-12-05 00:39:19 +01:00 committed by GitHub
commit 20486ea5b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 41 additions and 34 deletions

View File

@ -1,18 +1,22 @@
{ stdenv {
, lib lib,
, rustPlatform stdenv,
, fetchFromGitHub rustPlatform,
, pkg-config fetchFromGitHub,
, python3
, openssl # nativeBuildInputs
, libgpg-error gpgme,
, gpgme installShellFiles,
, xorg pkg-config,
, nettle python3,
, clang
, AppKit # buildInputs
, Security libgpg-error,
, installShellFiles nettle,
openssl,
xorg,
nix-update-script,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -22,7 +26,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cortex"; owner = "cortex";
repo = "ripasso"; repo = "ripasso";
rev = "release-${version}"; rev = "refs/tags/release-${version}";
hash = "sha256-j98X/+UTea4lCtFfMpClnfcKlvxm4DpOujLc0xc3VUY="; hash = "sha256-j98X/+UTea4lCtFfMpClnfcKlvxm4DpOujLc0xc3VUY=";
}; };
@ -35,39 +39,46 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "-p ripasso-cursive" ]; cargoBuildFlags = [ "-p ripasso-cursive" ];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config
gpgme gpgme
python3
installShellFiles installShellFiles
clang pkg-config
python3
rustPlatform.bindgenHook rustPlatform.bindgenHook
]; ];
buildInputs = [ buildInputs = [
openssl
libgpg-error
gpgme gpgme
xorg.libxcb libgpg-error
nettle nettle
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ openssl
AppKit xorg.libxcb
Security
]; ];
preCheck = '' preCheck = ''
export HOME=$TMPDIR 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 = '' postInstall = ''
installManPage target/man-page/cursive/ripasso-cursive.1 installManPage target/man-page/cursive/ripasso-cursive.1
''; '';
meta = with lib; { passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Simple password manager written in Rust"; description = "Simple password manager written in Rust";
mainProgram = "ripasso-cursive"; mainProgram = "ripasso-cursive";
homepage = "https://github.com/cortex/ripasso"; homepage = "https://github.com/cortex/ripasso";
license = licenses.gpl3; license = lib.licenses.gpl3;
maintainers = with maintainers; [ sgo ]; maintainers = with lib.maintainers; [ sgo ];
platforms = platforms.unix; platforms = lib.platforms.unix;
}; };
} }

View File

@ -2696,10 +2696,6 @@ with pkgs;
razergenie = libsForQt5.callPackage ../applications/misc/razergenie { }; 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 { }; roundcube = callPackage ../servers/roundcube { };
roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { }); roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { });