Author: simons
Date: Sun Aug  7 22:02:40 2011
New Revision: 28341
URL: https://svn.nixos.org/websvn/nix/?rev=28341&sc=1

Log:
Updated leksah-process and leksah-server to version 0.10.x.

Unfortunately, I cannot test these updates because gtksourceview doesn't
compile:

  ./gtksourceview2.h:10:48: fatal error: gtksourceview/gtksourceundomanager.h: 
No such file or directory

Not sure what that means.

Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/leksah/leksah-server.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/leksah/process-leksah.nix
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/leksah/leksah-server.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/leksah/leksah-server.nix   
Sun Aug  7 22:02:36 2011        (r28340)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/leksah/leksah-server.nix   
Sun Aug  7 22:02:40 2011        (r28341)
@@ -1,15 +1,22 @@
-{cabal, haddock, binary, binaryShared, deepseq, hslogger, ltk, mtl,
- network, parsec, processLeksah}:
+{cabal, binary, binaryShared, deepseq, ghc, haddock, 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];
+  version = "0.10.0.4";
+  sha256 = "0g523dkiaclk5ym16vzqiabh7mwksjqp0kbx17a899k5gzfwfjp6";
+  propagatedBuildInputs = [
+    binary binaryShared deepseq ghc haddock hslogger ltk mtl network
+    parsec processLeksah
+  ];
   meta = {
-    description = "The interface to GHC-API for leksah";
+    homepage = "http://leksah.org";;
+    description = "Metadata collection for leksah";
     license = "GPL";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    platforms = self.stdenv.lib.platforms.haskellPlatforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.simons
+      self.stdenv.lib.maintainers.andres
+    ];
   };
 })

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/leksah/process-leksah.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/leksah/process-leksah.nix  
Sun Aug  7 22:02:36 2011        (r28340)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/leksah/process-leksah.nix  
Sun Aug  7 22:02:40 2011        (r28341)
@@ -1,12 +1,16 @@
-{cabal}:
+{cabal} :
 
 cabal.mkDerivation (self : {
   pname = "process-leksah";
-  version = "1.0.1.3";
-  sha256 = "1pssbpcslrl39z495gf0v2xjgy2i6qpvxbrf4p0hkvrwycr7pnd8";
+  version = "1.0.1.4";
+  sha256 = "1899ybhnsj22sir2l933lhkk9fpcgjbb4qd6gscnby28qcs5bwbv";
   meta = {
-    description = "This package contains libraries for dealing with system 
processes";
-    license = "BSD";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    description = "Process libraries";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.stdenv.lib.platforms.haskellPlatforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.simons
+      self.stdenv.lib.maintainers.andres
+    ];
   };
 })

Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Sun Aug  7 22:02:36 
2011        (r28340)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Sun Aug  7 22:02:40 
2011        (r28341)
@@ -744,9 +744,7 @@
 
   jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};
 
-  leksahServer = callPackage 
../development/libraries/haskell/leksah/leksah-server.nix {
-    network = self.network_2_2_1_7;
-  };
+  leksahServer = callPackage 
../development/libraries/haskell/leksah/leksah-server.nix {};
 
   ListLike = callPackage ../development/libraries/haskell/ListLike {};
 
@@ -1315,8 +1313,6 @@
   };
 
   leksah = callPackage ../applications/editors/leksah {
-    network = self.network_2_2_1_7;
-    regexBase = self.regexBase_0_93_2;
     inherit (pkgs) makeWrapper;
   };
 
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to