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

Merge pull request #231514 from figsoda/dephell

Browse Source 
cargo-dephell: update Cargo.lock and switch to openssl 3
This commit is contained in:
Martin Weinelt 2023-05-13 00:16:57 +02:00 committed by GitHub
commit 72338c5f88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2580 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2548
pkgs/development/tools/rust/cargo-dephell/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

36
pkgs/development/tools/rust/cargo-dephell/default.nix
View File

@ -1,4 +1,13 @@
{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }:
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, stdenv
, curl
, openssl
, darwin
, libgit2_1_3_0
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-dephell";
@ -8,14 +17,31 @@ rustPlatform.buildRustPackage rec {
owner = "mimoo";
repo = pname;
rev = "v${version}";
sha256 = "1v3psrkjhgbkq9lm3698ac77qgk090jbly4r187nryj0vcmf9s1l";
hash = "sha256-NOjkKttA+mwPCpl4uiRIYD58DlMomVFpwnM9KGfWd+w=";
};
cargoSha256 = "0fwj782dbyj3ps16hxmq61drf8714863jb0d3mhivn3zlqawyyil";
cargoLock = {
lockFile = ./Cargo.lock;
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
pkg-config
] ++ lib.optionals stdenv.isDarwin [
curl
];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
buildInputs = [
openssl
] ++ lib.optional stdenv.isDarwin [
curl
darwin.apple_sdk.frameworks.Security
libgit2_1_3_0
];
# update Cargo.lock to work with openssl 3
postPatch = ''
ln -sf ${./Cargo.lock} Cargo.lock
'';
meta = with lib; {
description = "A tool to analyze the third-party dependencies imported by a rust crate or rust workspace";

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

@ -16244,10 +16244,7 @@ with pkgs;
cargo-cross = callPackage ../development/tools/rust/cargo-cross { };
cargo-deny = callPackage ../development/tools/rust/cargo-deny { };
cargo-depgraph = callPackage ../development/tools/rust/cargo-depgraph { };
cargo-dephell = callPackage ../development/tools/rust/cargo-dephell {
inherit (darwin.apple_sdk.frameworks) Security;
openssl = openssl_1_1;
};
cargo-dephell = callPackage ../development/tools/rust/cargo-dephell { };
cargo-diet = callPackage ../development/tools/rust/cargo-diet { };
cargo-dist = callPackage ../development/tools/rust/cargo-dist { };
cargo-embed = callPackage ../development/tools/rust/cargo-embed {