Author: urkud
Date: Mon Mar 19 04:36:41 2012
New Revision: 33252
URL: https://nixos.org/websvn/nix/?rev=33252&sc=1
Log:
Move gnome-doc-utils and gtk-doc to top-level
Add compatibility attrs.
Added:
nixpkgs/branches/glib-2.30-take2/pkgs/development/tools/documentation/gnome-doc-utils/
nixpkgs/branches/glib-2.30-take2/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
- copied, changed from r33251,
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/tools/documentation/gtk-doc/
nixpkgs/branches/glib-2.30-take2/pkgs/development/tools/documentation/gtk-doc/default.nix
- copied, changed from r33251,
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix
Deleted:
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/platform/gtk-doc/
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/default.nix
==============================================================================
--- nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/default.nix Mon Mar
19 04:36:35 2012 (r33251)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/default.nix Mon Mar
19 04:36:41 2012 (r33252)
@@ -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 { };
Copied and modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
(from r33251,
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix)
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix
Mon Mar 19 04:36:35 2012 (r33251, copy source)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
Mon Mar 19 04:36:41 2012 (r33252)
@@ -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";
Copied and modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/tools/documentation/gtk-doc/default.nix
(from r33251,
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix)
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix
Mon Mar 19 04:36:35 2012 (r33251, copy source)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/development/tools/documentation/gtk-doc/default.nix
Mon Mar 19 04:36:41 2012 (r33252)
@@ -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 @@
'';
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
];
}
Modified: nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix Mon Mar
19 04:36:35 2012 (r33251)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix Mon Mar
19 04:36:41 2012 (r33252)
@@ -3019,6 +3019,8 @@
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 @@
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 @@
self = pkgs.gnome2;
} // pkgs.gtkLibs // {
# Backwards compatibility;
- inherit (pkgs) libsoup;
+ inherit (pkgs) libsoup gtk_doc gnome_doc_utils;
};
gnome = recurseIntoAttrs gnome2;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
