summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Kądziołka <kuba@kadziolka.net>2020-06-22 03:35:03 +0200
committerJakub Kądziołka <kuba@kadziolka.net>2020-06-22 03:35:03 +0200
commiteeef77d9d371f4169210ffcca98e3a45ff9ff229 (patch)
treee8a7ad7cbe89350ae5686f1ba803752113f7baf8
parentMerge branch 'master' into core-updates (diff)
downloadguix-eeef77d9d371f4169210ffcca98e3a45ff9ff229.tar.gz
guix-eeef77d9d371f4169210ffcca98e3a45ff9ff229.tar.bz2
guix-eeef77d9d371f4169210ffcca98e3a45ff9ff229.tar.xz
gnu: bison-3.6: Remove package.
The `bison-3.6' variable is no longer necessary as `bison' itself already provides this version. * gnu/packages/bison.scm (bison-3.6): Remove variable. * gnu/packages/engineering.scm (poke)[native-inputs]: Replace bison-3.6 with bison.
-rw-r--r--gnu/packages/bison.scm11
-rw-r--r--gnu/packages/engineering.scm4
2 files changed, 1 insertions, 14 deletions
diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm
index 2ffdf47..ff0cc5a 100644
--- a/gnu/packages/bison.scm
+++ b/gnu/packages/bison.scm
@@ -65,17 +65,6 @@ grammar. It is versatile enough to have many applications, from parsers for
65simple tools through complex programming languages.") 65simple tools through complex programming languages.")
66 (license gpl3+))) 66 (license gpl3+)))
67 67
68(define-public bison-3.6
69 (package
70 (inherit bison)
71 (version "3.6.3")
72 (source
73 (origin
74 (method url-fetch)
75 (uri (string-append "mirror://gnu/bison/bison-" version ".tar.xz"))
76 (sha256
77 (base32 "0gdpnjh6ra9xa9vj6hzjdf0c04x4pjyy8vssm3qdb7fya4v7knq6"))))))
78
79(define-public bison-3.0 68(define-public bison-3.0
80 (package 69 (package
81 (inherit bison) 70 (inherit bison)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index f2d32e6..96a2bd8 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2704,9 +2704,7 @@ GUI.")
2704 ;; The GUI, which we elide, requires tcl and tk. 2704 ;; The GUI, which we elide, requires tcl and tk.
2705 (native-inputs `(("autoconf" ,autoconf) 2705 (native-inputs `(("autoconf" ,autoconf)
2706 ("automake" ,automake) 2706 ("automake" ,automake)
2707 ;; Requires bison 3.6+ but we currently only have 3.5. 2707 ("bison" ,bison)
2708 ;; Bison 3.6 will be available in the next core update.
2709 ("bison-3.6" ,bison-3.6)
2710 ("clisp" ,clisp) 2708 ("clisp" ,clisp)
2711 ("dejagnu" ,dejagnu) 2709 ("dejagnu" ,dejagnu)
2712 ("flex" ,flex) 2710 ("flex" ,flex)