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

Updating from trunk. I resolved simple conflicts.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
This commit is contained in:
Lluís Batlle i Rossell
2010-12-11 12:47:00 +00:00
parent 3f1a32c266 97d4a54698
commit ee04ffcb55
106 changed files with 2507 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/ati-drivers/default.nix
View File

@@ -21,7 +21,7 @@ in
stdenv.mkDerivation rec {
name = "ati-drivers-${version}";
version = "10-10-x86";
version = "10-11-x86";
builder = ./builder.sh;
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
src =
assert stdenv.system == "x86_64-linux";
fetchurl {
url = https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-10-10-x86.x86_64.run;
sha256 = "1g71sj8qbarshw3hfds2v6y9q7lma3d36d0x79c7vvgllcd5c76x";
url = https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-10-11-x86.x86_64.run;
sha256 = "1z33w831ayx1j5lm9d1xv6whkmzsz9v8li3s8c96hwnwki6zpimr";
};
buildInputs = [xlibs.libXext xlibs.libX11

45
pkgs/os-specific/linux/broadcom-sta/default.nix Normal file
View File

@@ -0,0 +1,45 @@
{ stdenv, fetchurl, kernel }:
let version = "5.60.246.6";
bits = if stdenv.system == "i686-linux" then "32" else
assert stdenv.system == "x86_64-linux"; "64";
in
stdenv.mkDerivation {
name = "broadcom-sta-${version}";
src = fetchurl {
url = "http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86-${bits}_v${version}.tar.gz";
sha256 = if bits == "32"
then "0y8ap9zhfsg1k603qf5a7n73zvsw7nkqh42dlcyxan5zdzmgcqdx"
else "0z8a57fpajiag830g1ifc9vrm7wk5bm7dwi7a9ljm3cns3an07fl";
};
buildInputs = [ kernel ];
patches = [ ./makefile.patch ];
makeFlags = "KDIR=${kernel}/lib/modules/${kernel.version}/build";
unpackPhase =
''
sourceRoot=broadcom-sta
mkdir "$sourceRoot"
tar xvf "$src" -C "$sourceRoot"
'';
installPhase =
''
binDir="$out/lib/modules/${kernel.version}/kernel/net/wireless/"
docDir="$out/share/doc/broadcom-sta/"
ensureDir "$binDir" "$docDir"
cp wl.ko "$binDir"
cp lib/LICENSE.txt "$docDir"
'';
meta = {
description = "Kernel module driver for some Broadcom's wireless cards";
homepage = http://www.broadcom.com/support/802.11/linux_sta.php;
license = "unfree-redistributable";
maintainers = [ stdenv.lib.maintainers.neznalek ];
platforms = stdenv.lib.platforms.linux;
};
}

16
pkgs/os-specific/linux/broadcom-sta/makefile.patch Normal file
View File

@@ -0,0 +1,16 @@
--- src/Makefile 2010-10-08 00:32:59.000000000 +0200
+++ src/Makefile 2010-11-09 11:06:28.832999850 +0100
@@ -27,10 +27,10 @@
EXTRA_LDFLAGS := $(src)/lib/wlc_hybrid.o_shipped
all:
- KBUILD_NOPEDANTIC=1 make -C /lib/modules/`uname -r`/build M=`pwd`
+ KBUILD_NOPEDANTIC=1 make -C ${KDIR} M=`pwd`
clean:
- KBUILD_NOPEDANTIC=1 make -C /lib/modules/`uname -r`/build M=`pwd` clean
+ KBUILD_NOPEDANTIC=1 make -C ${KDIR} clean
install:
- install -D -m 755 wl.ko /lib/modules/`uname -r`/kernel/drivers/net/wireless/wl.ko
+ install -D -m 755 wl.ko $out/lib/modules/${kernelVersion}/kernel/drivers/net/wireless/wl.ko

4
pkgs/os-specific/linux/kernel/linux-2.6.32.nix
View File

@@ -198,11 +198,11 @@ in
import ./generic.nix (
rec {
version = "2.6.32.25";
version = "2.6.32.26";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "1ycri78c335qqmfqxg8c4m03f6gy0q1y35yv7yg2f2m6aqhylh2z";
sha256 = "1kpkl5ps8xrwddmn90rzynra49am9rdm37smplhf3w3ifvpc1mf3";
};
config = configWithPlatform stdenv.platform;

20
pkgs/os-specific/linux/libnl/default.nix Normal file
View File

@@ -0,0 +1,20 @@
{stdenv, fetchurl, bison, flex}:
stdenv.mkDerivation rec {
name = "libnl-2.0";
src = fetchurl {
url = "${meta.homepage}files/${name}.tar.gz";
sha256 = "173sr25xpsakdvjcg62790v6kwcgxj5r0js2lx6hg89w7n8dqh2s";
};
buildInputs = [ bison flex ];
postConfigure = "type -tp flex";
meta = {
homepage = "http://www.infradead.org/~tgr/libnl/";
description = "Linux NetLink interface library";
maintainers = [ stdenv.lib.maintainers.urkud ];
platforms = stdenv.lib.platforms.linux;
};
}

6
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@@ -7,7 +7,7 @@
with stdenv.lib;
let versionNumber = "256.44"; in
let versionNumber = "260.19.21"; in
stdenv.mkDerivation {
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
@@ -18,12 +18,12 @@ stdenv.mkDerivation {
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
sha256 = "1kirr1bs6kricxcbk1lxz263jyzfb2il91071h0slilmpjs5ipmi";
sha256 = "1gr11icpi1jcba39i86mvb6yvawika04hja2c2gri9mz7bbbn1kp";
}
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}-no-compat32.run";
sha256 = "004m97wp2bspykb96dj8kkd2pa2rx8pswscyyf7r9hb93vx47bbl";
sha256 = "1pl5pwp72vdvw74449pv9h4hnygg5sasz8z3f0vbmch4c8hdmyz9";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";

20
pkgs/os-specific/linux/sysstat/default.nix
View File

@@ -1,18 +1,26 @@
{stdenv, fetchurl, gettext}:
{ stdenv, fetchurl, gettext }:
stdenv.mkDerivation {
name = "sysstat-8.0.4.1";
stdenv.mkDerivation rec {
name = "sysstat-9.0.6.1";
src = fetchurl {
url = http://perso.orange.fr/sebastien.godard/sysstat-8.0.4.1.tar.bz2;
sha256 = "17bzyz6bp63br4pns40ypc0qac0299lh90p7fhis5sn31sx811rf";
url = "http://perso.orange.fr/sebastien.godard/${name}.tar.bz2";
sha256 = "061r616cc0wfjkrk5ywqcwh5gwvm3gw92phfkj9bhlzxhi9srkr7";
};
buildInputs = [gettext];
buildInputs = [ gettext ];
preConfigure = ''
export PATH_CP=$(type -tp cp)
export PATH_CHKCONFIG=/no-such-program
makeFlagsArray=(SA_DIR=$out/var/log/sa SYSCONFIG_DIR=$out/etc CHOWN=true IGNORE_MAN_GROUP=y)
'';
meta = {
homepage = http://sebastien.godard.pagesperso-orange.fr/;
description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)";
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}