public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move buildStackProject to haskell.lib.

Browse Source
This commit is contained in:
Mathieu Boespflug 2016-03-04 21:24:42 +01:00
parent 6f09628c32
commit 7fedb7c992
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/haskell-users-guide.md
View File

@ -363,7 +363,7 @@ instead of `packages`:
For more on how to write a `shell.nix` file see the below section. You'll need For more on how to write a `shell.nix` file see the below section. You'll need
to express a derivation. Note that Nixpkgs ships with a convenience wrapper to express a derivation. Note that Nixpkgs ships with a convenience wrapper
function around `mkDerivation` called `haskell.buildStackProject` to help you function around `mkDerivation` called `haskell.lib.buildStackProject` to help you
create this derivation in exactly the way Stack expects. All of the same inputs create this derivation in exactly the way Stack expects. All of the same inputs
as `mkDerivation` can be provided. For example, to build a Stack project that as `mkDerivation` can be provided. For example, to build a Stack project that
including packages that link against a version of the R library compiled with including packages that link against a version of the R library compiled with
@ -373,7 +373,7 @@ special options turned on:
let R = pkgs.R.override { enableStrictBarrier = true; }; let R = pkgs.R.override { enableStrictBarrier = true; };
in in
haskell.buildStackProject { haskell.lib.buildStackProject {
name = "HaskellR"; name = "HaskellR";
buildInputs = [ R zeromq zlib ]; buildInputs = [ R zeromq zlib ];
} }

2
pkgs/development/haskell-modules/lib.nix
View File

@ -81,6 +81,8 @@ rec {
buildStrictly = pkg: buildFromSdist (appendConfigureFlag pkg "--ghc-option=-Wall --ghc-option=-Werror"); buildStrictly = pkg: buildFromSdist (appendConfigureFlag pkg "--ghc-option=-Wall --ghc-option=-Werror");
buildStackProject = callPackage ../development/haskell-modules/generic-stack-builder.nix { };
triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; }); triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; });
#FIXME: throw this away sometime in the future. added 2015-08-18 #FIXME: throw this away sometime in the future. added 2015-08-18

2
pkgs/top-level/haskell-packages.nix
View File

@ -4,8 +4,6 @@ rec {
lib = import ../development/haskell-modules/lib.nix { inherit pkgs; }; lib = import ../development/haskell-modules/lib.nix { inherit pkgs; };
buildStackProject = callPackage ../development/haskell-modules/generic-stack-builder.nix { };
compiler = { compiler = {
ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; }; ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; };