* Drop the "perl" prefix from Perl attribute names. It's redundant
now that Perl packages are in their own namespace (perlPackages.<pkg>). svn path=/nixpkgs/trunk/; revision=15176
This commit is contained in:
parent
2cbc761779
commit
c61c9dc35b
@ -31,7 +31,7 @@ complicated packages should be put in a separate file, typically in
|
||||
example of the former:
|
||||
|
||||
<programlisting>
|
||||
perlClassC3 = buildPerlPackage rec {
|
||||
ClassC3 = buildPerlPackage rec {
|
||||
name = "Class-C3-0.21";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz";
|
||||
@ -46,12 +46,12 @@ name attribute is consistent with the source that we’re actually
|
||||
downloading. Perl packages are made available in
|
||||
<filename>all-packages.nix</filename> through the variable
|
||||
<varname>perlPackages</varname>. For instance, if you have a package
|
||||
that needs <varname>perlClassC3</varname>, you would typically write
|
||||
that needs <varname>ClassC3</varname>, you would typically write
|
||||
|
||||
<programlisting>
|
||||
foo = import ../path/to/foo.nix {
|
||||
inherit stdenv fetchurl ...;
|
||||
inherit (perlPackages) perlClassC3;
|
||||
inherit (perlPackages) ClassC3;
|
||||
};
|
||||
</programlisting>
|
||||
|
||||
@ -59,7 +59,7 @@ in <filename>all-packages.nix</filename>. You can test building a
|
||||
Perl package as follows:
|
||||
|
||||
<screen>
|
||||
$ nix-build -A perlPackages.perlClassC3
|
||||
$ nix-build -A perlPackages.ClassC3
|
||||
</screen>
|
||||
|
||||
<varname>buildPerlPackage</varname> adds <literal>perl-</literal> to
|
||||
@ -72,7 +72,7 @@ $ nix-env -i perl-Class-C3
|
||||
</screen>
|
||||
|
||||
(Of course you can also install using the attribute name:
|
||||
<literal>nix-env -i -A perlPackages.perlClassC3</literal>.)</para>
|
||||
<literal>nix-env -i -A perlPackages.ClassC3</literal>.)</para>
|
||||
|
||||
<para>So what does <varname>buildPerlPackage</varname> do? It does
|
||||
the following:
|
||||
@ -137,14 +137,14 @@ builds a Perl module that has runtime dependencies on a bunch of other
|
||||
modules:
|
||||
|
||||
<programlisting>
|
||||
perlClassC3Componentised = buildPerlPackage rec {
|
||||
ClassC3Componentised = buildPerlPackage rec {
|
||||
name = "Class-C3-Componentised-1.0004";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz";
|
||||
sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1";
|
||||
};
|
||||
propagatedBuildInputs = [
|
||||
perlClassC3 perlClassInspector perlTestException perlMROCompat
|
||||
ClassC3 ClassInspector TestException MROCompat
|
||||
];
|
||||
};
|
||||
</programlisting>
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, perlArchiveZip
|
||||
, perlCompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd
|
||||
{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, ArchiveZip
|
||||
, CompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd
|
||||
, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
|
||||
, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
|
||||
, icu, boost, jdk, ant, hsqldb, libXext, libX11, libXtst, libXi, cups
|
||||
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib";
|
||||
|
||||
buildInputs = [
|
||||
pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib
|
||||
pam python tcsh libxslt perl ArchiveZip CompressZlib zlib
|
||||
libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl
|
||||
libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack
|
||||
getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
|
||||
|
@ -1,9 +1,9 @@
|
||||
args: with args;
|
||||
{fetchurl, stdenv, fontforge, perl, fontconfig, FontTTF}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "dejavu-fonts-2.23";
|
||||
#fontconfig is needed only for fc-lang (?)
|
||||
buildInputs = [fontforge perl perlFontTTF];
|
||||
buildInputs = [fontforge perl FontTTF];
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/dejavu/dejavu-fonts-2.23.tar.bz2;
|
||||
sha256 = "0gifaxiianls54i05yw5gxhi2a0j9jmy5p0q58ym4l9fxv5drnhn";
|
||||
|
@ -1,4 +1,4 @@
|
||||
{fetchurl, buildPerlPackage, perlDBI, sqlite}:
|
||||
{fetchurl, buildPerlPackage, DBI, sqlite}:
|
||||
|
||||
buildPerlPackage {
|
||||
name = "DBD-SQLite-1.14";
|
||||
@ -8,7 +8,7 @@ buildPerlPackage {
|
||||
sha256 = "01qd5xfx702chg3bv2k727kfdp84zy5xh31y6njvivkp78vrs624";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [perlDBI];
|
||||
propagatedBuildInputs = [DBI];
|
||||
|
||||
makeMakerFlags = "SQLITE_LOCATION=${sqlite}";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, perl, gettext, perlLocaleGettext}:
|
||||
{stdenv, fetchurl, perl, gettext, LocaleGettext}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "help2man-1.35.1";
|
||||
@ -11,11 +11,11 @@ stdenv.mkDerivation {
|
||||
buildInputs = [
|
||||
perl
|
||||
gettext
|
||||
perlLocaleGettext
|
||||
LocaleGettext
|
||||
];
|
||||
|
||||
# So that configure can find `preloadable_libintl.so'.
|
||||
LD_LIBRARY_PATH = gettext + "/lib";
|
||||
LD_LIBRARY_PATH = "${gettext}/lib";
|
||||
|
||||
inherit gettext;
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, perl, perlXMLSimple}:
|
||||
{stdenv, fetchurl, perl, XMLSimple}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "icon-naming-utils-0.8.7";
|
||||
@ -6,11 +6,11 @@ stdenv.mkDerivation {
|
||||
url = http://tango.freedesktop.org/releases/icon-naming-utils-0.8.7.tar.gz;
|
||||
sha256 = "1lj0lffdg7fjfinhrn0vsq1kj010dxlxlix4jfc969j6l3k9rd0w";
|
||||
};
|
||||
buildInputs = [perl perlXMLSimple];
|
||||
buildInputs = [perl XMLSimple];
|
||||
postInstall = "
|
||||
# Add XML::Simple to the runtime search path.
|
||||
substituteInPlace $out/libexec/icon-name-mapping \\
|
||||
--replace '/bin/perl' '/bin/perl -I${perlXMLSimple}/lib/site_perl';
|
||||
--replace '/bin/perl' '/bin/perl -I${XMLSimple}/lib/site_perl';
|
||||
ensureDir $out/lib
|
||||
ln -s $out/share/pkgconfig $out/lib/pkgconfig # WTF?
|
||||
";
|
||||
|
@ -1,7 +1,4 @@
|
||||
{ fetchurl, perl, perlTermReadKey, perlXMLTwig, perlXMLWriter
|
||||
, perlDateManip, perlHTMLTree, perlHTMLParser, perlHTMLTagset
|
||||
, perlURI, perlLWP
|
||||
}:
|
||||
{ fetchurl, perl, perlPackages }:
|
||||
|
||||
import ../../../development/perl-modules/generic perl {
|
||||
name = "xmltv-0.5.51";
|
||||
@ -11,7 +8,8 @@ import ../../../development/perl-modules/generic perl {
|
||||
};
|
||||
#makeMakerFlags = "-components tv_grab_nl";
|
||||
buildInputs = [
|
||||
perlTermReadKey perlXMLTwig perlXMLWriter perlDateManip
|
||||
perlHTMLTree perlHTMLParser perlHTMLTagset perlURI perlLWP
|
||||
perlPackages.TermReadKey perlPackages.XMLTwig perlPackages.XMLWriter
|
||||
perlPackages.DateManip perlPackages.HTMLTree perlPackages.HTMLParser
|
||||
perlPackages.HTMLTagset perlPackages.URI perlPackages.LWP
|
||||
];
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ fetchurl, stdenv, texinfo, perl
|
||||
, perlXMLSAX, perlXMLParser, perlXMLNamespaceSupport
|
||||
, XMLSAX, XMLParser, XMLNamespaceSupport
|
||||
, groff, libxml2, libxslt, gnused
|
||||
, makeWrapper }:
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
patches = [ ./db2x_texixml-to-stdout.patch ];
|
||||
|
||||
buildInputs = [ perl texinfo groff libxml2 libxslt makeWrapper
|
||||
perlXMLSAX perlXMLParser perlXMLNamespaceSupport ];
|
||||
XMLSAX XMLParser XMLNamespaceSupport ];
|
||||
|
||||
postConfigure = ''
|
||||
# Broken substitution is used for `perl/config.pl', which leaves literal
|
||||
@ -32,9 +32,9 @@ stdenv.mkDerivation rec {
|
||||
# XXX: We work around the fact that `wrapProgram' doesn't support
|
||||
# spaces below by inserting escaped backslashes.
|
||||
wrapProgram $out/bin/$i --prefix PERL5LIB : \
|
||||
"${perlXMLSAX}/lib/site_perl:${perlXMLParser}/lib/site_perl" \
|
||||
"${XMLSAX}/lib/site_perl:${XMLParser}/lib/site_perl" \
|
||||
--prefix PERL5LIB : \
|
||||
"${perlXMLNamespaceSupport}/lib/site_perl" \
|
||||
"${XMLNamespaceSupport}/lib/site_perl" \
|
||||
--prefix XML_CATALOG_FILES "\ " \
|
||||
"$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml"
|
||||
done
|
||||
|
@ -588,7 +588,7 @@ let
|
||||
docbook2x = import ../tools/typesetting/docbook2x {
|
||||
inherit fetchurl stdenv texinfo perl
|
||||
gnused groff libxml2 libxslt makeWrapper;
|
||||
inherit (perlPackages) perlXMLSAX perlXMLParser perlXMLNamespaceSupport;
|
||||
inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport;
|
||||
};
|
||||
|
||||
dosfstools = composedArgsAndFun (import ../tools/misc/dosfstools) {
|
||||
@ -1442,10 +1442,7 @@ let
|
||||
};
|
||||
|
||||
xmltv = import ../tools/misc/xmltv {
|
||||
inherit fetchurl perl;
|
||||
inherit (perlPackages)
|
||||
perlTermReadKey perlXMLTwig perlXMLWriter perlDateManip
|
||||
perlHTMLTree perlHTMLParser perlHTMLTagset perlURI perlLWP;
|
||||
inherit fetchurl perl perlPackages;
|
||||
};
|
||||
|
||||
xmpppy = builderDefsPackage (import ../development/python-modules/xmpppy) {
|
||||
@ -2524,12 +2521,12 @@ let
|
||||
|
||||
help2man = import ../development/tools/misc/help2man {
|
||||
inherit fetchurl stdenv perl gettext;
|
||||
inherit (perlPackages) perlLocaleGettext;
|
||||
inherit (perlPackages) LocaleGettext;
|
||||
};
|
||||
|
||||
iconnamingutils = import ../development/tools/misc/icon-naming-utils {
|
||||
inherit fetchurl stdenv perl;
|
||||
inherit (perlPackages) perlXMLSimple;
|
||||
inherit (perlPackages) XMLSimple;
|
||||
};
|
||||
|
||||
indent = composedArgsAndFun (selectVersion ../development/tools/misc/indent "2.2.9") {
|
||||
@ -4163,7 +4160,7 @@ let
|
||||
inherit pkgs;
|
||||
});
|
||||
|
||||
perlXMLParser = perlPackages.perlXMLParser;
|
||||
perlXMLParser = perlPackages.XMLParser;
|
||||
|
||||
|
||||
### DEVELOPMENT / PYTHON MODULES
|
||||
@ -5417,7 +5414,7 @@ let
|
||||
|
||||
dejavu_fonts = import ../data/fonts/dejavu-fonts {
|
||||
inherit fetchurl stdenv fontforge perl fontconfig;
|
||||
inherit (perlPackages) perlFontTTF;
|
||||
inherit (perlPackages) FontTTF;
|
||||
};
|
||||
|
||||
docbook5 = import ../data/sgml+xml/schemas/docbook-5.0 {
|
||||
@ -6493,7 +6490,7 @@ let
|
||||
boost = boost_1_36_0;
|
||||
inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama;
|
||||
inherit (gtkLibs) gtk;
|
||||
inherit (perlPackages) perlArchiveZip perlCompressZlib;
|
||||
inherit (perlPackages) ArchiveZip CompressZlib;
|
||||
};
|
||||
|
||||
opera = import ../applications/networking/browsers/opera {
|
||||
@ -6740,7 +6737,7 @@ let
|
||||
static = true;
|
||||
}));
|
||||
|
||||
svk = perlPackages.perlSVK;
|
||||
svk = perlPackages.SVK;
|
||||
|
||||
sylpheed = import ../applications/networking/mailreaders/sylpheed {
|
||||
inherit fetchurl stdenv pkgconfig openssl gpgme;
|
||||
|
@ -215,7 +215,7 @@ let
|
||||
zip
|
||||
;
|
||||
inherit (pkgs.perlPackages)
|
||||
perlTaskCatalystTutorial
|
||||
TaskCatalystTutorial
|
||||
;
|
||||
inherit (pkgs.xorg)
|
||||
fontbh100dpi
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -218,7 +218,6 @@ in {
|
||||
par2cmdline = all;
|
||||
pciutils = linux;
|
||||
perl = all;
|
||||
perlTaskCatalystTutorial = linux;
|
||||
php = linux;
|
||||
pidgin = linux;
|
||||
pinentry = linux;
|
||||
@ -397,7 +396,7 @@ in {
|
||||
};
|
||||
|
||||
perlPackages = {
|
||||
perlTaskCatalystTutorial = linux;
|
||||
TaskCatalystTutorial = linux;
|
||||
};
|
||||
|
||||
xorg = {
|
||||
|
Loading…
Reference in New Issue
Block a user