From fe2be5eec29e2761d18d68f60c06232c36de6736 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 May 2022 19:20:11 +0200 Subject: [PATCH] bore-cli: 0.2.3 -> 0.4.0 --- pkgs/tools/networking/bore-cli/default.nix | 18 ++++++++++++++---- pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/bore-cli/default.nix b/pkgs/tools/networking/bore-cli/default.nix index 370a726caa64..5ca16499fe82 100644 --- a/pkgs/tools/networking/bore-cli/default.nix +++ b/pkgs/tools/networking/bore-cli/default.nix @@ -1,17 +1,26 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, Security +}: rustPlatform.buildRustPackage rec { pname = "bore-cli"; - version = "0.2.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "ekzhang"; repo = "bore"; rev = "v${version}"; - sha256 = "sha256-KSJ5KYXOwjtK1oE9IpsVKb7H4uuKJroCpM1Dk+2XJlY="; + hash = "sha256-ywdJH39OYLaM4st/DIcvvtIUzExpbAucMMpqouJL1yI="; }; - cargoSha256 = "sha256-HPMEbHDRmsmcr7Fuhsyr+NkdI9t1sL7q8uzj8sFks0s="; + cargoSha256 = "sha256-ZnEVTFiPo3AFyo1BoV88X2nCqYzRK6PkcbawiR+QnV0="; + + buildInputs = lib.optional stdenv.isDarwin [ + Security + ]; # tests do not find grcov path correctly meta = with lib; { @@ -19,5 +28,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ekzhang/bore"; license = licenses.mit; maintainers = with maintainers; [ DieracDelta ]; + mainProgram = "bore"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e780640be541..c27e0d56ac1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14987,7 +14987,11 @@ with pkgs; libodb = callPackage ../development/libraries/libodb { }; libodb-sqlite = callPackage ../development/libraries/libodb-sqlite { }; bdep = callPackage ../development/tools/build-managers/build2/bdep.nix { }; - bore-cli = callPackage ../tools/networking/bore-cli/default.nix {}; + + bore-cli = callPackage ../tools/networking/bore-cli/default.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; + bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { }; buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { };