diff options
| author | Mathieu Boespflug <m@tweag.io> | 2016-03-04 21:24:42 +0100 |
|---|---|---|
| committer | Mathieu Boespflug <m@tweag.io> | 2016-03-04 21:24:42 +0100 |
| commit | 7fedb7c9922ec3c715851c54f689c949fae14da9 (patch) | |
| tree | a2ea37ee060bda838bd7464c98e9c060a1ba63e1 | |
| parent | 6f09628c321e19f999eb6f2f59fde829723a5c2d (diff) | |
| download | nixlib-7fedb7c9922ec3c715851c54f689c949fae14da9.tar nixlib-7fedb7c9922ec3c715851c54f689c949fae14da9.tar.gz nixlib-7fedb7c9922ec3c715851c54f689c949fae14da9.tar.bz2 nixlib-7fedb7c9922ec3c715851c54f689c949fae14da9.tar.lz nixlib-7fedb7c9922ec3c715851c54f689c949fae14da9.tar.xz nixlib-7fedb7c9922ec3c715851c54f689c949fae14da9.tar.zst nixlib-7fedb7c9922ec3c715851c54f689c949fae14da9.zip | |
Move `buildStackProject` to `haskell.lib`.
| -rw-r--r-- | doc/haskell-users-guide.md | 4 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/lib.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/haskell-users-guide.md b/doc/haskell-users-guide.md index da923db602d8..ce61295e5674 100644 --- a/doc/haskell-users-guide.md +++ b/doc/haskell-users-guide.md @@ -363,7 +363,7 @@ instead of `packages`: 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 -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 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 @@ -373,7 +373,7 @@ special options turned on: let R = pkgs.R.override { enableStrictBarrier = true; }; in - haskell.buildStackProject { + haskell.lib.buildStackProject { name = "HaskellR"; buildInputs = [ R zeromq zlib ]; } diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index a3e1b56104d3..51adb582e54f 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -81,6 +81,8 @@ rec { 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}"; }); #FIXME: throw this away sometime in the future. added 2015-08-18 diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 540343aa02d8..928541cd9dfa 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -4,8 +4,6 @@ rec { lib = import ../development/haskell-modules/lib.nix { inherit pkgs; }; - buildStackProject = callPackage ../development/haskell-modules/generic-stack-builder.nix { }; - compiler = { ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; }; |