diff options
-rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/documentation/gnome-doc-utils/default.nix (renamed from pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix) | 6 | ||||
-rw-r--r-- | pkgs/development/tools/documentation/gtk-doc/default.nix (renamed from pkgs/desktops/gnome-2/platform/gtk-doc/default.nix) | 16 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
4 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index c907a905849..661311b3014 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -56,8 +56,6 @@ at_spi = callPackage ./platform/at-spi { }; - gtk_doc = callPackage ./platform/gtk-doc { }; - gtkhtml = callPackage ./platform/gtkhtml { }; @@ -87,8 +85,6 @@ # scrollkeeper replacement rarian = callPackage ./desktop/rarian { }; - gnome_doc_utils = callPackage ./desktop/gnome-doc-utils { }; - zenity = callPackage ./desktop/zenity { }; metacity = callPackage ./desktop/metacity { }; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index 4953c860818..545cd298f8c 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -2,11 +2,11 @@ , makeWrapper, pythonPackages }: stdenv.mkDerivation { - name = "gnome-doc-utils-0.18.1"; + name = "gnome-doc-utils-0.20.7"; src = fetchurl { - url = mirror://gnome/sources/gnome-doc-utils/0.18/gnome-doc-utils-0.18.1.tar.bz2; - sha256 = "0psl9xnph6qga809dbkakjfp2z9mc32dxrdk8s6zn8whm41gc0gn"; + url = mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.7.tar.xz; + sha256 = "01lcq6gm4q9awvg7lccq43qh8g4ibz49s2mgykin78mgph9h396q"; }; configureFlags = "--disable-scrollkeeper"; diff --git a/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index c5086accc0d..a5d7d260804 100644 --- a/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, perl, python, libxml2, libxslt -, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex }: +{ stdenv, fetchurl, pkgconfig, perl, python, libxml2Python, libxslt, which +, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex, gettext }: -let version = "1.15"; in stdenv.mkDerivation { - name = "gtk-doc-${version}"; + name = "gtk-doc-1.18"; + src = fetchurl { - url = "mirror://gnome/sources/gtk-doc/${version}/gtk-doc-${version}.tar.bz2"; - sha256 = "0ca8wh67nyh574ahlfkx8k9w2bm4ji9yzxvi3afsicqdpyx77k2r"; + url = mirror://gnome/sources/gtk-doc/1.18/gtk-doc-1.18.tar.xz; + sha256 = "084scak99ppgqk5lkziskhcsd3jmcgf7a98ddwhciq8vaqf5jnvq"; }; # maybe there is a better way to pass the needed dtd and xsl files @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; buildInputs = - [ pkgconfig perl python libxml2 libxslt docbook_xml_dtd_43 docbook_xsl - gnome_doc_utils dblatex + [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl + gnome_doc_utils dblatex gettext which ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 310b36039fa..7db4e25bf8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3019,6 +3019,8 @@ let global = callPackage ../development/tools/misc/global { }; + gnome_doc_utils = callPackage ../development/tools/documentation/gnome-doc-utils {}; + gnum4 = callPackage ../development/tools/misc/gnum4 { }; gnumake = callPackage ../development/tools/build-managers/gnumake { }; @@ -3032,6 +3034,8 @@ let gperf = callPackage ../development/tools/misc/gperf { }; + gtk_doc = callPackage ../development/tools/documentation/gtk-doc { }; + gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; guileLint = callPackage ../development/tools/guile/guile-lint { }; @@ -7889,7 +7893,7 @@ let self = pkgs.gnome2; } // pkgs.gtkLibs // { # Backwards compatibility; - inherit (pkgs) libsoup; + inherit (pkgs) libsoup gtk_doc gnome_doc_utils; }; gnome = recurseIntoAttrs gnome2; |