From 6fd5a80dbe7013fc37aa1228051d02b42ee76527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 7 Jan 2019 14:05:37 +0100 Subject: gnu: Remove unnecessary build-side module imports. * gnu/packages/batik.scm, gnu/packages/boost.scm, gnu/packages/calendar.scm, gnu/packages/gl.scm, gnu/packages/lua.scm, gnu/packages/qt.scm, gnu/packages/simulation.scm, gnu/packages/terminals.scm: Remove unnecessary import of (guix build utils). * gnu/packages/emacs.scm: Remove unnecessary imports of (guix ...). * gnu/packages/libcanberra.scm: Use (srfi srfi-1) instead of (guix build utils) for 'alist-delete'. * gnu/packages/wxwidgets.scm: Likewise. --- gnu/packages/batik.scm | 1 - gnu/packages/boost.scm | 3 +-- gnu/packages/calendar.scm | 1 - gnu/packages/emacs.scm | 5 +---- gnu/packages/gl.scm | 1 - gnu/packages/libcanberra.scm | 6 +++--- gnu/packages/lua.scm | 1 - gnu/packages/qt.scm | 3 +-- gnu/packages/simulation.scm | 1 - gnu/packages/terminals.scm | 3 +-- gnu/packages/wxwidgets.scm | 4 ++-- 11 files changed, 9 insertions(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index 8296c0fbd6..cd77c9a12b 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -23,7 +23,6 @@ #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix build-system ant) - #:use-module (guix build utils) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages java) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index f9108b3ad6..26d0140fd0 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016 Eric Bavier -;;; Copyright © 2015 Ludovic Courtès +;;; Copyright © 2015, 2019 Ludovic Courtès ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Arun Isaac @@ -32,7 +32,6 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix build utils) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index a5c677bd4d..ccf26a2aea 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -27,7 +27,6 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system python) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 0c80d21b4c..ec67f278c9 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Alex Kost ;;; Copyright © 2015 Federico Beffa @@ -63,9 +63,6 @@ #:use-module (guix cvs-download) #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix gexp) - #:use-module (guix monads) - #:use-module (guix store) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system emacs) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index d7c112928f..39b3c52301 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -50,7 +50,6 @@ #:use-module (gnu packages xorg) #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix build utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module ((guix licenses) #:prefix license:) diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm index e7f4195ed4..0032d9a85f 100644 --- a/gnu/packages/libcanberra.scm +++ b/gnu/packages/libcanberra.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge -;;; Copyright © 2014, 2015 Ludovic Courtès +;;; Copyright © 2014, 2015, 2019 Ludovic Courtès ;;; Copyright © 2016 Fabian Harfert ;;; Copyright © 2017, 2018 Nils Gillmann ;;; @@ -28,7 +28,6 @@ #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system python) - #:use-module (guix build utils) #:use-module (guix utils) #:use-module (gnu packages autotools) #:use-module (gnu packages gstreamer) @@ -38,7 +37,8 @@ #:use-module (gnu packages pulseaudio) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages xiph)) + #:use-module (gnu packages xiph) + #:use-module ((srfi srfi-1) #:select (alist-delete))) (define-public libcanberra (package diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 2dc1452ccc..bab166e3e8 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -32,7 +32,6 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) - #:use-module (guix build utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (gnu packages) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 1c460e5957..55f72373f3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Andreas Enge ;;; Copyright © 2015 Sou Bunnbu -;;; Copyright © 2015, 2018 Ludovic Courtès +;;; Copyright © 2015, 2018, 2019 Ludovic Courtès ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2016 Thomas Danckaert @@ -32,7 +32,6 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix build utils) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 2132d4acf4..576b9bb89d 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -46,7 +46,6 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix download) - #:use-module (guix build utils) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index f6f3845070..45506d4f52 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Mckinley Olsen ;;; Copyright © 2016, 2017 Alex Griffin ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017 Ludovic Courtès +;;; Copyright © 2016, 2017, 2019 Ludovic Courtès ;;; Copyright © 2016, 2017 José Miguel Sánchez García ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Kei Kebreau @@ -30,7 +30,6 @@ (define-module (gnu packages terminals) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix build utils) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index b95be3ec14..caa0ad2372 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -30,7 +30,6 @@ #:use-module ((guix licenses) #:prefix l:) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system python) - #:use-module (guix build utils) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages compression) @@ -45,7 +44,8 @@ #:use-module (gnu packages python) #:use-module (gnu packages sdl) #:use-module (gnu packages webkit) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages xorg) + #:use-module ((srfi srfi-1) #:select (alist-delete))) (define-public wxwidgets (package -- cgit v1.2.3