diff --git a/nix/sync-with-upstream b/nix/sync-with-upstream index 720fae132e..e9cb070dcc 100755 --- a/nix/sync-with-upstream +++ b/nix/sync-with-upstream @@ -1,6 +1,6 @@ #!/bin/sh # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013 Ludovic Courtès +# Copyright © 2012, 2013, 2014 Ludovic Courtès # # This file is part of GNU Guix. # @@ -65,7 +65,16 @@ done rm -fv "$top_srcdir/nix/libstore/schema.sql.hh" cp -v "$top_srcdir/nix-upstream/COPYING" "$top_srcdir/nix" -cp -v "$top_srcdir/nix-upstream/AUTHORS" "$top_srcdir/nix" + +# Generate an 'AUTHORS' file since upstream Nix no longer has one. +cat > "$top_srcdir/nix/AUTHORS" <> "$top_srcdir/nix/AUTHORS" # Substitutions. sed -i "$top_srcdir/nix/libstore/gc.cc" \