From ef148d7d14ce2f6782d47186bc944851893e39eb Mon Sep 17 00:00:00 2001
From: Théo Zimmermann
Date: Fri, 5 Mar 2021 15:02:38 +0100
Subject: Fix list-constributors.sh script.

---
 dev/tools/list-contributors.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 dev/tools/list-contributors.sh

(limited to 'dev')

diff --git a/dev/tools/list-contributors.sh b/dev/tools/list-contributors.sh
old mode 100644
new mode 100755
index c968f2e952..0b0d01c7e2
--- a/dev/tools/list-contributors.sh
+++ b/dev/tools/list-contributors.sh
@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 # For compat with OSX which has a non-gnu sed which doesn't support -z
-SED=`which gsed || which sed`
+SED=`(which gsed || which sed) 2> /dev/null`
 
 if [ $# != 1 ]; then
-  error "usage: $0 rev0..rev1"
+  echo "usage: $0 rev0..rev1"
   exit 1
 fi
 
 git shortlog -s -n --group=author --group=trailer:Co-authored-by $1 | cut -f2 | sort -k 2 | grep -v -e "coqbot" -e "^$" > contributors.tmp
 
 cat contributors.tmp | wc -l | xargs echo "Contributors:"
-cat contributors.tmp | gsed -z "s/\n/, /g"
+cat contributors.tmp | $SED -z "s/\n/, /g"
 echo
 rm contributors.tmp
-- 
cgit v1.2.3


From afa4882102d627ce5be6821f591f3bf42fe74324 Mon Sep 17 00:00:00 2001
From: Théo Zimmermann
Date: Fri, 5 Mar 2021 15:03:59 +0100
Subject: Document the relation of the list-contributors.sh script to .mailmap.

---
 dev/doc/release-process.md | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'dev')

diff --git a/dev/doc/release-process.md b/dev/doc/release-process.md
index 57c325f698..1697a19668 100644
--- a/dev/doc/release-process.md
+++ b/dev/doc/release-process.md
@@ -114,6 +114,11 @@
   list of contributors between Coq revisions. Typically used with
   `VX.X+alpha..vX.X` to check the contributors of version `VX.X`.
 
+  Note that this script relies on `.mailmap` to merge multiple
+  identities.  If you notice anything incorrect while using it, use
+  the opportunity to fix the `.mailmap` file.  Same thing if you want
+  to have the full name of a contributor shown instead of a pseudonym.
+
 ## For each release (preview, final, patch-level) ##
 
 - [ ] Ensure that there exists a milestone for the following version.
-- 
cgit v1.2.3


From 9955d2dfe778e41e447cb3ae71e708c7a3716f0d Mon Sep 17 00:00:00 2001
From: Théo Zimmermann
Date: Fri, 5 Mar 2021 15:08:36 +0100
Subject: Update nixpkgs.

To get the right version of git to use the list-contributors.sh script.
---
 dev/nixpkgs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'dev')

diff --git a/dev/nixpkgs.nix b/dev/nixpkgs.nix
index a582a70e0a..37e39a99a9 100644
--- a/dev/nixpkgs.nix
+++ b/dev/nixpkgs.nix
@@ -1,4 +1,4 @@
 import (fetchTarball {
-  url = "https://github.com/NixOS/nixpkgs/archive/0bbeca2ff952e6a171534793ddd0fa97c8f9546a.tar.gz";
-  sha256 = "0h1y4ffvyvkqs6k2pak02pby25va7c6c1y4p8xkwlzqwswxqxvfl";
+  url = "https://github.com/NixOS/nixpkgs/archive/5c7a370a208d93d458193fc05ed84ced0ba7f387.tar.gz";
+  sha256 = "1jkn71xscsk4rb0agbp5saf06hy36qvy512zzh3881pkkn67i9js";
 })
-- 
cgit v1.2.3