JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #88838 from r-ryantm/auto-update/monolith

Browse Source 
monolith: 2.2.5 -> 2.2.6
This commit is contained in:
Mario Rodas 2020-05-25 06:07:11 -05:00 committed by GitHub
commit 246b93a81b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/backup/monolith/default.nix
View File

@ -3,25 +3,27 @@
, fetchFromGitHub
, pkg-config
, openssl
, Security
}:
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 ];
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";

4
pkgs/top-level/all-packages.nix
View File

@ -5266,7 +5266,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;