forked from tribes/guix
Compare commits
37 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Jelle Licht
|
1cd09ce1ec | ||
|
Jelle Licht
|
4b7a750b64 | ||
|
Jelle Licht
|
5d1c8cfa1e | ||
|
Jelle Licht
|
a4a3fe08c1 | ||
|
Jelle Licht
|
e095512494 | ||
|
Jelle Licht
|
4a1f2852e1 | ||
|
Jelle Licht
|
649fc872ba | ||
|
Jelle Licht
|
6199e6609c | ||
|
Jelle Licht
|
ec6b8c9808 | ||
|
Jelle Licht
|
429f698c17 | ||
|
Jelle Licht
|
efa499747f | ||
|
Nicolas Graves
|
c81f5b764c | ||
|
Nicolas Graves
|
3298ea0db1 | ||
|
Nicolas Graves
|
db6af3ab1a | ||
|
Nicolas Graves
|
0987ec2b82 | ||
|
Nicolas Graves
|
709c37f4db | ||
|
Nicolas Graves
|
ce843095f4 | ||
|
Nicolas Graves
|
2487ff1879 | ||
|
Nicolas Graves
|
71ef5c0ab6 | ||
|
Nicolas Graves
|
4b4ea6eb9d | ||
|
Nicolas Graves
|
65c24e5e11 | ||
|
Jelle Licht
|
07085345a2 | ||
|
Jelle Licht
|
98b2e3853b | ||
|
Jelle Licht
|
0e6f3fab58 | ||
|
Jelle Licht
|
d4ddddd9b4 | ||
|
Jelle Licht
|
ca11af32e2 | ||
|
Jelle Licht
|
40e40dafc4 | ||
|
Jelle Licht
|
2533fec0e1 | ||
|
Jelle Licht
|
462dc862b0 | ||
|
Jelle Licht
|
abd6fc6d49 | ||
|
Jelle Licht
|
7c7c4ba6f5 | ||
|
Jelle Licht
|
7b8101940c | ||
|
Jelle Licht
|
9d3d936e2f | ||
|
Jelle Licht
|
dd5c11de2b | ||
|
Jelle Licht
|
9247fd3bc7 | ||
|
Jelle Licht
|
721e60ef98 | ||
|
Jelle Licht
|
4f9a5a1a02 |
@@ -239,7 +239,6 @@ tests/guix-home\.sh @guix/home
|
||||
tests/home-import\.scm @guix/home
|
||||
tests/home-services\.scm @guix/home
|
||||
|
||||
gnu/packages/fabric-management\.scm @guix/hpc
|
||||
gnu/packages/mpi\.scm @guix/hpc
|
||||
gnu/packages/oneapi\.scm @guix/hpc
|
||||
gnu/packages/opencl\.scm @guix/hpc
|
||||
|
||||
+3
-4
@@ -48422,10 +48422,9 @@ A string denoting the name service (@pxref{Services in the NSS
|
||||
configuration,,, libc, The GNU C Library Reference Manual}).
|
||||
|
||||
Note that name services listed here must be visible to nscd. This is
|
||||
achieved by providing the list of packages implementing the needed
|
||||
services via the @code{name-services} field of the
|
||||
@code{nscd-configuration} record to be used with the @code{nscd-service-type}
|
||||
service (@pxref{Base Services, @code{nscd-configuration}}).
|
||||
achieved by passing the @code{#:name-services} argument to
|
||||
@code{nscd-service} the list of packages providing the needed name
|
||||
services (@pxref{Base Services, @code{nscd-service}}).
|
||||
|
||||
@item reaction
|
||||
An action specified using the @code{lookup-specification} macro
|
||||
|
||||
+1
-2
@@ -786,8 +786,7 @@ the haskell-build-system."
|
||||
(team 'hpc
|
||||
#:name "High-performance computing team"
|
||||
#:description "High-performance computing (HPC) related packages."
|
||||
#:scope (list "gnu/packages/fabric-management.scm"
|
||||
"gnu/packages/mpi.scm"
|
||||
#:scope (list "gnu/packages/mpi.scm"
|
||||
"gnu/packages/oneapi.scm"
|
||||
"gnu/packages/opencl.scm"
|
||||
"gnu/packages/parallel.scm"
|
||||
|
||||
+1
-3
@@ -1578,9 +1578,7 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \
|
||||
%D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
|
||||
%D%/packages/patches/gtk-doc-respect-xml-catalog.patch \
|
||||
%D%/packages/patches/gtk-doc-mkhtml-test-fix.patch \
|
||||
%D%/packages/patches/gtk4-demo-reproducible.patch \
|
||||
%D%/packages/patches/gtk4-needs-udmabuf.patch \
|
||||
%D%/packages/patches/gtk-doc-mkhtml-test-fix.patch \
|
||||
%D%/packages/patches/gtk4-respect-GUIX_GTK4_PATH.patch \
|
||||
%D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
|
||||
%D%/packages/patches/gtksourceview-2-add-default-directory.patch \
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2022, 2023, 2024, 2025 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2013, 2015, 2017, 2018, 2021 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016-2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2016-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016, 2018, 2019, 2021, 2023 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017, 2020-2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
@@ -406,7 +406,7 @@ precision.")
|
||||
(define-public giac
|
||||
(package
|
||||
(name "giac")
|
||||
(version "2.0.0-21")
|
||||
(version "2.0.0-10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@@ -418,7 +418,7 @@ precision.")
|
||||
"https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/"
|
||||
"stable/main/source/giac_" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1j6bip76hhqvycapf7xy26y0b8g5zzx4gwkfsr7bf6m2h71a2zry"))))
|
||||
(base32 "1lzb0jjmkg5ml1qfl0m00qqng4sxgfqwrbq10gpkp4b301k2ckv1"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
||||
@@ -7335,7 +7335,7 @@ genome- and pangenome-scale queries using a laptop.")
|
||||
(define-public delly
|
||||
(package
|
||||
(name "delly")
|
||||
(version "1.7.3")
|
||||
(version "0.8.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -7343,7 +7343,7 @@ genome- and pangenome-scale queries using a laptop.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1ri7m7iv3wakm7zdwqdzm5m71y0swad9n78dzrzr9gs3j7j5yxjs"))
|
||||
(base32 "1ibnplgfzj96w8glkx17v7sld3pm402fr5ybmf3h0rlcryabxrqy"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(delete-file-recursively "src/htslib"))))
|
||||
|
||||
@@ -43,7 +43,6 @@
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system glib-or-gtk)
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (gnu packages)
|
||||
@@ -996,17 +995,18 @@ Supported extensions to ISO 9660 are Rock Ridge, Joliet, AAIP, zisofs.")
|
||||
(define-public libudfread
|
||||
(package
|
||||
(name "libudfread")
|
||||
(version "1.2.0")
|
||||
(version "1.1.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://download.videolan.org/pub/videolan/libudfread/"
|
||||
name "-" version ".tar.xz"))
|
||||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"03q5b1wm90vygx4rf4mzzrf0yhvhbvp72nyhv63pgz7v9jypqixv"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs (list pkg-config))
|
||||
"05c943ymw94nzjxf7v102916frqk7icgw4gb244wx23jn8cnz56m"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list automake autoconf libtool pkg-config))
|
||||
(home-page "https://code.videolan.org/videolan/libudfread")
|
||||
(synopsis "C library to read UDF file systems")
|
||||
(description "@code{libudfread} is a C library for reading
|
||||
|
||||
@@ -8760,7 +8760,7 @@ similar rank-based tests for equal probability distributions due to Neuhauser
|
||||
(("^PKG_LIBS=.*")
|
||||
(string-append "PKG_LIBS="
|
||||
(assoc-ref inputs "libnode")
|
||||
"/lib/libnode.so.127\n")))
|
||||
"/lib/libnode.so.137\n")))
|
||||
(setenv "INCLUDE_DIR"
|
||||
(string-append
|
||||
(assoc-ref inputs "libnode")
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2017-2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018-2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2018-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net>
|
||||
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
|
||||
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
||||
@@ -385,7 +385,7 @@ not have any other specialized device.")
|
||||
(define-public openboard
|
||||
(package
|
||||
(name "openboard")
|
||||
(version "1.7.7")
|
||||
(version "1.7.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -394,7 +394,7 @@ not have any other specialized device.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1i27h84p77pl1chw791fjs3vyzsjvsqc9ky2mbw7g8xpzxz1nd9j"))))
|
||||
(base32 "1098pys5p82sx97xrhw54vlkn6jly0rhq8b09grmmx2h4mcpj2i2"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
;;; Copyright © 2015, 2018, 2023 David Thompson <dthompson2@worcester.edu>
|
||||
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017-2024, 2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2017-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2017, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
|
||||
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
@@ -3247,14 +3247,14 @@ that compiles to WebAssembly.")
|
||||
(define-public scummvm
|
||||
(package
|
||||
(name "scummvm")
|
||||
(version "2026.2.0")
|
||||
(version "2.9.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://downloads.scummvm.org/frs/scummvm/" version
|
||||
"/scummvm-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1wv0z9c4dnjywgla9zhbkgnzahj829ybvcx9jw67hdmagnbys42f"))))
|
||||
(base32 "1qspqawdazsxisxm1lxzgi0i4gx54qd10xyk3nmmirwxz9mg70ka"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
||||
+35
-22
@@ -30,7 +30,7 @@
|
||||
;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
|
||||
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
|
||||
;;; Copyright © 2017-2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2017-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2018 okapi <okapi@firemail.cc>
|
||||
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
|
||||
;;; Copyright © 2018 Madalin Ionel-Patrascu <madalinionel.patrascu@mdc-berlin.de>
|
||||
@@ -8191,7 +8191,7 @@ fish. The whole game is accompanied by quiet, comforting music.")
|
||||
(define-public crawl
|
||||
(package
|
||||
(name "crawl")
|
||||
(version "0.34.1")
|
||||
(version "0.34.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -8200,7 +8200,7 @@ fish. The whole game is accompanied by quiet, comforting music.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "09x4n4w3rw8sldwprb03yg1igwh4m09iw00g2iq30466jryys6bv"))
|
||||
(base32 "16fsvrzcndrplw8zcn6nh8459x8zl5xdnf9r9hzh4ll2a4w9dkcr"))
|
||||
(patches (search-patches "crawl-upgrade-saves.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
@@ -11355,33 +11355,46 @@ to remap axis and buttons and a way to calibrate joysticks.")
|
||||
(define-public jumpnbump
|
||||
(package
|
||||
(name "jumpnbump")
|
||||
(version "1.70")
|
||||
(version "1.61")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/LibreGames/jumpnbump.git")
|
||||
(commit version)))
|
||||
(url "https://gitlab.com/LibreGames/jumpnbump.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1irpssijxrfrjm023v642dl3aw4ldlv95fh073jlpdpl1mwqz71a"))))
|
||||
"12lwl5sl5n009nb83r8l4lakb9286csqdf1ynpmwwydy17giqsdp"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:make-flags
|
||||
#~(list (string-append "CC=" #$(cc-for-target))
|
||||
(string-append "PREFIX=" #$output)
|
||||
"SYSINSTALL=1")
|
||||
#:tests? #f ;no test
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure)))) ;no configure script
|
||||
`(#:make-flags
|
||||
(list "CC=gcc"
|
||||
(string-append "PREFIX=" (assoc-ref %outputs "out")))
|
||||
#:tests? #f ;no test
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; There is no configure script
|
||||
(replace 'configure
|
||||
(lambda _
|
||||
(substitute* "Makefile"
|
||||
(("-funroll-loops")
|
||||
"-funroll-loops -fcommon")
|
||||
(("SDL_CFLAGS =")
|
||||
"SDL_CFLAGS = -fcommon"))))
|
||||
(add-after 'unpack 'fix-sdl-path
|
||||
;; XXX: For some reason, `sdl2-config' reports stand-alone SDL
|
||||
;; directory, not SDL-union provided as an input to the package.
|
||||
;; We force the latter with "--prefix=" option.
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "Makefile"
|
||||
(("sdl2-config" command)
|
||||
(string-append command " --prefix=" (assoc-ref inputs "sdl")))))))))
|
||||
(inputs
|
||||
(list bzip2
|
||||
(sdl-union (list sdl2 sdl2-mixer sdl2-net))
|
||||
zlib))
|
||||
`(("bzip2" ,bzip2)
|
||||
("sdl" ,(sdl-union (list sdl2 sdl2-mixer sdl2-net)))
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
(list gettext-minimal)) ;for msgfmt
|
||||
`(("gettext" ,gettext-minimal))) ;for msgfmt
|
||||
(home-page "https://gitlab.com/LibreGames/jumpnbump")
|
||||
(synopsis "Multiplayer platform game with bunnies")
|
||||
(description "You, as a bunny, have to jump on your opponents to make them
|
||||
@@ -11517,7 +11530,7 @@ player adaptability for character progression.")
|
||||
(define-public li-ri
|
||||
(package
|
||||
(name "li-ri")
|
||||
(version "3.1.6")
|
||||
(version "3.1.5")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -11526,7 +11539,7 @@ player adaptability for character progression.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"09r6l0sbxp3q750kpbrx513yrafmg7a2769j4wgx812lsk92n3hg"))))
|
||||
"1fd5hl9qhgvyix51la8sl34jzk4mcin8sai05gidy2r2grb1dy4s"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list #:tests? #false ;no tests
|
||||
|
||||
@@ -564,7 +564,6 @@ It is written in C using GObject and libsoup.")
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list
|
||||
"CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types"
|
||||
"--disable-static"
|
||||
"--enable-gtk-doc"
|
||||
(string-append "--with-html-dir="
|
||||
|
||||
@@ -1229,36 +1229,6 @@ MetroHash}, a high quality, high performance hash algorithm.")
|
||||
"This package provides a hashing function.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-digitorus-pkcs7
|
||||
(package
|
||||
(name "go-github-com-digitorus-pkcs7")
|
||||
(version "0.0.0-20250730155240-ffadbf3f398c")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/digitorus/pkcs7")
|
||||
(commit (go-version->git-ref version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0snamp6fbg5vir0lsw5wzvyagrdd832lw6k7cnvcahcgp8l084zc"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/digitorus/pkcs7"))
|
||||
(native-inputs
|
||||
(list openssl))
|
||||
(home-page "https://github.com/digitorus/pkcs7")
|
||||
(synopsis "PKCS#7 implementation for Go")
|
||||
(description
|
||||
"This package implements parsing and generation of some
|
||||
PKCS#7/Cryptographic Message
|
||||
Syntax (@url{https://www.rfc-editor.org/rfc/rfc2315},
|
||||
@url{https://www.rfc-editor.org/rfc/rfc5652, RFC 2315}, RFC 5652) structures
|
||||
for Go applications. It's an alternative fork of deprecated
|
||||
@url{https://github.com/mozilla-services/pkcs7}.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-dvsekhvalnov-jose2go
|
||||
(package
|
||||
(name "go-github-com-dvsekhvalnov-jose2go")
|
||||
|
||||
@@ -987,34 +987,6 @@ Gemini clients and servers.")
|
||||
@url{https://1password.com/, 1Password} API.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-42wim-go-gitter
|
||||
(let ((commit "16aadfbb65c6641501ea8eebb6bcf23b9011912b")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github-com-42wim-go-gitter")
|
||||
(version "0.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/42wim/go-gitter")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "07l07msyackkzvxhc9cljzgh81v5g48crravz29ph516smqj0x6c"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/42wim/go-gitter"))
|
||||
(propagated-inputs
|
||||
(list go-github-com-mreiferson-go-httpclient
|
||||
go-github-com-mrexodia-wray))
|
||||
(home-page "https://github.com/42wim/go-gitter")
|
||||
(synopsis "Gitter API in Go")
|
||||
(description
|
||||
"This package provides a Gitter API for Golang.")
|
||||
(license license:asl2.0))))
|
||||
|
||||
(define-public go-github-com-42wim-httpsig
|
||||
(package
|
||||
(name "go-github-com-42wim-httpsig")
|
||||
@@ -11841,34 +11813,6 @@ forwarding and DNS resolution across host and VM boundaries.")
|
||||
the standard library.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-mrexodia-wray
|
||||
(package
|
||||
(name "go-github-com-mrexodia-wray")
|
||||
(version "0.0.0-20160318003008-78a2c1f284ff")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mrexodia/wray")
|
||||
(commit (go-version->git-ref version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "13fpq4sav9bb5g4vhq9lygimxzhslfp7nplfd5cyfgcxmckp5yrj"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #f ;tests are broken
|
||||
#:import-path "github.com/mrexodia/wray"))
|
||||
(native-inputs
|
||||
(list go-github-com-smartystreets-goconvey))
|
||||
(home-page "https://github.com/mrexodia/wray")
|
||||
(synopsis "Faye client for golang")
|
||||
(description
|
||||
"Wray is a client for the @url{http://faye.jcoglan.com/, Faye}
|
||||
publish-subscribe messaging service. It's alternative fork of
|
||||
@url{https://github.com/pythonandchips/wray}.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-muhlemmer-httpforwarded
|
||||
(package
|
||||
(name "go-github-com-muhlemmer-httpforwarded")
|
||||
|
||||
@@ -2850,32 +2850,6 @@ Unified Format}.")
|
||||
(description "Package list implements a doubly linked list.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public go-github-com-baozisoftware-qrcode-terminal-go
|
||||
(package
|
||||
(name "go-github-com-baozisoftware-qrcode-terminal-go")
|
||||
(version "0.0.0-20170407111555-c0650d8dff0f")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/Baozisoftware/qrcode-terminal-go")
|
||||
(commit (go-version->git-ref version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "166h9zy9y7ygayhybg7d080hpdcf1mvkf3rwnq5lqg8i3cg71s7b"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/Baozisoftware/qrcode-terminal-go"))
|
||||
(propagated-inputs
|
||||
(list go-github-com-mattn-go-colorable
|
||||
go-github-com-skip2-go-qrcode))
|
||||
(home-page "https://github.com/Baozisoftware/qrcode-terminal-go")
|
||||
(synopsis "QRCode terminal for Golang")
|
||||
(description
|
||||
"This package implments a QR code generator for terminal for Golang.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public go-github-com-baulk-chardet
|
||||
(package
|
||||
(name "go-github-com-baulk-chardet")
|
||||
@@ -2901,31 +2875,6 @@ Unified Format}.")
|
||||
"The chardet package ports character set detection from ICU to Go.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-benmcclelland-sgio
|
||||
(package
|
||||
(name "go-github-com-benmcclelland-sgio")
|
||||
(version "0.0.0-20250710154739-45e823ff1f46")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/benmcclelland/sgio")
|
||||
(commit (go-version->git-ref version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1bkilgs6ikbgy31m0w2ixhv94mjcbicqnx8kl6mwddhb7qwznki8"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/benmcclelland/sgio"
|
||||
#:test-flags #~(list "-vet=off")))
|
||||
(home-page "https://github.com/benmcclelland/sgio")
|
||||
(synopsis "SCSI commands using SG_IO ioctl")
|
||||
(description
|
||||
"This package provides support for issuing SCSI commands with SG_IO
|
||||
ioctl.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-beorn7-perks
|
||||
(package
|
||||
(name "go-github-com-beorn7-perks")
|
||||
@@ -8273,43 +8222,6 @@ BIOS (@url{https://en.wikipedia.org/wiki/System_Management_BIOS, SMBIOS}) and
|
||||
Desktop Management Interface (DMI) data and structures.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public go-github-com-digitorus-timestamp
|
||||
(package
|
||||
(name "go-github-com-digitorus-timestamp")
|
||||
(version "0.0.0-20250524132541-c45532741eea")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/digitorus/timestamp")
|
||||
(commit (go-version->git-ref version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1bmnyhmymxhpvmygkcvvm9r2c2909hfrnafd3n19d0rxgl21lvhk"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
#~(begin
|
||||
;; Fix example function name: ExampleCreateRequest_ParseResponse
|
||||
;; implies a method ParseResponse on type CreateRequest, but both
|
||||
;; are standalone functions. Rename to a valid package example.
|
||||
(substitute* "timestamp_example_test.go"
|
||||
(("ExampleCreateRequest_ParseResponse") "Example"))))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/digitorus/timestamp"
|
||||
;; Skip example test that requires network access to freetsa.org.
|
||||
#:test-flags #~(list "-skip" "Example")))
|
||||
(propagated-inputs
|
||||
(list go-github-com-digitorus-pkcs7))
|
||||
(home-page "https://github.com/digitorus/timestamp")
|
||||
(synopsis "RFC3161 Time-Stamp Protocol implementation for Go")
|
||||
(description
|
||||
"This package implements the Time-Stamp Protocol (TSP) as specified in
|
||||
@url{https://www.rfc-editor.org/rfc/rfc3161, RFC3161} (Internet X.509 Public
|
||||
Key Infrastructure Time-Stamp Protocol).")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public go-github-com-dimchansky-utfbom
|
||||
(package
|
||||
(name "go-github-com-dimchansky-utfbom")
|
||||
@@ -9884,31 +9796,6 @@ quoting, commenting, and escaping.")
|
||||
(home-page "https://github.com/flynn-archive/go-shlex")
|
||||
(license license:asl2.0))))
|
||||
|
||||
(define-public go-github-com-flynn-go-docopt
|
||||
(package
|
||||
(name "go-github-com-flynn-go-docopt")
|
||||
(version "0.0.0-20140912013429-f6dd2ebbb31e")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/flynn/go-docopt")
|
||||
(commit (go-version->git-ref version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "07s8fvnab40mcfmlsgrrddgvrirgm1krb7kaqgipcikjcmj8j6ql"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/flynn/go-docopt"
|
||||
#:test-subdirs #~(list ".")))
|
||||
(home-page "https://github.com/flynn/go-docopt")
|
||||
(synopsis "Docopt command-line argument parser")
|
||||
(description
|
||||
"Package docopt parses command-line arguments based on a help message.
|
||||
It's an alternative fork of @url{https://github.com/docopt/docopt.go}.")
|
||||
(license license:expat)))
|
||||
|
||||
;; XXX: This project isn't maintained upstream, consider to find alternative
|
||||
;; fork, see <https://github.com/fogleman/gg/issues/185> and remove the
|
||||
;; package when it has no users.
|
||||
@@ -17558,34 +17445,6 @@ to handle ANSI color escapes on Windows.")
|
||||
whether a file descriptor points to a terminal and the type of the terminal.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-mattn-go-localereader
|
||||
(package
|
||||
(name "go-github-com-mattn-go-localereader")
|
||||
(version "0.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mattn/go-localereader")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0wcgqnpjk0drm7swc0q27j4r5ab63mhz29dgbjdnyn4sw68rqm96"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/mattn/go-localereader"
|
||||
;; Tests reference NewCodePageDecoder which is only defined in
|
||||
;; localereader_windows.go and doesn't compile on non-Windows.
|
||||
#:tests? #f))
|
||||
(home-page "https://github.com/mattn/go-localereader")
|
||||
(synopsis "CodePage decoder for Windows")
|
||||
(description
|
||||
"This package provides a CodePage decoder for Windows, enabling Go programs
|
||||
to read locale-specific character encodings such as Shift JIS. It handles
|
||||
locale reading differently across Unix and Windows systems.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-mattn-go-pointer
|
||||
(package
|
||||
(name "go-github-com-mattn-go-pointer")
|
||||
@@ -19396,34 +19255,6 @@ Data type that can be converted:
|
||||
@end itemize")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public go-github-com-muhammadmuzzammil1998-jsonc
|
||||
(package
|
||||
(name "go-github-com-muhammadmuzzammil1998-jsonc")
|
||||
(version "1.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/muhammadmuzzammil1998/jsonc")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "037xi03p46hnfwwh5ylnkzm859h9bi3yn451647y4ghzjbwii1g4"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:import-path "github.com/muhammadmuzzammil1998/jsonc"))
|
||||
(home-page "https://github.com/muhammadmuzzammil1998/jsonc")
|
||||
(synopsis "JSON with comments parser for Go")
|
||||
(description
|
||||
"JSONC is a superset of JSON which supports comments. JSON formatted
|
||||
files are readable to humans but the lack of comments decreases readability.
|
||||
With JSONC, you can use block (@code{/* */}) and single line (@code{//} or
|
||||
@code{#}) comments to describe functionality. Microsoft VS Code also uses
|
||||
this format in configuration files like @file{settings.json},
|
||||
@file{keybindings.json}, and @file{launch.json}.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public go-github-com-muhlemmer-gu
|
||||
(package
|
||||
(name "go-github-com-muhlemmer-gu")
|
||||
|
||||
+20
-32
@@ -578,10 +578,7 @@ This package provides the core library and elements.")
|
||||
(substitute* "tests/check/meson.build"
|
||||
;; This test causes nondeterministic failures (see:
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/895>).
|
||||
((".*'elements/appsrc.c'.*") "")
|
||||
;; This one is flaky (see:
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/work_items/5016>).
|
||||
((".*'elements/inputselector.c'.*") ""))
|
||||
((".*'elements/appsrc.c'.*") ""))
|
||||
;; Some other tests fail on other architectures.
|
||||
#$@(cond
|
||||
((target-x86-32?)
|
||||
@@ -769,8 +766,7 @@ model to base your own plug-in on, here it is.")
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:configure-flags #~(list "-Dgpl=enabled"
|
||||
"-Dsctp-internal-usrsctp=disabled"
|
||||
#:configure-flags #~(list "-Dsctp-internal-usrsctp=disabled"
|
||||
;; TODO: Figure out why audiovisualizer test
|
||||
;; fails on riscv64-linux.
|
||||
#$@(if (target-riscv64?)
|
||||
@@ -780,15 +776,6 @@ model to base your own plug-in on, here it is.")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
#$@%common-gstreamer-phases
|
||||
(add-after 'unpack 'patch-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "ext/resindvd/resindvdsrc.c"
|
||||
;; `g_module_open' is a wrapper above dlopen; pass it the
|
||||
;; absolute file name of the library to ensure it is always
|
||||
;; found.
|
||||
(("\"libdvdcss\"")
|
||||
(format #f "~s"
|
||||
(search-input-file inputs "lib/libdvdcss.so"))))))
|
||||
(add-after 'unpack 'adjust-tests
|
||||
(lambda* (#:key native-inputs inputs #:allow-other-keys)
|
||||
(let ((gst-plugins-good (assoc-ref (or native-inputs inputs)
|
||||
@@ -802,18 +789,18 @@ model to base your own plug-in on, here it is.")
|
||||
|
||||
;; The 'elements_shm.test_shm_live' test sometimes times out
|
||||
;; (see:
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790>).
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790).
|
||||
((".*'elements/shm\\.c'.*") "")
|
||||
|
||||
;; The 'elements_curlhttpsrc' test sometimes times out.
|
||||
((".*'elements/curlhttpsrc\\.c'.*") "")
|
||||
|
||||
;; The 'mxfdemux' test fails for unknown reasons (see:
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3921>).
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3921).
|
||||
((".*'elements/mxfdemux.c'.*") "")
|
||||
|
||||
;; Unexpected critical/warning, see
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/792>
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3000>
|
||||
((".*'elements/netsim\\.c'.*") "")
|
||||
|
||||
;; TODO: Figure out why this test fails on riscv64-linux.
|
||||
@@ -822,19 +809,30 @@ model to base your own plug-in on, here it is.")
|
||||
"'elements/viewfinderbin.c'], true, ],"))
|
||||
'())
|
||||
|
||||
;; This test is flaky.
|
||||
;; This test is flaky on at least some architectures.
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1244
|
||||
(("'elements/camerabin\\.c'\\].*],")
|
||||
"'elements/camerabin.c'], true, ],")
|
||||
#$@(if (member (%current-system)
|
||||
'("aarch64-linux" "riscv64-linux"))
|
||||
`((("'elements/camerabin\\.c'\\].*],")
|
||||
"'elements/camerabin.c'], true, ],"))
|
||||
'())
|
||||
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412
|
||||
((".*elements/dtls\\.c.*") "")
|
||||
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3921
|
||||
((".*elements/mxfdemux\\.c.*") "")
|
||||
|
||||
;; Unable to create pipeline 'bin.
|
||||
;; ( vulkanupload ! vulkancolorconvert ! vulkandownload )':
|
||||
;; no element "vulkanupload"
|
||||
((".*elements/vkcolorconvert\\.c.*") "")
|
||||
((".*elements/vkupload\\.c.*") "")))))
|
||||
((".*elements/vkupload\\.c.*") ""))
|
||||
(substitute* "tests/check/elements/zxing.c"
|
||||
;; zxing 1.2.0 seemingly changed the type representation of
|
||||
;; the EAN_13 structure; disable it.
|
||||
((".*\"EAN_13\".*")
|
||||
"")))))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
;; Tests require a running X server.
|
||||
@@ -1164,19 +1162,9 @@ after their category.")
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
|
||||
#:configure-flags #~(list "-Dgpl=enabled")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
#$@%common-gstreamer-phases
|
||||
(add-after 'unpack 'patch-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "ext/dvdread/dvdreadsrc.c"
|
||||
;; `g_module_open' is a wrapper above dlopen; pass it the
|
||||
;; absolute file name of the library to ensure it is always
|
||||
;; found.
|
||||
(("\"libdvdcss\"")
|
||||
(format #f "~s"
|
||||
(search-input-file inputs "lib/libdvdcss.so"))))))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
;; Tests require a running X server.
|
||||
|
||||
+8
-15
@@ -1123,7 +1123,7 @@ application suites.")
|
||||
(define-public gtk
|
||||
(package
|
||||
(name "gtk")
|
||||
(version "4.22.1")
|
||||
(version "4.20.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@@ -1131,11 +1131,9 @@ application suites.")
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1z2mkmazc2d51jbg3qwwdycycqiwswm88nhw6bxscz8j86f5lyyd"))
|
||||
(base32 "0ly1gqc6ybxv5f2a9hvjp5k6l9mfzy2yv8iy2xqnr9l8628g4wr8"))
|
||||
(patches
|
||||
(search-patches "gtk4-demo-reproducible.patch"
|
||||
"gtk4-needs-udmabuf.patch"
|
||||
"gtk4-respect-GUIX_GTK4_PATH.patch"))
|
||||
(search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"))
|
||||
(modules '((guix build utils)))))
|
||||
(build-system meson-build-system)
|
||||
(outputs '("out" "bin" "doc"))
|
||||
@@ -1203,9 +1201,6 @@ application suites.")
|
||||
(("[ \t]*'empty-text.node',") "")
|
||||
(("[ \t]*'testswitch.node',") "")
|
||||
(("[ \t]*'widgetfactory.node',") "")
|
||||
;; The gtklistitemmanager test is flaky (see:
|
||||
;; <https://gitlab.gnome.org/GNOME/gtk/-/issues/6547>).
|
||||
((".*'gtklistitemmanager.c',.*") "")
|
||||
;; XXX: Figure out why this fails and report upstream.
|
||||
((".*'memorytexture',.*") "")
|
||||
((".*'yuv-matrix-dmabuf',.*") ""))
|
||||
@@ -1262,10 +1257,8 @@ application suites.")
|
||||
(setenv "XDG_CACHE_HOME" (getcwd))))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Tests require a running X server. The '-noreset' option is
|
||||
;; necessary to avoid spurious "Failed to open display" test
|
||||
;; errors.
|
||||
(system "Xvfb :1 +extension GLX -screen 0 1024x768x24 -noreset &")
|
||||
;; Tests require a running X server.
|
||||
(system "Xvfb :1 +extension GLX &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
;; Tests write to $HOME.
|
||||
(setenv "HOME" (getcwd))
|
||||
@@ -1308,7 +1301,6 @@ application suites.")
|
||||
docbook-xsl
|
||||
gettext-minimal
|
||||
`(,glib "bin")
|
||||
glibc-utf8-locales ;some tests require en_US.UTF-8
|
||||
gobject-introspection ;for building introspection data
|
||||
graphene
|
||||
gtk-doc/stable ;for building documentation
|
||||
@@ -1332,6 +1324,7 @@ application suites.")
|
||||
(inputs
|
||||
(list colord ;for color printing support
|
||||
cups ;for CUPS print-backend
|
||||
ffmpeg ;for ffmpeg media-backend
|
||||
fribidi
|
||||
gi-docgen
|
||||
gstreamer ;for gstreamer media-backend
|
||||
@@ -1375,8 +1368,8 @@ application suites.")
|
||||
(native-search-paths
|
||||
(list
|
||||
(search-path-specification
|
||||
(variable "GUIX_GTK4_PATH")
|
||||
(files '("lib/gtk-4.0")))))
|
||||
(variable "GUIX_GTK4_PATH")
|
||||
(files '("lib/gtk-4.0")))))
|
||||
(search-paths native-search-paths)
|
||||
(home-page "https://www.gtk.org/")
|
||||
(synopsis "Cross-platform widget toolkit")
|
||||
|
||||
@@ -112,7 +112,6 @@
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system glib-or-gtk)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system go)
|
||||
#:use-module (guix build-system guile)
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix build-system perl)
|
||||
@@ -311,38 +310,6 @@ sharing.")
|
||||
(define-deprecated-package barrier
|
||||
deskflow)
|
||||
|
||||
(define-public hd-idle
|
||||
(package
|
||||
(name "hd-idle")
|
||||
(version "1.22")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri
|
||||
(git-reference
|
||||
(url "https://github.com/adelolmo/hd-idle")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "12nckzp00b3y91igp8jzlf6as353la6ar8gp6b646kn9gi2hrla3"))
|
||||
(snippet
|
||||
#~(begin
|
||||
(use-modules (guix build utils))
|
||||
(delete-file-recursively "vendor")))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list #:import-path "github.com/adelolmo/hd-idle"
|
||||
#:install-source? #f))
|
||||
(inputs
|
||||
(list go-github-com-benmcclelland-sgio))
|
||||
(home-page "https://github.com/adelolmo/hd-idle")
|
||||
(synopsis "Spin down idle hard disks")
|
||||
(description "@command{hd-idle} is a utility program for spinning down
|
||||
external disks after a period of idle time. Since most USB hard drives do not
|
||||
support setting the idle timer via @command{hdparm}, hd-idle can be used as a
|
||||
workaround.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public hw-probe
|
||||
(package
|
||||
(name "hw-probe")
|
||||
|
||||
@@ -1133,7 +1133,6 @@ IBus-Table on IBus framework:
|
||||
(string-append out "/libexec/ibus-setup-stt")))))))))
|
||||
(inputs
|
||||
(list bash-minimal
|
||||
gst-plugins-good ; for pulsesrc
|
||||
gst-vosk
|
||||
gstreamer
|
||||
gtk
|
||||
|
||||
@@ -1177,7 +1177,6 @@ new Date();"))))
|
||||
fontconfig
|
||||
freetype
|
||||
giflib
|
||||
gtk+
|
||||
lcms
|
||||
elfutils
|
||||
libjpeg-turbo
|
||||
@@ -1548,7 +1547,6 @@ new Date();"))))
|
||||
fontconfig
|
||||
freetype
|
||||
giflib
|
||||
gtk+
|
||||
lcms
|
||||
libjpeg-turbo
|
||||
libpng
|
||||
|
||||
@@ -164,14 +164,14 @@ resolution, asynchronous file system operations, and threading primitives.")
|
||||
(package
|
||||
(inherit libuv)
|
||||
(name "libuv")
|
||||
(version "1.49.2")
|
||||
(version "1.51.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://dist.libuv.org/dist/v" version
|
||||
"/libuv-v" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1a75p8wp4l43y2ffj1szs1ssm6nzjad7k51bqi2r04ngs9mp044c"))))
|
||||
"1szqivvs7izbhw1a3nd1ipbk012yvqqkjg0sjmqxw1hi1fwmf1az"))))
|
||||
(properties '((hidden? . #t)))))
|
||||
|
||||
(define-public libuv-for-r-httpuv
|
||||
|
||||
@@ -531,7 +531,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
||||
;; The current "stable" kernels. That is, the most recently released major
|
||||
;; versions that are still supported upstream.
|
||||
|
||||
(define-public linux-libre-6.19-version "6.19.11")
|
||||
(define-public linux-libre-6.19-version "6.19.10")
|
||||
(define-public linux-libre-6.19-gnu-revision "gnu")
|
||||
(define deblob-scripts-6.19
|
||||
(linux-libre-deblob-scripts
|
||||
@@ -541,12 +541,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
||||
(base32 "05jpciyypvmy6byaxjl49b1fvzxcnlhknf0xabrdj5152iznrzkh")))
|
||||
(define-public linux-libre-6.19-pristine-source
|
||||
(let ((version linux-libre-6.19-version)
|
||||
(hash (base32 "16ymkc5r3hw05z7l7ih3qw406qlszz1l7b4g5yz0hv15ddxrs0r0")))
|
||||
(hash (base32 "072s76238rnf87yhdy15nbxfyq7x3ch7p2v14dq4pq551qd48va6")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-6.19)))
|
||||
|
||||
(define-public linux-libre-6.18-version "6.18.21")
|
||||
(define-public linux-libre-6.18-version "6.18.20")
|
||||
(define-public linux-libre-6.18-gnu-revision "gnu")
|
||||
(define deblob-scripts-6.18
|
||||
(linux-libre-deblob-scripts
|
||||
@@ -556,7 +556,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
||||
(base32 "0qlih8w8wg4v5cwbmd34rbhb6mjgbx69i9rx3s2vxw7h42q9l0ai")))
|
||||
(define-public linux-libre-6.18-pristine-source
|
||||
(let ((version linux-libre-6.18-version)
|
||||
(hash (base32 "0ks735y6jq4yy3jaicjsj4dn4n3kk2skf9dqh9dyifipn57j2f0w")))
|
||||
(hash (base32 "0lrm76rdlr92kjq3g410qdff9v49mpdf400lmsh7hq74k2ymlyl3")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-6.18)))
|
||||
@@ -565,7 +565,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
||||
;; Here are the support timelines:
|
||||
;; <https://www.kernel.org/category/releases.html>
|
||||
|
||||
(define-public linux-libre-6.12-version "6.12.80")
|
||||
(define-public linux-libre-6.12-version "6.12.79")
|
||||
(define-public linux-libre-6.12-gnu-revision "gnu")
|
||||
(define deblob-scripts-6.12
|
||||
(linux-libre-deblob-scripts
|
||||
@@ -575,7 +575,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
||||
(base32 "1x48hpmvajz7v5wn1vdd7l5r14mq4ngzh5npz3pj81z4f1g61i0a")))
|
||||
(define-public linux-libre-6.12-pristine-source
|
||||
(let ((version linux-libre-6.12-version)
|
||||
(hash (base32 "0lrylj87bb8ky29pbplpncrfhmgqqbq3d49iqgdwv7p7jvc929f9")))
|
||||
(hash (base32 "02vrl0m5iw4jiyhpcni2l8kcfzq279s69yagrdz5sany6cgpbyjb")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-6.12)))
|
||||
@@ -11580,7 +11580,7 @@ of Linux application development.")
|
||||
(define-public wireplumber
|
||||
(package
|
||||
(name "wireplumber")
|
||||
(version "0.5.14")
|
||||
(version "0.5.12")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -11590,7 +11590,7 @@ of Linux application development.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0rr2vlbwjjhgsk6lk2iwaww21gks2v63f0cs01rh2mdi8jpfz7h2"))))
|
||||
(base32 "1dljz669ywy1lvvn0jh14ymynmbii45q5vay71zajpcg31249dyw"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-Dsystemd=disabled"
|
||||
|
||||
+4
-11
@@ -390,7 +390,7 @@ handy.")
|
||||
(define (make-lua-filesystem name lua)
|
||||
(package
|
||||
(name name)
|
||||
(version "1.9.0")
|
||||
(version "1.7.0.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -401,7 +401,7 @@ handy.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0vd1b9rnbjl24bbnk91jrkli81dc1b2kvpjlsx319azjmynlk0y6"))))
|
||||
"0zmprgkm9zawdf9wnw0v3w6ibaj442wlc6alp39hmw610fl4vghi"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
@@ -432,9 +432,6 @@ directory structure and file attributes.")
|
||||
(define-public lua5.2-filesystem
|
||||
(make-lua-filesystem "lua5.2-filesystem" lua-5.2))
|
||||
|
||||
(define-public lua5.4-filesystem
|
||||
(make-lua-filesystem "lua5.4-filesystem" lua-5.4))
|
||||
|
||||
(define-public lua-bee
|
||||
;; There are no releases; use the commit known to work with the packaged
|
||||
;; luamake.
|
||||
@@ -1064,14 +1061,13 @@ Notable examples are GTK+, GStreamer and Webkit.")
|
||||
(define (make-lua-lpeg name lua)
|
||||
(package
|
||||
(name name)
|
||||
(version "1.1.0")
|
||||
(version "1.0.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0aimsjpcpkh3kk65f0pg1z2bp6d83rn4dg6pgbx1yv14s9kms5ab"))))
|
||||
(base32 "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
@@ -1105,9 +1101,6 @@ Grammars (PEGs).")
|
||||
(define-public lua5.2-lpeg
|
||||
(make-lua-lpeg "lua5.2-lpeg" lua-5.2))
|
||||
|
||||
(define-public lua5.4-lpeg
|
||||
(make-lua-lpeg "lua5.4-lpeg" lua-5.4))
|
||||
|
||||
(define (make-lua-luv name lua)
|
||||
(package
|
||||
(name name)
|
||||
|
||||
+5
-67
@@ -30,7 +30,7 @@
|
||||
;;; Copyright © 2018 Eric Brown <brown@fastmail.com>
|
||||
;;; Copyright © 2018, 2021, 2024 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2018 Amin Bandali <bandali@gnu.org>
|
||||
;;; Copyright © 2019, 2021-2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2019, 2021-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com>
|
||||
;;; Copyright © 2019 Robert Smith <robertsmith@posteo.net>
|
||||
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
||||
@@ -159,7 +159,6 @@
|
||||
#:use-module (gnu packages image-processing)
|
||||
#:use-module (gnu packages java)
|
||||
#:use-module (gnu packages less)
|
||||
#:use-module (gnu packages libedit)
|
||||
#:use-module (gnu packages lisp)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages llvm)
|
||||
@@ -447,66 +446,6 @@ programming languages.")
|
||||
(home-page "https://stcorp.nl/coda")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public cvc5
|
||||
(package
|
||||
(name "cvc5")
|
||||
(version "1.3.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/cvc5/cvc5/")
|
||||
(commit (string-append "cvc5-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0ynz7di4dyyiiydgmf0z9dc2jl7nm44xi0amch29rcgznwr4wy5m"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:build-type "Production"
|
||||
#:configure-flags
|
||||
;; Keep the flags in sync with the options set by `./configure --best`.
|
||||
;; See <https://github.com/cvc5/cvc5/blob/cvc5-1.3.3/configure.sh#L216-L222>.
|
||||
#~(list "-DBUILD_SHARED_LIBS=1"
|
||||
"-DENABLE_GPL=ON"
|
||||
"-DUSE_EDITLINE=ON"
|
||||
"-DUSE_CLN=ON"
|
||||
"-DUSE_POLY=ON"
|
||||
"-DENABLE_IPO=ON"
|
||||
"-DUSE_CRYPTOMINISAT=ON")
|
||||
;; TODO: The reduce_constant_dup test fails, needs investigation.
|
||||
#:test-exclude "reduce_constants_dup\\.smt2"
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; Guix's libedit package does not require -ltinfo.
|
||||
(add-after 'unpack 'remove-tinfo
|
||||
(lambda _
|
||||
(substitute* "cmake/FindEditline.cmake"
|
||||
((" tinfo")
|
||||
""))))
|
||||
;; The 'check phase requires test programs build using 'build-tests'.
|
||||
(add-before 'check 'build-tests
|
||||
(lambda _
|
||||
(invoke "cmake" "--build" "." "--target" "build-tests"))))))
|
||||
(inputs (list cadical-2.1
|
||||
cln
|
||||
cryptominisat
|
||||
gmp
|
||||
libedit
|
||||
libpoly
|
||||
symfpu))
|
||||
(native-inputs (list pkg-config
|
||||
python-minimal
|
||||
python-tomli
|
||||
python-pyparsing
|
||||
python-pexpect))
|
||||
(home-page "https://cvc5.github.io/")
|
||||
(synopsis "Satisfiability modulo theories solver")
|
||||
(description
|
||||
"cvc5 is a solver for @acronym{SMT, satisfiability modulo theories}
|
||||
problems. It processes input in the standard SMT-LIB format.")
|
||||
(license (list license:expat license:bsd-3))))
|
||||
|
||||
(define-public qdldl
|
||||
(package
|
||||
(name "qdldl")
|
||||
@@ -5076,7 +5015,6 @@ book.")
|
||||
(lambda _
|
||||
(let ((chuffed #$(this-package-input "chuffed"))
|
||||
(gecode #$(this-package-input "gecode"))
|
||||
(or-tools #$(this-package-input "or-tools"))
|
||||
(pkgdatadir (string-append #$output
|
||||
"/share/minizinc")))
|
||||
(call-with-output-file (string-append pkgdatadir
|
||||
@@ -5097,11 +5035,11 @@ book.")
|
||||
(copy-recursively
|
||||
(string-append solver "/share/minizinc/solvers")
|
||||
(string-append pkgdatadir "/solvers")))
|
||||
(list chuffed gecode or-tools))))))))
|
||||
(list gecode chuffed))))))))
|
||||
(native-inputs
|
||||
(list bison flex))
|
||||
(inputs
|
||||
(list cbc chuffed gecode or-tools zlib))
|
||||
(list cbc chuffed gecode zlib))
|
||||
(home-page "https://www.minizinc.org")
|
||||
(synopsis "High-level constraint modeling language")
|
||||
(description "MiniZinc is a high-level modeling language for constraint
|
||||
@@ -9532,7 +9470,7 @@ built on top of DUNE, the Distributed and Unified Numerics Environment.")
|
||||
(define-public nauty
|
||||
(package
|
||||
(name "nauty")
|
||||
(version "2.9.3")
|
||||
(version "2.9.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@@ -9540,7 +9478,7 @@ built on top of DUNE, the Distributed and Unified Numerics Environment.")
|
||||
"https://pallini.di.uniroma1.it/"
|
||||
"nauty" (string-join (string-split version #\.) "_") ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0nqvri1jfi95xswrcvn9dkyriy7pkjry6nwqhdc0z2pq0jpfvi4z"))))
|
||||
(base32 "0gl7rpl2viahrqmjrrgv0iq31xz093p5sk1ns9r2qdqas43ak3s8"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "lib"))
|
||||
(arguments
|
||||
|
||||
+12
-57
@@ -101,7 +101,6 @@
|
||||
#:use-module (gnu packages golang-check)
|
||||
#:use-module (gnu packages golang-compression)
|
||||
#:use-module (gnu packages golang-crypto)
|
||||
#:use-module (gnu packages golang-maths)
|
||||
#:use-module (gnu packages golang-web)
|
||||
#:use-module (gnu packages golang-xyz)
|
||||
#:use-module (gnu packages graphviz)
|
||||
@@ -3235,7 +3234,6 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
|
||||
(snippet '(for-each delete-file-recursively
|
||||
;; TODO: unbundle the rest as well
|
||||
'("vendor/filippo.io"
|
||||
"vendor/github.com/apex"
|
||||
"vendor/github.com/blang"
|
||||
"vendor/github.com/d5"
|
||||
"vendor/github.com/davecgh"
|
||||
@@ -3245,31 +3243,25 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
|
||||
"vendor/github.com/go-asn1-ber"
|
||||
"vendor/github.com/golang"
|
||||
"vendor/github.com/golang-jwt"
|
||||
"vendor/github.com/gomarkdown"
|
||||
"vendor/github.com/google"
|
||||
"vendor/github.com/gorilla"
|
||||
"vendor/github.com/google/uuid"
|
||||
"vendor/github.com/gorilla/websocket"
|
||||
"vendor/github.com/hashicorp"
|
||||
"vendor/github.com/Jeffail"
|
||||
"vendor/github.com/jpillora"
|
||||
"vendor/github.com/json-iterator"
|
||||
"vendor/github.com/kballard"
|
||||
"vendor/github.com/klauspost"
|
||||
"vendor/github.com/labstack/echo"
|
||||
"vendor/github.com/magiconair"
|
||||
"vendor/github.com/matterbridge/gomatrix"
|
||||
"vendor/github.com/mattn"
|
||||
"vendor/github.com/mgutz"
|
||||
"vendor/github.com/minio/md5-simd"
|
||||
"vendor/github.com/mattn/go-colorable"
|
||||
"vendor/github.com/mattn/go-isatty"
|
||||
"vendor/github.com/mattn/go-runewidth"
|
||||
"vendor/github.com/mgutz/ansi"
|
||||
"vendor/github.com/minio/sha256-simd"
|
||||
"vendor/github.com/mitchellh"
|
||||
"vendor/github.com/modern-go"
|
||||
"vendor/github.com/opentracing"
|
||||
"vendor/github.com/pborman"
|
||||
"vendor/github.com/pelletier"
|
||||
"vendor/github.com/philhofer"
|
||||
"vendor/github.com/pkg"
|
||||
"vendor/github.com/pmezard"
|
||||
"vendor/github.com/remyoudompheng"
|
||||
"vendor/github.com/rivo"
|
||||
"vendor/github.com/russross"
|
||||
"vendor/github.com/sirupsen"
|
||||
@@ -3277,24 +3269,15 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
|
||||
"vendor/github.com/spf13"
|
||||
"vendor/github.com/stretchr"
|
||||
"vendor/github.com/subosito"
|
||||
"vendor/github.com/tinylib"
|
||||
"vendor/github.com/valyala"
|
||||
"vendor/github.com/vmihailenco"
|
||||
"vendor/go.mau.fi"
|
||||
"vendor/github.com/valyala/bytebufferpool"
|
||||
"vendor/github.com/vmihailenco/tagparser"
|
||||
"vendor/go.uber.org"
|
||||
"vendor/golang.org"
|
||||
"vendor/google.golang.org"
|
||||
"vendor/google.golang.org/protobuf/"
|
||||
"vendor/gopkg.in/ini.v1"
|
||||
"vendor/gopkg.in/natefinch"
|
||||
"vendor/gopkg.in/yaml.v2"
|
||||
"vendor/gopkg.in/yaml.v3"
|
||||
"vendor/lukechampine.com"
|
||||
"vendor/modernc.org/cc"
|
||||
"vendor/modernc.org/mathutil"
|
||||
"vendor/modernc.org/memory"
|
||||
"vendor/modernc.org/opt"
|
||||
"vendor/modernc.org/strutil"
|
||||
"vendor/modernc.org/token")))
|
||||
"vendor/gopkg.in/yaml.v3")))
|
||||
(sha256
|
||||
(base32 "0939fiy7z53izznfhlr7c6vaskbmkbj3ncb09fzx5dmz9cjngy80"))))
|
||||
(build-system go-build-system)
|
||||
@@ -3317,13 +3300,12 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
|
||||
go-golang-org-x-time
|
||||
go-golang-org-x-tools
|
||||
;; google.golang.org
|
||||
go-google-golang-org-appengine
|
||||
go-google-golang-org-protobuf
|
||||
;; gopkg.in
|
||||
go-gopkg-in-ini-v1
|
||||
go-gopkg-in-natefinch-lumberjack-v2
|
||||
go-gopkg-in-yaml-v2
|
||||
go-gopkg-in-yaml-v3
|
||||
go-gopkg-in-natefinch-lumberjack-v2
|
||||
;; filippo.io
|
||||
go-filippo-io-edwards25519
|
||||
;; uber.org
|
||||
@@ -3331,7 +3313,6 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
|
||||
go-go-uber-org-multierr
|
||||
go-go-uber-org-zap
|
||||
;; github.com
|
||||
go-github-com-apex-log
|
||||
go-github-com-blang-semver
|
||||
go-github-com-d5-tengo-v2
|
||||
go-github-com-davecgh-go-spew
|
||||
@@ -3341,43 +3322,32 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
|
||||
go-github-com-go-asn1-ber-asn1-ber
|
||||
go-github-com-golang-jwt-jwt
|
||||
go-github-com-golang-protobuf
|
||||
go-github-com-gomarkdown-markdown
|
||||
go-github-com-google-gops
|
||||
go-github-com-google-uuid
|
||||
go-github-com-gorilla-schema
|
||||
go-github-com-gorilla-websocket
|
||||
go-github-com-hashicorp-errwrap
|
||||
go-github-com-hashicorp-go-multierror
|
||||
go-github-com-hashicorp-golang-lru
|
||||
go-github-com-hashicorp-hcl
|
||||
go-github-com-jeffail-gabs
|
||||
go-github-com-jpillora-backoff
|
||||
go-github-com-json-iterator-go
|
||||
go-github-com-kballard-go-shellquote
|
||||
go-github-com-klauspost-compress
|
||||
go-github-com-klauspost-cpuid-v2
|
||||
go-github-com-labstack-echo-v4
|
||||
go-github-com-magiconair-properties
|
||||
go-github-com-matterbridge-gomatrix
|
||||
go-github-com-mattn-go-colorable
|
||||
go-github-com-mattn-go-isatty
|
||||
go-github-com-mattn-go-runewidth
|
||||
go-github-com-mattn-godown
|
||||
go-github-com-mgutz-ansi
|
||||
go-github-com-minio-md5-simd
|
||||
go-github-com-minio-sha256-simd
|
||||
go-github-com-mitchellh-go-homedir
|
||||
go-github-com-mitchellh-mapstructure
|
||||
go-github-com-modern-go-concurrent
|
||||
go-github-com-modern-go-reflect2
|
||||
go-github-com-opentracing-opentracing-go
|
||||
go-github-com-pborman-uuid
|
||||
go-github-com-pelletier-go-toml
|
||||
go-github-com-pelletier-go-toml-v2
|
||||
go-github-com-philhofer-fwd
|
||||
go-github-com-pkg-errors
|
||||
go-github-com-pmezard-go-difflib
|
||||
go-github-com-remyoudompheng-bigfft
|
||||
go-github-com-rivo-uniseg
|
||||
go-github-com-russross-blackfriday
|
||||
go-github-com-sirupsen-logrus
|
||||
@@ -3389,23 +3359,8 @@ share/zulip/integrations or in lib/<...>/site-packages/integrations:
|
||||
go-github-com-spf13-viper
|
||||
go-github-com-stretchr-testify
|
||||
go-github-com-subosito-gotenv
|
||||
go-github-com-tinylib-msgp
|
||||
go-github-com-valyala-bytebufferpool
|
||||
go-github-com-valyala-fasttemplate
|
||||
go-github-com-vmihailenco-msgpack-v5
|
||||
go-github-com-vmihailenco-tagparser
|
||||
;; go.mau.fi
|
||||
go-go-mau-fi-libsignal
|
||||
go-go-mau-fi-whatsmeow
|
||||
;; lukechampine.com
|
||||
go-lukechampine-com-uint128
|
||||
;; modernc.org
|
||||
go-modernc-org-cc-v3
|
||||
go-modernc-org-mathutil
|
||||
go-modernc-org-memory
|
||||
go-modernc-org-opt
|
||||
go-modernc-org-strutil
|
||||
go-modernc-org-token))
|
||||
go-github-com-vmihailenco-tagparser))
|
||||
(synopsis "Bridge together various messaging networks and protocols")
|
||||
(description
|
||||
"Relays messages between different channels from various
|
||||
|
||||
@@ -614,9 +614,6 @@ Android, and ChromeOS.")
|
||||
(add-after 'unpack 'disable-failing-tests
|
||||
(lambda _
|
||||
(substitute* "tests/meson.build"
|
||||
;; This test is flaky (see:
|
||||
;; <https://gitlab.freedesktop.org/libnice/libnice/-/work_items/210>).
|
||||
((".*'test-send-recv',.*") "")
|
||||
;; ‘test-set-port-range.c:66:main: assertion failed:
|
||||
;; (nice_agent_gather_candidates (agent, stream1))’
|
||||
(("'test-set-port-range'" all)
|
||||
@@ -2044,7 +2041,7 @@ of the same name.")
|
||||
(define-public wireshark
|
||||
(package
|
||||
(name "wireshark")
|
||||
(version "4.6.4")
|
||||
(version "4.6.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -2053,7 +2050,7 @@ of the same name.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "05jivnnlmbbhc6b3r7zdahiw22fvb9r6pg4pc83ascnja49xlyq6"))))
|
||||
(base32 "0j49gnvc1x37sf7dq3wklzlhp5gihi7d926mmfqb1avyb68n7qjn"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
||||
@@ -2324,7 +2324,7 @@ a string consisting of a number and a time unit is converted to milliseconds.")
|
||||
(define-public node-nan
|
||||
(package
|
||||
(name "node-nan")
|
||||
(version "2.22.0")
|
||||
(version "2.26.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -2333,7 +2333,7 @@ a string consisting of a number and a time unit is converted to milliseconds.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "02gqm23x26glffvyxrnk610hy3hg0kwh2v58dhnb032l0jhjzqvp"))))
|
||||
(base32 "18xv0m40jgy3sc4pldw95w6p72ms5a5h0x2sm2mimlwlmxmrjlmb"))))
|
||||
(build-system node-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
||||
+48
-58
@@ -274,7 +274,7 @@
|
||||
(lambda (file stat)
|
||||
(executable-file? file))
|
||||
#:stat lstat)))))
|
||||
(add-after 'install 'install-npmrc
|
||||
(add-after 'install 'fix-node-gyp-reference
|
||||
;; Note: programs like node-gyp only receive these values if
|
||||
;; they are started via `npm` or `npx`.
|
||||
;; See: https://github.com/nodejs/node-gyp#npm-configuration
|
||||
@@ -482,7 +482,7 @@ Node.js and web browsers.")
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/indutny/llparse-builder.git")
|
||||
(url "https://github.com/nodejs/llparse-builder.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
@@ -491,10 +491,6 @@ Node.js and web browsers.")
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; FIXME: Unneeded runtime dependency.
|
||||
;; https://github.com/indutny/llparse-builder/pull/2
|
||||
(substitute* "package.json"
|
||||
(("\"@types/debug.*,") ""))
|
||||
;; Fix imports for esbuild.
|
||||
;; https://github.com/evanw/esbuild/issues/477
|
||||
(substitute* '("src/node/invoke.ts"
|
||||
@@ -521,7 +517,8 @@ Node.js and web browsers.")
|
||||
(add-after 'patch-dependencies 'delete-dependencies
|
||||
(lambda _
|
||||
(modify-json (delete-dependencies
|
||||
`("@types/mocha"
|
||||
`("@types/debug"
|
||||
"@types/mocha"
|
||||
"@types/node"
|
||||
"mocha"
|
||||
"ts-node"
|
||||
@@ -539,7 +536,7 @@ Node.js and web browsers.")
|
||||
(list node-binary-search-bootstrap node-debug-bootstrap))
|
||||
(native-inputs
|
||||
(list esbuild))
|
||||
(home-page "https://github.com/indutny/llparse-builder#readme")
|
||||
(home-page "https://github.com/nodejs/llparse-builder#readme")
|
||||
(properties '((hidden? . #t)))
|
||||
(synopsis "Graph builder for consumption by llparse")
|
||||
(description "This package builds graphs for consumption by llparse.")
|
||||
@@ -553,7 +550,7 @@ Node.js and web browsers.")
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/indutny/llparse-frontend.git")
|
||||
(url "https://github.com/nodejs/llparse-frontend.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
@@ -602,7 +599,7 @@ Node.js and web browsers.")
|
||||
(list node-debug-bootstrap node-llparse-builder-bootstrap))
|
||||
(native-inputs
|
||||
(list esbuild))
|
||||
(home-page "https://github.com/indutny/llparse-frontend#readme")
|
||||
(home-page "https://github.com/nodejs/llparse-frontend#readme")
|
||||
(properties '((hidden? . #t)))
|
||||
(synopsis "Frontend for the llparse compiler")
|
||||
(description "This package is a frontend for the llparse compiler.")
|
||||
@@ -611,17 +608,17 @@ Node.js and web browsers.")
|
||||
(define-public node-llparse-bootstrap
|
||||
(package
|
||||
(name "node-llparse")
|
||||
(version "7.1.0")
|
||||
(version "7.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/indutny/llparse.git")
|
||||
(url "https://github.com/nodejs/llparse.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"10da273iy2if88hp79cwms6c8qpsl1fkgzll6gmqyx5yxv5mkyp6"))
|
||||
"09hqjcynkz5iv7aydzdwgs42r7y2zylplv0ff7w0vkdsgb08j22a"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
@@ -645,10 +642,14 @@ Node.js and web browsers.")
|
||||
(add-after 'patch-dependencies 'delete-dependencies
|
||||
(lambda args
|
||||
(modify-json (delete-dependencies
|
||||
`("@types/debug"
|
||||
`("@stylistic/eslint-plugin"
|
||||
"@typescript-eslint/eslint-plugin"
|
||||
"@typescript-eslint/parser"
|
||||
"@types/debug"
|
||||
"@types/mocha"
|
||||
"@types/node"
|
||||
"esm"
|
||||
"eslint"
|
||||
"llparse-test-fixture"
|
||||
"mocha"
|
||||
"ts-node"
|
||||
@@ -676,7 +677,7 @@ parser definition into a C output.")
|
||||
(define-public llhttp-bootstrap
|
||||
(package
|
||||
(name "llhttp")
|
||||
(version "9.2.1")
|
||||
(version "9.3.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -685,7 +686,7 @@ parser definition into a C output.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0mzg19aqb1am498gms0z75cwd5kmfg9p78b1hhxw67019nsjcbac"))
|
||||
"0yz4ys94pjq2fs2pihpqjvmxj2mbpm8k5prlm445z4qlajzlr4kb"))
|
||||
(patches (search-patches "llhttp-ponyfill-object-fromentries.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
@@ -747,14 +748,14 @@ source files.")
|
||||
(define-public node-lts
|
||||
(package
|
||||
(inherit node-bootstrap)
|
||||
(version "22.14.0")
|
||||
(version "24.14.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://nodejs.org/dist/v" version
|
||||
"/node-v" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12msprh604s6qdsgwymxw4kl8ivaldbaydf4v37lbp02aznk2kkc"))
|
||||
"1cri5lp3a9jhh34dbd48hq2zyb7xjb9qs6zl36l3q2blawgwz642"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
@@ -770,13 +771,17 @@ source files.")
|
||||
"deps/icu-small"
|
||||
"deps/nghttp2"
|
||||
"deps/ngtcp2"
|
||||
"deps/llhttp"
|
||||
"deps/uv"
|
||||
"deps/zlib"))))))
|
||||
"deps/zlib"
|
||||
"deps/zstd"))))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments arguments
|
||||
((#:configure-flags configure-flags)
|
||||
''("--shared-cares"
|
||||
"--shared-libuv"
|
||||
"--shared-http-parser"
|
||||
"--shared-http-parser-libname=llhttp"
|
||||
"--shared-nghttp2"
|
||||
"--shared-openssl"
|
||||
"--shared-zlib"
|
||||
@@ -784,6 +789,7 @@ source files.")
|
||||
"--with-intl=system-icu"
|
||||
"--shared-ngtcp2"
|
||||
"--shared-nghttp3"
|
||||
"--shared-zstd"
|
||||
;;Needed for correct snapshot checksums
|
||||
"--v8-enable-snapshot-compression"))
|
||||
((#:phases phases)
|
||||
@@ -846,9 +852,11 @@ source files.")
|
||||
(for-each delete-file
|
||||
'("test/parallel/test-https-agent-unref-socket.js"))
|
||||
|
||||
;; This test is timing-sensitive, and fails sporadically on
|
||||
;; These tests are timing-sensitive, and fail sporadically on
|
||||
;; slow, busy, or even very fast machines.
|
||||
(delete-file "test/parallel/test-fs-utimes.js")
|
||||
(for-each delete-file
|
||||
'("test/parallel/test-fs-utimes.js"
|
||||
"test/sequential/test-performance-eventloopdelay.js"))
|
||||
|
||||
;; FIXME: This test fails randomly:
|
||||
;; https://github.com/nodejs/node/issues/31213
|
||||
@@ -899,18 +907,6 @@ source files.")
|
||||
"test/parallel/test-http2-invalid-last-stream-id.js")
|
||||
(("client\\.connect\\(address\\)")
|
||||
"client.connect(address.port)"))))
|
||||
(add-after 'delete-problematic-tests 'replace-llhttp-sources
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Replace pre-generated llhttp sources
|
||||
(let ((llhttp (assoc-ref inputs "llhttp")))
|
||||
(copy-file (string-append llhttp "/src/llhttp.c")
|
||||
"deps/llhttp/src/llhttp.c")
|
||||
(copy-file (string-append llhttp "/src/api.c")
|
||||
"deps/llhttp/src/api.c")
|
||||
(copy-file (string-append llhttp "/src/http.c")
|
||||
"deps/llhttp/src/http.c")
|
||||
(copy-file (string-append llhttp "/include/llhttp.h")
|
||||
"deps/llhttp/include/llhttp.h"))))
|
||||
;; npm installs dependencies by copying their files over a tar
|
||||
;; stream. A file with more than one hardlink is marked as a
|
||||
;; "Link". pacote/lib/fetcher.js calls node-tar's extractor with a
|
||||
@@ -935,30 +931,22 @@ source files.")
|
||||
;; https://github.com/npm/pacote/issues/285
|
||||
(add-after 'install 'ignore-number-of-hardlinks
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((file (string-append (assoc-ref outputs "out")
|
||||
"/lib/node_modules/npm/node_modules"
|
||||
"/tar/lib/write-entry.js")))
|
||||
(substitute* file
|
||||
(let ((dir (string-append (assoc-ref outputs "out")
|
||||
"/lib/node_modules/npm/node_modules"
|
||||
"/tar/dist")))
|
||||
(substitute*
|
||||
(list (string-append dir "/esm/write-entry.js")
|
||||
(string-append dir "/commonjs/write-entry.js"))
|
||||
(("this.stat.nlink > 1") "false")))))
|
||||
(add-after 'install 'install-node-gyp-wrapper
|
||||
(replace 'fix-node-gyp-reference
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(dir (string-append out "/lib/node_modules/npm/bin/node-gyp-bin"))
|
||||
(file (string-append dir "/node-gyp")))
|
||||
(mkdir-p dir)
|
||||
;; See https://github.com/npm/cli/issues/6842
|
||||
(call-with-output-file file
|
||||
(lambda (port)
|
||||
(format port "#!~a/bin/sh
|
||||
if [ \"x$npm_config_node_gyp\" = \"x\" ]; then
|
||||
~a/bin/node \"~a/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js\" \"$@\"
|
||||
else
|
||||
\"$npm_config_node_gyp\" \"$@\"
|
||||
fi"
|
||||
(assoc-ref inputs "bash")
|
||||
out
|
||||
out)))
|
||||
(chmod file #o555))))))))
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(for-each
|
||||
(lambda (spec)
|
||||
(wrap-program (string-append out spec)
|
||||
`("npm_package_config_node_gyp_nodedir" = (,out))))
|
||||
'("/bin/npm"
|
||||
"/bin/npx")))))))))
|
||||
(native-inputs
|
||||
(list ;; Runtime dependencies for binaries used as a bootstrap.
|
||||
c-ares-for-node-lts
|
||||
@@ -974,7 +962,8 @@ fi"
|
||||
pkg-config
|
||||
procps
|
||||
python
|
||||
util-linux))
|
||||
util-linux
|
||||
gcc-14))
|
||||
(inputs
|
||||
(list bash-minimal
|
||||
coreutils
|
||||
@@ -987,7 +976,8 @@ fi"
|
||||
nghttp3
|
||||
`(,nghttp2 "lib")
|
||||
openssl
|
||||
zlib))
|
||||
zlib
|
||||
`(,zstd-1.5.7 "lib")))
|
||||
(supported-systems
|
||||
(cons "riscv64-linux" (package-supported-systems node-bootstrap)))
|
||||
(properties (alist-delete 'hidden? (package-properties node-bootstrap)))))
|
||||
@@ -1003,6 +993,6 @@ fi"
|
||||
`(cons* "--shared" "--without-npm" ,flags))
|
||||
((#:phases phases '%standard-phases)
|
||||
`(modify-phases ,phases
|
||||
(delete 'install-npmrc)
|
||||
(delete 'fix-node-gyp-reference)
|
||||
(delete 'patch-nested-shebangs)
|
||||
(delete 'ignore-number-of-hardlinks)))))))
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
;;; Copyright © 2021, 2022, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
|
||||
;;; Copyright © 2022, 2023 Zhu Zihao <all_but_last@163.com>
|
||||
;;; Copyright © 2023, 2025-2026 jgart <jgart@dismail.de>
|
||||
;;; Copyright © 2023 jgart <jgart@dismail.de>
|
||||
;;; Copyright © 2023 Wojtek Kosior <koszko@koszko.org>
|
||||
;;; Copyright © 2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
|
||||
;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net>
|
||||
@@ -31,7 +31,6 @@
|
||||
;;; Copyright © 2025 Tomás Ortín Fernández <quanrong@mailbox.org>
|
||||
;;; Copyright © 2025-2026 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
|
||||
;;; Copyright © 2025 unwox <me@unwox.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@@ -798,47 +797,6 @@ with the @command{module} command commonly found on @acronym{HPC,
|
||||
high-performance computing} clusters.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public toys
|
||||
(package
|
||||
(name "toys")
|
||||
(version "0.1.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.sr.ht/~whereiseveryone/toys")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"169jxh5knp5f2y9wbnc454jjdvvyqb5r0ydv3qkpm332vr0cl6p9"))))
|
||||
(build-system guile-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'register-guix-extension
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((ext-path (string-append #$output "/share/guix/extensions")))
|
||||
(mkdir-p ext-path)
|
||||
(copy-recursively "guix/extensions" ext-path))))
|
||||
(add-after 'register-guix-extension 'clean-up
|
||||
(lambda* _
|
||||
(delete-file "channels.scm")
|
||||
(delete-file-recursively "guix"))))))
|
||||
(native-inputs (list guile-3.0-latest))
|
||||
(inputs
|
||||
(list guile-json-4
|
||||
guile-readline
|
||||
guile-sqlite3
|
||||
guix))
|
||||
(native-search-paths (list $GUIX_EXTENSIONS_PATH))
|
||||
(home-page "https://toys.whereis.social/")
|
||||
(synopsis "Search engine for Guix channels")
|
||||
(description "Toys is a search engine for collecting and displaying Guix
|
||||
channel data found across the internet. Toys provides a command-line
|
||||
interface for interacting with the application.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public guix-xsearch
|
||||
(package
|
||||
(name "guix-xsearch")
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
Some udmapbuf relying tests were still selected despite using --no-suite=needs-udmabuf.
|
||||
|
||||
Upstream-status: Patch prepared by upstream, not yet committed.
|
||||
|
||||
diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
|
||||
index 0118304bf8..6bf4d4bb93 100644
|
||||
--- a/testsuite/gsk/meson.build
|
||||
+++ b/testsuite/gsk/meson.build
|
||||
@@ -275,6 +275,16 @@ compare_render_tests = [
|
||||
'zero-length-path-stroke',
|
||||
]
|
||||
|
||||
+# These tests use dmabufs and fail in testrunners that have
|
||||
+# dmabuf support but no access to /dev/udmabuf.
|
||||
+# For that purpose we add them to the 'needs-udmabuf' suite
|
||||
+# with this list
|
||||
+needs_udmabuf = [
|
||||
+ 'yuv-matrix-dmabuf-nv12',
|
||||
+ 'yuv-matrix-dmabuf-rgba',
|
||||
+ 'yuv-matrix-dmabuf-yuyv',
|
||||
+]
|
||||
+
|
||||
# These tests are either slow or need lots of memory.
|
||||
# So we don't run them in parallel with other such tests to not
|
||||
# cause CI failures
|
||||
@@ -386,6 +396,9 @@ foreach renderer : renderers
|
||||
if test_xfails.contains(variant) or (renderer_name == 'cairo' and variant == 'clip')
|
||||
extra_suites += ['failing']
|
||||
endif
|
||||
+ if needs_udmabuf.contains(testname)
|
||||
+ extra_suites += ['needs-udmabuf']
|
||||
+ endif
|
||||
test('compare ' + renderer_name + ' ' + testname + ' ' + variant, compare_render,
|
||||
protocol: 'tap',
|
||||
args: [
|
||||
@@ -1,79 +0,0 @@
|
||||
Upstream-status: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/9675
|
||||
|
||||
diff --git a/demos/gtk-demo/geninclude.py b/demos/gtk-demo/geninclude.py
|
||||
index 2ebfaeb625..5864a608f5 100755
|
||||
--- a/demos/gtk-demo/geninclude.py
|
||||
+++ b/demos/gtk-demo/geninclude.py
|
||||
@@ -2,19 +2,20 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import sys
|
||||
-import re
|
||||
-import os
|
||||
from collections import *
|
||||
|
||||
+
|
||||
def add_quotes(s):
|
||||
return "\"" + s.lower() + "\""
|
||||
|
||||
+
|
||||
def wordify(s):
|
||||
return s.strip().rstrip(".,;:")
|
||||
|
||||
+
|
||||
def is_keyword(s):
|
||||
if s == "GTK":
|
||||
- return False
|
||||
+ return False
|
||||
elif s.startswith(("Gtk", "Gdk", "Pango")):
|
||||
return True
|
||||
elif s.startswith("G") and s[1].isupper():
|
||||
@@ -22,6 +23,7 @@ def is_keyword(s):
|
||||
else:
|
||||
return False
|
||||
|
||||
+
|
||||
out_file = sys.argv[1]
|
||||
in_files = sys.argv[2:]
|
||||
|
||||
@@ -82,6 +84,10 @@ for demo in demos:
|
||||
parent_index = parent_index + 1
|
||||
|
||||
|
||||
+# Sort demos by title
|
||||
+demos = sorted(demos, key=lambda x: x[1])
|
||||
+
|
||||
+
|
||||
# For every child with a parent, generate a list of child demos
|
||||
i = 0
|
||||
for parent in parents:
|
||||
@@ -91,15 +97,12 @@ for parent in parents:
|
||||
for child in demos:
|
||||
if child[1].startswith(parent + "/"):
|
||||
title = child[1][child[1].rfind('/') + 1:]
|
||||
- file_output += " { \"" + child[0] + "\", \"" + title + "\", " + "(const char*[]) {" + ", ".join(list(map(add_quotes, child[2])) + ["NULL"]) + " }, \"" + child[3] + "\", " + child[4] + ", NULL },\n"
|
||||
+ file_output += " { \"" + child[0] + "\", \"" + title + "\", " + "(const char*[]) {" + ", ".join(list(map(add_quotes, sorted(child[2]))) + ["NULL"]) + " }, \"" + child[3] + "\", " + child[4] + ", NULL },\n"
|
||||
|
||||
file_output += " { NULL }\n};\n"
|
||||
i = i + 1
|
||||
|
||||
|
||||
-# Sort demos by title
|
||||
-demos = sorted(demos, key=lambda x: x[1])
|
||||
-
|
||||
file_output += "\nDemoData gtk_demos[] = {\n"
|
||||
for demo in demos:
|
||||
# Do not generate one of these for demos with a parent demo
|
||||
@@ -118,10 +121,10 @@ for demo in demos:
|
||||
|
||||
if demo[5] != -1:
|
||||
child_array = "child" + str(demo[5])
|
||||
- file_output += " { " + name + ", " + title + ", " + "(const char*[]) {" + ", ".join(list(map(add_quotes, keywords)) + ["NULL"]) + " }, " + file + ", " + demo[4] + ", " + child_array + " },\n"
|
||||
+ file_output += " { " + name + ", " + title + ", " + "(const char*[]) {" + ", ".join(list(map(add_quotes, sorted(keywords))) + ["NULL"]) + " }, " + file + ", " + demo[4] + ", " + child_array + " },\n"
|
||||
|
||||
-file_output += " { NULL }\n};\n"
|
||||
|
||||
+file_output += " { NULL }\n};\n"
|
||||
ofile = open(out_file, "w")
|
||||
ofile.write(file_output)
|
||||
ofile.close()
|
||||
@@ -1,35 +0,0 @@
|
||||
Some udmapbuf relying tests were still selected despite using --no-suite=needs-udmabuf.
|
||||
|
||||
Upstream-status: Patch prepared by upstream, not yet committed.
|
||||
|
||||
diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
|
||||
index 0118304bf8..6bf4d4bb93 100644
|
||||
--- a/testsuite/gsk/meson.build
|
||||
+++ b/testsuite/gsk/meson.build
|
||||
@@ -275,6 +275,16 @@ compare_render_tests = [
|
||||
'zero-length-path-stroke',
|
||||
]
|
||||
|
||||
+# These tests use dmabufs and fail in testrunners that have
|
||||
+# dmabuf support but no access to /dev/udmabuf.
|
||||
+# For that purpose we add them to the 'needs-udmabuf' suite
|
||||
+# with this list
|
||||
+needs_udmabuf = [
|
||||
+ 'yuv-matrix-dmabuf-nv12',
|
||||
+ 'yuv-matrix-dmabuf-rgba',
|
||||
+ 'yuv-matrix-dmabuf-yuyv',
|
||||
+]
|
||||
+
|
||||
# These tests are either slow or need lots of memory.
|
||||
# So we don't run them in parallel with other such tests to not
|
||||
# cause CI failures
|
||||
@@ -386,6 +396,9 @@ foreach renderer : renderers
|
||||
if test_xfails.contains(variant) or (renderer_name == 'cairo' and variant == 'clip')
|
||||
extra_suites += ['failing']
|
||||
endif
|
||||
+ if needs_udmabuf.contains(testname)
|
||||
+ extra_suites += ['needs-udmabuf']
|
||||
+ endif
|
||||
test('compare ' + renderer_name + ' ' + testname + ' ' + variant, compare_render,
|
||||
protocol: 'tap',
|
||||
args: [
|
||||
@@ -1346,7 +1346,7 @@ using a stylus.")
|
||||
(define-public xournalpp
|
||||
(package
|
||||
(name "xournalpp")
|
||||
(version "1.3.4")
|
||||
(version "1.3.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -1355,7 +1355,7 @@ using a stylus.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1rs3x9k4nnlwpml49fzjsnp3hs807i7y8ccgffgngmb71999bla4"))))
|
||||
(base32 "1dzjp0hi54h2f5sbh9jmhywls3q52lc8j2bi2zyq6pl0y4nvfx80"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
||||
@@ -236,7 +236,7 @@ it.")
|
||||
(define-public trealla
|
||||
(package
|
||||
(name "trealla")
|
||||
(version "2.92.16")
|
||||
(version "2.92.15")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -245,7 +245,7 @@ it.")
|
||||
(url "https://github.com/trealla-prolog/trealla")
|
||||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32 "1246f15amc2f5d43s59ncq1i7k97yfxsjz057k2prymglyns0sgk"))
|
||||
(base32 "15kmal7pja5y0jxzl7kycr028513gc4y00dlvvs2f7gcviiddbxh"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
|
||||
@@ -173,7 +173,7 @@ rates.")
|
||||
(define-public pulseaudio
|
||||
(package
|
||||
(name "pulseaudio")
|
||||
(version "17.0")
|
||||
(version "16.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@@ -181,7 +181,7 @@ rates.")
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1dc7xdfbn5rknwsvv5m2ijfwnqrap208liwyhiykjghsczb98dq5"))
|
||||
"1r2aa0g7al9jhrrbrnih6i3bfznd73kkbafrbzwpjyflj7735vwf"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Disable console-kit support by default since it's deprecated
|
||||
|
||||
@@ -16898,11 +16898,12 @@ the @code{sendfile(2)} system call.")
|
||||
(arguments
|
||||
(list
|
||||
#:test-flags
|
||||
#~(list
|
||||
"-k" "not TestCommandLineParser"
|
||||
;; These contains flaky tests.
|
||||
"--deselect=pyftpdlib/test/test_functional.py"
|
||||
"--deselect=pyftpdlib/test/test_functional_ssl.py")))
|
||||
#~(list "-k" "not TestCommandLineParser"
|
||||
#$@(if (target-aarch64?)
|
||||
;; TimeoutError: timed out
|
||||
'((string-append "--deselect=pyftpdlib/test/test_functional.py"
|
||||
"::TestTimeouts::test_idle_data_timeout2"))
|
||||
'()))))
|
||||
(native-inputs
|
||||
(list python-psutil
|
||||
python-pytest
|
||||
@@ -20955,8 +20956,7 @@ into 22 character URL-safe base64 slug representation.")
|
||||
(sha256
|
||||
(base32 "0zwjry4ylqncqvxrywp0km96jng4f288dgz8kz5vymk7nr2z21m1"))))
|
||||
(build-system pyproject-build-system)
|
||||
;; The test_brokenpipeerror is flaky.
|
||||
(arguments (list #:test-flags #~(list "-k" "not test_brokenpipeerror")))
|
||||
;; tests: 856 passed, 24 skipped
|
||||
(native-inputs
|
||||
(list python-poetry-core
|
||||
python-pytest
|
||||
|
||||
+6
-15
@@ -1090,16 +1090,11 @@ tst_qt_cmake_create.cpp"
|
||||
|
||||
;; See https://bugreports.qt.io/browse/QTBUG-113371
|
||||
;; Adding glibc-utf8-locales to native-inpus is no help.
|
||||
;; TODO: when core-updates is merged, check again.
|
||||
"tst_selftests"
|
||||
|
||||
;; The qsqldatabase test is flaky (see:
|
||||
;; <https://qt-project.atlassian.net/browse/QTBUG-145385>).
|
||||
"tst_qsqldatabase"
|
||||
|
||||
;; The 'tst_qtimer' test has a propensity to hang and
|
||||
;; fail (see:
|
||||
;; <https://qt-project.atlassian.net/browse/QTBUG-145261>).
|
||||
"tst_qtimer_no_glib"
|
||||
;; The 'tst_qsqlthread' test sometimes fails.
|
||||
"tst_qsqlthread"
|
||||
|
||||
;; The 'tst_qthread' test is also flaky, despite the
|
||||
;; patch applied that promised to fix it.
|
||||
@@ -1198,11 +1193,7 @@ tst_qt_cmake_create.cpp"
|
||||
;; This test may fail non-deterministically as reported
|
||||
;; in Guix bug#73233 and upstream at
|
||||
;; https://bugreports.qt.io/browse/QTBUG-119321.
|
||||
"tst_qsharedmemory"
|
||||
|
||||
;; This test fails deterministically on a non-privileged
|
||||
;; daemon.
|
||||
"tst_qstandardpaths")
|
||||
"tst_qsharedmemory")
|
||||
#$@(cond
|
||||
((target-ppc64le?)
|
||||
#~((list
|
||||
@@ -4558,7 +4549,7 @@ instances.")
|
||||
(define-public pyotherside
|
||||
(package
|
||||
(name "pyotherside")
|
||||
(version "1.6.2")
|
||||
(version "1.6.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@@ -4567,7 +4558,7 @@ instances.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1nn0rmdwrxz6j95plzfy4r6s2jfq9ddqj7danbn4rx2nnd81brnq"))))
|
||||
"0vwl088p8zjkh2rwmzwpz5mkjs2rfyb80018dq4r571c9vpwp2r0"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
||||
+8
-12
@@ -403,26 +403,22 @@ has a small feature set similar to a traditional Bourne shell.")
|
||||
(define-public es
|
||||
(package
|
||||
(name "es")
|
||||
(version "0.10.0")
|
||||
(version "0.9.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/wryun/es-shell")
|
||||
(commit (string-append "v" version))))
|
||||
(method url-fetch/tarbomb)
|
||||
(uri (string-append "https://github.com/wryun/es-shell/releases/"
|
||||
"download/v" version "/es-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "11zykg28r018vl9n0sw82jwv3m2yk1r9d25y2mjrvpkxf0dj2va6"))
|
||||
(file-name (git-file-name name version))))
|
||||
(base32 "1pgmqhsk14wyvl489sxdy7kdl2gwrsq1xvkip0z90kh888mlh9n9"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:test-target "test"))
|
||||
(list #:test-target "test"))
|
||||
(inputs
|
||||
(list readline))
|
||||
(native-inputs
|
||||
(list autoconf-2.72 ;2.69 does not detect that some files are missing
|
||||
automake
|
||||
procps)) ;for tests
|
||||
(list bison))
|
||||
(synopsis "Extensible shell with higher-order functions")
|
||||
(description
|
||||
"Es is an extensible shell. The language was derived from the Plan 9
|
||||
|
||||
+53
-50
@@ -50,7 +50,7 @@
|
||||
;;; Copyright © 2021 Alexey Abramov <levenson@mmer.org>
|
||||
;;; Copyright © 2021, 2022, 2023 Andrew Tropin <andrew@trop.in>
|
||||
;;; Copyright © 2021 David Wilson <david@daviwil.com>
|
||||
;;; Copyright © 2021-2026 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2021-2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
|
||||
;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com>
|
||||
@@ -3573,33 +3573,22 @@ soon as it starts.")
|
||||
(define-public libbluray
|
||||
(package
|
||||
(name "libbluray")
|
||||
(version "1.4.1")
|
||||
(version "1.3.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.videolan.org/videolan/"
|
||||
name "/" version "/"
|
||||
name "-" version ".tar.xz"))
|
||||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0jglp44wsjpp5k3mrxskfj9b488ksn7cj2dhxfjdqa3z150drdbn"))))
|
||||
(build-system meson-build-system)
|
||||
"0aszpsz3pc7p7z6yahlib4na585m6pqbg2d9dkpyipgml1lgv3s7"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:configure-flags #~(list "--disable-bdjava-jar" "--disable-static")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-dlopen-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(define (lib/no.so library)
|
||||
(let ((found (search-input-file inputs library)))
|
||||
(substring found 0 (- (string-length found)
|
||||
(string-length ".so")))))
|
||||
(substitute* "src/libbluray/disc/aacs.c"
|
||||
(("\"libaacs\"")
|
||||
(string-append "\"" (lib/no.so "lib/libaacs.so") "\"")))
|
||||
(substitute* "src/libbluray/disc/bdplus.c"
|
||||
(("\"libbdplus\"")
|
||||
(string-append "\"" (lib/no.so "lib/libbdplus.so") "\"")))))
|
||||
(add-after 'install 'move-packages-to-libs
|
||||
(add-after 'unpack 'move-packages-to-libs
|
||||
;; Avoid the need to propagate libxml2 et al. by referring to them
|
||||
;; directly.
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
@@ -3607,17 +3596,27 @@ soon as it starts.")
|
||||
(dirname
|
||||
(search-input-file inputs
|
||||
(string-append "lib/lib" lib ".so"))))
|
||||
(substitute* (string-append #$output
|
||||
"/lib/pkgconfig/libbluray.pc")
|
||||
(("^Requires.private.*") "")
|
||||
(substitute* "src/libbluray.pc.in"
|
||||
(("@PACKAGES@") "")
|
||||
(("^Libs.private:" field)
|
||||
(string-append field
|
||||
" -L" (search-input-vicinity "xml2")
|
||||
" -L" (search-input-vicinity "freetype")
|
||||
" -L" (search-input-vicinity "fontconfig")
|
||||
" -lxml2 -lfreetype -lfontconfig"))))))))
|
||||
" -lxml2 -lfreetype -lfontconfig")))))
|
||||
(add-before 'build 'fix-dlopen-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(define (lib/no.so library)
|
||||
(let ((found (search-input-file inputs library)))
|
||||
(substring found 0 (- (string-length found)
|
||||
(string-length ".so")))))
|
||||
(substitute* "src/libbluray/disc/aacs.c"
|
||||
(("\"libaacs\"")
|
||||
(string-append "\"" (lib/no.so "lib/libaacs.so") "\""))
|
||||
(("\"libbdplus\"")
|
||||
(string-append "\"" (lib/no.so "lib/libbdplus.so") "\""))))))))
|
||||
(native-inputs (list pkg-config))
|
||||
(inputs (list fontconfig freetype libaacs libbdplus libudfread libxml2))
|
||||
(inputs (list fontconfig freetype libaacs libbdplus libxml2))
|
||||
(home-page "https://www.videolan.org/developers/libbluray.html")
|
||||
(synopsis "Blu-Ray Disc playback library")
|
||||
(description
|
||||
@@ -3628,18 +3627,22 @@ players, like VLC or MPlayer.")
|
||||
(define-public libdvdread
|
||||
(package
|
||||
(name "libdvdread")
|
||||
(version "7.0.1")
|
||||
(version "6.1.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.videolan.org/videolan/"
|
||||
"libdvdread/" version "/"
|
||||
"libdvdread-" version ".tar.xz"))
|
||||
"libdvdread-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"01ylalrr9lw6x7fz7z030243kln1hfd1pbh3m9ikjp610nih8gif"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs (list pkg-config))
|
||||
(propagated-inputs (list libdvdcss))
|
||||
"0sakl4c8y2kkp09km0b5353w66pvfc72y8wi1vjwn252jx4ladff"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--with-libdvdcss=yes")))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(propagated-inputs
|
||||
(list libdvdcss))
|
||||
(home-page "http://dvdnav.mplayerhq.hu/")
|
||||
(synopsis "Library for reading video DVDs")
|
||||
(description
|
||||
@@ -3703,16 +3706,16 @@ MPEG-2 stream containing VOB packets.")
|
||||
(define-public libdvdnav
|
||||
(package
|
||||
(name "libdvdnav")
|
||||
(version "7.0.0")
|
||||
(version "6.1.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.videolan.org/videolan/"
|
||||
"libdvdnav/" version "/"
|
||||
"libdvdnav-" version ".tar.xz"))
|
||||
"libdvdnav-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"07i2gdj4nfah4lwlc6hl14xjbyh6b12bc1lipxs3q4vdsdd8z8d2"))))
|
||||
(build-system meson-build-system)
|
||||
"0j4ds6c4xl34dijkfpw805vj7s0vzg095kw0fvzj7ls7b53sg4f1"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs (list pkg-config))
|
||||
(propagated-inputs (list libdvdread)) ;in 'Requires.private' of dvdnav.pc
|
||||
(home-page "http://dvdnav.mplayerhq.hu/")
|
||||
@@ -3733,16 +3736,16 @@ encapsulated.")
|
||||
(define-public libdvdcss
|
||||
(package
|
||||
(name "libdvdcss")
|
||||
(version "1.5.0")
|
||||
(version "1.4.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.videolan.org/pub/"
|
||||
name "/" version "/"
|
||||
name "-" version ".tar.xz"))
|
||||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"16f3lnwcldy0ssq2yah97qsb0b8scsvhsivfbhpgizmys7j6752j"))))
|
||||
(build-system meson-build-system)
|
||||
"0y800y33spblb20s1lsjbaiybknmwwmmiczmjqx5s760blpwjg13"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "https://www.videolan.org/developers/libdvdcss.html")
|
||||
(synopsis "Library for accessing DVDs as block devices")
|
||||
(description
|
||||
@@ -5198,18 +5201,19 @@ specifications.")
|
||||
(define-public libaacs
|
||||
(package
|
||||
(name "libaacs")
|
||||
(version "0.11.1")
|
||||
(version "0.11.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://ftp.videolan.org/pub/videolan/libaacs/"
|
||||
version "/libaacs-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "0f8ax9dp49mrm1484bl2df659b34xyrjmngzmvvpg2n9wkms12m8"))))
|
||||
(inputs (list libgcrypt))
|
||||
(native-inputs (list bison flex))
|
||||
(base32 "11skjqjlldmbjkyxdcz4fmcn6y4p95r1xagbcnjy4ndnzf0l723d"))))
|
||||
(inputs
|
||||
(list libgcrypt))
|
||||
(native-inputs
|
||||
(list bison flex))
|
||||
(build-system gnu-build-system)
|
||||
(arguments (list #:configure-flags #~(list "--disable-static")))
|
||||
(home-page "https://www.videolan.org/developers/libaacs.html")
|
||||
(synopsis "Library for decrypting certain Blu-Ray discs")
|
||||
(description "libaacs is a library which implements the Advanced Access
|
||||
@@ -5979,13 +5983,12 @@ tools for styling them, including a built-in real-time video preview.")
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
(package
|
||||
(inherit (gst-plugins/selection
|
||||
gst-plugins-bad
|
||||
#:plugins '("debugutils" "opencv" "transcode")
|
||||
#:configure-flags
|
||||
#~'("-Dintrospection=enabled")))
|
||||
(inputs (modify-inputs inputs (prepend opencv))))
|
||||
;; TODO: Add the 'cvtracker' plugin after our gstreamer packages
|
||||
;; has been upgraded to version 1.20.
|
||||
(gst-plugins/selection gst-plugins-bad #:plugins
|
||||
'("debugutils" "transcode")
|
||||
#:configure-flags
|
||||
#~'("-Dintrospection=enabled"))
|
||||
gst-libav
|
||||
gsound
|
||||
gtk+
|
||||
@@ -5998,7 +6001,7 @@ tools for styling them, including a built-in real-time video preview.")
|
||||
python-numpy
|
||||
python-matplotlib
|
||||
python-pycairo
|
||||
python-pygobject-3.50)) ; bump along with libpeas
|
||||
python-pygobject))
|
||||
;; Propagate librsvg so that is is registered in GDK_PIXBUF_MODULE_FILE,
|
||||
;; otherwise pitivi fails to launch.
|
||||
(propagated-inputs (list (librsvg-for-system)))
|
||||
|
||||
+18
-21
@@ -551,30 +551,27 @@ similar to CoqIDE or ProofGeneral.")
|
||||
(append python-minimal)))))
|
||||
|
||||
(define-public vim-fugitive
|
||||
(let ((commit "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "vim-fugitive")
|
||||
(version (git-version "3.7" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(package
|
||||
(name "vim-fugitive")
|
||||
(version "3.7")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/tpope/vim-fugitive")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "12254b827ps68naihdhzdhvcr0v0ksdxwks2yvq63vwwr85xpbqq"))))
|
||||
(build-system vim-build-system)
|
||||
(arguments
|
||||
(list #:plugin-name "fugitive"))
|
||||
(home-page "https://github.com/tpope/vim-fugitive")
|
||||
(synopsis "Vim plugin to work with Git")
|
||||
(description
|
||||
"Vim-fugitive is a wrapper for Vim that complements the
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "138290g2aph1jjhaza6biky5qi4ka6435s01bwxivllgb53g3irc"))))
|
||||
(build-system vim-build-system)
|
||||
(arguments
|
||||
(list #:plugin-name "fugitive"))
|
||||
(home-page "https://github.com/tpope/vim-fugitive")
|
||||
(synopsis "Vim plugin to work with Git")
|
||||
(description "Vim-fugitive is a wrapper for Vim that complements the
|
||||
command window, where you can stage and review your changes before the next
|
||||
commit or run any Git arbitrary command.")
|
||||
(license license:vim)))) ; distributed under the same license as vim
|
||||
(license license:vim))) ; distributed under the same license as vim
|
||||
|
||||
(define-public vim-airline
|
||||
(package
|
||||
|
||||
@@ -1672,23 +1672,6 @@ client/daemon pair that lets you open any number of terminal windows from
|
||||
within a single process.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public rxvt-unicode-terminfo
|
||||
(package
|
||||
(name "rxvt-unicode-terminfo")
|
||||
(version (package-version rxvt-unicode))
|
||||
(source rxvt-unicode)
|
||||
(build-system copy-build-system)
|
||||
(arguments (list #:install-plan #~'(("share/terminfo" "share/terminfo"))))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "TERMINFO_DIRS")
|
||||
(files '("share/terminfo")))))
|
||||
(home-page (package-home-page rxvt-unicode))
|
||||
(synopsis "Terminfo for rxvt-unicode")
|
||||
(description "This package provides terminfo files for the
|
||||
@command{rxvt-unicode} terminal.")
|
||||
(license (package-license rxvt-unicode))))
|
||||
|
||||
(define-public xcape
|
||||
(package
|
||||
(name "xcape")
|
||||
|
||||
@@ -116,7 +116,7 @@ knowledge of the Z-Wave protocol.")
|
||||
(lambda _
|
||||
(substitute* "binding.gyp"
|
||||
(("std=c\\+\\+11")
|
||||
"std=c++17"))))
|
||||
"std=c++20"))))
|
||||
(replace 'build
|
||||
;; For some reason, `npm install` doesn't build
|
||||
;; the addon automatically, so we do it explicitly here.
|
||||
|
||||
+1
-1
@@ -54,7 +54,7 @@
|
||||
;; Lookup specification (info "(libc) Actions in the NSS Configuration").
|
||||
|
||||
(define-enumeration lookup-action
|
||||
(return continue merge)
|
||||
(return continue)
|
||||
make-lookup-action)
|
||||
|
||||
(define-enumeration lookup-status
|
||||
|
||||
@@ -30,10 +30,16 @@
|
||||
#:use-module (guix search-paths)
|
||||
#:use-module (guix build-system)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:export (%node-build-system-modules
|
||||
#:export (%default-lockfiles
|
||||
%node-build-system-modules
|
||||
node-build
|
||||
node-build-system))
|
||||
|
||||
(define %default-lockfiles
|
||||
(list "package-lock.json"
|
||||
"yarn.lock"
|
||||
"npm-shrinkwrap.json"))
|
||||
|
||||
(define %node-build-system-modules
|
||||
;; Build-side modules imported by default.
|
||||
`((guix build node-build-system)
|
||||
@@ -47,6 +53,10 @@
|
||||
"Return the default Node package, resolved lazily."
|
||||
(@* (gnu packages node) node-lts))
|
||||
|
||||
(define (default-guile-json)
|
||||
"Return the default guile-json package, resolved lazily."
|
||||
(@* (gnu packages guile) guile-json-4))
|
||||
|
||||
(define* (lower name
|
||||
#:key source inputs native-inputs outputs system target
|
||||
(node (default-node))
|
||||
@@ -78,17 +88,12 @@
|
||||
(build node-build)
|
||||
(arguments (strip-keyword-arguments private-keywords arguments)))))
|
||||
|
||||
(define (default-guile-json)
|
||||
"Return the default guile-json package."
|
||||
;; Lazily resolve the binding to avoid a circular dependency.
|
||||
(let ((mod (resolve-interface '(gnu packages guile))))
|
||||
(module-ref mod 'guile-json-4)))
|
||||
|
||||
(define* (node-build name inputs
|
||||
#:key
|
||||
source
|
||||
(npm-flags ''())
|
||||
(test-target "test")
|
||||
(lockfiles %default-lockfiles)
|
||||
(tests? #t)
|
||||
(phases '%standard-phases)
|
||||
(outputs '("out"))
|
||||
@@ -110,6 +115,7 @@
|
||||
#:system #$system
|
||||
#:npm-flags #$npm-flags
|
||||
#:test-target #$test-target
|
||||
#:lockfiles '#$lockfiles
|
||||
#:tests? #$tests?
|
||||
#:phases #$phases
|
||||
#:outputs #$(outputs->gexp outputs)
|
||||
|
||||
@@ -105,6 +105,7 @@
|
||||
source
|
||||
(phases '%standard-phases)
|
||||
(grammar-directories '("."))
|
||||
(lockfiles %default-lockfiles)
|
||||
(tests? #t)
|
||||
(outputs '("out" "js"))
|
||||
(search-paths '())
|
||||
@@ -123,6 +124,7 @@
|
||||
#:source #+source
|
||||
#:system #$system
|
||||
#:phases #$phases
|
||||
#:lockfiles '#$lockfiles
|
||||
#:tests? #$tests?
|
||||
#:grammar-directories '#$grammar-directories
|
||||
#:outputs #$(outputs->gexp outputs)
|
||||
@@ -145,6 +147,7 @@
|
||||
guile source
|
||||
(phases '%standard-phases)
|
||||
(grammar-directories '("."))
|
||||
(lockfiles %default-lockfiles)
|
||||
(tests? #t)
|
||||
(outputs '("out" "js"))
|
||||
(search-paths '())
|
||||
@@ -179,6 +182,7 @@
|
||||
#:build #$build
|
||||
#:target #$target
|
||||
#:phases #$phases
|
||||
#:lockfiles '#$lockfiles
|
||||
#:tests? #$tests?
|
||||
#:grammar-directories '#$grammar-directories
|
||||
#:outputs #$(outputs->gexp outputs)
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
;;; Copyright © 2021, 2022 Philip McGrath <philip@philipmcgrath.com>
|
||||
;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler@gmail.com>
|
||||
;;; Copyright © 2024 Daniel Khodabakhsh <d.khodabakhsh@gmail.com>
|
||||
;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@@ -29,6 +30,7 @@
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (json)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-26)
|
||||
#:use-module (srfi srfi-71)
|
||||
#:export (%standard-phases
|
||||
delete-dependencies
|
||||
@@ -40,34 +42,6 @@
|
||||
replace-fields
|
||||
with-atomic-json-file-replacement))
|
||||
|
||||
(define* (assoc-ref* alist key #:optional default)
|
||||
"Like assoc-ref, but return DEFAULT instead of #f if no value exists."
|
||||
(match (assoc key alist)
|
||||
(#f default)
|
||||
((_ . value) value)))
|
||||
|
||||
(define* (alist-pop alist key #:optional (= equal?))
|
||||
"Return two values, the first pair in ALIST with key KEY, and the other
|
||||
elements. Equality calls are made as (= KEY ALISTCAR)."
|
||||
(define (found? pair)
|
||||
(= key (car pair)))
|
||||
|
||||
(let ((before after (break found? alist)))
|
||||
(if (pair? after)
|
||||
(values (car after) (append before (cdr after)))
|
||||
(values #f before))))
|
||||
|
||||
(define* (alist-update alist key proc #:optional (= equal?))
|
||||
"Return an association list like ALIST, but with KEY mapped to the result of
|
||||
PROC applied to the first value found under the comparison (= KEY ALISTCAR).
|
||||
If no such value exists, return the list unchanged.
|
||||
Unlike acons, this removes the previous association of KEY (assuming it is
|
||||
unique), but the result may still share storage with ALIST."
|
||||
(let ((pair rest (alist-pop alist key =)))
|
||||
(if (pair? pair)
|
||||
(acons key (proc (cdr pair)) rest)
|
||||
alist)))
|
||||
|
||||
;;;
|
||||
;;; package.json modification procedures
|
||||
;;;
|
||||
@@ -106,23 +80,19 @@ listed in 'dependencies-to-remove', a list of strings naming npm packages.
|
||||
|
||||
To prevent the deleted dependencies from being reintroduced, use this function
|
||||
only after the 'patch-dependencies' phase."
|
||||
(lambda (pkg-meta)
|
||||
(fold
|
||||
(lambda (dependency-key pkg-meta)
|
||||
(alist-update
|
||||
pkg-meta
|
||||
dependency-key
|
||||
(lambda (dependencies)
|
||||
(remove
|
||||
(lambda (dependency)
|
||||
(member (car dependency) dependencies-to-remove))
|
||||
dependencies))))
|
||||
pkg-meta
|
||||
(list
|
||||
"devDependencies"
|
||||
"dependencies"
|
||||
"peerDependencies"
|
||||
"optionalDependencies"))))
|
||||
(let ((predicate (lambda (dependency)
|
||||
(member (car dependency) dependencies-to-remove)))
|
||||
(dependency? (cut member <> (list "devDependencies"
|
||||
"dependencies"
|
||||
"peerDependencies"
|
||||
"optionalDependencies"))))
|
||||
(lambda (pkg-meta)
|
||||
(map (match-lambda
|
||||
(((? dependency? key) . dependencies)
|
||||
(cons key (remove predicate dependencies)))
|
||||
(otherwise
|
||||
otherwise))
|
||||
pkg-meta))))
|
||||
|
||||
(define* (modify-json-fields
|
||||
fields
|
||||
@@ -236,8 +206,7 @@ only after the 'patch-dependencies' phase."
|
||||
(begin
|
||||
(mkdir dir)
|
||||
(setenv "HOME" (string-append (getcwd) "/" dir))
|
||||
(format #t "set HOME to ~s~%" (getenv "HOME")))))))
|
||||
#t)
|
||||
(format #t "set HOME to ~s~%" (getenv "HOME"))))))))
|
||||
|
||||
(define (module-name module)
|
||||
(let* ((package.json (string-append module "/package.json"))
|
||||
@@ -257,67 +226,65 @@ only after the 'patch-dependencies' phase."
|
||||
(for-each (lambda (dir)
|
||||
(let ((nm (string-append dir "/lib/node_modules")))
|
||||
(for-each (lambda (module)
|
||||
(hash-set! index (module-name module) module))
|
||||
(hash-set! index (module-name module)
|
||||
(string-append "file://" module)))
|
||||
(list-modules nm))))
|
||||
input-paths)
|
||||
index))
|
||||
|
||||
(define* (patch-dependencies #:key inputs #:allow-other-keys)
|
||||
"Replace versions by paths when found among INPUTS in `package.json'."
|
||||
|
||||
(define index (index-modules (map cdr inputs)))
|
||||
(define resolve-dependencies
|
||||
(let ((index (index-modules (map cdr inputs))))
|
||||
(cut map
|
||||
(match-lambda
|
||||
((dependency . version)
|
||||
(cons dependency (hash-ref index dependency version))))
|
||||
<>)))
|
||||
|
||||
(define (resolve-dependencies dependencies)
|
||||
(map
|
||||
(match-lambda
|
||||
((dependency . version)
|
||||
(cons dependency (hash-ref index dependency version))))
|
||||
dependencies))
|
||||
|
||||
(with-atomic-json-file-replacement
|
||||
(define (resolve key getter)
|
||||
(lambda (pkg-meta)
|
||||
(fold
|
||||
(lambda (proc pkg-meta) (proc pkg-meta))
|
||||
pkg-meta
|
||||
(list
|
||||
(lambda (pkg-meta)
|
||||
(alist-update pkg-meta "devDependencies" resolve-dependencies))
|
||||
(lambda (pkg-meta)
|
||||
(assoc-set!
|
||||
pkg-meta
|
||||
"dependencies"
|
||||
(resolve-dependencies
|
||||
; Combined "peerDependencies" and "dependencies" dependencies
|
||||
; with "dependencies" taking precedent.
|
||||
(fold
|
||||
(lambda (dependency dependencies)
|
||||
(assoc-set! dependencies (car dependency) (cdr dependency)))
|
||||
(assoc-ref* pkg-meta "peerDependencies" '())
|
||||
(assoc-ref* pkg-meta "dependencies" '())))))))))
|
||||
#t)
|
||||
(assoc-set! pkg-meta key
|
||||
(resolve-dependencies (getter pkg-meta)))))
|
||||
|
||||
(define* (delete-lockfiles #:key inputs #:allow-other-keys)
|
||||
"Delete 'package-lock.json', 'yarn.lock', and 'npm-shrinkwrap.json', if they
|
||||
exist."
|
||||
(modify-json
|
||||
(resolve "devDependencies"
|
||||
(lambda (pkg-meta)
|
||||
(or (assoc-ref pkg-meta "devDependencies") '())))
|
||||
(resolve "dependencies"
|
||||
;; Combined "peerDependencies" and "dependencies" dependencies
|
||||
;; with "dependencies" taking precedent.
|
||||
(lambda (pkg-meta)
|
||||
(fold
|
||||
(lambda (dependency dependencies)
|
||||
(assoc-set! dependencies
|
||||
(car dependency) (cdr dependency)))
|
||||
(or (assoc-ref pkg-meta "peerDependencies") '())
|
||||
(or (assoc-ref pkg-meta "dependencies") '()))))))
|
||||
|
||||
(define* (delete-lockfiles #:key lockfiles #:allow-other-keys)
|
||||
"Delete LOCKFILES if they exist."
|
||||
(for-each (lambda (pth)
|
||||
(when (file-exists? pth)
|
||||
(delete-file pth)))
|
||||
'("package-lock.json"
|
||||
"yarn.lock"
|
||||
"npm-shrinkwrap.json"))
|
||||
#t)
|
||||
lockfiles))
|
||||
|
||||
(define* (configure #:key outputs inputs #:allow-other-keys)
|
||||
(define* (configure #:key inputs #:allow-other-keys)
|
||||
(let ((npm (string-append (assoc-ref inputs "node") "/bin/npm")))
|
||||
(invoke npm "--offline" "--ignore-scripts" "--install-links" "install")
|
||||
#t))
|
||||
(invoke npm "--offline"
|
||||
"--ignore-scripts"
|
||||
"--install-links"
|
||||
"--no-audit"
|
||||
"install")))
|
||||
|
||||
(define* (build #:key inputs #:allow-other-keys)
|
||||
(let ((package-meta (call-with-input-file "package.json" json->scm)))
|
||||
(if (assoc-ref* (assoc-ref* package-meta "scripts" '()) "build" #f)
|
||||
(let* ((package-meta (call-with-input-file "package.json" json->scm))
|
||||
(scripts (assoc-ref package-meta "scripts")))
|
||||
(if (and scripts (assoc-ref scripts "build"))
|
||||
(let ((npm (string-append (assoc-ref inputs "node") "/bin/npm")))
|
||||
(invoke npm "run" "build"))
|
||||
(format #t "there is no build script to run~%"))
|
||||
#t))
|
||||
(format #t "there is no build script to run~%"))))
|
||||
|
||||
(define* (check #:key tests? inputs test-target #:allow-other-keys)
|
||||
"Run 'npm run TEST-TARGET' if TESTS?"
|
||||
@@ -334,8 +301,7 @@ exist."
|
||||
"--owner=0"
|
||||
"--group=0"
|
||||
"--numeric-owner"
|
||||
"-czf" "../package.tgz" ".")
|
||||
#t)
|
||||
"-czf" "../package.tgz" "."))
|
||||
|
||||
(define* (install #:key outputs inputs #:allow-other-keys)
|
||||
"Install the node module to the output store item."
|
||||
@@ -347,8 +313,7 @@ exist."
|
||||
"--loglevel" "info"
|
||||
"--production"
|
||||
"--install-links"
|
||||
"install" "../package.tgz")
|
||||
#t))
|
||||
"install" "../package.tgz")))
|
||||
|
||||
(define* (avoid-node-gyp-rebuild #:key outputs #:allow-other-keys)
|
||||
"Adjust the installed 'package.json' to remove an 'install' script that
|
||||
@@ -376,28 +341,25 @@ would try to run 'node-gyp rebuild'."
|
||||
;; For further details, see:
|
||||
;; - https://docs.npmjs.com/cli/v8/configuring-npm/package-json#default-values
|
||||
;; - https://docs.npmjs.com/cli/v8/using-npm/scripts#best-practices
|
||||
(define installed-package.json
|
||||
(search-input-file outputs (string-append "/lib/node_modules/"
|
||||
(module-name ".")
|
||||
"/package.json")))
|
||||
;; We don't want to use an atomic replacement here, because we often don't
|
||||
;; even need to overwrite this file. Therefore, let's use some helpers
|
||||
;; that we'd otherwise not need.
|
||||
(define pkg-meta
|
||||
(call-with-input-file installed-package.json json->scm))
|
||||
(define scripts
|
||||
(assoc-ref* pkg-meta "scripts" '()))
|
||||
|
||||
(when (equal? "node-gyp rebuild" (assoc-ref* scripts "install" #f))
|
||||
(call-with-output-file installed-package.json
|
||||
(lambda (out)
|
||||
(scm->json
|
||||
(assoc-set! pkg-meta
|
||||
"scripts"
|
||||
(assoc-set! scripts
|
||||
"install"
|
||||
"echo Guix: avoiding node-gyp rebuild"))
|
||||
out)))))
|
||||
(let* ((installed-package.json
|
||||
(search-input-file outputs (string-append "/lib/node_modules/"
|
||||
(module-name ".")
|
||||
"/package.json")))
|
||||
;; We don't want to use an atomic replacement here, because we often
|
||||
;; don't even need to overwrite this file. Therefore, let's use some
|
||||
;; helpers that we'd otherwise not need.
|
||||
(pkg-meta (call-with-input-file installed-package.json json->scm))
|
||||
(scripts (or (assoc-ref pkg-meta "scripts") '())))
|
||||
(when (equal? "node-gyp rebuild" (assoc-ref scripts "install"))
|
||||
(call-with-output-file installed-package.json
|
||||
(lambda (out)
|
||||
(scm->json
|
||||
(assoc-set! pkg-meta
|
||||
"scripts"
|
||||
(assoc-set! scripts
|
||||
"install"
|
||||
"echo Guix: avoiding node-gyp rebuild"))
|
||||
out))))))
|
||||
|
||||
(define %standard-phases
|
||||
(modify-phases gnu:%standard-phases
|
||||
|
||||
Reference in New Issue
Block a user