From a26830f3aa56208d8146776065761358eb7c245a Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 5 Nov 2021 11:23:19 -0400 Subject: [PATCH] cargo-modules: 0.5.0 -> 0.5.6, fix darwin build --- .../tools/rust/cargo-modules/default.nix | 15 ++++++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index f894915c24ec..5ef0168383c5 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -1,22 +1,27 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, CoreFoundation, CoreServices }: rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.5.0"; + version = "0.5.6"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = version; - sha256 = "0y6ag8nar85l2fh2ca41fglkzc74cv1p5szxrhk1jdqnd2qzhvjp"; + sha256 = "sha256-bLljwxNrCmg1ZWfSninIxJIFIn2oHY8dmbHYPdwtD+M="; }; - cargoSha256 = "0m5r36p57w4vw2g3hg12s38ay328swjb0qfl381xwb2xqx10g8kx"; + cargoSha256 = "sha256-heyVeQwEIOA9qtyXnHY8lPo06YgIUJaWCtaht9dWLoo="; + + buildInputs = lib.optionals stdenv.isDarwin [ + CoreFoundation + CoreServices + ]; meta = with lib; { description = "A cargo plugin for showing a tree-like overview of a crate's modules"; homepage = "https://github.com/regexident/cargo-modules"; license = with licenses; [ mpl20 ]; - maintainers = with maintainers; [ rvarago ]; + maintainers = with maintainers; [ figsoda rvarago ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4026ac0afb93..adb1863cbabf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12787,7 +12787,9 @@ with pkgs; cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - cargo-modules = callPackage ../development/tools/rust/cargo-modules { }; + cargo-modules = callPackage ../development/tools/rust/cargo-modules { + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices; + }; cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { inherit (darwin.apple_sdk.frameworks) Security; };