Author: simons
Date: Fri Aug 12 09:04:07 2011
New Revision: 28506
URL: https://svn.nixos.org/websvn/nix/?rev=28506&sc=1

Log:
Updated BNFC to the latest version and fixed the spelling of its attribute.

Added BNFC-meta, alex-meta, and happy-meta.

Moved these tools into the tool section of haskell-packages.nix, and
paid special attention to the intended alphabetic order.

Added:
   nixpkgs/trunk/pkgs/development/tools/haskell/BNFC/
   nixpkgs/trunk/pkgs/development/tools/haskell/BNFC-meta/
   nixpkgs/trunk/pkgs/development/tools/haskell/BNFC-meta/default.nix
   nixpkgs/trunk/pkgs/development/tools/haskell/BNFC/default.nix
   nixpkgs/trunk/pkgs/development/tools/haskell/alex-meta/
   nixpkgs/trunk/pkgs/development/tools/haskell/alex-meta/default.nix
   nixpkgs/trunk/pkgs/development/tools/haskell/happy-meta/
   nixpkgs/trunk/pkgs/development/tools/haskell/happy-meta/default.nix
Deleted:
   nixpkgs/trunk/pkgs/development/tools/haskell/bnfc/default.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Added: nixpkgs/trunk/pkgs/development/tools/haskell/BNFC-meta/default.nix
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/BNFC-meta/default.nix  Fri Aug 
12 09:04:07 2011        (r28506)
@@ -0,0 +1,17 @@
+{ cabal, alexMeta, happyMeta, haskellSrcMeta }:
+
+cabal.mkDerivation (self: {
+  pname = "BNFC-meta";
+  version = "0.2.1";
+  sha256 = "0c58m1xkaylgp9f3r71nfgqb30fpidldz46dbwalhkb7fm0k4gmm";
+  buildDepends = [ alexMeta happyMeta haskellSrcMeta ];
+  meta = {
+    description = "Deriving Quasi-Quoters from BNF Grammars";
+    license = self.stdenv.lib.licenses.gpl2;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

Added: nixpkgs/trunk/pkgs/development/tools/haskell/BNFC/default.nix
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/BNFC/default.nix       Fri Aug 
12 09:04:07 2011        (r28506)
@@ -0,0 +1,20 @@
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "BNFC";
+  version = "2.4.2.0";
+  sha256 = "0nnalzsql1k5y3s93g5y2hy2gcdsrbi8r7cwzmdcy4vyy589pin0";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ mtl ];
+  meta = {
+    homepage = 
"http://www.cse.chalmers.se/research/group/Language-technology/BNFC/";;
+    description = "A compiler front-end generator";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

Added: nixpkgs/trunk/pkgs/development/tools/haskell/alex-meta/default.nix
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/alex-meta/default.nix  Fri Aug 
12 09:04:07 2011        (r28506)
@@ -0,0 +1,17 @@
+{ cabal, haskellSrcMeta }:
+
+cabal.mkDerivation (self: {
+  pname = "alex-meta";
+  version = "0.2.0.1";
+  sha256 = "1b508pg4a9f0ln9k91j5dj0mja3faxasz5k6qyxqz3zqnlysm2gj";
+  buildDepends = [ haskellSrcMeta ];
+  meta = {
+    description = "Quasi-quoter for Alex lexers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

Added: nixpkgs/trunk/pkgs/development/tools/haskell/happy-meta/default.nix
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/happy-meta/default.nix Fri Aug 
12 09:04:07 2011        (r28506)
@@ -0,0 +1,17 @@
+{ cabal, haskellSrcMeta, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "happy-meta";
+  version = "0.2.0.2";
+  sha256 = "1r9i01bnw0dz10balhpgiwcls5jwv5p09jafi8jl6hy0jwx7xydp";
+  buildDepends = [ haskellSrcMeta mtl ];
+  meta = {
+    description = "Quasi-quoter for Happy parsers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Fri Aug 12 08:34:36 
2011        (r28505)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Fri Aug 12 09:04:07 
2011        (r28506)
@@ -414,8 +414,6 @@
 
   bmp = callPackage ../development/libraries/haskell/bmp {};
 
-  bnfc = callPackage ../development/tools/haskell/bnfc {};
-
   Boolean = callPackage ../development/libraries/haskell/Boolean {};
 
   bytestringNums = callPackage 
../development/libraries/haskell/bytestring-nums {};
@@ -1353,6 +1351,12 @@
   alex_3_0   = callPackage ../development/tools/parsing/alex/3.0.nix   {};
   alex = self.alex_2_3_1;
 
+  alexMeta = callPackage ../development/tools/haskell/alex-meta {};
+
+  BNFC = callPackage ../development/tools/haskell/BNFC {};
+
+  BNFCMeta = callPackage ../development/tools/haskell/BNFC-meta {};
+
   cpphs = callPackage ../development/tools/misc/cpphs {};
 
   frown = callPackage ../development/tools/parsing/frown {};
@@ -1371,6 +1375,8 @@
   happy_1_18_6 = callPackage ../development/tools/parsing/happy/1.18.6.nix {};
   happy = self.happy_1_18_4;
 
+  happyMeta = callPackage ../development/tools/haskell/happy-meta {};
+
   HaRe = callPackage ../development/tools/haskell/HaRe {};
 
   hlint = callPackage ../development/tools/haskell/hlint {};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to