diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index b734eadae902..d9fab774b76a 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -1,15 +1,13 @@ { fetchurl, stdenv, expect, makeWrapper }: stdenv.mkDerivation rec { - name = "dejagnu-1.6"; + name = "dejagnu-1.6.1"; src = fetchurl { url = "mirror://gnu/dejagnu/${name}.tar.gz"; - sha256 = "0qypaakd2065jgpcv84zcsibl8gph3p334gb2qdmhsrbirhlmdh0"; + sha256 = "14hnq1mh91vqprc43xdy4f15sycw6fbajrh7zi6cw2kyg6xjhnxz"; }; - patches = [ ./wrapped-runtest-program-name.patch ]; - buildInputs = [ expect makeWrapper ]; doCheck = true; diff --git a/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch b/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch deleted file mode 100644 index d745bc65cbb2..000000000000 --- a/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch +++ /dev/null @@ -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 - : -