mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
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
This commit is contained in:
Maxim Cournoyer
parent
011f0580be
commit
e28ab6a6fe
7 changed files with 88 additions and 214 deletions
|
|
@ -1077,18 +1077,11 @@ parameter types for AWS Secrets Manager.")
|
|||
;; 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 "service" "sqs")
|
||||
(delete-all-but "." "service")))))
|
||||
(build-system go-build-system)
|
||||
|
|
@ -11864,18 +11857,11 @@ Handler) and routes @code{WithRouteTag}.")
|
|||
;; 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 "propagators" "autoprop")
|
||||
(delete-all-but "." "propagators")))))
|
||||
(build-system go-build-system)
|
||||
|
|
@ -12109,9 +12095,9 @@ go.opentelemetry.io/otel/trace.")
|
|||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/open-telemetry/opentelemetry-go")
|
||||
(commit (go-version->git-ref version
|
||||
#:subdir "exporters/otlp/otlptrace"))))
|
||||
(url "https://github.com/open-telemetry/opentelemetry-go")
|
||||
(commit (go-version->git-ref version
|
||||
#:subdir "exporters/otlp/otlptrace"))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1kvfbqc56p1h9rh9cvgn37ya6k10613r0f2rhjiwrrkgs2mszk30"))
|
||||
|
|
@ -12124,18 +12110,11 @@ go.opentelemetry.io/otel/trace.")
|
|||
;; 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 "exporters/otlp" "otlptrace")
|
||||
(delete-all-but "." "exporters")
|
||||
;; Submodules with their own go.mod files and packed as separated
|
||||
|
|
@ -12171,9 +12150,9 @@ go.opentelemetry.io/otel/trace.")
|
|||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/open-telemetry/opentelemetry-go")
|
||||
(commit (go-version->git-ref version
|
||||
#:subdir "exporters/otlp/otlptrace/otlptracegrpc"))))
|
||||
(url "https://github.com/open-telemetry/opentelemetry-go")
|
||||
(commit (go-version->git-ref version
|
||||
#:subdir "exporters/otlp/otlptrace/otlptracegrpc"))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1kvfbqc56p1h9rh9cvgn37ya6k10613r0f2rhjiwrrkgs2mszk30"))
|
||||
|
|
@ -12186,18 +12165,11 @@ go.opentelemetry.io/otel/trace.")
|
|||
;; 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 "exporters/otlp/otlptrace" "otlptracegrpc")
|
||||
(delete-all-but "." "exporters")))))
|
||||
(build-system go-build-system)
|
||||
|
|
@ -12234,9 +12206,9 @@ By default the telemetry is sent to @@url{https://localhost:4317}.")
|
|||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/open-telemetry/opentelemetry-go")
|
||||
(commit (go-version->git-ref version
|
||||
#:subdir "exporters/otlp/otlptrace/otlptracehttp"))))
|
||||
(url "https://github.com/open-telemetry/opentelemetry-go")
|
||||
(commit (go-version->git-ref version
|
||||
#:subdir "exporters/otlp/otlptrace/otlptracehttp"))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1kvfbqc56p1h9rh9cvgn37ya6k10613r0f2rhjiwrrkgs2mszk30"))
|
||||
|
|
@ -12249,18 +12221,11 @@ By default the telemetry is sent to @@url{https://localhost:4317}.")
|
|||
;; 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 "exporters/otlp/otlptrace" "otlptracehttp")
|
||||
(delete-all-but "." "exporters")))))
|
||||
(build-system go-build-system)
|
||||
|
|
@ -12328,9 +12293,9 @@ telemetry to be written to an output destination as JSON.")
|
|||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/open-telemetry/opentelemetry-go")
|
||||
(commit (go-version->git-ref version
|
||||
#:subdir "exporters/zipkin"))))
|
||||
(url "https://github.com/open-telemetry/opentelemetry-go")
|
||||
(commit (go-version->git-ref version
|
||||
#:subdir "exporters/zipkin"))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1kvfbqc56p1h9rh9cvgn37ya6k10613r0f2rhjiwrrkgs2mszk30"))
|
||||
|
|
@ -12343,18 +12308,11 @@ telemetry to be written to an output destination as JSON.")
|
|||
;; 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 "exporters" "zipkin")
|
||||
(delete-all-but "." "exporters")))))
|
||||
(build-system go-build-system)
|
||||
|
|
@ -12383,9 +12341,9 @@ telemetry to be written to an output destination as JSON.")
|
|||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/open-telemetry/opentelemetry-go")
|
||||
(commit (go-version->git-ref version
|
||||
#:subdir "log"))))
|
||||
(url "https://github.com/open-telemetry/opentelemetry-go")
|
||||
(commit (go-version->git-ref version
|
||||
#:subdir "log"))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0sb36qyq389fif9qp5iiqp6w41dfcwi95gb0bsbvznvijhd8c1cc"))
|
||||
|
|
@ -12398,18 +12356,11 @@ telemetry to be written to an output destination as JSON.")
|
|||
;; 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 "." "log")))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
|
|
@ -12450,8 +12401,8 @@ OpenTelemetry API.")))
|
|||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/open-telemetry/opentelemetry-go")
|
||||
(commit (go-version->git-ref version #:subdir "sdk"))))
|
||||
(url "https://github.com/open-telemetry/opentelemetry-go")
|
||||
(commit (go-version->git-ref version #:subdir "sdk"))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0sb36qyq389fif9qp5iiqp6w41dfcwi95gb0bsbvznvijhd8c1cc"))
|
||||
|
|
@ -12464,18 +12415,11 @@ OpenTelemetry API.")))
|
|||
;; 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 "." "sdk")
|
||||
(delete-file-recursively "sdk/log")
|
||||
(delete-file-recursively "sdk/metric")))))
|
||||
|
|
@ -12506,9 +12450,9 @@ OpenTelemetry API.")))
|
|||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/open-telemetry/opentelemetry-go")
|
||||
(commit (go-version->git-ref version
|
||||
#:subdir "sdk/log"))))
|
||||
(url "https://github.com/open-telemetry/opentelemetry-go")
|
||||
(commit (go-version->git-ref version
|
||||
#:subdir "sdk/log"))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0sb36qyq389fif9qp5iiqp6w41dfcwi95gb0bsbvznvijhd8c1cc"))
|
||||
|
|
@ -12521,18 +12465,11 @@ OpenTelemetry API.")))
|
|||
;; 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 "sdk" "log")
|
||||
(delete-all-but "." "sdk")))))
|
||||
(build-system go-build-system)
|
||||
|
|
@ -12561,9 +12498,9 @@ OpenTelemetry API.")))
|
|||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/open-telemetry/opentelemetry-go")
|
||||
(commit (go-version->git-ref version
|
||||
#:subdir "sdk/metric"))))
|
||||
(url "https://github.com/open-telemetry/opentelemetry-go")
|
||||
(commit (go-version->git-ref version
|
||||
#:subdir "sdk/metric"))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0sb36qyq389fif9qp5iiqp6w41dfcwi95gb0bsbvznvijhd8c1cc"))
|
||||
|
|
@ -12576,18 +12513,11 @@ OpenTelemetry API.")))
|
|||
;; 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 "sdk" "metric")
|
||||
(delete-all-but "." "sdk")))))
|
||||
(build-system go-build-system)
|
||||
|
|
@ -12804,8 +12734,8 @@ the standard @code{context} package to store request-scoped values.")
|
|||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/googleapis/go-genproto")
|
||||
(commit (go-version->git-ref version #:subdir "googleapis/api"))))
|
||||
(url "https://github.com/googleapis/go-genproto")
|
||||
(commit (go-version->git-ref version #:subdir "googleapis/api"))))
|
||||
(modules '((guix build utils)
|
||||
(ice-9 ftw)
|
||||
(srfi srfi-26)))
|
||||
|
|
@ -12815,18 +12745,11 @@ the standard @code{context} package to store request-scoped values.")
|
|||
;; 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))))
|
||||
;; Submodules with their own go.mod files and packaged separately:
|
||||
;;
|
||||
;; - google.golang.org/genproto/googleapis/api/apikeys
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue