mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 18:03:04 +00:00
rustup-toolchain-install-master: update Cargo.lock and unpin openssl
This commit is contained in:
parent
1e5e280dec
commit
4cfe86363b
1669
pkgs/development/tools/rust/rustup-toolchain-install-master/Cargo.lock
generated
Normal file
1669
pkgs/development/tools/rust/rustup-toolchain-install-master/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,12 +1,13 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, openssl
|
||||
, fetchFromGitHub
|
||||
, runCommand
|
||||
, stdenv
|
||||
, patchelf
|
||||
, zlib
|
||||
, pkg-config
|
||||
, openssl
|
||||
, xz
|
||||
, Security
|
||||
}:
|
||||
|
||||
@ -21,6 +22,10 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-J25ER/g8Kylw/oTIEl4Gl8i1xmhR+4JM5M5EHpl1ras=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
patches =
|
||||
let
|
||||
patchelfPatch = runCommand "0001-dynamically-patchelf-binaries.patch" {
|
||||
@ -41,11 +46,15 @@ rustPlatform.buildRustPackage rec {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
openssl
|
||||
xz
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
];
|
||||
|
||||
cargoSha256 = "n7t8Ap9hdhrjmtKjfdyozf26J7yhu57pedm19CunLF4=";
|
||||
# update Cargo.lock to work with openssl 3
|
||||
postPatch = ''
|
||||
ln -sf ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Install a rustc master toolchain usable from rustup";
|
||||
|
@ -16379,7 +16379,6 @@ with pkgs;
|
||||
};
|
||||
rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
rusty-man = callPackage ../development/tools/rust/rusty-man { };
|
||||
typeshare = callPackage ../development/tools/rust/typeshare { };
|
||||
|
Loading…
Reference in New Issue
Block a user