From c75eb7033642e836e4801966a17b068a577c8129 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 18 Jul 2023 04:20:00 +0000 Subject: [PATCH] rbw: 1.7.1 -> 1.8.1 Changelog: https://git.tozt.net/rbw/plain/CHANGELOG.md?id=1.8.1 --- pkgs/tools/security/rbw/default.nix | 13 ++++++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index 21952a3cdae7..0bd208c2af0b 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -5,7 +5,7 @@ , openssl , pkg-config , installShellFiles -, Security +, darwin # rbw-fzf , withFzf ? false @@ -24,20 +24,23 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "1.7.1"; + version = "1.8.1"; src = fetchzip { url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz"; - sha256 = "sha256-xE3T3iVXFaaTF90ehQiG6+dLXcsqrHeprSMUnlSsxkE="; + sha256 = "sha256-cRfCsuhVlTRSgndf4rZrfLG/+NgI4VshVwbQydJt2cE="; }; - cargoHash = "sha256-eaG56FGz4smlqDPi/CJ0KB7NMEgp684X19PVWxGQutw="; + cargoHash = "sha256-CFhBSRqWAJJJkeMNnLwp6/pLhIZHFvdlPn7pjfJFBWw="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.AppKit + ]; preConfigure = lib.optionalString stdenv.isLinux '' export OPENSSL_INCLUDE_DIR="${openssl.dev}/include" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9646ec6e0311..4ac573b0310c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11926,9 +11926,7 @@ with pkgs; revolt-desktop = callPackage ../applications/networking/instant-messengers/revolt-desktop { }; - rbw = callPackage ../tools/security/rbw { - inherit (darwin.apple_sdk.frameworks) Security; - }; + rbw = callPackage ../tools/security/rbw { }; remarshal = with python3Packages; toPythonApplication remarshal;