diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-11-18 09:39:59 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-11-18 09:39:59 +0000 |
commit | 7f5b839524cad9211699c68ea02d11c1758a800b (patch) | |
tree | ed963d727a8e719d2e1eae8ed31454d59ba2aba3 /pkgs/os-specific | |
parent | 52e9488541dc9e207d853ce2aa31d0e453c34767 (diff) | |
download | nixlib-7f5b839524cad9211699c68ea02d11c1758a800b.tar nixlib-7f5b839524cad9211699c68ea02d11c1758a800b.tar.gz nixlib-7f5b839524cad9211699c68ea02d11c1758a800b.tar.bz2 nixlib-7f5b839524cad9211699c68ea02d11c1758a800b.tar.lz nixlib-7f5b839524cad9211699c68ea02d11c1758a800b.tar.xz nixlib-7f5b839524cad9211699c68ea02d11c1758a800b.tar.zst nixlib-7f5b839524cad9211699c68ea02d11c1758a800b.zip |
* Removed selectVersion. There's no good reason to write
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'. * Replaced `with args' with formal function arguments in several packages. * Renamed several files to `default.nix'. As a general rule, version numbers should only be included in the filename when there is a reason to keep multiple versions of a package in Nixpkgs. Otherwise, it just makes it harder to update the package. svn path=/nixpkgs/trunk/; revision=18403
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/atheros/0.9.4.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/jfsrec/default.nix | 22 | ||||
-rw-r--r-- | pkgs/os-specific/linux/jfsrec/svn-7.nix | 23 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kqemu/1.4.0pre1.nix | 39 |
4 files changed, 38 insertions, 48 deletions
diff --git a/pkgs/os-specific/linux/atheros/0.9.4.nix b/pkgs/os-specific/linux/atheros/0.9.4.nix index c2d39072750d..780e19757b29 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-"+version; + name = "atheros-0.9.4"; builder = writeScript (name + "-builder") (textClosure localDefs [doMakeInstall postInstall doForceShare doPropagate]); diff --git a/pkgs/os-specific/linux/jfsrec/default.nix b/pkgs/os-specific/linux/jfsrec/default.nix new file mode 100644 index 000000000000..a805e86f0dd6 --- /dev/null +++ b/pkgs/os-specific/linux/jfsrec/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, boost }: + +stdenv.mkDerivation { + name = "jfsrec-pre-svn-7"; + + src = fetchurl { + url = http://downloads.sourceforge.net/jfsrec/jfsrec-svn-7.tar.gz; + sha256 = "163z6ljr05vw2k5mj4fim2nlg4khjyibrii95370pvn474mg28vg"; + }; + + buildInputs = [ boost ]; + + preConfigure = + '' + sed -e '/[#]include [<]config.h[>]/a\#include <string.h>' -i src/unicode_to_utf8.cpp + cat src/unicode_to_utf8.cpp + ''; + + meta = { + description = "JFS recovery tool"; + }; +} diff --git a/pkgs/os-specific/linux/jfsrec/svn-7.nix b/pkgs/os-specific/linux/jfsrec/svn-7.nix deleted file mode 100644 index 2516a505848a..000000000000 --- a/pkgs/os-specific/linux/jfsrec/svn-7.nix +++ /dev/null @@ -1,23 +0,0 @@ -args : with args; -rec { - src = fetchurl { - url = http://downloads.sourceforge.net/jfsrec/jfsrec-svn-7.tar.gz; - sha256 = "163z6ljr05vw2k5mj4fim2nlg4khjyibrii95370pvn474mg28vg"; - }; - - buildInputs = [boost]; - configureFlags = []; - - doFixInc = fullDepEntry ('' - sed -e '/[#]include [<]config.h[>]/a\#include <string.h>' -i src/unicode_to_utf8.cpp - cat src/unicode_to_utf8.cpp - '') ["minInit" "doUnpack"]; - - /* doConfigure should be specified separately */ - phaseNames = ["doFixInc" "doConfigure" "doMakeInstall"]; - - name = "jfsrec-" + version; - meta = { - description = "JFS recovery tool"; - }; -} diff --git a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix b/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix index 75d7483e33b9..ba5cf2e1d0f0 100644 --- a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix +++ b/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix @@ -1,37 +1,28 @@ -args : with args; -rec { - name = "kqemu-"+version; +{ stdenv, fetchurl, kernel, perl }: + +stdenv.mkDerivation rec { + name = "kqemu-1.4.0pre1"; + src = fetchurl { - url = http://www.nongnu.org/qemu/kqemu-1.4.0pre1.tar.gz; + url = "http://www.nongnu.org/qemu/${name}.tar.gz"; sha256 = "14dlmawn3gia1j401ag5si5k1a1vav7jpv86rl37p1hwmr7fihxs"; }; buildInputs = [perl]; + configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'']; - debugStep = fullDepEntry ('' - cat config-host.mak - '') ["minInit"]; - 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/kern 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"]; - 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"; }; } |