Commit Graph

110 Commits

Author SHA1 Message Date
Aycan iRiCAN
8fe08c34a4 Add binary to networkTransport again. 2014-06-21 18:06:24 +03:00
Aycan iRiCAN
719d0b64e0 Removed binary argument from networkTransport and networkTransportTcp 2014-06-21 18:01:51 +03:00
Aycan iRiCAN
88050e4a41 Moved package overrides from haskell-packages.nix to haskell-defaults.nix. 2014-06-21 17:44:29 +03:00
Peter Simons
ac56e50d3a haskell-defaults.nix: ghc-HEAD requires latest mtl 2014-06-10 20:27:20 +02:00
Mateusz Kowalczyk
3287542c57 haskell-vty: add version 5.1.0 2014-06-09 10:27:00 +02:00
Peter Simons
40eb5a5f73 haskell-system-fileio: require Cabal >= 1.8 2014-06-09 10:27:00 +02:00
Peter Simons
b134e2a0fd haskell-defaults.nix: don't provide singletons on pre-7.8.x platforms 2014-06-09 10:27:00 +02:00
Peter Simons
c7a18e326f Stick to transformers 0.3.x everywhere; the new versions breaks just about every other package that we have. 2014-06-09 10:26:59 +02:00
Peter Simons
1d50ed522a haskell-system-filepath: require at least Cabal 1.8 to build 2014-06-09 10:26:59 +02:00
Peter Simons
9dd2b3c651 haskell-shelly: move version override to haskell-defaults.nix 2014-06-09 10:26:58 +02:00
Peter Simons
4f2992c3fa Switch GHC 6.10.x to network 2.2.x because newer versions give buffering errors (according to the Cabal file from HTTP, which excludes newer versions from building) 2014-06-09 10:26:58 +02:00
Peter Simons
d07125a0d9 haskell-transformers-compat: provide different versions for GHC 7.8.2 and below
transformers is a core library in GHC 7.8.2, so that compiler is stuck
with an older version of the -compat library.
2014-06-09 10:26:58 +02:00
Peter Simons
1d392a56ae Update the default version of transformers to 0.4.1 on older compilers. 2014-06-09 10:26:56 +02:00
Peter Simons
6358b15985 haskell-mtl: update to version 2.2.1 (and delete unused versions 1.1.1.1 and 2.1.3.1) 2014-06-09 10:26:56 +02:00
Peter Simons
c9672d767f haskell-Cabal: update to version 1.20.0.1 2014-06-09 10:26:56 +02:00
Peter Simons
1d70298e2e Elm: require binary 0.7.x on ghc <= 7.6.3 2014-05-28 12:48:30 +02:00
Peter Simons
ff6db963fc haskell-aeson: update to version 0.7.0.6
Keep version 0.7.0.4 for builds with ghc <= 7.4.2.
2014-05-24 12:01:19 +02:00
Peter Simons
82df69a1de haskell-zip-archive: add version 0.2.3.2
Use latest zip archive only with GHC 7.8.2 so that we don't have to
override 'binary' everywhere else.
2014-05-24 12:01:08 +02:00
Peter Simons
ecaf15c324 haskell-attoparsec: add version 0.11.3.4 2014-05-24 12:00:58 +02:00
Peter Simons
19c4909124 cabal-install: update to version 1.20.0.2 2014-05-24 10:42:07 +02:00
Peter Simons
00594510e8 haskell-defaults.nix: fix hashtables build with GHC 6.10.x 2014-05-23 21:54:28 +02:00
Peter Simons
e081cc3b44 haskell-defaults.nix: fix hashable and case-insensitive builds with GHC 6.x 2014-05-23 21:54:28 +02:00
Peter Simons
ca02d3734b haskell-defaults.nix: override case-sensitive on GHC 7.2.2 to avoid build error 2014-05-23 21:54:28 +02:00
Peter Simons
5538d68aca haskell-defaults.nix: move extensible-exceptions override into the right place 2014-05-23 21:54:27 +02:00
Peter Simons
6962c86135 haskell-defaults.nix: improve configuration for GHC 6.x 2014-05-23 21:54:27 +02:00
Peter Simons
da38198b4f Use attoparsec 0.10.x when building with GHC 6.x.
Newer versions depend on 'scientific', which this compiler cannot build.
2014-05-23 21:54:27 +02:00
Peter Simons
45799eeaba haskell-scientific: there's no point in using 0.1.0.1, because it doesn't build with GHC 6.12.x either :-( 2014-05-23 21:54:27 +02:00
Peter Simons
78618e12d3 haskell-async: fix build with GHC 6.12.x 2014-05-23 18:59:09 +02:00
Peter Simons
70d61f8517 haskell-defaults.nix: don't override 'Cabal' in GHC 6.10.4; it's a core library 2014-05-23 18:57:03 +02:00
Peter Simons
de014b4b86 haskell-split: add version 0.1.4.3 for the benefit of GHC 6.x 2014-05-23 18:56:10 +02:00
Peter Simons
3f0a45e88f haskell-codex: update to version 0.0.2 2014-05-23 17:58:48 +02:00
Peter Simons
b1b24494f2 haskell-binary: update to version 0.7.2.1 2014-05-21 16:12:06 +02:00
Peter Simons
edeffd7c49 haskell-DrIFT: add version 2.4.2 2014-05-17 12:56:52 +02:00
Peter Simons
499f49f392 binary: fix build with ghc 6.10.4 2014-05-17 12:56:51 +02:00
Peter Simons
c9887ca489 cabal-install: use native Cabal version when compiling with GHC 7.9.x 2014-05-17 12:51:17 +02:00
Peter Simons
53ecf3fe17 haskell-modular-arithmetic: require ghc >7.8 2014-05-16 18:51:38 +02:00
Peter Simons
e048994d58 haskell-defaults.nix: stick to transformers 0.3.x 2014-05-16 18:51:38 +02:00
Peter Simons
9847b8d148 haskell-mtl: update to version 2.2.0.1 2014-05-16 18:51:37 +02:00
Peter Simons
9bc73e0f1e haskell-binary: update to version 0.7.2.0 2014-05-16 18:51:37 +02:00
Peter Simons
63a69164d0 haskell-transformers: update to version 0.4.1.0 2014-05-16 18:51:37 +02:00
Peter Simons
3c656b702c haskell-defaults.nix: don't provide gloss to ghc < 7.8 2014-05-14 15:02:35 +02:00
Peter Simons
d51617e877 haskell-pipes-binary: fix build with ghc < 7.8 2014-05-14 15:02:32 +02:00
Peter Simons
5e7de2f457 haskell-ariadne: fix build with ghc < 7.8 2014-05-14 15:02:31 +02:00
Peter Simons
8fe9c64b13 haskell-binary-conduit: fix build with ghc < 7.8 2014-05-14 15:02:30 +02:00
Peter Simons
16958ffaf9 haskell-bson: fix build with ghc < 7.8 2014-05-14 15:02:30 +02:00
Peter Simons
fd0f9e6fc1 Re-write the Haskell Platform out of haskell-defaults.nix.
1) Packages formerly called haskell-haskell-platform-ghcXYZ-VVVV.X.Y.Z are
    now called haskell-platform-VVVV.X.Y.Z. The latest version can be
    installed by running "nix-env -i haskell-platform".

 2) The attributes haskellPackages_ghcXYZ.haskellPlatform no longer exist.
    Instead, we have attributes like haskellPlatformPackages."2012_4_0_0".
    (The last numeric bit must be quoted when used in a Nix file, but not on
    the command line to nix-env, nix-build, etc.) The latest Platform has a
    top-level alias called simply haskellPlatform.

 3) The haskellPackages_ghcXYZ package sets offer the latest version of every
    library that GHC x.y.z can compile. For example, if 2.7 is the latest
    version of QuickCheck and if GHC 7.0.4 can compile that version, then
    haskellPackages_ghc704.QuickCheck refers to version 2.7.

 4) All intermediate GHC releases were dropped from all-packages.nix to
    simplify our configuration. What remains is a haskellPackages_ghcXYZ set
    for the latest version of every major release branch, i.e. GHC 6.10.4,
    6.12.3, 7.0.4, 7.2.2, 7.4.2, 7.6.3, 7.8.2, and 7.9.x (HEAD snapshot).

 5) The ghcXYZPrefs functions in haskell-defaults.nix now inherit overrides
    from newer to older compilers, i.e. an override configured for GHC 7.0.4
    will automatically apply to GHC 6.12.3 and 6.10.4, too. This change has
    reduced the redundancy in those configuration functions. The downside is
    that overriding an attribute for only one particular GHC version has become
    more difficult. In practice, this case doesn't occur much, though.

 6) The 'cabal' builder has a brand-new argument called 'extension'. That
    function is "self : super : {}" by default and users can override it to
    mess with the attribute set passed to cabal.mkDerivation. An example use
    would be the definition of darcs in all-packages.nix:

    | darcs = haskellPackages.darcs.override {
    |   cabal = haskellPackages.cabal.override {
    |     extension = self : super : {
    |       isLibrary = false;
    |       configureFlags = "-f-library " + super.configureFlags or "";
    |     };
    |   };
    | };

    In this case, extension disables building the library part of the package
    to give us an executable-only version that has no dependencies on GHC or
    any other Haskell packages.

    The 'self' argument refers to the final version of the attribute set and
    'super' refers to the original attribute set.

Note that ...

 - Haskell Platform packages always provide the Haddock binary that came with
   the compiler.

 - Haskell Platform 2009.2.0.2 is broken because of build failures in cgi and
   cabal-install.

 - Haskell Platform 2010.1.0.0 is broken becasue of build failures in cgi.
2014-05-14 14:59:52 +02:00
Russell O'Connor
46ccebe413 Allow for later binding in ghcPrefs
Now that both self and super are available to prefFun, we can use self, where appropriate to access late bound versions of most
packages.

When extensions are not used, there is no difference between self and super.
2014-05-08 22:01:36 -04:00
Russell O'Connor
d4bd4650d6 Rework the knot-tying code for defining Haskell packages.
The existing knot-tying code I felt was a bit incoherent with result, finalReturn, self, refering to different various forms of the "haskellPackages" value and often
different forms in the same place.

This commit instills some object-oriented discipline to the construction of hasekllPackages using a small number of fundamental OO concepts:

* An class is a open recursive function of the form (self : fooBody) where fooBody is a set.
* An instance of a class is the fixed point of the class.
  This value is sometimes refered to as an object and the values in the resulting set are sometimes refered to as methods.
* A class, foo = self : fooBody, can be extended by an extension which is a function bar = (self : super : barBody) where barBody a set of overrides for fooBody.
  The result of a class extension is a new class whose value is self : foo self // bar self (foo self).
  The super parameter gives access to the original methods that barBody may be overriding.

This commit turns the haskell-packages value into a "class".

The knot-tying, a.k.a the object instanitation, is moved into haskells-defaults.  The "finalReturn" is no longer needed and is eliminated from the body of
haskell-packages. All the work done by prefFun is moved to haskell-defaults, so that parameter is eliminated form haskell-packages.  Notice that the old prefFun took
two pameters named "self" and "super", but both parameters got passed the same value "result".  There seems to have been some confusion in the old code.

Inside haskell-defaults, the haskell-packages class is extended twice before instantiation.  The first extension is done using prefFun argument.
The second extension is done the extension argument, which is a renamed version of extraPrefs.

This two stage approach means that extension's super gets access to the post "perfFun" object while previously the extraPrefs only had access to the pre "prefFun"
object.  Also the extension function has access to both the super (post "perfFun") object and to self, the final object.  With extraPrefs, one needed to use the
"finalReturn" of the haskell packages to get access to the final object.  Due to significant changes in semantics, I thought it best to replace extraPrefs with
extension so that people using extraPrefs know to update thier cod.

Lastly, all the Prefs functions have renamed the "self" parameter to "super".  This is because "self" was never actually a self-reference in the object oriented sense
of the word.  For example

    Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; };

doesn't actually make sense from an object oriented standpoint because, barring further method overriding, the value of Cabal_1_18_1_3 would be trying to override it's
own value which simply causes a loop exception.  Thankfully all these uses of self were really uses of super:

    Cabal_1_18_1_3 = super.Cabal_1_18_1_3.override { deepseq = super.deepseq_1_3_0_2; };

In this notation the overriden Cabal_1_18_1_3 method calls the Cabal_1_18_1_3 of the super-class, which is a well-founded notion.

Below is an example use of using "extension" parameter

{
  packageOverrides = pkgs : {
    testHaskellPackages = pkgs.haskellPackages.override {
      extension = self : super : {
        transformers_0_4_1_0 = self.cabal.mkDerivation (pkgs: {
        pname = "transformers";
        version = "0.4.1.0";
        sha256 = "0jlnz86f87jndv4sifg1zpv5b2g2cxy1x2575x727az6vyaarwwg";
        meta = {
          description = "Concrete functor and monad transformers";
          license = pkgs.stdenv.lib.licenses.bsd3;
          platforms = pkgs.ghc.meta.platforms;
          maintainers = [ pkgs.stdenv.lib.maintainers.andres ];
        };
       });

      transformers = self.transformers_0_4_1_0;

      lensFamilyCore = super.lensFamilyCore.override { transformers = self.transformers_0_3_0_0; };
     };
   };
 };
}

Notice the use of self in the body of the override of the transformers method which references the newly defined transformers_0_4_1_0 method.

With the previous code, one would have to instead akwardly write

      transformers = super.finalReturn.transformers_0_4_1_0;

or use a rec clause, which would prevent futher overriding of transformers_0_4_1_0.
2014-05-08 12:01:45 -04:00
Peter Simons
b8bb480212 cabal-install: fix build of 1.20.0.1 with GHC 7.2.2 2014-05-07 19:13:06 +02:00
Peter Simons
437ed5aae4 haskell-defaults.nix: fix the "highPrio" variant of the haskell package set
"High priority" is not the same the thing as "not explicitly marked as
low priority".
2014-05-07 17:04:23 +02:00