diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-08-28 14:22:15 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-08-28 14:22:15 -0400 |
| commit | c00a9fbfef75d2fc08485f8158ec331bfa99d5ec (patch) | |
| tree | 4737817ee787c4ec8222ea13d3cfecb2ac98b673 /build-aux | |
| parent | 83291101c39c1cd1bf472280c24ad68d94248c2e (diff) | |
| parent | dd16424466196616b99c13526537a89aaee27f88 (diff) | |
| download | patches-c00a9fbfef75d2fc08485f8158ec331bfa99d5ec.tar patches-c00a9fbfef75d2fc08485f8158ec331bfa99d5ec.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/base.scm
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/check-final-inputs-self-contained.scm | 2 | ||||
| -rw-r--r-- | build-aux/hydra/gnu-system.scm | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/build-aux/check-final-inputs-self-contained.scm b/build-aux/check-final-inputs-self-contained.scm index bf4a74110f..ade4e98001 100644 --- a/build-aux/check-final-inputs-self-contained.scm +++ b/build-aux/check-final-inputs-self-contained.scm @@ -24,7 +24,7 @@ (guix packages) (guix derivations) (guix ui) - (gnu packages base) + (gnu packages commencement) (ice-9 match) (srfi srfi-1) (srfi srfi-26)) diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index f02f1f48e6..c24f4ab512 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -53,6 +53,7 @@ (gnu packages compression) (gnu packages multiprecision) (gnu packages make-bootstrap) + (gnu packages commencement) (gnu system) (gnu system vm) (gnu system install) |