* docbook-xsl / docbook-xsl-ns: match the upstream package name. Also

  updated docbook-xsl-ns.

svn path=/nixpkgs/trunk/; revision=16356

6 files changed, 28 insertions, 24 deletions

diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix
new file mode 100644
index 000000000000..c64bf74becdc
--- /dev/null
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "docbook-xsl-ns-1.75.1";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/docbook/${name}.tar.bz2";
+    sha256 = "1ph9ck4w38ycg22m9cws14mx55d04lfgw5fcjn3r8lsdgbm7glrh";
+  };
+
+  buildPhase = "true";
+
+  installPhase =
+    ''
+      ensureDir $out/xml/xsl
+      cd ..
+      mv docbook-xsl-ns-* $out/xml/xsl/docbook
+    '';
+
+  meta = {
+    homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets;
+    description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats";
+  };
+}
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/builder.sh b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh
index 1534806895cd..1534806895cd 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/builder.sh
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
index c54d8f304b62..c54d8f304b62 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/builder.sh b/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/builder.sh
deleted file mode 100644
index 889886b3cb24..000000000000
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/builder.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-source $stdenv/setup
-
-buildPhase=true
-
-installPhase=myInstallPhase
-myInstallPhase() {
-    ensureDir $out/xml/xsl
-    cd ..
-    mv docbook-xsl-ns-* $out/xml/xsl/docbook
-}
-
-genericBuild
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/default.nix
deleted file mode 100644
index d3440735801f..000000000000
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "docbook5-xsl-1.74.0";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = mirror://sourceforge/docbook/docbook-xsl-ns-1.74.0.tar.bz2;
-    sha256 = "0253ymp0k9wb3zsxazz8p9q9fy83rkmp8c67vlk84x7f2i7vf3x9";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d78d0a3862d7..ac5c2eb8f50d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5552,11 +5552,13 @@ let
 
   docbook_xml_xslt = docbook_xsl;
 
-  docbook_xsl = import ../data/sgml+xml/stylesheets/xslt/docbook {
+  docbook_xsl = import ../data/sgml+xml/stylesheets/xslt/docbook-xsl {
     inherit fetchurl stdenv;
   };
 
-  docbook5_xsl = import ../data/sgml+xml/stylesheets/xslt/docbook5 {
+  docbook5_xsl = docbook_xsl_ns;
+
+  docbook_xsl_ns = import ../data/sgml+xml/stylesheets/xslt/docbook-xsl-ns {
     inherit fetchurl stdenv;
   };