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/haskell-modules/configuration-nix.nix | |
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/haskell-modules/configuration-nix.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 7b9dbcdaa792..4dce5d59d4ad 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -25,9 +25,9 @@ # * enabling/disabling certain features in packages # # If you have an override of this kind, see configuration-common.nix instead. -{ pkgs }: +{ pkgs, haskellLib }: -with import ./lib.nix { inherit pkgs; }; +with haskellLib; # All of the overrides in this set should look like: # |