amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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 2025-08-25 08:47:29 +09:00
parent 011f0580be
commit e28ab6a6fe
No known key found for this signature in database
GPG key ID: 1260E46482E63562
7 changed files with 88 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/astronomy.scm
View file

@ -1553,18 +1553,11 @@ R. Seaman's protocol}
#~(begin #~(begin
;; XXX: 'delete-all-but' is copied from the turbovnc package. ;; XXX: 'delete-all-but' is copied from the turbovnc package.
(define (delete-all-but directory . preserve) (define (delete-all-but directory . preserve)
(define (directory? x)
(and=> (stat x #f)
(compose (cut eq? 'directory <>) stat:type)))
(with-directory-excursion directory (with-directory-excursion directory
(let* ((pred (let* ((pred (negate (cut member <>
(negate (cut member <> (append '("." "..") preserve)))) (cons* "." ".." preserve))))
(items (scandir "." pred))) (items (scandir "." pred)))
(for-each (lambda (item) (for-each (cut delete-file-recursively <>) items))))
(if (directory? item)
(delete-file-recursively item)
(delete-file item)))
items))))
(delete-all-but "thirdparty" "thirdparty.cmake"))))) (delete-all-but "thirdparty" "thirdparty.cmake")))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments

26
gnu/packages/emulators.scm
View file

@ -643,18 +643,11 @@ turbo speed, networked multiplayer, and graphical enhancements.")
#~(begin #~(begin
;; XXX: 'delete-all-but' is copied from the turbovnc package. ;; XXX: 'delete-all-but' is copied from the turbovnc package.
(define (delete-all-but directory . preserve) (define (delete-all-but directory . preserve)
(define (directory? x)
(and=> (stat x #f)
(compose (cut eq? 'directory <>) stat:type)))
(with-directory-excursion directory (with-directory-excursion directory
(let* ((pred (let* ((pred (negate (cut member <>
(negate (cut member <> (append '("." "..") preserve)))) (cons* "." ".." preserve))))
(items (scandir "." pred))) (items (scandir "." pred)))
(for-each (lambda (item) (for-each (cut delete-file-recursively <>) items))))
(if (directory? item)
(delete-file-recursively item)
(delete-file item)))
items))))
;; Clean up the source from bundled libraries we don't need. ;; Clean up the source from bundled libraries we don't need.
(delete-all-but "Externals" (delete-all-but "Externals"
@ -2866,18 +2859,11 @@ GLSL (@file{.slang}) shaders for use with RetroArch.")
(srfi srfi-26)) (srfi srfi-26))
;; XXX: 'delete-all-but' is copied from the turbovnc package. ;; XXX: 'delete-all-but' is copied from the turbovnc package.
(define (delete-all-but directory . preserve) (define (delete-all-but directory . preserve)
(define (directory? x)
(and=> (stat x #f)
(compose (cut eq? 'directory <>) stat:type)))
(with-directory-excursion directory (with-directory-excursion directory
(let* ((pred (let* ((pred (negate (cut member <>
(negate (cut member <> (append '("." "..") preserve)))) (cons* "." ".." preserve))))
(items (scandir "." pred))) (items (scandir "." pred)))
(for-each (lambda (item) (for-each (cut delete-file-recursively <>) items))))
(if (directory? item)
(delete-file-recursively item)
(delete-file item)))
items))))
;; Remove as much bundled sources as possible, shaving off about ;; Remove as much bundled sources as possible, shaving off about
;; 65 MiB. ;; 65 MiB.
(delete-all-but "deps" (delete-all-but "deps"

193
gnu/packages/golang-web.scm
View file

@ -1077,18 +1077,11 @@ parameter types for AWS Secrets Manager.")
;; Consider to implement it as re-usable procedure in ;; Consider to implement it as re-usable procedure in
;; guix/build/utils or guix/build-system/go. ;; guix/build/utils or guix/build-system/go.
(define (delete-all-but directory . preserve) (define (delete-all-but directory . preserve)
(define (directory? x)
(and=> (stat x #f)
(compose (cut eq? 'directory <>) stat:type)))
(with-directory-excursion directory (with-directory-excursion directory
(let* ((pred (let* ((pred (negate (cut member <>
(negate (cut member <> (append '("." "..") preserve)))) (cons* "." ".." preserve))))
(items (scandir "." pred))) (items (scandir "." pred)))
(for-each (lambda (item) (for-each (cut delete-file-recursively <>) items))))
(if (directory? item)
(delete-file-recursively item)
(delete-file item)))
items))))
(delete-all-but "service" "sqs") (delete-all-but "service" "sqs")
(delete-all-but "." "service"))))) (delete-all-but "." "service")))))
(build-system go-build-system) (build-system go-build-system)
@ -11864,18 +11857,11 @@ Handler) and routes @code{WithRouteTag}.")
;; Consider to implement it as re-usable procedure in ;; Consider to implement it as re-usable procedure in
;; guix/build/utils or guix/build-system/go. ;; guix/build/utils or guix/build-system/go.
(define (delete-all-but directory . preserve) (define (delete-all-but directory . preserve)
(define (directory? x)
(and=> (stat x #f)
(compose (cut eq? 'directory <>) stat:type)))
(with-directory-excursion directory (with-directory-excursion directory
(let* ((pred (let* ((pred (negate (cut member <>
(negate (cut member <> (append '("." "..") preserve)))) (cons* "." ".." preserve))))
(items (scandir "." pred))) (items (scandir "." pred)))
(for-each (lambda (item) (for-each (cut delete-file-recursively <>) items))))
(if (directory? item)
(delete-file-recursively item)
(delete-file item)))
items))))
(delete-all-but "propagators" "autoprop") (delete-all-but "propagators" "autoprop")
(delete-all-but "." "propagators"))))) (delete-all-but "." "propagators")))))
(build-system go-build-system) (build-system go-build-system)
@ -12109,9 +12095,9 @@ go.opentelemetry.io/otel/trace.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/open-telemetry/opentelemetry-go") (url "https://github.com/open-telemetry/opentelemetry-go")
(commit (go-version->git-ref version (commit (go-version->git-ref version
#:subdir "exporters/otlp/otlptrace")))) #:subdir "exporters/otlp/otlptrace"))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1kvfbqc56p1h9rh9cvgn37ya6k10613r0f2rhjiwrrkgs2mszk30")) (base32 "1kvfbqc56p1h9rh9cvgn37ya6k10613r0f2rhjiwrrkgs2mszk30"))
@ -12124,18 +12110,11 @@ go.opentelemetry.io/otel/trace.")
;; Consider to implement it as re-usable procedure in ;; Consider to implement it as re-usable procedure in
;; guix/build/utils or guix/build-system/go. ;; guix/build/utils or guix/build-system/go.
(define (delete-all-but directory . preserve) (define (delete-all-but directory . preserve)
(define (directory? x)
(and=> (stat x #f)
(compose (cut eq? 'directory <>) stat:type)))
(with-directory-excursion directory (with-directory-excursion directory
(let* ((pred (let* ((pred (negate (cut member <>
(negate (cut member <> (append '("." "..") preserve)))) (cons* "." ".." preserve))))
(items (scandir "." pred))) (items (scandir "." pred)))
(for-each (lambda (item) (for-each (cut delete-file-recursively <>) items))))
(if (directory? item)
(delete-file-recursively item)
(delete-file item)))
items))))
(delete-all-but "exporters/otlp" "otlptrace") (delete-all-but "exporters/otlp" "otlptrace")
(delete-all-but "." "exporters") (delete-all-but "." "exporters")
;; Submodules with their own go.mod files and packed as separated ;; Submodules with their own go.mod files and packed as separated
@ -12171,9 +12150,9 @@ go.opentelemetry.io/otel/trace.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/open-telemetry/opentelemetry-go") (url "https://github.com/open-telemetry/opentelemetry-go")
(commit (go-version->git-ref version (commit (go-version->git-ref version
#:subdir "exporters/otlp/otlptrace/otlptracegrpc")))) #:subdir "exporters/otlp/otlptrace/otlptracegrpc"))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1kvfbqc56p1h9rh9cvgn37ya6k10613r0f2rhjiwrrkgs2mszk30")) (base32 "1kvfbqc56p1h9rh9cvgn37ya6k10613r0f2rhjiwrrkgs2mszk30"))
@ -12186,18 +12165,11 @@ go.opentelemetry.io/otel/trace.")
;; Consider to implement it as re-usable procedure in ;; Consider to implement it as re-usable procedure in
;; guix/build/utils or guix/build-system/go. ;; guix/build/utils or guix/build-system/go.
(define (delete-all-but directory . preserve) (define (delete-all-but directory . preserve)
(define (directory? x)
(and=> (stat x #f)
(compose (cut eq? 'directory <>) stat:type)))
(with-directory-excursion directory (with-directory-excursion directory
(let* ((pred (let* ((pred (negate (cut member <>
(negate (cut member <> (append '("." "..") preserve)))) (cons* "." ".." preserve))))
(items (scandir "." pred))) (items (scandir "." pred)))
(for-each (lambda (item) (for-each (cut delete-file-recursively <>) items))))
(if (directory? item)
(delete-file-recursively item)
(delete-file item)))
items))))
(delete-all-but "exporters/otlp/otlptrace" "otlptracegrpc") (delete-all-but "exporters/otlp/otlptrace" "otlptracegrpc")
(delete-all-but "." "exporters"))))) (delete-all-but "." "exporters")))))
(build-system go-build-system) (build-system go-build-system)
@ -12234,9 +12206,9 @@ By default the telemetry is sent to @@url{https://localhost:4317}.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/open-telemetry/opentelemetry-go") (url "https://github.com/open-telemetry/opentelemetry-go")
(commit (go-version->git-ref version (commit (go-version->git-ref version
#:subdir "exporters/otlp/otlptrace/otlptracehttp")))) #:subdir "exporters/otlp/otlptrace/otlptracehttp"))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1kvfbqc56p1h9rh9cvgn37ya6k10613r0f2rhjiwrrkgs2mszk30")) (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 ;; Consider to implement it as re-usable procedure in
;; guix/build/utils or guix/build-system/go. ;; guix/build/utils or guix/build-system/go.
(define (delete-all-but directory . preserve) (define (delete-all-but directory . preserve)
(define (directory? x)
(and=> (stat x #f)
(compose (cut eq? 'directory <>) stat:type)))
(with-directory-excursion directory (with-directory-excursion directory
(let* ((pred (let* ((pred (negate (cut member <>
(negate (cut member <> (append '("." "..") preserve)))) (cons* "." ".." preserve))))
(items (scandir "." pred))) (items (scandir "." pred)))
(for-each (lambda (item) (for-each (cut delete-file-recursively <>) items))))
(if (directory? item)
(delete-file-recursively item)
(delete-file item)))
items))))
(delete-all-but "exporters/otlp/otlptrace" "otlptracehttp") (delete-all-but "exporters/otlp/otlptrace" "otlptracehttp")
(delete-all-but "." "exporters"))))) (delete-all-but "." "exporters")))))
(build-system go-build-system) (build-system go-build-system)
@ -12328,9 +12293,9 @@ telemetry to be written to an output destination as JSON.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/open-telemetry/opentelemetry-go") (url "https://github.com/open-telemetry/opentelemetry-go")
(commit (go-version->git-ref version (commit (go-version->git-ref version
#:subdir "exporters/zipkin")))) #:subdir "exporters/zipkin"))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1kvfbqc56p1h9rh9cvgn37ya6k10613r0f2rhjiwrrkgs2mszk30")) (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 ;; Consider to implement it as re-usable procedure in
;; guix/build/utils or guix/build-system/go. ;; guix/build/utils or guix/build-system/go.
(define (delete-all-but directory . preserve) (define (delete-all-but directory . preserve)
(define (directory? x)
(and=> (stat x #f)
(compose (cut eq? 'directory <>) stat:type)))
(with-directory-excursion directory (with-directory-excursion directory
(let* ((pred (let* ((pred (negate (cut member <>
(negate (cut member <> (append '("." "..") preserve)))) (cons* "." ".." preserve))))
(items (scandir "." pred))) (items (scandir "." pred)))
(for-each (lambda (item) (for-each (cut delete-file-recursively <>) items))))
(if (directory? item)
(delete-file-recursively item)
(delete-file item)))
items))))
(delete-all-but "exporters" "zipkin") (delete-all-but "exporters" "zipkin")
(delete-all-but "." "exporters"))))) (delete-all-but "." "exporters")))))
(build-system go-build-system) (build-system go-build-system)
@ -12383,9 +12341,9 @@ telemetry to be written to an output destination as JSON.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/open-telemetry/opentelemetry-go") (url "https://github.com/open-telemetry/opentelemetry-go")
(commit (go-version->git-ref version (commit (go-version->git-ref version
#:subdir "log")))) #:subdir "log"))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0sb36qyq389fif9qp5iiqp6w41dfcwi95gb0bsbvznvijhd8c1cc")) (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 ;; Consider to implement it as re-usable procedure in
;; guix/build/utils or guix/build-system/go. ;; guix/build/utils or guix/build-system/go.
(define (delete-all-but directory . preserve) (define (delete-all-but directory . preserve)
(define (directory? x)
(and=> (stat x #f)
(compose (cut eq? 'directory <>) stat:type)))
(with-directory-excursion directory (with-directory-excursion directory
(let* ((pred (let* ((pred (negate (cut member <>
(negate (cut member <> (append '("." "..") preserve)))) (cons* "." ".." preserve))))
(items (scandir "." pred))) (items (scandir "." pred)))
(for-each (lambda (item) (for-each (cut delete-file-recursively <>) items))))
(if (directory? item)
(delete-file-recursively item)
(delete-file item)))
items))))
(delete-all-but "." "log"))))) (delete-all-but "." "log")))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
@ -12450,8 +12401,8 @@ OpenTelemetry API.")))
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/open-telemetry/opentelemetry-go") (url "https://github.com/open-telemetry/opentelemetry-go")
(commit (go-version->git-ref version #:subdir "sdk")))) (commit (go-version->git-ref version #:subdir "sdk"))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0sb36qyq389fif9qp5iiqp6w41dfcwi95gb0bsbvznvijhd8c1cc")) (base32 "0sb36qyq389fif9qp5iiqp6w41dfcwi95gb0bsbvznvijhd8c1cc"))
@ -12464,18 +12415,11 @@ OpenTelemetry API.")))
;; Consider to implement it as re-usable procedure in ;; Consider to implement it as re-usable procedure in
;; guix/build/utils or guix/build-system/go. ;; guix/build/utils or guix/build-system/go.
(define (delete-all-but directory . preserve) (define (delete-all-but directory . preserve)
(define (directory? x)
(and=> (stat x #f)
(compose (cut eq? 'directory <>) stat:type)))
(with-directory-excursion directory (with-directory-excursion directory
(let* ((pred (let* ((pred (negate (cut member <>
(negate (cut member <> (append '("." "..") preserve)))) (cons* "." ".." preserve))))
(items (scandir "." pred))) (items (scandir "." pred)))
(for-each (lambda (item) (for-each (cut delete-file-recursively <>) items))))
(if (directory? item)
(delete-file-recursively item)
(delete-file item)))
items))))
(delete-all-but "." "sdk") (delete-all-but "." "sdk")
(delete-file-recursively "sdk/log") (delete-file-recursively "sdk/log")
(delete-file-recursively "sdk/metric"))))) (delete-file-recursively "sdk/metric")))))
@ -12506,9 +12450,9 @@ OpenTelemetry API.")))
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/open-telemetry/opentelemetry-go") (url "https://github.com/open-telemetry/opentelemetry-go")
(commit (go-version->git-ref version (commit (go-version->git-ref version
#:subdir "sdk/log")))) #:subdir "sdk/log"))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0sb36qyq389fif9qp5iiqp6w41dfcwi95gb0bsbvznvijhd8c1cc")) (base32 "0sb36qyq389fif9qp5iiqp6w41dfcwi95gb0bsbvznvijhd8c1cc"))
@ -12521,18 +12465,11 @@ OpenTelemetry API.")))
;; Consider to implement it as re-usable procedure in ;; Consider to implement it as re-usable procedure in
;; guix/build/utils or guix/build-system/go. ;; guix/build/utils or guix/build-system/go.
(define (delete-all-but directory . preserve) (define (delete-all-but directory . preserve)
(define (directory? x)
(and=> (stat x #f)
(compose (cut eq? 'directory <>) stat:type)))
(with-directory-excursion directory (with-directory-excursion directory
(let* ((pred (let* ((pred (negate (cut member <>
(negate (cut member <> (append '("." "..") preserve)))) (cons* "." ".." preserve))))
(items (scandir "." pred))) (items (scandir "." pred)))
(for-each (lambda (item) (for-each (cut delete-file-recursively <>) items))))
(if (directory? item)
(delete-file-recursively item)
(delete-file item)))
items))))
(delete-all-but "sdk" "log") (delete-all-but "sdk" "log")
(delete-all-but "." "sdk"))))) (delete-all-but "." "sdk")))))
(build-system go-build-system) (build-system go-build-system)
@ -12561,9 +12498,9 @@ OpenTelemetry API.")))
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/open-telemetry/opentelemetry-go") (url "https://github.com/open-telemetry/opentelemetry-go")
(commit (go-version->git-ref version (commit (go-version->git-ref version
#:subdir "sdk/metric")))) #:subdir "sdk/metric"))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0sb36qyq389fif9qp5iiqp6w41dfcwi95gb0bsbvznvijhd8c1cc")) (base32 "0sb36qyq389fif9qp5iiqp6w41dfcwi95gb0bsbvznvijhd8c1cc"))
@ -12576,18 +12513,11 @@ OpenTelemetry API.")))
;; Consider to implement it as re-usable procedure in ;; Consider to implement it as re-usable procedure in
;; guix/build/utils or guix/build-system/go. ;; guix/build/utils or guix/build-system/go.
(define (delete-all-but directory . preserve) (define (delete-all-but directory . preserve)
(define (directory? x)
(and=> (stat x #f)
(compose (cut eq? 'directory <>) stat:type)))
(with-directory-excursion directory (with-directory-excursion directory
(let* ((pred (let* ((pred (negate (cut member <>
(negate (cut member <> (append '("." "..") preserve)))) (cons* "." ".." preserve))))
(items (scandir "." pred))) (items (scandir "." pred)))
(for-each (lambda (item) (for-each (cut delete-file-recursively <>) items))))
(if (directory? item)
(delete-file-recursively item)
(delete-file item)))
items))))
(delete-all-but "sdk" "metric") (delete-all-but "sdk" "metric")
(delete-all-but "." "sdk"))))) (delete-all-but "." "sdk")))))
(build-system go-build-system) (build-system go-build-system)
@ -12804,8 +12734,8 @@ the standard @code{context} package to store request-scoped values.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/googleapis/go-genproto") (url "https://github.com/googleapis/go-genproto")
(commit (go-version->git-ref version #:subdir "googleapis/api")))) (commit (go-version->git-ref version #:subdir "googleapis/api"))))
(modules '((guix build utils) (modules '((guix build utils)
(ice-9 ftw) (ice-9 ftw)
(srfi srfi-26))) (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 ;; Consider to implement it as re-usable procedure in
;; guix/build/utils or guix/build-system/go. ;; guix/build/utils or guix/build-system/go.
(define (delete-all-but directory . preserve) (define (delete-all-but directory . preserve)
(define (directory? x)
(and=> (stat x #f)
(compose (cut eq? 'directory <>) stat:type)))
(with-directory-excursion directory (with-directory-excursion directory
(let* ((pred (let* ((pred (negate (cut member <>
(negate (cut member <> (append '("." "..") preserve)))) (cons* "." ".." preserve))))
(items (scandir "." pred))) (items (scandir "." pred)))
(for-each (lambda (item) (for-each (cut delete-file-recursively <>) items))))
(if (directory? item)
(delete-file-recursively item)
(delete-file item)))
items))))
;; Submodules with their own go.mod files and packaged separately: ;; Submodules with their own go.mod files and packaged separately:
;; ;;
;; - google.golang.org/genproto/googleapis/api/apikeys ;; - google.golang.org/genproto/googleapis/api/apikeys

19
gnu/packages/golang-xyz.scm
View file

@ -21790,9 +21790,9 @@ when they'd prefer a more familiar, loosely typed API.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/uber-go/zap") (url "https://github.com/uber-go/zap")
(commit (go-version->git-ref version (commit (go-version->git-ref version
#:subdir "exp")))) #:subdir "exp"))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "05i15278swdmpif3p6g18sy0sn7rnfdl3m2rj5p30cnyb0j29vig")) (base32 "05i15278swdmpif3p6g18sy0sn7rnfdl3m2rj5p30cnyb0j29vig"))
@ -21805,18 +21805,11 @@ when they'd prefer a more familiar, loosely typed API.")
;; Consider to implement it as re-usable procedure in ;; Consider to implement it as re-usable procedure in
;; guix/build/utils or guix/build-system/go. ;; guix/build/utils or guix/build-system/go.
(define (delete-all-but directory . preserve) (define (delete-all-but directory . preserve)
(define (directory? x)
(and=> (stat x #f)
(compose (cut eq? 'directory <>) stat:type)))
(with-directory-excursion directory (with-directory-excursion directory
(let* ((pred (let* ((pred (negate (cut member <>
(negate (cut member <> (append '("." "..") preserve)))) (cons* "." ".." preserve))))
(items (scandir "." pred))) (items (scandir "." pred)))
(for-each (lambda (item) (for-each (cut delete-file-recursively <>) items))))
(if (directory? item)
(delete-file-recursively item)
(delete-file item)))
items))))
(delete-all-but "." "exp"))))) (delete-all-but "." "exp")))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments

19
gnu/packages/ipfs.scm
View file

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

19
gnu/packages/mpi.scm
View file

@ -356,18 +356,11 @@ software vendors, application developers and computer science researchers.")
'(begin '(begin
;; XXX: 'delete-all-but' is copied from the turbovnc package. ;; XXX: 'delete-all-but' is copied from the turbovnc package.
(define (delete-all-but directory . preserve) (define (delete-all-but directory . preserve)
(define (directory? x)
(and=> (stat x #f)
(compose (cut eq? 'directory <>) stat:type)))
(with-directory-excursion directory (with-directory-excursion directory
(let* ((pred (let* ((pred (negate (cut member <>
(negate (cut member <> (append '("." "..") preserve)))) (cons* "." ".." preserve))))
(items (scandir "." pred))) (items (scandir "." pred)))
(for-each (lambda (item) (for-each (cut delete-file-recursively <>) items))))
(if (directory? item)
(delete-file-recursively item)
(delete-file item)))
items))))
;; Delete as many bundled libraries as permitted by the build ;; Delete as many bundled libraries as permitted by the build
;; system. ;; system.
(delete-all-but "3rd-party" "treematch" "Makefile.in" "Makefile.am") (delete-all-but "3rd-party" "treematch" "Makefile.in" "Makefile.am")
@ -381,8 +374,8 @@ software vendors, application developers and computer science researchers.")
;; As of Open MPI 5.0.X, PMIx is used to communicate ;; As of Open MPI 5.0.X, PMIx is used to communicate
;; with SLURM, so SLURM'S PMI is no longer needed. ;; with SLURM, so SLURM'S PMI is no longer needed.
(delete "slurm") (delete "slurm")
(append openpmix) ;for PMI support (launching via "srun") (append openpmix) ;for PMI support (launching via "srun")
(append prrte))) ;for PMI support (launching via "srun") (append prrte))) ;for PMI support (launching via "srun")
(native-inputs (modify-inputs (package-native-inputs openmpi) (native-inputs (modify-inputs (package-native-inputs openmpi)
(append python))) (append python)))
@ -392,7 +385,7 @@ software vendors, application developers and computer science researchers.")
#~(list #$(string-append #~(list #$(string-append
"CFLAGS=-g -O2" "CFLAGS=-g -O2"
" -Wno-error=incompatible-pointer-types") " -Wno-error=incompatible-pointer-types")
"--enable-mpi-ext=affinity" ;cr doesn't work "--enable-mpi-ext=affinity" ;cr doesn't work
"--with-sge" "--with-sge"
"--disable-static" "--disable-static"

13
gnu/packages/vnc.scm
View file

@ -192,19 +192,12 @@ RDP, VNC, SPICE, NX, XDMCP, SSH and EXEC network protocols are supported.")
;; bundled under java/org. These are used by the 'vncviewer' ;; bundled under java/org. These are used by the 'vncviewer'
;; program. The jsch copy is modified and integrates changes from ;; program. The jsch copy is modified and integrates changes from
;; https://github.com/mwiede/jsch, so cannot easily be un-bundled. ;; https://github.com/mwiede/jsch, so cannot easily be un-bundled.
(define (directory? x)
(and=> (stat x #f) (compose (cut eq? 'directory <>) stat:type)))
(define (delete-all-but directory . preserve) (define (delete-all-but directory . preserve)
(with-directory-excursion directory (with-directory-excursion directory
(let* ((pred (negate (cut member <> (append '("." "..") (let* ((pred (negate (cut member <>
preserve)))) (cons* "." ".." preserve))))
(items (scandir "." pred))) (items (scandir "." pred)))
(for-each (lambda (item) (for-each (cut delete-file-recursively <>) items))))
(if (directory? item)
(delete-file-recursively item)
(delete-file item)))
items))))
;; d3des, rfb (headers) and turbojpeg-jni are small and not ;; d3des, rfb (headers) and turbojpeg-jni are small and not
;; packaged in Guix, so preserve them. ;; packaged in Guix, so preserve them.