~ruther/guix-local

ref: 90ed6291df875c8805cbbacec6ee12143e340375 guix-local/nix/sync-with-upstream -rwxr-xr-x 2.1 KiB
d501fad1 — Ludovic Courtès 12 years ago
Merge branch 'master' into core-updates

Conflicts:
	gnu/packages/make-bootstrap.scm
8cf13c1f — Ludovic Courtès 12 years ago
build: Fix `sync-with-upstream'.

* nix/sync-with-upstream: Remove schema.sql.hh.
01e354eb — Ludovic Courtès 13 years ago
Merge branch 'core-updates'

Conflicts:
	guix/build/union.scm
2357f850 — Ludovic Courtès 13 years ago
Update a few more license headers.

* distro/packages/openssl.scm, m4/guix.m4, nix/sync-with-upstream:
  Update headers.
a784c307 — Ludovic Courtès 13 years ago
Merge branch 'master' into core-updates

Conflicts:
	distro/packages/multiprecision.scm
0d12bea3 — Andreas Enge 13 years ago
build: Avoid brace expansion in `nix/sync-with-upstream'.

* nix/sync-with-upstream: Avoid brace expansion, for the sake of Dash.
1e982451 — Ludovic Courtès 13 years ago
Merge branch 'nix-integration'

Conflicts:
	tests/guix-package.sh
f5c82e15 — Ludovic Courtès 13 years ago
daemon: Add `list-runtime-roots' script.

* nix/scripts/list-runtime-roots.in: New file.
* config-daemon.ac: Add `AC_CONFIG_FILES' invocation for it.
* daemon.am (nodist_pkglibexec_SCRIPTS): New variable.
  (AM_TESTS_ENVIRONMENT): Define `top_builddir'.
* tests/guix-daemon.sh: Export `NIX_ROOT_FINDER'.
* nix/sync-with-upstream: Substitute the path to the root finder in
  libstore/gc.cc.
b49ffe2d — Ludovic Courtès 13 years ago
build: Add `bootstrap' and `sync-with-upstream' scripts.

* bootstrap, nix/sync-with-upstream: New files.
* Makefile.am (EXTRA_DIST): Add `bootstrap'.
* daemon.am (EXTRA_DIST): Add `nix/sync-with-upstream'.