From b3307bfdf9ebf6808fe15dce9fd2712db6f5b909 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice
Date: Tue, 14 Aug 2018 21:26:46 +0200
Subject: gnu: f3: Don't use unstable tarball.

* gnu/packages/disk.scm (f3)[source]: Use GIT-FETCH and GIT-FILE-NAME.
---
 gnu/packages/disk.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'gnu/packages/disk.scm')

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 9d05b2444..e101d33e2 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -398,13 +398,14 @@ systems.  Output format is completely customizable.")
     (version "6.0")
     (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"))))
+        "1azi10ba0h9z7m0gmfnyymmfqb8380k9za8hn1rrw1s442hzgnz2"))))
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f ; no check target
-- 
cgit v1.3


From af514eadb2ef77b890daab17f872350d009a4c18 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice
Date: Tue, 14 Aug 2018 21:42:22 +0200
Subject: 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.
---
 gnu/packages/disk.scm | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'gnu/packages/disk.scm')

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index e101d33e2..f1b3f265f 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -395,7 +395,7 @@ systems.  Output format is completely customizable.")
 (define-public f3
   (package
     (name "f3")
-    (version "6.0")
+    (version "7.1")
     (source
      (origin
       (method git-fetch)
@@ -405,25 +405,21 @@ systems.  Output format is completely customizable.")
       (file-name (git-file-name name version))
       (sha256
        (base32
-        "1azi10ba0h9z7m0gmfnyymmfqb8380k9za8hn1rrw1s442hzgnz2"))))
+        "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)))
-- 
cgit v1.3