Commit Graph

1704 Commits

Author SHA1 Message Date
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
9b86fb4ea4 haskell-scientific: update default to the latest version 2014-05-24 12:00:38 +02:00
Peter Simons
19c4909124 cabal-install: update to version 1.20.0.2 2014-05-24 10:42:07 +02:00
Peter Simons
d364ba0fba haskell-wreq: remove unnecessary overrides 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
db0b1b76d3 haskell-scientific: add versions 0.1.0.1 and 0.3.2.1 2014-05-23 21:54:27 +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
Mateusz Kowalczyk
7943355954 free-game: 1.0.5, 1.1 2014-05-23 18:02:20 +02:00
Mateusz Kowalczyk
099f7d5620 minioperational: 0.4.3 2014-05-23 18:02:20 +02:00
Mateusz Kowalczyk
f4f0dab825 JuicyPixels-util: 0.1 2014-05-23 18:02:20 +02:00
Mateusz Kowalczyk
ab59d64a59 freetype2: 0.1.1 2014-05-23 18:02:20 +02:00
Mateusz Kowalczyk
7bd546b816 control-bool: 0.2.1 2014-05-23 18:02:20 +02:00
Mateusz Kowalczyk
9e8f9b5528 boundingboxes: 0.1.1, 0.2 2014-05-23 18:02:20 +02:00
Mateusz Kowalczyk
555d1fbfdf colors: 0.1.1 2014-05-23 18:02:20 +02:00
Peter Simons
6dbc7547ea Merge pull request #2722 from Fuuzetsu/wcwidth
wcwidth
2014-05-23 17:52:13 +02:00
Peter Simons
6421a74f67 haskell-packages.nix: rename GLFWb to GLFWB for consistency
https://github.com/NixOS/cabal2nix/issues/65
2014-05-23 17:42:51 +02:00
John Wiegley
a1df473db7 haskell-hobbes: add version 0.2.2 2014-05-23 17:39:16 +02:00
John Wiegley
47a8cd7008 haskell-codex: add version 0.0.1.6 2014-05-23 17:39:15 +02:00
John Wiegley
04f3c8e718 haskell-recursion-schemes: add version 4.0 2014-05-23 17:39:15 +02:00
John Wiegley
34c6a26f5d haskell-compdata: add version 0.7.0.1 2014-05-23 17:39:15 +02:00
John Wiegley
d7bc0de8c8 haskell-categories: add version 1.0.6 2014-05-23 17:39:15 +02:00
Peter Simons
ba5473676f Update Haskell OpenGL and GLUT packages.
1) GLURaw 1.4.0.0 --> 1.4.0.1
 2) GLUT 2.5.1.0 -> 2.5.1.1
 3) OpenGL 2.9.1.0 -> 2.9.2.0
 4) OpenGLRaw 1.5.0.0 added
2014-05-23 17:39:15 +02:00
Peter Simons
363b35ac2c haskell-tls: update to version 1.2.8.nix 2014-05-23 17:39:15 +02:00
Peter Simons
a815933a5d haskell-pretty-show: update to version 1.6.7
... and drop obsolete 1.2 version.
2014-05-23 17:39:14 +02:00
Mateusz Kowalczyk
cb2cf60a14 wcwidth: 0.0.2 2014-05-22 23:46:12 +02:00
Mateusz Kowalczyk
f8ae62a8d0 setlocale: 0.0.3 2014-05-22 23:45:46 +02:00
Austin Seipp
23e53f1057 Merge pull request #2512 from jwiegley/hoogle-local
Add an expression for building fullly local Hoogle docs
2014-05-22 14:09:28 -05:00
Daniel Bergey
f211c32e6d IMM RSS reader and dependencies 2014-05-22 14:17:24 +00:00
Peter Simons
2244541cda haskell-parsers: add version 0.11.0.1 2014-05-21 23:04:30 +02:00
Peter Simons
a59b8c143e haskell-fmlist: add version 0.8 2014-05-21 23:04:30 +02:00
Peter Simons
548cce8826 haskell-language-glsl: add version 0.0.2 2014-05-21 23:04:30 +02:00
Peter Simons
b1b24494f2 haskell-binary: update to version 0.7.2.1 2014-05-21 16:12:06 +02:00
Peter Simons
8882c77d4b haskell-vector: update to version 0.10.9.2 2014-05-21 16:12:06 +02:00
Oliver Charles
be17f7fef2 haskellPackages.networkMetrics: New expression 2014-05-19 10:46:33 +01:00
Ian-Woo Kim
e6f4534ee7 hgal: new package. library for computation automorphism group and canonical labelling of a graph 2014-05-18 12:58:49 +02:00
Peter Simons
e2d1b8c60b leksah: remove broken package 2014-05-17 12:56:52 +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
14958391df haskell-multiset: drop obsolete version 0.2.1 2014-05-16 18:51:38 +02:00
Peter Simons
413401f760 haskell-attoparsec: update to version 0.11.3.1 2014-05-16 18:51:37 +02:00
Peter Simons
e62a8e5b82 haskell-hashable: update to version 1.2.2.0 2014-05-16 18:51:37 +02:00
Peter Simons
e50442a35b haskell-tls: update to version 1.2.7 2014-05-16 18:51:37 +02:00
Peter Simons
8d51acf74f haskell-text: update to version 1.1.1.2 2014-05-16 18:51:37 +02:00
Peter Simons
51fc4fe842 haskell-primitive: update to version 0.5.3.0 2014-05-16 18:51:37 +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
17b80ebf06 haskell-HTTP: update to version 4000.2.15 2014-05-16 18:51:37 +02:00
Peter Simons
a82d0962eb haskell-data-lens-light: add version 0.1.1 2014-05-16 18:51:34 +02:00
Peter Simons
aae174b361 haskell-temporary-rc: add version 1.2.0.3 2014-05-16 18:51:34 +02:00
Peter Simons
485ad34b9c Merge pull request #2647 from crooney/master
cabal2nix derivation for haskellPackages.fayText
2014-05-15 18:12:24 +02:00
chris rooney
cc51572bd5 Register expression for fay-text in catalog. 2014-05-15 11:11:47 -04:30
Christoph Hrdinka
b1feffd1a1 haskell-glfw-b: add package version 1.4.6 2014-05-15 13:46:20 +02:00
Peter Simons
edd71867e5 haskell-websockets: require QuickCheck 2.6 2014-05-14 15:02:35 +02:00
Peter Simons
438a8d1cb8 haskell-HTTP-4000.2.5: require network < 2.5 2014-05-14 15:02:34 +02:00
Peter Simons
f77b806b46 haskell-Pathfinder and DSH: remove broken packages 2014-05-14 15:02:34 +02:00
Peter Simons
514a57c6d9 haskell-AspectAG: remove broken package 2014-05-14 15:02:33 +02:00
Peter Simons
5d1b8ea3b5 haskell-MazesOfMonad: remove broken package 2014-05-14 15:02:33 +02:00
Peter Simons
6be622c178 haskell-NanoProlog: remove broken package 2014-05-14 15:02:33 +02:00
Peter Simons
d5307df65f haskell-Hipmunk: remove broken package 2014-05-14 15:02:33 +02:00
Peter Simons
7dcce5b013 ebnf2ps: drop un-maintained package that doesn't compile 2014-05-14 15:02:33 +02:00
Peter Simons
6c61d41dc9 Drop obsolete Haskell packages WebBits, WebBitsHtml, JsContracts, and flapjax.
None of our compilers can build these packages. I suppose that stuff has
been replaced by language-ecmascript.
2014-05-14 15:02:33 +02:00
Peter Simons
cb644cafa8 Agda: require QuickCheck < 2.7 2014-05-14 15:02:32 +02:00
Peter Simons
45bd1ddb7d haskell-ChasingBottoms: require QuickCheck < 2.7 2014-05-14 15:02:32 +02:00
Peter Simons
b7e383487b haskell-packages: remove obsolete parsec2 and parsec3 aliases 2014-05-14 15:02:31 +02:00
Peter Simons
f6341cb43f haskell-checkers: require QuickCheck < 2.7 2014-05-14 15:02:31 +02:00
Peter Simons
44d03082d4 haskell-GLUT-2.3.1.0: fix build 2014-05-14 15:02:30 +02:00
Peter Simons
8de3955037 haskell-packages.nix: remove references to parsec2 2014-05-14 15:02:27 +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
John Wiegley
7be94d3b59 Add an expression for build fullly local Hoogle docs 2014-05-12 16:48:51 -05:00
Peter Simons
06f9fed0ac Merge pull request #2592 from bennofs/haskell-new-expressions
Add a few haskell expressions
2014-05-09 22:59:40 +02:00
Benno Fünfstück
631e74963f haskell-dynamic-cabal: new expression 2014-05-09 22:50:41 +02:00
Benno Fünfstück
fb2d8ab9aa haskell-th-lift-instances: new expression 2014-05-09 22:50:40 +02:00
Benno Fünfstück
52bd5978a0 haskell-quickcheck-property-monad: new expression 2014-05-09 22:50:39 +02:00
Benno Fünfstück
e61e23b6c7 haskell-hcltest: new expression 2014-05-09 22:50:38 +02:00
Benno Fünfstück
b49de7164e haskell-generate: new expression 2014-05-09 22:50:37 +02:00
Benno Fünfstück
97dde61662 haskell-system-time-monotonic: new expression 2014-05-09 22:50:36 +02:00
Benno Fünfstück
2525aac134 haskell-unix-memory: new expression 2014-05-09 22:50:35 +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
4ee0cd2bbb haskell-gloss: Revert "update to version 1.8.2.1"
This reverts commit 37df971a49b6264894df2584c45a65a358f5fade. The new
version doesn't compile.
2014-05-07 19:13:06 +02:00
Peter Simons
ee1a03577c haskell-statistics: drop obsolete version 0.10.5.2 2014-05-07 19:13:06 +02:00
Peter Simons
6f5ee37d5c haskell-HTTP: update to version 4000.2.14 2014-05-07 19:13:04 +02:00
Peter Simons
af8d34c35e Merge pull request #2531 from jwiegley/djinn
Add an expression for the Haskell library djinn
2014-05-07 11:36:56 +02:00
Oliver Charles
fcc3ae1d84 haskellPackages.snapletStripe: New expression 2014-05-07 09:57:27 +01:00
Shea Levy
0d0f7d2681 Merge branch 'buildLocalCabal-drvArgs' of git://github.com/proger/nixpkgs
buildLocalCabal: allow drvArgs in buildLocalCabalWithArgs
2014-05-06 09:27:40 -04:00
Peter Simons
81a05aabbe haskell-packages.nix: update (unused) reference to cabal-install 2014-05-06 10:59:23 +02:00
Vladimir Kirillov
7eff825487 buildLocalCabal: allow cabalDrvArgs in buildLocalCabalWithArgs
allows to write neat expressions like (as we're still generating an
expression string):

```
{
  build = haskellPackages.buildLocalCabalWithArgs {
    inherit src name;
    cabalDrvArgs = {
      jailbreak = false;
      doCheck = false;
    };
  };
}
```

without resorting to weird kung-fu like darcs does:

```
darcs = haskellPackages.darcs.override {
  # A variant of the Darcs derivation that containts only the
  # executable and
  # thus has no dependencies on other Haskell packages.
  cabal = { mkDerivation = x: rec { final = haskellPackages.cabal.mkDerivation (self: (x final) // {
            isLibrary = false;
            configureFlags = "-f-library"; }); }.final;
          };
};
```

While here, move the `jailbreak = true;` as the default `cabalDrvArgs`
option.
2014-05-06 11:00:48 +03:00
John Wiegley
7848f96b58 Add an expression for the Haskell library djinn 2014-05-05 19:48:50 -05:00
Vladimir Kirillov
9aa231abfa buildLocalCabal: include cabalInstall to buildDepends to preserve developer experience 2014-05-05 14:43:55 +03:00
Peter Simons
66997bba1e haskell-gloss: require the latest OpenGL and GLUT libraries 2014-05-05 10:54:12 +02:00
Peter Simons
dbb561ae62 haskell-packages.nix: strip trailing whitespace 2014-05-05 10:52:11 +02:00
Peter Simons
f5a6b58374 cabal-install: update to version 1.20.0.1 2014-05-05 10:46:40 +02:00
Peter Simons
986a42dfe7 haskell-cabal-lenses: add version 0.1 2014-05-05 10:46:39 +02:00
Peter Simons
e7c207e10d haskell-hourglass: add version 0.1.1 2014-05-05 10:46:39 +02:00
Peter Simons
401f4a28c1 cryptol: fix reference to text library 2014-05-04 23:21:39 +02:00
Benno Fünfstück
d385835c38 haskell-profiteur: new expression 2014-05-04 23:02:46 +02:00
Peter Simons
18f49692ec haskell-wreq: fix reference to attoparsec 2014-05-04 22:25:56 +02:00
Peter Simons
911d9d5b1b Merge pull request #2489 from jwiegley/haskexprs
Add several new Haskell expressions
2014-05-04 13:22:13 +02:00