summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Johnson <djohnson.m@gmail.com>2017-05-08 12:46:14 -0700
committerDavid Johnson <djohnson.m@gmail.com>2017-05-08 22:32:08 -0700
commita5df611d9134d6816e110603d55cea384c2f272a (patch)
tree3c2ee29063b9016d9238ea6864d426be4d6f49cf
parente2700861fb4b5598695209e631a22a2cd44bb2c9 (diff)
downloadnixpkgs-a5df611d9134d6816e110603d55cea384c2f272a.tar
nixpkgs-a5df611d9134d6816e110603d55cea384c2f272a.tar.gz
nixpkgs-a5df611d9134d6816e110603d55cea384c2f272a.tar.bz2
nixpkgs-a5df611d9134d6816e110603d55cea384c2f272a.tar.lz
nixpkgs-a5df611d9134d6816e110603d55cea384c2f272a.tar.xz
nixpkgs-a5df611d9134d6816e110603d55cea384c2f272a.tar.zst
nixpkgs-a5df611d9134d6816e110603d55cea384c2f272a.zip
ghcjs: mark as fixed
-rw-r--r--pkgs/development/compilers/ghcjs/base.nix2
-rw-r--r--pkgs/development/compilers/ghcjs/default.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index ab68a8fe3b5..4c9ae16a313 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -190,6 +190,6 @@ in mkDerivation (rec {
   description = "A Haskell to JavaScript compiler that uses the GHC API";
   license = stdenv.lib.licenses.bsd3;
   platforms = ghc.meta.platforms;
-  maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
+  maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan dmjio ];
   inherit broken;
 })
diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index eda724e5947..f23da1149c5 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -2,5 +2,5 @@
 
 bootPkgs.callPackage ./base.nix {
   inherit bootPkgs;
-  broken = true; # http://hydra.nixos.org/build/45110274
+  broken = false;
 }