Author: andres
Date: Thu May 10 14:23:48 2012
New Revision: 34044
URL: https://nixos.org/websvn/nix/?rev=34044&sc=1
Log:
Reverting some more Haskell changes, to make things complete again.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix
nixpkgs/trunk/pkgs/development/tools/parsing/alex/3.0.1.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix
Thu May 10 14:23:48 2012 (r34044)
@@ -0,0 +1,14 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "xhtml";
+ version = "3000.2.0.5";
+ sha256 = "1gqq910pncqppb2dscxnfxvm1ly4qpb5mwmady2i4irar3gngh9v";
+ meta = {
+ homepage = "https://github.com/haskell/xhtml";;
+ description = "An XHTML combinator library";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/tools/parsing/alex/3.0.1.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/tools/parsing/alex/3.0.1.nix Thu May 10
14:23:48 2012 (r34044)
@@ -0,0 +1,18 @@
+{ cabal, perl, QuickCheck }:
+
+cabal.mkDerivation (self: {
+ pname = "alex";
+ version = "3.0.1";
+ sha256 = "1w7s9kzgr4kfh6cyhb4qkvxwy9gcw3xa1d2k5dy575k3wk73awkj";
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [ QuickCheck ];
+ buildTools = [ perl ];
+ meta = {
+ homepage = "http://www.haskell.org/alex/";;
+ description = "Alex is a tool for generating lexical analysers in Haskell";
+ 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 Thu May 10 10:38:52
2012 (r34043)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Thu May 10 14:23:48
2012 (r34044)
@@ -1522,6 +1522,7 @@
xhtml_3000_2_0_1 = callPackage
../development/libraries/haskell/xhtml/3000.2.0.1.nix {};
xhtml_3000_2_0_4 = callPackage
../development/libraries/haskell/xhtml/3000.2.0.4.nix {};
+ xhtml_3000_2_0_5 = callPackage
../development/libraries/haskell/xhtml/3000.2.0.5.nix {};
xhtml_3000_2_1 = callPackage
../development/libraries/haskell/xhtml/3000.2.1.nix {};
xhtml = self.xhtml_3000_2_1;
@@ -1605,6 +1606,7 @@
alex_2_3_2 = callPackage ../development/tools/parsing/alex/2.3.2.nix {};
alex_2_3_3 = callPackage ../development/tools/parsing/alex/2.3.3.nix {};
alex_2_3_5 = callPackage ../development/tools/parsing/alex/2.3.5.nix {};
+ alex_3_0_1 = callPackage ../development/tools/parsing/alex/3.0.1.nix {};
alex_3_0_2 = callPackage ../development/tools/parsing/alex/3.0.2.nix {};
alex = self.alex_3_0_2;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
