From 8198d23ed72ec250f1a34144ab51c21dcd9b87a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 25 May 2020 00:08:48 +0000 Subject: [PATCH 1/2] monolith: 2.2.5 -> 2.2.6 --- pkgs/tools/backup/monolith/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index f3bcf82e545..b87f900ad98 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "monolith"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "Y2Z"; repo = pname; rev = "v${version}"; - sha256 = "0w19szxzhwxbgnv4k618p8v29dhbar1fn433bsz1cr1apnrahmkn"; + sha256 = "0ifv1h16xrs40gw5wx7kwj7hirnzpgfrznskz2igsslk7ycjlbr1"; }; - cargoSha256 = "06gc3cpx1m2f6fwrm8brw5nidg1v02q1qwqfxvv3xzmmczbw4345"; + cargoSha256 = "1plx9p265jcc6wg3bhcdk1f77md8ann08kkv3g2706d82kxy2c1i"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; From 3a3cbfd12b0998a6a31e6a8cd13fa13cf5e4fe7c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 24 May 2020 23:23:23 -0500 Subject: [PATCH 2/2] monolith: enable on darwin --- pkgs/tools/backup/monolith/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index b87f900ad98..261267b809a 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pkg-config , openssl +, Security }: rustPlatform.buildRustPackage rec { @@ -18,10 +19,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1plx9p265jcc6wg3bhcdk1f77md8ann08kkv3g2706d82kxy2c1i"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - checkPhase = "cargo test -- --skip tests::cli"; + checkFlagsArray = [ "--skip=tests::cli" ]; meta = with stdenv.lib; { description = "Bundle any web page into a single HTML file"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bd1772db83..b40c68c67c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5264,7 +5264,9 @@ in monit = callPackage ../tools/system/monit { }; - monolith = callPackage ../tools/backup/monolith { }; + monolith = callPackage ../tools/backup/monolith { + inherit (darwin.apple_sdk.frameworks) Security; + }; moreutils = callPackage ../tools/misc/moreutils { docbook-xsl = docbook_xsl;