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: 0a2f47b51b0b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cd34bf3e2917
Choose a head ref
  • 3 commits
  • 7 files changed
  • 2 contributors

Commits on Nov 6, 2020

  1. ghc*: Increase build timeout to 1 day 

    The default of 10 hours is insufficient for some of the slower
platforms like macOS and aarch64.
    @roberth
    roberth committed Nov 6, 2020
    Copy the full SHA
    6057cb9 View commit details

  2. ghc8102: Fix whitespace

    @roberth
    roberth committed Nov 6, 2020
    Copy the full SHA
    7ac71d7 View commit details

  3. Merge pull request #103008 from hercules-ci/increase-ghc-build-timeout 

    ghc*: Increase build timeout to 1 day
    @peti
    peti authored Nov 6, 2020
    Copy the full SHA
    cd34bf3 View commit details
1 change: 1 addition & 0 deletions pkgs/development/compilers/ghc/8.10.1.nix
View file
Original file line number Diff line number Diff line change
@@ -246,6 +246,7 @@ stdenv.mkDerivation (rec {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;
};

9 changes: 5 additions & 4 deletions pkgs/development/compilers/ghc/8.10.2.nix
View file
Original file line number Diff line number Diff line change
@@ -107,9 +107,9 @@ stdenv.mkDerivation (rec {

outputs = [ "out" "doc" ];

# https://gitlab.haskell.org/ghc/ghc/-/issues/18549
patches = [
./issue-18549.patch
# https://gitlab.haskell.org/ghc/ghc/-/issues/18549
patches = [
./issue-18549.patch
];

postPatch = "patchShebangs .";
@@ -190,7 +190,7 @@ stdenv.mkDerivation (rec {
strictDeps = true;

# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;
dontAddExtraLibs = true;

nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx
@@ -242,6 +242,7 @@ stdenv.mkDerivation (rec {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;
};

1 change: 1 addition & 0 deletions pkgs/development/compilers/ghc/8.6.5.nix
View file
Original file line number Diff line number Diff line change
@@ -256,6 +256,7 @@ stdenv.mkDerivation (rec {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;
};

1 change: 1 addition & 0 deletions pkgs/development/compilers/ghc/8.8.2.nix
View file
Original file line number Diff line number Diff line change
@@ -241,6 +241,7 @@ stdenv.mkDerivation (rec {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;
};

1 change: 1 addition & 0 deletions pkgs/development/compilers/ghc/8.8.3.nix
View file
Original file line number Diff line number Diff line change
@@ -246,6 +246,7 @@ stdenv.mkDerivation (rec {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;
};

1 change: 1 addition & 0 deletions pkgs/development/compilers/ghc/8.8.4.nix
View file
Original file line number Diff line number Diff line change
@@ -250,6 +250,7 @@ stdenv.mkDerivation (rec {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;
};

1 change: 1 addition & 0 deletions pkgs/development/compilers/ghc/9.0.1.nix
View file
Original file line number Diff line number Diff line change
@@ -237,6 +237,7 @@ stdenv.mkDerivation (rec {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;
};