* Move all the Perl packages out of all-packages.nix into a separate

file, perl-packages.nix.

svn path=/nixpkgs/trunk/; revision=15171
This commit is contained in:
Eelco Dolstra 2009-04-20 12:08:09 +00:00
parent c531caffe5
commit ac24816344
7 changed files with 2140 additions and 2099 deletions

View File

@ -15,7 +15,7 @@ rec {
cpio tcl tk makeWrapper subversion;
svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
guiSupport = getConfig ["git" "guiSupport"] false;
perlLibs = [perlLWP perlURI perlTermReadKey subversion];
perlLibs = [perlPackages.perlLWP perlPackages.perlURI perlPackages.perlTermReadKey subversion];
};
gitGit = import ./git/git-git.nix {
@ -26,7 +26,7 @@ rec {
inherit (bleedingEdgeRepos) sourceByName;
svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
guiSupport = getConfig ["git" "guiSupport"] false;
perlLibs = [perlLWP perlURI perlTermReadKey subversion];
perlLibs = [perlPackages.perlLWP perlPackages.perlURI perlPackages.perlTermReadKey subversion];
};
qgit = import ./qgit {

View File

@ -582,7 +582,7 @@ rec {
rpmClosureGenerator =
{name, packagesList, urlPrefix, packages, archs ? []}:
runCommand "${name}.nix" {buildInputs = [perl perlXMLSimple]; inherit archs;} ''
runCommand "${name}.nix" {buildInputs = [perl perlPackages.perlXMLSimple]; inherit archs;} ''
gunzip < ${packagesList} > ./packages.xml
perl -w ${rpm/rpm-closure.pl} \
./packages.xml ${urlPrefix} ${toString packages} > $out

View File

@ -1,6 +1,6 @@
{fetchurl, perl, db4}:
{fetchurl, buildPerlPackage, db4}:
import ../generic perl {
buildPerlPackage {
name = "DB_File-1.816";
src = fetchurl {
@ -16,6 +16,4 @@ import ../generic perl {
INCLUDE = ${db4}/include
EOF
'';
inherit db4;
}

File diff suppressed because it is too large Load Diff

View File

@ -142,7 +142,6 @@ let
par2cmdline
pciutils
perl
perlTaskCatalystTutorial
php
pinentry
pkgconfig
@ -215,6 +214,9 @@ let
zile
zip
;
inherit (pkgs.perlPackages)
perlTaskCatalystTutorial
;
inherit (pkgs.xorg)
fontbh100dpi
fontbhlucidatypewriter100dpi

File diff suppressed because it is too large Load Diff

View File

@ -395,6 +395,10 @@ in {
kernel = linux;
virtualbox = linux;
};
perlPackages = {
perlTaskCatalystTutorial = linux;
};
xorg = {
fontadobe100dpi = linux;