diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-12-15 15:28:50 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-15 15:28:50 +0100 |
| commit | a784c3077e7cdae5d8492aa540b86b8d32c9a696 (patch) | |
| tree | 9a09f9a1b2f032b09f2314cf12f7965877290eaf /nix/sync-with-upstream | |
| parent | 7f131cf3681afe62c84db66e48430de9e54e7d7d (diff) | |
| parent | 07ab4bf1fc590642307f18b4d1b8687dde3d664b (diff) | |
| download | guix-a784c3077e7cdae5d8492aa540b86b8d32c9a696.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: distro/packages/multiprecision.scm
Diffstat (limited to 'nix/sync-with-upstream')
| -rwxr-xr-x | nix/sync-with-upstream | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nix/sync-with-upstream b/nix/sync-with-upstream index 69bd1fbee7..1f11fd7d47 100755 --- a/nix/sync-with-upstream +++ b/nix/sync-with-upstream @@ -61,7 +61,8 @@ do fi done -cp -v "$top_srcdir/nix-upstream/"{COPYING,AUTHORS} "$top_srcdir/nix" +cp -v "$top_srcdir/nix-upstream/COPYING" "$top_srcdir/nix" +cp -v "$top_srcdir/nix-upstream/AUTHORS" "$top_srcdir/nix" # Substitutions. sed -i "$top_srcdir/nix/libstore/gc.cc" \ |