Merge branch 'master' of github.com:input-output-hk/haskell.nix into feature/pkg-def-extras

Author: rvl

builder/comp-builder.nix

@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, ghc, lib, pkgconfig, writeText, runCommand, haskellLib, nonReinstallablePkgs, withPackage }:
+{ stdenv, buildPackages, ghc, lib, pkgconfig, writeText, runCommand, haskellLib, nonReinstallablePkgs, withPackage, hsPkgs }:
 
 { componentId
 , component
@@ -9,6 +9,7 @@
 , flags
 , revision
 , cabalFile
+, cabal-generator
 , patches ? []
 
 , preUnpack ? null, postUnpack ? null
@@ -187,7 +188,9 @@ let
   # the target dir for haddock documentation
   docdir = docoutput: docoutput + "/share/doc/" + componentId.cname;
 
-  doHaddock' = doHaddock && (haskellLib.isLibrary componentId);
+  doHaddock' = doHaddock 
+    && (haskellLib.isLibrary componentId)
+    && stdenv.hostPlatform == stdenv.buildPlatform;
 
 in stdenv.lib.fix (drv:
 
@@ -240,9 +243,11 @@ stdenv.mkDerivation ({
   # Phases
   preInstallPhases = lib.optional doHaddock' "haddockPhase";
 
-  prePatch = lib.optionalString (cabalFile != null) ''
-    cat ${cabalFile} > ${package.identifier.name}.cabal
-  '';
+  prePatch = if (cabalFile != null)
+     then ''cat ${cabalFile} > ${package.identifier.name}.cabal''
+     else lib.optionalString (cabal-generator == "hpack") ''
+       ${hsPkgs.hpack.components.exes.hpack}/bin/hpack
+     '';
 
   configurePhase = ''
     runHook preConfigure

builder/default.nix

@@ -1,8 +1,9 @@
-{ pkgs, buildPackages, stdenv, lib, haskellLib, ghc, buildGHC, fetchurl, writeText, runCommand, pkgconfig, nonReinstallablePkgs, withPackage }:
+{ pkgs, buildPackages, stdenv, lib, haskellLib, ghc, buildGHC, fetchurl, writeText, runCommand, pkgconfig, nonReinstallablePkgs, withPackage, hsPkgs }:
 
 { flags
 , package
 , components
+, cabal-generator
 
 , name
 , sha256
@@ -71,10 +72,10 @@ let
       '';
     };
 
-  comp-builder = haskellLib.weakCallPackage pkgs ./comp-builder.nix { inherit ghc haskellLib nonReinstallablePkgs withPackage; };
+  comp-builder = haskellLib.weakCallPackage pkgs ./comp-builder.nix { inherit ghc haskellLib nonReinstallablePkgs withPackage hsPkgs; };
 
   buildComp = componentId: component: comp-builder {
-    inherit componentId component package name src flags setup cabalFile patches revision
+    inherit componentId component package name src flags setup cabalFile cabal-generator patches revision
             preUnpack postUnpack preConfigure postConfigure
             preBuild postBuild preCheck postCheck
             preInstall postInstall preHaddock postHaddock

docs/user-guide-cabal.md

@@ -49,7 +49,6 @@ file as follows:
 
 ```nix
 let plan = import ./plan.nix; in
-{ ... }:
 { pkg-def = plan;
   overlay =
     { local-package-a = ./local-package-a.nix;

docs/user-guide-stack.md

@@ -35,26 +35,5 @@ packages.  The overlay specifies which `extra-deps` (here: o-clock-0.1.1)
 we wanted to overlay over the stackage snapshot, and what local
 packages we want (here: my-package).
 
-We will then create the following `nix/default.nix` file:
-
-```nix
-{ pkgs ? import <nixpkgs> {} }:
-
-let
-  haskell = import (builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz) { inherit pkgs; };
-
-  pkgSet = haskell.mkStackPkgSet {
-    stack-pkgs = import ./pkgs.nix;
-    pkg-def-extras = [];
-    modules = [];
-  };
-
-in
-  pkgSet.config.hsPkgs
-```
-
-This generated file is a template, so you can customize it as
-necessary.
-
 *If you came here from the [User Guide](/user-guide), go back and
  complete the setup.*

docs/user-guide.md

@@ -35,41 +35,23 @@ let
 in
 ```
 
-Next we will use this to import `haskell.nix`, `hackage.nix` and
-`stackage.nix` (if we use a stack project).
+Next we will use this to import `haskell.nix`.
 
 **NOTE**: update the `rev` and `sha256` values to the recent ones as
-  found on GitHub.  Especially `hackage.nix` and `stackage.nix` will
-  evolve with package release on hackage and stackage releases
+  found on GitHub.  Especially `haskell.hackage` and `haskell.stackage`
+  will evolve with package release on hackage and stackage releases
   respectively.
 
 ```nix
 let
-  # all packages from hackage as nix expressions
-  hackage = import (overrideWith "hackage"
-                    (pkgs.fetchFromGitHub { owner  = "input-output-hk";
-                                            repo   = "hackage.nix";
-                                            rev    = "3180384b563ec7c7b46bca86b3ace0f32d04cde8";
-                                            sha256 = "19ndkn8pivli9plwq0wnx1cj126l89yk7jw9a0dj51ic3b2qhlb2";
-                                            name   = "hackage-exprs-source"; }))
-                   ;
-  # a different haskell infrastructure
-  haskell = import (overrideWith "haskell"
-                    (pkgs.fetchFromGitHub { owner  = "input-output-hk";
-                                            repo   = "haskell.nix";
-                                            rev    = "73f733ba8bbd11443dda713d1a2d4b7c50a5d408";
-                                            sha256 = "1p2srrxw2lac5krrg35waa251by98r2miwyg6zac9glpg2vmq3ip";
-                                            name   = "haskell-lib-source"; }))
-                   hackage;
-
-  # the set of all stackage snapshots
-  stackage = import (overrideWith "stackage"
-                     (pkgs.fetchFromGitHub { owner  = "input-output-hk";
-                                             repo   = "stackage.nix";
-                                             rev    = "2615a4e6b1651215ee400e62fcdcb195062a3d35";
-                                             sha256 = "08c8lb8x047hndwm1cb2zxixnjmrswfp5y18xp1v79cjqlva0qj6";
-                                             name   = "stackage-snapshot-source"; }))
-                   ;
+  haskellLib = pkgs.fetchFromGitHub {
+    owner  = "input-output-hk";
+    repo   = "haskell.nix";
+    rev    = "5180ae9d78756509c81b98b8e6d974e350b15752";
+    sha256 = "0fbnnvymdp2qb09wlqy6ga8wsyhglx607cjdfg510s1gs756v9yx";
+    name   = "haskell-lib-source";
+  };
+  haskell = import (overrideWith "haskell" haskellLib) { inherit pkgs; };
 in
 ```
 
@@ -78,10 +60,17 @@ Finally we string this together and produce a package set:
 ```nix
 let
   # Import the file you will create in the stack-to-nix or cabal-to-nix step.
-  my-pkgs = import ./nix/pkgs.nix { inherit stackage; };
+  my-pkgs = import ./nix/pkgs.nix;
+
+  # Stack projects use the mkStackPkgSet helper function
+  pkgSet = haskell.mkStackPkgSet {
+    stack-pkgs = my-pkgs;
+    pkg-def-overlays = [];
+    modules = [];
+  };
 
+  # Cabal projects use mkPkgSet
   pkgSet = haskell.mkPkgSet {
-    inherit pkgs;
     pkg-def = my-pkgs.pkg-def;
     pkg-def-extras = [
       # this overlay will provide additional packages

hackage-src.json

@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/input-output-hk/hackage.nix",
-  "rev": "3180384b563ec7c7b46bca86b3ace0f32d04cde8",
-  "date": "2019-02-05T17:32:14+08:00",
-  "sha256": "19ndkn8pivli9plwq0wnx1cj126l89yk7jw9a0dj51ic3b2qhlb2",
+  "rev": "bae1e9533d0b389218dae18a011f61bb89913058",
+  "date": "2019-03-04T17:30:54+01:00",
+  "sha256": "0qyhzliwanvlkwgfl08s2wiibdy2pv2jr4pdgndvgk1qh3ihy0gx",
   "fetchSubmodules": false
 }

modules/component-driver.nix

@@ -5,7 +5,7 @@ let
     inherit haskellLib;
     ghc = config.ghc.package;
     buildGHC = buildModules.config.ghc.package;
-    inherit (config) nonReinstallablePkgs;
+    inherit (config) nonReinstallablePkgs hsPkgs;
     inherit withPackage;
   };
 

stackage-src.json

@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/input-output-hk/stackage.nix",
-  "rev": "2615a4e6b1651215ee400e62fcdcb195062a3d35",
-  "date": "2019-02-05T17:41:44+08:00",
-  "sha256": "08c8lb8x047hndwm1cb2zxixnjmrswfp5y18xp1v79cjqlva0qj6",
+  "rev": "1d992021163db62c064fe704730f8aff79fbac2b",
+  "date": "2019-03-04T17:30:33+01:00",
+  "sha256": "0dxb93bpfjcgc83j1asi23r7yn8fcc456sjn5diblkj0vy7wjg43",
   "fetchSubmodules": false
 }