diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-11 15:39:04 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-11 15:39:04 +0000 |
| commit | 0e722781806c2d87b8e2b810144dc08b11faba8a (patch) | |
| tree | 6b621dad6878f4ae71a4ff35531715bbd0ff2be8 | |
| parent | 68c6b5f2fc18d3468afc12ecd88c6b800b60fefc (diff) | |
| download | nixpkgs-0e722781806c2d87b8e2b810144dc08b11faba8a.tar nixpkgs-0e722781806c2d87b8e2b810144dc08b11faba8a.tar.gz nixpkgs-0e722781806c2d87b8e2b810144dc08b11faba8a.tar.bz2 nixpkgs-0e722781806c2d87b8e2b810144dc08b11faba8a.tar.lz nixpkgs-0e722781806c2d87b8e2b810144dc08b11faba8a.tar.xz nixpkgs-0e722781806c2d87b8e2b810144dc08b11faba8a.tar.zst nixpkgs-0e722781806c2d87b8e2b810144dc08b11faba8a.zip | |
* Docbook 5.
* Docbook XSL 1.74.0. svn path=/nixpkgs/trunk/; revision=12040
| -rw-r--r-- | doc/release-notes.xml | 25 | ||||
| -rw-r--r-- | pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/data/sgml+xml/stylesheets/xslt/docbook5/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 34 insertions, 9 deletions
diff --git a/doc/release-notes.xml b/doc/release-notes.xml index 8ed87faa2ee..f04a674e96b 100644 --- a/doc/release-notes.xml +++ b/doc/release-notes.xml @@ -7,7 +7,30 @@ <section><title>Release 0.12 (TBA)</title> -<para>…</para> +<para>This release has the following improvements: + +<itemizedlist> + + <listitem><para>TODO: simplified and expanded stdenv hook + handling.</para></listitem> + + <listitem><para>Important updates: + + <itemizedlist> + + <listitem><para>Glibc 2.7.</para></listitem> + + <listitem><para>GCC 4.2.4.</para></listitem> + + <listitem><para>Linux 2.6.25.</para></listitem> + + </itemizedlist> + + </para></listitem> + +</itemizedlist> + +</para> </section> diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix index dff67222e69..1e0103a9305 100644 --- a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix +++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix @@ -1,11 +1,13 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "docbook5-5.0-pre-cr1"; + name = "docbook5-5.0"; builder = ./builder.sh; src = fetchurl { - url = http://www.docbook.org/xml/5.0CR1/docbook-5.0CR1.tar.gz; - sha256 = "15bbnydspiry7k7fwl2gdjb53nyw2vg6xwpn3d40f03mcf0bkw11"; + url = http://www.docbook.org/xml/5.0/docbook-5.0.zip; + sha256 = "13i04dkd709f0p5f2413sf2y9321pfi4y85ynf8wih6ryphnbk9x"; }; + + buildInputs = [unzip]; } diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/default.nix index af9152ac4d2..d3440735801 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook5/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "docbook5-xsl-1.73.1"; + name = "docbook5-xsl-1.74.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/docbook/docbook-xsl-ns-1.73.1.tar.bz2; - sha256 = "105irc94p04j0fj5vf5fschyxv9azkh2bsa69a796jax5ngpbahn"; + 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 618e0faa2de..e40daac8647 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5281,7 +5281,7 @@ let pkgs = rec { }; docbook5 = import ../data/sgml+xml/schemas/docbook-5.0 { - inherit fetchurl stdenv; + inherit fetchurl stdenv unzip; }; docbook_xml_dtd_412 = import ../data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix { |