Author: simons
Date: Tue Apr 3 06:31:11 2012
New Revision: 33551
URL: https://nixos.org/websvn/nix/?rev=33551&sc=1
Log:
Updated Haskell packages.
- fgl-visualize: added meta.maintainers
- gtk2hs-buildtools: added version 0.12.3
- network-conduit: added version 0.4.0
- path-pieces: updated to version 0.1.1
- void: added version 0.5.5
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix
- copied, changed from r33549,
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix
- copied, changed from r33549,
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/network-conduit/
nixpkgs/trunk/pkgs/development/libraries/haskell/network-conduit/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/path-pieces/default.nix
(contents, props changed)
- copied, changed from r33549,
nixpkgs/trunk/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/void/
nixpkgs/trunk/pkgs/development/libraries/haskell/void/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/fgl-visualize/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/fgl-visualize/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/fgl-visualize/default.nix
Mon Apr 2 22:05:02 2012 (r33550)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/fgl-visualize/default.nix
Tue Apr 3 06:31:11 2012 (r33551)
@@ -9,5 +9,6 @@
description = "Convert FGL graphs to dot (graphviz) files";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix
(from r33549,
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix
(from r33549,
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix)
==============================================================================
---
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
Mon Apr 2 21:54:14 2012 (r33549, copy source)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix
Tue Apr 3 06:31:11 2012 (r33551)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "gtk2hs-buildtools";
- version = "0.12.1";
- sha256 = "003d48q8q6ji4axa69bh0sp95fic19cgw3hwigsjbl46qgh6n9gl";
+ version = "0.12.3";
+ sha256 = "1129p2b0hvmin7zpq43ik670v2c63jv704bnmnh3cr0bw06qrrbi";
isLibrary = false;
isExecutable = true;
buildDepends = [ filepath random ];
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/network-conduit/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/network-conduit/default.nix
Tue Apr 3 06:31:11 2012 (r33551)
@@ -0,0 +1,18 @@
+{ cabal, conduit, liftedBase, monadControl, network, transformers
+}:
+
+cabal.mkDerivation (self: {
+ pname = "network-conduit";
+ version = "0.4.0";
+ sha256 = "0h0s33nxihd4zy9mvy2vpdrpvjapacbl69ndsw5zrbqhwbpz3mzs";
+ buildDepends = [
+ conduit liftedBase monadControl network transformers
+ ];
+ meta = {
+ homepage = "http://github.com/snoyberg/conduit";;
+ description = "Stream socket data using conduits";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/path-pieces/default.nix (from
r33549, nixpkgs/trunk/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix
Mon Apr 2 21:54:14 2012 (r33549, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/path-pieces/default.nix
Tue Apr 3 06:31:11 2012 (r33551)
@@ -1,10 +1,10 @@
-{ cabal, text }:
+{ cabal, text, time }:
cabal.mkDerivation (self: {
pname = "path-pieces";
- version = "0.0.0";
- sha256 = "09sk4wlzy37gaii7spisjy4a3pizis9si4kv389bki20gfwpaivf";
- buildDepends = [ text ];
+ version = "0.1.1";
+ sha256 = "17ymk2azgz2c1hwnzqd9xy77hh51mvrgz4zs7lz4ik6rnvvihraz";
+ buildDepends = [ text time ];
meta = {
homepage = "http://github.com/snoyberg/path-pieces";;
description = "Components of paths";
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/void/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/void/default.nix Tue Apr
3 06:31:11 2012 (r33551)
@@ -0,0 +1,15 @@
+{ cabal, semigroups }:
+
+cabal.mkDerivation (self: {
+ pname = "void";
+ version = "0.5.5";
+ sha256 = "011ji37d5f6xrvd6sq0zkzggaq11r7nyb2z5v3ix3kn14r5psfz3";
+ buildDepends = [ semigroups ];
+ meta = {
+ homepage = "http://github.com/ekmett/void";;
+ description = "A Haskell 98 logically uninhabited data type";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Apr 2 22:05:02
2012 (r33550)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Tue Apr 3 06:31:11
2012 (r33551)
@@ -753,7 +753,9 @@
libc = pkgs.stdenv.gcc.libc;
};
- gtk2hsBuildtools = callPackage
../development/libraries/haskell/gtk2hs-buildtools {};
+ gtk2hsBuildtools_0_12_1 = callPackage
../development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix {};
+ gtk2hsBuildtools_0_12_3 = callPackage
../development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix {};
+ gtk2hsBuildtools = self.gtk2hsBuildtools_0_12_1;
gtk2hsC2hs = self.gtk2hsBuildtools;
gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2
{
@@ -1042,6 +1044,8 @@
network_2_3_0_11 = callPackage
../development/libraries/haskell/network/2.3.0.11.nix {};
network = self.network_2_3_0_11;
+ networkConduit = callPackage
../development/libraries/haskell/network-conduit {};
+
nonNegative = callPackage ../development/libraries/haskell/non-negative {};
numericPrelude = callPackage
../development/libraries/haskell/numeric-prelude {};
@@ -1065,9 +1069,7 @@
OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {};
- pathPieces_0_0_0 = callPackage
../development/libraries/haskell/path-pieces/0.0.0.nix {};
- pathPieces_0_1_0 = callPackage
../development/libraries/haskell/path-pieces/0.1.0.nix {};
- pathPieces = self.pathPieces_0_1_0;
+ pathPieces = callPackage ../development/libraries/haskell/path-pieces {};
pandoc = callPackage ../development/libraries/haskell/pandoc {};
@@ -1427,6 +1429,8 @@
vectorSpace = callPackage ../development/libraries/haskell/vector-space {};
+ void = callPackage ../development/libraries/haskell/void {};
+
vty = callPackage ../development/libraries/haskell/vty {
mtl = self.mtl2;
};
@@ -1497,9 +1501,7 @@
yesodAuth = callPackage ../development/libraries/haskell/yesod-auth {};
- yesodCore = callPackage ../development/libraries/haskell/yesod-core {
- pathPieces = self.pathPieces_0_0_0;
- };
+ yesodCore = callPackage ../development/libraries/haskell/yesod-core {};
yesodDefault = callPackage ../development/libraries/haskell/yesod-default {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
