Merge PR #13901: Fix list contributors

Reviewed-by: SkySkimmer

5 files changed, 16 insertions, 7 deletions

diff --git a/.mailmap b/.mailmap
index 6474a9d164..c30a4298e0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -22,6 +22,7 @@ Yves Bertot <yves.bertot@inria.fr>                 Yves Bertot <bertot@inria.fr>
 Yves Bertot <yves.bertot@inria.fr>                 Yves Bertot <Yves.Bertot@inria.fr>
 Yves Bertot <yves.bertot@inria.fr>                 Yves Bertot <bertot@nardis.inria.fr>
 Frédéric Besson <frederic.besson@inria.fr>         fbesson <fbesson@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Frédéric Besson <frederic.besson@inria.fr>         BESSON Frederic <frederic.besson@inria.fr>
 Siddharth Bhat <siddu.druid@gmail.com>             Siddharth <siddu.druid@gmail.com>
 Lasse Blaauwbroek <lasse@blaauwbroek.eu>           Lasse Blaauwbroek <lasse@lasse-work.localdomain>
 Simon Boulier <simon.boulier@ens-rennes.fr>        SimonBoulier <simon.boulier@ens-rennes.fr>
@@ -72,6 +73,7 @@ Vincent Gross <vgross@gforge>                      vgross <vgross@85f007b7-540e-
 Huang Guan-Shieng <huang@gforge>                   huang <huang@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Hugo Herbelin <Hugo.Herbelin@inria.fr>             herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Hugo Herbelin <Hugo.Herbelin@inria.fr>             Hugo Herbelin <herbelin@users.noreply.github.com>
+Wolf Honore <wolfhonore@gmail.com>                 whonore <wolfhonore@gmail.com>
 Jasper Hugunin <jasperh@cs.washington.edu>         Jasper Hugunin <jasper@hashplex.com>
 Tom Hutchinson <thutchin@gforge>                   thutchin <thutchin@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Cezary Kaliszyk <cek@gforge>                       cek <cek@85f007b7-540e-0410-9357-904b9bb8a0f7>
@@ -91,7 +93,6 @@ Larry Darryl Lee Jr. <llee454@gmail.com>           llee454@gmail.com <llee454@gm
 Xavier Leroy <xavier.leroy@college-de-france.fr>   Xavier Leroy <xavier.leroy@inria.fr>
 Pierre Letouzey <pierre.letouzey@inria.fr>         letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Pierre Letouzey <pierre.letouzey@inria.fr>         letouzey <pierre.letouzey@inria.fr>
-Xia Li-yao <lysxia@gmail.com>                      Lysxia <lysxia@gmail.com>
 Yishuai Li <yishuai@cis.upenn.edu>                 Yishuai Li <yishuai@upenn.edu>
 Assia Mahboubi <assia.mahboubi@inria.fr>           amahboub <amahboub@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Kenji Maillard <kenji.maillard@inria.fr>           Kenji Maillard <kenji@maillard.blue>
@@ -154,6 +155,9 @@ Laurent Théry <laurent.thery@inria.fr>             Laurent Théry <thery@sophia
 Laurent Théry <laurent.thery@inria.fr>             thery <Laurent.Thery@inria.fr>
 Anton Trunov <anton.a.trunov@gmail.com>            Anton Trunov <anton.trunov@imdea.org>
 Benjamin Werner <werner@gforge>                    werner <werner@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Li-yao Xia <lysxia@gmail.com>                      Lysxia <lysxia@gmail.com>
+Li-yao Xia <lysxia@gmail.com>                      Xia Li-yao <lysxia@gmail.com>
+Li-yao Xia <lysxia@gmail.com>                      Xia Li-yao <Lysxia@users.noreply.github.com>
 Wang Zhuyang <hawnzug@gmail.com>                   hawnzug <hawnzug@gmail.com>
 Beta Ziliani <beta@mpi-sws.org>                    Beta Ziliani <bziliani@famaf.unc.edu.ar>
 Beta Ziliani <beta@mpi-sws.org>                    beta <beta@mpi-sws.org>
diff --git a/default.nix b/default.nix
index f838f17d07..4700a6ed64 100644
--- a/default.nix
+++ b/default.nix
@@ -33,7 +33,7 @@
 }:
 
 with pkgs;
-with stdenv.lib;
+with pkgs.lib;
 
 stdenv.mkDerivation rec {
 
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.
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";
 })
diff --git a/dev/tools/list-contributors.sh b/dev/tools/list-contributors.sh
index c968f2e952..0b0d01c7e2 100644..100755
--- 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