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

top-level changes ..

Browse Source 
svn path=/nixpkgs/trunk/; revision=11829
This commit is contained in:
Michael Raskin 2008-05-15 17:51:41 +00:00
parent 5b98b7ac77
commit 09ab1882a9
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3933,6 +3933,10 @@ let pkgs = rec {
inherit fetchurl stdenv mkDerivationByConfiguration perl lib; inherit fetchurl stdenv mkDerivationByConfiguration perl lib;
}; };
squidHead = import ../servers/squid/3.head.nix {
inherit fetchurl stdenv mkDerivationByConfiguration perl lib;
};
tomcat5 = import ../servers/http/tomcat { tomcat5 = import ../servers/http/tomcat {
inherit fetchurl stdenv jdk; inherit fetchurl stdenv jdk;
}; };
@ -5292,6 +5296,15 @@ let pkgs = rec {
gtksharp = gtksharp1; gtksharp = gtksharp1;
}; };
funpidgin = builderDefsPackage (selectVersion ../applications/networking/instant-messengers/funpidgin "2.4.1") {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss
gtkspell aspell gettext ncurses;
GStreamer = gst_all.gstreamer;
inherit (gtkLibs) gtk;
inherit (gnome) startupnotification;
inherit (xlibs) libXScrnSaver scrnsaverproto libX11 xproto;
} null;
gimp = import ../applications/graphics/gimp { gimp = import ../applications/graphics/gimp {
inherit fetchurl stdenv pkgconfig freetype fontconfig inherit fetchurl stdenv pkgconfig freetype fontconfig
libtiff libjpeg libpng libexif zlib perl perlXMLParser libtiff libjpeg libpng libexif zlib perl perlXMLParser

7
pkgs/top-level/builder-defs.nix
View File

@ -17,6 +17,9 @@ args: with args; with stringsWithDeps; with lib;
else if (hasSuffixHack "-cvs-export" s) then "cvs-dir" else if (hasSuffixHack "-cvs-export" s) then "cvs-dir"
else if (hasSuffixHack ".nar.bz2" s) then "narbz2" else if (hasSuffixHack ".nar.bz2" s) then "narbz2"
# Mostly for manually specified directories..
else if (hasSuffixHack "/" s) then "dir"
# Last block - for single files!! It should be always after .tar.* # Last block - for single files!! It should be always after .tar.*
else if (hasSuffixHack ".bz2" s) then "plain-bz2" else if (hasSuffixHack ".bz2" s) then "plain-bz2"
@ -195,6 +198,10 @@ args: with args; with stringsWithDeps; with lib;
cp -r '${s}' . cp -r '${s}' .
cd \$(basename ${s}) cd \$(basename ${s})
chmod u+rwX -R . chmod u+rwX -R .
" else if (archiveType s) == "dir" then "
cp -r '${s}' .
cd \$(basename ${s})
chmod u+rwX -R .
" else if (archiveType s) == "narbz2" then " " else if (archiveType s) == "narbz2" then "
bzip2 <${s} | nix-store --restore \$PWD/\$(basename ${s} .nar.bz2) bzip2 <${s} | nix-store --restore \$PWD/\$(basename ${s} .nar.bz2)
cd \$(basename ${s} .nar.bz2) cd \$(basename ${s} .nar.bz2)