Haskell multiple outputs: bin etc lib (take three)

pkgs/applications/altcoins/hevm.nix

@@ -28,6 +28,8 @@ lib.overrideDerivation (mkDerivation rec {
   isLibrary = false;
   isExecutable = true;
   enableSharedExecutables = false;
+  # TODO: it creates cycle between out and bin
+  enableSeparateBinOutput = false;
 
   postInstall = ''
     wrapProgram $out/bin/hevm \

pkgs/build-support/trivial-builders.nix

@@ -97,15 +97,31 @@ rec {
          , preferLocalBuild ? true
          , allowSubstitutes ? false
          , postBuild ? ""
+         , extraOutputsToInstall ? []
          , ...
          }:
     let
-      args = removeAttrs args_ [ "name" "postBuild" ]
-        // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults
+      # Handle multiple outputs
+      dirs = (map (drv: 
+          # First add the usual output(s): respect if user has chosen explicitly,
+          # and otherwise use `meta.outputsToInstall`. The attribute is guaranteed
+          # to exist in mkDerivation-created cases. The other cases (e.g. runCommand)
+          # aren't expected to have multiple outputs.
+          (if drv.outputUnspecified or false
+              && drv.meta.outputsToInstall or null != null
+            then map (outName: drv.${outName}) drv.meta.outputsToInstall
+            else [ drv ])
+          # Add any extra outputs specified by the caller of `buildEnv`.
+          ++ lib.filter (p: p!=null)
+            (builtins.map (outName: drv.${outName} or null) extraOutputsToInstall)
+      ) paths);
+
+      args = removeAttrs args_ [ "name" "postBuild" "paths"]
+        // { inherit preferLocalBuild allowSubstitutes dirs; }; # pass the defaults
     in runCommand name args
       ''
         mkdir -p $out
-        for i in $paths; do
+        for i in $dirs; do
           ${lndir}/bin/lndir -silent $i $out
         done
         ${postBuild}

pkgs/development/compilers/elm/default.nix

@@ -58,7 +58,7 @@ let
               postInstall =
                 let bins = lib.makeBinPath [ nodejs self.elm-make ];
                 in ''
-                  wrapProgram $out/bin/elm-repl \
+                  wrapProgram $bin/bin/elm-repl \
                     --prefix PATH ':' ${bins}
                 '';
             });
@@ -97,6 +97,10 @@ let
           sha256 = "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn";
           libraryHaskellDepends = drv.libraryHaskellDepends ++ [super.concatenative];
         });
+        mkDerivation = args: super.mkDerivation (args // {
+          # reduce closure size for bin outputs
+          enableSharedExecutables = false;
+        });
       };
   };
 in hsPkgs.elmPkgs // {

pkgs/development/compilers/elm/packages/elm-format.nix

@@ -29,7 +29,7 @@ mkDerivation {
   ];
   jailbreak = true;
   postInstall = ''
-    ln -s $out/bin/elm-format-0.18 $out/bin/elm-format
+    ln -s $bin/bin/elm-format-0.18 $bin/bin/elm-format
   '';
   postPatch = ''
     sed -i "s|desc <-.*||" ./Setup.hs

pkgs/development/compilers/ghcjs/base.nix

@@ -107,13 +107,14 @@ in mkDerivation (rec {
   jailbreak = true;
   doHaddock = false;
   doCheck = false;
+  enableSeparateDataOutput = true;
   buildDepends = [
     filepath HTTP mtl network random stm time zlib aeson attoparsec
     bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta
     lens optparse-applicative parallel safe shelly split
     stringsearch syb system-fileio system-filepath tar terminfo text-binary
     unordered-containers vector wl-pprint-text yaml
-    alex happy git gnumake autoconf automake libtool patch gmp
+    (stdenv.lib.getBin alex) (stdenv.lib.getBin happy) git gnumake autoconf automake libtool patch gmp
     base16-bytestring cryptohash executable-path haddock-api
     transformers-compat QuickCheck haddock hspec xhtml
     regex-posix libiconv
@@ -128,17 +129,17 @@ in mkDerivation (rec {
       --replace "/usr/bin/env" "${coreutils}/bin/env"
 
     substituteInPlace src/Compiler/Info.hs \
-      --replace "@PREFIX@" "$out"          \
+      --replace "@PREFIX@" "$lib"          \
       --replace "@VERSION@" "${version}"
 
     substituteInPlace src-bin/Boot.hs \
-      --replace "@PREFIX@" "$out"     \
+      --replace "@PREFIX@" "$lib"     \
       --replace "@CC@"     "${stdenv.cc}/bin/cc"
   '';
   preBuild = ''
     export HOME="$TMP"
 
-    local topDir=$out/lib/ghcjs-${version}
+    local topDir=$lib/lib/ghcjs-${version}
     mkdir -p $topDir
 
     cp -r ${ghcjsBoot} $topDir/ghcjs-boot
@@ -158,15 +159,18 @@ in mkDerivation (rec {
   # This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a
   # Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw
   postInstall = ''
-    PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \
-      env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \
+    PATH=$bin/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \
+      env -u GHC_PACKAGE_PATH $bin/bin/ghcjs-boot \
         --dev \
         --quick \
         --with-cabal ${cabal-install}/bin/cabal \
         --with-gmp-includes ${gmp.dev}/include \
-        --with-gmp-libraries ${gmp.out}/lib
+        --with-gmp-libraries ${gmp.out}/lib \
+        --with-datadir $data/share/ghc-*/*/ghcjs-*/ \
+        --with-ghcjs-bin $bin/bin
+      find $lib -name setup-config -o -name config.log -o -name config.status | xargs rm
   '' + lib.optionalString (ghcLibdir != null) ''
-    printf '%s' '${ghcLibdir}' > "$out/lib/ghcjs-${version}/ghc_libdir"
+    printf '%s' '${ghcLibdir}' > "$lib/lib/ghcjs-${version}/ghc_libdir"
   '';
   passthru = {
     inherit bootPkgs;

pkgs/development/haskell-modules/configuration-common.nix

@@ -456,6 +456,9 @@ self: super: {
   # no haddock since this is an umbrella package.
   cloud-haskell = dontHaddock super.cloud-haskell;
 
+  # Don't haddock because it is only used for bootstrapping.
+  uuagc-bootstrap = dontHaddock super.uuagc-bootstrap;
+
   # This packages compiles 4+ hours on a fast machine. That's just unreasonable.
   CHXHtml = dontDistribute super.CHXHtml;
 
@@ -842,6 +845,7 @@ self: super: {
   # Don't install internal mkReadme tool.
   hastache = overrideCabal super.hastache (drv: {
     doCheck = false;
+    enableSeparateBinOutput = false;
     postInstall = "rm $out/bin/mkReadme && rmdir $out/bin";
   });
 

pkgs/development/haskell-modules/configuration-nix.nix

@@ -227,7 +227,10 @@ self: super: builtins.intersectAttrs super {
 
   # wxc supports wxGTX >= 3.0, but our current default version points to 2.8.
   # http://hydra.cryp.to/build/1331287/log/raw
-  wxc = (addBuildDepend super.wxc self.split).override { wxGTK = pkgs.wxGTK30; };
+  wxc = (overrideCabal super.wxc (drv: {
+      buildDepends = (drv.buildDepends or []) ++ [self.split];
+      postInstall = "cp -v dist/build/libwxc.so.0.92.3.0 $lib/lib/libwxc.so";
+    })).override { wxGTK = pkgs.wxGTK30; };
   wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; };
 
   # Test suite wants to connect to $DISPLAY.
@@ -509,11 +512,70 @@ self: super: builtins.intersectAttrs super {
   partial-semigroup = dontCheck super.partial-semigroup;
   colour = dontCheck super.colour;
 
+  # Alex has some weird files in /usr/share that create a cyclic ref with
+  # its bin dir.
+  alex = hasNoBinOutput super.alex;
+
+  # Disable separate bin outputs for these specific packages that break with it.
+  H = hasNoBinOutput super.H;
+  cryptol = hasNoBinOutput super.cryptol;
+  hscolour = hasNoBinOutput super.hscolour;
+  sproxy = hasNoBinOutput super.sproxy;
+  sproxy2 = hasNoBinOutput super.sproxy2;
+  sproxy-web = hasNoBinOutput super.sproxy-web;
+  juandelacosa = hasNoBinOutput super.juandelacosa;
+  mywatch = hasNoBinOutput super.mywatch;
+  sugarhaskell = hasNoBinOutput super.sugarhaskell;
+  zerobin = hasNoBinOutput super.zerobin;
+
+  git-annex = overrideCabal super.git-annex (drv: {
+    enableSeparateBinOutput = false;
+    enableSeparateEtcOutput = false;
+  });
+
+  # Has extra data files which are referred to from the binary output,
+  # creating a store reference cycle. Putting data in separate output
+  # solves the problem.
+  happy = overrideCabal super.happy (drv: {
+    enableSeparateDataOutput = true;
+    configureFlags = drv.configureFlags or [] ++ ["--libdir=/var/empty"];
+   });
+
+  hspec-meta = overrideCabal super.hspec-meta (drv: {
+    enableSeparateDataOutput = true;
+  });
+  hspec-discover = overrideCabal super.hspec-discover (drv: {
+    enableSeparateDataOutput = true;
+  });
+
+  # Override a number of packages with specific references to $out in their
+  # derivations
+  stack = overrideCabal super.stack (drv: {
+    postInstall = ''
+      exe=$bin/bin/stack
+      mkdir -p $bin/share/bash-completion/completions
+      $exe --bash-completion-script $exe >$bin/share/bash-completion/completions/stack
+    '';
+  });
+  Agda = overrideCabal super.Agda (drv: {
+    postInstall = ''
+      files=("$data/share/ghc-"*"/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda})
+      for f in "''${files[@]}" ; do
+        $bin/bin/agda $f
+      done
+      for f in "''${files[@]}" ; do
+        $bin/bin/agda -c --no-main $f
+      done
+      $bin/bin/agda-mode compile
+    '';
+  });
+
   LDAP = dontCheck (overrideCabal super.LDAP (drv: {
     librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ];
   }));
 
   # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73
   blank-canvas = dontCheck super.blank-canvas;
   blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2;
+
 }