summary refs log tree commit diff
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
parent43bc7855113bd725d464dd9eaa1e54e78edfaab1 (diff)
downloadguix-eeef77d9d371f4169210ffcca98e3a45ff9ff229.tar.gz
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 2ffdf47655..ff0cc5a694 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
 simple tools through complex programming languages.")
     (license gpl3+)))
 
-(define-public bison-3.6
-  (package
-    (inherit bison)
-    (version "3.6.3")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnu/bison/bison-" version ".tar.xz"))
-      (sha256
-       (base32 "0gdpnjh6ra9xa9vj6hzjdf0c04x4pjyy8vssm3qdb7fya4v7knq6"))))))
-
 (define-public bison-3.0
   (package
     (inherit bison)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index f2d32e663f..96a2bd8808 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2704,9 +2704,7 @@ GUI.")
       ;; The GUI, which we elide, requires tcl and tk.
       (native-inputs `(("autoconf" ,autoconf)
                        ("automake" ,automake)
-                       ;; Requires bison 3.6+ but we currently only have 3.5.
-                       ;; Bison 3.6 will be available in the next core update.
-                       ("bison-3.6" ,bison-3.6)
+                       ("bison" ,bison)
                        ("clisp" ,clisp)
                        ("dejagnu" ,dejagnu)
                        ("flex" ,flex)