Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 195a9b51bab1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 27a6b2613aa0
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 5, 2019

  1. memtest86-efi: 8.0 -> 8.1 

    Update memtest86-efi from version 8.0 to 8.1.

This also reworks the derivation to have less dependencies.
    @cdepillabout
    cdepillabout committed Oct 5, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    be9b61f View commit details

  2. Merge pull request #70454 from cdepillabout/memtest86-efi-8.1 

    memtest86-efi: 8.0 -> 8.1
    @mmahut
    mmahut authored Oct 5, 2019
    Copy the full SHA
    27a6b26 View commit details
Showing with 23 additions and 21 deletions.
  1. +23 −21 pkgs/tools/misc/memtest86-efi/default.nix
44 changes: 23 additions & 21 deletions pkgs/tools/misc/memtest86-efi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,44 @@
{ lib, stdenv, fetchurl, unzip, libguestfs-with-appliance }:
{ fetchzip, lib, p7zip, stdenv }:

stdenv.mkDerivation rec {
pname = "memtest86-efi";
version = "8.0";
version = "8.1";

src = fetchurl {
# TODO: The latest version of memtest86 is actually 8.1, but apparently the
# company has stopped distributing versioned binaries of memtest86:
src = fetchzip {
# TODO: The latest version of memtest86 is actually 8.2, but the
# company developing memtest86 has stopped providing a versioned download
# link for the latest version:
#
# https://www.passmark.com/forum/memtest86/44494-version-8-1-distribution-file-is-not-versioned?p=44505#post44505
# However, it does look like redistribution is okay, so if we had
# somewhere to host binaries that we make sure to version, then we could
# probably keep up with the latest versions released by the company.
#
# However, versioned links for the previous version are available, so that
# is what is being used.
#
# It does look like redistribution is okay, so if we had somewhere to host
# binaries that we make sure to version, then we could probably keep up
# with the latest versions released by the company.
url = "https://www.memtest86.com/downloads/memtest86-${version}-usb.zip";
sha256 = "147mnd7fnx2wvbzscw7pkg9ljiczhz05nb0cjpmww49a0ms4yknw";
sha256 = "0qiyd8ymn307shmvwmqd80q3svxf49133d2pf84qpdlcmjjfnhgg";
stripRoot = false;
};

nativeBuildInputs = [ libguestfs-with-appliance unzip ];

unpackPhase = ''
unzip -q $src -d .
'';
nativeBuildInputs = [ p7zip ];

installPhase = ''
mkdir -p $out
# memtest86 is distributed as a bootable USB image. It contains the actual
# memtest86 EFI app.
#
# The following command uses libguestfs to extract the actual EFI app from the
# usb image so that it can be installed directly on the hard drive. This creates
# the ./BOOT/ directory with the memtest86 EFI app.
guestfish --ro --add ./memtest86-usb.img --mount /dev/sda1:/ copy-out /EFI/BOOT .
cp -r BOOT/* $out/
# The following command uses p7zip to extract the actual EFI app from the
# usb image so that it can be installed directly on the hard drive.
7z x -o$TEMP/temp-efi-dirs $src/memtest86-usb.img
7z x -o$TEMP/memtest86-files $TEMP/temp-efi-dirs/EFI\ System\ Partition.img
cp -r $TEMP/memtest86-files/EFI/BOOT/* $out/
'';

meta = with lib; {
homepage = http://memtest86.com/;
homepage = "http://memtest86.com/";
downloadPage = "https://www.memtest86.com/download.htm";
description = "A tool to detect memory errors, to be run from a bootloader";
longDescription = ''