diff --git a/pkgs/README b/pkgs/README index b315e1bfb7e..1a5c673b9a4 100644 --- a/pkgs/README +++ b/pkgs/README @@ -95,3 +95,11 @@ ELSE IF it's an APPLICATION: ./applications/networking/misc ELSE ./applications/misc + +ELSE IF it's DATA (i.e., doe not have a straight-forward executable semantics): + + IF it's related to SGML/XML processing: + IF it's a XML DTD: + ./data/sgml+xml/schemas/xml-dtd + ELSE IF it's an XSLT stylesheet (okay, these are executable...): + ./data/sgml+xml/stylesheets/xslt diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index d469af8c678..f885b84b33f 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -4,12 +4,21 @@ {system, stdenv}: rec { + # Hack: remember stdenv. + stdenv_ = stdenv; + + ### BUILD SUPPORT fetchurl = (import ../build-support/fetchurl) { stdenv = stdenv; }; + fetchsvn = (import ../build-support/fetchsvn) { + stdenv = stdenv; + subversion = subversion; + }; + ### TOOLS @@ -59,6 +68,11 @@ stdenv = stdenv; }; + unzip = (import ../tools/archivers/unzip) { + fetchurl = fetchurl; + stdenv = stdenv; + }; + gzip = (import ../tools/compression/gzip) { fetchurl = fetchurl; stdenv = stdenv; @@ -95,6 +109,20 @@ stdenv = stdenv; }; + autoconf = (import ../development/tools/misc/autoconf) { + fetchurl = fetchurl; + stdenv = stdenv; + m4 = gnum4; + perl = perl; + }; + + automake = (import ../development/tools/misc/automake) { + fetchurl = fetchurl; + stdenv = stdenv; + perl = perl; + autoconf = autoconf; + }; + pkgconfig = (import ../development/tools/misc/pkgconfig) { fetchurl = fetchurl; stdenv = stdenv; @@ -155,6 +183,12 @@ zlib = zlib; }; + libxslt = (import ../development/libraries/libxslt) { + fetchurl = fetchurl; + stdenv = stdenv; + libxml2 = libxml2; + }; + gettext = (import ../development/libraries/gettext) { fetchurl = fetchurl; stdenv = stdenv; @@ -329,6 +363,20 @@ }; + ### DATA + + docbook_xml_dtd = (import ../data/sgml+xml/schemas/xml-dtd/docbook) { + fetchurl = fetchurl; + stdenv = stdenv; + unzip = unzip; + }; + + docbook_xml_xslt = (import ../data/sgml+xml/stylesheets/xslt/docbook) { + fetchurl = fetchurl; + stdenv = stdenv; + }; + + ### APPLICATIONS subversion = (import ../applications/version-management/subversion) {