diff options
| author | Ryan Trinkle <ryan.trinkle@gmail.com> | 2015-01-02 12:30:19 -0500 |
|---|---|---|
| committer | Ryan Trinkle <ryan.trinkle@gmail.com> | 2015-01-02 12:30:19 -0500 |
| commit | b1e967958e50b742fbc73270263d7e150590b462 (patch) | |
| tree | dd0817ec872fcd02546d3739df2c5d84055db33d /pkgs/build-support/cabal | |
| parent | ca9d370f5604d76da19d10a4b669c851fc39d889 (diff) | |
| download | nixpkgs-b1e967958e50b742fbc73270263d7e150590b462.tar nixpkgs-b1e967958e50b742fbc73270263d7e150590b462.tar.gz nixpkgs-b1e967958e50b742fbc73270263d7e150590b462.tar.bz2 nixpkgs-b1e967958e50b742fbc73270263d7e150590b462.tar.lz nixpkgs-b1e967958e50b742fbc73270263d7e150590b462.tar.xz nixpkgs-b1e967958e50b742fbc73270263d7e150590b462.tar.zst nixpkgs-b1e967958e50b742fbc73270263d7e150590b462.zip | |
Eliminate incorrect version checks from cabalJs
Diffstat (limited to 'pkgs/build-support/cabal')
| -rw-r--r-- | pkgs/build-support/cabal/ghcjs.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/build-support/cabal/ghcjs.nix b/pkgs/build-support/cabal/ghcjs.nix index 67c57482f3d..3d12c3efb11 100644 --- a/pkgs/build-support/cabal/ghcjs.nix +++ b/pkgs/build-support/cabal/ghcjs.nix @@ -6,14 +6,13 @@ , enableSharedLibraries ? false , enableSharedExecutables ? false , enableStaticLibraries ? true -, enableCheckPhase ? stdenv.lib.versionOlder "7.4" ghc.version +, enableCheckPhase ? true , enableHyperlinkSource ? false , extension ? (self : super : {}) }: let enableFeature = stdenv.lib.enableFeature; - versionOlder = stdenv.lib.versionOlder; optional = stdenv.lib.optional; optionals = stdenv.lib.optionals; optionalString = stdenv.lib.optionalString; @@ -156,9 +155,9 @@ in (enableFeature self.enableSplitObjs "split-objs") (enableFeature enableLibraryProfiling "library-profiling") (enableFeature true "shared") - (optional (versionOlder "7" ghc.version) (enableFeature self.enableStaticLibraries "library-vanilla")) - (optional (versionOlder "7.4" ghc.version) (enableFeature self.enableSharedExecutables "executable-dynamic")) - (optional (versionOlder "7" ghc.version) (enableFeature self.doCheck "tests")) + (enableFeature self.enableStaticLibraries "library-vanilla") + (enableFeature self.enableSharedExecutables "executable-dynamic") + (enableFeature self.doCheck "tests") ]; # GHC needs the locale configured during the Haddock phase. |