diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-08-16 20:56:38 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-16 20:56:38 +0200 |
| commit | df570bf271536399993b39e7ea2ea0452bb6cde4 (patch) | |
| tree | 32cde458f90c599691831fc33cfbd4efcca9e9eb /gnu/packages/disk.scm | |
| parent | 37d203985e2817b0962129384e8b993a1bb92de9 (diff) | |
| parent | 5f9a9945b5747e5ec284f8b116b2e8cc1b9064d7 (diff) | |
| download | guix-df570bf271536399993b39e7ea2ea0452bb6cde4.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/disk.scm')
| -rw-r--r-- | gnu/packages/disk.scm | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 9d05b2444e..f1b3f265fe 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -395,34 +395,31 @@ systems. Output format is completely customizable.") (define-public f3 (package (name "f3") - (version "6.0") + (version "7.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/AltraMayor/f3/archive/" - "v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/AltraMayor/f3.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1mgbzc1swvgil45md1336j0aqkmkhwmpxical0ln5g09b2qxsanp")))) + "0zglsmz683jg7f9wc6vmgljyg9w87pbnjw5x4w6x02w8233zvjqf")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no check target + '(#:tests? #f ; no check target #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'fix-makefile - (lambda _ - (substitute* "Makefile" - ;; Install without setting owner and group - (("\\$\\(INSTALL\\) -oroot -groot ") "$(INSTALL) ") - ;; also build and install experimental tools - (("^all: ") "all: $(EXPERIMENTAL_TARGETS) ") - (("^install: ") "install-all: ") - (("^install-experimental: ") "install: install-all ")) - #t))))) + (delete 'configure) ; no configure script + (add-after 'build 'build-extra + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "extra" make-flags))) + (add-after 'build 'install-extra + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "install-extra" make-flags)))))) (inputs `(("eudev" ,eudev) ("parted" ,parted))) |