From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Craven Subject: [PATCH 2/8] gnu: Use define-public to export packages. Date: Fri, 29 Jul 2016 10:23:51 +0200 Message-ID: <20160729082357.17501-2-david@craven.ch> References: <20160729082357.17501-1-david@craven.ch> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55427) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bT36F-0006Bq-0I for guix-devel@gnu.org; Fri, 29 Jul 2016 04:24:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bT36C-0002I4-G9 for guix-devel@gnu.org; Fri, 29 Jul 2016 04:24:53 -0400 Received: from so254-10.mailgun.net ([198.61.254.10]:50481) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bT36B-0002HJ-8A for guix-devel@gnu.org; Fri, 29 Jul 2016 04:24:52 -0400 In-Reply-To: <20160729082357.17501-1-david@craven.ch> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org Cc: David Craven * gnu/packages/bison.scm (bison): Define public. * gnu/packages/flex.scm (flex): Define public. * gnu/packages/pulseaudio.scm (libsndfile, libsamplerate, pulseaudio): Define public. * gnu/packages/sdl.scm (sdl, sdl2, libmikmod, sdl-gfx, sdl-image, sdl-mixer, sdl-net, sdl-ttf): Define public. * gnu/packages/search.scm (xapian): Remove unnecessary #:export. * gnu/packages/swig.scm (swig): Define public. --- gnu/packages/bison.scm | 6 ++---- gnu/packages/flex.scm | 6 ++---- gnu/packages/pulseaudio.scm | 11 ++++------- gnu/packages/sdl.scm | 26 +++++++++----------------- gnu/packages/search.scm | 3 +-- gnu/packages/swig.scm | 7 +++---- 6 files changed, 21 insertions(+), 38 deletions(-) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index c8ec8cc..178a99d 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -24,10 +24,9 @@ #:use-module (gnu packages m4) #:use-module (gnu packages perl) #:use-module (gnu packages flex) - #:use-module (srfi srfi-1) - #:export (bison)) + #:use-module (srfi srfi-1)) -(define bison +(define-public bison (package (name "bison") (version "3.0.4") @@ -65,4 +64,3 @@ simple tools through complex programming languages.") (sha256 (base32 "1zd77ilmpv5mi3kr55jrj6ncqlcnyhpianhrwzak2q28cv2cbn23")))))) - diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index f8d5ccd..20aff19 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -26,10 +26,9 @@ #:use-module (gnu packages m4) #:use-module (gnu packages bison) #:use-module (gnu packages indent) - #:use-module (srfi srfi-1) - #:export (flex)) + #:use-module (srfi srfi-1)) -(define flex +(define-public flex (package (name "flex") (version "2.6.0") @@ -79,4 +78,3 @@ regular expressions for each rule. Whenever it finds a match, it executes the corresponding C code.") (license (non-copyleft "file://COPYING" "See COPYING in the distribution.")))) - diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index b2b0508..5d36dbe 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -36,12 +36,9 @@ #:use-module (gnu packages linux) #:use-module (gnu packages m4) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages xiph) - #:export (libsndfile - libsamplerate - pulseaudio)) + #:use-module (gnu packages xiph)) -(define libsndfile +(define-public libsndfile (package (name "libsndfile") (version "1.0.26") @@ -74,7 +71,7 @@ SPARC. Hopefully the design of the library will also make it easy to extend for reading and writing new sound file formats.") (license l:gpl2+))) -(define libsamplerate +(define-public libsamplerate (package (name "libsamplerate") ; aka. Secret Rabbit Code (SRC) (version "0.1.8") @@ -112,7 +109,7 @@ the theoretical best bandwidth for a given pair of input and output sample rates.") (license l:gpl2+))) -(define pulseaudio +(define-public pulseaudio (package (name "pulseaudio") (version "8.0") diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 49b9dea..161689b 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -38,17 +38,9 @@ #:use-module (gnu packages gl) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) - #:export (sdl - sdl2 - libmikmod - sdl-gfx - sdl-image - sdl-mixer - sdl-net - sdl-ttf - sdl-union)) + #:export (sdl-union)) -(define sdl +(define-public sdl (package (name "sdl") (version "1.2.15") @@ -92,7 +84,7 @@ joystick, and graphics hardware.") (home-page "http://libsdl.org/") (license lgpl2.1))) -(define sdl2 +(define-public sdl2 (package (inherit sdl) (name "sdl2") (version "2.0.4") @@ -106,7 +98,7 @@ joystick, and graphics hardware.") "0jqp46mxxbh9lhpx1ih6sp93k752j2smhpc0ad0q4cb3px0famfs")))) (license bsd-3))) -(define libmikmod +(define-public libmikmod (package (name "libmikmod") (version "3.3.7") @@ -131,7 +123,7 @@ system, such as sound redirection over the network.") (license lgpl2.1) (home-page "http://mikmod.sourceforge.net/"))) -(define sdl-gfx +(define-public sdl-gfx (package (name "sdl-gfx") (version "2.0.24") @@ -155,7 +147,7 @@ other supporting functions for SDL.") ;; MIPS, at least. (supported-systems '("i686-linux" "x86_64-linux")))) -(define sdl-image +(define-public sdl-image (package (name "sdl-image") (version "1.2.12") @@ -191,7 +183,7 @@ WEBP, XCF, XPM, and XV.") (home-page "http://www.libsdl.org/projects/SDL_image/") (license zlib))) -(define sdl-mixer +(define-public sdl-mixer (package (name "sdl-mixer") (version "1.2.12") @@ -229,7 +221,7 @@ MIDI, Ogg Vorbis, and MP3.") (home-page "http://www.libsdl.org/projects/SDL_mixer/") (license zlib))) -(define sdl-net +(define-public sdl-net (package (name "sdl-net") (version "1.2.8") @@ -250,7 +242,7 @@ SDL.") (home-page "http://www.libsdl.org/projects/SDL_net/") (license zlib))) -(define sdl-ttf +(define-public sdl-ttf (package (name "sdl-ttf") (version "2.0.11") diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index d34d70b..9b01909 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -26,8 +26,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages check) #:use-module (gnu packages databases) - #:use-module (gnu packages linux) - #:export (xapian)) + #:use-module (gnu packages linux)) (define-public xapian (package diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm index 01137d8..096cfd5 100644 --- a/gnu/packages/swig.scm +++ b/gnu/packages/swig.scm @@ -26,10 +26,9 @@ #:use-module (gnu packages guile) #:use-module (gnu packages boost) #:use-module (gnu packages python) - #:use-module (gnu packages perl) - #:export (swig)) + #:use-module (gnu packages perl)) -(define swig +(define-public swig (package (name "swig") (version "3.0.5") @@ -49,7 +48,7 @@ ("guile" ,guile-2.0) ("perl" ,perl))) ;; FIXME: reactivate input python as soon as the test failures - ;; fatal error: Python.h: No such file or directory + ;; fatal error: Python.h: No such file or directory ;; # include ;; are fixed. ;; The python part probably never worked and does not seem to -- 2.9.0