diff --git a/build-aux/GNUmakefile.in b/build-aux/GNUmakefile.in index 95e8be41..ac6ed678 100644 --- a/build-aux/GNUmakefile.in +++ b/build-aux/GNUmakefile.in @@ -310,8 +310,10 @@ $(TARBALL): .tarball-version | generate-ChangeLog ifdef GUIX update-hash: $(TARBALL) $(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 $(warning update-hash: no guix) endif @@ -335,7 +337,10 @@ tag: guix-build: ./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 GEN_ANNOUNCE=$(GNULIB)/build-aux/announce-gen diff --git a/guix/git/mes.scm b/guix/git/mes.scm index 72b9436a..3571cc42 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,2020,2021 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Mes. ;;; @@ -160,13 +160,13 @@ extensive examples, including parsers for the Javascript and C99 languages.") (define-public mes (package (name "mes") - (version "0.22") + (version #!mes!# "0.22") (source (origin (method url-fetch) (uri (string-append "https://ftp.gnu.org/pub/gnu/mes/mes-" version ".tar.gz")) (sha256 - (base32 #!mes!# "04pajp8v31na34ls4730ig5f6miiplhdvkmsb9ls1b8bbmw2vb4n")))) + (base32 #!mes!# "16ngnrdlzik19sdzy9d7krg57q6ws3xrckwkk2gs7q4h5f3x1z99")))) (build-system gnu-build-system) (supported-systems '("aarch64-linux" "armhf-linux" "i686-linux" "x86_64-linux")) (propagated-inputs @@ -207,7 +207,7 @@ Guile.") (license gpl3+))) (define-public mes.git - (let ((version "0.22") + (let ((version #!mes!# "0.22") (revision "0") (commit (read-string (open-pipe "git show HEAD | head -1 | cut -d ' ' -f 2" OPEN_READ)))) (package