diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-06-20 23:51:00 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-06-20 23:51:00 +0200 |
| commit | d501fad11cfbd69245a4d5e2d632a0ab37985b55 (patch) | |
| tree | 4d5a347efb3a5476937b21cb5bdb26204aaeea0c /nix | |
| parent | 4db00e42109b6f8229259859deac35499eec9004 (diff) | |
| parent | f3211ef3868326e3cec5318bc799a2ff6572741b (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/make-bootstrap.scm
Diffstat (limited to 'nix')
| -rwxr-xr-x | nix/sync-with-upstream | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nix/sync-with-upstream b/nix/sync-with-upstream index 66a315a643..535763d602 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 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> # # This file is part of GNU Guix. # @@ -61,6 +61,9 @@ do fi done +# This file should be generated by our build system so remove it. +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" |