From ef47f32b6f6040753ba8a31677ad0e92376b9f8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jan 2024 22:11:43 +0000 Subject: [PATCH 1/2] monolith: 2.7.0 -> 2.8.0 --- 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 d89ad0d1dc10..c23c4f6a3591 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "monolith"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "Y2Z"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pljMWAfmDQUxQEyFGVhXqLjRq6P7D+YUB/e1h66WnDE="; + sha256 = "sha256-TYLQkVVjIFr6BrPaKJSHDnLAK0HQuI3Pmi2IkWVoIn4="; }; - cargoSha256 = "sha256-kFDyjiupjN1cuhzE16v6JP/yyXdtwL3srZVtSimnahA="; + cargoHash = "sha256-NIKueum/BQEW21e8/DGadtwylXeT3Vl2TOVbbxxWkLY="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] From cb0f22b4d46a533883171f6775424ed8969f14fa Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 19 Jan 2024 17:12:14 +0100 Subject: [PATCH 2/2] monolith: add missing framework on darwin --- pkgs/tools/backup/monolith/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index c23c4f6a3591..38ae3e7cddd3 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -5,6 +5,7 @@ , openssl , libiconv , Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { @@ -22,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ]; checkFlagsArray = [ "--skip=tests::cli" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14ab047f1d0b..a08b82abb9d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10963,7 +10963,7 @@ with pkgs; monocraft = callPackage ../data/fonts/monocraft { }; monolith = callPackage ../tools/backup/monolith { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; moreutils = callPackage ../tools/misc/moreutils {