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

Merge pull request #43876 from marsam/feature/update-dejagnu-1.6.1

Browse Source 
dejagnu: 1.6 -> 1.6.1
This commit is contained in:
Frederik Rietdijk 2018-07-21 10:50:59 +02:00 committed by GitHub
commit d4086f7060
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/misc/dejagnu/default.nix
View File

@ -1,15 +1,13 @@
{ fetchurl, stdenv, expect, makeWrapper }: { fetchurl, stdenv, expect, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dejagnu-1.6"; name = "dejagnu-1.6.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/dejagnu/${name}.tar.gz"; url = "mirror://gnu/dejagnu/${name}.tar.gz";
sha256 = "0qypaakd2065jgpcv84zcsibl8gph3p334gb2qdmhsrbirhlmdh0"; sha256 = "14hnq1mh91vqprc43xdy4f15sycw6fbajrh7zi6cw2kyg6xjhnxz";
}; };
patches = [ ./wrapped-runtest-program-name.patch ];
buildInputs = [ expect makeWrapper ]; buildInputs = [ expect makeWrapper ];
doCheck = true; doCheck = true;

15
pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch
View File

@ -1,15 +0,0 @@
This patch gives `runtest' a `$0' that contains `runtest' instead
of `.runtest-wrapped'. This is required because `runtest' checks
what `$0' looks like to determine the target.
--- dejagnu-1.4.4/runtest 2003-08-17 03:27:59.000000000 +0200
+++ dejagnu-1.4.4/runtest 2010-03-18 15:57:58.000000000 +0100
@@ -10,6 +10,7 @@
# Get the execution path to this script and the current directory.
#
mypath=${0-.}
+mypath="`echo $mypath | sed -'es|\.runtest-wrapped|runtest|g'`"
if expr ${mypath} : '.*/.*' > /dev/null
then
: