summary refs log tree commit diff
path: root/pkgs/development/tools/documentation
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-28 15:42:42 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-28 15:42:42 +0000
commitdefd86049c17a1a34db52f9cbf238f926e270dca (patch)
treebfb3eab227bc0ad487db09a2a34780fb71f61808 /pkgs/development/tools/documentation
parent49b7f13128731188bfebdc2cf2a712a7fc5118ce (diff)
parentdb8f709430e20ad07e040af1813529e133ec823b (diff)
downloadnixlib-defd86049c17a1a34db52f9cbf238f926e270dca.tar
nixlib-defd86049c17a1a34db52f9cbf238f926e270dca.tar.gz
nixlib-defd86049c17a1a34db52f9cbf238f926e270dca.tar.bz2
nixlib-defd86049c17a1a34db52f9cbf238f926e270dca.tar.lz
nixlib-defd86049c17a1a34db52f9cbf238f926e270dca.tar.xz
nixlib-defd86049c17a1a34db52f9cbf238f926e270dca.tar.zst
nixlib-defd86049c17a1a34db52f9cbf238f926e270dca.zip
Merge ^/nixpkgs/trunk.
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
Diffstat (limited to 'pkgs/development/tools/documentation')
-rw-r--r--pkgs/development/tools/documentation/haddock/2.10.0.nix5
-rw-r--r--pkgs/development/tools/documentation/haddock/2.4.2.nix5
-rw-r--r--pkgs/development/tools/documentation/haddock/2.9.4.nix5
3 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/development/tools/documentation/haddock/2.10.0.nix b/pkgs/development/tools/documentation/haddock/2.10.0.nix
index a1510f58f7e1..5c608c440aaa 100644
--- a/pkgs/development/tools/documentation/haddock/2.10.0.nix
+++ b/pkgs/development/tools/documentation/haddock/2.10.0.nix
@@ -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 ];
   };
 })
diff --git a/pkgs/development/tools/documentation/haddock/2.4.2.nix b/pkgs/development/tools/documentation/haddock/2.4.2.nix
index 35299f2901aa..dd7b9de97254 100644
--- a/pkgs/development/tools/documentation/haddock/2.4.2.nix
+++ b/pkgs/development/tools/documentation/haddock/2.4.2.nix
@@ -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 ];
   };
 })
diff --git a/pkgs/development/tools/documentation/haddock/2.9.4.nix b/pkgs/development/tools/documentation/haddock/2.9.4.nix
index 1303473f8076..15ed35f5758c 100644
--- a/pkgs/development/tools/documentation/haddock/2.9.4.nix
+++ b/pkgs/development/tools/documentation/haddock/2.9.4.nix
@@ -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 ];
   };
 })