Author: andres
Date: Wed Nov 17 14:48:12 2010
New Revision: 24737
URL: https://svn.nixos.org/websvn/nix/?rev=24737&sc=1
Log:
Version bump for leksah (plus dependencies). Now works with ghc-6.12.3.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/binary-shared/
nixpkgs/trunk/pkgs/development/libraries/haskell/binary-shared/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/gtksourceview2/
nixpkgs/trunk/pkgs/development/libraries/haskell/gtksourceview2/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/leksah/
nixpkgs/trunk/pkgs/development/libraries/haskell/leksah/leksah-server.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/leksah/process-leksah.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/ltk/
nixpkgs/trunk/pkgs/development/libraries/haskell/ltk/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/editors/leksah/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
nixpkgs/trunk/pkgs/top-level/release.nix
Modified: nixpkgs/trunk/pkgs/applications/editors/leksah/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/editors/leksah/default.nix Wed Nov 17
14:39:02 2010 (r24736)
+++ nixpkgs/trunk/pkgs/applications/editors/leksah/default.nix Wed Nov 17
14:48:12 2010 (r24737)
@@ -1,26 +1,27 @@
-{cabal, gtk2hs, binary, parsec, regexPosix, regexCompat, utf8String, libedit,
makeWrapper}:
+{cabal, gtk, glib, binary, binaryShared, deepseq, hslogger, ltk, network,
parsec,
+ leksahServer, processLeksah, regexBase, regexTDFA, utf8String, gtksourceview2,
+ makeWrapper}:
cabal.mkDerivation (self : {
pname = "leksah";
- version = "0.6.1";
- sha256 = "de4e0974be3df0e58fd26bfbb76594d81514f1e1d898b9f47881b42084bacf35";
+ version = "0.8.0.8";
+ sha256 = "1d6n5dlnqlqfckg9f611qf9lvi6b7ghrkk1l0myh6h667fxh8a1r";
- # !!! The explicit libedit dependency shouldn't be necessary.
- extraBuildInputs = [gtk2hs binary parsec regexPosix regexCompat utf8String
libedit makeWrapper];
+ propagatedBuildInputs =
+ [gtk glib binary binaryShared deepseq hslogger ltk network parsec
+ leksahServer processLeksah regexBase regexTDFA utf8String gtksourceview2];
+ extraBuildInputs = [makeWrapper];
- preConfigure =
- ''
- substituteInPlace leksah.cabal --replace 'Cabal ==1.6.0.1' 'Cabal
>=1.6.0.1'
- '';
-
- postInstall =
- ''
- wrapProgram $out/bin/leksah --prefix XDG_DATA_DIRS :
${gtk2hs.gtksourceview}/share
- '';
+ # postInstall =
+ # ''
+ # wrapProgram $out/bin/leksah --prefix XDG_DATA_DIRS :
${gtk2hs.gtksourceview}/share
+ # '';
meta = {
homepage = http://leksah.org/;
description = "An Integrated Development Environment for Haskell written
in Haskell";
+ license = "GPL";
+ maintainers = [self.stdenv.lib.maintainers.andres];
};
})
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/binary-shared/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/binary-shared/default.nix
Wed Nov 17 14:48:12 2010 (r24737)
@@ -0,0 +1,13 @@
+{cabal, binary, mtl}:
+
+cabal.mkDerivation (self : {
+ pname = "binary-shared";
+ version = "0.8.1";
+ sha256 = "0niq6hgsawsdg3kkjgkwyrgy8w7pfkqfph5d1x5bzcjrcl982jrg";
+ propagatedBuildInputs = [binary mtl];
+ meta = {
+ description = "Binary serialization with support for sharing identical
elements";
+ license = "GPL";
+ maintainers = [self.stdenv.lib.maintainers.andres];
+ };
+})
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/gtksourceview2/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/gtksourceview2/default.nix
Wed Nov 17 14:48:12 2010 (r24737)
@@ -0,0 +1,14 @@
+{cabal, gtk2hsBuildtools, pkgconfig, gtksourceview, glib, gtk, gtkC, glibc}:
+
+cabal.mkDerivation (self : {
+ pname = "gtksourceview2";
+ version = "0.11.1";
+ sha256 = "1skb13ssp6sd06jb3nshv97wjqvwa0mnzcxgmrxwd5l21r6k1m2v";
+ extraBuildInputs = [pkgconfig gtksourceview gtkC glibc gtk2hsBuildtools];
+ propagatedBuildInputs = [glib gtk];
+ meta = {
+ description = "GtkSourceView is a text widget that extends the standard
GTK+ 2.x text widget GtkTextView";
+ license = "LGPLv2+";
+ maintainers = [self.stdenv.lib.maintainers.andres];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/leksah/leksah-server.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/leksah/leksah-server.nix
Wed Nov 17 14:48:12 2010 (r24737)
@@ -0,0 +1,15 @@
+{cabal, haddock, binary, binaryShared, deepseq, hslogger, ltk, mtl,
+ network, parsec, processLeksah}:
+
+cabal.mkDerivation (self : {
+ pname = "leksah-server";
+ version = "0.8.0.8";
+ sha256 = "10srf3wzrnyjhw7q8lzzfqammjr9k1fgwqlkkcfkljbmsz9j0nfm";
+ propagatedBuildInputs =
+ [binary binaryShared deepseq hslogger ltk mtl network parsec processLeksah
haddock];
+ meta = {
+ description = "The interface to GHC-API for leksah";
+ license = "GPL";
+ maintainers = [self.stdenv.lib.maintainers.andres];
+ };
+})
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/leksah/process-leksah.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/leksah/process-leksah.nix
Wed Nov 17 14:48:12 2010 (r24737)
@@ -0,0 +1,12 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+ pname = "process-leksah";
+ version = "1.0.1.3";
+ sha256 = "1pssbpcslrl39z495gf0v2xjgy2i6qpvxbrf4p0hkvrwycr7pnd8";
+ meta = {
+ description = "This package contains libraries for dealing with system
processes";
+ license = "BSD";
+ maintainers = [self.stdenv.lib.maintainers.andres];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/ltk/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/ltk/default.nix Wed Nov
17 14:48:12 2010 (r24737)
@@ -0,0 +1,13 @@
+{cabal, glib, gtk, haddock, mtl, parsec}:
+
+cabal.mkDerivation (self : {
+ pname = "ltk";
+ version = "0.8.0.8";
+ sha256 = "172l3nvvyqqgzy43b7mjxs8vpfw0wlyl993g77zjiy8qbhlcd9mg";
+ propagatedBuildInputs = [glib gtk mtl parsec haddock];
+ meta = {
+ description = "UI framework used by leksah";
+ license = "GPL";
+ maintainers = [self.stdenv.lib.maintainers.andres];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Nov 17 14:39:02
2010 (r24736)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Nov 17 14:48:12
2010 (r24737)
@@ -48,6 +48,8 @@
binary = callPackage ../development/libraries/haskell/binary {};
+ binaryShared = callPackage ../development/libraries/haskell/binary-shared {};
+
bitmap = callPackage ../development/libraries/haskell/bitmap {};
blazeBuilder = callPackage ../development/libraries/haskell/blaze-builder {};
@@ -204,6 +206,12 @@
happy = happy_1_18_5;
};
+ gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2
{
+ inherit (pkgs) pkgconfig glibc;
+ inherit (pkgs.gnome) gtksourceview;
+ gtkC = pkgs.gtkLibs.gtk;
+ };
+
Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {
fgl = fgl_5_4_2_3;
};
@@ -315,7 +323,8 @@
haskellPlatform_2009_2_0_2 = import
../development/libraries/haskell/haskell-platform/2009.2.0.2.nix {
inherit cabal ghc GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline
haskellSrc html parallel regexBase regexCompat regexPosix
- stm time xhtml zlib cabalInstall alex happy haddock;
+ stm time xhtml zlib cabalInstall alex happy;
+ haddock = haddock_2_4_2;
inherit (pkgs) fetchurl;
};
@@ -389,6 +398,12 @@
json_0_3_6 = callPackage ../development/libraries/haskell/json/0.3.6.nix {};
+ leksahServer = callPackage
../development/libraries/haskell/leksah/leksah-server.nix {
+ network = network_2_2_1_7;
+ };
+
+ ltk = callPackage ../development/libraries/haskell/ltk {};
+
maybench = callPackage ../development/libraries/haskell/maybench {};
MaybeT = callPackage ../development/libraries/haskell/MaybeT {};
@@ -487,6 +502,8 @@
primitive = callPackage ../development/libraries/haskell/primitive {};
+ processLeksah = callPackage
../development/libraries/haskell/leksah/process-leksah.nix {};
+
QuickCheck = QuickCheck_1;
QuickCheck_1 = callPackage ../development/libraries/haskell/QuickCheck {};
@@ -742,7 +759,7 @@
frown = callPackage ../development/tools/parsing/frown {};
- haddock = haddock_2_7_2;
+ haddock = haddock_2_7_2_P;
haddock_2_4_2 = callPackage
../development/tools/documentation/haddock/haddock-2.4.2.nix {};
@@ -792,7 +809,9 @@
};
leksah = callPackage ../applications/editors/leksah {
- inherit (pkgs) libedit makeWrapper;
+ network = network_2_2_1_7;
+ regexBase = regexBase_0_93_2;
+ inherit (pkgs) makeWrapper;
};
xmobar = callPackage ../applications/misc/xmobar {};
Modified: nixpkgs/trunk/pkgs/top-level/release.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/release.nix Wed Nov 17 14:39:02 2010
(r24736)
+++ nixpkgs/trunk/pkgs/top-level/release.nix Wed Nov 17 14:48:12 2010
(r24737)
@@ -407,9 +407,7 @@
haskellPackages_ghc6104 = {
ghc = ghcSupported;
- # gitit = linux;
gtk2hs = linux;
- leksah = linux;
haskellPlatform_2009_2_0_2 = ghcSupported;
xmonad = linux;
};
@@ -430,6 +428,8 @@
darcs = ghcSupported;
ghc = ghcSupported;
gitit = linux;
+ gtk = linux;
+ leksah = linux;
haskellPlatform_2010_2_0_0 = ghcSupported;
lhs2tex = ghcSupported;
xmonad = linux;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
