Author: simons
Date: Sat Aug 13 23:38:23 2011
New Revision: 28550
URL: https://svn.nixos.org/websvn/nix/?rev=28550&sc=1
Log:
Regenerated haskell-wx and haskell-wxdirect expressions; no functional change.
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wx.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wx.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wx.nix Sat Aug
13 22:06:18 2011 (r28549)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wx.nix Sat Aug
13 23:38:23 2011 (r28550)
@@ -1,13 +1,18 @@
-{cabal, stm, wxcore} :
+{ cabal, stm, wxcore }:
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
pname = "wx";
version = "0.12.1.6";
sha256 = "1p0gn46gk1abin095va22n9bycxhm2cq1vyvwiypcdq7jq541lhk";
- propagatedBuildInputs = [ stm wxcore ];
+ buildDepends = [ stm wxcore ];
meta = {
homepage = "http://haskell.org/haskellwiki/WxHaskell";;
description = "wxHaskell";
license = "LGPL";
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
};
})
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
Sat Aug 13 22:06:18 2011 (r28549)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
Sat Aug 13 23:38:23 2011 (r28550)
@@ -1,15 +1,20 @@
-{cabal, parsec} :
+{ cabal, parsec, time }:
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
pname = "wxdirect";
version = "0.12.1.4";
sha256 = "0v1blh3l02h58cvsngfax5knmg51lil1kj6pr5iqrbcrivp2nh7f";
- propagatedBuildInputs = [ parsec ];
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ parsec time ];
meta = {
homepage = "http://haskell.org/haskellwiki/WxHaskell";;
description = "helper tool for building wxHaskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
- maintainers = [ self.stdenv.lib.maintainers.simons ];
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
};
})
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
