diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-01 12:44:08 -0400 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2017-08-03 13:12:01 +0200 |
| commit | 74f5fe50681003f075bf0b1ff811d0c0cd7c64f3 (patch) | |
| tree | 3778107673a5b406aaca29fe5901c0cf998af555 /pkgs/development/tools/haskell | |
| parent | a2825a3c6f445175d4ad8dc52b8c02af3c629571 (diff) | |
| download | nixlib-74f5fe50681003f075bf0b1ff811d0c0cd7c64f3.tar nixlib-74f5fe50681003f075bf0b1ff811d0c0cd7c64f3.tar.gz nixlib-74f5fe50681003f075bf0b1ff811d0c0cd7c64f3.tar.bz2 nixlib-74f5fe50681003f075bf0b1ff811d0c0cd7c64f3.tar.lz nixlib-74f5fe50681003f075bf0b1ff811d0c0cd7c64f3.tar.xz nixlib-74f5fe50681003f075bf0b1ff811d0c0cd7c64f3.tar.zst nixlib-74f5fe50681003f075bf0b1ff811d0c0cd7c64f3.zip | |
haskell infra: Misc cleanups
- The haskell lib is very close to not relying on Nixpkgs. I think this is good---simpler to think about and matches Nixpkgs's lib. - The haskell lib is only imported once - stdenv is exposed more shallowly so it can be overriden more easily. I'll eventually use this on Darwin to avoid the Sierra shared library problems (unless changes are to be made system-wide). Closes https://github.com/NixOS/nixpkgs/pull/27840.
Diffstat (limited to 'pkgs/development/tools/haskell')
| -rw-r--r-- | pkgs/development/tools/haskell/lambdabot/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix index 85d4bfc93b6a..7282fb4970ee 100644 --- a/pkgs/development/tools/haskell/lambdabot/default.nix +++ b/pkgs/development/tools/haskell/lambdabot/default.nix @@ -1,4 +1,4 @@ -{ lib, haskell-lib, fetchpatch, makeWrapper, haskellPackages +{ lib, haskellLib, fetchpatch, makeWrapper, haskellPackages , mueval , withDjinn ? true , aspell ? null @@ -25,7 +25,7 @@ let allPkgs = pkgs: mueval.defaultPkgs pkgs ++ [ pkgs.lambdabot-trusted ] ++ pac modulesStr = lib.replaceChars ["\n"] [" "] modules; configStr = lib.replaceChars ["\n"] [" "] configuration; -in haskell-lib.overrideCabal haskellPackages.lambdabot (self: { +in haskellLib.overrideCabal haskellPackages.lambdabot (self: { patches = (self.patches or []) ++ [ ./custom-config.patch ]; postPatch = (self.postPatch or "") + '' substituteInPlace src/Main.hs \ |