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 /tests/packages.scm | |
parent | 83291101c39c1cd1bf472280c24ad68d94248c2e (diff) | |
parent | dd16424466196616b99c13526537a89aaee27f88 (diff) | |
download | guix-c00a9fbfef75d2fc08485f8158ec331bfa99d5ec.tar guix-c00a9fbfef75d2fc08485f8158ec331bfa99d5ec.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/base.scm
Diffstat (limited to 'tests/packages.scm')
-rw-r--r-- | tests/packages.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/packages.scm b/tests/packages.scm index 2a67f108ad..16e65619bc 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -339,7 +339,7 @@ (test-assert "GNU Make, bootstrap" ;; GNU Make is the first program built during bootstrap; we choose it ;; here so that the test doesn't last for too long. - (let ((gnu-make (@@ (gnu packages base) gnu-make-boot0))) + (let ((gnu-make (@@ (gnu packages commencement) gnu-make-boot0))) (and (package? gnu-make) (or (location? (package-location gnu-make)) (not (package-location gnu-make))) |