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

Merged with trunk again

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10267
This commit is contained in:
Yury G. Kudryashov
2008-01-23 18:11:03 +00:00
parent 4de89f61b0
commit da57804fff
109 changed files with 1394 additions and 1352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/os-specific/linux/atheros/0.9.3.3.nix
View File

@@ -1,5 +1,5 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://downloads.sourceforge.net/madwifi/madwifi-0.9.3.3.tar.bz2;
@@ -16,6 +16,7 @@ args : with args;
sha256 = "11xpx5g9w7ilagvj60prc3s8a3x0n5n4mr0b7nh0lxwrbjdgjjfg";
} else "")*/;
} null; /* null is a terminator for sumArgs */
in with localDefs;
let
doPatch = FullDepEntry (if patchAR2425x86 !="" then ''
cd hal
@@ -25,7 +26,7 @@ in
stdenv.mkDerivation rec {
name = "atheros-"+version;
builder = writeScript (name + "-builder")
(textClosure [doPatch doMakeInstall doForceShare doPropagate]);
(textClosure localDefs [doPatch doMakeInstall doForceShare doPropagate]);
meta = {
description = "
Atheros WiFi driver.

5
pkgs/os-specific/linux/atheros/r2756.nix
View File

@@ -1,5 +1,5 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2756-20071018.tar.gz;
@@ -16,6 +16,7 @@ args : with args;
sha256 = "11xpx5g9w7ilagvj60prc3s8a3x0n5n4mr0b7nh0lxwrbjdgjjfg";
} else "");
} null; /* null is a terminator for sumArgs */
in with localDefs;
let
doPatch = FullDepEntry (if patchAR2425x86 !="" then ''
cd hal
@@ -26,7 +27,7 @@ in
stdenv.mkDerivation rec {
name = "atheros-"+version;
builder = writeScript (name + "-builder")
(textClosure [doPatch doMakeInstall doForceShare doPropagate]);
(textClosure localDefs [doPatch doMakeInstall doForceShare doPropagate]);
meta = {
description = "
Atheros WiFi driver.

5
pkgs/os-specific/linux/atheros/r3122.nix
View File

@@ -1,5 +1,5 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r3122-20080109.tar.gz;
@@ -10,10 +10,11 @@ args : with args;
configureFlags = [];
makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out''];
} null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec {
name = "atheros-"+version;
builder = writeScript (name + "-builder")
(textClosure [doMakeInstall doForceShare doPropagate]);
(textClosure localDefs [doMakeInstall doForceShare doPropagate]);
meta = {
description = "
Atheros WiFi driver.

5
pkgs/os-specific/linux/dmidecode/2.9.nix
View File

@@ -1,5 +1,5 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://download.savannah.gnu.org/releases/dmidecode/dmidecode-2.9.tar.bz2;
@@ -10,10 +10,11 @@ args : with args;
configureFlags = [];
makeFlags = "prefix=\$out";
} null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec {
name = "dmidecode-"+version;
builder = writeScript (name + "-builder")
(textClosure [ doMakeInstall doForceShare doPropagate]);
(textClosure localDefs [ doMakeInstall doForceShare doPropagate]);
meta = {
description = "
Tool to decode Desktop Management Interface and SBIOS data.

5
pkgs/os-specific/linux/dvd+rw-tools/7.0.nix
View File

@@ -1,5 +1,5 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.0.tar.gz;
@@ -10,6 +10,7 @@ args : with args;
configureFlags = [];
makeFlags = [" prefix=\$out "];
} null; /* null is a terminator for sumArgs */
in with localDefs;
let
preBuild = FullDepEntry ("
sed -e 's@/usr/local@'\$out'@g' -i Makefile.m4 Makefile
@@ -18,7 +19,7 @@ in
stdenv.mkDerivation rec {
name = "dvd+rw-tools-"+version;
builder = writeScript (name + "-builder")
(textClosure [preBuild doMakeInstall doForceShare doPropagate]);
(textClosure localDefs [preBuild doMakeInstall doForceShare doPropagate]);
meta = {
description = "
DVD+RW tools.

6
pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
View File

@@ -1,5 +1,5 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://fabrice.bellard.free.fr/qemu/kqemu-1.3.0pre11.tar.gz;
@@ -8,11 +8,13 @@ args : with args;
buildInputs = [];
configureFlags = [''--prefix=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)''];
} null; /* null is a terminator for sumArgs */
in with localDefs;
let
debugStep = FullDepEntry (''
cat config-host.mak
'') [minInit];
preConfigure = FullDepEntry (''
sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh
sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh
sed -e '/depmod/d' -i install.sh
cat install.sh
@@ -21,7 +23,7 @@ in
stdenv.mkDerivation rec {
name = "kqemu-"+version;
builder = writeScript (name + "-builder")
(textClosure [preConfigure doConfigure debugStep doMakeInstall doForceShare doPropagate]);
(textClosure localDefs [preConfigure doConfigure debugStep doMakeInstall doForceShare doPropagate]);
meta = {
description = "
Kernel module for Qemu acceleration

7
pkgs/os-specific/linux/module-init-tools/aggregator.nix
View File

@@ -1,10 +1,11 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
addSbinPath = true;
src = "";
buildInputs = [module_init_tools];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
in with localDefs;
let
doCollect = FullDepEntry (''
@@ -17,7 +18,7 @@ done
rm -rf nix-support
cd lib/modules/
rm */modules.*
MODULE_DIR=$PWD/ depmod -a
MODULE_DIR=$PWD/ depmod -a *
cd $out/
'') [minInit addInputs defEnsureDir];
in
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
name = "kernel-modules";
inherit moduleSources;
builder = writeScript (name + "-builder")
(textClosure [doCollect doForceShare doPropagate]);
(textClosure localDefs [doCollect doForceShare doPropagate]);
meta = {
description = "
A directory to hold all the modules, including those

5
pkgs/os-specific/linux/sdparm/1.02.nix
View File

@@ -1,5 +1,5 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://sg.torque.net/sg/p/sdparm-1.02.tgz;
@@ -9,10 +9,11 @@ args : with args;
buildInputs = [];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec {
name = "sdparm-"+version;
builder = writeScript (name + "-builder")
(textClosure [doConfigure doMakeInstall doForceShare doPropagate]);
(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
meta = {
description = "
SCSI parameters utility.

10
pkgs/os-specific/linux/usbutils/default.nix
View File

@@ -3,17 +3,17 @@
let
usbids = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/usb.ids.20061212.bz2;
sha256 = "112l4fzjn5p3y6fv3x10vbrd36n2v5n04s7pjdlkb2yqv4crp84m";
url = http://nix.cs.uu.nl/dist/tarballs/usb.ids.20080115.bz2;
sha256 = "0xymp8fpp9pnkj2i4ry8zpsvy18zw14sx03pnz316lpgwc6dx12n";
};
in
stdenv.mkDerivation {
name = "usbutils-0.72";
name = "usbutils-0.73";
src = fetchurl {
url = mirror://sourceforge/linux-usb/usbutils-0.72.tar.gz;
sha256 = "08s4g4sz7p3a1afvphxd7h5bbfywvp0j611y85wbhwr14i9m6f00";
url = mirror://sourceforge/linux-usb/usbutils-0.73.tar.gz;
sha256 = "1x27mc2apyipf8fa2ac49rfnkm7f5dwv784b1ncgc5yjiz4prp1f";
};
buildInputs = [libusb];
preBuild = "bunzip2 < ${usbids} > usb.ids";