Commit bc07be2a authored by figsoda's avatar figsoda
Browse files

cargo-dephell: update Cargo.lock and switch to openssl 3

parent 9eff6f44

pkgs/development/tools/rust/cargo-dephell/Cargo.lock

0 → 100644
+2548 −0

File added.

Preview size limit exceeded, changes collapsed.

pkgs/development/tools/rust/cargo-dephell/default.nix

+31 −5
Original line number Diff line number Diff line 
{ 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

  ] ++ lib.optionals stdenv.isDarwin [

    curl

  ];



  nativeBuildInputs = [ pkg-config ];

  buildInputs = [

    openssl

  ] ++ lib.optional stdenv.isDarwin [

    curl

    darwin.apple_sdk.frameworks.Security

    libgit2_1_3_0

  ];



  buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;

  # 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";

pkgs/top-level/all-packages.nix

+1 −4
Original line number Diff line number Diff line
@@ -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 {