From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark H Weaver Subject: [PATCHES] Some cleanups for core-updates Date: Fri, 27 Feb 2015 13:06:46 -0500 Message-ID: <87h9u76xft.fsf@netris.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37074) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRPJL-00085x-TH for guix-devel@gnu.org; Fri, 27 Feb 2015 13:06:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YRPJF-0005Sh-SQ for guix-devel@gnu.org; Fri, 27 Feb 2015 13:06:51 -0500 Received: from world.peace.net ([50.252.239.5]:43926) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRPJF-0005Sc-Lj for guix-devel@gnu.org; Fri, 27 Feb 2015 13:06:45 -0500 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain Here are two commits I'd like to push to core-updates. Comments and suggestions welcome. Mark --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Move-autoconf-style-phases-after-the-unpack-phas.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH 1/2] gnu: Move autoconf-style phases after the unpack phase >From d30e55dcf10b4d090926763dc63725410f31aa9c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 27 Feb 2015 11:53:06 -0500 Subject: [PATCH 1/2] gnu: Move autoconf-style phases after the unpack phase. * gnu/packages/audio.scm (soundtouch)[arguments]: Move 'bootstrap' after 'unpack'. Remove custom /usr/bin/file patching, which will now be handled by the 'patch-usr-bin-file' phase. * gnu/packages/emacs.scm (emacs-w3m)[arguments]: Rename 'pre-configure' phase to 'autoconf' and move it after 'unpack'. * gnu/packages/fontutils.scm (libuninameslist)[arguments]: Move 'bootstrap' phase after 'unpack'. * gnu/packages/libevent.scm (libuv)[arguments]: Move 'autogen' phase after 'unpack'. Run "sh autogen.sh" instead of "./autogen.sh". * gnu/packages/linux.scm (bridge-utils)[arguments]: Move 'bootstrap' phase after 'unpack'. * gnu/packages/mail.scm (libetpan)[arguments]: Move 'autogen' phase after 'unpack'. Run "sh autogen.sh" instead of "./autogen.sh". Setenv "NOCONFIGURE" before running autogen.sh. * gnu/packages/package-management.scm (guix-devel)[arguments]: Move 'bootstrap' phase after 'unpack'. Run "sh autogen.sh" instead of "./autogen.sh". * gnu/packages/rdf.scm (lrdf)[arguments]: Move 'autoreconf' phase after 'remove-out-of-tree-references' phase. * gnu/packages/tor.scm (privoxy)[arguments]: Move 'autoconf' phase after 'unpack'. * gnu/packages/web.scm (libpsl)[arguments]: Move 'bootstrap' phase after 'unpack'. Run "sh autogen.sh" instead of "./autogen.sh". Remove 'fix-autogen-shebang' phase. --- gnu/packages/audio.scm | 9 +++------ gnu/packages/emacs.scm | 4 ++-- gnu/packages/fontutils.scm | 4 ++-- gnu/packages/libevent.scm | 6 +++--- gnu/packages/linux.scm | 4 ++-- gnu/packages/mail.scm | 13 +++++-------- gnu/packages/package-management.scm | 6 +++--- gnu/packages/rdf.scm | 6 +++--- gnu/packages/tor.scm | 6 +++--- gnu/packages/web.scm | 17 +++++------------ 10 files changed, 31 insertions(+), 44 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 52feea3..bc21c9f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -804,13 +804,10 @@ stretching and pitch scaling of audio. This package = contains the library.") ("file" ,file))) (arguments '(#:phases - (alist-cons-before - 'configure 'bootstrap + (alist-cons-after + 'unpack 'bootstrap (lambda _ - (unless (zero? (system* "sh" "bootstrap")) - (error "bootstrap failed")) - (substitute* '("configure") - (("/usr/bin/file") "file"))) + (zero? (system* "sh" "bootstrap"))) %standard-phases))) (home-page "http://www.surina.net/soundtouch/") (synopsis diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index f4d7ac9..b2a151a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -309,8 +309,8 @@ operations.") out "/share/images/emacs-w3m"))) #:tests? #f ; no check target #:phases - (alist-cons-before - 'configure 'pre-configure + (alist-cons-after + 'unpack 'autoconf (lambda _ (zero? (system* "autoconf"))) (alist-cons-before diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 14f42a9..52e34e5 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -278,8 +278,8 @@ smooth contours with constant curvature at the spline j= oins.") ("automake" ,automake) ("libtool" ,libtool))) (arguments - `(#:phases (alist-cons-before - 'configure 'bootstrap + `(#:phases (alist-cons-after + 'unpack 'bootstrap (lambda _ (zero? (system* "autoreconf" "-vi"))) %standard-phases))) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 64892bf..2afae3f 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -73,12 +73,12 @@ loop.") "1ys2wlypdbv59yywn91d5vl329z50mi7ivi3fj5rjm4mr9g3wnmr")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-before - 'configure 'autogen + '(#:phases (alist-cons-after + 'unpack 'autogen (lambda _ ;; Fashionable people don't run 'make dist' these days,= so ;; we need to do that ourselves. - (zero? (system* "./autogen.sh"))) + (zero? (system* "sh" "autogen.sh"))) %standard-phases) =20 ;; XXX: Some tests want /dev/tty, attempt to make connections, etc. diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4fe6f88..b7eedc6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1005,8 +1005,8 @@ Linux-based operating systems.") (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake))) (arguments - '(#:phases (alist-cons-before - 'configure 'bootstrap + '(#:phases (alist-cons-after + 'unpack 'bootstrap (lambda _ (zero? (system* "autoreconf" "-vf"))) %standard-phases) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index dc33c8c..17988cc 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2013, 2014, 2015 Ludovic Court=C3=A8s -;;; Copyright =C2=A9 2014 Mark H Weaver +;;; Copyright =C2=A9 2014, 2015 Mark H Weaver ;;; Copyright =C2=A9 2014 Ian Denhardt ;;; Copyright =C2=A9 2014 Sou Bunnbu ;;; Copyright =C2=A9 2014 Julien Lepiller @@ -432,14 +432,11 @@ useful features.") `(("curl" ,curl) ("expat" ,expat))) (arguments - '(#:phases (alist-cons-before - 'configure 'autogen + '(#:phases (alist-cons-after + 'unpack 'autogen (lambda _ - (system* "./autogen.sh")) ;; Note: this fails because = the - ;; generated configure script uses /bin/sh. It is - ;; replaced in the configure phase by the correct - ;; value. TODO: replace the configure phase by the - ;; autogen phase and have the SHELL variable be r= eplaced + (setenv "NOCONFIGURE" "true") + (zero? (system* "sh" "autogen.sh"))) %standard-phases) #:configure-flags '("--disable-static" "--disable-db"))) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-man= agement.scm index 97e96c7..65b4e9b 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -156,15 +156,15 @@ the Nix package manager.") (arguments (substitute-keyword-arguments (package-arguments guix-0.8.1) ((#:phases phases) - `(alist-cons-before - 'configure 'bootstrap + `(alist-cons-after + 'unpack 'bootstrap (lambda _ ;; Make sure 'msgmerge' can modify the PO files. (for-each (lambda (po) (chmod po #o666)) (find-files "." "\\.po$")) =20 - (zero? (system* "./bootstrap"))) + (zero? (system* "sh" "bootstrap"))) ,phases)))) (native-inputs `(("autoconf" ,(autoconf-wrapper)) diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 5102ebe..8edc2f4 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -140,9 +140,9 @@ Java Lucene text search engine API to C++.") (substitute* "examples/Makefile.am" (("instances_test remove_test") "instances_test") (("\\$\\(TESTS\\) remove_test") "$(TESTS)"))) - (alist-cons-before - 'configure 'autoreconf - (lambda* (#:key inputs #:allow-other-keys) + (alist-cons-after + 'remove-out-of-tree-references 'autoreconf + (lambda _ (zero? (system* "autoreconf" "-vfi"))) %standard-phases)))) (inputs diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index db0415a..73becbb 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2013, 2014 Ludovic Court=C3=A8s -;;; Copyright =C2=A9 2014 Mark H Weaver +;;; Copyright =C2=A9 2014, 2015 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -99,8 +99,8 @@ rejects UDP traffic from the application you're using.") #:configure-flags (list (string-append "--sysconfdir=3D" (assoc-ref %outputs "out") "/etc/privoxy")) - #:phases (alist-cons-before - 'configure 'autoconf + #:phases (alist-cons-after + 'unpack 'autoconf (lambda _ ;; Unfortunately, this is not a tarball produced by ;; "make dist". diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5296c43..f0f9746 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2,7 +2,7 @@ ;;; Copyright =C2=A9 2013, 2015 Andreas Enge ;;; Copyright =C2=A9 2013 Aljosha Papsch ;;; Copyright =C2=A9 2014, 2015 Ludovic Court=C3=A8s -;;; Copyright =C2=A9 2014 Mark H Weaver +;;; Copyright =C2=A9 2014, 2015 Mark H Weaver ;;; Copyright =C2=A9 2015 Ricardo Wurmus ;;; Copyright =C2=A9 2015 Taylan Ulrich Bay=C4=B1rl=C4=B1/Kammer ;;; @@ -258,18 +258,11 @@ for efficient socket-like bidirectional reliable comm= unication channels.") ("which" ,which) ("libtool" ,libtool))) (arguments - `(#:phases (alist-cons-before - 'bootstrap 'fix-autogen-shebang + `(#:phases (alist-cons-after + 'unpack 'bootstrap (lambda _ - (substitute* "autogen.sh" - ;; Removing -e as it causes the whole script to fail = when - ;; `which gtkdocize` fails. - (("# !/bin/sh -e") (string-append "#!" (which "sh")))= )) - (alist-cons-before - 'patch-usr-bin-file 'bootstrap - (lambda _ - (zero? (system* "./autogen.sh"))) - %standard-phases)))) + (zero? (system* "sh" "autogen.sh"))) + %standard-phases))) (home-page "https://github.com/rockdaboot/libpsl") (synopsis "C library for the Publix Suffix List") (description --=20 2.2.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0002-gnu-Add-file-name-fields-for-github-source-tarballs-.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH 2/2] gnu: Add 'file-name' fields for github source tarballs without a name >From 7d85c52c8afa3b3ca10c2fb0e467e1ecc8731182 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 27 Feb 2015 12:23:27 -0500 Subject: [PATCH 2/2] gnu: Add 'file-name' fields for github source tarballs without a name. * gnu/packages/aarddict.scm (aarddict), gnu/packages/algebra.scm (arb), gnu/packages/audio.scm (jack-2, lvtk), gnu/packages/bioinformatics.scm (bedops, bedtools, bowtie), gnu/packages/game-development.scm (tiled), gnu/packages/games.scm (minetest-data, minetest, retroarch), gnu/packages/jrnl.scm (jrnl), gnu/packages/kde.scm (qjson), gnu/packages/libevent.scm (libuv), gnu/packages/linux.scm (pflask), gnu/packages/mail.scm (offlineimap, libetpan), gnu/packages/maths.scm (arpack-ng), gnu/packages/ninja.scm (ninja), gnu/packages/nutrition.scm (gourmet), gnu/packages/python.scm (python-cairocffi), gnu/packages/rdf.scm (lrdf), gnu/packages/ruby.scm (ruby-i18n), gnu/packages/sxiv.scm (sxiv): Add 'file-name' field to origin. --- gnu/packages/aarddict.scm | 1 + gnu/packages/algebra.scm | 1 + gnu/packages/audio.scm | 2 ++ gnu/packages/bioinformatics.scm | 3 +++ gnu/packages/game-development.scm | 2 ++ gnu/packages/games.scm | 3 +++ gnu/packages/jrnl.scm | 2 ++ gnu/packages/kde.scm | 1 + gnu/packages/libevent.scm | 1 + gnu/packages/linux.scm | 1 + gnu/packages/mail.scm | 2 ++ gnu/packages/maths.scm | 1 + gnu/packages/ninja.scm | 1 + gnu/packages/nutrition.scm | 2 ++ gnu/packages/python.scm | 1 + gnu/packages/rdf.scm | 1 + gnu/packages/ruby.scm | 3 ++- gnu/packages/sxiv.scm | 1 + 18 files changed, 28 insertions(+), 1 deletion(-) diff --git a/gnu/packages/aarddict.scm b/gnu/packages/aarddict.scm index 33bd7b4..76c7aa4 100644 --- a/gnu/packages/aarddict.scm +++ b/gnu/packages/aarddict.scm @@ -33,6 +33,7 @@ (method url-fetch) (uri (string-append "https://github.com/aarddict/desktop/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "12h7m0z7nd7rg8avpi9syd265k0rhh4vbdh464nq0jzdg8m9p28c")))) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 2fe26a4..da8dab9 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -215,6 +215,7 @@ fast arithmetic.") (uri (string-append "https://github.com/fredrik-johansson/arb/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0a8cgzznkmr59ngj4di9a37b5h4i00gbnixnxlwd34bcbflvjzyr= ")))) (build-system gnu-build-system) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index bc21c9f..42449e8 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -284,6 +284,7 @@ synchronous execution of all clients, and low latency o= peration.") "https://github.com/jackaudio/jack2/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "03b0iiyk3ng3vh5s8gaqwn565vik7910p56mlbk512bw3dhbdwc8")))) @@ -507,6 +508,7 @@ software.") (uri (string-append "https://github.com/lvtk/lvtk/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd")))) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.= scm index dbafd94..f6df298 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -43,6 +43,7 @@ (method url-fetch) (uri (string-append "https://github.com/bedops/bedops/archiv= e/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0wmg6j0icimlrnsidaxrzf3hfgjvlkkcwvpdg7n4gg7hdv2m9ni5")))) @@ -100,6 +101,7 @@ computational cluster.") (method url-fetch) (uri (string-append "https://github.com/arq5x/bedtools2/arch= ive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "16aq0w3dmbd0853j32xk9jin4vb6v6fgakfyvrsmsjizzbn3fpfl")))) @@ -149,6 +151,7 @@ BED, GFF/GTF, VCF.") (method url-fetch) (uri (string-append "https://github.com/BenLangmead/bowtie2/= archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "15dnbqippwvhyh9zqjhaxkabk7lm1xbh1nvar1x4b5kwm117zijn")) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-developm= ent.scm index fefdf67..0e6a1d5 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2014 Tom=C3=A1=C5=A1 =C4=8Cech +;;; Copyright =C2=A9 2015 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -58,6 +59,7 @@ is used in some video games and movies.") (method url-fetch) (uri (string-append "https://github.com/bjorn/tiled/archive/= v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "03a15vbzjfwc8dpifbjvd0gnr208mzmdkgs2nlc8zq6z0a4h4jqd")))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 789a02e..5843ca6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -606,6 +606,7 @@ for common mesh file formats, and collision detection.") (uri (string-append "https://github.com/minetest/minetest_game/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0hzb27srv6f2j84dpxx2p0p0aaq9vdp5jvbrfpklb5q5ssdjxvc6")))) @@ -646,6 +647,7 @@ for common mesh file formats, and collision detection.") (uri (string-append "https://github.com/minetest/minetest/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0h223svzkvp63b77nqfxy7k8whw4543gahs3kxd3x4myi5ax5z5f")))) @@ -792,6 +794,7 @@ reference interpreter, using Glk API.") (method url-fetch) (uri (string-append "https://github.com/libretro/RetroArch/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1iqcrb076xiih20sk8n1w79xsp4fb8pj4vkmdc1xn562h56y4nxx")))) (build-system gnu-build-system) diff --git a/gnu/packages/jrnl.scm b/gnu/packages/jrnl.scm index bdd4471..26401f8 100644 --- a/gnu/packages/jrnl.scm +++ b/gnu/packages/jrnl.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2014 Eric Bavier +;;; Copyright =C2=A9 2015 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,7 @@ (method url-fetch) (uri (string-append "https://github.com/maebert/jrnl/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "019ky09sj5i7frmca0imv4jm46mn3f4lzah2wmiwxh22cisj7ksn")))) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 96acf0a..c655686 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -96,6 +96,7 @@ (method url-fetch) (uri (string-append "https://github.com/flavio/qjson/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "163fspi0xc705irv79qw861fmh68pjyla9vx3kqiq6xrdhb9834j")))) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 2afae3f..a48c524 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -68,6 +68,7 @@ loop.") (method url-fetch) (uri (string-append "https://github.com/joyent/libuv/archive= /v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1ys2wlypdbv59yywn91d5vl329z50mi7ivi3fj5rjm4mr9g3wnmr")))) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b7eedc6..4bd3592 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1851,6 +1851,7 @@ particular the 'perf' command.") (method url-fetch) (uri (string-append "https://github.com/ghedo/pflask/archive= /v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1g8fjj67dfkc2s0852l9vqi1pm61gp4rxbpzbzg780f5s5hd1fys")))) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 17988cc..0dfc282 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -283,6 +283,7 @@ and corrections. It is based on a Bayesian filter.") (method url-fetch) (uri (string-append "https://github.com/OfflineIMAP/offlinei= map/" "archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "00k84qagph3xnxss6rkxm61x07ngz8fvffx4z9jyw5baf3cdd32p")))) @@ -416,6 +417,7 @@ useful features.") (method url-fetch) (uri (string-append "https://github.com/dinhviethoa/" name "/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "05qyqx2c1ppb1jnrs3m52i60f9xlxfxdmb9dnwg4vqjv8kwv2q= kr")))) (build-system gnu-build-system) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 8c4eb3b..e3e6e59 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -222,6 +222,7 @@ be output in text, PostScript, PDF or HTML.") (method url-fetch) (uri (string-append "https://github.com/opencollab/arpack-ng/archiv= e/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1fwch6vipms1ispzg2djvbzv5wag36f1dmmr3xs3mbp6imfyhvff")))) diff --git a/gnu/packages/ninja.scm b/gnu/packages/ninja.scm index 7416b67..2483cc5 100644 --- a/gnu/packages/ninja.scm +++ b/gnu/packages/ninja.scm @@ -32,6 +32,7 @@ (method url-fetch) (uri (string-append "https://github.com/martine/ninja/" "archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1h3yfwcfl61v493vna6jia2fizh8rpig7qw2504cvkr6gid3p5bw")) diff --git a/gnu/packages/nutrition.scm b/gnu/packages/nutrition.scm index 72bd5b0..6363798 100644 --- a/gnu/packages/nutrition.scm +++ b/gnu/packages/nutrition.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2014 Eric Bavier +;;; Copyright =C2=A9 2015 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +37,7 @@ (method url-fetch) (uri (string-append "https://github.com/thinkle/gourmet/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1qvz175arzqm10lpfx8ffadrgirs3240zzqcp0h7sl53qfwx7v8k")))) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7569770..e044e19 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2678,6 +2678,7 @@ support for Python 3 and PyPy. It is based on cffi.") ;; The archive on pypi is missing the 'utils' directory! (uri (string-append "https://github.com/SimonSapin/cairocffi/archive= /v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "03w5p62sp3nqiccx864sbq0jvh7946277jqx3rcc3dch5xwfvv51")))) diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 8edc2f4..a76b2c3 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -120,6 +120,7 @@ Java Lucene text search engine API to C++.") (method url-fetch) (uri (string-append "https://github.com/swh/LRDF/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "18p2flb2sv2hq6w2qkd29z9c7knnwqr3f12i2srshlzx6vwkm05s")))) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7fc7993..4a4ab5d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2014 Pjotr Prins ;;; Copyright =C2=A9 2014 Ludovic Court=C3=A8s -;;; Copyright =C2=A9 2014 Mark H Weaver +;;; Copyright =C2=A9 2014, 2015 Mark H Weaver ;;; Copyright =C2=A9 2014 David Thompson ;;; ;;; This file is part of GNU Guix. @@ -122,6 +122,7 @@ a focus on simplicity and productivity.") (method url-fetch) (uri (string-append "https://github.com/svenfuchs/i18n/archi= ve/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1fdhnhh1p5g8vibv44d770z8nq208zrms3m2nswdvr54072y1m6k")))) diff --git a/gnu/packages/sxiv.scm b/gnu/packages/sxiv.scm index 4c068e5..ee5e822 100644 --- a/gnu/packages/sxiv.scm +++ b/gnu/packages/sxiv.scm @@ -34,6 +34,7 @@ (uri (string-append "https://github.com/muennich/sxiv/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "03hxy5ff7xbs15rhlbpgx8xmvmpjlffp0m4528975hg16sqa2c4s")))) --=20 2.2.1 --=-=-=--