Author: viric
Date: Mon Apr 9 19:54:34 2012
New Revision: 33689
URL: https://nixos.org/websvn/nix/?rev=33689&sc=1
Log:
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.
Added:
nixpkgs/trunk/pkgs/tools/misc/memtest86/plus.nix
- copied, changed from r33686,
nixpkgs/trunk/pkgs/tools/misc/memtest86/default.nix
Modified:
nixpkgs/trunk/pkgs/tools/misc/memtest86/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/tools/misc/memtest86/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/misc/memtest86/default.nix Mon Apr 9 17:56:38
2012 (r33688)
+++ nixpkgs/trunk/pkgs/tools/misc/memtest86/default.nix Mon Apr 9 19:54:34
2012 (r33689)
@@ -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 @@
'';
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";
};
}
Copied and modified: nixpkgs/trunk/pkgs/tools/misc/memtest86/plus.nix (from
r33686, nixpkgs/trunk/pkgs/tools/misc/memtest86/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/tools/misc/memtest86/default.nix Mon Apr 9 13:04:58
2012 (r33686, copy source)
+++ nixpkgs/trunk/pkgs/tools/misc/memtest86/plus.nix Mon Apr 9 19:54:34
2012 (r33689)
@@ -26,6 +26,6 @@
meta = {
homepage = http://www.memtest.org/;
- description = "A tool to detect memory errors";
+ description = "A tool to detect memory errors, fork from memtest86";
};
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Apr 9 17:56:38
2012 (r33688)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Apr 9 19:54:34
2012 (r33689)
@@ -985,6 +985,8 @@
memtest86 = callPackage ../tools/misc/memtest86 { };
+ memtest86plus = callPackage ../tools/misc/memtest86/plus.nix { };
+
mc = callPackage ../tools/misc/mc { };
mcabber = callPackage ../applications/networking/instant-messengers/mcabber
{ };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
