Merge master into staging-next

2021-02-09 00:36:17 +00:00
parent df21fb8afa 5464a2355a
commit 5704fd1095
41 changed files with 509 additions and 295 deletions
--- a/pkgs/build-support/fetchcvs/builder.sh
+++ b/pkgs/build-support/fetchcvs/builder.sh
@@ -1,6 +1,6 @@
 source $stdenv/setup

-(echo '#!/usr/bin/env sh'; \
+(echo "#!$SHELL"; \
 echo 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"') > ssh
 chmod +x ssh
 export CVS_RSH=$PWD/ssh