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

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
This commit is contained in:
Eelco Dolstra
2009-03-16 12:45:27 +00:00
parent d574d882cc 808f12e369
commit 3593b97d63
339 changed files with 4943 additions and 2370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,10 +9,12 @@ stdenv.mkDerivation rec {
meta = {
description = ''Linux ACPI client is a small command-line
program that attempts to replicate the functionality of
the "old" `apm' command on ACPI systems. It includes
battery and thermal information.'';
longDescription = ''
Linux ACPI client is a small command-line
program that attempts to replicate the functionality of
the "old" `apm' command on ACPI systems. It includes
battery and thermal information.
'';
homepage = http://grahame.angrygoats.net/acpi.shtml;
license = "GPLv2+";
};

7
pkgs/os-specific/linux/acpitool/default.nix
View File

@@ -1,16 +1,15 @@
args: with args;
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "acpitool-0.4.7";
src = fetchurl {
url = "mirror://sourceforge/acpitool/${name}.tar.bz2";
sha256 = "133bdgcq9ql0l940kp9m2v6wzdvkyv8f1dizwjbx7v96n8g2c239";
};
meta = {
description = ''ACPI Tool is a small, convenient command-line
ACPI client with a lot of features for Linux.'';
description = "A small, convenient command-line ACPI client with a lot of features";
homepage = http://freeunix.dyndns.org:8000/site2/acpitool.shtml;
license = "GPLv2+";
};

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

@@ -32,9 +32,7 @@ stdenv.mkDerivation rec {
(textClosure localDefs [doPatch doMakeInstall
postInstall doForceShare doPropagate]);
meta = {
description = "
Atheros WiFi driver.
";
description = "Atheros WiFi driver";
inherit src;
};
}

4
pkgs/os-specific/linux/atheros/0.9.4.nix
View File

@@ -22,9 +22,7 @@ stdenv.mkDerivation rec {
(textClosure localDefs [doMakeInstall
postInstall doForceShare doPropagate]);
meta = {
description = "
Atheros WiFi driver.
";
description = "Atheros WiFi driver";
inherit src;
};
}

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

@@ -33,9 +33,7 @@ stdenv.mkDerivation rec {
(textClosure localDefs [doPatch doMakeInstall
postInstall doForceShare doPropagate]);
meta = {
description = "
Atheros WiFi driver.
";
description = "Atheros WiFi driver.";
inherit src;
};
}

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

@@ -22,9 +22,7 @@ stdenv.mkDerivation rec {
(textClosure localDefs [doMakeInstall postInstall
doForceShare doPropagate]);
meta = {
description = "
Atheros WiFi driver.
";
description = "Atheros WiFi driver";
inherit src;
};
}

4
pkgs/os-specific/linux/atheros/r3574.nix
View File

@@ -22,9 +22,7 @@ stdenv.mkDerivation rec {
(textClosure localDefs [doMakeInstall postInstall
doForceShare doPropagate]);
meta = {
description = "
Atheros WiFi driver.
";
description = "Atheros WiFi driver";
inherit src;
};
}

4
pkgs/os-specific/linux/atheros/r3693.nix
View File

@@ -35,9 +35,7 @@ stdenv.mkDerivation rec {
++ [doMakeInstall postInstall
doForceShare doPropagate]));
meta = {
description = "
Atheros WiFi driver.
";
description = "Atheros WiFi driver";
inherit src;
};
}

4
pkgs/os-specific/linux/atheros/r3837.nix
View File

@@ -39,9 +39,7 @@ stdenv.mkDerivation rec {
++ [doPatch doMakeInstall postInstall
doForceShare doPropagate]));
meta = {
description = "
Atheros WiFi driver.
";
description = "Atheros WiFi driver";
inherit src;
};
}

4
pkgs/os-specific/linux/atheros/r3867.nix
View File

@@ -39,9 +39,7 @@ stdenv.mkDerivation rec {
++ [doPatch doMakeInstall postInstall
doForceShare doPropagate]));
meta = {
description = "
Atheros WiFi driver.
";
description = "Atheros WiFi driver";
inherit src;
};
}

23
pkgs/os-specific/linux/cryptsetup/default.nix Normal file
View File

@@ -0,0 +1,23 @@
{stdenv, fetchurl, e2fsprogs, popt, devicemapper, udev }:
stdenv.mkDerivation {
name = "cryptsetup-1.0.6";
src = fetchurl {
url = http://cryptsetup.googlecode.com/files/cryptsetup-1.0.6.tar.bz2;
sha256 = "df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd";
};
configureFlags = [ "--enable-libdevmapper" ];
patchPhase = ''
sed -i -e 's@/sbin/udevsettle@${udev}/sbin/udevsettle@' lib/libdevmapper.c
'';
buildInputs = [ e2fsprogs popt devicemapper ];
meta = {
homepage = http://code.google.com/p/cryptsetup/;
description = "LUKS for dm-crypt";
license = "GPLv2";
};
}

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

@@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
builder = writeScript (name + "-builder")
(textClosure localDefs [ doMakeInstall doForceShare doPropagate]);
meta = {
description = "
Tool to decode Desktop Management Interface and SBIOS data.
";
description = "Tool to decode Desktop Management Interface and SBIOS data";
inherit src;
};
}

11
pkgs/os-specific/linux/kernel-headers/2.6.28.nix
View File

@@ -20,9 +20,6 @@ stdenv.mkDerivation {
buildInputs = [perl];
# !!! hacky
fixupPhase = "ln -s $out/include/asm $out/include/asm-$platform";
extraIncludeDirs =
if stdenv.system == "powerpc-linux" then ["ppc"] else [];
@@ -41,4 +38,12 @@ stdenv.mkDerivation {
ensureDir $out/include/config
echo "${version}-default" > $out/include/config/kernel.release
'';
# !!! hacky
fixupPhase = ''
ln -s asm $out/include/asm-$platform
if test "$platform" = "i386" -o "$platform" = "x86_64"; then
ln -s asm $out/include/asm-x86
fi
'';
}

10
pkgs/os-specific/linux/kernel/builder.sh
View File

@@ -124,12 +124,10 @@ installPhase() {
# copy include files
includeDir=$out/lib/modules/$version/build/include
mkdir -p $includeDir
(cd include && cp -a acpi config linux math-emu media net pcmcia rxrpc scsi sound video asm-generic $includeDir)
if test -e arch/$archDir/include/asm; then
cp -a arch/$archDir/include/asm $includeDir
else
cp -a include/asm-$archDir $includeDir/asm
fi
(cd include && cp -a acpi config linux math-emu media net pcmcia rxrpc scsi sound video asm-generic asm asm-$archDir $includeDir)
(cd arch/$archDir/include && cp -a * $includeDir || true)
(cd arch/$archDir/include && cp -a asm/* $includeDir/asm/ || true)
(cd arch/$archDir/include/asm/mach-generic && cp -a * $includeDir/ || true)
fi
}

2
pkgs/os-specific/linux/kernel/config-2.6.27-i686-smp
View File

@@ -3426,7 +3426,7 @@ CONFIG_SDIO_UART=m
#
# MMC/SD Host Controller Drivers
#
# CONFIG_MMC_SDHCI is not set
CONFIG_MMC_SDHCI=m
CONFIG_MMC_WBSD=m
CONFIG_MMC_TIFM_SD=m
CONFIG_MMC_SDRICOH_CS=m

2
pkgs/os-specific/linux/kernel/config-2.6.28-i686-smp
View File

@@ -3553,7 +3553,7 @@ CONFIG_SDIO_UART=m
#
# MMC/SD/SDIO Host Controller Drivers
#
# CONFIG_MMC_SDHCI is not set
CONFIG_MMC_SDHCI=m
CONFIG_MMC_WBSD=m
CONFIG_MMC_TIFM_SD=m
CONFIG_MMC_SDRICOH_CS=m

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

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

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

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

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

@@ -18,10 +18,21 @@ rec {
cat install.sh
sed -e '/linux\/ioctl.h/a#include <linux\/sched.h>' -i kqemu-linux.c
'') ["minInit" "doUnpack"];
phaseNames = ["preConfigure" "doConfigure" "debugStep" "doMakeInstall"];
fixInc = {
text = ''
sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c
'';
deps = ["minInit" "doUnpack"];
};
fixMemFunc = {
text=''
sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c
'';
deps = ["minInit" "doUnpack"];
};
phaseNames = ["fixInc" "fixMemFunc" "preConfigure" "doConfigure" "debugStep" "doMakeInstall"];
meta = {
description = " Kernel module for Qemu acceleration ";
description = "Kernel module for Qemu acceleration";
};
}

15
pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
View File

@@ -17,8 +17,19 @@ rec {
sed -e '/depmod/d' -i install.sh
cat install.sh
'') ["minInit" "doUnpack"];
phaseNames = ["preConfigure" "doConfigure" "debugStep" "doMakeInstall"];
fixInc = {
text = ''
sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c
'';
deps = ["minInit" "doUnpack"];
};
fixMemFunc = {
text=''
sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c
'';
deps = ["minInit" "doUnpack"];
};
phaseNames = ["fixInc" "fixMemFunc" "preConfigure" "doConfigure" "debugStep" "doMakeInstall"];
meta = {
description = " Kernel module for Qemu acceleration ";

8
pkgs/os-specific/linux/kvm/82.nix → pkgs/os-specific/linux/kvm/84.nix
View File

@@ -2,12 +2,12 @@
assert stdenv.isLinux;
stdenv.mkDerivation {
name = "kvm-82";
stdenv.mkDerivation rec {
name = "kvm-84";
src = fetchurl {
url = mirror://sourceforge/kvm/kvm-82.tar.gz;
sha256 = "1fk58g8z9v7z42vy76zq0sq28slqf8zszzmh73vyxm07vfbc96zs";
url = "mirror://sourceforge/kvm/${name}.tar.gz";
sha256 = "13lqhy4lpxqby7qj3l1cdbj73c7jmvkq73bc5wchwn0l0dkjsjlk";
};
patches = [

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

@@ -39,5 +39,6 @@ stdenv.mkDerivation {
meta = {
homepage = http://www.nvidia.com/object/unix.html;
description = "X.org driver and kernel module for NVIDIA graphics cards";
license = "unfree";
};
}

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

@@ -1,11 +1,11 @@
{stdenv, fetchurl, ncurses}:
{stdenv, fetchurl, ncurses, gettext}:
stdenv.mkDerivation {
name = "powertop-1.9";
name = "powertop-1.11";
src = fetchurl {
url = http://www.lesswatts.org/projects/powertop/download/powertop-1.9.tar.gz;
sha256 = "15150ra7n0q1nfij4ax3dnlplyjakm2ipx246xi3wsj3qc99m2a1";
url = http://www.lesswatts.org/projects/powertop/download/powertop-1.11.tar.gz;
sha256 = "1wl0c7sav5rf7andnx704vs3n5gj2b5g1adx8zjfbbgvwm9wrrvh";
};
patches = [./powertop-1.8.patch];
buildInputs = [ncurses];
buildInputs = [ncurses gettext];
}

4
pkgs/os-specific/linux/sdparm/1.03.nix
View File

@@ -15,9 +15,7 @@ stdenv.mkDerivation rec {
builder = writeScript (name + "-builder")
(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
meta = {
description = "
SCSI parameters utility.
";
description = "Utility for setting parameters of SCSI devices";
inherit src;
};
}

62
pkgs/os-specific/linux/tcp-wrapper/builder.sh
View File

@@ -1,37 +1,39 @@
source "$stdenv/setup" || exit 1
# Unpack
unpackPhase && \
cd "$sourceRoot/upstream/tarballs" && \
tar xzvf * && \
cd tcp_wrappers_7.6 && \
\
unpackPhase
cd "$sourceRoot/upstream/tarballs"
tar xzvf *
cd tcp_wrappers_7.6
# Patch
patchPhase
for patch in debian/patches/*
do
echo "applying Debian patch \`$(basename $patch)'..."
patch -p1 < $patch
done
substituteInPlace "Makefile" --replace \
"REAL_DAEMON_DIR=/usr/sbin" "REAL_DAEMON_DIR=$out/sbin" \
--replace "/tmp" '$$TMPDIR' && \
substituteInPlace "scaffold.c" --replace \
'extern char *malloc();' " " && \
substituteInPlace "environ.c" --replace \
'extern char *malloc();' " " && \
\
# The `linux' target doesn't work on Linux...
echo building... && \
make REAL_DAEMON_DIR="$out/sbin" freebsd && \
\
--replace "/tmp" '$$TMPDIR'
echo "building..."
make REAL_DAEMON_DIR="$out/sbin" linux
# Install
ensureDir "$out/sbin" && \
cp safe_finger tcpd tcpdchk tcpdmatch try-from "$out/sbin" && \
\
ensureDir "$out/lib" && \
cp lib*.a "$out/lib" && \
\
ensureDir "$out/include" && \
cp *.h "$out/include" && \
\
ensureDir "$out/man" && \
for i in 3 5 8; \
do \
ensureDir "$out/man/man$i" && \
cp *.$i "$out/man/man$i" ; \
done \
ensureDir "$out/sbin"
cp -v safe_finger tcpd tcpdchk tcpdmatch try-from "$out/sbin"
ensureDir "$out/lib"
cp -v shared/lib*.so* "$out/lib"
ensureDir "$out/include"
cp -v *.h "$out/include"
ensureDir "$out/man"
for i in 3 5 8;
do
ensureDir "$out/man/man$i"
cp *.$i "$out/man/man$i" ;
done

28
pkgs/os-specific/linux/tcp-wrapper/default.nix
View File

@@ -7,8 +7,32 @@ stdenv.mkDerivation {
url = mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.dbs.orig.tar.gz;
sha256 = "0k68ziinx6biwar5lcb9jvv0rp6b3vmj6861n75bvrz4w1piwkdp";
};
patches = [
(fetchurl {
url = mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.dbs-13.diff.gz;
sha256 = "071ir20rh8ckhgrc0y99wgnlbqjgkprf0qwbv84lqw5i6qajbcnh";
})
];
builder = ./builder.sh;
# meta = ...
meta = {
description = "TCP Wrappers, a network logger, also known as TCPD or LOG_TCP";
longDescription = ''
Wietse Venema's network logger, also known as TCPD or LOG_TCP.
These programs log the client host name of incoming telnet, ftp,
rsh, rlogin, finger etc. requests. Security options are: access
control per host, domain and/or service; detection of host name
spoofing or host address spoofing; booby traps to implement an
early-warning system. The current version supports the System
V.4 TLI network programming interface (Solaris, DG/UX) in
addition to the traditional BSD sockets.
'';
homepage = ftp://ftp.porcupine.org/pub/security/index.html;
license = "BSD-style";
};
}

21
pkgs/os-specific/linux/tunctl/default.nix Normal file
View File

@@ -0,0 +1,21 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "tunctl-1.5";
src = fetchurl {
url = mirror://sourceforge/tunctl/tunctl-1.5.tar.gz;
sha256 = "aa2a6c4cc6bfacb11e0d9f62334a6638a0d435475c61230116f00b6af8b14fff";
};
makeFlags = [ "tunctl" ];
installPhase = ''
ensureDir $out/bin
cp tunctl $out/bin
'';
meta = {
homepage = http://tunctl.sourceforge.net/;
description = "Utility to set up and maintain TUN/TAP network interfaces";
license = "GPLv2";
};
}