Commit Graph

37 Commits

Author SHA1 Message Date
Vladimír Čunát
137eae0b55 Merge #2630: add and use fetchpatch
fetchpatch is fetchurl that determinizes the patch.
Some parts of generated patches change from time to time, e.g. see #1983 and
http://comments.gmane.org/gmane.linux.distributions.nixos/12815
Using fetchpatch should prevent the hash from changing.

Conflicts (auto-solved):
	pkgs/development/libraries/haskell/gitit/default.nix
2014-05-17 07:31:03 +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
Peter Simons
7a58716347 haskell-gitit: patch to fix build with recent versions of pandoc 2013-09-28 15:05:14 +02:00
Peter Simons
c428feb0c4 haskell-gitit: jailbreak to support recent versions of happstack-server 2013-07-16 15:41:34 +02:00
Peter Simons
3b2254a3af Remove myself from the meta.maintainer field of most Haskell packages.
There is no point in receiving hundreds of e-mails; I cannot read them anyway.
2013-05-11 00:36:59 +02:00
Peter Simons
6fc2cccfe6 Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix. 2013-03-23 15:58:14 +01:00
Peter Simons
bbc516c59e haskell-gitit: update to version 0.10.3.1 2013-03-21 11:15:42 +01:00
Peter Simons
126100e7a9 haskell-gitit: update to version 0.10.3 2013-03-10 00:32:03 +01:00
Peter Simons
8e148fa50e haskell-gitit: jailbreak to fix build with recent blazehtml 2013-02-24 10:41:44 +01:00
Peter Simons
09a3f9f775 haskell-gitit: update to version 0.10.2 2013-02-10 15:41:37 +01:00
Peter Simons
4d6f490c31 haskell-gitit: update to version 0.10.1.2 2013-01-12 15:30:35 +01:00
Peter Simons
6f6cce58fe haskell-gitit: update to version 0.10.1.1 2013-01-04 19:24:15 +01:00
Peter Simons
4b8a9c7ad1 haskell-gitit: update to version 0.10.0.2 2012-11-11 22:50:40 +01:00
Peter Simons
e0522ca42b haskell-gitit: update to version 0.10.0.2 2012-11-05 16:25:27 +01:00
Peter Simons
d7d1f995e6 Use jailbreak to get rid of overspecified version restrictions to fix
builds of Agda, accelerate-cuda, clientsession, filestore, ghc-events,
gitit, happstack, happstack, happstack, hledger-lib, hledger, mime-mail,
pandoc, snap, wai-app-static, yesod-static, and urlencoded.
2012-09-10 12:36:18 +02:00
Peter Simons
9bce51f6ec haskell-gitit: patch to support recent versions of base64-bytestring 2012-08-28 12:34:15 +02:00
Peter Simons
3c090b3f29 haskell-gitit: patch to support current version of hslogger 2012-07-16 11:21:29 +02:00
Peter Simons
e55ca0628f Updated Haskell packages.
- generic-deriving: updated to version 1.2.1
 - ghc-mod: updated to version 1.10.17
 - gitit: updated to version 0.10.0.1
 - graphviz: updated to version 2999.13.0.3
 - hsemail: updated to version 1.7.2
 - split: updated to version 0.1.4.3

svn path=/nixpkgs/trunk/; revision=34384
2012-06-08 13:38:20 +00:00
Peter Simons
1dcdab8988 haskell-gitit: updated to version 0.10
svn path=/nixpkgs/trunk/; revision=34296
2012-05-31 07:24:44 +00:00
Peter Simons
d775e93f90 Updated Haskell packages.
- HTTP: added version 4000.2.3
 - RSA: updated to version 1.2.0.0
 - RepLib: updated to version 0.5.2.1
 - conduit: updated to version 0.4.1.1
 - data-accessor: updated to version 0.2.2.2
 - deepseq-th: updated to version 0.1.0.3
 - explicit-exception: updated to version 0.1.7
 - ghc-mod: updated to version 1.10.15
 - gitit: updated to version 0.9.0.1
 - hakyll: updated to version 3.2.7.2
 - hjsmin: updated to version 0.0.16
 - http-conduit: updated to version 1.4.1
 - iteratee: updated to version 0.8.8.2
 - language-javascript: updated to version 0.5.0
 - reactive-banana: updated to version 0.5.0.1
 - repa: updated to version 3.1.1.1
 - rvar: updated to version 0.2.0.1
 - semigroups: updated to version 0.8.3
 - simple-sendfile: updated to version 0.2.3
 - storable-record: updated to version 0.0.2.5
 - unbound: updated to version 0.4.0.2
 - wxc: added version 0.90.0.2

svn path=/nixpkgs/trunk/; revision=33802
2012-04-16 12:07:58 +00:00
Peter Simons
880dcc2c64 Removed myself as a maintainer from Haskell packages that I don't personally use.
By now, it happened twice that a commit broke GHC and thus all Haskell packages
we have in Nixpkgs. On such an occasion, I receive well in excess of 3000
notification e-mails from Hydra, and then I receive another 3000 e-mails after
the bug has been fixed. Under these circumstances, subscribing to these
notifications makes no sense for me.

svn path=/nixpkgs/trunk/; revision=33392
2012-03-24 10:21:28 +00:00
Peter Simons
49a9e39593 haskell-gitit: updated to version 0.9
svn path=/nixpkgs/trunk/; revision=32709
2012-02-29 19:24:49 +00:00
Peter Simons
cb28766341 Re-generated Haskell package descriptions with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32327
2012-02-16 14:05:41 +00:00
Peter Simons
ac69747aa8 Regenerated all Haskell packages with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32292
2012-02-14 17:00:37 +00:00
Peter Simons
27b2d8f8a9 haskell-gitit: updated to version 0.8.1
svn path=/nixpkgs/trunk/; revision=29002
2011-09-04 13:44:22 +00:00
Peter Simons
3e10ee5c92 Updated Haskell expressions with the latest version of cabal2nix.
* haskell-dataenc: updated to version 0.14.0.2
 * haskell-fclabels: updated to version 1.0.1

svn path=/nixpkgs/trunk/; revision=28574
2011-08-14 22:52:05 +00:00
Peter Simons
468c5dbc5c The 'random' library is no longer a core library in GHC 7.2.1. For older
versions of the compiler, haskell-packages.nix provides a null attribute.

svn path=/nixpkgs/trunk/; revision=28500
2011-08-12 00:18:56 +00:00
Peter Simons
dbce2ffd0f Generated neater meta.description strings.
svn path=/nixpkgs/trunk/; revision=28492
2011-08-11 13:03:51 +00:00
Peter Simons
3685cea8e9 Updated (almost) all Haskell package expressions with cabal2nix.
The new files ...

 * conform to the coding guidelines,

 * consistently specify meta.maintainers and meta.platforms,

 * have proper descriptions and licenses as specified in their Cabal file, and

 * take advantage of the new cabal.nix extensions, i.e. proper
   distinction between buildInputs and propagatedBuildInputs.

Furthermore, the following updates were performed:

 * haskell-Ranged-sets: updated to version 0.3.0
 * haskell-Shellac-haskeline: updated to version 0.2.0.1
 * haskell-cpphs: updated to version 1.12
 * haskell-hslogger: updated to version 1.1.5
 * haskell-xml: updated to version 1.3.9
 * haskell-HDBC-postgresql: updated to version 2.3.2.0
 * haskell-HDBC-sqlite3: updated to version 2.3.3.0
 * haskell-HDBC: updated to version 2.3.1.0
 * haskell-base-unicode-symbols: updated to version 0.2.2.1
 * haskell-convertible: updated to version 1.0.11.0
 * haskell-monad-control: updated to version 0.2.0.2
 * haskell-murmur-hash: updated to version 0.1.0.4
 * haskell-repa: updated to version 2.1.1.3
 * haskell-statistics: updated to version 0.9.0.0
 * haskell-ansi-terminal: updated to version 0.5.5

haskell-maybench was dropped, because it cannot be built with recent
versions of Cabal:

   Configuring maybench-0.2.4.1...
   Setup: At least the following dependencies are missing:
   Cabal >=1.2 && <1.5

svn path=/nixpkgs/trunk/; revision=28446
2011-08-09 23:00:20 +00:00
Peter Simons
c13f967ed5 Replaced the obsolete 'haskellPlatforms' attribute with the platforms exported by GHC.
svn path=/nixpkgs/trunk/; revision=28418
2011-08-09 09:54:50 +00:00
Peter Simons
843725a7da gitit: updated to version 0.8.0.1
svn path=/nixpkgs/trunk/; revision=28252
2011-08-07 18:23:52 +00:00
Peter Simons
981d6e6a7f gitit: added myself as a maintainer
svn path=/nixpkgs/trunk/; revision=28188
2011-08-06 07:46:16 +00:00
Andres Löh
b18dd91057 Removing trailing whitespace.
svn path=/nixpkgs/trunk/; revision=26570
2011-03-28 15:04:00 +00:00
Andres Löh
3e0ac9b040 Major Haskell packages overhaul.
Several changes, some highlights:

  * Structure of haskell-packages.nix updated. It's now easier to
    select different default versions of packages for different
    versions of GHC.

  * GHC 7.0.2 is now default.

  * Haskell Platform 2011.2.0.0 has been added and is now default.

  * Several packages have been updated
    (gtk2hs, gitit, xmonad, darcs, ...).

  * Some old packages have been removed.

svn path=/nixpkgs/trunk/; revision=26288
2011-03-12 17:28:15 +00:00
Andres Löh
923d30959f Added yst; updated happstack, pandoc, gitit and dependencies.
svn path=/nixpkgs/trunk/; revision=23670
2010-09-07 12:58:07 +00:00
Andres Löh
934b429725 Updated gitit plus dependencies.
svn path=/nixpkgs/trunk/; revision=21108
2010-04-15 21:10:06 +00:00
Andres Löh
df8def8dfb Added HAppS and gitit plus dependencies.
svn path=/nixpkgs/trunk/; revision=16419
2009-07-18 15:25:28 +00:00