From 9af076245f2e9e708314e4267c2f7c732aaff3b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 2 Jan 2017 14:42:56 +0100 Subject: [PATCH] gnu: gfortran: Remove non-'eq?' duplicate of gfortran@4.9. * gnu/packages/gcc.scm (gfortran): Turn into an alias for GFORTRAN-4.9. --- gnu/packages/gcc.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 0f3f36e7d9..cfd33f85ab 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2014, 2015, 2016 Ricardo Wurmus ;;; Copyright © 2015 Andreas Enge @@ -494,8 +494,11 @@ as the 'native-search-paths' field." %generic-search-paths)) (define-public gfortran - (custom-gcc gcc "gfortran" '("fortran") - %generic-search-paths)) + ;; Note: Update this when GCC changes! We cannot use + ;; (custom-gcc gcc "fortran" …) because that would lead to a package object + ;; that is not 'eq?' with GFORTRAN-4.9, and thus 'fold-packages' would + ;; report two gfortran@4.9 that are in fact identical. + gfortran-4.9) (define-public gfortran-5 (custom-gcc gcc-5 "gfortran" '("fortran")