artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build: Update guix package version too.

Browse source 
* guix/git/mes.scm (mes, mes.git)[version]: Mark fields.
* build-aux/GNUmakefile.in (update-hash): Update mes version too.
(release): Remove gen-announce, guix-build dependencies.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2021-01-10 12:06:17 +01:00
parent 3f70993dd2
commit 49b4a0f144
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
build-aux/GNUmakefile.in
View file

@ -310,8 +310,10 @@ $(TARBALL): .tarball-version | generate-ChangeLog
ifdef GUIX ifdef GUIX
update-hash: $(TARBALL) update-hash: $(TARBALL)
$(GUIX) download file://$(PWD)/$< $(GUIX) download file://$(PWD)/$<
sed -i -e 's,(base32 #!mes!# "[^"]*"),(base32 #!mes!# "$(shell $(GUIX) hash $<)"),' guix/git/mes.scm sed -i \
-e 's,version #!mes!# "[^"]*"),version #!mes!# "$(VERSION)"),' \
-e 's,(base32 #!mes!# "[^"]*"),(base32 #!mes!# "$(shell $(GUIX) hash $<)"),' \
guix/git/mes.scm
else else
$(warning update-hash: no guix) $(warning update-hash: no guix)
endif endif
@ -335,7 +337,10 @@ tag:
guix-build: guix-build:
./pre-inst-env $(GUIX) build mes@$(VERSION) --with-source=$(TARBALL) ./pre-inst-env $(GUIX) build mes@$(VERSION) --with-source=$(TARBALL)
release: update-hash | gen-announce guix-build release: update-hash
git commit -m 'guix: mes: Update to $(VERSION).' \
-m '* guix/git/mes.scm (mes)[source]: Update to $(VERSION).' \
guix/git/mes.scm
GPG_KEY_ID:=1A858392E331EAFDB8C27FFBF3C1A0D9C1D65273 GPG_KEY_ID:=1A858392E331EAFDB8C27FFBF3C1A0D9C1D65273
GEN_ANNOUNCE=$(GNULIB)/build-aux/announce-gen GEN_ANNOUNCE=$(GNULIB)/build-aux/announce-gen

8
guix/git/mes.scm
View file

@ -1,5 +1,5 @@
;;; GNU Mes --- Maxwell Equations of Software ;;; GNU Mes --- Maxwell Equations of Software
;;; Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016,2017,2018,2019,2020,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Mes. ;;; This file is part of GNU Mes.
;;; ;;;
@ -160,13 +160,13 @@ extensive examples, including parsers for the Javascript and C99 languages.")
(define-public mes (define-public mes
(package (package
(name "mes") (name "mes")
(version "0.22") (version #!mes!# "0.22")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://ftp.gnu.org/pub/gnu/mes/mes-" version ".tar.gz")) "https://ftp.gnu.org/pub/gnu/mes/mes-" version ".tar.gz"))
(sha256 (sha256
(base32 #!mes!# "04pajp8v31na34ls4730ig5f6miiplhdvkmsb9ls1b8bbmw2vb4n")))) (base32 #!mes!# "16ngnrdlzik19sdzy9d7krg57q6ws3xrckwkk2gs7q4h5f3x1z99"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(supported-systems '("aarch64-linux" "armhf-linux" "i686-linux" "x86_64-linux")) (supported-systems '("aarch64-linux" "armhf-linux" "i686-linux" "x86_64-linux"))
(propagated-inputs (propagated-inputs
@ -207,7 +207,7 @@ Guile.")
(license gpl3+))) (license gpl3+)))
(define-public mes.git (define-public mes.git
(let ((version "0.22") (let ((version #!mes!# "0.22")
(revision "0") (revision "0")
(commit (read-string (open-pipe "git show HEAD | head -1 | cut -d ' ' -f 2" OPEN_READ)))) (commit (read-string (open-pipe "git show HEAD | head -1 | cut -d ' ' -f 2" OPEN_READ))))
(package (package