From f301378d943e9848df30805957d4933e0e894f2c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 1 Jul 2017 12:23:23 +0200 Subject: utils: Remove useless procedures. * src/cuirass/utils.scm (mkdir-p, make-user-module, call-with-temporary-directory, with-directory-excursion): Remove because already defined in guix. * tests/utils (with-directory-excursion): Remove associated test. * src/cuirass/base.scm: Use (guix build utils) to provide procedure removed from (cuirass utils). * bin/evaluate.in: Ditto. * bin/cuirass.in: Use "make-user-module" provided by (guix ui). --- bin/cuirass.in | 4 ++-- bin/evaluate.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/cuirass.in b/bin/cuirass.in index 7df5ddb..27efaac 100644 --- a/bin/cuirass.in +++ b/bin/cuirass.in @@ -26,7 +26,7 @@ exec ${GUILE:-@GUILE@} --no-auto-compile -e main -s "$0" "$@" (use-modules (cuirass) (cuirass ui) - (cuirass utils) + (guix ui) (ice-9 getopt-long)) (define (show-help) @@ -90,7 +90,7 @@ exec ${GUILE:-@GUILE@} --no-auto-compile -e main -s "$0" "$@" (and specfile (let ((new-specs (save-module-excursion (λ () - (set-current-module (make-user-module)) + (set-current-module (make-user-module '())) (primitive-load specfile))))) (for-each (λ (spec) (db-add-specification db spec)) new-specs))) diff --git a/bin/evaluate.in b/bin/evaluate.in index 8875238..09a785b 100644 --- a/bin/evaluate.in +++ b/bin/evaluate.in @@ -26,9 +26,9 @@ exec ${GUILE:-@GUILE@} --no-auto-compile -e main -s "$0" "$@" ;;; along with Cuirass. If not, see . (use-modules (cuirass) - (cuirass utils) (ice-9 match) (ice-9 pretty-print) + (guix build utils) (guix store)) (define* (main #:optional (args (command-line))) -- cgit v1.2.3