rcs: 5.9.4 -> 5.10.0 (#112014)
This commit is contained in:
parent
34673e7f24
commit
8bae808a21
|
@ -1,55 +1,21 @@
|
||||||
{ lib, stdenv, fetchurl, fetchpatch, ed }:
|
{ lib, stdenv, fetchurl, fetchpatch, buildPackages, diffutils, ed }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "rcs-5.9.4";
|
pname = "rcs";
|
||||||
|
version = "5.10.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnu/rcs/${name}.tar.xz";
|
url = "mirror://gnu/rcs/${pname}-${version}.tar.xz";
|
||||||
sha256 = "1zsx7bb0rgvvvisiy4zlixf56ay8wbd9qqqcp1a1g0m1gl6mlg86";
|
sha256 = "sha256-Og2flYx60wPkdehjRlSXTtvm3rOkVEkfOFfcGIm6xcU";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ ed ];
|
ac_cv_path_ED = "${ed}/bin/ed";
|
||||||
|
DIFF = "${diffutils}/bin/diff";
|
||||||
|
DIFF3 = "${diffutils}/bin/diff3";
|
||||||
|
|
||||||
patches = lib.optionals stdenv.isDarwin [
|
disallowedReferences =
|
||||||
# This failure appears unrelated to the subject of the test. This
|
lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform)
|
||||||
# test seems to rely on a bash bug where `test $x -nt $y` ignores
|
[ buildPackages.diffutils buildPackages.ed ];
|
||||||
# subsecond values in timetamps. This bug has been fixed in Bash
|
|
||||||
# 5, and seemingly doesn't affect Darwin.
|
|
||||||
./disable-t810.patch
|
|
||||||
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://raw.githubusercontent.com/macports/macports-ports/b76d1e48dac/editors/nano/files/secure_snprintf.patch";
|
|
||||||
extraPrefix = "";
|
|
||||||
sha256 = "1wy9pjw3vvp8fv8a7pmkqmiapgacfx54qj9fvsc5gwry0vv7vnc3";
|
|
||||||
})
|
|
||||||
|
|
||||||
# Expected to appear in the next release
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3fff7c990b8df4174045834b9c1210e7736ff5a4/rcs/noreturn.patch";
|
|
||||||
sha256 = "10zniqrd6xagf3q03i1vksl0vd9nla3qcj0840n3m8z6jd4aypcx";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
doCheck = true;
|
|
||||||
|
|
||||||
checkFlags = [ "VERBOSE=1" ];
|
|
||||||
|
|
||||||
checkPhase = ''
|
|
||||||
# If neither LOGNAME or USER are set, rcs will default to
|
|
||||||
# getlogin(), which is unreliable on macOS. It will often return
|
|
||||||
# things like `_spotlight`, or `_mbsetupuser`. macOS sets both
|
|
||||||
# environment variables in user sessions, so this is unlikely to
|
|
||||||
# affect regular usage.
|
|
||||||
|
|
||||||
export LOGNAME=$(id -un)
|
|
||||||
|
|
||||||
print_logs_and_fail() {
|
|
||||||
grep -nH -e . -r tests/*.d/{out,err}
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
make $checkFlags check || print_logs_and_fail
|
|
||||||
'';
|
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-std=c99";
|
NIX_CFLAGS_COMPILE = "-std=c99";
|
||||||
|
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
--- rcs-5.9.4-orig/tests/Makefile.in 2015-01-22 19:40:36.000000000 +0900
|
|
||||||
+++ rcs-5.9.4/tests/Makefile.in 2019-04-16 20:04:30.557626000 +0900
|
|
||||||
@@ -1372,7 +1372,6 @@
|
|
||||||
t803 \
|
|
||||||
t804 \
|
|
||||||
t805 \
|
|
||||||
- t810 \
|
|
||||||
t900 \
|
|
||||||
t999
|
|
||||||
|
|
Loading…
Reference in a new issue