gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #207135: stdenv: aarch64-linux: gcc9 -> gcc12

Browse Source 
...into staging
Also merge the commit that was referenced as the base for the build
of the new bootstrap tools (although others would give the same).
This commit is contained in:
Vladimír Čunát
2023-03-01 12:54:52 +01:00
parent 63e505f376 f05b5d4054 7c026bae62
commit 763470bbb0
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/linux/bootstrap-files/aarch64.nix
+4 -4
View File
@@ -1,11 +1,11 @@
{
busybox = import <nix/fetchurl.nix> {
url = "http://tarballs.nixos.org/stdenv-linux/aarch64/c7c997a0662bf88264db52cbc41e67884eb7a1ff/busybox";
sha256 = "sha256-4EN2vLvXUkelZZR2eKaAQA5kCEuHNvRZN6dcohxVY+c=";
url = "http://tarballs.nixos.org/stdenv-linux/aarch64/21ec906463ea8f11abf3f9091ddd4c3276516e58/busybox";
executable = true;
hash = "sha256-0MuIeQlBUaeisqoFSu8y+8oB6K4ZG5Lhq8RcS9JqkFQ=";
};
bootstrapTools = import <nix/fetchurl.nix> {
url = "http://tarballs.nixos.org/stdenv-linux/aarch64/c7c997a0662bf88264db52cbc41e67884eb7a1ff/bootstrap-tools.tar.xz";
sha256 = "sha256-AjOvmaW8JFVZaBSRUMKufr9kJozg/tsZr7PvUEBQyi4=";
url = "http://tarballs.nixos.org/stdenv-linux/aarch64/21ec906463ea8f11abf3f9091ddd4c3276516e58/bootstrap-tools.tar.xz";
hash = "sha256-aJvtsWeuQHbb14BGZ2EiOKzjQn46h3x3duuPEawG0eE=";
};
}
pkgs/top-level/all-packages.nix
-1
View File
@@ -14457,7 +14457,6 @@ with pkgs;
inherit (let
num =
if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6
else if (stdenv.targetPlatform.isAarch64 && stdenv.isLinux) then 9
else 12;
numS = toString num;
in {