···

       
475
       
475
       
 
       
    doHaddock = false;

     

       
476
       
476
       
 
       
  });

     

       
477
       
477
       
 
       


     

       
478
       
478
       
+
       
<<<<<<< HEAD

     

       
478
       
479
       
 
       
  # This packages compiles 4+ hours on a fast machine. That's just unreasonable.

     

       
479
       
480
       
 
       
  CHXHtml = dontDistribute super.CHXHtml;

     

       
480
       
481
       
 
       


     
···

       
520
       
521
       
 
       


     

       
521
       
522
       
 
       
  # https://github.com/osa1/language-lua/issues/14

     

       
522
       
523
       
 
       
  language-lua = dontCheck super.language-lua;

     

       
524
       
524
       
+
       


     

       
525
       
525
       
+
       
=======

     

       
526
       
526
       
+
       
>>>>>>> c723352d7741f5b348be652b35e8c2f1a1908c22

     

       
527
       
527
       
+
       
  # https://github.com/afcowie/http-streams/issues/80

     

       
528
       
528
       
+
       
  http-streams = dontCheck super.http-streams;

     

       
523
       
529
       
 
       


     

       
524
       
530
       
 
       
} // {

     

       
525
       
531