Author: simons
Date: Wed Aug 10 15:47:35 2011
New Revision: 28461
URL: https://svn.nixos.org/websvn/nix/?rev=28461&sc=1
Log:
cabal2nix: updated to version 1.9
Added:
nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/
nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/cabal2nix/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/cabal2nix/default.nix Wed Aug
10 15:47:35 2011 (r28461)
@@ -0,0 +1,20 @@
+{ cabal, HTTP, mtl, regexPosix }:
+
+cabal.mkDerivation (self: {
+ pname = "cabal2nix";
+ version = "1.9";
+ sha256 = "0wfagx42l3jcjclwyw914srramh9jind1988xg7dkxblngqw153v";
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [ HTTP mtl regexPosix ];
+ meta = {
+ homepage = "http://github.com/haskell4nix/cabal2nix";;
+ description = "Convert Cabal files into Nix build instructions";
+ 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 Wed Aug 10 14:16:29
2011 (r28460)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed Aug 10 15:47:35
2011 (r28461)
@@ -424,8 +424,6 @@
bytestringTrie = callPackage
../development/libraries/haskell/bytestring-trie {};
- cabal2nix = callPackage ../development/libraries/haskell/cabal2nix {};
-
cairo = callPackage ../development/libraries/haskell/cairo {
inherit (pkgs) cairo zlib;
};
@@ -1415,6 +1413,8 @@
myhasktags = callPackage ../tools/misc/myhasktags {};
+ cabal2nix = callPackage ../development/tools/haskell/cabal2nix {};
+
# Games.
LambdaHack = callPackage ../games/LambdaHack {};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
