* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14057
This commit is contained in:
Eelco Dolstra
2009-02-12 21:16:55 +00:00
74 changed files with 2775 additions and 1291 deletions

View File

@@ -0,0 +1,20 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "acpid-1.0.8";
src = fetchurl {
url = mirror://sourceforge/acpid/acpid-1.0.8.tar.gz;
sha256 = "1cdp4vql8ya073b42mjpzpzzn1py00baazq91837vhrq5hqfaynm";
};
preBuild = ''
makeFlagsArray=(BINDIR=$out/bin SBINDIR=$out/sbin MAN8DIR=$out/share/man/man8)
'';
meta = {
homepage = http://acpid.sourceforge.net/;
description = "A daemon for delivering ACPI events to userspace programs";
license = "GPLv2+";
};
}

View File

@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "e2fsprogs-1.41.3";
name = "e2fsprogs-1.41.4";
src = fetchurl {
url = mirror://sourceforge/e2fsprogs/e2fsprogs-1.41.3.tar.gz;
sha256 = "0yldax5z1d1gfxpvzmr8y2z5zg5xhbi9pjjy4yw0q28dd2pfsxyf";
url = mirror://sourceforge/e2fsprogs/e2fsprogs-1.41.4.tar.gz;
sha256 = "1p10j04gwr286qc2pjpp72k38nqk2d2n7sslwhvxgb995gp0zh9c";
};
configureFlags =

View File

@@ -5,11 +5,11 @@ assert !userModeLinux;
import ./generic.nix (
rec {
version = "2.6.27.13";
version = "2.6.27.15";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "1zxyid70nlzxmx08mrg6a2vafqvs6q1szlcix417d1qq52c88l9i";
sha256 = "17n8q425q5xix2fd1ig5gbpfjhy18wggd27pyaxi7vvxa9ihm969";
};
features = {

View File

@@ -5,11 +5,11 @@ assert !userModeLinux;
import ./generic.nix (
rec {
version = "2.6.28.2";
version = "2.6.28.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "0fw4wv9xnajsw3prp2p79470wsflpnigflyyg21s2lfy0xn66ay8";
sha256 = "1k45azdjv4i9hh76nbi442vsfpwz31736aq3la2pn5avmkwiz2mm";
};
features = {

View File

@@ -16,6 +16,7 @@ rec {
sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh
sed -e '/depmod/d' -i install.sh
cat install.sh
sed -e '/linux\/ioctl.h/a#include <linux\/sched.h>' -i kqemu-linux.c
'') ["minInit" "doUnpack"];
phaseNames = ["preConfigure" "doConfigure" "debugStep" "doMakeInstall"];

View File

@@ -2,7 +2,7 @@
let
versionNumber = "180.22";
versionNumber = "180.29";
in
@@ -14,13 +14,13 @@ stdenv.mkDerivation {
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg1.run";
sha256 = "0cp6ii14pm8kzy1fy1qx2id2fp0lmb02akddid8wwdca7xpczqg7";
url = "ftp://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run";
sha256 = "17wgg5rf5384bxng9ygwarf4imvvg069zihfvvvmahg1b0fsipvq";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg2.run";
sha256 = "0yycsr8i5cc8bnqwvfrk0v9d7gxxv42zqdpz9ki8vxil7lvjfdxv";
url = "ftp://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run";
sha256 = "1w7a67s5df8i5lbr2r980l674wvrqzzys1zdwcla267zy109rp5d";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";