From 4aea820f0954fce4d076718072faf211f62f3f9d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 15 Apr 2019 16:57:12 +0200 Subject: guix build: Fix relative file name canonicalization for '--root'. Fixes . Reported by rendaw <7e9wc56emjakcm@s.rendaw.me>. * guix/scripts/build.scm (register-root): When ROOT is a relative file name, append the basename of ROOT, not ROOT itself. * tests/guix-build.sh: Add test. --- tests/guix-build.sh | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tests') diff --git a/tests/guix-build.sh b/tests/guix-build.sh index 66bf6be8d0..d479296ef1 100644 --- a/tests/guix-build.sh +++ b/tests/guix-build.sh @@ -183,6 +183,13 @@ then false; else true; fi rm -f "$result" +# Check relative file name canonicalization: . +mkdir "$result" +guix build -r "$result/x" -e '(@@ (gnu packages bootstrap) %bootstrap-guile)' +test -x "$result/x/bin/guile" +rm "$result/x" +rmdir "$result" + # Cross building. guix build coreutils --target=mips64el-linux-gnu --dry-run --no-substitutes -- cgit v1.2.3 s customized Guix
aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-05gnu: Add python2-sphinx.Ricardo Wurmus
We need this to unbreak python2-numpydoc. Eventually, this should be moved to the Guix Past channel. * gnu/packages/sphinx.scm (python2-sphinx): New variable.
2021-02-02gnu: Add python-sphinx-argparse.Nicolas Goaziou
* gnu/packages/sphinx.scm (python-sphinx-argparse): New variable.
2021-02-01Merge branch 'staging'Leo Famulari
2021-01-27gnu: python-xyz: Move a few modules to (gnu packages python-build).Maxim Cournoyer
* gnu/packages/python-xyz.scm (python-pep517): Inherit from python-pep517-bootstrap. Remove the inherited common fields. (python-poetry-core, python-wheel) (python-toml): Move to ... * gnu/packages/python-build.scm: ... here, a new module. (python-pep517-bootstrap): New package. * gnu/local.mk (GNU_SYSTEM_MODULES): Register the new module.
2020-12-21Merge branch 'ungrafting' into stagingMarius Bakke
2020-12-15gnu: Add python-nbsphinx.Giacomo Leidi
* gnu/packages/sphinx.scm (python-nbsphinx): New variable. Signed-off-by: Leo Famulari <leo@famulari.name>
2020-12-13gnu: python-sphinx: Update to 3.3.1.Marius Bakke
* gnu/packages/sphinx.scm (python-sphinx): Update to 3.3.1.
2020-11-07Merge remote-tracking branch 'origin/staging-next' into stagingMarius Bakke
2020-11-07Merge branch 'master' into stagingMarius Bakke
Conflicts: gnu/local.mk gnu/packages/gdb.scm gnu/packages/lisp-xyz.scm gnu/packages/web-browsers.scm
2020-11-05gnu: python-sphinx-intl: Update to 2.0.1.Tobias Geerinckx-Rice
* gnu/packages/sphinx.scm (python-sphinx-intl): Update to 2.0.1.
2020-10-24gnu: python-breathe: Update to 4.22.1.Simon South
* gnu/packages/sphinx.scm (python-breathe): Update to 4.22.1. Signed-off-by: Christopher Baines <mail@cbaines.net>
2020-10-24gnu: python-sphinx: Update to 3.2.1.Simon South
* gnu/packages/sphinx.scm (python-sphinx): Update to 3.2.1. Signed-off-by: Christopher Baines <mail@cbaines.net>
2020-07-25gnu: Sphinx: Update to 3.1.2.Marius Bakke
* gnu/packages/sphinx.scm (python-sphinx): Update to 3.1.2.
2020-07-25gnu: Remove python2-sphinx.Marius Bakke
* gnu/packages/sphinx.scm (python-sphinx)[properties]: Use self as python2 variant. (python2-sphinx): Remove variable.