public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/git-and-tools/default.nix
View File

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

2
pkgs/build-support/vm/default.nix
View File

@ -582,7 +582,7 @@ rec {
rpmClosureGenerator = rpmClosureGenerator =
{name, packagesList, urlPrefix, packages, archs ? []}: {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 gunzip < ${packagesList} > ./packages.xml
perl -w ${rpm/rpm-closure.pl} \ perl -w ${rpm/rpm-closure.pl} \
./packages.xml ${urlPrefix} ${toString packages} > $out ./packages.xml ${urlPrefix} ${toString packages} > $out

6
pkgs/development/perl-modules/DB_File/default.nix
View File

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

2111
pkgs/top-level/all-packages.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/top-level/build-for-release.nix
View File

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

2108
pkgs/top-level/perl-packages.nix Normal file
View File

File diff suppressed because it is too large Load Diff

4
pkgs/top-level/release.nix
View File

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