public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge ^/nixpkgs/trunk.

Browse Source 
This merge leads to a big rebuild, but this wouldn't hurt as I'm going to
reintegrate this branch soon.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455
This commit is contained in:
Yury G. Kudryashov
2012-03-28 15:42:42 +00:00
parent 49b7f13128 db8f709430
commit defd86049c
773 changed files with 4797 additions and 4596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/tools/documentation/haddock/2.10.0.nix
View File

@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
description = "A documentation-generation tool for Haskell libraries";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/documentation/haddock/2.4.2.nix
View File

@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
description = "A documentation-generation tool for Haskell libraries";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/documentation/haddock/2.9.4.nix
View File

@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
description = "A documentation-generation tool for Haskell libraries";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/haskell/BNFC-meta/default.nix
View File

@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
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
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/haskell/HaRe/default.nix
View File

@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
description = "the Haskell Refactorer";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/haskell/SourceGraph/default.nix
View File

@@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
description = "Static code analysis using graph-theoretic techniques";
license = "GPL";
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/haskell/alex-meta/default.nix
View File

@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
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
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/haskell/cabal-ghci/default.nix
View File

@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
description = "Set up ghci with options taken from a .cabal file";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

4
pkgs/development/tools/haskell/cabal2nix/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
version = "1.28";
sha256 = "04996v4b0767qzyi2g42anl30h1abaip77hvdj6hhfrvyrgdfsaw";
version = "1.30";
sha256 = "1qkrdxqvasm0q4sh98c50qwpm7nff6yzp4yjhx8sdy39v4gvbw2b";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];

5
pkgs/development/tools/haskell/happy-meta/default.nix
View File

@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
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
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/haskell/haskdogs/default.nix
View File

@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
description = "Generate ctags file for haskell project directory and it's deps";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/haskell/hasktags/default.nix
View File

@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

9
pkgs/development/tools/haskell/hlint/default.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hlint";
version = "1.8.24";
sha256 = "1crxhpgy49xg3j225cyfxflnc8zgck2xa8hb04chd0yh9n03h6kx";
version = "1.8.26";
sha256 = "001id2853bkxnbh7jc0bvfyq7v9595zn31n7hhma3il0dqim71lp";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
description = "Source code suggestions";
license = "GPL";
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/haskell/hslogger/default.nix
View File

@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
description = "Versatile logging framework";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/haskell/tar/0.3.2.0.nix
View File

@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
description = "Reading, writing and manipulating \".tar\" archive files.";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/haskell/tar/0.4.0.0.nix
View File

@@ -9,9 +9,6 @@ cabal.mkDerivation (self: {
description = "Reading, writing and manipulating \".tar\" archive files.";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/haskell/threadscope/default.nix
View File

@@ -17,9 +17,6 @@ cabal.mkDerivation (self: {
description = "A graphical tool for profiling parallel Haskell programs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/haskell/uuagc/bootstrap.nix
View File

@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
description = "Attribute Grammar System of Universiteit Utrecht";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/haskell/uuagc/cabal.nix
View File

@@ -10,9 +10,6 @@ cabal.mkDerivation (self: {
description = "Cabal plugin for the Universiteit Utrecht Attribute Grammar System";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/haskell/uuagc/default.nix
View File

@@ -16,9 +16,6 @@ cabal.mkDerivation (self: {
description = "Attribute Grammar System of Universiteit Utrecht";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/misc/cpphs/default.nix
View File

@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
description = "A liberalised re-implementation of cpp, the C pre-processor";
license = "LGPL";
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/parsing/alex/2.3.1.nix
View File

@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
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
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/parsing/alex/2.3.2.nix
View File

@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
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
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/parsing/alex/2.3.3.nix
View File

@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
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
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/parsing/alex/2.3.5.nix
View File

@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
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
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/parsing/alex/3.0.1.nix
View File

@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
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
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/parsing/happy/1.18.4.nix
View File

@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
description = "Happy is a parser generator for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/parsing/happy/1.18.5.nix
View File

@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
description = "Happy is a parser generator for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/parsing/happy/1.18.6.nix
View File

@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
description = "Happy is a parser generator for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/parsing/happy/1.18.8.nix
View File

@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
description = "Happy is a parser generator for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/tools/parsing/happy/1.18.9.nix
View File

@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
description = "Happy is a parser generator for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})