mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-31 14:41:27 +00:00
Move gnome-doc-utils and gtk-doc to top-level
Add compatibility attrs. svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33252
This commit is contained in:
parent
066896556f
commit
3d0b778848
@ -56,8 +56,6 @@
|
|||||||
|
|
||||||
at_spi = callPackage ./platform/at-spi { };
|
at_spi = callPackage ./platform/at-spi { };
|
||||||
|
|
||||||
gtk_doc = callPackage ./platform/gtk-doc { };
|
|
||||||
|
|
||||||
gtkhtml = callPackage ./platform/gtkhtml { };
|
gtkhtml = callPackage ./platform/gtkhtml { };
|
||||||
|
|
||||||
|
|
||||||
@ -87,8 +85,6 @@
|
|||||||
# scrollkeeper replacement
|
# scrollkeeper replacement
|
||||||
rarian = callPackage ./desktop/rarian { };
|
rarian = callPackage ./desktop/rarian { };
|
||||||
|
|
||||||
gnome_doc_utils = callPackage ./desktop/gnome-doc-utils { };
|
|
||||||
|
|
||||||
zenity = callPackage ./desktop/zenity { };
|
zenity = callPackage ./desktop/zenity { };
|
||||||
|
|
||||||
metacity = callPackage ./desktop/metacity { };
|
metacity = callPackage ./desktop/metacity { };
|
||||||
|
@ -2,11 +2,11 @@
|
|||||||
, makeWrapper, pythonPackages }:
|
, makeWrapper, pythonPackages }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "gnome-doc-utils-0.18.1";
|
name = "gnome-doc-utils-0.20.7";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = mirror://gnome/sources/gnome-doc-utils/0.18/gnome-doc-utils-0.18.1.tar.bz2;
|
url = mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.7.tar.xz;
|
||||||
sha256 = "0psl9xnph6qga809dbkakjfp2z9mc32dxrdk8s6zn8whm41gc0gn";
|
sha256 = "01lcq6gm4q9awvg7lccq43qh8g4ibz49s2mgykin78mgph9h396q";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = "--disable-scrollkeeper";
|
configureFlags = "--disable-scrollkeeper";
|
@ -1,12 +1,12 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, perl, python, libxml2, libxslt
|
{ stdenv, fetchurl, pkgconfig, perl, python, libxml2Python, libxslt, which
|
||||||
, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex }:
|
, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex, gettext }:
|
||||||
|
|
||||||
let version = "1.15"; in
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "gtk-doc-${version}";
|
name = "gtk-doc-1.18";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/gtk-doc/${version}/gtk-doc-${version}.tar.bz2";
|
url = mirror://gnome/sources/gtk-doc/1.18/gtk-doc-1.18.tar.xz;
|
||||||
sha256 = "0ca8wh67nyh574ahlfkx8k9w2bm4ji9yzxvi3afsicqdpyx77k2r";
|
sha256 = "084scak99ppgqk5lkziskhcsd3jmcgf7a98ddwhciq8vaqf5jnvq";
|
||||||
};
|
};
|
||||||
|
|
||||||
# maybe there is a better way to pass the needed dtd and xsl files
|
# maybe there is a better way to pass the needed dtd and xsl files
|
||||||
@ -26,7 +26,7 @@ stdenv.mkDerivation {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ pkgconfig perl python libxml2 libxslt docbook_xml_dtd_43 docbook_xsl
|
[ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
|
||||||
gnome_doc_utils dblatex
|
gnome_doc_utils dblatex gettext which
|
||||||
];
|
];
|
||||||
}
|
}
|
@ -3019,6 +3019,8 @@ let
|
|||||||
|
|
||||||
global = callPackage ../development/tools/misc/global { };
|
global = callPackage ../development/tools/misc/global { };
|
||||||
|
|
||||||
|
gnome_doc_utils = callPackage ../development/tools/documentation/gnome-doc-utils {};
|
||||||
|
|
||||||
gnum4 = callPackage ../development/tools/misc/gnum4 { };
|
gnum4 = callPackage ../development/tools/misc/gnum4 { };
|
||||||
|
|
||||||
gnumake = callPackage ../development/tools/build-managers/gnumake { };
|
gnumake = callPackage ../development/tools/build-managers/gnumake { };
|
||||||
@ -3032,6 +3034,8 @@ let
|
|||||||
|
|
||||||
gperf = callPackage ../development/tools/misc/gperf { };
|
gperf = callPackage ../development/tools/misc/gperf { };
|
||||||
|
|
||||||
|
gtk_doc = callPackage ../development/tools/documentation/gtk-doc { };
|
||||||
|
|
||||||
gtkdialog = callPackage ../development/tools/misc/gtkdialog { };
|
gtkdialog = callPackage ../development/tools/misc/gtkdialog { };
|
||||||
|
|
||||||
guileLint = callPackage ../development/tools/guile/guile-lint { };
|
guileLint = callPackage ../development/tools/guile/guile-lint { };
|
||||||
@ -7889,7 +7893,7 @@ let
|
|||||||
self = pkgs.gnome2;
|
self = pkgs.gnome2;
|
||||||
} // pkgs.gtkLibs // {
|
} // pkgs.gtkLibs // {
|
||||||
# Backwards compatibility;
|
# Backwards compatibility;
|
||||||
inherit (pkgs) libsoup;
|
inherit (pkgs) libsoup gtk_doc gnome_doc_utils;
|
||||||
};
|
};
|
||||||
|
|
||||||
gnome = recurseIntoAttrs gnome2;
|
gnome = recurseIntoAttrs gnome2;
|
||||||
|
Loading…
Reference in New Issue
Block a user