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
This commit is contained in:
@@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self : {
|
||||
pname = "wx";
|
||||
version = "0.11.1.2";
|
||||
sha256 = "d407e191391ec977552932ffbfc86ce7826b56208bbcbc1262d3fc65fe1c2337";
|
||||
version = "0.12.1.6";
|
||||
sha256 = "1p0gn46gk1abin095va22n9bycxhm2cq1vyvwiypcdq7jq541lhk";
|
||||
propagatedBuildInputs = [stm wxcore];
|
||||
meta = {
|
||||
description = "wxHaskell";
|
||||
|
||||
@@ -1,15 +1,20 @@
|
||||
{cabal, time, parsec, stm, libX11, mesa, wxGTK}:
|
||||
{cabal, time, parsec, stm, wxdirect, libX11, mesa, wxGTK}:
|
||||
|
||||
cabal.mkDerivation (self : {
|
||||
pname = "wxcore";
|
||||
version = "0.11.1.2";
|
||||
sha256 = "b91b17243d8a08d96f572224c434c36d14feb1b0bb64a0e63900f0103a7c4752";
|
||||
propagatedBuildInputs = [time parsec stm libX11 wxGTK mesa];
|
||||
version = "0.12.1.6";
|
||||
sha256 = "162m7z8nzdwsszha87mvz7dzxh268n0sgymf3vq2yn5axw7zx5ap";
|
||||
propagatedBuildInputs = [time parsec stm libX11 wxGTK mesa wxdirect];
|
||||
preConfigure = ''
|
||||
sed -i 's|\(containers.*\) && < 0.4|\1|' ${self.pname}.cabal
|
||||
'';
|
||||
/* configureFlags = [ "--with-opengl" ]; */
|
||||
/*
|
||||
preConfigure = ''
|
||||
sed -i 's/ghc-pkg latest/ghc-pkg --global latest/g' configure
|
||||
sed -i 's/pkg describe/pkg --global describe/g' configure
|
||||
'';
|
||||
*/
|
||||
meta = {
|
||||
description = "wxHaskell core";
|
||||
};
|
||||
|
||||
16
pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
Normal file
16
pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
Normal file
@@ -0,0 +1,16 @@
|
||||
{cabal, parsec, time}:
|
||||
|
||||
cabal.mkDerivation (self : {
|
||||
pname = "wxdirect";
|
||||
version = "0.12.1.3";
|
||||
sha256 = "da59315339dc78b3bfbe08c1681d53c74a56e7c3de0f41a90099bd289b1bfb11";
|
||||
preConfigure = ''
|
||||
sed -i 's|\(containers.*\) && < 0.4|\1|' ${self.pname}.cabal
|
||||
sed -i 's|\(time.*\) && < 1.2|\1|' ${self.pname}.cabal
|
||||
'';
|
||||
propagatedBuildInputs = [parsec time];
|
||||
meta = {
|
||||
description = "helper tool for building wxHaskell";
|
||||
};
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user