diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-04-09 19:54:34 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-04-09 19:54:34 +0000 |
commit | 0684ca8745e05db787f4046e80329ed9718fc88c (patch) | |
tree | 9e6b54ccfee44f0b460fc6d98fe71c4bb6007d6c | |
parent | d4913759da0e863c4e136190dfed7fe39d2fb240 (diff) | |
download | nixlib-0684ca8745e05db787f4046e80329ed9718fc88c.tar nixlib-0684ca8745e05db787f4046e80329ed9718fc88c.tar.gz nixlib-0684ca8745e05db787f4046e80329ed9718fc88c.tar.bz2 nixlib-0684ca8745e05db787f4046e80329ed9718fc88c.tar.lz nixlib-0684ca8745e05db787f4046e80329ed9718fc88c.tar.xz nixlib-0684ca8745e05db787f4046e80329ed9718fc88c.tar.zst nixlib-0684ca8745e05db787f4046e80329ed9718fc88c.zip |
Adding the memtest86 from memtest86.com, and renaming the top-level attribute
name of memtest86+ to memtest86plus. I think it makes more sense for the attribute memtest86 to point to the upstream memtest86.com version. svn path=/nixpkgs/trunk/; revision=33689
-rw-r--r-- | pkgs/tools/misc/memtest86/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/misc/memtest86/plus.nix | 31 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 38 insertions, 5 deletions
diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 633d08e4c666..35395fc116f4 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "memtest86+-4.20"; + name = "memtest86-4.0a"; src = fetchurl { - url = http://www.memtest.org/download/4.20/memtest86+-4.20.tar.gz; - sha256 = "0dw7kvfxiwqdmhapbz6ds1j9fralbky56hnzj4c6fsqfinbwwc2n"; + url = http://memtest86.com/memtest86-4.0a.tar.gz; + sha256 = "0d2n3nzyvna9k880zk6vl1z3b7wal1hrwcqay9vda8br7yp7634y"; }; preBuild = '' @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.memtest.org/; - description = "A tool to detect memory errors"; + homepage = http://memtest86.com/; + description = "A tool to detect memory errors, to be run from a bootloader"; }; } diff --git a/pkgs/tools/misc/memtest86/plus.nix b/pkgs/tools/misc/memtest86/plus.nix new file mode 100644 index 000000000000..262811d330d6 --- /dev/null +++ b/pkgs/tools/misc/memtest86/plus.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "memtest86+-4.20"; + + src = fetchurl { + url = http://www.memtest.org/download/4.20/memtest86+-4.20.tar.gz; + sha256 = "0dw7kvfxiwqdmhapbz6ds1j9fralbky56hnzj4c6fsqfinbwwc2n"; + }; + + preBuild = '' + # Really dirty hack to get Memtest to build without needing a Glibc + # with 32-bit libraries and headers. + if test "$system" = x86_64-linux; then + mkdir gnu + touch gnu/stubs-32.h + fi + ''; + + NIX_CFLAGS_COMPILE = "-I."; + + installPhase = '' + mkdir -p $out + cp memtest.bin $out/ + ''; + + meta = { + homepage = http://www.memtest.org/; + description = "A tool to detect memory errors, fork from memtest86"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7c4ca2ceee0..f8f780c35eb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -985,6 +985,8 @@ let memtest86 = callPackage ../tools/misc/memtest86 { }; + memtest86plus = callPackage ../tools/misc/memtest86/plus.nix { }; + mc = callPackage ../tools/misc/mc { }; mcabber = callPackage ../applications/networking/instant-messengers/mcabber { }; |