From 1ffa7090b99dfd2f54fa883929c5e78d7852657a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 18 Jan 2013 01:06:24 +0100 Subject: distro: Change the module name space to (gnu ...). * distro: Rename to... * gnu: ... this. Update module names accordingly. * Makefile.am: Adjust accordingly. * po/POTFILES.in: Likewise. * distro.scm: Search for files under /gnu/packages instead of /distro/packages. * gnu/packages/base.scm (ld-wrapper-boot3): Likewise. --- distro/packages/guile.scm | 197 ---------------------------------------------- 1 file changed, 197 deletions(-) delete mode 100644 distro/packages/guile.scm (limited to 'distro/packages/guile.scm') diff --git a/distro/packages/guile.scm b/distro/packages/guile.scm deleted file mode 100644 index 9964f9d9f0..0000000000 --- a/distro/packages/guile.scm +++ /dev/null @@ -1,197 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Ludovic Courtès -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (distro packages guile) - #:use-module (guix licenses) - #:use-module (distro) - #:use-module (distro packages bdw-gc) - #:use-module (distro packages gawk) - #:use-module (distro packages gperf) - #:use-module (distro packages libffi) - #:use-module (distro packages autotools) - #:use-module (distro packages libunistring) - #:use-module (distro packages m4) - #:use-module (distro packages multiprecision) - #:use-module (distro packages pkg-config) - #:use-module (distro packages readline) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu)) - -;;; Commentary: -;;; -;;; GNU Guile, and modules and extensions. -;;; -;;; Code: - -(define-public guile-1.8 - (package - (name "guile") - (version "1.8.8") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/guile/guile-" version - ".tar.gz")) - (sha256 - (base32 - "0l200a0v7h8bh0cwz6v7hc13ds39cgqsmfrks55b1rbj5vniyiy3")))) - (build-system gnu-build-system) - (arguments '(#:configure-flags '("--disable-error-on-warning") - #:patches (list (assoc-ref %build-inputs "patch/snarf")) - - ;; Insert a phase before `configure' to patch things up. - #:phases (alist-cons-before - 'configure - 'patch-loader-search-path - (lambda* (#:key outputs #:allow-other-keys) - ;; Add a call to `lt_dladdsearchdir' so that - ;; `libguile-readline.so' & co. are in the - ;; loader's search path. - (substitute* "libguile/dynl.c" - (("lt_dlinit.*$" match) - (format #f - " ~a~% lt_dladdsearchdir(\"~a/lib\");~%" - match - (assoc-ref outputs "out"))))) - %standard-phases))) - (inputs `(("patch/snarf" ,(search-patch "guile-1.8-cpp-4.5.patch")) - ("gawk" ,gawk) - ("readline" ,readline))) - - ;; Since `guile-1.8.pc' has "Libs: ... -lgmp -lltdl", these must be - ;; propagated. - (propagated-inputs `(("gmp" ,gmp) - ("libtool" ,libtool))) - - ;; When cross-compiling, a native version of Guile itself is needed. - (self-native-input? #t) - - (synopsis "GNU Guile 1.8, an embeddable Scheme interpreter") - (description -"GNU Guile 1.8 is an interpreter for the Scheme programming language, -packaged as a library that can be embedded into programs to make them -extensible. It supports many SRFIs.") - (home-page "http://www.gnu.org/software/guile/") - (license lgpl2.0+))) - -(define-public guile-2.0 - (package - (name "guile") - (version "2.0.7") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/guile/guile-" version - ".tar.xz")) - (sha256 - (base32 - "0f53pxkia4v17n0avwqlcjpy0n89hkazm2xsa6p84lv8k6k8y9vg")))) - (build-system gnu-build-system) - (native-inputs `(("pkgconfig" ,pkg-config))) - (inputs `(("libffi" ,libffi) - ("readline" ,readline))) - - (propagated-inputs - `( ;; These ones aren't normally needed here, but since `libguile-2.0.la' - ;; reads `-lltdl -lunistring', adding them here will add the needed - ;; `-L' flags. As for why the `.la' file lacks the `-L' flags, see - ;; . - ("libunistring" ,libunistring) - ("libtool" ,libtool) - - ;; The headers and/or `guile-2.0.pc' refer to these packages, so they - ;; must be propagated. - ("bdw-gc" ,libgc) - ("gmp" ,gmp))) - - (self-native-input? #t) - - (arguments - '(#:phases (alist-cons-before - 'configure 'pre-configure - (lambda* (#:key inputs #:allow-other-keys) - (let ((bash (assoc-ref inputs "bash"))) - (substitute* "module/ice-9/popen.scm" - (("/bin/sh") - (string-append bash "/bin/bash"))))) - %standard-phases))) - - (synopsis "GNU Guile 2.0, an embeddable Scheme implementation") - (description -"GNU Guile is an implementation of the Scheme programming language, with -support for many SRFIs, packaged for use in a wide variety of environments. -In addition to implementing the R5RS Scheme standard and a large subset of -R6RS, Guile includes a module system, full access to POSIX system calls, -networking support, multiple threads, dynamic linking, a foreign function -call interface, and powerful string processing.") - (home-page "http://www.gnu.org/software/guile/") - (license lgpl3+))) - -(define-public guile-2.0/fixed - ;; A package of Guile 2.0 that's rarely changed. It is the one used - ;; in the `base' module, and thus changing it entails a full rebuild. - guile-2.0) - - -;;; -;;; Extensions. -;;; - -(define (guile-reader guile) - "Build Guile-Reader against GUILE, a package of some version of Guile 1.8 -or 2.0." - (package - (name (string-append "guile-reader-for-guile-" (package-version guile))) - (version "0.6") - (source (origin - (method url-fetch) - (uri (string-append - "http://download-mirror.savannah.gnu.org/releases/guile-reader/guile-reader-" - version ".tar.gz")) - (sha256 - (base32 - "1svlyk5pm4fsdp2g7n6qffdl6fdggxnlicj0jn9s4lxd63gzxy1n")))) - (build-system gnu-build-system) - (native-inputs `(("pkgconfig" ,pkg-config) - ("gperf" ,gperf))) - (inputs `(("guile" ,guile))) - (synopsis "Guile-Reader, a simple framework for building readers for -GNU Guile") - (description -"Guile-Reader is a simple framework for building readers for GNU Guile. - -The idea is to make it easy to build procedures that extend Guile’s read -procedure. Readers supporting various syntax variants can easily be written, -possibly by re-using existing “token readers” of a standard Scheme -readers. For example, it is used to implement Skribilo’s R5RS-derived -document syntax. - -Guile-Reader’s approach is similar to Common Lisp’s “read table”, but -hopefully more powerful and flexible (for instance, one may instantiate as -many readers as needed).") - (home-page "http://www.nongnu.org/guile-reader/") - (license gpl3+))) - -(define-public guile-reader/guile-1.8 - ;; Guile-Reader built against Guile 1.8. - (guile-reader guile-1.8)) - -(define-public guile-reader/guile-2.0 - ;; Guile-Reader built against Guile 2.0. - (guile-reader guile-2.0)) - -;;; guile.scm ends here -- cgit v1.2.3