Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f516d8169c3e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 055f5f93a4e7
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 4, 2020

  1. ghc8102BinaryMinimal: Re-add docs, remove more profiling files

    @roberth
    roberth committed Nov 4, 2020
    Copy the full SHA
    7bd21d3 View commit details

  2. ghc8102Binary*: simplify meta 

    Not distributing dependencies via hydraPlatforms does not work,
so we keep meta simple.
    @roberth
    roberth committed Nov 4, 2020
    Copy the full SHA
    4643796 View commit details

Commits on Nov 5, 2020

  1. Merge pull request #102504 from hercules-ci/minimal-ghc-to-please-hyd… 

    …ra-limits

[staging-20.09] Add ghc8102BinaryMinimal to stay within hydra limits on aarch64
    @roberth
    roberth authored Nov 5, 2020
    Copy the full SHA
    055f5f9 View commit details
Showing with 9 additions and 14 deletions.
  1. +9 −14 pkgs/development/compilers/ghc/8.10.2-binary.nix
23 changes: 9 additions & 14 deletions pkgs/development/compilers/ghc/8.10.2-binary.nix
View file
Original file line number Diff line number Diff line change
@@ -7,8 +7,6 @@
# regular builds and GHC bootstrapping.
# This is "useful" for staying within hydra's output limits for at least the
# aarch64-linux architecture.
# Examples of unnecessary files are the bundled documentation and files that
# are only needed for profiling builds.
, minimal ? false
}:

@@ -182,11 +180,15 @@ stdenv.mkDerivation rec {
done
'' +
stdenv.lib.optionalString minimal ''
# Remove profiling objects
# Remove profiling files
find $out -type f -name '*.p_o' -delete
find $out -type f -name '*.p_hi' -delete
find $out -type f -name '*_p.a' -delete
rm $out/lib/ghc-*/bin/ghc-iserv-prof
# Remove docs
rm -r $out/share/{doc,man}
# Hydra will redistribute this derivation, so we have to keep the docs for
# legal reasons (retaining the legal notices etc)
# As a last resort we could unpack the docs separately and symlink them in.
# They're in $out/share/{doc,man}.
'';

doInstallCheck = true;
@@ -210,18 +212,11 @@ stdenv.mkDerivation rec {
enableShared = true;
};

meta = let
platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
in {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
license = stdenv.lib.licenses.bsd3;

# The minimal variation can not be distributed because it removes the
# documentation, including licensing information that is required for
# distribution.
inherit platforms;
hydraPlatforms = stdenv.lib.optionals (!minimal) platforms;
platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
maintainers = with stdenv.lib.maintainers; [ lostnet ];
};
}