nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: f3: Update to 7.1. 

* gnu/packages/disk.scm (f3): Update to 7.1.
[arguments]: Remove ‘fix-makefile’ phase.
Move installation of experimental (now called ‘extra’) tools to their
own phases instead of cleverly patching Makefile.
This commit is contained in:
Tobias Geerinckx-Rice 2018-08-14 21:42:22 +02:00
parent b3307bfdf9
commit af514eadb2
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/disk.scm
View File

@ -395,7 +395,7 @@ systems. Output format is completely customizable.")
(define-public f3 (define-public f3
(package (package
(name "f3") (name "f3")
(version "6.0") (version "7.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -405,7 +405,7 @@ systems. Output format is completely customizable.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1azi10ba0h9z7m0gmfnyymmfqb8380k9za8hn1rrw1s442hzgnz2")))) "0zglsmz683jg7f9wc6vmgljyg9w87pbnjw5x4w6x02w8233zvjqf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no check target '(#:tests? #f ; no check target
@ -413,17 +413,13 @@ systems. Output format is completely customizable.")
(string-append "PREFIX=" %output)) (string-append "PREFIX=" %output))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure) ; no configure script
(add-before 'build 'fix-makefile (add-after 'build 'build-extra
(lambda _ (lambda* (#:key make-flags #:allow-other-keys)
(substitute* "Makefile" (apply invoke "make" "extra" make-flags)))
;; Install without setting owner and group (add-after 'build 'install-extra
(("\\$\\(INSTALL\\) -oroot -groot ") "$(INSTALL) ") (lambda* (#:key make-flags #:allow-other-keys)
;; also build and install experimental tools (apply invoke "make" "install-extra" make-flags))))))
(("^all: ") "all: $(EXPERIMENTAL_TARGETS) ")
(("^install: ") "install-all: ")
(("^install-experimental: ") "install: install-all "))
#t)))))
(inputs (inputs
`(("eudev" ,eudev) `(("eudev" ,eudev)
("parted" ,parted))) ("parted" ,parted)))