From a2e69f1b06c5244178d61bbc5541a1417c83bf39 Mon Sep 17 00:00:00 2001 From: Renaud Date: Sun, 12 May 2019 11:26:11 +0200 Subject: [PATCH 1/2] bitwarden_rs: 1.8.0 -> 1.9.0 Changelog: https://github.com/dani-garcia/bitwarden_rs/releases/tag/1.9.0 --- pkgs/tools/security/bitwarden_rs/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index 2dbbd93e13b..3db979767cb 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -2,20 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "0jz9r6ck6sfz4ig95x0ja6g5ikyq6z0xw1zn9zf4kxha4klqqbkx"; + sha256 = "14c2blzkmdd9s0gpf6b7y141yx9s2v2gmwy5l1lgqjhi3h6jpcqr"; }; - buildInputs = [ pkgconfig openssl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ]; RUSTC_BOOTSTRAP = 1; - cargoSha256 = "02xrz7vq8nan70f07xyf335blfmdc6gaz9sbfjipsi1drgfccf09"; + cargoSha256 = "038l6alcdc0g4avpbzxgd2k09nr3wrsbry763bq2c77qqgwldj8r"; meta = with lib; { description = "An unofficial lightweight implementation of the Bitwarden server API using Rust and SQLite"; From 1e9ad86cd3aaa372a088e7e3024a5ec5956c8239 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 12 May 2019 09:54:30 -0500 Subject: [PATCH 2/2] bitwarden_rs: fix darwin build --- pkgs/tools/security/bitwarden_rs/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index 3db979767cb..d22a2773fd9 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, pkgconfig, openssl }: +{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, Security, CoreServices }: rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security CoreServices ]; RUSTC_BOOTSTRAP = 1; cargoSha256 = "038l6alcdc0g4avpbzxgd2k09nr3wrsbry763bq2c77qqgwldj8r"; - meta = with lib; { + meta = with stdenv.lib; { description = "An unofficial lightweight implementation of the Bitwarden server API using Rust and SQLite"; homepage = https://github.com/dani-garcia/bitwarden_rs; license = licenses.gpl3; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bca0461518..cfadb2e868d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -674,7 +674,9 @@ in bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; - bitwarden_rs = callPackage ../tools/security/bitwarden_rs { }; + bitwarden_rs = callPackage ../tools/security/bitwarden_rs { + inherit (darwin.apple_sdk.frameworks) Security CoreServices; + }; bitwarden_rs-vault = callPackage ../tools/security/bitwarden_rs/vault.nix { };