Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: isomorphism/hackage2
base: b9435cadc4
...
head fork: isomorphism/hackage2
compare: c16b8dc146
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 2 contributors
Commits on Feb 14, 2012
@ehird ehird Omit duplicate instances when using deepseq 1.3
Everything now builds cleanly for me with the dependencies that cabal
chooses with --solver=modular --avoid-reinstalls.
898805a
@isomorphism Merge pull request #4 from ehird/master
Omit duplicate instances when using deepseq 1.3
c16b8dc
Showing with 6 additions and 4 deletions.
  1. +6 −4 Distribution/Server/Framework/Instances.hs
View
10 Distribution/Server/Framework/Instances.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE DeriveDataTypeable, StandaloneDeriving, FlexibleContexts #-}
+{-# LANGUAGE CPP, DeriveDataTypeable, StandaloneDeriving, FlexibleContexts #-}
-- | 'Typeable', 'Binary', 'Serialize', and 'NFData' instances for various
-- types from Cabal, and other standard libraries.
@@ -92,15 +92,17 @@ instance NFData Response where
instance NFData PackageName where
rnf (PackageName pkg) = rnf pkg
-instance NFData Version where
- rnf (Version cont tags) = rnf cont `seq` rnf tags
-
instance NFData PackageIdentifier where
rnf (PackageIdentifier name version) = rnf name `seq` rnf version
+#if !MIN_VERSION_deepseq(1,3,0)
+instance NFData Version where
+ rnf (Version cont tags) = rnf cont `seq` rnf tags
+
instance NFData Day where
rnf (ModifiedJulianDay day) = rnf day
instance NFData UTCTime where
rnf time = rnf (utctDay time) `seq` rnf (toRational $ utctDayTime time)
+#endif

No commit comments for this range

Something went wrong with that request. Please try again.