Merge pull request #231570 from figsoda/rustup (0ec755b0) · Commits · nix / nixpkgs

pkgs/development/tools/rust/rustup-toolchain-install-master/Cargo.lock

0 → 100644

+1669 −0

File added.

Preview size limit exceeded, changes collapsed.

+15 −6

Original line number	Diff line number	Diff line
		{ 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";

+0 −1

Original line number	Diff line number	Diff line
		@@ -16381,7 +16381,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 { };