[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: gnu: axoloti-runtime: Don't use unstable tarball.
From: |
guix-commits |
Subject: |
01/03: gnu: axoloti-runtime: Don't use unstable tarball. |
Date: |
Sat, 5 Oct 2019 16:23:57 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 07c1a10ef6cd24a0a02aefb281931fdd6fa3895e
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Sat Oct 5 19:30:13 2019 +0200
gnu: axoloti-runtime: Don't use unstable tarball.
* gnu/packages/axoloti.scm (axoloti-runtime)[source]: Use GIT-FETCH and
GIT-FILE-NAME.
(axoloti-patcher)[arguments]: Add ‘make-git-checkout-writable’ phase.
---
gnu/packages/axoloti.scm | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm
index 6a76ad6..a3ca6b6 100644
--- a/gnu/packages/axoloti.scm
+++ b/gnu/packages/axoloti.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2019 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -20,6 +21,7 @@
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu)
#:use-module (guix build-system ant)
@@ -64,20 +66,21 @@
(package
(name "axoloti-runtime")
(version "1.0.12")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/axoloti/axoloti/"
- "archive/" version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "1dynk6h0nixp4zihpirpqa4vi8fq1lhm443jsmvhk135ykhf364p"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Remove pre-built Java binaries.
- (delete-file-recursively "lib/")
- #t))))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/axoloti/axoloti.git")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "05hyr9qx9dplp0gkx4v34i17972b3f512qndnarzy4wzfpnp0s3b"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Remove pre-built Java binaries.
+ (delete-file-recursively "lib/")
+ #t))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no check target
@@ -231,6 +234,10 @@ runtime.")
,@%gnu-build-system-modules)
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'make-git-checkout-writable
+ (lambda _
+ (for-each make-file-writable (find-files "."))
+ #t))
(delete 'configure)
(replace 'build
(lambda* (#:key inputs #:allow-other-keys)