diff options
| author | Peter Simons <simons@cryp.to> | 2015-01-22 14:09:24 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-01-22 22:40:21 +0100 |
| commit | 56616ec0990442b2a425810f2502660c8103db28 (patch) | |
| tree | f00f6df7c89f386de88db7dd69ef51ba46ae0be1 /pkgs/development | |
| parent | 78f3bd565a931bd451d18590ae690dca5b9d0769 (diff) | |
| download | nixpkgs-56616ec0990442b2a425810f2502660c8103db28.tar nixpkgs-56616ec0990442b2a425810f2502660c8103db28.tar.gz nixpkgs-56616ec0990442b2a425810f2502660c8103db28.tar.bz2 nixpkgs-56616ec0990442b2a425810f2502660c8103db28.tar.lz nixpkgs-56616ec0990442b2a425810f2502660c8103db28.tar.xz nixpkgs-56616ec0990442b2a425810f2502660c8103db28.tar.zst nixpkgs-56616ec0990442b2a425810f2502660c8103db28.zip | |
haskell-ng: move configuration know-how out of cabal2nix and into Nixpkgs
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/hackage-packages.nix | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b67d8e7130e..57c6dab6adc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -373,6 +373,12 @@ self: super: { descriptive = self.descriptive_0_0_2; # https://github.com/chrisdone/structured-haskell-mode/issues/94 }; + # Expect to find sendmail(1) in $PATH. + mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\""; + + # Help the test suite find system timezone data. + tz = overrideCabal super.tz (drv: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; }); + } // { # Not on Hackage yet. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e8b83ed94d5..ef2adf5b7da 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -79215,7 +79215,7 @@ self: { "mime-mail" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring - , filepath, hspec, process, random, sendmail ? "sendmail", text + , filepath, hspec, process, random, text }: mkDerivation { pname = "mime-mail"; @@ -79226,7 +79226,6 @@ self: { random text ]; testDepends = [ base blaze-builder bytestring hspec text ]; - configureFlags = "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"${sendmail}\""; homepage = "http://github.com/snoyberg/mime-mail"; description = "Compose MIME email messages"; license = stdenv.lib.licenses.mit; @@ -114530,7 +114529,6 @@ self: { test-framework-hunit test-framework-quickcheck2 test-framework-th time tzdata unix vector ]; - preConfigure = "export TZDIR=${tzdata}/share/zoneinfo"; homepage = "https://github.com/nilcons/haskell-tz"; description = "Efficient time zone handling"; license = stdenv.lib.licenses.asl20; |