summary refs log tree commit diff
diff options
context:
space:
mode:
authorCharles Strahan <charles@cstrahan.com>2017-02-27 02:10:34 -0500
committerCharles Strahan <charles@cstrahan.com>2017-02-27 02:10:34 -0500
commit1ba97d6ee9795b8c9c6ff25b0baaf988be561781 (patch)
tree8116c5165cd433d74547f119b5ef85ac47c5a9af
parent3540c139b9ddfed29e5bdfc5a68a76d7fae82196 (diff)
downloadnixpkgs-1ba97d6ee9795b8c9c6ff25b0baaf988be561781.tar
nixpkgs-1ba97d6ee9795b8c9c6ff25b0baaf988be561781.tar.gz
nixpkgs-1ba97d6ee9795b8c9c6ff25b0baaf988be561781.tar.bz2
nixpkgs-1ba97d6ee9795b8c9c6ff25b0baaf988be561781.tar.lz
nixpkgs-1ba97d6ee9795b8c9c6ff25b0baaf988be561781.tar.xz
nixpkgs-1ba97d6ee9795b8c9c6ff25b0baaf988be561781.tar.zst
nixpkgs-1ba97d6ee9795b8c9c6ff25b0baaf988be561781.zip
ghcjsHEAD: unbreak
-rw-r--r--pkgs/development/compilers/ghcjs/base.nix3
-rw-r--r--pkgs/development/compilers/ghcjs/default.nix5
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index 393278be49e..130c9995c8d 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, broken ? false
 , test-framework
 , test-framework-hunit
 , test-framework-quickcheck2
@@ -183,5 +184,5 @@ in mkDerivation (rec {
   license = stdenv.lib.licenses.bsd3;
   platforms = ghc.meta.platforms;
   maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
-  broken = true;  # http://hydra.nixos.org/build/45110274
+  inherit broken;
 })
diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 7400057b128..eda724e5947 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -1,3 +1,6 @@
 { bootPkgs }:
 
-bootPkgs.callPackage ./base.nix { inherit bootPkgs; }
+bootPkgs.callPackage ./base.nix {
+  inherit bootPkgs;
+  broken = true; # http://hydra.nixos.org/build/45110274
+}