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: d9d29d9115b0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 61508b5d92d7
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 11, 2019

  1. haskell.compiler.ghcHEAD: 20190115 -> 20190601

    @infinisil
    infinisil committed Jun 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c382915 View commit details

Commits on Jun 14, 2019

  1. Merge pull request #63001 from Infinisil/update/ghcHEAD 

    haskell.compiler.ghcHEAD: 20190115 -> 20190601
    @peti
    peti authored Jun 14, 2019
    Copy the full SHA
    61508b5 View commit details
Showing with 13 additions and 3 deletions.
  1. +13 −3 pkgs/development/compilers/ghc/head.nix
16 changes: 13 additions & 3 deletions pkgs/development/compilers/ghc/head.nix
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
, # Whetherto build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows

, version ? "8.7.20190115"
, version ? "8.9.20190601"
, # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values.
ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
@@ -89,14 +89,24 @@ stdenv.mkDerivation (rec {

src = fetchgit {
url = "https://gitlab.haskell.org/ghc/ghc.git/";
rev = "c9756dbf1ee58b117ea5c4ded45dea88030efd65";
sha256 = "0ja3ivyz4jrqkw6z1mdgsczxaqkjy5vw0nyyqlqr0bqxiw9p8834";
rev = "9bc10993bb300d3712b0f13ec6e28621d75d4204";
sha256 = "1s7vbinywx8ffj09nxr0h32nggjiqpssrvgmj7820k32w2yi7i8v";
};

enableParallelBuilding = true;

outputs = [ "out" "doc" ];

patches = [
(fetchpatch rec { # https://github.com/haskell/haddock/issues/900
url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff";
name = "loadpluginsinmodules.diff";
sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1";
extraPrefix = "utils/haddock/";
stripLen = 1;
})
];

postPatch = "patchShebangs .";

# GHC is a bit confused on its cross terminology.