diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/backup.scm | 7 | ||||
| -rw-r--r-- | gnu/packages/cmake.scm | 11 | ||||
| -rw-r--r-- | gnu/packages/gnome.scm | 10 | ||||
| -rw-r--r-- | gnu/packages/gnutls.scm | 8 | ||||
| -rw-r--r-- | gnu/packages/mail.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/mpd.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/mpi.scm | 8 |
7 files changed, 29 insertions, 30 deletions
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 1aef75e05b..a634c9454e 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> +;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build utils) #:use-module (guix build-system gnu) #:use-module (guix build-system python) @@ -38,8 +40,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages rsync) #:use-module (gnu packages ssh) - #:use-module (gnu packages xml) - #:use-module (srfi srfi-1)) + #:use-module (gnu packages xml)) (define-public duplicity (package @@ -49,7 +50,7 @@ (origin (method url-fetch) (uri (string-append "https://code.launchpad.net/duplicity/" - (string-join (take (string-split version #\.) 2) ".") + (version-major+minor version) "-series/" version "/+download/duplicity-" version ".tar.gz")) (sha256 diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 2c20c73c23..63805ef9fd 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> +;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,14 +23,14 @@ #:use-module ((guix licenses) #:select (bsd-3)) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages backup) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages file) - #:use-module (gnu packages xml) - #:use-module (srfi srfi-1)) + #:use-module (gnu packages xml)) (define-public cmake (package @@ -39,8 +40,7 @@ (method url-fetch) (uri (string-append "http://www.cmake.org/files/v" - (string-join (take (string-split version #\.) 2) - ".") + (version-major+minor version) "/cmake-" version ".tar.gz")) (sha256 (base32 "11q21vyrr6c6smyjy81k2k07zmn96ggjia9im9cxwvj0n88bm1fq")) @@ -91,8 +91,7 @@ "--mandir=share/man" ,(string-append "--docdir=share/doc/cmake-" - (string-join (take (string-split version #\.) 2) - ".")))))) + (version-major+minor version)))))) %standard-phases))))) (inputs `(("file" ,file) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bbb3053284..d4972468a3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages bison) @@ -42,8 +44,7 @@ #:use-module (gnu packages xml) #:use-module (gnu packages gl) #:use-module (gnu packages compression) - #:use-module (gnu packages xorg) - #:use-module (srfi srfi-1)) + #:use-module (gnu packages xorg)) (define-public brasero (package @@ -706,8 +707,7 @@ featuring mature C, C++ and Python bindings.") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" - (string-join (take (string-split version #\.) 2) - ".") + (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 (base32 "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i")) @@ -1077,7 +1077,7 @@ widgets built in the loading process.") (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" - (string-join (take (string-split version #\.) 2) ".") + (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 (base32 diff --git a/gnu/packages/gnutls.scm b/gnu/packages/gnutls.scm index 3e4fa631d9..166058841f 100644 --- a/gnu/packages/gnutls.scm +++ b/gnu/packages/gnutls.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ #: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 compression) #:prefix guix:) #:use-module (gnu packages) @@ -29,8 +31,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages which) #:use-module (gnu packages texinfo) - #:use-module (gnu packages pkg-config) - #:use-module (srfi srfi-1)) + #:use-module (gnu packages pkg-config)) (define-public libtasn1 (package @@ -69,8 +70,7 @@ specifications.") ;; Note: Releases are no longer on ftp.gnu.org since the ;; schism (after version 3.1.5). (string-append "mirror://gnupg/gnutls/v" - (string-join (take (string-split version #\.) 2) - ".") + (version-major+minor version) "/gnutls-" version ".tar.xz")) (sha256 (base32 diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 2a742cdc56..46c24092e5 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,9 +50,9 @@ #:select (gpl2 gpl2+ gpl3+ lgpl2.1+ lgpl3+)) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) - #:use-module (guix build-system python) - #:use-module (srfi srfi-1)) + #:use-module (guix build-system python)) (define-public mailutils (package @@ -192,9 +193,7 @@ operating systems.") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gmime/" - (string-join (take (string-split version #\.) - 2) - ".") + (version-major+minor version) "/gmime-" version ".tar.xz")) (sha256 (base32 diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 0accc5edef..4aa313b038 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 David Thompson <dthompson2@worcester.edu> ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com> +;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,11 +20,11 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages mpd) - #:use-module (srfi srfi-1) #:use-module (gnu packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages avahi) #:use-module (gnu packages compression) @@ -72,8 +73,7 @@ interfacing MPD in the C, C++ & Objective C languages.") (method url-fetch) (uri (string-append "http://musicpd.org/download/mpd/" - (string-join (take (string-split - version #\.) 2) ".") + (version-major+minor version) "/mpd-" version ".tar.gz")) (sha256 (base32 diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index e7919bc436..a268239d5e 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,7 @@ #:use-module ((guix licenses) #:hide (expat)) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages gcc) @@ -32,8 +34,7 @@ #:use-module (gnu packages xml) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages valgrind) - #:use-module (srfi srfi-1)) + #:use-module (gnu packages valgrind)) (define-public hwloc (package @@ -88,8 +89,7 @@ bind processes, and much more.") (origin (method url-fetch) (uri (string-append "http://www.open-mpi.org/software/ompi/v" - (string-join (take (string-split version #\.) 2) - ".") + (version-major+minor version) "/downloads/openmpi-" version ".tar.bz2")) (sha256 (base32 |