public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge release-21.05 into staging-next-21.05

This commit is contained in:
github-actions[bot] 2021-09-19 12:02:02 +00:00 committed by GitHub
parent 6c5cbd1e21 79cfaa09fa
commit 2f30c1dada
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/misc/phoronix-test-suite/default.nix
View File

@ -13,10 +13,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ which gnused makeWrapper ]; nativeBuildInputs = [ which gnused makeWrapper ];
installPhase = '' installPhase = ''
runHook preInstall
./install-sh $out ./install-sh $out
wrapProgram $out/bin/phoronix-test-suite \ wrapProgram $out/bin/phoronix-test-suite \
--set PHP_BIN ${php}/bin/php \ --set PHP_BIN ${php}/bin/php \
--prefix PATH : ${lib.makeBinPath [ gnumake gcc ]} --prefix PATH : ${lib.makeBinPath [ gnumake gcc ]}
runHook postInstall
''; '';
passthru.tests = { passthru.tests = {

14
pkgs/tools/networking/atftp/default.nix
View File

@ -1,21 +1,27 @@
{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }: { lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc, ps }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "atftp"; pname = "atftp";
version = "0.7.4"; version = "0.7.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz";
sha256 = "sha256-08nNDZcd/Hhtel9AVcNdTmaq/IECrANHPvIlvfftsmo="; sha256 = "12h3sgkd25j4nfagil2jqyj1n8yxvaawj0cf01742642n57pmj4k";
}; };
# fix test script
postPatch = ''
patchShebangs .
'';
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ readline tcp_wrappers pcre gcc ]; buildInputs = [ readline tcp_wrappers pcre gcc ];
# Expects pre-GCC5 inline semantics # Expects pre-GCC5 inline semantics
NIX_CFLAGS_COMPILE = "-std=gnu89"; NIX_CFLAGS_COMPILE = "-std=gnu89";
doCheck = false; # fails doCheck = true;
checkInputs = [ ps ];
meta = { meta = {
description = "Advanced tftp tools"; description = "Advanced tftp tools";