From 75c9f144d3545340c856617618eae47eabab9b2f Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 12 Feb 2021 13:02:34 +0100 Subject: [PATCH 1/5] flashbench: use fetchFromGitHub instead of fetchgit --- pkgs/os-specific/linux/flashbench/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/os-specific/linux/flashbench/default.nix index 9c14fde319df5..0d9d8e6c2489c 100644 --- a/pkgs/os-specific/linux/flashbench/default.nix +++ b/pkgs/os-specific/linux/flashbench/default.nix @@ -1,11 +1,12 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "flashbench"; version = "2012-06-06"; - src = fetchgit { - url = "https://github.com/bradfa/flashbench.git"; + src = fetchFromGitHub { + owner = "bradfa"; + repo = "flashbench"; rev = "2e30b1968a66147412f21002ea844122a0d5e2f0"; sha256 = "037rhd2alwfip9qk78cy8fwwnc2kdyzccsyc7v2zpmvl4vvpvnhg"; }; From 9fb911b2bbda4aff3bd014a869d0ae811b326bba Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 12 Feb 2021 12:59:19 +0100 Subject: [PATCH 2/5] flashbench: 2012-06-06 -> 2020-01-23 --- pkgs/os-specific/linux/flashbench/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/os-specific/linux/flashbench/default.nix index 0d9d8e6c2489c..048b41b001c3b 100644 --- a/pkgs/os-specific/linux/flashbench/default.nix +++ b/pkgs/os-specific/linux/flashbench/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "flashbench"; - version = "2012-06-06"; + version = "2020-01-23"; src = fetchFromGitHub { owner = "bradfa"; repo = "flashbench"; - rev = "2e30b1968a66147412f21002ea844122a0d5e2f0"; - sha256 = "037rhd2alwfip9qk78cy8fwwnc2kdyzccsyc7v2zpmvl4vvpvnhg"; + rev = "d783b1bd2443812c6deadc31b081f043e43e4c1a"; + sha256 = "045j1kpay6x2ikz8x54ph862ymfy1nzpbmmqpf3nkapiv32fjqw5"; }; installPhase = '' From ff76c80986799f5cb67a17d81e9a5f7f5e620dd4 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 12 Feb 2021 14:04:39 +0100 Subject: [PATCH 3/5] flashbench: clarify license gpl2 -> gpl2Only --- pkgs/os-specific/linux/flashbench/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/os-specific/linux/flashbench/default.nix index 048b41b001c3b..7c82581587b27 100644 --- a/pkgs/os-specific/linux/flashbench/default.nix +++ b/pkgs/os-specific/linux/flashbench/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "Testing tool for flash based memory devices"; homepage = "https://github.com/bradfa/flashbench"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.rycee ]; }; } From 5fe0982efcb19933bf0bd7a9c9a5042a15200d63 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 12 Feb 2021 14:39:31 +0100 Subject: [PATCH 4/5] flashbench: run preInstall and postInstall phases --- pkgs/os-specific/linux/flashbench/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/os-specific/linux/flashbench/default.nix index 7c82581587b27..27b1b397c123a 100644 --- a/pkgs/os-specific/linux/flashbench/default.nix +++ b/pkgs/os-specific/linux/flashbench/default.nix @@ -12,10 +12,14 @@ stdenv.mkDerivation { }; installPhase = '' + runHook preInstall + install -d -m755 $out/bin $out/share/doc/flashbench install -v -m755 flashbench $out/bin install -v -m755 erase $out/bin/flashbench-erase install -v -m644 README $out/share/doc/flashbench + + runHook postInstall ''; meta = with lib; { From 363581bc7f03d5bacfb974fac440d30a4b768f58 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 12 Feb 2021 19:28:07 +0100 Subject: [PATCH 5/5] flashbench: mark version as unstable --- pkgs/os-specific/linux/flashbench/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/os-specific/linux/flashbench/default.nix index 27b1b397c123a..2bba8914c2782 100644 --- a/pkgs/os-specific/linux/flashbench/default.nix +++ b/pkgs/os-specific/linux/flashbench/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "flashbench"; - version = "2020-01-23"; + version = "unstable-2020-01-23"; src = fetchFromGitHub { owner = "bradfa";