From 3a00c537fa350581ee41692fd51fb1ff7c203407 Mon Sep 17 00:00:00 2001 From: John Shaffer Date: Thu, 3 Nov 2022 13:25:56 -0500 Subject: [PATCH 1/2] srvc: 0.6.0 -> 0.7.0 --- pkgs/applications/version-management/srvc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index 8e32b42912c0..d7eb9ac34cd8 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "srvc"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "insilica"; repo = "rs-srvc"; rev = "v${version}"; - sha256 = "sha256-PBs86cvEacvCt/2JnURL4qKvXGXRZHWaGYrPUSsnt0I="; + sha256 = "sha256-XGZ6Jr/RVDOLDa0sANZIsKtNjY3pEBlOtei+xNGPBBY="; }; - cargoSha256 = "sha256-5CUbfI67gsINdHcxN8KbIN10Mu90rAU53DbmQ5QotWg="; + cargoSha256 = "sha256-sjMg5XMnAQZjp6z9prtRq+0pyNQ1oTm0/KWOZPxDW4w="; meta = with lib; { description = "Sysrev version control"; From 6af053e21b2e3a9b87a3dab75101e18612db1e07 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 4 Nov 2022 11:39:09 +0800 Subject: [PATCH 2/2] srvc: Fix darwin build --- pkgs/applications/version-management/srvc/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index d7eb9ac34cd8..a3e8d5dc8135 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "srvc"; @@ -13,6 +13,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-sjMg5XMnAQZjp6z9prtRq+0pyNQ1oTm0/KWOZPxDW4w="; + buildInputs = lib.optionals stdenv.isDarwin [ + Security + ]; + meta = with lib; { description = "Sysrev version control"; homepage = "https://github.com/insilica/rs-srvc"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6abae9d38f82..91e8a6070b11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4863,7 +4863,9 @@ with pkgs; spacevim = callPackage ../applications/editors/spacevim { }; - srvc = callPackage ../applications/version-management/srvc { }; + srvc = callPackage ../applications/version-management/srvc { + inherit (darwin.apple_sdk.frameworks) Security; + }; ssmsh = callPackage ../tools/admin/ssmsh { };