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

* Merged most of the stdenv-updates branch. Some stuff didn't

Browse Source 
merge cleanly right away (kde-4, kernel stuff) so it should be
  merged later.  But the stdenv stuff is all there.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10793
This commit is contained in:
Eelco Dolstra
2008-02-20 23:02:41 +00:00
parent 3a49502530 0032a3245e f4eda0eb22 0b2d493521 a4512a4a49 2ca177e6ae 81429b0ac2 b37f504680 8ea549b319 805424e33f dd184fa88d 9e0a642955 f516036cbb 71353ce929 bcb28f63a0 f5bf68f9a8
commit e12b421add
211 changed files with 1399 additions and 4020 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/sql/mysql5/default.nix
+4 -3
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, ps, ncurses, zlib ? null, perl}:
args: with args;
# Note: zlib is not required; MySQL can use an internal zlib.
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
sha256 = "e4443d8dc859ed53bd9f3bef143ce30c7f5dee66a02748e9a003136be25e0060";
};
buildInputs = [ps ncurses zlib perl];
buildInputs = [ps ncurses zlib perl openssl];
postInstall = "ln -s mysqld_safe $out/bin/mysqld";
configureFlags = "--enable-thread-safe-client";
configureFlags = "--enable-thread-safe-client --with-embedded-server --disable-static --with-openssl=${openssl} --with-berkeley-db";
}
pkgs/servers/sql/postgresql/8.2.6.nix
+14
View File
@@ -0,0 +1,14 @@
args: with args;
stdenv.mkDerivation rec {
name = "postgresql-" + version;
LC_ALL = "en_US";
src = fetchurl {
url = "ftp://ftp.de.postgresql.org/mirror/postgresql/source/v${version}/${name}.tar.bz2";
sha256="056ixbsfmdwhniryc0mr1kl66jywkqqhqvjdi7i3v4qzh9z34hgf";
};
passthru = { inherit readline; };
buildInputs = [zlib ncurses readline];
}
pkgs/servers/sql/postgresql/8.3.0.nix
+14
View File
@@ -0,0 +1,14 @@
args: with args;
stdenv.mkDerivation rec {
name = "postgresql-" + version;
LC_ALL = "en_US";
src = fetchurl {
url = "ftp://ftp.de.postgresql.org/mirror/postgresql/source/v${version}/${name}.tar.bz2";
sha256="19kf0q45d5zd1rxffin0iblizckk8cp6fpgb52sipqkpnmm6sdc5";
};
passthru = { inherit readline; };
buildInputs = [zlib ncurses readline];
}
pkgs/servers/x11/xorg/default.nix
+8 -10
View File
@@ -1,8 +1,5 @@
# This is a generated file. Do not edit!
{ stdenv, fetchurl, pkgconfig, freetype, fontconfig
, libxslt, expat, libdrm, libpng, zlib, perl, mesa, mesaHeaders
, xkeyboard_config, gettext
}:
args: with args;
rec {
@@ -883,8 +880,9 @@ rec {
url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/libXpm-3.5.7.tar.bz2;
sha256 = "1aibr6y6hnlgc7m1a1y5s1qx7863praq4pdp0xrpkc75gkk1lw34";
};
buildInputs = [pkgconfig gettext libX11 libXext xextproto xproto libXt ];
}) // {inherit gettext libX11 libXext xextproto xproto libXt ;};
buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
}) // {inherit libX11 libXext xextproto xproto libXt ;};
libXprintAppUtil = (stdenv.mkDerivation {
name = "libXprintAppUtil-1.0.1";
@@ -1283,7 +1281,7 @@ rec {
url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/setxkbmap-1.0.4.tar.bz2;
sha256 = "1b1brw1v98q2rqhr5x7f8mr3clxq62nw5175gpamg5s172916nwv";
};
buildInputs = [pkgconfig libX11 libxkbfile ]; postInstall = "ensureDir $out/share; ln -sfn ${xkeyboard_config}/etc/X11 $out/share/X11";
buildInputs = [pkgconfig libX11 libxkbfile ]; postInstall = "ensureDir $out/share; ln -sfn ${xkeyboard_config}/etc/X11 $out/share/X11";
}) // {inherit libX11 libxkbfile ;};
showfont = (stdenv.mkDerivation {
@@ -1744,7 +1742,7 @@ rec {
sha256 = "15avwy8isbqagzcdj20ngqajl22k40pssfx7vjirhrqyyq19fiwb";
};
preBuild = "
sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c
sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c
";
buildInputs = [pkgconfig inputproto kbproto randrproto xorgserver xproto ];
}) // {inherit inputproto kbproto randrproto xorgserver xproto ;};
@@ -2716,8 +2714,8 @@ rec {
url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xorg-server-1.4.tar.bz2;
sha256 = "1hpbq0bl1jkq84gvksp0xzbbrwwgl0wz2wakf11p2hld6bgl5cai";
};
buildInputs = [pkgconfig pixman renderproto bigreqsproto compositeproto damageproto libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ]; mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ./xorgserver-xkb-leds.patch ];
}) // {inherit pixman renderproto bigreqsproto compositeproto damageproto libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ;};
buildInputs = [pkgconfig pixman renderproto bigreqsproto compositeproto damageproto dbus.libs libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto hal inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ]; mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ./xorgserver-xkb-leds.patch ];
}) // {inherit pixman renderproto bigreqsproto compositeproto damageproto libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto hal inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ;};
xorgsgmldoctools = (stdenv.mkDerivation {
name = "xorg-sgml-doctools-1.2";
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+6 -7
View File
@@ -35,7 +35,8 @@ $pcMap{"mkfontscale"} = "mkfontscale";
$pcMap{"mkfontdir"} = "mkfontdir";
$pcMap{"bdftopcf"} = "bdftopcf";
$pcMap{"libxslt"} = "libxslt";
$pcMap{"gettext"} = "gettext";
$pcMap{"dbus-1"} = "dbus";
$pcMap{"hal"} = "hal";
$pcMap{"\$PIXMAN"} = "pixman";
$pcMap{"\$RENDERPROTO"} = "renderproto";
@@ -56,6 +57,8 @@ $extraAttrs{"xf86inputevdev"} = "
sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c
\";";
$extraAttrs{"libXpm"} = "
patchPhase = \"sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in\";";
my $downloadCache = "./download-cache";
$ENV{'NIX_DOWNLOAD_CACHE'} = $downloadCache;
@@ -112,7 +115,7 @@ while (<>) {
my $file;
{
local $/;
open FOO, "cd '$tmpDir'/* && cat configure.ac |";
open FOO, "cd '$tmpDir'/* && grep -v '^ *#' configure.ac |";
$file = <FOO>;
close FOO;
}
@@ -184,7 +187,6 @@ while (<>) {
push @requires, "zlib" if $pkg =~ /xorgserver/;
push @requires, "xf86bigfontproto" if $pkg =~ /xorgserver/;
push @requires, "libxslt" if $pkg =~ /libxcb/;
push @requires, "gettext" if $pkg =~ /libXpm/;
print "REQUIRES @requires => $pkg\n";
$pkgRequires{$pkg} = \@requires;
@@ -200,10 +202,7 @@ open OUT, ">default2.nix";
print OUT "";
print OUT <<EOF;
# This is a generated file. Do not edit!
{ stdenv, fetchurl, pkgconfig, freetype, fontconfig
, libxslt, expat, libdrm, libpng, zlib, perl, mesa, mesaHeaders
, xkeyboard_config, gettext
}:
args: with args;
rec {
pkgs/servers/xmpp/ejabberd/builder.sh
+1 -1
View File
@@ -3,7 +3,7 @@ buildInputs="$expat $erlang $zlib $openssl"
source $stdenv/setup
tar xfvz $src
cd $name/src
cd ejabberd-*/src
./configure --prefix=$out
make
make install
pkgs/servers/xmpp/ejabberd/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, expat, erlang, zlib, openssl}:
stdenv.mkDerivation {
name = "ejabberd-1.1.4";
name = "ejabberd-2.0.0-rc1";
builder = ./builder.sh;
src = fetchurl {
url = http://www.process-one.net/downloads/ejabberd/1.1.4/ejabberd-1.1.4.tar.gz;
md5 = "65e9cd346f11a28afbacfe1d7be3a33b";
url = http://www.process-one.net/downloads/ejabberd/2.0.0-rc1/ejabberd-2.0.0-rc1.tar.gz;
sha256 = "02ldssvsy0rkvxm96018fpk5lc3iqgkrira9cw1ym2snas0k8nzy";
};
inherit expat erlang zlib openssl;
}