diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-03-10 14:41:34 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-03-10 20:38:13 +0000 |
| commit | 7079e744d4666db3af186899fe2fc0ef3cbeb842 (patch) | |
| tree | d65e951be75dab998ecd2e8337e1c30e7722e28c /pkgs/development/compilers/ghcjs/default.nix | |
| parent | 4eec6bc9c9cafac55dbf774a2fd30da7e5a79cc4 (diff) | |
| parent | ddddca5c2fe1c93369404979ac194a1bc5d5fbaf (diff) | |
| download | nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.gz nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.bz2 nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.lz nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.xz nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.zst nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.zip | |
Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix
Diffstat (limited to 'pkgs/development/compilers/ghcjs/default.nix')
| -rw-r--r-- | pkgs/development/compilers/ghcjs/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 7f3cc9440015..b5a7a7f7cfc2 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -2,4 +2,5 @@ bootPkgs.callPackage ./base.nix { inherit bootPkgs cabal-install; + broken = true; # https://hydra.nixos.org/build/70552553 } |