Compare commits

...

6 commits

Author SHA1 Message Date
Christopher Baines
e68ec94fdb
gnu: guix-build-coordinator: Update to 0-136.a1c18b1.
* gnu/packages/package-management.scm (guix-build-coordinator): Update to
0-136.a1c18b1.

Change-Id: I1a7ced7d7f8a1abef4b13719e6e5844829c63b79
2026-01-24 15:54:26 +00:00
Christopher Baines
a284958334
gnu: nar-herder: Update to 0-51.24c1914.
* gnu/packages/package-management.scm (nar-herder): Update to 0-51.24c1914.

Change-Id: Id1d3c0b6bccbe4709b5c1cb9c0a455aaaa6e889d
2026-01-24 15:50:51 +00:00
Christopher Baines
c4c0b0ac10
gnu: guile-knots: Update to 0-29.35f4c16.
* gnu/packages/guile-xyz.scm (guile-knots): Update to 0-29.35f4c16.
[home-page,description]: Update.

Change-Id: I84291aad7d2b17bb93b87b57b7ee8cdadc880141
2026-01-24 15:48:47 +00:00
Gabriel Wicki
3a7ac72469
gnu: mp3: Remove taglib-next.
taglib had been updated and taglib-next is broken due to missing input
cppunit.

* gnu/packages/mp3.scm (taglib-next): Delete variable.
(python-pytaglib) [inputs]: Change reference to taglib.

Change-Id: I398761463488795aa66a547817fa6eb23ae8446a
Signed-off-by: Gabriel Wicki <gabriel@erlikon.ch>
2026-01-24 12:17:22 +01:00
Giacomo Leidi
8e11f42c0c
gnu: Allow guile-dotenv-cli to find its dependencies.
* gnu/packages/guile-xyz.scm (guile-dotenv-cli)[modules]: Add
guile-build-system's modules.
[phases]<wrap-binaries>: Simplify and add nyacc to the dependencies.

Merges: #1714
Change-Id: I93f441e2aee484bad3926633f710472d343ced7a
2026-01-24 12:07:03 +01:00
Cayetano Santos
0908abf25c
gnu: iverilog: Enable cross compile.
* gnu/packages/electronics.scm (iverilog)[arguments]: Add #:make-flags
and remove ’ensure-native-baked-CC/CXX #:phase.

Merges guix/guix!5696

Change-Id: I53cbdc77a426403dcd965a4e51b04e34fdd590d2
2026-01-24 10:26:21 +01:00
4 changed files with 49 additions and 94 deletions

View file

@ -633,18 +633,10 @@ Simulator Trace} files.")
(arguments (arguments
(list (list
#:bootstrap-scripts #~(list "autoconf.sh") #:bootstrap-scripts #~(list "autoconf.sh")
#:phases #~(modify-phases %standard-phases #:make-flags
(add-after 'unpack 'ensure-native-baked-CC/CXX #~(list (string-append "CC=" #$(cc-for-target))
(lambda _ (string-append "CXX=" #$(cxx-for-target))
;; The compilers used to build are retained in (string-append "PREFIX=" #$output))))
;; bin/iverilog-vpi, which is a Makefile
;; script. Normalize these to just 'gcc' and 'g++' to
;; avoid having these set to cross compilers.
(substitute* "Makefile.in"
(("s;@IVCC@;\\$\\(CC);")
"s;@IVCC@;gcc;")
(("s;@IVCXX@;\\$\\(CXX);")
"s;@IVCXX@;g++;")))))))
(native-inputs (list autoconf bison flex gperf)) (native-inputs (list autoconf bison flex gperf))
(inputs (list zlib)) (inputs (list zlib))
(home-page "https://steveicarus.github.io/iverilog/") (home-page "https://steveicarus.github.io/iverilog/")

View file

@ -957,59 +957,40 @@ variables from them.")
(name "guile-dotenv-cli") (name "guile-dotenv-cli")
(arguments (arguments
(list (list
#:modules `((ice-9 match) #:modules `(((guix build guile-build-system)
(ice-9 ftw) #:select
,@%default-gnu-imported-modules) (target-guile-effective-version))
,@%default-gnu-modules)
#:phases #:phases
#~(modify-phases %standard-phases (with-imported-modules `((guix build guile-build-system)
(replace 'install ,@%default-gnu-imported-modules)
(lambda _ #~(modify-phases %standard-phases
(mkdir-p (string-append #$output "/bin")) (replace 'install
(install-file "./scripts/dotenv" (lambda _
(string-append #$output "/bin/")))) (mkdir-p (string-append #$output "/bin"))
(add-after 'install 'wrap-binaries (install-file "./scripts/dotenv"
(lambda _ (string-append #$output "/bin/"))))
(let* ((inputs (add-after 'install 'wrap-binaries
(list (lambda* (#:key inputs #:allow-other-keys)
#$@(map (lambda (input) (let* ((version (target-guile-effective-version))
(this-package-input input)) (site-ccache (string-append "/lib/guile/"
'("guile-config" version "/site-ccache"))
"guile-dotenv")))) (site (string-append "/share/guile/site/" version))
(compiled-dir (dep-path
(lambda (out version) (lambda (env path)
(string-append out "/lib/guile/" (list env ":" 'prefix
version "/site-ccache"))) (cons (string-append #$output path)
(uncompiled-dir (map (lambda (input)
(lambda (out version) (string-append
(string-append out "/share/guile/site" (assoc-ref inputs input)
(if (string-null? version) "" "/") path))
version))) (list "guile-config"
(dep-path "guile-dotenv"
(lambda (env modules path) "nyacc"))))))
(list env ":" 'prefix (bin (string-append (ungexp output) "/bin/")))
(cons modules (wrap-program (string-append bin "dotenv")
(map (lambda (input) (dep-path "GUILE_LOAD_PATH" site)
(string-append input path)) (dep-path "GUILE_LOAD_COMPILED_PATH" site-ccache)))))))))
inputs)))))
(bin (string-append #$output "/bin/"))
(site
(uncompiled-dir #$(this-package-input "guile-dotenv") "")))
(match (scandir site)
(("." ".." version)
(for-each
(lambda (file)
(wrap-program (string-append bin file)
(dep-path
"GUILE_LOAD_PATH"
(uncompiled-dir
#$(this-package-input "guile-dotenv") version)
(uncompiled-dir "" version))
(dep-path
"GUILE_LOAD_COMPILED_PATH"
(compiled-dir
#$(this-package-input "guile-dotenv") version)
(compiled-dir "" version))))
'("dotenv"))))))))))
(inputs (inputs
(modify-inputs (package-inputs guile-dotenv) (modify-inputs (package-inputs guile-dotenv)
(append bash-minimal))) (append bash-minimal)))
@ -7387,8 +7368,8 @@ is an attempt to combine both into something useful.")
(license license:asl2.0)))) (license license:asl2.0))))
(define-public guile-knots (define-public guile-knots
(let ((commit "a8e07b738b558d701c6de1f5ee6452ee4095198e") (let ((commit "35f4c16ab0b3846cd10f5209b39a6a3f5bf8a3f1")
(revision "28")) (revision "29"))
(package (package
(name "guile-knots") (name "guile-knots")
(version (git-version "0" revision commit)) (version (git-version "0" revision commit))
@ -7399,7 +7380,7 @@ is an attempt to combine both into something useful.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"13cc81pnjw55y1p8v6zvbk46bsf0snwbk3fkg3xh9girl9z5krj3")) "0zd4k5c0v4rdbhlb6fwa51v53s8rs8xjrznvdnw3yhkpiy66x1ki"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
@ -7413,12 +7394,12 @@ is an attempt to combine both into something useful.")
(list guile-next)) (list guile-next))
(propagated-inputs (propagated-inputs
(list guile-fibers-next)) (list guile-fibers-next))
(home-page "https://forge.cbaines.net/cbaines/guile-knots") (home-page "https://cbaines.codeberg.page/guile-knots/")
(synopsis "Patterns and functionality to use with Guile Fibers") (synopsis "Patterns and functionality to use with Guile Fibers")
(description (description
"Guile Knots is a collection of patterns and functionality that is useful "Guile Knots is a collection of patterns and functionality that is useful
when using Guile Fibers. This includes higher level concurrency utilities, when using Guile Fibers. This includes higher level concurrency utilities,
support for timeouts and an alternative web server implementation.") support for timeouts and a web server.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public guile-kolam (define-public guile-kolam

View file

@ -285,24 +285,6 @@ Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files.")
(base32 (base32
"0phliksg5r1n15prcbp391xk2z1fh2c7zlc7h0nabpwkf6j08za1")))))) "0phliksg5r1n15prcbp391xk2z1fh2c7zlc7h0nabpwkf6j08za1"))))))
(define-public taglib-next
(package
(inherit taglib)
(name "taglib")
(version "2.1.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/taglib/taglib")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0m1xyjsg6a8p4prn1xr1g29zsxqr7606cv3cblgjgxkb1dk26fx7"))))
(inputs
(list utfcpp
zlib))))
(define-public minimp3 (define-public minimp3
;; The latest commit is used as there is no release. ;; The latest commit is used as there is no release.
(let ((commit "afb604c06bc8beb145fecd42c0ceb5bda8795144") (let ((commit "afb604c06bc8beb145fecd42c0ceb5bda8795144")
@ -792,7 +774,7 @@ fingerprinting library and the Acoustid API.")
python-pytest python-pytest
python-setuptools)) python-setuptools))
(inputs (inputs
(list taglib-next)) (list taglib))
(home-page "https://github.com/supermihi/pytaglib") (home-page "https://github.com/supermihi/pytaglib")
(synopsis "Python bindings for taglib") (synopsis "Python bindings for taglib")
(description (description

View file

@ -1926,8 +1926,8 @@ environments.")
"153bgcjqw6jp0yl0vj0k67k9c8lw82vac6b0cnacrjrcb24lcpdq"))))))) "153bgcjqw6jp0yl0vj0k67k9c8lw82vac6b0cnacrjrcb24lcpdq")))))))
(define-public guix-build-coordinator (define-public guix-build-coordinator
(let ((commit "88b0416678771f3e47901f184e11249ff9cce845") (let ((commit "a1c18b175ecd7f42336de555746824ec003b600b")
(revision "135")) (revision "136"))
(package (package
(name "guix-build-coordinator") (name "guix-build-coordinator")
(version (git-version "0" revision commit)) (version (git-version "0" revision commit))
@ -1938,7 +1938,7 @@ environments.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1jgcywldqkm0zjvp9z6xrfpzjvz914rrc2gwc6an3iq5yg0bi7mz")) "1adpr1s5c6s1sk5vbph2275v5fnz8mqh0s7ynvpdxag93rfczrjz"))
(file-name (string-append name "-" version "-checkout")))) (file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -2181,8 +2181,8 @@ in an isolated environment, in separate namespaces.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public nar-herder (define-public nar-herder
(let ((commit "8a99247d1868ce75cd1c5409090450fd17543c72") (let ((commit "24c1914efa9d65c629e8d2d06e1f98afa4219400")
(revision "50")) (revision "51"))
(package (package
(name "nar-herder") (name "nar-herder")
(version (git-version "0" revision commit)) (version (git-version "0" revision commit))
@ -2193,7 +2193,7 @@ in an isolated environment, in separate namespaces.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1mkzb8sq7l4xh8pri4d0pqxby4har2yhmhxdy9frdbrbrfapjpqx")) "178c7l27m76snqnsn4rk1hylibr5fh8h7bch8xpcfa7y4xicf8jr"))
(file-name (string-append name "-" version "-checkout")))) (file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments