gnu: Use built-in delete-all-but.world-rebuild

* gnu/packages/astronomy.scm (phd2): Use built-in delete-all-but.
* gnu/packages/bioinformatics.scm (pynsptools-examples-files): Likewise.
* gnu/packages/containers.scm
  (go-github-com-opencontainers-image-spec-schema)
  (go-go-podman-io-common, go-go-podman-io-image-v5)
  (go-go-podman-io-storage): Likewise.
* gnu/packages/databases.scm (mysql): Likewise.
* gnu/packages/debug.scm (fandango): Likewise.
* gnu/packages/electronics.scm (hal, librepcb, nextpnr, surelog):
  Likewise.
* gnu/packages/emacs-xyz.scm (emacs-smartparens): Likewise.
* gnu/packages/emulators.scm (dolphin-emu, libretro-dolphin-emu)
  (libretro-slang-shaders, mgba, pcsx2, retroarch-minimal): Likewise.
* gnu/packages/game-development.scm (sfml): Likewise.
* gnu/packages/gnome.scm (gjs): Likewise.
* gnu/packages/golang-apps.scm (godoc): Likewise.
* gnu/packages/golang-build.scm (go-golang-org-x-tools-go-expect)
  (go-golang-org-x-tools-go-packages-packagestest)
  (go-golang-org-x-tools-godoc): Likewise.
* gnu/packages/golang-check.scm
  (go-github-com-go-openapi-swag-jsonutils-fixtures-test): Likewise.
* gnu/packages/golang-web.scm (go-github-com-containerd-containerd-api)
  (go-cloud-google-com-go-auth, go-cloud-google-com-go-auth-oauth2adapt)
  (go-cloud-google-com-go-iam, go-cloud-google-com-go-kms)
  (go-cloud-google-com-go-logging, go-cloud-google-com-go-longrunning)
  (go-cloud-google-com-go-monitoring, go-cloud-google-com-go-profiler)
  (go-cloud-google-com-go-security, go-cloud-google-com-go-spanner)
  (go-cloud-google-com-go-storage, go-cloud-google-com-go-trace)
  (go-github-com-aws-aws-sdk-go-v2-config)
  (go-github-com-aws-aws-sdk-go-v2-credentials)
  (go-github-com-aws-aws-sdk-go-v2-feature-ec2-imds)
  (go-github-com-aws-aws-sdk-go-v2-internal-configsources)
  (go-github-com-aws-aws-sdk-go-v2-internal-endpoints-v2)
  (go-github-com-aws-aws-sdk-go-v2-service-cloudwatchlogs)
  (go-github-com-aws-aws-sdk-go-v2-service-kms)
  (go-github-com-aws-aws-sdk-go-v2-service-sns)
  (go-github-com-aws-aws-sdk-go-v2-service-sqs)
  (go-github-com-aws-aws-sdk-go-v2-service-ssm)
  (go-github-com-aws-smithy-go-metrics-smithyotelmetrics)
  (go-github-com-azure-azure-sdk-for-go-sdk-azcore)
  (go-github-com-azure-azure-sdk-for-go-sdk-azidentity)
  (go-github-com-azure-azure-sdk-for-go-sdk-internal)
  (go-github-com-azure-azure-sdk-for-go-sdk-security-keyvault-azkeys)
  (go-github-com-azure-azure-sdk-for-go-sdk-security-keyvault-internal)
  (go-github-com-azure-azure-sdk-for-go-sdk-storage-azblob)
  (go-github-com-azure-azure-sdk-for-go-sdk-storage-azfile)
  (go-github-com-envoyproxy-go-control-plane-envoy)
  (go-github-com-go-openapi-swag-loading)
  (go-github-com-googlecloudplatform-opentelemetry-operations-go-exporter-metric)
  (go-github-com-googlecloudplatform-opentelemetry-operations-go-exporter-trace)
  (go-github-com-googlecloudplatform-opentelemetry-operations-go-internal-cloudmock)
  (go-github-com-googlecloudplatform-opentelemetry-operations-go-internal-resourcemapping)
  (go-github-com-grpc-ecosystem-go-grpc-middleware-providers-prometh)
  (go-github-com-hashicorp-go-secure-stdlib-parseutil)
  (go-github-com-jtolio-crawlspace-tools)
  (go-github-com-moby-moby-client)
  (go-github-com-opentracing-contrib-go-grpc-test)
  (go-github-com-sigstore-sigstore-pkg-signature-kms-aws)
  (go-github-com-sigstore-sigstore-pkg-signature-kms-azure)
  (go-github-com-sigstore-sigstore-pkg-signature-kms-gcp)
  (go-github-com-sigstore-sigstore-pkg-signature-kms-hashivault)
  (go-go-etcd-io-etcd-api-v3, go-go-etcd-io-etcd-client-pkg-v3)
  (go-go-opentelemetry-io-auto-sdk)
  (go-go-opentelemetry-io-contrib-detectors-aws-ec2-v2)
  (go-go-opentelemetry-io-contrib-detectors-aws-ecs)
  (go-go-opentelemetry-io-contrib-detectors-gcp)
  (go-go-opentelemetry-io-contrib-instrumentation-net-http-httptrace)
  (go-go-opentelemetry-io-contrib-propagators-autoprop)
  (go-go-opentelemetry-io-otel-bridge-opentracing)
  (go-go-opentelemetry-io-otel-exporters-otlp-otlpmetric-otlpmetricgrpc)
  (go-go-opentelemetry-io-otel-exporters-otlp-otlpmetric-otlpmetrichttp)
  (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-prometheus)
  (go-go-opentelemetry-io-otel-exporters-stdout-stdoutmetric)
  (go-go-opentelemetry-io-otel-exporters-stdout-stdouttrace)
  (go-go-opentelemetry-io-otel-exporters-zipkin)
  (go-go-opentelemetry-io-otel-log)
  (go-go-opentelemetry-io-otel-metric-x)
  (go-go-opentelemetry-io-otel-sdk, go-go-opentelemetry-io-otel-sdk-log)
  (go-go-opentelemetry-io-otel-sdk-metric)
  (go-golang-getoutline-org-sdk-x)
  (go-google-golang-org-genproto-googleapis-api)
  (go-google-golang-org-genproto-googleapis-bytestream)
  (go-google-golang-org-grpc-cmd-protoc-gen-go-grpc)
  (go-google-golang-org-grpc-examples)
  (go-k8s-io-kube-openapi-test-integration): Likewise.
* gnu/packages/golang-xyz.scm (go-github-com-ajstarks-deck-generate)
  (go-github-com-charmbracelet-x-ansi)
  (go-github-com-charmbracelet-x-cellbuf)
  (go-github-com-charmbracelet-x-errors)
  (go-github-com-charmbracelet-x-term)
  (go-github-com-charmbracelet-x-xpty)
  (go-github-com-containerd-errdefs-pkg)
  (go-github-com-go-openapi-swag-jsonutils)
  (go-github-com-go-openapi-swag-yamlutils)
  (go-github-com-moby-sys-atomicwriter, go-github-com-moby-sys-devices)
  (go-github-com-moby-sys-mount, go-go-uber-org-zap-exp)
  (go-modernc-org-ccgo-v4, go-sigs-k8s-io-kustomize-cmd-config):
  Likewise.
* gnu/packages/image-processing.scm (opencv): Likewise.
* gnu/packages/ipfs.scm (go-github-com-ipfs-shipyard-nopfs-ipfs):
  Likewise.
* gnu/packages/kubernetes.scm (go-go-etcd-io-etcd-client-v3)
  go-go-etcd-io-etcd-pkg-v3, go-go-etcd-io-etcd-server-v3): Likewise.
* gnu/packages/mail.scm (neomutt): Likewise.
* gnu/packages/mpi.scm (openmpi-5): Likewise.
* gnu/packages/protobuf.scm (protobuf-6): Likewise.
* gnu/packages/python-science.scm (python-vaex-core): Likewise.
* gnu/packages/specifications.scm (specification-astropy-data):
  Likewise.
* gnu/packages/taler.scm (taler-docs): Likewise.
* gnu/packages/version-control.scm (libfossil): Likewise.
* gnu/packages/vnc.scm (turbovnc): Likewise.

Merges: https://codeberg.org/guix/guix/pulls/5312
Reviewed-by: Maxim Cournoyer <maxim@guixotic.coop>
Reviewed-by: Cayetano Santos <csantosb@inventati.org>
Reviewed-by: Gabriel Wicki <gabriel@erlikon.ch>
Co-authored-by: Nguyễn Gia Phong <cnx@loang.net>
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>

1 files changed, 7 insertions, 15 deletions

diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index c354c32bff9..f8b924ad7a3 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -600,24 +600,16 @@ different data arrays similar to those available in the numdiff software.")
               (file-name (git-file-name name version))
               (snippet
                #~(begin
-                   (use-modules (guix build utils)
-                                (ice-9 ftw)
-                                (srfi srfi-26))
+                   (use-modules (guix build utils))
                    ;; Delete any bundled .jar files.
                    (for-each delete-file (find-files "." "\\.jar$"))
-                   (define (delete-all-but directory . preserve)
-                     (with-directory-excursion directory
-                       (let* ((pred (negate (cut member <>
-                                                 (cons* "." ".." preserve))))
-                              (items (scandir "." pred)))
-                         (for-each (cut delete-file-recursively <>) items))))
                    (delete-all-but "3rdparty"
-                                   "fastcv"     ;TODO: Unbundle these
-                                   "libspng"
-                                   "libtim-vx"
-                                   "orbbecsdk"
-                                   "quirc"
-                                   "zlib-ng")))
+                     "fastcv"           ;TODO: Unbundle these
+                     "libspng"
+                     "libtim-vx"
+                     "orbbecsdk"
+                     "quirc"
+                     "zlib-ng")))
               (sha256
                (base32
                 "15w4fqjqv5k1yw70jbjsnlgiky39mqpy05rvmm2fbyjrif4kbgkl"))))