JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haskell-packages.nix: remove if-then-else case distinctions by compiler version

Browse Source 
These decisions belong into haskell-defaults.nix.
This commit is contained in:
Peter Simons 2014-10-12 16:17:08 +02:00
parent 258a47fcc7
commit fa00a9bfdc
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/top-level/haskell-packages.nix
View File

@ -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 {};