Merge branch 'master' into staging

1 files changed, 16 insertions, 19 deletions

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 15d0401090..d03c915f9d 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2015 Mathieu Lirzin <mthl@gnu.org>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2016, 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2016, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
@@ -367,20 +367,15 @@ output without any plausibility checks.")
 (define-public gptfdisk
   (package
     (name "gptfdisk")
-    (version "1.0.8")
+    (version "1.0.9")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://sourceforge/gptfdisk/gptfdisk/"
                           version "/gptfdisk-" version ".tar.gz"))
       (sha256
-       (base32 "1py6klp1b7rni1qjj110snyyxafhx092carlii5vrnh4y1b9ilcm"))))
+       (base32 "1hjh5m77fmfq5m44yy61kchv7mbfgx026aw3jy5qxszsjckavzns"))))
     (build-system gnu-build-system)
-    (inputs
-     `(("gettext" ,gettext-minimal)
-       ("ncurses" ,ncurses)
-       ("popt" ,popt)
-       ("util-linux" ,util-linux "lib"))) ;libuuid
     (arguments
      `(#:test-target "test"
        #:phases
@@ -388,8 +383,7 @@ output without any plausibility checks.")
          (add-after 'unpack 'fix-include-directory
            (lambda _
              (substitute* "gptcurses.cc"
-               (("ncursesw/ncurses.h") "ncurses.h"))
-             #t))
+               (("ncursesw/ncurses.h") "ncurses.h"))))
          (delete 'configure)            ; no configure script
          (replace 'install
            ;; There's no ‘make install’ target.
@@ -405,6 +399,12 @@ output without any plausibility checks.")
                (install-file "fixparts.8" man)
                (install-file "gdisk.8" man)
                (install-file "sgdisk.8" man)))))))
+    (native-inputs
+     (list gettext-minimal))
+    (inputs
+     (list ncurses
+           popt
+           `(,util-linux "lib"))) ;libuuid
     (home-page "https://www.rodsbooks.com/gdisk/")
     (synopsis "Low-level GPT disk partitioning and formatting")
     (description "GPT fdisk (aka gdisk) is a text-mode partitioning tool that
@@ -416,14 +416,14 @@ scheme.")
 (define-public ddrescue
   (package
     (name "ddrescue")
-    (version "1.25")
+    (version "1.26")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://gnu/ddrescue/ddrescue-"
                           version ".tar.lz"))
       (sha256
-       (base32 "0qqh38izl5ppap9a5izf3hijh94k65s3zbfkczd4b7x04syqwlyf"))))
+       (base32 "07smgh9f2p90zgyyrddzjwaz0v8glh5d95qiv7yhv0frj0xcs4z5"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags (list (string-append "CXX=" ,(cxx-for-target)))))
@@ -1098,7 +1098,7 @@ on your file system and offers to remove it.  @command{rmlint} can find:
 (define-public lf
   (package
     (name "lf")
-    (version "25")
+    (version "27")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1107,14 +1107,11 @@ on your file system and offers to remove it.  @command{rmlint} can find:
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "014cybng6hc9y3ma74hpc1ac3rkz4ydflx8jbmvx81rdd08rzwz7"))))
+                "1piym8za0iw2s8yryh39y072f90mzisv89ffvn1jzb71f71mbfqa"))))
     (build-system go-build-system)
     (native-inputs
-     `(("go-github.com-mattn-go-runewidth" ,go-github.com-mattn-go-runewidth)
-       ("go-github.com-nsf-termbox-go" ,go-github.com-nsf-termbox-go)
-       ("go-golang-org-x-term" ,go-golang-org-x-term)
-       ("go-gopkg-in-djherbis-times-v1" ,go-gopkg-in-djherbis-times-v1)
-       ("go-github-com-gdamore-tcell-v2" ,go-github-com-gdamore-tcell-v2)))
+     (list go-github.com-mattn-go-runewidth go-golang-org-x-term
+           go-gopkg-in-djherbis-times-v1 go-github-com-gdamore-tcell-v2))
     (arguments
      `(#:import-path "github.com/gokcehan/lf"))
     (home-page "https://github.com/gokcehan/lf")