diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/tools/misc/memtest86+/default.nix | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/memtest86+/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/memtest86+/default.nix | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/tools/misc/memtest86+/default.nix b/nixpkgs/pkgs/tools/misc/memtest86+/default.nix index 0db6f9f72872..95985eb29956 100644 --- a/nixpkgs/pkgs/tools/misc/memtest86+/default.nix +++ b/nixpkgs/pkgs/tools/misc/memtest86+/default.nix @@ -1,25 +1,29 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "memtest86+"; - version = "5.01-coreboot-002"; + version = "6.00-beta2"; - src = fetchgit { - url = "https://review.coreboot.org/memtest86plus.git"; - rev = "v002"; - sha256 = "0cwx20yja24bfknqh1rjb5rl2c0kwnppzsisg1dibbak0l8mxchk"; + src = fetchFromGitHub { + owner = "memtest86plus"; + repo = "memtest86plus"; + rev = "v${finalAttrs.version}"; + hash = "sha256-U3++iJa0Zj3g2SZTJ0jom7raAu+LGqiOKZEputs/YfM="; }; - NIX_CFLAGS_COMPILE = "-I. -std=gnu90"; + # Binaries are booted directly by BIOS/UEFI or bootloader + # and should not be patched/stripped + dontPatchELF = true; + dontStrip = true; - hardeningDisable = [ "all" ]; + passthru.efi = "${finalAttrs.finalPackage}/memtest.efi"; - buildFlags = [ "memtest.bin" ]; - - doCheck = false; # fails + preBuild = '' + cd ${if stdenv.isi686 then "build32" else "build64"} + ''; installPhase = '' - install -Dm0444 -t $out/ memtest.bin + install -Dm0444 -t $out/ memtest.bin memtest.efi ''; meta = { @@ -27,5 +31,6 @@ stdenv.mkDerivation { description = "A tool to detect memory errors"; license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ lib.maintainers.LunNova ]; }; -} +}) |