Merge pull request #204812 from figsoda/cargo-modules

cargo-modules: 0.5.14 -> 0.7.0

authored by

figsoda and committed by
GitHub
8cdc50c4 a3c1a4ab

+11 -14
+10 -11
pkgs/development/tools/rust/cargo-modules/default.nix
··· 1 - { lib, rustPlatform, fetchCrate, stdenv, CoreFoundation, CoreServices }: 1 + { lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "cargo-modules"; 5 - version = "0.5.14"; 5 + version = "0.7.0"; 6 6 7 - src = fetchCrate { 8 - inherit pname version; 9 - sha256 = "sha256-urbyWNbmj2qEO4JJ/waRXGRJ9L5KgwsRB5Wh9yib8zc="; 7 + src = fetchFromGitHub { 8 + owner = "regexident"; 9 + repo = pname; 10 + rev = version; 11 + sha256 = "sha256-IBvSuyr3ERfPIivw6sEJSRta07Awmwd47cV1iKmvt8A="; 10 12 }; 11 13 12 - cargoSha256 = "sha256-3OxO+j5UuPEg9xNmN+kIqpdq6fVnFpgx5xCaMNue52g="; 14 + cargoSha256 = "sha256-zX3lBNQVWBrVQh+02TDUqU7Xmbd7hBOzJxD7cSNTNR0="; 13 15 14 16 buildInputs = lib.optionals stdenv.isDarwin [ 15 - CoreFoundation 16 - CoreServices 17 + darwin.apple_sdk.frameworks.CoreServices 17 18 ]; 18 - 19 - # the crate version doesn't include all the files required to run tests 20 - doCheck = false; 21 19 22 20 meta = with lib; { 23 21 description = "A cargo plugin for showing a tree-like overview of a crate's modules"; 24 22 homepage = "https://github.com/regexident/cargo-modules"; 23 + changelog = "https://github.com/regexident/cargo-modules/blob/${version}/CHANGELOG.md"; 25 24 license = with licenses; [ mpl20 ]; 26 25 maintainers = with maintainers; [ figsoda rvarago ]; 27 26 };
+1 -3
pkgs/top-level/all-packages.nix
··· 15320 15320 cargo-make = callPackage ../development/tools/rust/cargo-make { 15321 15321 inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; 15322 15322 }; 15323 - cargo-modules = callPackage ../development/tools/rust/cargo-modules { 15324 - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices; 15325 - }; 15323 + cargo-modules = callPackage ../development/tools/rust/cargo-modules { }; 15326 15324 cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { 15327 15325 inherit (darwin.apple_sdk.frameworks) Security; 15328 15326 };