bootstrap: mes: Add mes-0.19.

* gnu/packages/mes.scm (mes-0.19): New variable.
(mes): Inherit it.
* gnu/packages/make-bootstrap.scm (%mes-minimal): Likewise.
This commit is contained in:
Jan Nieuwenhuizen 2019-09-29 10:39:40 +02:00
parent 066cb9bab2
commit bffd8fcd31
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
2 changed files with 23 additions and 39 deletions

View File

@ -633,45 +633,12 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
#t)))) #t))))
(inputs `(("mescc-tools" ,%mescc-tools-static))))) (inputs `(("mescc-tools" ,%mescc-tools-static)))))
;; (define-public %mes-minimal-stripped
;; ;; A minimal Mes without documentation dependencies, for bootstrap.
;; (let ((triplet "i686-unknown-linux-gnu"))
;; (package
;; (inherit mes)
;; (name "mes-minimal-stripped")
;; (native-inputs
;; `(("guile" ,guile-2.2)))
;; (arguments
;; `(#:system "i686-linux"
;; #:strip-binaries? #f
;; #:configure-flags '("--mes")
;; #:phases
;; (modify-phases %standard-phases
;; (delete 'patch-shebangs)
;; (add-after 'install 'strip-install
;; (lambda _
;; (let* ((out (assoc-ref %outputs "out"))
;; (share (string-append out "/share")))
;; (delete-file-recursively (string-append out "/lib/guile"))
;; (delete-file-recursively (string-append share "/guile"))
;; (delete-file-recursively (string-append share "/mes/scaffold"))
;; (for-each delete-file
;; (find-files
;; (string-append share "/mes/lib") "\\.(h|c)"))
;; (for-each (lambda (dir)
;; (for-each remove-store-references
;; (find-files (string-append out "/" dir)
;; ".*")))
;; '("bin" "share/mes")))))))))))
;; Two packages: first build static, bare minimum content. ;; Two packages: first build static, bare minimum content.
(define-public %mes-minimal (define-public %mes-minimal
;; A minimal Mes without documentation. ;; A minimal Mes without documentation.
(let ((triplet "i686-unknown-linux-gnu")) (let ((triplet "i686-unknown-linux-gnu"))
(package (package
(inherit mes) (inherit mes-0.19)
(name "mes-minimal") (name "mes-minimal")
(native-inputs (native-inputs
`(("guile" ,guile-2.2))) `(("guile" ,guile-2.2)))

View File

@ -38,6 +38,7 @@
#:use-module (guix utils)) #:use-module (guix utils))
(define-public nyacc-0.86 (define-public nyacc-0.86
;; Nyacc used for bootstrap.
(package (package
(name "nyacc") (name "nyacc")
(version "0.86.0") (version "0.86.0")
@ -91,22 +92,23 @@ extensive examples, including parsers for the Javascript and C99 languages.")
(inputs (inputs
`(("guile" ,guile-2.2))))) `(("guile" ,guile-2.2)))))
(define-public mes (define-public mes-0.19
;; Mes used for bootstrap.
(package (package
(name "mes") (name "mes")
(version "0.20") (version "0.19")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/mes/" (uri (string-append "mirror://gnu/mes/"
"mes-" version ".tar.gz")) "mes-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"04pajp8v31na34ls4730ig5f6miiplhdvkmsb9ls1b8bbmw2vb4n")))) "15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(supported-systems '("i686-linux" "x86_64-linux")) (supported-systems '("i686-linux" "x86_64-linux"))
(propagated-inputs (propagated-inputs
`(("mescc-tools" ,mescc-tools) `(("mescc-tools" ,mescc-tools-0.5.2)
("nyacc" ,nyacc))) ("nyacc" ,nyacc-0.86)))
(native-inputs (native-inputs
`(("guile" ,guile-2.2) `(("guile" ,guile-2.2)
,@(let ((target-system (or (%current-target-system) ,@(let ((target-system (or (%current-target-system)
@ -135,6 +137,21 @@ Guile.")
(home-page "https://gnu.org/software/mes") (home-page "https://gnu.org/software/mes")
(license gpl3+))) (license gpl3+)))
(define-public mes
(package
(inherit mes-0.19)
(version "0.20")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/mes/"
"mes-" version ".tar.gz"))
(sha256
(base32
"04pajp8v31na34ls4730ig5f6miiplhdvkmsb9ls1b8bbmw2vb4n"))))
(propagated-inputs
`(("mescc-tools" ,mescc-tools)
("nyacc" ,nyacc)))))
(define-public mescc-tools-0.5.2 (define-public mescc-tools-0.5.2
;; Mescc-tools used for bootstrap. ;; Mescc-tools used for bootstrap.
(let ((commit "bb062b0da7bf2724ca40f9002b121579898d4ef7") (let ((commit "bb062b0da7bf2724ca40f9002b121579898d4ef7")