tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
cargo,clippy,rustc,rustfmt: 1.82.0 -> 1.83.0
Alyssa Ross
1 year ago
66817904
f152afb1
+21
-31
2 changed files
expand all
collapse all
unified
split
pkgs
development
compilers
rust
1_83.nix
top-level
all-packages.nix
+17
-27
pkgs/development/compilers/rust/1_82.nix
pkgs/development/compilers/rust/1_83.nix
···
28
28
llvm_19,
29
29
wrapCCWith,
30
30
overrideCC,
31
31
-
fetchpatch,
32
31
}@args:
33
32
let
34
33
llvmSharedFor =
···
48
47
in
49
48
import ./default.nix
50
49
{
51
51
-
rustcVersion = "1.82.0";
52
52
-
rustcSha256 = "fFP0UJ7aGE4XTvprp9XutYZYVobOjt78eBorEafPUSo=";
50
50
+
rustcVersion = "1.83.0";
51
51
+
rustcSha256 = "ci13O9Tqstgo1901tZ8LAX3fmpfuK0bBt/f6xciEHG4=";
53
52
54
53
llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
55
54
llvmSharedForHost = llvmSharedFor pkgsBuildHost;
···
107
106
# Note: the version MUST be the same version that we are building. Upstream
108
107
# ensures that each released compiler can compile itself:
109
108
# https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363
110
110
-
bootstrapVersion = "1.82.0";
109
109
+
bootstrapVersion = "1.83.0";
111
110
112
111
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
113
112
bootstrapHashes = {
114
114
-
i686-unknown-linux-gnu = "77b261fb3d9efa7fe39e87c024987495e03b647b6cb23a66b8e69aeb12a8be61";
115
115
-
x86_64-unknown-linux-gnu = "0265c08ae997c4de965048a244605fb1f24a600bbe35047b811c638b8fcf676b";
116
116
-
x86_64-unknown-linux-musl = "9dd781c64f71c1d3f854b0937eb751f19e8ebac1110e68e08b94223ad9b022ba";
117
117
-
arm-unknown-linux-gnueabihf = "d6a2857d0ab8880c3bc691607b10b68fb2750eae35144e035a9a5eeef820b740";
118
118
-
armv7-unknown-linux-gnueabihf = "eff9939c4b98c6ad91a759fa1a2ebdd81b4d05e47ac523218bf9d7093226589b";
119
119
-
aarch64-unknown-linux-gnu = "d7db04fce65b5f73282941f3f1df5893be9810af17eb7c65b2e614461fe31a48";
120
120
-
aarch64-unknown-linux-musl = "f061eabf0324805637c1e89e7d936365f705be1359699efbda59b637dbe9715f";
121
121
-
x86_64-apple-darwin = "b1a289cabc523f259f65116a41374ac159d72fbbf6c373bd5e545c8e835ceb6a";
122
122
-
aarch64-apple-darwin = "49b6d36b308addcfd21ae56c94957688338ba7b8985bff57fc626c8e1b32f62c";
123
123
-
powerpc64le-unknown-linux-gnu = "44f3a1e70be33f91927ae8d89a11843a79b8b6124d62a9ddd9030a5275ebc923";
124
124
-
riscv64gc-unknown-linux-gnu = "a72e8aa3fff374061ff90ada317a8d170c2a15eb079ddc828c97189179d3eebd";
125
125
-
s390x-unknown-linux-gnu = "63760886a9b2de6cb38f75a236db358939d904e205e1e2bc9d96cec69e00ae83";
126
126
-
x86_64-unknown-freebsd = "f7b51943dbed0af3387e3269c1767fee916fb22b8e7897b3594bf5e422403137";
113
113
+
i686-unknown-linux-gnu = "cb4763e8e04a302486e06195917921f917b485d1138823b9ebae1e23abf55a99";
114
114
+
x86_64-unknown-linux-gnu = "bd9d53d09d4b60826288336de19fb9c5c7592081e4e4520d6de2f65ee8d79087";
115
115
+
x86_64-unknown-linux-musl = "d1d379e8bb545466f53f8a5821dfbc7129e8cab046c44c0a9ea089eeff1616e1";
116
116
+
arm-unknown-linux-gnueabihf = "1ac6ebcb610226c7d81d52ef5158571567d5385a62a41ba73775e52c25666220";
117
117
+
armv7-unknown-linux-gnueabihf = "747c685a4858f2814a7e493e5d2552ff4234ad41e724560c75738340947cf425";
118
118
+
aarch64-unknown-linux-gnu = "ec70c500e2744f0db55bd495ef90534a31fd9c0d5f5a2d752182a59e439ddee3";
119
119
+
aarch64-unknown-linux-musl = "b7aabedc3d6109e2b46e02e2925aafd8d0aa2d319390a257c170b6750ba683ce";
120
120
+
x86_64-apple-darwin = "d878d4508e0bf2d699e4c8b9b8b9ccd30787859f60149c0934371c53a0fdf013";
121
121
+
aarch64-apple-darwin = "a605f4e3732eb472dac524861ca8c7456a923e4b4c883b0c8ebfba7550238f41";
122
122
+
powerpc64le-unknown-linux-gnu = "0bf705a288994d47975e10bd2a709d00e4caf6cc53b02a8847ad607cbc77e24a";
123
123
+
riscv64gc-unknown-linux-gnu = "f4cb563530ad12daba059373a354cf0dcb53a88e5a5d24928778d2736a0e8c65";
124
124
+
s390x-unknown-linux-gnu = "502010d6f40b1385c4b99cf74ff0436102efd155ec1e49bca4c02e8c68a4b142";
125
125
+
x86_64-unknown-freebsd = "3b55ed8afe27032128622b14e4f4b59d66b3cc7ff64e6df7a06d5e224b3de2a1";
127
126
};
128
127
129
129
-
selectRustPackage = pkgs: pkgs.rust_1_82;
130
130
-
131
131
-
rustcPatches = [
132
132
-
(fetchpatch {
133
133
-
name = "fix-fastCross.patch";
134
134
-
url = "https://github.com/rust-lang/rust/commit/c15469a7fec811d1a4f69ff26e18c6f383df41d2.patch";
135
135
-
hash = "sha256-lFc48AMoGf4LCP65IsXS5rEB9eYacTP8ADftQkj8zkg=";
136
136
-
})
137
137
-
];
128
128
+
selectRustPackage = pkgs: pkgs.rust_1_83;
138
129
}
139
130
140
131
(
···
143
134
"llvm_19"
144
135
"wrapCCWith"
145
136
"overrideCC"
146
146
-
"fetchpatch"
147
137
"pkgsHostTarget"
148
138
]
149
139
)
+4
-4
pkgs/top-level/all-packages.nix
···
6829
6829
wrapRustcWith = { rustc-unwrapped, ... } @ args: callPackage ../build-support/rust/rustc-wrapper args;
6830
6830
wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; };
6831
6831
6832
6832
-
rust_1_82 = callPackage ../development/compilers/rust/1_82.nix {
6832
6832
+
rust_1_83 = callPackage ../development/compilers/rust/1_83.nix {
6833
6833
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
6834
6834
llvm_19 = llvmPackages_19.libllvm;
6835
6835
};
6836
6836
-
rust = rust_1_82;
6836
6836
+
rust = rust_1_83;
6837
6837
6838
6838
mrustc = callPackage ../development/compilers/mrustc { };
6839
6839
mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
···
6841
6841
openssl = openssl_1_1;
6842
6842
};
6843
6843
6844
6844
-
rustPackages_1_82 = rust_1_82.packages.stable;
6845
6845
-
rustPackages = rustPackages_1_82;
6844
6844
+
rustPackages_1_83 = rust_1_83.packages.stable;
6845
6845
+
rustPackages = rustPackages_1_83;
6846
6846
6847
6847
inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform;
6848
6848