From cab249615d1c416fb596343a0aecb20167b23334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 10 Feb 2013 17:23:48 +0100 Subject: [PATCH] Re-export `%current-system' from (guix packages). * guix/packages.scm: Re-export `%current-system'. * gnu/packages/bdw-gc.scm, gnu/packages/gawk.scm, gnu/packages/gperf.scm, gnu/packages/libffi.scm, gnu/packages/libsigsegv.scm, gnu/packages/libunistring.scm, gnu/packages/lout.scm, gnu/packages/m4.scm, gnu/packages/multiprecision.scm, gnu/packages/ncurses.scm, gnu/packages/perl.scm, gnu/packages/pkg-config.scm, gnu/packages/readline.scm, gnu/packages/recutils.scm, gnu/packages/scheme.scm: Remove (guix utils) import. --- gnu/packages/bdw-gc.scm | 3 +-- gnu/packages/gawk.scm | 1 - gnu/packages/gperf.scm | 3 +-- gnu/packages/libffi.scm | 3 +-- gnu/packages/libsigsegv.scm | 1 - gnu/packages/libunistring.scm | 3 +-- gnu/packages/lout.scm | 1 - gnu/packages/m4.scm | 1 - gnu/packages/multiprecision.scm | 1 - gnu/packages/ncurses.scm | 1 - gnu/packages/perl.scm | 1 - gnu/packages/pkg-config.scm | 3 +-- gnu/packages/readline.scm | 3 +-- gnu/packages/recutils.scm | 1 - gnu/packages/scheme.scm | 1 - guix/packages.scm | 1 + 16 files changed, 7 insertions(+), 21 deletions(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index 65c2fd99ce..98526512f8 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Ludovic Courtès +;;; Copyright © 2012, 2013 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,7 +20,6 @@ (define-module (gnu packages bdw-gc) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix utils) #:use-module (guix build-system gnu)) (define-public libgc diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index ad87043d96..5279544db9 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -21,7 +21,6 @@ (define-module (gnu packages gawk) #:use-module (gnu packages libsigsegv) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix utils) #:use-module (guix build-system gnu)) (define-public gawk diff --git a/gnu/packages/gperf.scm b/gnu/packages/gperf.scm index 94fa62b652..2425756f1b 100644 --- a/gnu/packages/gperf.scm +++ b/gnu/packages/gperf.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Ludovic Courtès +;;; Copyright © 2012, 2013 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,7 +20,6 @@ (define-module (gnu packages gperf) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix utils) #:use-module (guix build-system gnu)) (define-public gperf diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 87c849e564..21ddd46340 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Ludovic Courtès +;;; Copyright © 2012, 2013 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,7 +20,6 @@ (define-module (gnu packages libffi) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix utils) #:use-module (guix build-system gnu)) (define-public libffi diff --git a/gnu/packages/libsigsegv.scm b/gnu/packages/libsigsegv.scm index de896e4e8b..d73056892c 100644 --- a/gnu/packages/libsigsegv.scm +++ b/gnu/packages/libsigsegv.scm @@ -20,7 +20,6 @@ (define-module (gnu packages libsigsegv) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix utils) #:use-module (guix build-system gnu)) (define-public libsigsegv diff --git a/gnu/packages/libunistring.scm b/gnu/packages/libunistring.scm index 62ade5e378..92241d891b 100644 --- a/gnu/packages/libunistring.scm +++ b/gnu/packages/libunistring.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Ludovic Courtès +;;; Copyright © 2012, 2013 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,7 +20,6 @@ (define-module (gnu packages libunistring) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix utils) #:use-module (guix build-system gnu)) (define-public libunistring diff --git a/gnu/packages/lout.scm b/gnu/packages/lout.scm index 83f3fcfaf8..299af093e5 100644 --- a/gnu/packages/lout.scm +++ b/gnu/packages/lout.scm @@ -20,7 +20,6 @@ (define-module (gnu packages lout) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages ghostscript)) diff --git a/gnu/packages/m4.scm b/gnu/packages/m4.scm index 2a8bc5c72c..eb114c7514 100644 --- a/gnu/packages/m4.scm +++ b/gnu/packages/m4.scm @@ -21,7 +21,6 @@ (define-module (gnu packages m4) #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix utils) #:use-module (guix build-system gnu)) (define-public m4 diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 407604c6b1..7778552b40 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -22,7 +22,6 @@ (define-module (gnu packages multiprecision) #:use-module (gnu packages m4) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix utils) #:use-module (guix build-system gnu)) (define-public gmp diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index 52864a6c77..f790e6e38f 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -20,7 +20,6 @@ (define-module (gnu packages ncurses) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix utils) #:use-module (guix build-system gnu)) (define-public ncurses diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 5d5b7ac099..624d228059 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -21,7 +21,6 @@ (define-module (gnu packages perl) #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix utils) #:use-module (guix build-system gnu)) (define-public perl diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm index f9bcf18728..0910a410ee 100644 --- a/gnu/packages/pkg-config.scm +++ b/gnu/packages/pkg-config.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Ludovic Courtès +;;; Copyright © 2012, 2013 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,7 +20,6 @@ (define-module (gnu packages pkg-config) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix utils) #:use-module (guix build-system gnu)) (define-public pkg-config diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index 83666b225d..e73b293ba3 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Ludovic Courtès +;;; Copyright © 2012, 2013 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,7 +22,6 @@ (define-module (gnu packages readline) #:use-module (gnu packages ncurses) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix utils) #:use-module (guix build-system gnu)) (define-public readline diff --git a/gnu/packages/recutils.scm b/gnu/packages/recutils.scm index 3104f71499..fecb209deb 100644 --- a/gnu/packages/recutils.scm +++ b/gnu/packages/recutils.scm @@ -21,7 +21,6 @@ (define-module (gnu packages recutils) #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages emacs) #:use-module (gnu packages check) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index ac14d2b56a..b4fb896262 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -22,7 +22,6 @@ (define-module (gnu packages scheme) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) - #:use-module ((guix utils) #:select (%current-system)) #:use-module (gnu packages m4) #:use-module (gnu packages multiprecision) #:use-module (gnu packages emacs) diff --git a/guix/packages.scm b/guix/packages.scm index 4d3b499bf4..b372f03818 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -26,6 +26,7 @@ (define-module (guix packages) #:use-module (srfi srfi-9 gnu) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) + #:re-export (%current-system) #:export (origin origin? origin-uri