From d62d02793c19a3143ab6ec2164b46394724d10d6 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 18 Sep 2021 15:52:37 +0100 Subject: [PATCH 1/3] atftp: 0.7.4 -> 0.7.5 (cherry picked from commit 108423388944d94a080fc5f04f213777f78f11b1) --- pkgs/tools/networking/atftp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index 0e76cb94346..a9461244736 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atftp"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz"; - sha256 = "sha256-08nNDZcd/Hhtel9AVcNdTmaq/IECrANHPvIlvfftsmo="; + sha256 = "12h3sgkd25j4nfagil2jqyj1n8yxvaawj0cf01742642n57pmj4k"; }; nativeBuildInputs = [ makeWrapper ]; From 2bfe1df1f9ebb9f91cca8b92fc1f228dd15e2664 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 18 Sep 2021 15:52:54 +0100 Subject: [PATCH 2/3] atftp: enable tests (cherry picked from commit 70da17646624c7d24daacc644c3c870a938b2f94) --- pkgs/tools/networking/atftp/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index a9461244736..ca06afe7bdb 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }: +{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc, ps }: stdenv.mkDerivation rec { pname = "atftp"; @@ -9,13 +9,19 @@ stdenv.mkDerivation rec { sha256 = "12h3sgkd25j4nfagil2jqyj1n8yxvaawj0cf01742642n57pmj4k"; }; + # fix test script + postPatch = '' + patchShebangs . + ''; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ readline tcp_wrappers pcre gcc ]; # Expects pre-GCC5 inline semantics NIX_CFLAGS_COMPILE = "-std=gnu89"; - doCheck = false; # fails + doCheck = true; + checkInputs = [ ps ]; meta = { description = "Advanced tftp tools"; From 79cfaa09fa73866147a4a58511d6c5f36f7972a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 18 Sep 2021 18:32:31 +0200 Subject: [PATCH 3/3] phoronix-test-suite: run missing hooks: preInstall, postInstall (cherry picked from commit ef448795997dd7bde63cdb1a50413e3f0f855af6) --- pkgs/tools/misc/phoronix-test-suite/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index 971f924faaa..f0f20d4b3a7 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -13,10 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which gnused makeWrapper ]; installPhase = '' + runHook preInstall + ./install-sh $out wrapProgram $out/bin/phoronix-test-suite \ --set PHP_BIN ${php}/bin/php \ --prefix PATH : ${lib.makeBinPath [ gnumake gcc ]} + + runHook postInstall ''; passthru.tests = {