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

Merge pull request #122026 from sternenseemann/ghc-binary-no-aarch64-hydra

Browse Source 
haskell.compiler: misc cleanups for hydra aarch64 builds
This commit is contained in:
maralorn 2021-05-07 20:15:44 +02:00 committed by GitHub
commit 8b7d34d89e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/ghc/8.10.2-binary.nix
View File

@ -214,11 +214,12 @@ stdenv.mkDerivation rec {
enableShared = true; enableShared = true;
}; };
meta = { meta = rec {
homepage = "http://haskell.org/ghc"; homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler"; description = "The Glasgow Haskell Compiler";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms;
maintainers = with lib.maintainers; [ lostnet ]; maintainers = with lib.maintainers; [ lostnet ];
}; };
} }

7
pkgs/development/compilers/ghc/8.6.5-binary.nix
View File

@ -173,6 +173,9 @@ stdenv.mkDerivation rec {
enableShared = true; enableShared = true;
}; };
meta.license = lib.licenses.bsd3; meta = rec {
meta.platforms = ["x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; license = lib.licenses.bsd3;
platforms = ["x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
hydraPlatforms = builtins.filter (p: p != "aarch64-linux") platforms;
};
} }

6
pkgs/top-level/haskell-packages.nix
View File

@ -76,7 +76,11 @@ in {
llvmPackages = pkgs.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9;
}; };
ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix {
bootPkgs = packages.ghc8102Binary; # aarch64 ghc8102Binary exceeds max output size on hydra
bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then
packages.ghc8102BinaryMinimal
else
packages.ghc8102Binary;
inherit (buildPackages.python3Packages) sphinx; inherit (buildPackages.python3Packages) sphinx;
buildLlvmPackages = buildPackages.llvmPackages_10; buildLlvmPackages = buildPackages.llvmPackages_10;
llvmPackages = pkgs.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10;