futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: tla2tools: Build from a known commit.

Browse Source 
Reported by Andrew Patterson <andrewpatt7@gmail.com>.

* gnu/packages/java.scm (tla2tools)[version, source]: Use a commit (and
GIT-VERSION) instead of a tag.
This commit is contained in:
Tobias Geerinckx-Rice 2021-09-27 14:55:47 +02:00
parent a4b4dc8f99
commit 86d316b334
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnu/packages/java.scm
View File

@ -14091,16 +14091,21 @@ can be interpreted by IDEs and static analysis tools to improve code analysis.")
license:asl2.0)))) license:asl2.0))))
(define-public tla2tools (define-public tla2tools
(let* ((version "1.8.0") ;; This package was originally based on the "v1.8.0" tag, but that merely
(tag (string-append "v" version))) ;; points to the moving master branch. That might be because the ‘latest
;; release’ at GitHub is currently 1.7.1. We'll see! For now, rather than
;; downgrade to 1.7.1 proper, use the commit that we originally dubbed 1.8.0.
(let* ((release "1.7.1")
(revision "0")
(commit "6932e19083fc6df42473464857fc1280cb5aaecc"))
(package (package
(name "tla2tools") (name "tla2tools")
(version version) (version (git-version release revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/tlaplus/tlaplus") (url "https://github.com/tlaplus/tlaplus")
(commit tag))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
@ -14124,7 +14129,7 @@ can be interpreted by IDEs and static analysis tools to improve code analysis.")
#:make-flags '("-f" ,build-xml) #:make-flags '("-f" ,build-xml)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; Replace packed libs with references to jars in store ;; Replace packed libs with references to jars in store
(add-after 'unpack 'replace-libs (add-after 'unpack 'replace-libs
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(define (input-jar input) (define (input-jar input)
@ -14147,12 +14152,12 @@ can be interpreted by IDEs and static analysis tools to improve code analysis.")
("junit-4.12.jar" . "java-junit") ("junit-4.12.jar" . "java-junit")
("easymock-3.3.1.jar" . "java-easymock"))) ("easymock-3.3.1.jar" . "java-easymock")))
;; Retain a tiny subset of the original X-Git-* ;; Retain a tiny subset of the original X-Git-*
;; manifest values just to aid in debugging ;; manifest values just to aid in debugging.
(substitute* ,build-xml (substitute* ,build-xml
(("\\$\\{git.tag\\}") ,tag)))) (("\\$\\{git.tag\\}") (string-append "v" ,release)))))
(add-before 'check 'prepare-tests (add-before 'check 'prepare-tests
(lambda _ (lambda _
;; pcal tests write to cfg files ;; The pcal tests write to .cfg files.
(for-each (cut chmod <> #o644) (for-each (cut chmod <> #o644)
(find-files (string-append ,tlatools (find-files (string-append ,tlatools
"/test-model/pcal") "/test-model/pcal")