forked from tribes/guix
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Ian Eure
|
baed3ca1b6 |
@@ -1579,7 +1579,6 @@ dist_patch_DATA = \
|
||||
%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 \
|
||||
%D%/packages/patches/gst-plugins-base-null-pointer.patch \
|
||||
%D%/packages/patches/gzdoom-search-in-installed-share.patch \
|
||||
%D%/packages/patches/gzdoom-find-system-libgme.patch \
|
||||
%D%/packages/patches/hare-fallback-cache.patch \
|
||||
|
||||
+27
-43
@@ -338,14 +338,14 @@ another.")
|
||||
(define-public orc
|
||||
(package
|
||||
(name "orc")
|
||||
(version "0.4.42")
|
||||
(version "0.4.41")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://gstreamer.freedesktop.org/data/src/"
|
||||
"orc/orc-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03694b8jnaqhi9z49v45qchcbvp1i9maamn4fiwcjg5gb6mi5jby"))))
|
||||
"18kz8sc8vh0rzk0n221zc8km9pp9gdcjsr04phwwv2ajcm7zs6yb"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
@@ -375,7 +375,7 @@ arrays of data.")
|
||||
(define-public gstreamer-docs
|
||||
(package
|
||||
(name "gstreamer-docs")
|
||||
(version "1.28.1")
|
||||
(version "1.26.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@@ -383,7 +383,7 @@ arrays of data.")
|
||||
"/gstreamer-docs-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bp2rffj82a8c5l119dv4kxjkl1l35d9b0lynfc0vk2krcrb5xyv"))))
|
||||
"11q0yydchisd4c0jnqa6kmnf66kf25fim3l456krlwcy1qpsvd4j"))))
|
||||
(build-system trivial-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build utils))
|
||||
@@ -435,7 +435,7 @@ the GStreamer multimedia framework.")
|
||||
(define-public gstreamer
|
||||
(package
|
||||
(name "gstreamer")
|
||||
(version "1.28.1")
|
||||
(version "1.26.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@@ -444,7 +444,7 @@ the GStreamer multimedia framework.")
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0125cqbm5a2bhi37bzs6hgj89r057py3zhkmrfc8ggxx6px2ypmn"))))
|
||||
"1016z0znl2j43n08rl19zdhfvfsgnmg44qh8fk6dr4qj481icrnw"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list #:disallowed-references (list (this-package-native-input "python"))
|
||||
@@ -516,7 +516,7 @@ This package provides the core library and elements.")
|
||||
(define-public gst-plugins-base
|
||||
(package
|
||||
(name "gst-plugins-base")
|
||||
(version "1.28.1")
|
||||
(version "1.26.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@@ -524,13 +524,11 @@ This package provides the core library and elements.")
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"15r42ff1mwkj5p3z0dij6d9isi1q02gmjnp8i26xgx9gm71a8ihl"))
|
||||
(patches (search-patches "gst-plugins-base-null-pointer.patch"))))
|
||||
"0cvrq9767w0aqzinifbirbc95jg4i4md4b8f4b70hlq217pzkyaf"))))
|
||||
(build-system meson-build-system)
|
||||
(propagated-inputs
|
||||
(list glib ;required by gstreamer-sdp-1.0.pc
|
||||
gstreamer ;required by gstreamer-plugins-base-1.0.pc
|
||||
libdrm ;required by gstreamer-allocators-1.0.pc
|
||||
libgudev ;required by gstreamer-gl-1.0.pc
|
||||
;; wayland-client.h is referred to in
|
||||
;; include/gstreamer-1.0/gst/gl/wayland/gstgldisplay_wayland.h
|
||||
@@ -572,8 +570,9 @@ This package provides the core library and elements.")
|
||||
(lambda _
|
||||
(substitute* "tests/check/meson.build"
|
||||
;; This test causes nondeterministic failures (see:
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/895>).
|
||||
((".*'elements/appsrc.c'.*") ""))
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/950).
|
||||
((".*'elements/appsrc.c'.*")
|
||||
""))
|
||||
;; Some other tests fail on other architectures.
|
||||
#$@(cond
|
||||
((target-x86-32?)
|
||||
@@ -625,7 +624,7 @@ for the GStreamer multimedia library.")
|
||||
(define-public gst-plugins-good
|
||||
(package
|
||||
(name "gst-plugins-good")
|
||||
(version "1.28.1")
|
||||
(version "1.26.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@@ -634,7 +633,7 @@ for the GStreamer multimedia library.")
|
||||
"https://gstreamer.freedesktop.org/src/" name "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "139n8in88003dbx4kv6i69zhl4bs07f1mf201q2n4yhvwjp2d3kk"))))
|
||||
(base32 "0lrwscda9yy8a61bv65c3392vb5m8phrl5i7bwgbprnz1rkwjkpy"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@@ -745,14 +744,14 @@ model to base your own plug-in on, here it is.")
|
||||
(define-public gst-plugins-bad
|
||||
(package
|
||||
(name "gst-plugins-bad")
|
||||
(version "1.28.1")
|
||||
(version "1.26.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://gstreamer.freedesktop.org/src/"
|
||||
name "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"18hk8gh97r2cwdazl5ikjwsczk3bkvr4z7nmjc45bdgqhwvmkhan"))
|
||||
"0qbmblksgl2nmbi6brw54b1bzziw9flvqk2zb576y9qlmyn8vi4m"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
@@ -958,7 +957,7 @@ par compared to the rest.")
|
||||
(define-public gst-plugins-ugly
|
||||
(package
|
||||
(name "gst-plugins-ugly")
|
||||
(version "1.28.1")
|
||||
(version "1.26.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@@ -966,7 +965,7 @@ par compared to the rest.")
|
||||
(string-append "https://gstreamer.freedesktop.org/src/"
|
||||
name "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0y2sz79ms498mag3rsvkng8q5pmg9f2v0njfq3zw7k1z0v5z70j0"))))
|
||||
(base32 "19fvv6rvrcvhw4lnx078xb4b85pzbwbrqwdk841sqd7pjpl5wzs1"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
|
||||
@@ -1015,7 +1014,7 @@ think twice about shipping them.")
|
||||
(define-public gst-libav
|
||||
(package
|
||||
(name "gst-libav")
|
||||
(version "1.28.1")
|
||||
(version "1.26.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@@ -1024,7 +1023,7 @@ think twice about shipping them.")
|
||||
"https://gstreamer.freedesktop.org/src/" name "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "16zfxw6h865sqi71j47lllr3y7jlnwsrwmfxvjnxh3wdlfn1madz"))))
|
||||
(base32 "0kbjs8z545maj3j2qzgpg41v3yr53q1c852v80zbmf5rld87xnis"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs (list perl pkg-config python-wrapper ruby))
|
||||
(inputs (list ffmpeg))
|
||||
@@ -1038,7 +1037,7 @@ decoders, muxers, and demuxers provided by FFmpeg.")
|
||||
(define-public gst-editing-services
|
||||
(package
|
||||
(name "gst-editing-services")
|
||||
(version "1.28.1")
|
||||
(version "1.26.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@@ -1046,7 +1045,7 @@ decoders, muxers, and demuxers provided by FFmpeg.")
|
||||
"gst-editing-services-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1p0ml4yyqs840l9zlgw41k1lh8z9jvaangap5azfwsrmw75h0q1x"))))
|
||||
"1lkgs5h76qzqfpqvi31vs5xr68bbi0kwkw2g0ahvcs1l5hysj86x"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@@ -1094,7 +1093,7 @@ given, also pass them to the build system instead of the ones used by PKG."
|
||||
#~(modify-phases #$phases
|
||||
(add-after 'unpack 'disable-auto-plugins
|
||||
(lambda _
|
||||
(substitute* "meson.options"
|
||||
(substitute* "meson_options.txt"
|
||||
(("'auto'") "'disabled'")))))))))))
|
||||
|
||||
(define-public gst-plugins-bad-minimal
|
||||
@@ -1108,14 +1107,14 @@ binary, but none of the actual plugins.")))
|
||||
(define-public gst-rtsp-server
|
||||
(package
|
||||
(name "gst-rtsp-server")
|
||||
(version "1.28.1")
|
||||
(version "1.26.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://gstreamer.freedesktop.org/src/" name "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0cpqvdxr7falww14xblqs7la6q2f1z1zbli4vjdp9yqcy9mfil3c"))))
|
||||
(base32 "1ibg83sa0nswqan5fg378bg36jis5sn1dwfl1mvqjiw4m59qlpj1"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
@@ -1143,7 +1142,7 @@ RTSP connections and messages.")
|
||||
(define-public python-gst
|
||||
(package
|
||||
(name "python-gst")
|
||||
(version "1.28.1")
|
||||
(version "1.26.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@@ -1151,7 +1150,7 @@ RTSP connections and messages.")
|
||||
"gst-python-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"11bhdylgkfcgdlfcv61vyjp0f27sqp3i4y7d8c2a2nxrmnaylz6l"))))
|
||||
"04hv5pj8br56knvw1nsx74j1lpxskbm6znsdqac28iszqjkvjhwk"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@@ -1163,22 +1162,7 @@ RTSP connections and messages.")
|
||||
#:configure-flags
|
||||
#~(list (string-append
|
||||
"-Dpygi-overrides-dir="
|
||||
(py:site-packages %build-inputs %outputs) "/gi/overrides"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'disable-problematic-tests
|
||||
(lambda _
|
||||
;; The 'fundamentals' test fails with a segmentation fault since
|
||||
;; 1.28.1 (see:
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4937>).
|
||||
(substitute* "testsuite/meson.build"
|
||||
((".*'fundamentals',.*") ""))))
|
||||
(delete 'check) ;moved after install
|
||||
(add-after 'install 'check
|
||||
(assoc-ref %standard-phases 'check))
|
||||
(add-before 'check 'add-install-to-pythonpath
|
||||
;; Required for the 'plugins' test.
|
||||
(assoc-ref py:%standard-phases 'add-install-to-pythonpath)))))
|
||||
(py:site-packages %build-inputs %outputs) "/gi/overrides"))))
|
||||
(native-inputs
|
||||
(list pkg-config python))
|
||||
;; XXX: Move back to propagated-inputs once we no longer need to use
|
||||
|
||||
+108
-136
@@ -169,13 +169,12 @@
|
||||
(name "artanis")
|
||||
(version "1.3.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://https.git.savannah.gnu.org/git/artanis.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256 (base32
|
||||
"0qpksi681z10jsip8ka0phq5kmkpxfcy5nvm861dsbjb335klbb6"))
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/artanis/artanis-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"16cwjyl0ykz6r7vvczrwaik6y4pc0fwc0hvwskfbgv9z71j2alzi"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
@@ -214,10 +213,7 @@
|
||||
(propagated-inputs
|
||||
(list guile-json-4 guile-curl guile-readline guile-redis))
|
||||
(native-inputs
|
||||
(list autoconf
|
||||
automake
|
||||
gnu-gettext ;for 'AC_LIB_LINKFLAGS_FROM_LIBS' macro
|
||||
bash-minimal ;for the `source' builtin
|
||||
(list bash-minimal ;for the `source' builtin
|
||||
pkg-config
|
||||
util-linux)) ;for the `script' command
|
||||
(arguments
|
||||
@@ -820,16 +816,16 @@ library for GNU Guile based on the actor model.")
|
||||
(name "guile-daemon")
|
||||
(version "0.1.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/alezost/guile-daemon")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256 (base32
|
||||
"0mdxdiwb52zgpz144vii8f4jdia8a7w1i1mpffw8zh3ghglfrjzl"))))
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/alezost/" name
|
||||
"/releases/download/v" version
|
||||
"/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"08gaqrgjlly9k5si72vvpbr4xhq5v52l5ma5y6a7spid5dd057cy"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list autoconf automake texinfo pkg-config))
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
(list guile-3.0))
|
||||
(home-page "https://github.com/alezost/guile-daemon")
|
||||
@@ -1436,19 +1432,20 @@ HTML (via SXML) or any other format for rendering.")
|
||||
(name "guile-sjson")
|
||||
(version "0.2.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/dustyweb/guile-sjson")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256 (base32
|
||||
"1npbla3vy1m0dqvr8gfzx1ncd2mp2cm59mnb7g490vak29kc8s9j"))
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://dustycloud.org/misc/sjson-" version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"08sr16fg5cqvik3wblav6k4b6djc5ydhgfvxa49bc5bh1irqvrcn"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Allow builds with Guile 3.0.
|
||||
#~(substitute* "configure.ac"
|
||||
(("2\\.2 2\\.0")
|
||||
"3.0 2.2 2.0")))))
|
||||
'(begin
|
||||
;; Allow builds with Guile 3.0.
|
||||
(substitute* "configure"
|
||||
(("2\\.2 2\\.0")
|
||||
"3.0 2.2 2.0"))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list autoconf automake pkg-config))
|
||||
@@ -1872,14 +1869,12 @@ types are supported.")
|
||||
(name "guile-aa-tree")
|
||||
(version "3.1.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url
|
||||
"https://https.git.savannah.gnu.org/git/guile-aa-tree.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256 (base32
|
||||
"0ghbrszjhv2abgpf11js6grqrri53frysf4360a5yvwhy9bb42pc"))))
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://savannah/guile-aa-tree/guile-aa-tree-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0044c105r3q9vpl17pv3phl1b79kjm1llhkakqgiasixyav01blh"))))
|
||||
(build-system guile-build-system)
|
||||
(inputs (list guile-3.0))
|
||||
(arguments
|
||||
@@ -2170,16 +2165,15 @@ allows users to interact with the Guile REPL through Jupyter.")
|
||||
(name "guile-sparql")
|
||||
(version "0.0.8")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/roelj/guile-sparql")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256 (base32
|
||||
"0iy390dsa0rs6d4gapw1s03gz4zba26w5sdiyvnzlygwv0d1inww"))))
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/roelj/guile-sparql/releases/download/"
|
||||
version "/guile-sparql-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1jf4972f9fpm0rd865xpnc9mzl3xv6vhfnp0iygadydy905z9nln"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list autoconf automake texinfo pkg-config))
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
(list guile-3.0))
|
||||
(home-page "https://github.com/roelj/guile-sparql")
|
||||
@@ -2194,19 +2188,17 @@ using S-expressions.")
|
||||
(name "guile-debbugs")
|
||||
(version "0.0.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url
|
||||
"https://https.git.savannah.gnu.org/git/guile-debbugs.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256 (base32
|
||||
"0ipv3vywx02yhyssq5rp1bifg1qkydgh6kr16vfspxs601q8bbm2"))))
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/guile-debbugs/guile-debbugs-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1cc63nw3xdfjrfk8c58r6d5lidmfq5cpqcy32yd5xp81yccprvn9"))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs
|
||||
(list guile-email))
|
||||
(native-inputs
|
||||
(list autoconf automake texinfo guile-3.0 pkg-config))
|
||||
(list guile-3.0 pkg-config))
|
||||
(home-page "https://savannah.gnu.org/projects/guile-debbugs/")
|
||||
(synopsis "Guile interface to the Debbugs bug tracking service")
|
||||
(description
|
||||
@@ -2457,14 +2449,13 @@ written in pure Scheme by using Guile's foreign function interface.")
|
||||
(name "guile-xosd")
|
||||
(version "0.2.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/alezost/guile-xosd")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/alezost/" name
|
||||
"/releases/download/v" version
|
||||
"/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0jc88zg6icdg70mxbg732hx5by5bahqjm68yhx2ypqdqi7kqq1fk"))))
|
||||
"10r29bpyrsvjalnzkam2falj9k34lvxmch05zs606zp1nk93whp3"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
@@ -2477,7 +2468,7 @@ written in pure Scheme by using Guile's foreign function interface.")
|
||||
(or (getenv "CPATH") "")))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
(list autoconf automake libtool texinfo pkg-config))
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
(list guile-3.0 libx11 libxext libxinerama xosd))
|
||||
(home-page "https://github.com/alezost/guile-xosd")
|
||||
@@ -2521,6 +2512,10 @@ library}.")
|
||||
(assoc-ref %standard-phases 'check)))))
|
||||
(native-inputs (list autoconf automake libtool pkg-config))
|
||||
(inputs (list guile-3.0 yaml-cpp))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "GUILE_EXTENSIONS_PATH")
|
||||
(files (list "lib/guile/3.0")))))
|
||||
(home-page "https://gitlab.com/yorgath/guile-yamlpp")
|
||||
(synopsis "Guile YAML reader/writer based on @code{yaml-cpp}")
|
||||
(description
|
||||
@@ -3534,6 +3529,10 @@ wrap G-Golf applications when writing a Guix package.")))
|
||||
(install-file "socket.scm" share-dir))))
|
||||
(delete 'check)
|
||||
(delete 'install))))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "GUILE_EXTENSIONS_PATH")
|
||||
(files (list "lib/guile/3.0")))))
|
||||
(inputs (list gcc guile-3.0))
|
||||
(synopsis "C bindings for UNIX sockets in multi-scheme (Guile, Gauche,
|
||||
Chicken) Wayland library")
|
||||
@@ -3607,6 +3606,10 @@ Probably can be replaced with guile's built-ins: @code{fdes->ports},
|
||||
(install-file "shm.scm" share-dir))))
|
||||
(delete 'check)
|
||||
(delete 'install))))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "GUILE_EXTENSIONS_PATH")
|
||||
(files (list "lib/guile/3.0")))))
|
||||
(inputs (list gcc guile-3.0))
|
||||
(synopsis "C bindings for wayland shared memory (SHM) in multi-scheme
|
||||
(Guile, Gauche, Chicken) wayland library")
|
||||
@@ -3674,6 +3677,10 @@ Probably can be replaced with guile's built-in file-descriptor procedures.")
|
||||
(substitute* (list client-file)
|
||||
(("WAYLAND_BASE_PROTOCOL_PATH")
|
||||
core-protocol-file))))))))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "GUILE_EXTENSIONS_PATH")
|
||||
(files (list "lib/guile/3.0")))))
|
||||
(native-inputs (list guile-3.0 pkg-config texinfo autoconf automake))
|
||||
(inputs (list wayland wayland-protocols))
|
||||
(propagated-inputs (list guile-wayland-scm-socket guile-wayland-scm-shm))
|
||||
@@ -3688,22 +3695,15 @@ client bindings for Wayland.")
|
||||
(name "g-wrap")
|
||||
(version "1.9.15")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://https.git.savannah.gnu.org/git/g-wrap.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://savannah/g-wrap/g-wrap-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"19bwqfk33djd51ijylvcmz3zz9pqvv1k7bk8k912b1bwbpfr3j0y"))))
|
||||
"0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list autoconf
|
||||
automake
|
||||
libtool
|
||||
gnu-gettext ;for 'AC_LIB_LINKFLAGS_FROM_LIBS' macro
|
||||
texinfo
|
||||
pkg-config))
|
||||
(list pkg-config))
|
||||
(propagated-inputs
|
||||
(list guile-2.2 guile-lib))
|
||||
(inputs
|
||||
@@ -3795,34 +3795,14 @@ quotes.")
|
||||
(name "guile-reader")
|
||||
(version "0.6.4")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url
|
||||
"https://https.git.savannah.gnu.org/git/guile-reader.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://savannah/guile-reader/guile-reader-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0y3dq509hwm30ixb3cs3wci2lpni78438q7zz8f7way8vqp5164a"))))
|
||||
"0nqkk4x18i7p3k9jxld4fnk8d69bq9ag6hqsyjzbfw9fmhrh08kb"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'bootstrap 'copy-config.rpath
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; This file is not automatically copied by 'autoreconf'.
|
||||
(let ((config-rpath (search-input-file
|
||||
inputs
|
||||
"/share/gettext/config.rpath")))
|
||||
(install-file config-rpath "build-aux")))))))
|
||||
(native-inputs
|
||||
(list autoconf
|
||||
automake
|
||||
libtool
|
||||
gnu-gettext ;for 'AC_LIB_LINKFLAGS_FROM_LIBS' macro
|
||||
texinfo
|
||||
pkg-config
|
||||
gperf))
|
||||
(native-inputs (list pkg-config gperf))
|
||||
(inputs (list guile-3.0))
|
||||
(synopsis "Framework for building readers for GNU Guile")
|
||||
(description
|
||||
@@ -3851,18 +3831,15 @@ many readers as needed).")
|
||||
(name "guile-ncurses")
|
||||
(version "3.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url
|
||||
"https://https.git.savannah.gnu.org/git/guile-ncurses.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"00xhlca5s278i4g74qgks35ymisa98rhcj63bflja289gpb7j8wf"))))
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/guile-ncurses/guile-ncurses-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0cypz1ikw66n8bc2klsnnaj1plpl22dwq6pwyc7dvffamz7fi2gf"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs (list ncurses guile-3.0))
|
||||
(native-inputs (list autoconf automake libtool texinfo pkg-config))
|
||||
(native-inputs (list pkg-config))
|
||||
(arguments
|
||||
`(#:modules ((guix build gnu-build-system)
|
||||
((guix build guile-build-system)
|
||||
@@ -3911,16 +3888,13 @@ library.")
|
||||
(name "guile-lib")
|
||||
(version "0.2.8.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url
|
||||
"https://https.git.savannah.gnu.org/git/guile-lib.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256 (base32
|
||||
"1f5a1mi1w487ia677nl8b6gixbgcavnbykzmgqs0yiyrc3w6vdcz"))
|
||||
(patches (search-patches
|
||||
"guile-lib-fix-tests-for-guile2.2.patch"))))
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://savannah/guile-lib/guile-lib-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ca95g15a88l7rpqcnzmhj1kyxc7gyfbvnni1hckv8z677cc4x0k"))
|
||||
(patches (search-patches "guile-lib-fix-tests-for-guile2.2.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:make-flags '("GUILE_AUTO_COMPILE=0") ;placate guild warnings
|
||||
@@ -3938,7 +3912,6 @@ $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")))))))
|
||||
(native-inputs
|
||||
(list autoconf
|
||||
automake
|
||||
texinfo
|
||||
gettext-minimal
|
||||
guile-3.0
|
||||
pkg-config))
|
||||
@@ -4709,27 +4682,27 @@ a standalone WebAssembly toolchain.")
|
||||
(name "guile-file-names")
|
||||
(version "0.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/brandoninvergo/guile-file-names")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://brandon.invergo.net/software/download/"
|
||||
"guile-file-names/guile-file-names-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0hmsbvbcl9a7366afcqi0pdhjhlq7l137nkmv1a5z9b8pcgzx90s"))))
|
||||
"01chizdxkhw6aqv629vxka9f5x3534ij7r0jqndawsg2vxm1r9sz"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-target-directory
|
||||
(lambda _
|
||||
(substitute* "src/Makefile.am"
|
||||
(substitute* "src/Makefile.in"
|
||||
(("guilemoddir = \\$\\(GUILE_SITE\\)")
|
||||
"guilemoddir = $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n")))))))
|
||||
"guilemoddir = $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
|
||||
#t)))))
|
||||
(inputs
|
||||
(list guile-2.2))
|
||||
(native-inputs
|
||||
(list autoconf automake texinfo pkg-config))
|
||||
(list pkg-config))
|
||||
(home-page "https://gitlab.com/brandoninvergo/guile-file-names")
|
||||
(synopsis "Manipulate file names")
|
||||
(description
|
||||
@@ -5792,14 +5765,12 @@ processing filters.")
|
||||
(name "guile-cv")
|
||||
(version "0.4.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://https.git.savannah.gnu.org/git/guile-cv.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/guile-cv/guile-cv-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"15qmhfiijca2468s8s9xhb0wskiy4wgym9p5jqi4xy30ddnpvyk2"))))
|
||||
"00620zxm1rxlws7vn1zp2zzcb6y6r3szzj6b4b9fyjb86k972izb"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@@ -5813,7 +5784,8 @@ processing filters.")
|
||||
(("SITEDIR=\"\\$datadir/guile-cv\"")
|
||||
"SITEDIR=\"$datadir/guile/site/$GUILE_EFFECTIVE_VERSION\"")
|
||||
(("SITECCACHEDIR=\"\\$libdir/guile-cv/")
|
||||
"SITECCACHEDIR=\"$libdir/"))))
|
||||
"SITECCACHEDIR=\"$libdir/"))
|
||||
(delete-file "configure"))) ;trigger 'bootstrap' phase
|
||||
(add-after 'unpack 'substitute-libs
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(substitute* "cv/init.scm"
|
||||
|
||||
@@ -244,17 +244,17 @@
|
||||
;; It's used for cache validation and therefore can lead to strange bugs.
|
||||
;; ex: date '+%Y%m%d%H%M%S'
|
||||
;; or: (format-time-string "%Y%m%d%H%M%S")
|
||||
(define %librewolf-build-id "20260228165433")
|
||||
(define %librewolf-build-id "20260310145002")
|
||||
|
||||
(define-public librewolf
|
||||
(package
|
||||
(name "librewolf")
|
||||
(version "148.0-1")
|
||||
(version "148.0.2-1")
|
||||
(source
|
||||
(make-librewolf-source
|
||||
#:version version
|
||||
#:firefox-hash "0vybaiiknrzk2zvg46w5sxb0i0m9rmy4msvpxklxpdr3182fb4zc"
|
||||
#:librewolf-hash "02sraza4xy4cp559nlc51m1vwhi52l58i3zz2h95lwymyvc5hv17"
|
||||
#:firefox-hash "142f4k4ykcm65kbvj60p472103r4k79v9fdsfljdav2rbr6qxjx6"
|
||||
#:librewolf-hash "0c664ci4j5xpqjf07bs8vcrl2scscc35sdcasd1aqn4fdssmghmq"
|
||||
#:l10n firefox-l10n))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
||||
@@ -695,15 +695,6 @@ is to provide an accurate identifier for record tracks.")
|
||||
(sha256
|
||||
(base32 "0v866n5rwdz45ks8dlhl8hzx3p54hcjl0rz7x3rbsj4c96jn0m5c"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list #:phases #~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-gst-init
|
||||
(lambda _
|
||||
;; `None' is no longer accepted as of gstreamer
|
||||
;; 2.28.1.
|
||||
(substitute* "audioread/gstdec.py"
|
||||
(("Gst.init\\(None\\)")
|
||||
"Gst.init([])")))))))
|
||||
(propagated-inputs (list ffmpeg python-pygobject))
|
||||
(native-inputs
|
||||
(list gstreamer
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
;;; Copyright © 2019-2024 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
||||
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2020, 2023, 2024, 2026 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020 Giacomo Leidi <therewasa@fishinthecalculator.me>
|
||||
;;; Copyright © 2020 Jesse Gibbons <jgibbons2357+guix@gmail.com>
|
||||
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
|
||||
@@ -188,8 +188,8 @@
|
||||
;; Note: the 'update-guix-package.scm' script expects this definition to
|
||||
;; start precisely like this.
|
||||
(let ((version "1.5.0")
|
||||
(commit "520785e315eddbe47199ac557e88e60eca3ae97c")
|
||||
(revision 2))
|
||||
(commit "deedd482e437182dc8e35b9ef260cfd0dc68e7f2")
|
||||
(revision 1))
|
||||
(package
|
||||
(name "guix")
|
||||
|
||||
@@ -205,7 +205,7 @@
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"1kkryhrr2vxyirr5xzl69386kvy9rqlkpz10qbdv222dw628lcda"))
|
||||
"14rch8ycl3zy0da4xkrnbyjsxlwnfcm30dfrvjqcgz5s2v71jiaq"))
|
||||
(file-name (string-append "guix-" version "-checkout"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
From 7d7c9ce06837f20d5585f1bc28a47701d12cf8ec Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
|
||||
Date: Sun, 1 Mar 2026 10:53:21 +0200
|
||||
Subject: [PATCH] glcolorconvert: Fix NULL pointer dereference on buffers
|
||||
without video meta
|
||||
|
||||
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4935
|
||||
---
|
||||
.../gst-libs/gst/gl/gstglcolorconvert.c | 14 ++++++++------
|
||||
1 file changed, 8 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/gst-libs/gst/gl/gstglcolorconvert.c b/gst-libs/gst/gl/gstglcolorconvert.c
|
||||
index f2dc2dc7bbb..c13b4df69de 100644
|
||||
--- a/gst-libs/gst/gl/gstglcolorconvert.c
|
||||
+++ b/gst-libs/gst/gl/gstglcolorconvert.c
|
||||
@@ -3428,10 +3428,12 @@ _init_convert (GstGLColorConvert * convert)
|
||||
}
|
||||
|
||||
GstVideoMeta *v_meta = gst_buffer_get_video_meta (convert->inbuf);
|
||||
- if (v_meta->width != convert->priv->padded_width
|
||||
- || v_meta->height != convert->priv->padded_height) {
|
||||
- gdouble padded_width = v_meta->width;
|
||||
- gdouble padded_height = v_meta->height;
|
||||
+ if ((v_meta && (v_meta->width != convert->priv->padded_width
|
||||
+ || v_meta->height != convert->priv->padded_height)) ||
|
||||
+ (!v_meta && (convert->in_info.width != convert->priv->padded_width ||
|
||||
+ convert->in_info.height != convert->priv->padded_height))) {
|
||||
+ gdouble padded_width = v_meta ? v_meta->width : convert->in_info.width;
|
||||
+ gdouble padded_height = v_meta ? v_meta->height : convert->in_info.height;
|
||||
gdouble display_width = GST_VIDEO_INFO_WIDTH (&convert->in_info);
|
||||
gdouble display_height = GST_VIDEO_INFO_HEIGHT (&convert->in_info);
|
||||
|
||||
@@ -3449,8 +3451,8 @@ _init_convert (GstGLColorConvert * convert)
|
||||
crop_vertices, GL_STATIC_DRAW);
|
||||
gl->BindBuffer (GL_ARRAY_BUFFER, 0);
|
||||
|
||||
- convert->priv->padded_width = v_meta->width;
|
||||
- convert->priv->padded_height = v_meta->height;
|
||||
+ convert->priv->padded_width = padded_width;
|
||||
+ convert->priv->padded_height = padded_height;
|
||||
}
|
||||
|
||||
gl->BindTexture (GL_TEXTURE_2D, 0);
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -205,7 +205,7 @@ Protocol.")
|
||||
python-bcrypt
|
||||
python-dateutil
|
||||
python-pycairo
|
||||
python-pygobject-3.50
|
||||
python-pygobject
|
||||
psmisc
|
||||
syncthing))
|
||||
(home-page "https://github.com/kozec/syncthing-gtk")
|
||||
|
||||
+42
-103
@@ -7,7 +7,7 @@
|
||||
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
|
||||
;;; Copyright © 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2020, 2023, 2024, 2026 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
|
||||
;;; Copyright © 2022 ( <paren@disroot.org>
|
||||
;;;
|
||||
@@ -38,13 +38,9 @@
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages gawk)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages gperf)
|
||||
#:use-module (gnu packages man)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages perl-compression)
|
||||
@@ -117,38 +113,18 @@ is on expressing the content semantically, avoiding physical markup commands.")
|
||||
(inherit texinfo)
|
||||
(version "7.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.savannah.gnu.org/git/texinfo.git")
|
||||
(commit (string-append "texinfo-" version))))
|
||||
(file-name (git-file-name "texinfo" version))
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/texinfo/texinfo-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ln3rr34b9k9m8mhg01ygifj945610cn5qk11mfvgzpavyy5rghg"))))
|
||||
(native-inputs (list autoconf
|
||||
automake
|
||||
bash-minimal
|
||||
coreutils-minimal
|
||||
gawk
|
||||
gettext-minimal
|
||||
gperf
|
||||
help2man
|
||||
(libc-utf8-locales-for-target)
|
||||
libtool
|
||||
ncurses
|
||||
perl
|
||||
perl-text-unidecode
|
||||
perl-unicode-eastasianwidth))
|
||||
"0bn7ckhxjqrgfvxz122vr5z9bs26bpfxyr2jp1rriyhwynq4xxsi"))))
|
||||
(inputs (modify-inputs (package-inputs texinfo)
|
||||
(append perl-archive-zip ;needed for 'tex2any --epub3'
|
||||
(append perl-archive-zip ;needed for 'tex2any --epub3'
|
||||
perl-unicode-eastasianwidth perl-text-unidecode
|
||||
perl-libintl-perl)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments texinfo)
|
||||
((#:modules modules `((guix build utils)
|
||||
(guix build gnu-build-system)))
|
||||
`((srfi srfi-26)
|
||||
,@modules))
|
||||
((#:configure-flags flags
|
||||
''())
|
||||
#~(cons* "--with-external-Unicode-EastAsianWidth"
|
||||
@@ -157,38 +133,6 @@ is on expressing the content semantically, avoiding physical markup commands.")
|
||||
#$flags))
|
||||
((#:phases phases #~%standard-phases)
|
||||
#~(modify-phases #$phases
|
||||
(add-after 'unpack 'patch-bootstrap-shebangs
|
||||
(lambda* (#:key native-inputs inputs #:allow-other-keys)
|
||||
(let ((sh (search-input-file (or native-inputs inputs)
|
||||
"/bin/sh"))
|
||||
(perl (search-input-file (or native-inputs inputs)
|
||||
"/bin/perl")))
|
||||
(for-each
|
||||
(cute patch-shebang <> (list (dirname sh)))
|
||||
(find-files "." ".*[.]sh"))
|
||||
(for-each
|
||||
(cute patch-shebang <> (list (dirname perl)))
|
||||
(find-files "." ".*[.]pl")))))
|
||||
#$@(if (%current-target-system)
|
||||
;; Texinfo uses a C binary during the build process, but
|
||||
;; lacks the concept of `CC_FOR_BUILD'
|
||||
;; Hack around that by building it manually.
|
||||
#~((add-after 'configure 'build-native-tools
|
||||
(lambda _
|
||||
(with-directory-excursion "info"
|
||||
(lambda _
|
||||
(invoke "make" "CC=gcc" "makedoc")))))
|
||||
(add-after 'configure 'fixup-texindex-building-from-git
|
||||
(lambda _
|
||||
(symlink "../../texindex/texindex"
|
||||
"tools/texindex/texindex"))))
|
||||
#~())
|
||||
(add-after 'configure 'patch-jrtangle
|
||||
(lambda* (#:key native-inputs inputs #:allow-other-keys)
|
||||
(let ((mv (search-input-file (or native-inputs inputs)
|
||||
"/bin/mv")))
|
||||
(substitute* "texindex/jrtangle"
|
||||
(("mv") mv)))))
|
||||
(add-after 'install 'wrap-program
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
@@ -277,49 +221,44 @@ is on expressing the content semantically, avoiding physical markup commands.")
|
||||
(package/inherit texinfo-7
|
||||
(name "info-reader")
|
||||
(arguments
|
||||
(append
|
||||
(substitute-keyword-arguments (package-arguments texinfo-7)
|
||||
((#:modules modules `((guix build utils)
|
||||
(guix build gnu-build-system)))
|
||||
`((srfi srfi-1)
|
||||
(ice-9 ftw)
|
||||
,@modules))
|
||||
((#:phases phases)
|
||||
#~(modify-phases #$phases
|
||||
;; Make sure 'info-reader' can read compressed info files
|
||||
;; in a pure environment. There are also a few other
|
||||
;; uncompressors listed in this file (lzip, unxz, bunzip2, ...)
|
||||
;; but let's not include them because info manuals in Guix
|
||||
;; are always compressed with 'gzip'.
|
||||
;; TODO(core-updates): maybe move to the 'texinfo' package.
|
||||
(add-after 'unpack 'absolute-binary-path
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "info/filesys.c"
|
||||
(("gunzip") (search-input-file inputs "/bin/gunzip"))
|
||||
(("gzip") (search-input-file inputs "/bin/gzip")))))
|
||||
(add-after 'install 'keep-only-info-reader
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; Remove everything but 'bin/info' and associated
|
||||
;; files.
|
||||
(define (files)
|
||||
(scandir "." (lambda (file)
|
||||
(not (member file '("." ".."))))))
|
||||
`(,@(substitute-keyword-arguments (package-arguments texinfo)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
;; Make sure 'info-reader' can read compressed info files
|
||||
;; in a pure environment. There are also a few other
|
||||
;; uncompressors listed in this file (lzip, unxz, bunzip2, ...)
|
||||
;; but let's not include them because info manuals in Guix
|
||||
;; are always compressed with 'gzip'.
|
||||
;; TODO(core-updates): maybe move to the 'texinfo' package.
|
||||
(add-after 'unpack 'absolute-binary-path
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "info/filesys.c"
|
||||
(("gunzip") (search-input-file inputs "/bin/gunzip"))
|
||||
(("gzip") (search-input-file inputs "/bin/gzip")))))
|
||||
(add-after 'install 'keep-only-info-reader
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; Remove everything but 'bin/info' and associated
|
||||
;; files.
|
||||
(define (files)
|
||||
(scandir "." (lambda (file)
|
||||
(not (member file '("." ".."))))))
|
||||
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(with-directory-excursion out
|
||||
(for-each delete-file-recursively
|
||||
(fold delete (files) '("bin" "share"))))
|
||||
(with-directory-excursion (string-append out "/bin")
|
||||
(for-each delete-file (delete "info" (files))))
|
||||
(with-directory-excursion (string-append out "/share")
|
||||
(for-each delete-file-recursively
|
||||
(fold delete (files)
|
||||
'("info" "locale")))))))
|
||||
(delete 'wrap-program))))
|
||||
(list
|
||||
#:disallowed-references (list (this-package-input "perl")))))
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(with-directory-excursion out
|
||||
(for-each delete-file-recursively
|
||||
(fold delete (files) '("bin" "share"))))
|
||||
(with-directory-excursion (string-append out "/bin")
|
||||
(for-each delete-file (delete "info" (files))))
|
||||
(with-directory-excursion (string-append out "/share")
|
||||
(for-each delete-file-recursively
|
||||
(fold delete (files)
|
||||
'("info" "locale"))))
|
||||
#t))))))
|
||||
#:disallowed-references ,(list (this-package-input "perl"))
|
||||
#:modules ((ice-9 ftw) (srfi srfi-1)
|
||||
,@%default-gnu-modules)))
|
||||
(synopsis "Standalone Info documentation reader")
|
||||
(inputs (modify-inputs (package-inputs texinfo-7)
|
||||
(inputs (modify-inputs (package-inputs texinfo)
|
||||
(prepend gzip)))))
|
||||
|
||||
(define-public texi2html
|
||||
|
||||
@@ -1008,8 +1008,8 @@ shared library and encoder and decoder command-line executables.")
|
||||
(define-public libx264
|
||||
;; There are no tags in the repository, so we take the version number from
|
||||
;; the X264_BUILD variable defined in x264.h.
|
||||
(let ((version "165")
|
||||
(commit "0480cb05fa188d37ae87e8f4fd8f1aea3711f7ee")
|
||||
(let ((version "164")
|
||||
(commit "b093bbe7d9bc642c8f24067cbdcc73bb43562eab")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "libx264")
|
||||
@@ -1022,7 +1022,7 @@ shared library and encoder and decoder command-line executables.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"136vma04rfzn8kcass8psnxygmn3ykrsyrv0q2dy3iv080vywpy9"))))
|
||||
"095pv8y6fqjg8mdvsfk12d0jqgyhip536a6vxhzm7qz8hfp96qhq"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config nasm))
|
||||
@@ -1865,8 +1865,7 @@ operate properly.")
|
||||
#$@(if (target-powerpc?)
|
||||
;; These tests fail on powerpc64-le (see:
|
||||
;; https://trac.ffmpeg.org/ticket/9604).
|
||||
'("--ignore-tests=checkasm-sw_scale,\
|
||||
filter-scale2ref_keep_aspect,sws-floatimg-cmp")
|
||||
'("--ignore-tests=checkasm-sw_scale,filter-scale2ref_keep_aspect")
|
||||
'())
|
||||
"--enable-gpl" ;enable optional gpl licensed parts
|
||||
"--enable-shared"
|
||||
|
||||
@@ -2000,7 +2000,7 @@ to an arbitrary balanced color.")
|
||||
libxxf86vm
|
||||
libxcb
|
||||
python
|
||||
python-pygobject-3.50
|
||||
python-pygobject
|
||||
python-pyxdg
|
||||
wayland))
|
||||
(home-page "https://gitlab.com/chinstrap/gammastep")
|
||||
|
||||
+1
-37
@@ -1,5 +1,5 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012-2013, 2018-2020, 2023, 2025-2026 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2012-2013, 2018-2020, 2023, 2025 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016 Jelle Licht <jlicht@fsfe.org>
|
||||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2017, 2019, 2020, 2022, 2023, 2024, 2025 Ricardo Wurmus <rekado@elephly.net>
|
||||
@@ -58,11 +58,6 @@
|
||||
#:use-module (ice-9 rdelim)
|
||||
#:use-module (ice-9 receive)
|
||||
#:use-module (ice-9 regex)
|
||||
#:autoload (web uri) (string->uri
|
||||
uri-scheme
|
||||
uri-host
|
||||
uri-path
|
||||
split-and-decode-uri-path)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-9)
|
||||
#:use-module (srfi srfi-11)
|
||||
@@ -81,7 +76,6 @@
|
||||
peek-body
|
||||
|
||||
git-repository-url?
|
||||
tarball-url->git-repository-url
|
||||
download-git-repository
|
||||
git-origin
|
||||
git->origin
|
||||
@@ -208,36 +202,6 @@ thrown."
|
||||
;; Fallback.
|
||||
(string-suffix? ".git" url)))
|
||||
|
||||
(define (tarball-url->git-repository-url url)
|
||||
"Given URL, the URL of a source code tarball, return the URL of the
|
||||
corresponding Git repository or #f if it could not be guessed."
|
||||
(let ((uri (string->uri url)))
|
||||
(match (uri-scheme uri)
|
||||
('mirror
|
||||
(match (uri-host uri)
|
||||
((or "gnu" "savannah")
|
||||
(string-append "https://https.git.savannah.gnu.org/git/"
|
||||
(match (split-and-decode-uri-path (uri-path uri))
|
||||
((name _ ...)
|
||||
(string-append name ".git")))))
|
||||
("gnome"
|
||||
(string-append "https://gitlab.gnome.org/GNOME/"
|
||||
(match (split-and-decode-uri-path (uri-path uri))
|
||||
(("sources" name _ ...)
|
||||
(string-append name ".git")))))
|
||||
;; TODO: Add "kernel" and other mirrors.
|
||||
(_ #f)))
|
||||
((or 'https 'http)
|
||||
(match (uri-host uri)
|
||||
((or "github.com" "gitlab.com")
|
||||
(match (split-and-decode-uri-path (uri-path uri))
|
||||
((owner repository _ ...)
|
||||
(string-append "https://" (uri-host uri)
|
||||
"/" owner "/" repository))))
|
||||
(_
|
||||
#f)))
|
||||
(_ #f))))
|
||||
|
||||
(define* (download-git-repository url ref #:key recursive?)
|
||||
"Fetch the given REF from the Git repository at URL. Return three values :
|
||||
the commit hash, the downloaded directory and its content hash."
|
||||
|
||||
+1
-2
@@ -362,8 +362,7 @@ expressions and blanks that were read."
|
||||
;; of 1, except that indent is 1 instead of 2 columns.
|
||||
(vhashq
|
||||
('source '(package))
|
||||
('git-reference '(uri origin))
|
||||
('snippet '(origin))
|
||||
('git-reference '(uri origin source))
|
||||
('sha256 '(origin source package))
|
||||
('arguments '(package))
|
||||
('list '(arguments package))
|
||||
|
||||
+29
-44
@@ -1,5 +1,5 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2021-2026 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2021-2025 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2024 Herman Rimm <herman@rimm.ee>
|
||||
;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
|
||||
;;;
|
||||
@@ -33,8 +33,7 @@
|
||||
#:autoload (gnu packages) (specification->package fold-packages)
|
||||
#:autoload (guix import utils) (default-git-error
|
||||
generate-git-source
|
||||
git-repository-url?
|
||||
tarball-url->git-repository-url)
|
||||
git-repository-url?)
|
||||
#:use-module (guix combinators)
|
||||
#:use-module (guix scripts)
|
||||
#:use-module ((guix scripts build) #:select (%standard-build-options))
|
||||
@@ -48,6 +47,7 @@
|
||||
#:use-module (ice-9 control)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-2)
|
||||
#:use-module (srfi srfi-9)
|
||||
#:use-module (srfi srfi-11)
|
||||
#:use-module (srfi srfi-26)
|
||||
@@ -569,7 +569,7 @@ are put in alphabetical order."
|
||||
;;; url-fetch->git-fetch
|
||||
;;;
|
||||
|
||||
(define (transform-to-git-fetch location origin repository-url version)
|
||||
(define (transform-to-git-fetch location origin home-page version)
|
||||
"Transform an origin using url-fetch to use git-fetch if appropriate.
|
||||
Return the new origin S-expression or #f if transformation isn't applicable."
|
||||
(match origin
|
||||
@@ -578,22 +578,15 @@ Return the new origin S-expression or #f if transformation isn't applicable."
|
||||
('uri uri-expr)
|
||||
('sha256 ('base32 _))
|
||||
rest ...)
|
||||
(catch 'git-error
|
||||
(lambda ()
|
||||
(let ((rest (filter (match-lambda
|
||||
(('patches . _) #t)
|
||||
(('modules . _) #t)
|
||||
(('snippet . _) #t)
|
||||
(_ #f))
|
||||
rest)))
|
||||
`(,@(generate-git-source repository-url version
|
||||
(lambda args
|
||||
(apply throw args)))
|
||||
,@rest)))
|
||||
(let ((report-error (default-git-error repository-url location)))
|
||||
(lambda args
|
||||
(apply report-error args)
|
||||
#f))))
|
||||
(let ((rest (filter (match-lambda
|
||||
(('patches . _) #t)
|
||||
(('modules . _) #t)
|
||||
(('snippet . _) #t)
|
||||
(_ #f))
|
||||
rest)))
|
||||
`(,@(generate-git-source home-page version
|
||||
(default-git-error home-page location))
|
||||
,@rest)))
|
||||
(_ #f)))
|
||||
|
||||
(define* (url-fetch->git-fetch package
|
||||
@@ -601,39 +594,31 @@ Return the new origin S-expression or #f if transformation isn't applicable."
|
||||
(policy 'safe)
|
||||
(edit-expression edit-expression))
|
||||
"Transform PACKAGE's source from url-fetch to git-fetch when appropriate."
|
||||
(define (transform-source location repository-url str)
|
||||
(define (transform-source location str)
|
||||
(let* ((origin-exp (call-with-input-string str read-with-comments))
|
||||
(home-page (package-home-page package))
|
||||
(new-origin (transform-to-git-fetch location
|
||||
origin-exp
|
||||
repository-url
|
||||
home-page
|
||||
(package-version package))))
|
||||
(if new-origin
|
||||
(begin
|
||||
(info location (G_ "~a: changing source to 'git-fetch'~%")
|
||||
(package-full-name package))
|
||||
(info location (G_ "transforming source from url-fetch to git-fetch~%"))
|
||||
(object->string* new-origin (location-column location)))
|
||||
str)))
|
||||
|
||||
;; Check if this package uses 'url-fetch' and has a known corresponding Git
|
||||
;; repository.
|
||||
(let* ((source (package-source package))
|
||||
(home-page (package-home-page package))
|
||||
(repository-url (and (origin? source)
|
||||
(eq? url-fetch (origin-method source))
|
||||
(or (and (git-repository-url? home-page)
|
||||
home-page)
|
||||
(and=> (match (origin-uri source)
|
||||
(((? string? head) . _) head)
|
||||
((? string? url) url)
|
||||
(_ #f))
|
||||
tarball-url->git-repository-url))))
|
||||
(location ;source might be inherited
|
||||
(and=> (package-field-location package 'source)
|
||||
absolute-location)))
|
||||
(when (and repository-url location)
|
||||
(edit-expression
|
||||
(location->source-properties location)
|
||||
(cut transform-source location repository-url <>)))))
|
||||
;; Check if this package uses url-fetch and has a git repository home-page
|
||||
(and-let* ((source (package-source package))
|
||||
(home-page (package-home-page package))
|
||||
(location ; source might be inherited
|
||||
(and=> (and (origin? source)
|
||||
(eq? url-fetch (origin-method source))
|
||||
(git-repository-url? home-page)
|
||||
(package-field-location package 'source))
|
||||
absolute-location)))
|
||||
(edit-expression
|
||||
(location->source-properties location)
|
||||
(cut transform-source location <>))))
|
||||
|
||||
|
||||
;;;
|
||||
|
||||
@@ -344,13 +344,4 @@ error procedure has been called."
|
||||
(let ((sexp error-called? (test-generate-git-source "1.0.0" "2.0.0")))
|
||||
error-called?))
|
||||
|
||||
(test-equal "tarball-url->git-repository-url, guile"
|
||||
'("https://https.git.savannah.gnu.org/git/guile.git"
|
||||
"https://gitlab.gnome.org/GNOME/brasero.git"
|
||||
"https://github.com/aide/aide")
|
||||
(map tarball-url->git-repository-url
|
||||
'("mirror://gnu/guile/guile-3.0.11.tar.gz"
|
||||
"mirror://gnome/sources/brasero/3.12/brasero-3.12.3.tar.xz"
|
||||
"https://github.com/aide/aide/releases/download/v0.19.3/aide-0.19.3.tar.gz")))
|
||||
|
||||
(test-end "import-utils")
|
||||
|
||||
+1
-36
@@ -1,5 +1,5 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2021-2024, 2026 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2021-2024 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@@ -669,41 +669,6 @@
|
||||
(cut string-contains <> "patches")))))))
|
||||
"1"))
|
||||
|
||||
(unless (false-if-exception
|
||||
(getaddrinfo "https.git.savannah.gnu.org" "https"))
|
||||
(test-skip 1))
|
||||
(test-equal "url-fetch->git-fetch, mirror:// URL"
|
||||
'(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://https.git.savannah.gnu.org/git/sed.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"00p6v3aa22jz365scmifr06fspkylzrvbqda0waz4x06q5qv0263")))
|
||||
(call-with-test-package
|
||||
'((version "4.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/sed/sed-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0000000000000000000000000000000000000000000000000000")))))
|
||||
(lambda (directory)
|
||||
(define file
|
||||
(string-append directory "/my-packages-1.scm"))
|
||||
|
||||
;; Note: This ends up cloning the 'sed' repository on Savannah.
|
||||
(system* "guix" "style" "-L" directory "-S" "git-source" "my-coreutils-1")
|
||||
|
||||
(load file)
|
||||
(call-with-input-string (read-package-field
|
||||
(@ (my-packages-1) my-coreutils-1) 'source 8)
|
||||
read))
|
||||
"1"))
|
||||
|
||||
(test-assert "url-fetch->git-fetch, non-git home-page unchanged"
|
||||
(call-with-test-package
|
||||
'((home-page "https://www.example.com")
|
||||
|
||||
Reference in New Issue
Block a user