From b23126fcc3bca0072f68b576178aee263182ba71 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Feb 2012 14:32:28 +0000 Subject: * Include the kernel version in kernel-specific packages so that they can be distinguished in nix-env -qa output. svn path=/nixpkgs/trunk/; revision=32352 --- pkgs/os-specific/linux/acpi-call/default.nix | 13 +++++---- pkgs/os-specific/linux/atheros/0.9.4.nix | 2 +- pkgs/os-specific/linux/ati-drivers/default.nix | 25 ++++++++-------- pkgs/os-specific/linux/bbswitch/default.nix | 6 ++-- pkgs/os-specific/linux/broadcom-sta/default.nix | 3 +- pkgs/os-specific/linux/e1000e/default.nix | 2 +- pkgs/os-specific/linux/exmap/default.nix | 2 +- pkgs/os-specific/linux/frandom/default.nix | 4 +-- pkgs/os-specific/linux/iscsitarget/default.nix | 10 ++++--- pkgs/os-specific/linux/klibc/default.nix | 13 ++------- pkgs/os-specific/linux/kqemu/1.3.0pre11.nix | 38 ------------------------- pkgs/os-specific/linux/kqemu/1.4.0pre1.nix | 30 ------------------- pkgs/os-specific/linux/kqemu/default.nix | 28 ++++++++++++++++++ pkgs/os-specific/linux/ndiswrapper/default.nix | 2 +- pkgs/os-specific/linux/open-iscsi/default.nix | 9 +++--- pkgs/os-specific/linux/v86d/default.nix | 2 +- 16 files changed, 73 insertions(+), 116 deletions(-) delete mode 100644 pkgs/os-specific/linux/kqemu/1.3.0pre11.nix delete mode 100644 pkgs/os-specific/linux/kqemu/1.4.0pre1.nix create mode 100644 pkgs/os-specific/linux/kqemu/default.nix (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 1a9b3cbf74d..d7c9e2c3695 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -1,13 +1,14 @@ -{stdenv, fetchgit, kernel, ...}: +{ stdenv, fetchgit, kernel }: stdenv.mkDerivation { + name = "acpi-call-${kernel.version}"; + src = fetchgit { - url="git://github.com/mkottman/acpi_call.git"; - rev="4f71ce83392bc52b3497"; - sha256="1f20516dc7d42bc7d9d71eaa54f48f38cd56b8683062f81d6f3857990056bdd3"; + url = "git://github.com/mkottman/acpi_call.git"; + rev = "4f71ce83392bc52b3497"; + sha256 = "1f20516dc7d42bc7d9d71eaa54f48f38cd56b8683062f81d6f3857990056bdd3"; }; - name = "acpi-call"; - + preBuild = '' kernelVersion=$(cd ${kernel}/lib/modules && ls) sed -e 's/break/true/' -i test_off.sh diff --git a/pkgs/os-specific/linux/atheros/0.9.4.nix b/pkgs/os-specific/linux/atheros/0.9.4.nix index b139867be60..87470da9649 100644 --- a/pkgs/os-specific/linux/atheros/0.9.4.nix +++ b/pkgs/os-specific/linux/atheros/0.9.4.nix @@ -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]); diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 248e24c90bd..703895b4f34 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -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" diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index d64701a1d07..502d24d32d8 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -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 { diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 48ab458d402..e03e4a5cda4 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -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" diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix index b4d92158054..709befd9dc5 100644 --- a/pkgs/os-specific/linux/e1000e/default.nix +++ b/pkgs/os-specific/linux/e1000e/default.nix @@ -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"; diff --git a/pkgs/os-specific/linux/exmap/default.nix b/pkgs/os-specific/linux/exmap/default.nix index da5e00e3377..4f9f85e648a 100644 --- a/pkgs/os-specific/linux/exmap/default.nix +++ b/pkgs/os-specific/linux/exmap/default.nix @@ -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"; diff --git a/pkgs/os-specific/linux/frandom/default.nix b/pkgs/os-specific/linux/frandom/default.nix index 9f07e7c8eb0..fb2c50a778d 100644 --- a/pkgs/os-specific/linux/frandom/default.nix +++ b/pkgs/os-specific/linux/frandom/default.nix @@ -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 ]; diff --git a/pkgs/os-specific/linux/iscsitarget/default.nix b/pkgs/os-specific/linux/iscsitarget/default.nix index 03d01db2785..214fae01cfc 100644 --- a/pkgs/os-specific/linux/iscsitarget/default.nix +++ b/pkgs/os-specific/linux/iscsitarget/default.nix @@ -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; }; } diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index e1b8c0d2836..e1f347af23c 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -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"; diff --git a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix deleted file mode 100644 index d9dc076d92f..00000000000 --- a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix +++ /dev/null @@ -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 ' -i kqemu-linux.c - '') ["minInit" "doUnpack"]; - fixInc = { - text = '' - sed -e '/#include/i#include ' -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"; - }; -} diff --git a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix b/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix deleted file mode 100644 index a24e65b378f..00000000000 --- a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, kernel, perl, fullDepEntry, ... }: - -stdenv.mkDerivation rec { - name = "kqemu-1.4.0pre1"; - - src = fetchurl { - url = "http://www.nongnu.org/qemu/${name}.tar.gz"; - sha256 = "14dlmawn3gia1j401ag5si5k1a1vav7jpv86rl37p1hwmr7fihxs"; - }; - - buildInputs = [perl]; - - configureFlags = [''--PREFIX=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'']; - - preConfigure = fullDepEntry ('' - sed -e '/#include/i#include ' -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 - 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 - '') ["minInit" "doUnpack"]; - - phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; - - meta = { - description = "Kernel module for Qemu acceleration"; - }; -} diff --git a/pkgs/os-specific/linux/kqemu/default.nix b/pkgs/os-specific/linux/kqemu/default.nix new file mode 100644 index 00000000000..c703ca4e4a4 --- /dev/null +++ b/pkgs/os-specific/linux/kqemu/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, kernel, perl }: + +stdenv.mkDerivation rec { + name = "kqemu-1.4.0pre1-${kernel.version}"; + + src = fetchurl { + url = "http://www.nongnu.org/qemu/${name}.tar.gz"; + sha256 = "14dlmawn3gia1j401ag5si5k1a1vav7jpv86rl37p1hwmr7fihxs"; + }; + + buildInputs = [ perl ]; + + configureFlags = [ ''--PREFIX=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'' ]; + + preConfigure = '' + sed -e '/#include/i#include ' -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 + 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 + ''; + + meta = { + description = "Kernel module for QEMU acceleration"; + }; +} diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix index 75ff3fba3c6..c41649e0285 100644 --- a/pkgs/os-specific/linux/ndiswrapper/default.nix +++ b/pkgs/os-specific/linux/ndiswrapper/default.nix @@ -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; diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 80703990778..eccdde30b13 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -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; }; } diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index c8924f91c57..aedfe9ac686 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -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"; -- cgit 1.4.1