Author: andres
Date: Mon Nov 15 20:28:21 2010
New Revision: 24700
URL: https://svn.nixos.org/websvn/nix/?rev=24700&sc=1
Log:
Updated/added a number of Haskell libraries.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/derive/
nixpkgs/trunk/pkgs/development/libraries/haskell/derive/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-syb-utils/
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-syb/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/multiset/default.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/derive/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/derive/default.nix Mon Nov
15 20:28:21 2010 (r24700)
@@ -0,0 +1,11 @@
+{cabal, haskellSrcExts, mtl, uniplate}:
+
+cabal.mkDerivation (self : {
+ pname = "derive";
+ version = "2.3.0.2";
+ sha256 = "bb8f62d93742d0f27c742bf09fdad73111057d9b531dda45d7f0c894b447809e";
+ propagatedBuildInputs = [haskellSrcExts mtl uniplate];
+ meta = {
+ description = "A program and library to derive instances for data types";
+ };
+})
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
Mon Nov 15 20:28:21 2010 (r24700)
@@ -0,0 +1,11 @@
+{cabal, ghcSyb}:
+
+cabal.mkDerivation (self : {
+ pname = "ghc-syb-utils";
+ version = "0.2.0.0";
+ sha256 = "457110f7e1f163ccf78acb898f8ca43b6a5b4595156a08a2f1a3d81f944d74a9";
+ propagatedBuildInputs = [ghcSyb];
+ meta = {
+ description = "Scrap Your Boilerplate utilities for the GHC API";
+ };
+})
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-syb/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-syb/default.nix
Mon Nov 15 20:26:06 2010 (r24699)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/ghc-syb/default.nix
Mon Nov 15 20:28:21 2010 (r24700)
@@ -1,15 +1,10 @@
-{cabal, fetchurl, syb, sourceFromHead}:
+{cabal}:
cabal.mkDerivation (self : {
pname = "ghc-syb";
- version = "dev";
- name = self.fname;
- # REGION AUTO UPDATE: { name="ghc_syb"; type = "git"; url =
"git://github.com/nominolo/ghc-syb.git"; groups="haskell scien"; }
- src = sourceFromHead
"ghc_syb-876b121e73f1b5ca4b17b0c6908b27ba7efb0374.tar.gz"
- (fetchurl { url =
"http://mawercer.de/~nix/repos/ghc_syb-876b121e73f1b5ca4b17b0c6908b27ba7efb0374.tar.gz";;
sha256 = "bb5071ee8a6a6cd99634e0f146c921592e8c77b13d511cde0c91fedc406a0a07";
});
- # END
- extraBuildInputs = [syb];
+ version = "0.2.0.0";
+ sha256 = "0052bd2ee4d92fbb010bebc7bcfd533a0b78437f1fb0834288ce979c103d9d67";
meta = {
- description = "Source code suggestions";
+ description = "Data and Typeable instances for the GHC API";
};
})
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/multiset/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/multiset/default.nix
Mon Nov 15 20:26:06 2010 (r24699)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/multiset/default.nix
Mon Nov 15 20:28:21 2010 (r24700)
@@ -1,13 +1,11 @@
-{cabal, syb}:
+{cabal}:
cabal.mkDerivation (self : {
pname = "multiset";
- version = "0.1";
- sha256 = "0nh1bfis4r5yd4jd9dqwckiyrqa7j8yqn4ai676xb18rh4hwsv87";
- propagatedBuildInputs = [syb];
+ version = "0.2";
+ sha256 = "35d76c026bab0dbdf761c8590297d718507bb9ef93c30bce4f524efee23f5323";
meta = {
description = "A variation of Data.Set. Multisets, sometimes also called
bags, can contain multiple copies of the same key";
};
- patchPhase = '' sed -i 's/containers/containers, syb/' *.cabal ''; # add syb
to library dependency list
})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Nov 15 20:26:06
2010 (r24699)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Nov 15 20:28:21
2010 (r24700)
@@ -105,6 +105,8 @@
deepseq = callPackage ../development/libraries/haskell/deepseq {};
+ derive = callPackage ../development/libraries/haskell/derive {};
+
Diff = callPackage ../development/libraries/haskell/Diff {};
digest = callPackage ../development/libraries/haskell/digest {
@@ -153,6 +155,8 @@
ghcSyb = callPackage ../development/libraries/haskell/ghc-syb {};
+ ghcSybUtils = callPackage ../development/libraries/haskell/ghc-syb-utils {};
+
gitit = callPackage ../development/libraries/haskell/gitit {
cgi = cgi_3001_1_7_2;
HTTP = HTTP_4000_0_9;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
