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 ];
};
})