mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
cargo,clippy,rustc,rustfmt: 1.77.2 -> 1.78.0
This commit is contained in:
parent
0cee134634
commit
23d4f83453
4 changed files with 66 additions and 64 deletions
|
@ -1,59 +0,0 @@
|
||||||
# New rust versions should first go to staging.
|
|
||||||
# Things to check after updating:
|
|
||||||
# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
|
|
||||||
# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
|
|
||||||
# This testing can be also done by other volunteers as part of the pull
|
|
||||||
# request review, in case platforms cannot be covered.
|
|
||||||
# 2. The LLVM version used for building should match with rust upstream.
|
|
||||||
# Check the version number in the src/llvm-project git submodule in:
|
|
||||||
# https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules
|
|
||||||
# 3. Firefox and Thunderbird should still build on x86_64-linux.
|
|
||||||
|
|
||||||
{ stdenv, lib
|
|
||||||
, newScope, callPackage
|
|
||||||
, CoreFoundation, Security, SystemConfiguration
|
|
||||||
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost, pkgsTargetTarget
|
|
||||||
, makeRustPlatform
|
|
||||||
, wrapRustcWith
|
|
||||||
, llvmPackages_17, llvm_17
|
|
||||||
} @ args:
|
|
||||||
|
|
||||||
import ./default.nix {
|
|
||||||
rustcVersion = "1.77.2";
|
|
||||||
rustcSha256 = "xhRX749ZZjj928dxZ3iy9rmf8SUTo7DxOZTDvFIWOMM=";
|
|
||||||
|
|
||||||
llvmSharedForBuild = pkgsBuildBuild.llvmPackages_17.libllvm.override { enableSharedLibraries = true; };
|
|
||||||
llvmSharedForHost = pkgsBuildHost.llvmPackages_17.libllvm.override { enableSharedLibraries = true; };
|
|
||||||
llvmSharedForTarget = pkgsBuildTarget.llvmPackages_17.libllvm.override { enableSharedLibraries = true; };
|
|
||||||
|
|
||||||
# For use at runtime
|
|
||||||
llvmShared = llvm_17.override { enableSharedLibraries = true; };
|
|
||||||
|
|
||||||
# Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox
|
|
||||||
llvmPackages = llvmPackages_17;
|
|
||||||
|
|
||||||
# Note: the version MUST be one version prior to the version we're
|
|
||||||
# building
|
|
||||||
bootstrapVersion = "1.76.0";
|
|
||||||
|
|
||||||
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
|
|
||||||
bootstrapHashes = {
|
|
||||||
i686-unknown-linux-gnu = "4c3eefc9341b8809235e6c4fbcbc19ab52a5cbe771292c400df068c12984fa3e";
|
|
||||||
x86_64-unknown-linux-gnu = "9d589d2036b503cc45ecc94992d616fb3deec074deb36cacc2f5c212408f7399";
|
|
||||||
x86_64-unknown-linux-musl = "aa8568f4d262468aaf4f622bd421c5435b24454d8fbcdae48da1162962205384";
|
|
||||||
arm-unknown-linux-gnueabihf = "7d1da067362fc64bcad198d90a61e024d5712aed76e17b28e1cd7e8ba263cc6f";
|
|
||||||
armv7-unknown-linux-gnueabihf = "c03346d56d4a860cd3a8d2d2a7ea75c510b68204e3ad97b3770076595261c913";
|
|
||||||
aarch64-unknown-linux-gnu = "2e8313421e8fb673efdf356cdfdd4bc16516f2610d4f6faa01327983104c05a0";
|
|
||||||
aarch64-unknown-linux-musl = "a1d1c8ccb8ea00cfa2b79d80411b8eb22b2bef5214f86536825361e98d7c617a";
|
|
||||||
x86_64-apple-darwin = "7bdbe085695df8e46389115e99eda7beed37a9494f6b961b45554c658e53b8e7";
|
|
||||||
aarch64-apple-darwin = "17496f15c3cb6ff73d5c36f5b54cc110f1ac31fa09521a7991c0d7ddd890dceb";
|
|
||||||
powerpc64le-unknown-linux-gnu = "44b3494675284d26b04747a824dc974e32fd8fd46fc0aa06a7c8ebe851332d2c";
|
|
||||||
riscv64gc-unknown-linux-gnu = "4a9db321874fc441235b71eb8aa295fc50251305e461540b25b4eef89fb56255";
|
|
||||||
};
|
|
||||||
|
|
||||||
selectRustPackage = pkgs: pkgs.rust_1_77;
|
|
||||||
|
|
||||||
rustcPatches = [ ];
|
|
||||||
}
|
|
||||||
|
|
||||||
(builtins.removeAttrs args [ "llvmPackages_17" "llvm_17"])
|
|
59
pkgs/development/compilers/rust/1_78.nix
Normal file
59
pkgs/development/compilers/rust/1_78.nix
Normal file
|
@ -0,0 +1,59 @@
|
||||||
|
# New rust versions should first go to staging.
|
||||||
|
# Things to check after updating:
|
||||||
|
# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
|
||||||
|
# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
|
||||||
|
# This testing can be also done by other volunteers as part of the pull
|
||||||
|
# request review, in case platforms cannot be covered.
|
||||||
|
# 2. The LLVM version used for building should match with rust upstream.
|
||||||
|
# Check the version number in the src/llvm-project git submodule in:
|
||||||
|
# https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules
|
||||||
|
# 3. Firefox and Thunderbird should still build on x86_64-linux.
|
||||||
|
|
||||||
|
{ stdenv, lib
|
||||||
|
, newScope, callPackage
|
||||||
|
, CoreFoundation, Security, SystemConfiguration
|
||||||
|
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost, pkgsTargetTarget
|
||||||
|
, makeRustPlatform
|
||||||
|
, wrapRustcWith
|
||||||
|
, llvmPackages_18, llvm_18
|
||||||
|
} @ args:
|
||||||
|
|
||||||
|
import ./default.nix {
|
||||||
|
rustcVersion = "1.78.0";
|
||||||
|
rustcSha256 = "/1RII6XLJ/JzgShXfx5+AO6PTIPyo0h4GuT8NV6R1ak=";
|
||||||
|
|
||||||
|
llvmSharedForBuild = pkgsBuildBuild.llvmPackages_18.libllvm.override { enableSharedLibraries = true; };
|
||||||
|
llvmSharedForHost = pkgsBuildHost.llvmPackages_18.libllvm.override { enableSharedLibraries = true; };
|
||||||
|
llvmSharedForTarget = pkgsBuildTarget.llvmPackages_18.libllvm.override { enableSharedLibraries = true; };
|
||||||
|
|
||||||
|
# For use at runtime
|
||||||
|
llvmShared = llvm_18.override { enableSharedLibraries = true; };
|
||||||
|
|
||||||
|
# Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox
|
||||||
|
llvmPackages = llvmPackages_18;
|
||||||
|
|
||||||
|
# Note: the version MUST be one version prior to the version we're
|
||||||
|
# building
|
||||||
|
bootstrapVersion = "1.77.2";
|
||||||
|
|
||||||
|
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
|
||||||
|
bootstrapHashes = {
|
||||||
|
i686-unknown-linux-gnu = "168e653fbc30b3a80801bc7735a79ff644651618434234959925f669bf77d1a2";
|
||||||
|
x86_64-unknown-linux-gnu = "b7d12b1b162c36c1fd5234b4b16856aa7eafca91d17c49787f6487cb26f4062d";
|
||||||
|
x86_64-unknown-linux-musl = "2e08fe23c4837a780a40ebfac601760cd6297581d21eae2f88cb59060243a375";
|
||||||
|
arm-unknown-linux-gnueabihf = "9f14a31dbef0153c0a7463a79cf8f9e8295b355354de41aa054953027beb70d7";
|
||||||
|
armv7-unknown-linux-gnueabihf = "b37649399081228244b3ff3acc6047f6c138e602c721cd500efe43715d043c5e";
|
||||||
|
aarch64-unknown-linux-gnu = "297c6201edd42e580f242fcd75b521b0392f6f3be02cf03ca76690fece4a74da";
|
||||||
|
aarch64-unknown-linux-musl = "fdd9c485f93c73a085c113b4f0fbad0989f79153079d394ec4bbac2b3804f71b";
|
||||||
|
x86_64-apple-darwin = "16bbbfcf0c982b35271d8904977d80fda1bb7caa7f898abceed3569a867d9cea";
|
||||||
|
aarch64-apple-darwin = "415bb2bc198feb0f2d8329e33c57d0890bbd57977d1ae48b17f6c7e1f632eaa7";
|
||||||
|
powerpc64le-unknown-linux-gnu = "79582acb339bd2d79fef095b977049049ffa04616011f1af1793fb8e98194b19";
|
||||||
|
riscv64gc-unknown-linux-gnu = "300fe4861e2d1f6e4c4f5e36ae7997beca8a979343a7f661237ab78a37a54648";
|
||||||
|
};
|
||||||
|
|
||||||
|
selectRustPackage = pkgs: pkgs.rust_1_78;
|
||||||
|
|
||||||
|
rustcPatches = [ ];
|
||||||
|
}
|
||||||
|
|
||||||
|
(builtins.removeAttrs args [ "llvmPackages_18" "llvm_18"])
|
|
@ -16621,11 +16621,11 @@ with pkgs;
|
||||||
wrapRustcWith = { rustc-unwrapped, ... } @ args: callPackage ../build-support/rust/rustc-wrapper args;
|
wrapRustcWith = { rustc-unwrapped, ... } @ args: callPackage ../build-support/rust/rustc-wrapper args;
|
||||||
wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; };
|
wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; };
|
||||||
|
|
||||||
rust_1_77 = callPackage ../development/compilers/rust/1_77.nix {
|
rust_1_78 = callPackage ../development/compilers/rust/1_78.nix {
|
||||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
|
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
|
||||||
llvm_17 = llvmPackages_17.libllvm;
|
llvm_18 = llvmPackages_18.libllvm;
|
||||||
};
|
};
|
||||||
rust = rust_1_77;
|
rust = rust_1_78;
|
||||||
|
|
||||||
mrustc = callPackage ../development/compilers/mrustc { };
|
mrustc = callPackage ../development/compilers/mrustc { };
|
||||||
mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
|
mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
|
||||||
|
@ -16633,8 +16633,8 @@ with pkgs;
|
||||||
openssl = openssl_1_1;
|
openssl = openssl_1_1;
|
||||||
};
|
};
|
||||||
|
|
||||||
rustPackages_1_77 = rust_1_77.packages.stable;
|
rustPackages_1_78 = rust_1_78.packages.stable;
|
||||||
rustPackages = rustPackages_1_77;
|
rustPackages = rustPackages_1_78;
|
||||||
|
|
||||||
inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform;
|
inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform;
|
||||||
|
|
||||||
|
|
|
@ -193,6 +193,7 @@ in {
|
||||||
kernelPatches.rust_1_75
|
kernelPatches.rust_1_75
|
||||||
kernelPatches.rust_1_76
|
kernelPatches.rust_1_76
|
||||||
kernelPatches.rust_1_77-6_8
|
kernelPatches.rust_1_77-6_8
|
||||||
|
kernelPatches.rust_1_78
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -205,6 +206,7 @@ in {
|
||||||
kernelPatches.bridge_stp_helper
|
kernelPatches.bridge_stp_helper
|
||||||
kernelPatches.request_key_helper
|
kernelPatches.request_key_helper
|
||||||
kernelPatches.rust_1_77-6_9
|
kernelPatches.rust_1_77-6_9
|
||||||
|
kernelPatches.rust_1_78
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
latest = packageAliases.linux_latest.kernel;
|
latest = packageAliases.linux_latest.kernel;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue