Merge master into staging-next

3 files changed, 12 insertions, 56 deletions

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 53ac8a0d1a0..2db4b4ed7bd 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation {
     ++ lib.optionals withLibsecret [ pkg-config glib libsecret ];
 
   # required to support pthread_cancel()
-  NIX_LDFLAGS = lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
+  NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s"
               + lib.optionalString (stdenv.isFreeBSD) "-lthr";
 
   configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix
index f8143711318..d814e0ca0a5 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@@ -1,55 +1,21 @@
-{ lib, stdenv, fetchurl, fetchpatch, ed }:
+{ lib, stdenv, fetchurl, fetchpatch, buildPackages, diffutils, ed }:
 
 stdenv.mkDerivation rec {
-  name = "rcs-5.9.4";
+  pname = "rcs";
+  version = "5.10.0";
 
   src = fetchurl {
-    url = "mirror://gnu/rcs/${name}.tar.xz";
-    sha256 = "1zsx7bb0rgvvvisiy4zlixf56ay8wbd9qqqcp1a1g0m1gl6mlg86";
+    url = "mirror://gnu/rcs/${pname}-${version}.tar.xz";
+    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 [
-    # This failure appears unrelated to the subject of the test. This
-    # test seems to rely on a bash bug where `test $x -nt $y` ignores
-    # 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
-  '';
+  disallowedReferences =
+    lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform)
+      [ buildPackages.diffutils buildPackages.ed ];
 
   NIX_CFLAGS_COMPILE = "-std=c99";
 
diff --git a/pkgs/applications/version-management/rcs/disable-t810.patch b/pkgs/applications/version-management/rcs/disable-t810.patch
deleted file mode 100644
index 745f1868a36..00000000000
--- a/pkgs/applications/version-management/rcs/disable-t810.patch
+++ /dev/null
@@ -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
-