b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

* Include the kernel version in kernel-specific packages so that they

Browse source 
can be distinguished in nix-env -qa output.

svn path=/nixpkgs/trunk/; revision=32352
This commit is contained in:
Eelco Dolstra 2012-02-17 14:32:28 +00:00
parent d27f8787f7
commit b23126fcc3
17 changed files with 55 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/tools/profiling/systemtap/default.nix
View file

@ -3,7 +3,7 @@
, gtkmm, libglademm, boost, perl, sqlite }:
stdenv.mkDerivation rec {
name = "systemtap-1.2";
name = "systemtap-1.2-${linux.version}";
src = fetchurl {
url = "http://sources.redhat.com/systemtap/ftp/releases/${name}.tar.gz";

15
pkgs/os-specific/linux/acpi-call/default.nix
View file

@ -1,13 +1,14 @@
{stdenv, fetchgit, kernel, ...}:
{ stdenv, fetchgit, kernel }:
stdenv.mkDerivation {
src = fetchgit {
url="git://github.com/mkottman/acpi_call.git";
rev="4f71ce83392bc52b3497";
sha256="1f20516dc7d42bc7d9d71eaa54f48f38cd56b8683062f81d6f3857990056bdd3";
};
name = "acpi-call";
name = "acpi-call-${kernel.version}";
src = fetchgit {
url = "git://github.com/mkottman/acpi_call.git";
rev = "4f71ce83392bc52b3497";
sha256 = "1f20516dc7d42bc7d9d71eaa54f48f38cd56b8683062f81d6f3857990056bdd3";
};
preBuild = ''
kernelVersion=$(cd ${kernel}/lib/modules && ls)
sed -e 's/break/true/' -i test_off.sh

2
pkgs/os-specific/linux/atheros/0.9.4.nix
View file

@ -17,7 +17,7 @@ postInstall = fullDepEntry (''
'') [minInit doMakeInstall];
in
stdenv.mkDerivation rec {
name = "atheros-0.9.4";
name = "atheros-0.9.4-${kernel.version}";
builder = writeScript (name + "-builder")
(textClosure localDefs [doMakeInstall
postInstall doForceShare doPropagate]);

25
pkgs/os-specific/linux/ati-drivers/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl , kernel, xlibs, which, imake
{ stdenv, fetchurl, kernel, xlibs, which, imake
, mesa # for fgl_glxgears
, libXxf86vm, xf86vidmodeproto # for fglrx_gamma
, xorg, makeWrapper, glibc, patchelf
@ -14,33 +14,32 @@
# The gentoo ebuild contains much more magic..
let lib = stdenv.lib;
inherit (lib) concatStringsSep;
in
# http://wiki.cchtml.com/index.php/Main_Page
assert stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
name = "ati-drivers-${version}";
name = "ati-drivers-${version}-${kernel.version}";
version = "10-11-x86";
builder = ./builder.sh;
inherit libXxf86vm xf86vidmodeproto;
src =
assert stdenv.system == "x86_64-linux";
fetchurl {
src = fetchurl {
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
xlibs.libXrandr which imake makeWrapper
patchelf
];
buildInputs =
[ xlibs.libXext xlibs.libX11
xlibs.libXrandr which imake makeWrapper
patchelf
];
inherit kernel glibc /* glibc only used for setting interpreter */;
LD_LIBRARY_PATH = concatStringsSep ":"
LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":"
[ "${xorg.libXrandr}/lib"
"${xorg.libXrender}/lib"
"${xorg.libXext}/lib"

6
pkgs/os-specific/linux/bbswitch/default.nix
View file

@ -3,9 +3,11 @@
let
version = "0.4.1";
name = "bbswitch-${version}";
name = "bbswitch-${version}-${kernel.version}";
in stdenv.mkDerivation {
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {

3
pkgs/os-specific/linux/broadcom-sta/default.nix
View file

@ -6,7 +6,8 @@ let version = "5_100_82_112";
in
stdenv.mkDerivation {
name = "broadcom-sta-${version}";
name = "broadcom-sta-${version}-${kernel.version}";
src = fetchurl {
url = "http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_${bits}-v${version}.tar.gz";
sha256 = if bits == "32"

2
pkgs/os-specific/linux/e1000e/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, kernel }:
stdenv.mkDerivation {
name = "e1000e-1.5.1";
name = "e1000e-1.5.1-${kernel.version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/e1000/e1000e-1.5.1.tar.gz";

2
pkgs/os-specific/linux/exmap/default.nix
View file

@ -1,7 +1,7 @@
{ fetchurl, stdenv, kernel, pkgconfig, gtkmm, boost, pcre }:
stdenv.mkDerivation rec {
name = "exmap-0.10";
name = "exmap-0.10-${kernel.version}";
src = fetchurl {
url = "http://www.berthels.co.uk/exmap/download/${name}.tgz";

4
pkgs/os-specific/linux/frandom/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, kernel }:
stdenv.mkDerivation rec {
name = "frandom-1.1";
name = "frandom-1.1-${kernel.version}";
src = fetchurl {
url = "http://sourceforge.net/projects/frandom/files/${name}.tar.gz";
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
buildInputs = [];
meta = {
description = "A very fast random number generator kernel module.";
description = "A very fast random number generator kernel module";
homepage = http://frandom.sourceforge.net/;
license = "GPLv2";
maintainers = [ stdenv.lib.maintainers.bluescreen303 ];

10
pkgs/os-specific/linux/iscsitarget/default.nix
View file

@ -1,14 +1,16 @@
{ stdenv, fetchurl, kernel, module_init_tools}:
stdenv.mkDerivation rec {
name = "iscsitarget-1.4.20.2";
name = "iscsitarget-1.4.20.2-${kernel.version}";
src = fetchurl {
url = "mirror://sourceforge/iscsitarget/iscsitarget/1.4.20.2/${name}.tar.gz";
sha256 = "126kp0yc7vmvdbaw2xfav89340b0h91dvvyib5qbvyrq40n8wg0g";
};
KSRC = "${kernel}/lib/modules/*/build";
DESTDIR="$(out)";
DESTDIR = "$(out)";
preConfigure = ''
export PATH=$PATH:${module_init_tools}/sbin
@ -18,8 +20,8 @@ stdenv.mkDerivation rec {
buildInputs = [ module_init_tools ];
meta = {
description = "iSCSI Enterprise Target (IET) software is for building an iSCSI storage system on Linux.";
description = "iSCSI Enterprise Target (IET), software for building an iSCSI storage system on Linux";
license = "GPLv2+";
homepage = http://iscsitarget.sourceforge.net ;
homepage = http://iscsitarget.sourceforge.net;
};
}

13
pkgs/os-specific/linux/klibc/default.nix
View file

@ -1,13 +1,4 @@
{
stdenv,
fetchurl,
perl,
bison,
mktemp,
linuxHeaders,
linuxHeadersCross,
kernel ? null
}:
{ stdenv, fetchurl, perl, bison, mktemp, linuxHeaders, linuxHeadersCross, kernel ? null }:
assert stdenv.isLinux;
@ -17,7 +8,7 @@ let
in
stdenv.mkDerivation {
name = "klibc-${version}";
name = "klibc-${version}${stdenv.lib.optionalString (kernel != null) "-${kernel.version}"}";
src = fetchurl {
url = "http://ftp.eu.openbsd.org/pub/linux/libs/klibc/1.5/klibc-${version}.tar.bz2";

38
pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
View file

@ -1,38 +0,0 @@
args : with args;
rec {
name = "kqemu-"+version;
src = fetchurl {
url = http://www.nongnu.org/qemu/kqemu-1.3.0pre11.tar.gz;
sha256 = "03svg2x52ziglf9r9irf6ziiz8iwa731fk1mdskwdip5jxbyy6jl";
};
buildInputs = [];
configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)''];
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
sed -e '/linux\/ioctl.h/a#include <linux\/sched.h>' -i kqemu-linux.c
'') ["minInit" "doUnpack"];
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";
};
}

16
pkgs/os-specific/linux/kqemu/1.4.0pre1.nix → pkgs/os-specific/linux/kqemu/default.nix
View file

@ -1,18 +1,18 @@
{ stdenv, fetchurl, kernel, perl, fullDepEntry, ... }:
{ stdenv, fetchurl, kernel, perl }:
stdenv.mkDerivation rec {
name = "kqemu-1.4.0pre1";
name = "kqemu-1.4.0pre1-${kernel.version}";
src = fetchurl {
url = "http://www.nongnu.org/qemu/${name}.tar.gz";
sha256 = "14dlmawn3gia1j401ag5si5k1a1vav7jpv86rl37p1hwmr7fihxs";
};
buildInputs = [perl];
buildInputs = [ perl ];
configureFlags = [''--PREFIX=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)''];
configureFlags = [ ''--PREFIX=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'' ];
preConfigure = fullDepEntry (''
preConfigure = ''
sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c
sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c
@ -20,11 +20,9 @@ stdenv.mkDerivation rec {
sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh
sed -e '/depmod/d' -i install.sh
cat install.sh
'') ["minInit" "doUnpack"];
'';
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
meta = {
description = "Kernel module for Qemu acceleration";
description = "Kernel module for QEMU acceleration";
};
}

2
pkgs/os-specific/linux/ndiswrapper/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, kernel, perl }:
stdenv.mkDerivation {
name = "ndiswrapper-1.56-stable";
name = "ndiswrapper-1.56-${kernel.version}";
# need at least .config and include
inherit kernel;

9
pkgs/os-specific/linux/open-iscsi/default.nix
View file

@ -1,14 +1,15 @@
{ stdenv, fetchurl, kernel}:
stdenv.mkDerivation rec {
name = "open-iscsi-2.0-871";
name = "open-iscsi-2.0-871-${kernel.version}";
src = fetchurl {
url = "http://www.open-iscsi.org/bits/${name}.tar.gz";
sha256 = "1jvx1agybaj4czhz41bz37as076spicsmlh5pjksvwl2mr38gsmw";
};
KSRC = "${kernel}/lib/modules/*/build";
DESTDIR="$(out)";
DESTDIR = "$(out)";
preConfigure = ''
sed -i 's|/usr/|/|' Makefile
@ -17,8 +18,8 @@ stdenv.mkDerivation rec {
patches = [./kernel.patch];
meta = {
description = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720.";
description = "A high performance, transport independent, multi-platform implementation of RFC3720";
license = "GPLv2+";
homepage = http://www.open-iscsi.org ;
homepage = http://www.open-iscsi.org;
};
}

2
pkgs/os-specific/linux/v86d/default.nix
View file

@ -1,7 +1,7 @@
{stdenv, fetchurl, klibc, kernel, withKlibc ? true}:
stdenv.mkDerivation rec {
name = "v86d-0.1.10";
name = "v86d-0.1.10-${kernel.version}";
src = fetchurl {
url = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/${name}.tar.bz2";

4
pkgs/top-level/all-packages.nix
View file

@ -5893,9 +5893,7 @@ let
wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { };
kqemu = builderDefsPackage ../os-specific/linux/kqemu/1.4.0pre1.nix {
inherit kernel perl;
};
kqemu = callPackage ../os-specific/linux/kqemu { };
klibc = callPackage ../os-specific/linux/klibc {
linuxHeaders = glibc.kernelHeaders;