diff options
| author | Patrick Norton <patrick.147.norton@gmail.com> | 2026-01-02 07:21:13 -0500 |
|---|---|---|
| committer | Nguyễn Gia Phong <cnx@loang.net> | 2026-08-31 11:00:20 +0900 |
| commit | f817b7fbbd8513562a641529107c87deab310a4f (patch) | |
| tree | 01b3f5fdfd96182b791a3ccb8aaafb0c53a6c308 /gnu/packages/containers.scm | |
| parent | 7fb8a151ff6699e7a6b9ed3144e3930b702a7814 (diff) | |
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>
Diffstat (limited to 'gnu/packages/containers.scm')
| -rw-r--r-- | gnu/packages/containers.scm | 76 |
1 files changed, 6 insertions, 70 deletions
diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index dc6612c17f9..976c565c072 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm | |||
| @@ -491,25 +491,8 @@ The binary is called @command{gvproxy}.") | |||
| 491 | (file-name (git-file-name name version)) | 491 | (file-name (git-file-name name version)) |
| 492 | (sha256 | 492 | (sha256 |
| 493 | (base32 "0jg1wfbr6rva24cz6q6d73wgaridzkh9sclzm2dwxpiwmbkcas38")) | 493 | (base32 "0jg1wfbr6rva24cz6q6d73wgaridzkh9sclzm2dwxpiwmbkcas38")) |
| 494 | (modules '((guix build utils) | 494 | (modules '((guix build utils))) |
| 495 | (ice-9 ftw) | 495 | (snippet #~(delete-all-but "." "schema")))) |
| 496 | (srfi srfi-26))) | ||
| 497 | (snippet | ||
| 498 | #~(begin | ||
| 499 | (define (delete-all-but directory . preserve) | ||
| 500 | (define (directory? x) | ||
| 501 | (and=> (stat x #f) | ||
| 502 | (compose (cut eq? 'directory <>) stat:type))) | ||
| 503 | (with-directory-excursion directory | ||
| 504 | (let* ((pred | ||
| 505 | (negate (cut member <> (append '("." "..") preserve)))) | ||
| 506 | (items (scandir "." pred))) | ||
| 507 | (for-each (lambda (item) | ||
| 508 | (if (directory? item) | ||
| 509 | (delete-file-recursively item) | ||
| 510 | (delete-file item))) | ||
| 511 | items)))) | ||
| 512 | (delete-all-but "." "schema"))))) | ||
| 513 | (build-system go-build-system) | 496 | (build-system go-build-system) |
| 514 | (arguments | 497 | (arguments |
| 515 | (list | 498 | (list |
| @@ -621,24 +604,9 @@ unprivileged user, known as \"Rootless mode\".") | |||
| 621 | (file-name (git-file-name name version)) | 604 | (file-name (git-file-name name version)) |
| 622 | (sha256 | 605 | (sha256 |
| 623 | (base32 "040snqsg3il98pz9w8442wdzwm2rm07yqbch87f4jic4p4s0707s")) | 606 | (base32 "040snqsg3il98pz9w8442wdzwm2rm07yqbch87f4jic4p4s0707s")) |
| 624 | (modules '((guix build utils) | 607 | (modules '((guix build utils))) |
| 625 | (ice-9 ftw) | ||
| 626 | (srfi srfi-26))) | ||
| 627 | (snippet | 608 | (snippet |
| 628 | #~(begin | 609 | #~(begin |
| 629 | (define (delete-all-but directory . preserve) | ||
| 630 | (define (directory? x) | ||
| 631 | (and=> (stat x #f) | ||
| 632 | (compose (cut eq? 'directory <>) stat:type))) | ||
| 633 | (with-directory-excursion directory | ||
| 634 | (let* ((pred | ||
| 635 | (negate (cut member <> (append '("." "..") preserve)))) | ||
| 636 | (items (scandir "." pred))) | ||
| 637 | (for-each (lambda (item) | ||
| 638 | (if (directory? item) | ||
| 639 | (delete-file-recursively item) | ||
| 640 | (delete-file item))) | ||
| 641 | items)))) | ||
| 642 | (delete-all-but "." "common") | 610 | (delete-all-but "." "common") |
| 643 | ;; Module name has been changed upstream. | 611 | ;; Module name has been changed upstream. |
| 644 | (substitute* (find-files "." "\\.go$") | 612 | (substitute* (find-files "." "\\.go$") |
| @@ -728,24 +696,9 @@ those files in github.com/containers repos.") | |||
| 728 | (file-name (git-file-name name version)) | 696 | (file-name (git-file-name name version)) |
| 729 | (sha256 | 697 | (sha256 |
| 730 | (base32 "17qjzgc3h89sa0y8qkviz5gry1kvkkm3j79yhn78c7gbmqcx5v0j")) | 698 | (base32 "17qjzgc3h89sa0y8qkviz5gry1kvkkm3j79yhn78c7gbmqcx5v0j")) |
| 731 | (modules '((guix build utils) | 699 | (modules '((guix build utils))) |
| 732 | (ice-9 ftw) | ||
| 733 | (srfi srfi-26))) | ||
| 734 | (snippet | 700 | (snippet |
| 735 | #~(begin | 701 | #~(begin |
| 736 | (define (delete-all-but directory . preserve) | ||
| 737 | (define (directory? x) | ||
| 738 | (and=> (stat x #f) | ||
| 739 | (compose (cut eq? 'directory <>) stat:type))) | ||
| 740 | (with-directory-excursion directory | ||
| 741 | (let* ((pred | ||
| 742 | (negate (cut member <> (append '("." "..") preserve)))) | ||
| 743 | (items (scandir "." pred))) | ||
| 744 | (for-each (lambda (item) | ||
| 745 | (if (directory? item) | ||
| 746 | (delete-file-recursively item) | ||
| 747 | (delete-file item))) | ||
| 748 | items)))) | ||
| 749 | (delete-all-but "." "image") | 702 | (delete-all-but "." "image") |
| 750 | ;; This is a workaround to provide a correct import-path. | 703 | ;; This is a workaround to provide a correct import-path. |
| 751 | (rename-file "image" "tmp") | 704 | (rename-file "image" "tmp") |
| @@ -863,25 +816,8 @@ also implements \"simple image signing\". It's a successor of | |||
| 863 | (file-name (git-file-name name version)) | 816 | (file-name (git-file-name name version)) |
| 864 | (sha256 | 817 | (sha256 |
| 865 | (base32 "0ywj80wkpyq2yhizsdlfh0n2fxip75042rsk7jm4vyp98bb18rb6")) | 818 | (base32 "0ywj80wkpyq2yhizsdlfh0n2fxip75042rsk7jm4vyp98bb18rb6")) |
| 866 | (modules '((guix build utils) | 819 | (modules '((guix build utils))) |
| 867 | (ice-9 ftw) | 820 | (snippet #~(delete-all-but "." "storage")))) |
| 868 | (srfi srfi-26))) | ||
| 869 | (snippet | ||
| 870 | #~(begin | ||
| 871 | (define (delete-all-but directory . preserve) | ||
| 872 | (define (directory? x) | ||
| 873 | (and=> (stat x #f) | ||
| 874 | (compose (cut eq? 'directory <>) stat:type))) | ||
| 875 | (with-directory-excursion directory | ||
| 876 | (let* ((pred | ||
| 877 | (negate (cut member <> (append '("." "..") preserve)))) | ||
| 878 | (items (scandir "." pred))) | ||
| 879 | (for-each (lambda (item) | ||
| 880 | (if (directory? item) | ||
| 881 | (delete-file-recursively item) | ||
| 882 | (delete-file item))) | ||
| 883 | items)))) | ||
| 884 | (delete-all-but "." "storage"))))) | ||
| 885 | (build-system go-build-system) | 821 | (build-system go-build-system) |
| 886 | (arguments | 822 | (arguments |
| 887 | (list | 823 | (list |
