diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-03-01 18:04:12 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-03-01 18:04:12 +0100 |
| commit | 86990eeda2a85acd3640059c0b681f1eddbacba0 (patch) | |
| tree | df0d4f0b86dad2b260b7354d451993c141dde5e7 /gnu/packages/autotools.scm | |
| parent | 6d796220c417a34100c282a7fa1f9afb6ac00339 (diff) | |
| parent | 52fb59ef253d9550ca4cfa095c2c0c2360d79095 (diff) | |
| download | guix-86990eeda2a85acd3640059c0b681f1eddbacba0.tar guix-86990eeda2a85acd3640059c0b681f1eddbacba0.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/autotools.scm')
| -rw-r--r-- | gnu/packages/autotools.scm | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 355e66f42a..846e318aa1 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org> ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2015, 2017 Mark H Weaver <mhw@netris.org> @@ -315,6 +315,21 @@ intuitive format and then Automake works with Autoconf to produce a robust Makefile, simplifying the entire process for the developer.") (license gpl2+))) ; some files are under GPLv3+ +(define-public automake-1.16 + ;; Make this the default on the next rebuild cycle. + (package + (inherit automake) + (version "1.16") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/automake/automake-" + version ".tar.xz")) + (sha256 + (base32 + "12jvcmkcmd5p14b41w9f7ixd3sca97pymd6lqbkwnl8qn6bjv3zr")) + (patches + (search-patches "automake-skip-amhello-tests.patch")))))) + (define-public libtool (package (name "libtool") |