Author: andres
Date: Mon Aug 8 07:41:45 2011
New Revision: 28376
URL: https://svn.nixos.org/websvn/nix/?rev=28376&sc=1
Log:
Updating leksah.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/strict/
nixpkgs/trunk/pkgs/development/libraries/haskell/strict/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/editors/leksah/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/editors/leksah/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/editors/leksah/default.nix Mon Aug 8
01:39:26 2011 (r28375)
+++ nixpkgs/trunk/pkgs/applications/editors/leksah/default.nix Mon Aug 8
07:41:45 2011 (r28376)
@@ -1,27 +1,22 @@
-{cabal, gtk, glib, binary, binaryShared, deepseq, hslogger, ltk, network,
parsec,
- leksahServer, processLeksah, regexBase, regexTDFA, utf8String, gtksourceview2,
- makeWrapper}:
+{cabal, binary, binaryShared, deepseq, glib, gtk,
+ gtksourceview2, hslogger, leksahServer, ltk, mtl, network,
+ parsec, processLeksah, regexBase, regexTDFA, strict, utf8String} :
cabal.mkDerivation (self : {
pname = "leksah";
- version = "0.8.0.8";
- sha256 = "1d6n5dlnqlqfckg9f611qf9lvi6b7ghrkk1l0myh6h667fxh8a1r";
-
- propagatedBuildInputs =
- [gtk glib binary binaryShared deepseq hslogger ltk network parsec
- leksahServer processLeksah regexBase regexTDFA utf8String gtksourceview2];
- extraBuildInputs = [makeWrapper];
-
- # postInstall =
- # ''
- # wrapProgram $out/bin/leksah --prefix XDG_DATA_DIRS :
${gtk2hs.gtksourceview}/share
- # '';
-
+ version = "0.10.0.4";
+ sha256 = "1g12w1kl63fxzz1c2x237yrqkaja9awiqyyipkdms5iql0ini7bw";
+ propagatedBuildInputs = [
+ binary binaryShared deepseq glib gtk gtksourceview2 hslogger
+ leksahServer ltk mtl network parsec processLeksah regexBase
+ regexTDFA strict utf8String
+ ];
+ noHaddock = true;
meta = {
- homepage = http://leksah.org/;
- description = "An Integrated Development Environment for Haskell written
in Haskell";
+ homepage = "http://www.leksah.org";;
+ description = "Haskell IDE written in Haskell";
license = "GPL";
- maintainers = [self.stdenv.lib.maintainers.andres];
+ platforms = self.stdenv.lib.platforms.haskellPlatforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
};
-})
-
+})
Modified:
nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix
Mon Aug 8 01:39:26 2011 (r28375)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix
Mon Aug 8 07:41:45 2011 (r28376)
@@ -2,10 +2,10 @@
libxml2, perl, intltool, gettext}:
stdenv.mkDerivation {
- name = "gtksourceview-2.8.1";
+ name = "gtksourceview-2.9.9";
src = fetchurl {
- url = mirror://gnome/sources/gtksourceview/2.8/gtksourceview-2.8.1.tar.bz2;
- sha256 = "02irdw8sz374d3k51sx21hm7vmpkcwrhmnpp3v6afa2jcwi84zp6";
+ url = mirror://gnome/sources/gtksourceview/2.9/gtksourceview-2.9.9.tar.bz2;
+ sha256 = "0d0i586nj8jsqqfcjcvaj0yzc3sid3s1a4y62xr0qbddkbn1wllj";
};
buildInputs = [pkgconfig atk cairo glib gtk pango libxml2 perl intltool
gettext];
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/strict/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/strict/default.nix Mon Aug
8 07:41:45 2011 (r28376)
@@ -0,0 +1,14 @@
+{cabal} :
+
+cabal.mkDerivation (self : {
+ pname = "strict";
+ version = "0.3.2";
+ sha256 = "08cjajqz9h47fkq98mlf3rc8n5ghbmnmgn8pfsl3bdldjdkmmlrc";
+ meta = {
+ homepage = "http://www.cse.unsw.edu.au/~rl/code/strict.html";;
+ description = "Strict data types and String IO.";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.stdenv.lib.platforms.haskellPlatforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Aug 8 01:39:26
2011 (r28375)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Aug 8 07:41:45
2011 (r28376)
@@ -1045,6 +1045,8 @@
streamproc = callPackage ../development/libraries/haskell/streamproc {};
+ strict = callPackage ../development/libraries/haskell/strict {};
+
# TODO: investigate status of syb in older platform versions
syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {};
syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {};
@@ -1369,9 +1371,7 @@
parsec = self.parsec2;
};
- leksah = callPackage ../applications/editors/leksah {
- inherit (pkgs) makeWrapper;
- };
+ leksah = callPackage ../applications/editors/leksah {};
xmobar = callPackage ../applications/misc/xmobar {};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
