From 14caa774f7d7ef0bb411ec8dfb23c1b3c1680bf4 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Tue, 6 Oct 2020 16:42:59 +0200 Subject: [PATCH] Revert "guix: nyacc: Update to 1.03.0." This does not work yet, sorry for the noise. This reverts commit 70b2942286ecc0b40798ac4e1fdaa9cd56a48aaf. --- guix/git/mes.scm | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/guix/git/mes.scm b/guix/git/mes.scm index c040215b..3cf75f2c 100644 --- a/guix/git/mes.scm +++ b/guix/git/mes.scm @@ -1,5 +1,5 @@ ;;; GNU Mes --- Maxwell Equations of Software -;;; Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Mes. ;;; @@ -89,7 +89,7 @@ get_machine.") (home-page "https://savannah.nongnu.org/projects/mescc-tools") (license gpl3+))) -(define-public nyacc-0.99 +(define-public nyacc (package (name "nyacc") (version "0.99.0") @@ -128,20 +128,6 @@ extensive examples, including parsers for the Javascript and C99 languages.") (home-page "https://savannah.nongnu.org/projects/nyacc") (license (list gpl3+ lgpl3+)))) -(define-public nyacc - (package - (inherit nyacc) - (version "1.03.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://savannah/nyacc/nyacc-" - version ".tar.gz")) - (sha256 - (base32 - "1vdiqpm3p0ndmpmkzcpkpjvgklfsk4wxrhkixdxbczpafdfl635p")))) - (inputs - `(("guile" ,guile-3.0))))) - (define-public mes (package (name "mes") @@ -156,9 +142,9 @@ extensive examples, including parsers for the Javascript and C99 languages.") (supported-systems '("aarch64-linux" "armhf-linux" "i686-linux" "x86_64-linux")) (propagated-inputs `(("mescc-tools" ,mescc-tools) - ("nyacc" ,guile3-nyacc))) + ("nyacc" ,nyacc))) (native-inputs - `(("guile" ,guile-3.0) + `(("guile" ,guile-2.2) ,@(cond ((string-prefix? "x86_64-linux" (or (%current-target-system) (%current-system))) ;; Use cross-compiler rather than #:system "i686-linux" to get