diff options
author | figsoda <figsoda@pm.me> | 2022-12-07 14:14:03 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-07 14:14:03 -0500 |
commit | 8cdc50c4341fa9f88e7f92cb18be20d31c87fef7 (patch) | |
tree | 6669c2b064723900674efa17d2857fc68ae9c850 | |
parent | a3c1a4abc78df37b537cb08414efa8eac38211b6 (diff) | |
parent | e2078b28c8e4d67fa28ffc5a6a00797075304b72 (diff) |
Merge pull request #204812 from figsoda/cargo-modules
cargo-modules: 0.5.14 -> 0.7.0
-rw-r--r-- | pkgs/development/tools/rust/cargo-modules/default.nix | 21 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 14 deletions
diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index b6a6c2f535398..99d3eb61e43f6 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -1,27 +1,26 @@ -{ lib, rustPlatform, fetchCrate, stdenv, CoreFoundation, CoreServices }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.5.14"; + version = "0.7.0"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-urbyWNbmj2qEO4JJ/waRXGRJ9L5KgwsRB5Wh9yib8zc="; + src = fetchFromGitHub { + owner = "regexident"; + repo = pname; + rev = version; + sha256 = "sha256-IBvSuyr3ERfPIivw6sEJSRta07Awmwd47cV1iKmvt8A="; }; - cargoSha256 = "sha256-3OxO+j5UuPEg9xNmN+kIqpdq6fVnFpgx5xCaMNue52g="; + cargoSha256 = "sha256-zX3lBNQVWBrVQh+02TDUqU7Xmbd7hBOzJxD7cSNTNR0="; buildInputs = lib.optionals stdenv.isDarwin [ - CoreFoundation - CoreServices + darwin.apple_sdk.frameworks.CoreServices ]; - # the crate version doesn't include all the files required to run tests - doCheck = false; - 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"; + changelog = "https://github.com/regexident/cargo-modules/blob/${version}/CHANGELOG.md"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ figsoda rvarago ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bccd62544dde..96d9cb14ea13b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15320,9 +15320,7 @@ 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 { - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices; - }; + cargo-modules = callPackage ../development/tools/rust/cargo-modules { }; cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { inherit (darwin.apple_sdk.frameworks) Security; }; |