diff options
| author | Peter Simons <simons@cryp.to> | 2014-10-12 16:17:08 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-10-12 16:17:08 +0200 |
| commit | fa00a9bfdc0c28dfbe175a9d4af046b44cc26d31 (patch) | |
| tree | 01313573e43727c80fc39f3e59b725bb45d69631 | |
| parent | 258a47fcc755fd9f92d29ec0138fa84b3770e913 (diff) | |
| download | nixlib-fa00a9bfdc0c28dfbe175a9d4af046b44cc26d31.tar nixlib-fa00a9bfdc0c28dfbe175a9d4af046b44cc26d31.tar.gz nixlib-fa00a9bfdc0c28dfbe175a9d4af046b44cc26d31.tar.bz2 nixlib-fa00a9bfdc0c28dfbe175a9d4af046b44cc26d31.tar.lz nixlib-fa00a9bfdc0c28dfbe175a9d4af046b44cc26d31.tar.xz nixlib-fa00a9bfdc0c28dfbe175a9d4af046b44cc26d31.tar.zst nixlib-fa00a9bfdc0c28dfbe175a9d4af046b44cc26d31.zip | |
haskell-packages.nix: remove if-then-else case distinctions by compiler version
These decisions belong into haskell-defaults.nix.
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 189e472521b0..b3e000651a47 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -465,9 +465,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; - compdata = if (pkgs.stdenv.lib.versionOlder "7.8" ghc.version) - then callPackage ../development/libraries/haskell/compdata {} - else null; + compdata = callPackage ../development/libraries/haskell/compdata {}; compdataParam = callPackage ../development/libraries/haskell/compdata-param {}; @@ -1259,8 +1257,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hsdns = callPackage ../development/libraries/haskell/hsdns {}; - hsemail = if (pkgs.stdenv.lib.versionOlder ghc.version "7") then null else - callPackage ../development/libraries/haskell/hsemail {}; + hsemail = callPackage ../development/libraries/haskell/hsemail {}; hslua = callPackage ../development/libraries/haskell/hslua { lua = pkgs.lua5_1; @@ -2553,8 +2550,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in textStreamDecode = callPackage ../development/libraries/haskell/text-stream-decode {}; - tfRandom = if (pkgs.stdenv.lib.versionOlder ghc.version "7") then null else - callPackage ../development/libraries/haskell/tf-random {}; + tfRandom = callPackage ../development/libraries/haskell/tf-random {}; these = callPackage ../development/libraries/haskell/these {}; |