gnu: turbovnc: Simplify 'delete-all-but' in snippet.

* gnu/packages/vnc.scm (turbovnc) [source] <snippet>: Simplify.
* gnu/packages/astronomy.scm (phd2): Likewise.
* gnu/packages/emulators.scm (libretro-dolphin-emu)
(retroarch-minimal): Likewise.
* gnu/packages/golang-web.scm (go-github-com-aws-aws-sdk-go-v2-service-sqs)
(go-go-opentelemetry-io-contrib-propagators-autoprop)
(go-go-opentelemetry-io-otel-exporters-otlp-otlptrace)
(go-go-opentelemetry-io-otel-exporters-otlp-otlptrace-otlptracegrpc)
(go-go-opentelemetry-io-otel-exporters-otlp-otlptrace-otlptracehttp)
(go-go-opentelemetry-io-otel-exporters-zipkin)
(go-go-opentelemetry-io-otel-log, go-go-opentelemetry-io-otel-sdk)
(go-go-opentelemetry-io-otel-sdk-log, go-go-opentelemetry-io-otel-sdk-metric)
(go-google-golang-org-genproto-googleapis-api): Likewise.
* gnu/packages/golang-xyz.scm (go-go-uber-org-zap-exp): Likewise.
* gnu/packages/ipfs.scm (go-github-com-ipfs-shipyard-nopfs-ipfs): Likewise.
* gnu/packages/mpi.scm (openmpi-5): Likewise.

Change-Id: I286ff1e949ccb97f9369f2a172c8559e3884dba7

1 files changed, 6 insertions, 13 deletions

diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index 96153a4415a..a128b8fb610 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -1531,9 +1531,9 @@ code prior to it getting merged into @code{go-cid}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ipfs-shipyard/nopfs")
-             (commit (go-version->git-ref version
-                                          #:subdir "ipfs"))))
+              (url "https://github.com/ipfs-shipyard/nopfs")
+              (commit (go-version->git-ref version
+                                           #:subdir "ipfs"))))
        (file-name (git-file-name name version))
        (sha256
         (base32 "00lwizzdfdx6kynxddal3all6q9dhwqanpkw0d0vxlwik4nkvxa5"))
@@ -1546,18 +1546,11 @@ code prior to it getting merged into @code{go-cid}.")
             ;; Consider to implement it as re-usable procedure in
             ;; guix/build/utils or guix/build-system/go.
             (define (delete-all-but directory . preserve)
-              (define (directory? x)
-                (and=> (stat x #f)
-                       (compose (cut eq? 'directory <>) stat:type)))
               (with-directory-excursion directory
-                (let* ((pred
-                        (negate (cut member <> (append '("." "..") preserve))))
+                (let* ((pred (negate (cut member <>
+                                          (cons* "." ".." preserve))))
                        (items (scandir "." pred)))
-                  (for-each (lambda (item)
-                              (if (directory? item)
-                                  (delete-file-recursively item)
-                                  (delete-file item)))
-                            items))))
+                  (for-each (cut delete-file-recursively <>) items))))
             (delete-all-but "." "ipfs")))))
     (build-system go-build-system)
     (arguments