Merge branch 'staging'
commit
c567a82a69
23
gnu/local.mk
23
gnu/local.mk
|
@ -1105,6 +1105,8 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \
|
||||
%D%/packages/patches/fifo-map-remove-catch.hpp.patch \
|
||||
%D%/packages/patches/findutils-localstatedir.patch \
|
||||
%D%/packages/patches/firebird-riscv64-support-pt1.patch \
|
||||
%D%/packages/patches/firebird-riscv64-support-pt2.patch \
|
||||
%D%/packages/patches/flann-cmake-3.11.patch \
|
||||
%D%/packages/patches/flatpak-fix-path.patch \
|
||||
%D%/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch \
|
||||
|
@ -1116,7 +1118,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/fp16-system-libraries.patch \
|
||||
%D%/packages/patches/fpc-reproducibility.patch \
|
||||
%D%/packages/patches/freedink-engine-fix-sdl-hints.patch \
|
||||
%D%/packages/patches/freeglut-gcc-compat.patch \
|
||||
%D%/packages/patches/freeimage-unbundle.patch \
|
||||
%D%/packages/patches/fuse-glibc-2.34.patch \
|
||||
%D%/packages/patches/fuse-overlapping-headers.patch \
|
||||
|
@ -1258,14 +1259,12 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/gpm-glibc-2.26.patch \
|
||||
%D%/packages/patches/gpodder-disable-updater.patch \
|
||||
%D%/packages/patches/gpsbabel-fix-i686-test.patch \
|
||||
%D%/packages/patches/grantlee-merge-theme-dirs.patch \
|
||||
%D%/packages/patches/grep-timing-sensitive-test.patch \
|
||||
%D%/packages/patches/grfcodec-gcc-compat.patch \
|
||||
%D%/packages/patches/gromacs-tinyxml2.patch \
|
||||
%D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \
|
||||
%D%/packages/patches/grub-efi-fat-serial-number.patch \
|
||||
%D%/packages/patches/grub-setup-root.patch \
|
||||
%D%/packages/patches/gst-plugins-good-fix-test.patch \
|
||||
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
|
||||
%D%/packages/patches/guile-2.2-skip-oom-test.patch \
|
||||
%D%/packages/patches/guile-2.2-skip-so-test.patch \
|
||||
|
@ -1369,7 +1368,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
|
||||
%D%/packages/patches/julia-tracker-16-compat.patch \
|
||||
%D%/packages/patches/julia-allow-parallel-build.patch \
|
||||
%D%/packages/patches/kdbusaddons-kinit-file-name.patch \
|
||||
%D%/packages/patches/libffi-3.3-powerpc-fixes.patch \
|
||||
%D%/packages/patches/libffi-float128-powerpc64le.patch \
|
||||
%D%/packages/patches/libobjc2-unbundle-robin-map.patch \
|
||||
|
@ -1386,16 +1384,10 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/kiki-missing-includes.patch \
|
||||
%D%/packages/patches/kiki-portability-64bit.patch \
|
||||
%D%/packages/patches/kinit-kdeinit-extra_libs.patch \
|
||||
%D%/packages/patches/kinit-kdeinit-libpath.patch \
|
||||
%D%/packages/patches/kio-search-smbd-on-PATH.patch \
|
||||
%D%/packages/patches/kismet-unbundle-boost.patch \
|
||||
%D%/packages/patches/kmail-Fix-missing-link-libraries.patch \
|
||||
%D%/packages/patches/kmod-module-directory.patch \
|
||||
%D%/packages/patches/kmscon-runtime-keymap-switch.patch \
|
||||
%D%/packages/patches/kpackage-allow-external-paths.patch \
|
||||
%D%/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch \
|
||||
%D%/packages/patches/kmplayer-aarch64.patch \
|
||||
%D%/packages/patches/kmplayer-upstream_Fix-build-with-Qt-5.9.patch \
|
||||
%D%/packages/patches/kobodeluxe-paths.patch \
|
||||
%D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \
|
||||
%D%/packages/patches/kobodeluxe-const-charp-conversion.patch \
|
||||
|
@ -1551,6 +1543,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/monero-use-system-miniupnpc.patch \
|
||||
%D%/packages/patches/mosaicatcher-unbundle-htslib.patch \
|
||||
%D%/packages/patches/mrrescue-support-love-11.patch \
|
||||
%D%/packages/patches/mrustc-riscv64-support.patch \
|
||||
%D%/packages/patches/mtools-mformat-uninitialized.patch \
|
||||
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
|
||||
%D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \
|
||||
|
@ -1677,13 +1670,10 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/plib-CVE-2011-4620.patch \
|
||||
%D%/packages/patches/plib-CVE-2012-4552.patch \
|
||||
%D%/packages/patches/plotutils-spline-test.patch \
|
||||
%D%/packages/patches/polkit-CVE-2021-4034.patch \
|
||||
%D%/packages/patches/polkit-configure-elogind.patch \
|
||||
%D%/packages/patches/polkit-use-duktape.patch \
|
||||
%D%/packages/patches/polkit-disable-systemd.patch \
|
||||
%D%/packages/patches/portaudio-audacity-compat.patch \
|
||||
%D%/packages/patches/portmidi-modular-build.patch \
|
||||
%D%/packages/patches/postgresql-disable-resolve_symlinks.patch \
|
||||
%D%/packages/patches/postgresql-riscv-spinlocks.patch \
|
||||
%D%/packages/patches/procmail-ambiguous-getline-debian.patch \
|
||||
%D%/packages/patches/procmail-CVE-2014-3618.patch \
|
||||
%D%/packages/patches/procmail-CVE-2017-16844.patch \
|
||||
|
@ -1717,6 +1707,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \
|
||||
%D%/packages/patches/python-cross-compile.patch \
|
||||
%D%/packages/patches/python-configobj-setuptools.patch \
|
||||
%D%/packages/patches/python-dateutil-pytest-compat.patch \
|
||||
%D%/packages/patches/python-debugpy-unbundle-pydevd.patch \
|
||||
%D%/packages/patches/python-docopt-pytest6-compat.patch \
|
||||
%D%/packages/patches/python-execnet-read-only-fix.patch \
|
||||
|
@ -1808,12 +1799,13 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/rocm-comgr-3.1.0-dependencies.patch \
|
||||
%D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch \
|
||||
%D%/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch \
|
||||
%D%/packages/patches/ruby-hydra-minimal-no-byebug.patch \
|
||||
%D%/packages/patches/ruby-anystyle-data-immutable-install.patch \
|
||||
%D%/packages/patches/ruby-anystyle-fix-dictionary-populate.patch \
|
||||
%D%/packages/patches/ruby-latex-decode-fix-test.patch \
|
||||
%D%/packages/patches/ruby-mustache-1.1.1-fix-race-condition-tests.patch \
|
||||
%D%/packages/patches/ruby-sanitize-system-libxml.patch \
|
||||
%D%/packages/patches/rustc-1.39.0-src.patch \
|
||||
%D%/packages/patches/rustc-1.54.0-src.patch \
|
||||
%D%/packages/patches/rust-adblock-ignore-live-tests.patch \
|
||||
%D%/packages/patches/i3status-rust-enable-unstable-features.patch \
|
||||
%D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \
|
||||
|
@ -1889,6 +1881,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/telegram-purple-adjust-test.patch \
|
||||
%D%/packages/patches/texi2html-document-encoding.patch \
|
||||
%D%/packages/patches/texi2html-i18n.patch \
|
||||
%D%/packages/patches/texlive-hyph-utf8-no-byebug.patch \
|
||||
%D%/packages/patches/thefuck-test-environ.patch \
|
||||
%D%/packages/patches/tidy-CVE-2015-5522+5523.patch \
|
||||
%D%/packages/patches/timescaledb-flaky-test.patch \
|
||||
|
|
|
@ -125,7 +125,7 @@ C or C++ programs, though that is not its primary goal.")
|
|||
(define-public libatomic-ops
|
||||
(package
|
||||
(name "libatomic-ops")
|
||||
(version "7.6.10")
|
||||
(version "7.6.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -133,13 +133,8 @@ C or C++ programs, though that is not its primary goal.")
|
|||
version "/libatomic_ops-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bwry043f62pc4mgdd37zx3fif19qyrs8f5bw7qxlmkzh5hdyzjq"))))
|
||||
"0glzah695wsf6c27hs5wwlw4mnq1vfivdshz1rb8pq7w4mp5dazh"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(,@(if (target-riscv64?)
|
||||
`(#:configure-flags
|
||||
(list "CFLAGS_EXTRA=-latomic"))
|
||||
'())))
|
||||
(outputs '("out" "debug"))
|
||||
(synopsis "Accessing hardware atomic memory update operations")
|
||||
(description
|
||||
|
|
|
@ -119,7 +119,7 @@ the <tz.h> library for handling time zones and leap seconds.")
|
|||
(define-public libical
|
||||
(package
|
||||
(name "libical")
|
||||
(version "3.0.10")
|
||||
(version "3.0.14")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -127,7 +127,7 @@ the <tz.h> library for handling time zones and leap seconds.")
|
|||
version "/libical-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1d1nqcfilb4k8bc5x85fhnd26l1ski58wpk2nmds6mlxrzkb6czr"))))
|
||||
"13ycghsi4iv8mnm0xv97bs0x6qvfhdxkw20n3yhcc7bg6n0bg122"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; test suite appears broken
|
||||
|
@ -143,8 +143,7 @@ the <tz.h> library for handling time zones and leap seconds.")
|
|||
(substitute* "doc/reference/libical-glib/libical-glib-docs.sgml.in"
|
||||
(("http://www.oasis-open.org/docbook/xml/4.3/")
|
||||
(string-append (assoc-ref inputs "docbook-xml")
|
||||
"/xml/dtd/docbook/")))
|
||||
#t))
|
||||
"/xml/dtd/docbook/")))))
|
||||
(add-before 'configure 'patch-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; TODO: libical 3.1.0 supports using TZDIR instead of a hard-coded
|
||||
|
@ -156,8 +155,7 @@ the <tz.h> library for handling time zones and leap seconds.")
|
|||
(string-append "\"" tzdata "/share/zoneinfo\""))
|
||||
(("\\\"/usr/lib/zoneinfo\\\",") "")
|
||||
(("\\\"/etc/zoneinfo\\\",") "")
|
||||
(("\\\"/usr/share/lib/zoneinfo\\\"") "")))
|
||||
#t)))))
|
||||
(("\\\"/usr/share/lib/zoneinfo\\\"") ""))))))))
|
||||
(native-inputs
|
||||
(list docbook-xml-4.3
|
||||
gobject-introspection
|
||||
|
|
|
@ -131,7 +131,7 @@ that was originally contributed to Debian.")
|
|||
;; XXX We used to refer to the nss package here, but that eventually caused
|
||||
;; module cycles. The below is a quick copy-paste job that must be kept in
|
||||
;; sync manually. Surely there's a better way…?
|
||||
(version "3.71")
|
||||
(version "3.81")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (let ((version-with-underscores
|
||||
|
@ -142,7 +142,7 @@ that was originally contributed to Debian.")
|
|||
"nss-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0ly2l3dv6z5hlxs72h5x6796ni3x1bq60saavaf42ddgv4ax7b4r"))
|
||||
"19ncvhz45dhr0nmymwkxspq9l44gaafkspxiwxbqs1hpnqxmzgx8"))
|
||||
;; Create nss.pc and nss-config.
|
||||
(patches (search-patches "nss-3.56-pkgconfig.patch"
|
||||
"nss-getcwd-nonnull.patch"
|
||||
|
|
|
@ -2778,18 +2778,29 @@ create data based on random numbers and yet remain repeatable.")
|
|||
(define-public python-freezegun
|
||||
(package
|
||||
(name "python-freezegun")
|
||||
(version "0.3.14")
|
||||
(version "1.2.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "freezegun" version))
|
||||
(sha256
|
||||
(base32 "0al75mk829j1izxi760b7yjnknjihyfhp2mvi5qiyrxb9cpxwqk2"))))
|
||||
(base32 "0ijlq32qvpm5zprfzbyzawpl9qjsknlxhryr1i0q84wl0sxd28nd"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Add an explicit case for static methods as they are callable
|
||||
;; in Python 3.10, breaking this conditional.
|
||||
;; XXX Taken from upstream pull request:
|
||||
;; https://github.com/spulec/freezegun/pull/397
|
||||
'(substitute* "freezegun/api.py"
|
||||
(("if not callable\\(attr_value\\) or \
|
||||
inspect\\.isclass\\(attr_value\\):")
|
||||
"if (not callable(attr_value) or inspect.isclass(attr_value)\
|
||||
or isinstance(attr_value, staticmethod)):")))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
(list python-mock python-pytest))
|
||||
(list python-pytest))
|
||||
(propagated-inputs
|
||||
(list python-six python-dateutil))
|
||||
(list python-dateutil))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
|
||||
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -2004,8 +2005,41 @@ interactive applications.")
|
|||
"This package provides a library for window abstraction.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-png-0.17
|
||||
(package
|
||||
(name "rust-png")
|
||||
(version "0.17.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "png" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1fp3vnaxmjdv71dcakc21k07ir5s31dlx1mrazfqddzgaynw0f6w"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:tests? #false ;XXX missing files in tarball
|
||||
#:cargo-inputs
|
||||
(("rust-bitflags" ,rust-bitflags-1)
|
||||
("rust-crc32fast" ,rust-crc32fast-1)
|
||||
("rust-deflate" ,rust-deflate-1)
|
||||
("rust-miniz-oxide" ,rust-miniz-oxide-0.5))
|
||||
#:cargo-development-inputs
|
||||
(("rust-criterion" ,rust-criterion-0.3)
|
||||
("rust-getopts" ,rust-getopts-0.2)
|
||||
("rust-glium" ,rust-glium-0.31)
|
||||
("rust-glob" ,rust-glob-0.3)
|
||||
("rust-rand" ,rust-rand-0.8)
|
||||
("rust-term" ,rust-term-0.7))))
|
||||
(home-page "https://github.com/image-rs/image-png")
|
||||
(synopsis "PNG decoding and encoding library in pure Rust")
|
||||
(description
|
||||
"This package is a PNG decoding and encoding library in pure Rust.")
|
||||
(license (list license:expat license:asl2.0))))
|
||||
|
||||
(define-public rust-png-0.16
|
||||
(package
|
||||
(inherit rust-png-0.17)
|
||||
(name "rust-png")
|
||||
(version "0.16.8")
|
||||
(source
|
||||
|
@ -2015,19 +2049,13 @@ interactive applications.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1ipl44q3vy4kvx6j296vk7d4v8gvcg203lrkvvixwixq1j98fciw"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:skip-build? #t
|
||||
#:cargo-inputs
|
||||
(("rust-bitflags" ,rust-bitflags-1)
|
||||
("rust-crc32fast" ,rust-crc32fast-1)
|
||||
("rust-deflate" ,rust-deflate-0.8)
|
||||
("rust-miniz-oxide" ,rust-miniz-oxide-0.3))))
|
||||
(home-page "https://github.com/image-rs/image-png.git")
|
||||
(synopsis "PNG decoding and encoding library in pure Rust")
|
||||
(description
|
||||
"This package is a PNG decoding and encoding library in pure Rust.")
|
||||
(license (list license:expat license:asl2.0))))
|
||||
("rust-miniz-oxide" ,rust-miniz-oxide-0.3))))))
|
||||
|
||||
(define-public rust-png-0.15
|
||||
(package
|
||||
|
|
|
@ -168,8 +168,40 @@
|
|||
#:cargo-development-inputs
|
||||
(("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
|
||||
|
||||
(define-public rust-cairo-rs-0.15
|
||||
(package
|
||||
(name "rust-cairo-rs")
|
||||
(version "0.15.12")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "cairo-rs" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1g396fdz8crf74dmmjarcsdbsm8qgxy3a5x9kw6m2d9xn28y6vn7"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-bitflags" ,rust-bitflags-1)
|
||||
("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.15)
|
||||
("rust-freetype" ,rust-freetype-0.7)
|
||||
("rust-glib" ,rust-glib-0.15)
|
||||
("rust-libc" ,rust-libc-0.2)
|
||||
("rust-thiserror" ,rust-thiserror-1))
|
||||
#:cargo-development-inputs
|
||||
(("rust-tempfile" ,rust-tempfile-3))))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
(list cairo))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "Rust bindings for the Cairo library")
|
||||
(description "Rust bindings for the Cairo library")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-cairo-rs-0.14
|
||||
(package
|
||||
(inherit rust-cairo-rs-0.15)
|
||||
(name "rust-cairo-rs")
|
||||
(version "0.14.9")
|
||||
(source
|
||||
|
@ -191,13 +223,7 @@
|
|||
("rust-libc" ,rust-libc-0.2)
|
||||
("rust-thiserror" ,rust-thiserror-1))
|
||||
#:cargo-development-inputs
|
||||
(("rust-tempfile" ,rust-tempfile-3))))
|
||||
(inputs
|
||||
(list cairo))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "Rust bindings for the Cairo library")
|
||||
(description "Rust bindings for the Cairo library")
|
||||
(license license:expat)))
|
||||
(("rust-tempfile" ,rust-tempfile-3))))))
|
||||
|
||||
(define-public rust-cairo-rs-0.9
|
||||
(package
|
||||
|
@ -277,8 +303,37 @@
|
|||
#:cargo-development-inputs
|
||||
(("rust-tempfile" ,rust-tempfile-3))))))
|
||||
|
||||
(define-public rust-cairo-sys-rs-0.15
|
||||
(package
|
||||
(name "rust-cairo-sys-rs")
|
||||
(version "0.15.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "cairo-sys-rs" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1j6k4pps3dv6g0vlpmxc2xyk0s40vj2wpzi55lbwjspmpqlx8m9w"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-glib-sys" ,rust-glib-sys-0.15)
|
||||
("rust-libc" ,rust-libc-0.2)
|
||||
("rust-system-deps" ,rust-system-deps-6)
|
||||
("rust-winapi" ,rust-winapi-0.3)
|
||||
("rust-x11" ,rust-x11-2))))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
(list cairo))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "FFI bindings to libcairo")
|
||||
(description "This package provides FFI bindings to libcairo.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-cairo-sys-rs-0.14
|
||||
(package
|
||||
(inherit rust-cairo-sys-rs-0.15)
|
||||
(name "rust-cairo-sys-rs")
|
||||
(version "0.14.9")
|
||||
(source
|
||||
|
@ -288,7 +343,6 @@
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0w3md4xk87ign30wb3rqfmmj0q6pvg5arbm35flgsd08jxvbhj5l"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:skip-build?
|
||||
#t
|
||||
|
@ -298,12 +352,7 @@
|
|||
("rust-system-deps" ,rust-system-deps-3)
|
||||
("rust-winapi" ,rust-winapi-0.3)
|
||||
("rust-x11" ,rust-x11-2))))
|
||||
(inputs
|
||||
(list cairo))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "FFI bindings to libcairo")
|
||||
(description "This package provides FFI bindings to libcairo.")
|
||||
(license license:expat)))
|
||||
(native-inputs '())))
|
||||
|
||||
(define-public rust-cairo-sys-rs-0.10
|
||||
(package
|
||||
|
@ -440,8 +489,41 @@
|
|||
#:cargo-development-inputs
|
||||
(("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
|
||||
|
||||
(define-public rust-gdk-pixbuf-0.15
|
||||
(package
|
||||
(name "rust-gdk-pixbuf")
|
||||
(version "0.15.11")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "gdk-pixbuf" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "16k1z21r76m620z61kfmgid1n6s8dnxpa4zlrppcr6dhr2fdsf5d"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display`
|
||||
#:tests? #f
|
||||
#:cargo-inputs
|
||||
(("rust-bitflags" ,rust-bitflags-1)
|
||||
("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.15)
|
||||
("rust-gio" ,rust-gio-0.15)
|
||||
("rust-glib" ,rust-glib-0.15)
|
||||
("rust-libc" ,rust-libc-0.2))
|
||||
#:cargo-development-inputs
|
||||
(("rust-gir-format-check" ,rust-gir-format-check-0.1))))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
(list gdk-pixbuf))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "Rust bindings for the GdkPixbuf library")
|
||||
(description "Rust bindings for the GdkPixbuf library")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-gdk-pixbuf-0.14
|
||||
(package
|
||||
(inherit rust-gdk-pixbuf-0.15)
|
||||
(name "rust-gdk-pixbuf")
|
||||
(version "0.14.0")
|
||||
(source
|
||||
|
@ -461,13 +543,7 @@
|
|||
("rust-glib" ,rust-glib-0.14)
|
||||
("rust-libc" ,rust-libc-0.2))
|
||||
#:cargo-development-inputs
|
||||
(("rust-gir-format-check" ,rust-gir-format-check-0.1))))
|
||||
(inputs
|
||||
(list gdk-pixbuf))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "Rust bindings for the GdkPixbuf library")
|
||||
(description "Rust bindings for the GdkPixbuf library")
|
||||
(license license:expat)))
|
||||
(("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
|
||||
|
||||
(define-public rust-gdk-pixbuf-0.9
|
||||
(package
|
||||
|
@ -549,8 +625,42 @@
|
|||
#:cargo-development-inputs
|
||||
(("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
|
||||
|
||||
(define-public rust-gdk-pixbuf-sys-0.15
|
||||
(package
|
||||
(name "rust-gdk-pixbuf-sys")
|
||||
(version "0.15.10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "gdk-pixbuf-sys" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "19q2qjrzmmgc7bbs59sk6k0sv3xhpmnk9a2h0cajfr95g19jy2ql"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(;#:skip-build?
|
||||
;#t
|
||||
#:cargo-inputs
|
||||
(("rust-gio-sys" ,rust-gio-sys-0.15)
|
||||
("rust-glib-sys" ,rust-glib-sys-0.15)
|
||||
("rust-gobject-sys" ,rust-gobject-sys-0.15)
|
||||
("rust-libc" ,rust-libc-0.2)
|
||||
("rust-system-deps" ,rust-system-deps-6))
|
||||
#:cargo-development-inputs
|
||||
(("rust-shell-words" ,rust-shell-words-1)
|
||||
("rust-tempfile" ,rust-tempfile-3))))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
(list gdk-pixbuf))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "FFI bindings to libgdk_pixbuf-2.0")
|
||||
(description "This package provides FFI bindings to @code{libgdk_pixbuf-2.0}.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-gdk-pixbuf-sys-0.14
|
||||
(package
|
||||
(inherit rust-gdk-pixbuf-sys-0.15)
|
||||
(name "rust-gdk-pixbuf-sys")
|
||||
(version "0.14.0")
|
||||
(source
|
||||
|
@ -572,13 +682,7 @@
|
|||
("rust-system-deps" ,rust-system-deps-3))
|
||||
#:cargo-development-inputs
|
||||
(("rust-shell-words" ,rust-shell-words-0.1)
|
||||
("rust-tempfile" ,rust-tempfile-3))))
|
||||
(inputs
|
||||
(list gdk-pixbuf))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "FFI bindings to libgdk_pixbuf-2.0")
|
||||
(description "This package provides FFI bindings to @code{libgdk_pixbuf-2.0}.")
|
||||
(license license:expat)))
|
||||
("rust-tempfile" ,rust-tempfile-3))))))
|
||||
|
||||
(define-public rust-gdk-pixbuf-sys-0.10
|
||||
(package
|
||||
|
@ -719,8 +823,48 @@
|
|||
(("rust-shell-words" ,rust-shell-words-0.1)
|
||||
("rust-tempfile" ,rust-tempfile-3))))))
|
||||
|
||||
(define-public rust-gio-0.15
|
||||
(package
|
||||
(name "rust-gio")
|
||||
(version "0.15.12")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "gio" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0fr8qiqjf9yzl8867kgqdsxpkcx2jrns3xwmlf0jfiid668brzb8"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display`
|
||||
#:tests? #f
|
||||
#:cargo-inputs
|
||||
(("rust-bitflags" ,rust-bitflags-1)
|
||||
("rust-futures-channel" ,rust-futures-channel-0.3)
|
||||
("rust-futures-core" ,rust-futures-core-0.3)
|
||||
("rust-futures-io" ,rust-futures-io-0.3)
|
||||
("rust-futures-util" ,rust-futures-util-0.3)
|
||||
("rust-gio-sys" ,rust-gio-sys-0.15)
|
||||
("rust-glib" ,rust-glib-0.15)
|
||||
("rust-libc" ,rust-libc-0.2)
|
||||
("rust-once-cell" ,rust-once-cell-1)
|
||||
("rust-thiserror" ,rust-thiserror-1))
|
||||
#:cargo-development-inputs
|
||||
(("rust-futures-util" ,rust-futures-util-0.3)
|
||||
("rust-gir-format-check" ,rust-gir-format-check-0.1)
|
||||
("rust-serial-test" ,rust-serial-test-0.6))))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
(list glib))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "Rust bindings for the Gio library")
|
||||
(description "Rust bindings for the Gio library")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-gio-0.14
|
||||
(package
|
||||
(inherit rust-gio-0.15)
|
||||
(name "rust-gio")
|
||||
(version "0.14.8")
|
||||
(source
|
||||
|
@ -746,13 +890,7 @@
|
|||
("rust-thiserror" ,rust-thiserror-1))
|
||||
#:cargo-development-inputs
|
||||
(("rust-gir-format-check" ,rust-gir-format-check-0.1)
|
||||
("rust-serial-test" ,rust-serial-test-0.4))))
|
||||
(inputs
|
||||
(list glib))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "Rust bindings for the Gio library")
|
||||
(description "Rust bindings for the Gio library")
|
||||
(license license:expat)))
|
||||
("rust-serial-test" ,rust-serial-test-0.4))))))
|
||||
|
||||
(define-public rust-gio-0.9
|
||||
(package
|
||||
|
@ -848,8 +986,51 @@
|
|||
#:cargo-development-inputs
|
||||
(("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
|
||||
|
||||
(define-public rust-gio-sys-0.15
|
||||
(package
|
||||
(name "rust-gio-sys")
|
||||
(version "0.15.10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "gio-sys" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "13fgmc2xdzg9qk9l3nlp1bilwn6466mrqbiq4fhc9qkia93pl59j"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(;; FIXME: some GLib macros are not found
|
||||
#:tests? #f
|
||||
#:cargo-inputs
|
||||
(("rust-glib-sys" ,rust-glib-sys-0.15)
|
||||
("rust-gobject-sys" ,rust-gobject-sys-0.15)
|
||||
("rust-libc" ,rust-libc-0.2)
|
||||
("rust-system-deps" ,rust-system-deps-6)
|
||||
("rust-winapi" ,rust-winapi-0.3))
|
||||
#:cargo-development-inputs
|
||||
(("rust-shell-words" ,rust-shell-words-1)
|
||||
("rust-tempfile" ,rust-tempfile-3))
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'check 'extend-include-path
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((gio-headers (search-input-directory
|
||||
inputs "include/gio-unix-2.0")))
|
||||
;; Tests rely on these headers.
|
||||
(setenv "C_INCLUDE_PATH"
|
||||
(string-append gio-headers ":"
|
||||
(getenv "C_INCLUDE_PATH")))))))))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
(list glib))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "FFI bindings to libgio-2.0")
|
||||
(description "This package provides FFI bindings to libgio-2.0.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-gio-sys-0.14
|
||||
(package
|
||||
(inherit rust-gio-sys-0.15)
|
||||
(name "rust-gio-sys")
|
||||
(version "0.14.0")
|
||||
(source
|
||||
|
@ -868,13 +1049,7 @@
|
|||
("rust-gobject-sys" ,rust-gobject-sys-0.14)
|
||||
("rust-libc" ,rust-libc-0.2)
|
||||
("rust-system-deps" ,rust-system-deps-3)
|
||||
("rust-winapi" ,rust-winapi-0.3))))
|
||||
(inputs
|
||||
(list glib))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "FFI bindings to libgio-2.0")
|
||||
(description "This package provides FFI bindings to libgio-2.0.")
|
||||
(license license:expat)))
|
||||
("rust-winapi" ,rust-winapi-0.3))))))
|
||||
|
||||
(define-public rust-gio-sys-0.10
|
||||
(package
|
||||
|
@ -939,8 +1114,51 @@
|
|||
(description "File format checker in Rust.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-glib-0.15
|
||||
(package
|
||||
(name "rust-glib")
|
||||
(version "0.15.12")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "glib" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0pahikbwxr3vafdrr5l2hnlhkf9xi4illryan0l59ayhp9pk1c7d"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display`
|
||||
#:tests? #f
|
||||
#:cargo-inputs
|
||||
(("rust-bitflags" ,rust-bitflags-1)
|
||||
("rust-futures-channel" ,rust-futures-channel-0.3)
|
||||
("rust-futures-core" ,rust-futures-core-0.3)
|
||||
("rust-futures-executor" ,rust-futures-executor-0.3)
|
||||
("rust-futures-task" ,rust-futures-task-0.3)
|
||||
("rust-glib-macros" ,rust-glib-macros-0.15)
|
||||
("rust-glib-sys" ,rust-glib-sys-0.15)
|
||||
("rust-gobject-sys" ,rust-gobject-sys-0.15)
|
||||
("rust-libc" ,rust-libc-0.2)
|
||||
("rust-log" ,rust-log-0.4)
|
||||
("rust-once-cell" ,rust-once-cell-1)
|
||||
("rust-smallvec" ,rust-smallvec-1)
|
||||
("rust-thiserror" ,rust-thiserror-1))
|
||||
#:cargo-development-inputs
|
||||
(("rust-futures-util" ,rust-futures-util-0.3)
|
||||
("rust-gir-format-check" ,rust-gir-format-check-0.1)
|
||||
("rust-tempfile" ,rust-tempfile-3))))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
(list glib))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "Rust bindings for the GLib library")
|
||||
(description "Rust bindings for the GLib library")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-glib-0.14
|
||||
(package
|
||||
(inherit rust-glib-0.15)
|
||||
(name "rust-glib")
|
||||
(version "0.14.8")
|
||||
(source
|
||||
|
@ -966,13 +1184,7 @@
|
|||
("rust-libc" ,rust-libc-0.2)
|
||||
("rust-log" ,rust-log-0.4)
|
||||
("rust-once-cell" ,rust-once-cell-1)
|
||||
("rust-smallvec" ,rust-smallvec-1))))
|
||||
(inputs
|
||||
(list glib))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "Rust bindings for the GLib library")
|
||||
(description "Rust bindings for the GLib library")
|
||||
(license license:expat)))
|
||||
("rust-smallvec" ,rust-smallvec-1))))))
|
||||
|
||||
(define-public rust-glib-0.10
|
||||
(package
|
||||
|
@ -1057,8 +1269,37 @@
|
|||
#:cargo-development-inputs
|
||||
(("rust-tempfile" ,rust-tempfile-3))))))
|
||||
|
||||
(define-public rust-glib-macros-0.15
|
||||
(package
|
||||
(name "rust-glib-macros")
|
||||
(version "0.15.11")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "glib-macros" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0r3cr0c79rs91z0sps089nsf8ppnm8agp48qwwqlkc32lqqq39i5"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(;; XXX: Circular dependency on rust-glib??
|
||||
#:tests? #f
|
||||
#:cargo-inputs
|
||||
(("rust-anyhow" ,rust-anyhow-1)
|
||||
("rust-heck" ,rust-heck-0.4)
|
||||
("rust-proc-macro-crate" ,rust-proc-macro-crate-1)
|
||||
("rust-proc-macro-error" ,rust-proc-macro-error-1)
|
||||
("rust-proc-macro2" ,rust-proc-macro2-1)
|
||||
("rust-quote" ,rust-quote-1)
|
||||
("rust-syn" ,rust-syn-1))))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "Rust bindings for the GLib library, proc macros crate")
|
||||
(description "Rust bindings for the GLib library, proc macros crate.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-glib-macros-0.14
|
||||
(package
|
||||
(inherit rust-glib-macros-0.15)
|
||||
(name "rust-glib-macros")
|
||||
(version "0.14.1")
|
||||
(source
|
||||
|
@ -1079,11 +1320,7 @@
|
|||
("rust-proc-macro-error" ,rust-proc-macro-error-1)
|
||||
("rust-proc-macro2" ,rust-proc-macro2-1)
|
||||
("rust-quote" ,rust-quote-1)
|
||||
("rust-syn" ,rust-syn-1))))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "Rust bindings for the GLib library, proc macros crate")
|
||||
(description "Rust bindings for the GLib library, proc macros crate.")
|
||||
(license license:expat)))
|
||||
("rust-syn" ,rust-syn-1))))))
|
||||
|
||||
(define-public rust-glib-macros-0.10
|
||||
(package
|
||||
|
@ -1109,8 +1346,40 @@
|
|||
("rust-quote" ,rust-quote-1)
|
||||
("rust-syn" ,rust-syn-1))))))
|
||||
|
||||
(define-public rust-glib-sys-0.15
|
||||
(package
|
||||
(name "rust-glib-sys")
|
||||
(version "0.15.10")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "glib-sys" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1m5sqm69fdk8vaw6hggyizhs1r1vivx73splrdvczsb5iqpijjzg"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(;; XXX: Tests are sensitive to the version of glib, even though
|
||||
;; the library supports a wide range. Skip for now.
|
||||
#:tests? #f
|
||||
#:cargo-inputs
|
||||
(("rust-libc" ,rust-libc-0.2)
|
||||
("rust-system-deps" ,rust-system-deps-6))
|
||||
#:cargo-development-inputs
|
||||
(("rust-shell-words" ,rust-shell-words-1)
|
||||
("rust-tempfile" ,rust-tempfile-3))))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
(list glib))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "FFI bindings to libglib-2.0")
|
||||
(description "This package provides FFI bindings to libglib-2.0.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-glib-sys-0.14
|
||||
(package
|
||||
(inherit rust-glib-sys-0.15)
|
||||
(name "rust-glib-sys")
|
||||
(version "0.14.0")
|
||||
(source
|
||||
|
@ -1120,7 +1389,6 @@
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1bjlymn3fw4g8slij6iiggaipknf9072mr2qm3i4a91199an078w"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:skip-build?
|
||||
#t
|
||||
|
@ -1130,12 +1398,7 @@
|
|||
#:cargo-development-inputs
|
||||
(("rust-shell-words" ,rust-shell-words-0.1)
|
||||
("rust-tempfile" ,rust-tempfile-3))))
|
||||
(inputs
|
||||
(list glib))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "FFI bindings to libglib-2.0")
|
||||
(description "This package provides FFI bindings to libglib-2.0.")
|
||||
(license license:expat)))
|
||||
(native-inputs '())))
|
||||
|
||||
(define-public rust-glib-sys-0.10
|
||||
(package
|
||||
|
@ -1181,21 +1444,52 @@
|
|||
(("rust-shell-words" ,rust-shell-words-0.1)
|
||||
("rust-tempfile" ,rust-tempfile-3))))))
|
||||
|
||||
(define-public rust-gobject-sys-0.14
|
||||
(define-public rust-gobject-sys-0.15
|
||||
(package
|
||||
(name "rust-gobject-sys")
|
||||
(version "0.14.0")
|
||||
(version "0.15.10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "gobject-sys" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1xf3jiwzrjingq8jr15bjkbv6m5dypzp67cjnm5f7njrjzicm4ma"))))
|
||||
(base32 "02hyilvpi4hw4gr03z2plsbf1zicsfs5l0xxadqx3v3b4i2cwmqd"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:skip-build?
|
||||
#t
|
||||
`(;; FIXME: Constant value mismatch for G_TYPE_FUNDAMENTAL_MAX
|
||||
;; Rust: "255"
|
||||
;; C: "1020"
|
||||
#:tests? #f
|
||||
#:cargo-inputs
|
||||
(("rust-glib-sys" ,rust-glib-sys-0.15)
|
||||
("rust-libc" ,rust-libc-0.2)
|
||||
("rust-system-deps" ,rust-system-deps-6))
|
||||
#:cargo-development-inputs
|
||||
(("rust-shell-words" ,rust-shell-words-1)
|
||||
("rust-tempfile" ,rust-tempfile-3))))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
(list glib))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "FFI bindings to libgobject-2.0")
|
||||
(description "This package provides FFI bindings to libgobject-2.0.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-gobject-sys-0.14
|
||||
(package
|
||||
(inherit rust-gobject-sys-0.15)
|
||||
(version "0.14.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "gobject-sys" version))
|
||||
(file-name (string-append "rust-gobject-sys-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1xf3jiwzrjingq8jr15bjkbv6m5dypzp67cjnm5f7njrjzicm4ma"))))
|
||||
(arguments
|
||||
`(#:skip-build? #t
|
||||
#:cargo-inputs
|
||||
(("rust-glib-sys" ,rust-glib-sys-0.14)
|
||||
("rust-libc" ,rust-libc-0.2)
|
||||
|
@ -1203,12 +1497,7 @@
|
|||
#:cargo-development-inputs
|
||||
(("rust-shell-words" ,rust-shell-words-0.1)
|
||||
("rust-tempfile" ,rust-tempfile-3))))
|
||||
(inputs
|
||||
(list glib))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "FFI bindings to libgobject-2.0")
|
||||
(description "This package provides FFI bindings to libgobject-2.0.")
|
||||
(license license:expat)))
|
||||
(native-inputs '())))
|
||||
|
||||
(define-public rust-gobject-sys-0.10
|
||||
(package
|
||||
|
@ -1482,8 +1771,41 @@
|
|||
library.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-pango-0.15
|
||||
(package
|
||||
(name "rust-pango")
|
||||
(version "0.15.10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "pango" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0ksf85fqkw4y5pf21p84g5xn4fnqn21cbrmx2d9yx6k591ah9r12"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display`
|
||||
#:tests? #f
|
||||
#:cargo-inputs
|
||||
(("rust-bitflags" ,rust-bitflags-1)
|
||||
("rust-glib" ,rust-glib-0.15)
|
||||
("rust-libc" ,rust-libc-0.2)
|
||||
("rust-once-cell" ,rust-once-cell-1)
|
||||
("rust-pango-sys" ,rust-pango-sys-0.15))
|
||||
#:cargo-development-inputs
|
||||
(("rust-gir-format-check" ,rust-gir-format-check-0.1))))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
(list pango))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "Rust bindings for the Pango library")
|
||||
(description "Rust bindings for the Pango library")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-pango-0.14
|
||||
(package
|
||||
(inherit rust-pango-0.15)
|
||||
(name "rust-pango")
|
||||
(version "0.14.8")
|
||||
(source
|
||||
|
@ -1504,13 +1826,7 @@ library.")
|
|||
("rust-once-cell" ,rust-once-cell-1)
|
||||
("rust-pango-sys" ,rust-pango-sys-0.14))
|
||||
#:cargo-development-inputs
|
||||
(("rust-gir-format-check" ,rust-gir-format-check-0.1))))
|
||||
(inputs
|
||||
(list pango))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "Rust bindings for the Pango library")
|
||||
(description "Rust bindings for the Pango library")
|
||||
(license license:expat)))
|
||||
(("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
|
||||
|
||||
(define-public rust-pango-0.9
|
||||
(package
|
||||
|
@ -1592,8 +1908,39 @@ library.")
|
|||
#:cargo-development-inputs
|
||||
(("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
|
||||
|
||||
(define-public rust-pango-sys-0.15
|
||||
(package
|
||||
(name "rust-pango-sys")
|
||||
(version "0.15.10")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "pango-sys" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1an3c931kbkr08n9d9d1dapsq3n26zs0xn4ixn11jrp4rn0h186j"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-glib-sys" ,rust-glib-sys-0.15)
|
||||
("rust-gobject-sys" ,rust-gobject-sys-0.15)
|
||||
("rust-libc" ,rust-libc-0.2)
|
||||
("rust-system-deps" ,rust-system-deps-6))
|
||||
#:cargo-development-inputs
|
||||
(("rust-shell-words" ,rust-shell-words-1)
|
||||
("rust-tempfile" ,rust-tempfile-3))))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
(list pango))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "FFI bindings to libpango-1.0")
|
||||
(description "This package provides FFI bindings to @code{libpango-1.0}.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-pango-sys-0.14
|
||||
(package
|
||||
(inherit rust-pango-sys-0.15)
|
||||
(name "rust-pango-sys")
|
||||
(version "0.14.0")
|
||||
(source
|
||||
|
@ -1603,7 +1950,6 @@ library.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1zj236n9kjldf47wwlxvhshwm5zhg589a0fml5mm8qg7lnf0jrr3"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:skip-build?
|
||||
#t
|
||||
|
@ -1611,13 +1957,7 @@ library.")
|
|||
(("rust-glib-sys" ,rust-glib-sys-0.14)
|
||||
("rust-gobject-sys" ,rust-gobject-sys-0.14)
|
||||
("rust-libc" ,rust-libc-0.2)
|
||||
("rust-system-deps" ,rust-system-deps-3))))
|
||||
(inputs
|
||||
(list pango))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "FFI bindings to libpango-1.0")
|
||||
(description "This package provides FFI bindings to @code{libpango-1.0}.")
|
||||
(license license:expat)))
|
||||
("rust-system-deps" ,rust-system-deps-3))))))
|
||||
|
||||
(define-public rust-pango-sys-0.10
|
||||
(package
|
||||
|
@ -1662,8 +2002,44 @@ library.")
|
|||
(("rust-shell-words" ,rust-shell-words-0.1)
|
||||
("rust-tempfile" ,rust-tempfile-3))))))
|
||||
|
||||
(define-public rust-pangocairo-0.15
|
||||
(package
|
||||
(name "rust-pangocairo")
|
||||
(version "0.15.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "pangocairo" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0rjk0clrjxah4kc0kybn7l7bxa5m5kpxkihxc2i7a6hx3xfa8xkq"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display`
|
||||
#:tests? #f
|
||||
#:cargo-inputs
|
||||
(("rust-bitflags" ,rust-bitflags-1)
|
||||
("rust-cairo-rs" ,rust-cairo-rs-0.15)
|
||||
("rust-glib" ,rust-glib-0.15)
|
||||
("rust-libc" ,rust-libc-0.2)
|
||||
("rust-pango" ,rust-pango-0.15)
|
||||
("rust-pangocairo-sys" ,rust-pangocairo-sys-0.15))
|
||||
#:cargo-development-inputs
|
||||
(("rust-gir-format-check" ,rust-gir-format-check-0.1))))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
(list pango))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "Rust bindings for the PangoCairo library")
|
||||
(description
|
||||
"Rust bindings for the PangoCairo library.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-pangocairo-0.9
|
||||
(package
|
||||
(inherit rust-pangocairo-0.15)
|
||||
(name "rust-pangocairo")
|
||||
(version "0.9.0")
|
||||
(source
|
||||
|
@ -1690,14 +2066,7 @@ library.")
|
|||
("rust-pangocairo-sys" ,rust-pangocairo-sys-0.10)
|
||||
("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1))
|
||||
#:cargo-development-inputs
|
||||
(("rust-gir-format-check" ,rust-gir-format-check-0.1))))
|
||||
(inputs
|
||||
(list gtk+))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "Rust bindings for the PangoCairo library")
|
||||
(description
|
||||
"Rust bindings for the PangoCairo library.")
|
||||
(license license:expat)))
|
||||
(("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
|
||||
|
||||
(define-public rust-pangocairo-0.8
|
||||
(package
|
||||
|
@ -1729,8 +2098,43 @@ library.")
|
|||
#:cargo-development-inputs
|
||||
(("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
|
||||
|
||||
(define-public rust-pangocairo-sys-0.15
|
||||
(package
|
||||
(name "rust-pangocairo-sys")
|
||||
(version "0.15.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "pangocairo-sys" version))
|
||||
(file-name
|
||||
(string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"154llaawy60zh8fkw2yq0r31ynpmqlsr7brryzaq2v4ijijp9kvq"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.15)
|
||||
("rust-glib-sys" ,rust-glib-sys-0.15)
|
||||
("rust-libc" ,rust-libc-0.2)
|
||||
("rust-pango-sys" ,rust-pango-sys-0.15)
|
||||
("rust-system-deps" ,rust-system-deps-6))
|
||||
#:cargo-development-inputs
|
||||
(("rust-shell-words" ,rust-shell-words-1)
|
||||
("rust-tempfile" ,rust-tempfile-3))))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
;; XXX: Should these be propagated from their respective crates?
|
||||
(list cairo glib pango))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "FFI bindings to libgtk-3")
|
||||
(description "This package provides FFI bindings to libgtk-3.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-pangocairo-sys-0.10
|
||||
(package
|
||||
(inherit rust-pangocairo-sys-0.15)
|
||||
(name "rust-pangocairo-sys")
|
||||
(version "0.10.1")
|
||||
(source
|
||||
|
@ -1752,13 +2156,7 @@ library.")
|
|||
("rust-pkg-config" ,rust-pkg-config-0.3))
|
||||
#:cargo-development-inputs
|
||||
(("rust-shell-words" ,rust-shell-words-0.1)
|
||||
("rust-tempfile" ,rust-tempfile-3))))
|
||||
(inputs
|
||||
(list gtk+))
|
||||
(home-page "https://gtk-rs.org/")
|
||||
(synopsis "FFI bindings to libgtk-3")
|
||||
(description "This package provides FFI bindings to libgtk-3.")
|
||||
(license license:expat)))
|
||||
("rust-tempfile" ,rust-tempfile-3))))))
|
||||
|
||||
(define-public rust-soup-sys-0.10
|
||||
(package
|
||||
|
|
|
@ -1900,7 +1900,7 @@ checksum, used in the zlib compression format.")
|
|||
(define-public rust-adler32-1
|
||||
(package
|
||||
(name "rust-adler32")
|
||||
(version "1.1.0")
|
||||
(version "1.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -1909,15 +1909,19 @@ checksum, used in the zlib compression format.")
|
|||
(string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bgks405vz823bphgwhj4l9h6vpfh900s0phfk4qqijyh9xhfysn"))))
|
||||
"0d7jq7jsjyhsgbhnfq5fvrlh9j0i9g1fqrl2735ibv5f75yjgqda"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
|
||||
("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))
|
||||
#:cargo-development-inputs
|
||||
(("rust-bencher" ,rust-bencher-0.1)
|
||||
("rust-rand" ,rust-rand-0.4))))
|
||||
(("rust-criterion" ,rust-criterion-0.3)
|
||||
("rust-getrandom" ,rust-getrandom-0.1)
|
||||
("rust-humansize" ,rust-humansize-1)
|
||||
("rust-rand" ,rust-rand-0.7)
|
||||
("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
|
||||
("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
|
||||
(home-page "https://github.com/remram44/adler32-rs")
|
||||
(synopsis "Implementation of the Adler32 rolling hash algorithm")
|
||||
(description
|
||||
|
@ -10548,7 +10552,7 @@ box''.")
|
|||
(define-public rust-cc-1
|
||||
(package
|
||||
(name "rust-cc")
|
||||
(version "1.0.67")
|
||||
(version "1.0.73")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -10556,7 +10560,7 @@ box''.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1z9p27ys80shv09zhknmlal8jjra78agdwg97i6jjd6lg83rpip3"))))
|
||||
"04ccylrjq94jssh8f7d7hxv64gs9f1m1jrsxb7wqgfxk4xljmzrg"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
|
@ -10695,8 +10699,34 @@ that need to represent UTF-16 data as 8-bit characters.")
|
|||
winded @code{#[cfg()]} checks.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-cfg-expr-0.10
|
||||
(package
|
||||
(name "rust-cfg-expr")
|
||||
(version "0.10.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "cfg-expr" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1nw50j1sl6q96067399r1c6ppwp483q6vvmqdsnv493cv7sarb0a"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-smallvec" ,rust-smallvec-1)
|
||||
("rust-target-lexicon" ,rust-target-lexicon-0.12))
|
||||
#:cargo-development-inputs
|
||||
(("rust-similar-asserts" ,rust-similar-asserts-1))))
|
||||
(home-page "https://github.com/EmbarkStudios/cfg-expr")
|
||||
(synopsis "Parser and evaluator for Rust @code{cfg()} expressions")
|
||||
(description
|
||||
"This package provides a parser and evaluator for Rust @code{cfg()}
|
||||
expressions.")
|
||||
(license (list license:expat license:asl2.0))))
|
||||
|
||||
(define-public rust-cfg-expr-0.8
|
||||
(package
|
||||
(inherit rust-cfg-expr-0.10)
|
||||
(name "rust-cfg-expr")
|
||||
(version "0.8.1")
|
||||
(source
|
||||
|
@ -10712,13 +10742,7 @@ winded @code{#[cfg()]} checks.")
|
|||
(("rust-smallvec" ,rust-smallvec-1)
|
||||
("rust-target-lexicon" ,rust-target-lexicon-0.12))
|
||||
#:cargo-development-inputs
|
||||
(("rust-difference" ,rust-difference-2))))
|
||||
(home-page "https://github.com/EmbarkStudios/cfg-expr")
|
||||
(synopsis "Parser and evaluator for Rust @code{cfg()} expressions")
|
||||
(description
|
||||
"This package provides a parser and evaluator for Rust @code{cfg()}
|
||||
expressions.")
|
||||
(license (list license:expat license:asl2.0))))
|
||||
(("rust-difference" ,rust-difference-2))))))
|
||||
|
||||
(define-public rust-cfg-expr-0.7
|
||||
(package
|
||||
|
@ -14305,7 +14329,7 @@ final xor value. It has many built-in CRC functions.")
|
|||
(define-public rust-crc32fast-1
|
||||
(package
|
||||
(name "rust-crc32fast")
|
||||
(version "1.2.0")
|
||||
(version "1.3.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -14314,15 +14338,14 @@ final xor value. It has many built-in CRC functions.")
|
|||
(string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1c9dhkvf3brrzzplcijaywxi2w8wv5578i0ryhcm7x8dmzi5s4ms"))))
|
||||
"03c8f29yx293yf43xar946xbls1g60c207m9drf8ilqhr25vsh5m"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:skip-build? #t
|
||||
#:cargo-inputs
|
||||
(("rust-cfg-if" ,rust-cfg-if-0.1))
|
||||
`(#:cargo-inputs
|
||||
(("rust-cfg-if" ,rust-cfg-if-1))
|
||||
#:cargo-development-inputs
|
||||
(("rust-bencher" ,rust-bencher-0.1)
|
||||
("rust-quickcheck" ,rust-quickcheck-0.8)
|
||||
("rust-quickcheck" ,rust-quickcheck-1)
|
||||
("rust-rand" ,rust-rand-0.4))))
|
||||
(home-page "https://github.com/srijs/rust-crc32fast")
|
||||
(synopsis
|
||||
|
@ -17158,8 +17181,35 @@ verifying the contents.")
|
|||
thread.")
|
||||
(license license:mpl2.0)))
|
||||
|
||||
(define-public rust-deflate-1
|
||||
(package
|
||||
(name "rust-deflate")
|
||||
(version "1.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "deflate" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bs319wa9wl7pn9j6jrrxg1gaqbak581rkx210cbix0qyljpwvy8"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; not all test files included
|
||||
#:cargo-inputs
|
||||
(("rust-adler32" ,rust-adler32-1)
|
||||
("rust-gzip-header" ,rust-gzip-header-1))
|
||||
#:cargo-development-inputs
|
||||
(("rust-miniz-oxide" ,rust-miniz-oxide-0.5))))
|
||||
(home-page "https://github.com/image-rs/deflate-rs")
|
||||
(synopsis "DEFLATE, zlib and gzip encoder written in rust")
|
||||
(description "This package provides a DEFLATE, zlib and gzip encoder
|
||||
written in rust.")
|
||||
(license (list license:expat license:asl2.0))))
|
||||
|
||||
(define-public rust-deflate-0.9
|
||||
(package
|
||||
(inherit rust-deflate-1)
|
||||
(name "rust-deflate")
|
||||
(version "0.9.1")
|
||||
(source
|
||||
|
@ -17170,19 +17220,13 @@ thread.")
|
|||
(sha256
|
||||
(base32
|
||||
"0w0ww0hrq4bjnihxgbnrri4lj5c8yzg31fyzx36fd9pvvw2vz5az"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; not all test files included
|
||||
#:cargo-inputs
|
||||
(("rust-adler32" ,rust-adler32-1)
|
||||
("rust-gzip-header" ,rust-gzip-header-0.3))
|
||||
#:cargo-development-inputs
|
||||
(("rust-miniz-oxide" ,rust-miniz-oxide-0.3))))
|
||||
(home-page "https://github.com/image-rs/deflate-rs")
|
||||
(synopsis "DEFLATE, zlib and gzip encoder written in rust")
|
||||
(description "This package provides a DEFLATE, zlib and gzip encoder
|
||||
written in rust.")
|
||||
(license (list license:expat license:asl2.0))))
|
||||
(("rust-miniz-oxide" ,rust-miniz-oxide-0.3))))))
|
||||
|
||||
(define-public rust-deflate-0.8
|
||||
(package
|
||||
|
@ -26730,8 +26774,32 @@ support.")
|
|||
("rust-quote" ,rust-quote-1)
|
||||
("rust-syn" ,rust-syn-1))))))
|
||||
|
||||
(define-public rust-gzip-header-1
|
||||
(package
|
||||
(name "rust-gzip-header")
|
||||
(version "1.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "gzip-header" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"18lm2y96mahkmcd76pzyam2sl3v6lsl9mn8ajri9l0p6j9xm5k4m"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-crc32fast" ,rust-crc32fast-1))))
|
||||
(home-page "https://github.com/oyvindln/gzip-header")
|
||||
(synopsis "Decoding and encoding the header part of gzip files")
|
||||
(description
|
||||
"This package provides a crate for decoding and encoding the header part
|
||||
of gzip files based on the gzip header implementation in the @code{flate2} crate.")
|
||||
(license (list license:expat license:asl2.0))))
|
||||
|
||||
(define-public rust-gzip-header-0.3
|
||||
(package
|
||||
(inherit rust-gzip-header-1)
|
||||
(name "rust-gzip-header")
|
||||
(version "0.3.0")
|
||||
(source
|
||||
|
@ -26746,13 +26814,7 @@ support.")
|
|||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-crc32fast" ,rust-crc32fast-1))))
|
||||
(home-page "https://github.com/oyvindln/gzip-header")
|
||||
(synopsis "Decoding and encoding the header part of gzip files")
|
||||
(description
|
||||
"This package provides a crate for decoding and encoding the header part
|
||||
of gzip files based on the gzip header implementation in the @code{flate2} crate.")
|
||||
(license (list license:expat license:asl2.0))))
|
||||
(("rust-crc32fast" ,rust-crc32fast-1))))))
|
||||
|
||||
(define-public rust-h2-0.3
|
||||
(package
|
||||
|
@ -30548,14 +30610,14 @@ whether or not a given path points to an executable file.")
|
|||
(define-public rust-itertools-0.10
|
||||
(package
|
||||
(name "rust-itertools")
|
||||
(version "0.10.1")
|
||||
(version "0.10.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "itertools" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1bsyxnm20x05rwc5qskrqy4cfswrcadzlwc26dkqml6hz64vipb9"))))
|
||||
(base32 "1qy55fqbaisr9qgbn7cvdvqlfqbh1f4ddf99zwan56z7l6gx3ad9"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
|
@ -47482,8 +47544,34 @@ they were parsed from")
|
|||
@code{LC_COLLATE} and @code{LC_CTYPE} are not yet supported.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-pyo3-build-config-0.16
|
||||
(package
|
||||
(name "rust-pyo3-build-config")
|
||||
(version "0.16.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "pyo3-build-config" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1j2jj5qnnpagi3gvkwjpydcxfsd5qv3vmpghnaqs7n1mdia5pdmm"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-once-cell" ,rust-once-cell-1)
|
||||
("rust-python3-dll-a" ,rust-python3-dll-a-0.2)
|
||||
("rust-target-lexicon" ,rust-target-lexicon-0.12))))
|
||||
(native-inputs (list python)) ;for tests
|
||||
(home-page "https://github.com/pyo3/pyo3")
|
||||
(synopsis "Build configuration for PyO3")
|
||||
(description
|
||||
"This package contains build configuration helpers for the PyO3
|
||||
ecosystem.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public rust-pyo3-build-config-0.15
|
||||
(package
|
||||
(inherit rust-pyo3-build-config-0.16)
|
||||
(name "rust-pyo3-build-config")
|
||||
(version "0.15.1")
|
||||
(source
|
||||
|
@ -47493,20 +47581,63 @@ they were parsed from")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0aw5zfqwzj5rzfxjyqvrqfam138d1009jh6kia4xrgdz538y9yfv"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:skip-build? #t
|
||||
#:cargo-inputs
|
||||
(("rust-once-cell" ,rust-once-cell-1))))
|
||||
(native-inputs '())))
|
||||
|
||||
(define-public rust-pyo3-ffi-0.16
|
||||
(package
|
||||
(name "rust-pyo3-ffi")
|
||||
(version "0.16.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "pyo3-ffi" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0avls4q393nmzhb124zg6kp5lj6xzy2f6qx564qa7b614xqs0xf2"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:skip-build? #t
|
||||
#:cargo-inputs
|
||||
(("rust-libc" ,rust-libc-0.2)
|
||||
("rust-pyo3-build-config" ,rust-pyo3-build-config-0.16))))
|
||||
(home-page "https://github.com/pyo3/pyo3")
|
||||
(synopsis "Build configuration for PyO3")
|
||||
(synopsis "Python API bindings for the PyO3 ecosystem")
|
||||
(description
|
||||
"This package contains build configuration helpers for the PyO3
|
||||
ecosystem.")
|
||||
"This crate provides Rust FFI declarations for Python 3.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public rust-pyo3-macros-backend-0.16
|
||||
(package
|
||||
(name "rust-pyo3-macros-backend")
|
||||
(version "0.16.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "pyo3-macros-backend" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1bvzvdx2a6hhliny12n2vy7v7gbsgzanxjckjr1cbxbkizss1gak"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:skip-build? #t
|
||||
#:cargo-inputs
|
||||
(("rust-proc-macro2" ,rust-proc-macro2-1)
|
||||
("rust-pyo3-build-config" ,rust-pyo3-build-config-0.16)
|
||||
("rust-quote" ,rust-quote-1)
|
||||
("rust-syn" ,rust-syn-1))))
|
||||
(home-page "https://github.com/pyo3/pyo3")
|
||||
(synopsis "Code generation for PyO3")
|
||||
(description
|
||||
"This package provides code generation backends for PyO3.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public rust-pyo3-macros-backend-0.15
|
||||
(package
|
||||
(inherit rust-pyo3-macros-backend-0.16)
|
||||
(name "rust-pyo3-macros-backend")
|
||||
(version "0.15.1")
|
||||
(source
|
||||
|
@ -47523,11 +47654,30 @@ ecosystem.")
|
|||
(("rust-proc-macro2" ,rust-proc-macro2-1)
|
||||
("rust-pyo3-build-config" ,rust-pyo3-build-config-0.15)
|
||||
("rust-quote" ,rust-quote-1)
|
||||
("rust-syn" ,rust-syn-1))))
|
||||
("rust-syn" ,rust-syn-1))))))
|
||||
|
||||
(define-public rust-pyo3-macros-0.16
|
||||
(package
|
||||
(name "rust-pyo3-macros")
|
||||
(version "0.16.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "pyo3-macros" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1xwh7sl4n73746q80n5m5afd261zg0kxcqfnlr89ik7vbd4c8kr8"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:skip-build? #t
|
||||
#:cargo-inputs
|
||||
(("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.16)
|
||||
("rust-quote" ,rust-quote-1)
|
||||
("rust-syn" ,rust-syn-1))))
|
||||
(home-page "https://github.com/pyo3/pyo3")
|
||||
(synopsis "Code generation for PyO3")
|
||||
(synopsis "Proc macros for PyO3")
|
||||
(description
|
||||
"This package provides code generation backends for PyO3.")
|
||||
"This package provides compiler macros for use with PyO3.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public rust-pyo3-macros-backend-0.13
|
||||
|
@ -47551,6 +47701,7 @@ ecosystem.")
|
|||
|
||||
(define-public rust-pyo3-macros-0.15
|
||||
(package
|
||||
(inherit rust-pyo3-macros-0.16)
|
||||
(name "rust-pyo3-macros")
|
||||
(version "0.15.1")
|
||||
(source
|
||||
|
@ -47566,11 +47717,59 @@ ecosystem.")
|
|||
#:cargo-inputs
|
||||
(("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.15)
|
||||
("rust-quote" ,rust-quote-1)
|
||||
("rust-syn" ,rust-syn-1))))
|
||||
("rust-syn" ,rust-syn-1))))))
|
||||
|
||||
(define-public rust-pyo3-0.16
|
||||
(package
|
||||
(name "rust-pyo3")
|
||||
(version "0.16.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "pyo3" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1p5kjsj3jdw2gnahdjrzljmi93w3nxdp11qq8x3i80b0a3l04qqy"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-anyhow" ,rust-anyhow-1)
|
||||
("rust-cfg-if" ,rust-cfg-if-1)
|
||||
("rust-eyre" ,rust-eyre-0.6)
|
||||
("rust-hashbrown" ,rust-hashbrown-0.11)
|
||||
("rust-indexmap" ,rust-indexmap-1)
|
||||
("rust-indoc" ,rust-indoc-1)
|
||||
("rust-inventory" ,rust-inventory-0.2)
|
||||
("rust-libc" ,rust-libc-0.2)
|
||||
("rust-num-bigint" ,rust-num-bigint-0.4)
|
||||
("rust-num-complex" ,rust-num-complex-0.4)
|
||||
("rust-parking-lot" ,rust-parking-lot-0.11)
|
||||
("rust-paste" ,rust-paste-0.1)
|
||||
("rust-pyo3-build-config" ,rust-pyo3-build-config-0.16)
|
||||
("rust-pyo3-ffi" ,rust-pyo3-ffi-0.16)
|
||||
("rust-pyo3-macros" ,rust-pyo3-macros-0.16)
|
||||
("rust-serde" ,rust-serde-1)
|
||||
("rust-unindent" ,rust-unindent-0.1))
|
||||
#:cargo-development-inputs
|
||||
(("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
|
||||
("rust-bitflags" ,rust-bitflags-1.2)
|
||||
("rust-criterion" ,rust-criterion-0.3)
|
||||
("rust-half" ,rust-half-1)
|
||||
("rust-proptest" ,rust-proptest-0.10)
|
||||
("rust-rustversion" ,rust-rustversion-1)
|
||||
("rust-send-wrapper" ,rust-send-wrapper-0.5)
|
||||
("rust-serde-json" ,rust-serde-json-1)
|
||||
("rust-trybuild" ,rust-trybuild-1)
|
||||
("rust-widestring" ,rust-widestring-0.5))
|
||||
;; FIXME: fails to initialize Python interpreter.
|
||||
#:tests? #f))
|
||||
(inputs (list python))
|
||||
(home-page "https://github.com/pyo3/pyo3")
|
||||
(synopsis "Proc macros for PyO3")
|
||||
(synopsis "Rust bindings for the Python interpreter")
|
||||
(description
|
||||
"This package provides compiler macros for use with PyO3.")
|
||||
"This package provides Rust bindings for Python, including tools for
|
||||
creating native Python extension modules. Running and interacting with
|
||||
Python code from a Rust binary is also supported.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public rust-pyo3-macros-0.13
|
||||
|
@ -47594,6 +47793,7 @@ ecosystem.")
|
|||
|
||||
(define-public rust-pyo3-0.15
|
||||
(package
|
||||
(inherit rust-pyo3-0.16)
|
||||
(name "rust-pyo3")
|
||||
(version "0.15.1")
|
||||
(source
|
||||
|
@ -47639,15 +47839,7 @@ ecosystem.")
|
|||
("rust-serde-json" ,rust-serde-json-1)
|
||||
("rust-trybuild" ,rust-trybuild-1))
|
||||
;; FIXME: fails to initialize Python interpreter.
|
||||
#:tests? #f))
|
||||
(inputs (list python))
|
||||
(home-page "https://github.com/pyo3/pyo3")
|
||||
(synopsis "Rust bindings for the Python interpreter")
|
||||
(description
|
||||
"This package provides Rust bindings for Python, including tools for
|
||||
creating native Python extension modules. Running and interacting with
|
||||
Python code from a Rust binary is also supported.")
|
||||
(license license:asl2.0)))
|
||||
#:tests? #f))))
|
||||
|
||||
(define-public rust-pyo3-0.13
|
||||
(package
|
||||
|
@ -47687,6 +47879,28 @@ Python code from a Rust binary is also supported.")
|
|||
("rust-serde-json" ,rust-serde-json-1)
|
||||
("rust-trybuild" ,rust-trybuild-1))))))
|
||||
|
||||
(define-public rust-python3-dll-a-0.2
|
||||
(package
|
||||
(name "rust-python3-dll-a")
|
||||
(version "0.2.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "python3-dll-a" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"01k2nf4wq4f4xnaq3fy1gx12v10pndwmdrjq4x4pshhjxxnrpml9"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;Windows-like targets only
|
||||
#:cargo-inputs (("rust-cc" ,rust-cc-1))))
|
||||
(home-page "https://github.com/pyo3/python3-dll-a")
|
||||
(synopsis "Python import library generator")
|
||||
(description
|
||||
"This crate generates import libraries for the Python shared library
|
||||
for MinGW-w64 and MSVC (cross-)compile targets.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-qstring-0.7
|
||||
(package
|
||||
(name "rust-qstring")
|
||||
|
@ -59292,7 +59506,7 @@ inline storage.")
|
|||
(define-public rust-smallvec-1
|
||||
(package
|
||||
(name "rust-smallvec")
|
||||
(version "1.6.1")
|
||||
(version "1.9.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -59301,11 +59515,12 @@ inline storage.")
|
|||
(string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0kk08axr0ybfbjzk65a41k84mb6sfhyajmfndaka9igkx34kf3zy"))))
|
||||
"1lfss4vs5z5njm3ac9c499s5m1gphzm5a7gxcbw1zncpjmsdpl1g"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-serde" ,rust-serde-1))
|
||||
(("rust-arbitrary" ,rust-arbitrary-1)
|
||||
("rust-serde" ,rust-serde-1))
|
||||
#:cargo-development-inputs
|
||||
(("rust-bincode" ,rust-bincode-1))))
|
||||
(home-page "https://github.com/servo/rust-smallvec")
|
||||
|
@ -63069,8 +63284,46 @@ processors, disks, components and networks.")
|
|||
(description "Send log messages to syslog.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-system-deps-6
|
||||
(package
|
||||
(name "rust-system-deps")
|
||||
(version "6.0.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "system-deps" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "02g750rlhh7ynqa3p4a3qm7jrkjp3d0jlzrl29z225ch9hf5m951"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;source is missing some test files
|
||||
#:cargo-inputs
|
||||
(("rust-anyhow" ,rust-anyhow-1)
|
||||
("rust-cfg-expr" ,rust-cfg-expr-0.10)
|
||||
("rust-heck" ,rust-heck-0.4)
|
||||
("rust-itertools" ,rust-itertools-0.10)
|
||||
("rust-pkg-config" ,rust-pkg-config-0.3)
|
||||
("rust-strum" ,rust-strum-0.21)
|
||||
("rust-strum-macros" ,rust-strum-macros-0.21)
|
||||
("rust-thiserror" ,rust-thiserror-1)
|
||||
("rust-toml" ,rust-toml-0.5)
|
||||
("rust-version-compare" ,rust-version-compare-0.1))
|
||||
#:cargo-development-inputs
|
||||
(("rust-assert-matches" ,rust-assert-matches-1)
|
||||
("rust-itertools" ,rust-itertools-0.10)
|
||||
("rust-lazy-static" ,rust-lazy-static-1))))
|
||||
(home-page "https://github.com/gdesmott/system-deps")
|
||||
(synopsis "Define system dependencies in @file{Cargo.toml}")
|
||||
(description "This crate lets you write system dependencies in
|
||||
@file{Cargo.toml} metadata, rather than programmatically in @file{build.rs}.
|
||||
This makes those dependencies declarative, so other tools can read them as
|
||||
well.")
|
||||
(license (list license:expat license:asl2.0))))
|
||||
|
||||
(define-public rust-system-deps-3
|
||||
(package
|
||||
(inherit rust-system-deps-6)
|
||||
(name "rust-system-deps")
|
||||
(version "3.2.0")
|
||||
(source
|
||||
|
@ -63097,14 +63350,7 @@ processors, disks, components and networks.")
|
|||
#:cargo-development-inputs
|
||||
(("rust-assert-matches" ,rust-assert-matches-1)
|
||||
("rust-itertools" ,rust-itertools-0.10)
|
||||
("rust-lazy-static" ,rust-lazy-static-1))))
|
||||
(home-page "https://github.com/gdesmott/system-deps")
|
||||
(synopsis "Define system dependencies in @file{Cargo.toml}")
|
||||
(description "This crate lets you write system dependencies in
|
||||
@file{Cargo.toml} metadata, rather than programmatically in @file{build.rs}.
|
||||
This makes those dependencies declarative, so other tools can read them as
|
||||
well.")
|
||||
(license (list license:expat license:asl2.0))))
|
||||
("rust-lazy-static" ,rust-lazy-static-1))))))
|
||||
|
||||
(define-public rust-system-deps-1
|
||||
(package
|
||||
|
@ -63315,14 +63561,14 @@ memory all at once.")
|
|||
(define-public rust-target-lexicon-0.12
|
||||
(package
|
||||
(name "rust-target-lexicon")
|
||||
(version "0.12.2")
|
||||
(version "0.12.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "target-lexicon" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1zsvillq0zsggg3fb0mfmcia0f68wfclahaqc0zgln14pkfzrgyr"))))
|
||||
(base32 "1hfk4v8gbhczr6jwsy1ja6yg4npkvznym6b7r4fbgjc0fw428960"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments `(#:skip-build? #t))
|
||||
(home-page "https://github.com/CraneStation/target-lexicon")
|
||||
|
@ -65642,14 +65888,14 @@ C library.")
|
|||
(define-public rust-tinyvec-1
|
||||
(package
|
||||
(name "rust-tinyvec")
|
||||
(version "1.1.1")
|
||||
(version "1.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "tinyvec" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "08qhf0a9vxf85bj1hd38i8qzwiwm6v4vvwd11k7c728f59bwlz1i"))))
|
||||
(base32 "0hn3fkpb9nca9nf9znz2dxlp4ccv37hnbh67aczpzpmpbgq20ljv"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:skip-build? #t
|
||||
|
@ -74398,6 +74644,23 @@ library.")
|
|||
for locating fonts.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-yeslogic-fontconfig-sys-2
|
||||
(package
|
||||
(inherit rust-yeslogic-fontconfig-sys-3)
|
||||
(name "rust-yeslogic-fontconfig-sys")
|
||||
(version "2.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "yeslogic-fontconfig-sys" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"13bzwn12dmxnc8iqd6za6q3j2ililnqjcplnlrfblbca4ia73r1q"))))
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-const-cstr" ,rust-const-cstr-0.3)
|
||||
("rust-pkg-config" ,rust-pkg-config-0.3))))))
|
||||
|
||||
(define-public rust-zbase32-0.1
|
||||
(package
|
||||
(name "rust-zbase32")
|
||||
|
|
|
@ -259,17 +259,19 @@ ElasticSearch server")
|
|||
(define-public firebird
|
||||
(package
|
||||
(name "firebird")
|
||||
(version "3.0.7")
|
||||
(version "3.0.10")
|
||||
(source
|
||||
(let ((revision "33374-0"))
|
||||
(let ((revision "33601-0"))
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/FirebirdSQL/"
|
||||
"firebird/releases/download/R"
|
||||
(string-replace-substring version "." "_") "/"
|
||||
"firebird/releases/download/v"
|
||||
version "/"
|
||||
"Firebird-" version "." revision ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "0xpy1bncz36c6n28y7kllm1dkrdkn4vb4gw2n43f2351mznmrf5c"))
|
||||
(base32 "0h033xj1kxwgvdv4ncm6kk0mqybvvn203gf88xcv3avys9hbnf4i"))
|
||||
(patches (search-patches "firebird-riscv64-support-pt1.patch"
|
||||
"firebird-riscv64-support-pt2.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
`(begin
|
||||
|
@ -291,8 +293,7 @@ ElasticSearch server")
|
|||
"doc/Firebird-3-QuickStart.pdf"
|
||||
(string-append "doc/Firebird-" ,version
|
||||
"-ReleaseNotes.pdf")
|
||||
"doc/README.SecureRemotePassword.html"))
|
||||
#t)))))
|
||||
"doc/README.SecureRemotePassword.html")))))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs (list "debug" "out"))
|
||||
(arguments
|
||||
|
@ -325,13 +326,19 @@ ElasticSearch server")
|
|||
(srfi srfi-26))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
,@(if (target-riscv64?)
|
||||
`((add-before 'bootstrap 'force-bootstrap
|
||||
(lambda _
|
||||
(delete-file "configure")
|
||||
;; This file prevents automake from running.
|
||||
(delete-file "autogen.sh"))))
|
||||
'())
|
||||
(add-after 'unpack 'use-system-boost
|
||||
(lambda _
|
||||
(substitute* "src/include/firebird/Message.h"
|
||||
(("\"\\./impl/boost/preprocessor/seq/for_each_i\\.hpp\"")
|
||||
"<boost/preprocessor/seq/for_each_i.hpp>")
|
||||
(("FB_BOOST_") "BOOST_"))
|
||||
#t))
|
||||
(("FB_BOOST_") "BOOST_"))))
|
||||
(add-after 'unpack 'patch-installation
|
||||
(lambda _
|
||||
(substitute*
|
||||
|
@ -359,27 +366,23 @@ ElasticSearch server")
|
|||
|
||||
;; These promote proprietary workflows not relevant on Guix.
|
||||
(for-each delete-file-recursively
|
||||
(find-files "doc" "README\\.(build\\.msvc|NT|Win)"))
|
||||
#t))
|
||||
(find-files "doc" "README\\.(build\\.msvc|NT|Win)"))))
|
||||
(add-after 'configure 'delete-init-scripts
|
||||
(lambda _
|
||||
(delete-file-recursively "gen/install/misc")
|
||||
#t))
|
||||
(delete-file-recursively "gen/install/misc")))
|
||||
(add-before 'build 'set-build-environment-variables
|
||||
(lambda _
|
||||
;; ‘isql’ needs to run & find libfbclient.so during the build.
|
||||
;; This doubles as a rudimentary test in lieu of a test suite.
|
||||
(setenv "LD_LIBRARY_PATH"
|
||||
(string-append (assoc-ref %build-inputs "icu4c") "/lib"))
|
||||
#t))
|
||||
(string-append (assoc-ref %build-inputs "icu4c") "/lib"))))
|
||||
(add-before 'install 'keep-embedded-debug-symbols
|
||||
(lambda _
|
||||
;; Let the gnu-build-system separate & deal with them later.
|
||||
;; XXX Upstream would use ‘--strip-unneeded’, shaving a whole
|
||||
;; megabyte off Guix's 7.7M libEngine12.so, for example.
|
||||
(substitute* "gen/Makefile.install"
|
||||
(("readelf") "false"))
|
||||
#t))
|
||||
(("readelf") "false"))))
|
||||
(add-after 'install 'prune-undesirable-files
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
|
@ -390,12 +393,15 @@ ElasticSearch server")
|
|||
;; Delete (now-)empty directories.
|
||||
(for-each rmdir
|
||||
(list "include/firebird/impl"
|
||||
"lib/firebird/plugins/udr"))
|
||||
#t)))))))
|
||||
"lib/firebird/plugins/udr")))))))))
|
||||
(native-inputs
|
||||
(if (target-riscv64?)
|
||||
(list autoconf automake libtool)
|
||||
'()))
|
||||
(inputs
|
||||
(list boost
|
||||
editline
|
||||
icu4c-67
|
||||
icu4c
|
||||
libtommath
|
||||
ncurses
|
||||
zlib))
|
||||
|
@ -418,8 +424,6 @@ Firebird can also be embedded into stand-alone applications that don't want or
|
|||
need a full client & server. Used in this manner, it offers richer SQL support
|
||||
than SQLite as well as the option to seamlessly migrate to a client/server
|
||||
database later.")
|
||||
(properties
|
||||
`((lint-hidden-cve . ("CVE-2017-6369"))))
|
||||
(license
|
||||
;; See doc/license/README.license.usage.txt for rationale & details.
|
||||
(list license:bsd-3 ; src/common/sha2/
|
||||
|
@ -1284,39 +1288,13 @@ pictures, sounds, or video.")
|
|||
(package
|
||||
(inherit postgresql-14)
|
||||
(version "13.6")
|
||||
(replacement postgresql-13/replacement)
|
||||
(source (origin
|
||||
(inherit (package-source postgresql-14))
|
||||
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
|
||||
version "/postgresql-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1z37ix80hb2bqa2smh1hbj9r507ypnl3pil43gkqznnlv6ipzz5s"))
|
||||
(patches (search-patches "postgresql-riscv-spinlocks.patch"))))))
|
||||
|
||||
;; The merge of commit ...
|
||||
;; 781dd2de230e3 gnu: postgresql-13: Fix building on riscv64-linux.
|
||||
;; ... in ...
|
||||
;; 49b350fafc2c3 Merge branch 'master' into staging.
|
||||
;; ... lost the inherited patch from postgresql-14, causing problems such as ...
|
||||
;; 05fef7bfc6005 gnu: timescaledb: Adjust test preparation to PostgreSQL 13.6.
|
||||
;;
|
||||
;; While at it, remove the RISC-V spinlock patch, which has been upstreamed
|
||||
;; in a different form (so the old patch still applies).
|
||||
;; TODO: Remove in the next rebuild cycle.
|
||||
(define postgresql-13/replacement
|
||||
(package
|
||||
(inherit postgresql-13)
|
||||
(version "13.7")
|
||||
(source
|
||||
(origin
|
||||
(inherit (package-source postgresql-13))
|
||||
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
|
||||
version "/postgresql-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"16b3ljid7zd1v5l4l4pmwihx43wi8p9izidkjfii8dnqygs5p40v"))
|
||||
(patches (search-patches "postgresql-disable-resolve_symlinks.patch"))))))
|
||||
"1z37ix80hb2bqa2smh1hbj9r507ypnl3pil43gkqznnlv6ipzz5s"))))))
|
||||
|
||||
(define-public postgresql-11
|
||||
(package
|
||||
|
@ -1329,9 +1307,7 @@ pictures, sounds, or video.")
|
|||
version "/postgresql-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1983a7y4y6zhbgh0qcdfkf99445j1zm5q1ncrbkrx555y08y3n9d"))
|
||||
(patches (search-patches
|
||||
"postgresql-disable-resolve_symlinks.patch"))))
|
||||
"1983a7y4y6zhbgh0qcdfkf99445j1zm5q1ncrbkrx555y08y3n9d"))))
|
||||
(native-inputs
|
||||
(modify-inputs (package-native-inputs postgresql-13)
|
||||
(replace "docbook-xml" docbook-xml-4.2)))))
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
;;; Copyright © 2020 Fredrik Salomonsson <plattfot@gmail.com>
|
||||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
||||
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;;
|
||||
|
@ -77,7 +77,16 @@
|
|||
"sddm-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0hcdysw8ibr66vk8i7v56l0v5ijvhlq67v4460mc2xf2910g2m72"))))
|
||||
"0hcdysw8ibr66vk8i7v56l0v5ijvhlq67v4460mc2xf2910g2m72"))
|
||||
(snippet
|
||||
#~(begin
|
||||
;; https://github.com/sddm/sddm/issues/1536
|
||||
;; https://github.com/sddm/sddm/commit/e93bf95c54ad8c2a1604f8d7be05339164b19308
|
||||
;; Commit comes shortly after the 0.19.0 release.
|
||||
(use-modules ((guix build utils)))
|
||||
(substitute* "src/daemon/XorgDisplayServer.cpp"
|
||||
(("m_cookie\\[i\\] = digits\\[dis\\(gen\\)\\]")
|
||||
"m_cookie[i] = QLatin1Char(digits[dis(gen)])"))))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules pkg-config qttools-5))
|
||||
|
|
|
@ -646,14 +646,14 @@ language and very flexible regarding to new or unknown keyboard layouts.")
|
|||
(define-public ktouch
|
||||
(package
|
||||
(name "ktouch")
|
||||
(version "20.12.1")
|
||||
(version "21.12.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/"
|
||||
version "/src/ktouch-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib"))))
|
||||
(base32 "1rq2n8395sb17rqd295axv2pbwzhqs8ikjqx5ryn4lv1713alabl"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools pkg-config))
|
||||
|
|
|
@ -447,11 +447,10 @@ GTK and also enables xwidgets.")))
|
|||
((#:modules _) (%emacs-modules build-system))
|
||||
((#:phases phases)
|
||||
#~(modify-phases #$phases
|
||||
(delete 'set-libgccjit-path)
|
||||
(delete 'restore-emacs-pdmp)
|
||||
(delete 'strip-double-wrap)))))
|
||||
(inputs (list ncurses coreutils gzip
|
||||
(make-ld-wrapper "ld-wrapper" #:binutils binutils)
|
||||
binutils glibc libgccjit zlib))
|
||||
(inputs (list ncurses coreutils gzip))
|
||||
(native-inputs (list autoconf pkg-config))))
|
||||
|
||||
(define-public emacs-xwidgets
|
||||
|
|
|
@ -508,14 +508,14 @@ freedesktop.org project.")
|
|||
;; Updating this will rebuild over 700 packages through libinput-minimal.
|
||||
(package
|
||||
(name "libinput")
|
||||
(version "1.19.2")
|
||||
(version "1.19.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://freedesktop.org/software/libinput/"
|
||||
"libinput-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"10xqk05mkvsyxfxpn3vwkwb7j22d38wlbg1l1k37f6pfyc59zhqg"))))
|
||||
"0h5lz54rrl48bhi3vki6s08m6rn2h62rlf08dhgchdm9nmqaaczz"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-Ddocumentation=false")
|
||||
|
@ -1646,9 +1646,9 @@ which speak the Qualcomm MSM Interface (QMI) protocol.")
|
|||
#~(list (string-append "--with-udev-base-dir=" #$output "/lib/udev"))))
|
||||
(native-inputs
|
||||
(list dbus
|
||||
gettext-minimal
|
||||
gobject-introspection
|
||||
`(,glib "bin") ;for glib-mkenums
|
||||
gettext-minimal
|
||||
pkg-config
|
||||
python
|
||||
python-dbus
|
||||
|
@ -2000,15 +2000,15 @@ manually by a user.")
|
|||
(define-public perl-file-basedir
|
||||
(package
|
||||
(name "perl-file-basedir")
|
||||
(version "0.08")
|
||||
(version "0.09")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/K/KI/KIMRYAN/"
|
||||
(uri (string-append "mirror://cpan/authors/id/P/PL/PLICEASE/"
|
||||
"File-BaseDir-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qq5ag9zffx8zc5i9b4z03ar80pqj4drgk3vjdlyfapjwb9zqrf0"))))
|
||||
"1nb757cyyy80xln147qgns113i2ivfpgcfhsxw8qzb322llgg9kd"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs
|
||||
(list perl-module-build perl-file-which perl-test-pod
|
||||
|
@ -2052,7 +2052,7 @@ applications define in those files.")
|
|||
(define-public perl-file-mimeinfo
|
||||
(package
|
||||
(name "perl-file-mimeinfo")
|
||||
(version "0.29")
|
||||
(version "0.33")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2060,7 +2060,7 @@ applications define in those files.")
|
|||
"File-MimeInfo-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1sh8r6vczyz08zm8vfsjmkg6a165wch54akjdrd1vbifcmwjg5pi"))))
|
||||
"1i5iw6ri0w9clwpqf40xmsh4isc8xvx2lyf2r5g34886i6rsdgpn"))))
|
||||
(build-system perl-build-system)
|
||||
(inputs
|
||||
;; TODO(staging): Make unconditional.
|
||||
|
|
|
@ -6825,7 +6825,7 @@ fight against their plot and save his fellow rabbits from slavery.")
|
|||
libxcursor
|
||||
libxml2
|
||||
miniupnpc
|
||||
mozjs
|
||||
mozjs-78
|
||||
openal
|
||||
sdl2
|
||||
wxwidgets
|
||||
|
|
|
@ -67,6 +67,7 @@
|
|||
#:use-module (guix build-system waf)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module ((srfi srfi-1) #:hide (zip)))
|
||||
|
@ -74,15 +75,22 @@
|
|||
(define-public glu
|
||||
(package
|
||||
(name "glu")
|
||||
(version "9.0.1")
|
||||
(version "9.0.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/glu/glu-"
|
||||
version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.freedesktop.org/mesa/glu")
|
||||
(commit (string-append "glu-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1xqhk9bn10nbvffw3r4p4rjslwz1l7gaycc0x2pqkr2irp7q9x7n"))))
|
||||
"1khxfidyglpx4yd8f3xvrj05ah823cz1ygcszhcaa4w7h9kd1lbr"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config
|
||||
autoconf
|
||||
automake
|
||||
libtool))
|
||||
(propagated-inputs
|
||||
(list mesa)) ; according to glu.pc
|
||||
(home-page "http://www.opengl.org/archives/resources/faq/technical/glu.htm")
|
||||
|
@ -103,16 +111,15 @@ as ASCII text.")
|
|||
(define-public freeglut
|
||||
(package
|
||||
(name "freeglut")
|
||||
(version "3.2.1")
|
||||
(version "3.2.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://sourceforge/freeglut/freeglut/"
|
||||
version "/freeglut-" version ".tar.gz"))
|
||||
(patches (search-patches "freeglut-gcc-compat.patch"))
|
||||
"https://github.com/FreeGLUTProject/freeglut/releases"
|
||||
"/download/v" version "/freeglut-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0s6sk49q8ijgbsrrryb7dzqx2fa744jhx1wck5cz5jia2010w06l"))))
|
||||
"0l3s57zw51fy3mn5qfdm4z775kfhflgxppanaxmskfzh5l44m565"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ;no test target
|
||||
|
@ -248,14 +255,14 @@ also known as DXTn or DXTC) for Mesa.")
|
|||
(package
|
||||
(inherit libva)
|
||||
(name "libva-without-mesa")
|
||||
(inputs `(,@(fold alist-delete (package-inputs libva)
|
||||
'("mesa" "wayland"))))
|
||||
(inputs (fold alist-delete (package-inputs libva)
|
||||
'("mesa" "wayland")))
|
||||
(arguments
|
||||
(strip-keyword-arguments
|
||||
'(#:make-flags)
|
||||
(substitute-keyword-arguments (package-arguments libva)
|
||||
((#:configure-flags flags)
|
||||
'(list "--disable-glx" "--disable-egl"))))))))
|
||||
'(list "--disable-glx"))))))))
|
||||
|
||||
(define-public mesa
|
||||
(package
|
||||
|
@ -716,37 +723,31 @@ OpenGL graphics API.")
|
|||
(define-public libepoxy
|
||||
(package
|
||||
(name "libepoxy")
|
||||
(version "1.5.5")
|
||||
(version "1.5.10")
|
||||
(home-page "https://github.com/anholt/libepoxy")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/anholt/libepoxy/releases/download/"
|
||||
version "/libepoxy-" version ".tar.xz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference (url home-page) (commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0mh5bdgqfd8m4wj6jlvn4ac94sgfa8r6ish75ciwrhdw47dn65i6"))))
|
||||
"0jw02bzdwynyrwsn5rhcacv92h9xx928j3xp436f8gdnwlyb5641"))))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'bootstrap)
|
||||
(add-before
|
||||
'configure 'patch-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((python (assoc-ref inputs "python"))
|
||||
(mesa (assoc-ref inputs "mesa")))
|
||||
(substitute* "src/gen_dispatch.py"
|
||||
(("/usr/bin/env python") python))
|
||||
(substitute* (find-files "." "\\.[ch]$")
|
||||
(("libGL.so.1") (string-append mesa "/lib/libGL.so.1"))
|
||||
(("libEGL.so.1") (string-append mesa "/lib/libEGL.so.1")))
|
||||
#t))))))
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'configure 'patch-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((mesa (dirname (search-input-file inputs "lib/libGL.so"))))
|
||||
(substitute* (find-files "." "\\.[ch]$")
|
||||
(("libGL.so.1") (string-append mesa "/libGL.so.1"))
|
||||
(("libEGL.so.1") (string-append mesa "/libEGL.so.1")))))))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config python))
|
||||
(propagated-inputs
|
||||
;; epoxy.pc: 'Requires.private: gl egl'
|
||||
(list mesa))
|
||||
(home-page "https://github.com/anholt/libepoxy/")
|
||||
(synopsis "Library for handling OpenGL function pointer management")
|
||||
(description
|
||||
"A library for handling OpenGL function pointer management.")
|
||||
|
|
|
@ -5211,7 +5211,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
|
|||
(define-public libsecret
|
||||
(package
|
||||
(name "libsecret")
|
||||
(version "0.20.4")
|
||||
(version "0.20.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -5220,28 +5220,47 @@ and the GLib main loop, to integrate well with GNOME applications.")
|
|||
"libsecret-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0a4xnfmraxchd9cq5ai66j12jv2vrgjmaaxz25kl031jvda4qnij"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
"0k9bs47rzb3dwvznb4179d6nw7rbzjdyd4y8hx6vazfd1wscxcrz"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; FIXME: Testing hangs.
|
||||
#:configure-flags
|
||||
(list (string-append "--with-html-dir="
|
||||
(assoc-ref %outputs "doc")
|
||||
"/share/gtk-doc/html"))))
|
||||
(list
|
||||
#:configure-flags
|
||||
#~(list "-Dgtk_doc=false") ;requires gi-docgen
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'disable-problematic-tests
|
||||
(lambda _
|
||||
(substitute* "libsecret/meson.build"
|
||||
;; The test-collection test fails non-deterministically (see:
|
||||
;; https://gitlab.gnome.org/GNOME/libsecret/-/issues/80).
|
||||
((".*'test-collection',.*") ""))))
|
||||
(delete 'check)
|
||||
(add-after 'install 'check
|
||||
(lambda* (#:key tests? test-options #:allow-other-keys)
|
||||
(when tests?
|
||||
(setenv "HOME" "/tmp")
|
||||
(setenv "XDG_DATA_DIRS" ;for /org/freedesktop/secrets/collection
|
||||
(string-append #$output "/share:"
|
||||
(getenv "XDG_DATA_DIRS")))
|
||||
(apply invoke "dbus-run-session" "--"
|
||||
"meson" "test" "--print-errorlogs" "-t" "0"
|
||||
test-options)))))))
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
("glib:bin" ,glib "bin") ; for gdbus-codegen, etc.
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
("pkg-config" ,pkg-config)
|
||||
("vala" ,vala)
|
||||
("xsltproc" ,libxslt)))
|
||||
(list dbus
|
||||
docbook-xml-4.2
|
||||
docbook-xsl
|
||||
gettext-minimal
|
||||
`(,glib "bin") ;for gdbus-codegen, etc.
|
||||
gobject-introspection
|
||||
libxml2 ;for XML_CATALOG_FILES
|
||||
libxslt
|
||||
pkg-config
|
||||
python
|
||||
python-dbus
|
||||
python-pygobject
|
||||
vala))
|
||||
(propagated-inputs
|
||||
(list glib)) ; required by libsecret-1.pc
|
||||
(inputs
|
||||
;; The ‘build’ phase complains about missing docbook-xml-4.2 but adding it
|
||||
;; doesn't seem to affect the build result.
|
||||
(list docbook-xsl libgcrypt libxml2)) ; for XML_CATALOG_FILES
|
||||
(list glib libgcrypt)) ;required by libsecret-1.pc
|
||||
(home-page "https://wiki.gnome.org/Projects/Libsecret/")
|
||||
(synopsis "GObject bindings for \"Secret Service\" API")
|
||||
(description
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
||||
;;; Copyright © 2019, 2020 Adrian Malacoda <malacoda@monarch-pass.net>
|
||||
;;; Copyright © 2020, 2021, 2022 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
||||
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
|
||||
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
|
||||
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
|
@ -98,16 +98,16 @@
|
|||
(define-public mozjs
|
||||
(package
|
||||
(name "mozjs")
|
||||
(version "78.15.0")
|
||||
(version "102.2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
;; TODO: Switch to IceCat source once available on ftp.gnu.org.
|
||||
(uri (string-append "https://archive.mozilla.org/pub/firefox"
|
||||
(uri (string-append "https://ftp.mozilla.org/pub/firefox"
|
||||
"/releases/" version "esr/source/firefox-"
|
||||
version "esr.source.tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0l91cxdc5v9fps79ckb1kid4gw6v5qng1jd9zvaacwaiv628shx4"))))
|
||||
"1zwpgis7py1bf8p88pz3mpai6a02qrdb8ww2fa9kxxdl9b8r2k81"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
@ -128,10 +128,6 @@
|
|||
"--enable-hardening"
|
||||
"--enable-optimize"
|
||||
"--enable-release"
|
||||
;; FIXME: rust-simd is disabled otherwise the build fails with
|
||||
;; "error: `[u32; 64]` is forbidden as the type of a const generic
|
||||
;; parameter".
|
||||
"--disable-rust-simd"
|
||||
"--enable-readline"
|
||||
"--enable-shared-js"
|
||||
"--with-system-icu"
|
||||
|
@ -153,7 +149,7 @@
|
|||
(for-each generate-all-checksums
|
||||
'("js" "third_party/rust")))))
|
||||
(replace 'configure
|
||||
(lambda* (#:key inputs configure-flags #:allow-other-keys)
|
||||
(lambda* (#:key configure-flags #:allow-other-keys)
|
||||
;; The configure script does not accept environment variables as
|
||||
;; arguments. It also must be run from a different directory,
|
||||
;; but not the root directory either.
|
||||
|
@ -162,43 +158,11 @@
|
|||
(setenv "SHELL" (which "sh"))
|
||||
(setenv "CONFIG_SHELL" (which "sh"))
|
||||
(setenv "AUTOCONF" (which "autoconf"))
|
||||
(apply invoke "../js/src/configure"
|
||||
(cons (string-append "--prefix=" #$output)
|
||||
configure-flags))))
|
||||
(add-after 'unpack 'adjust-for-icu-68
|
||||
(lambda _
|
||||
(with-directory-excursion "js/src/tests"
|
||||
;; The test suite expects a lightly patched ICU 67. Since
|
||||
;; Guix is about to switch to ICU 68, massage the tests to
|
||||
;; work with that instead of patching ICU. Try removing this
|
||||
;; phase for newer versions of mozjs.
|
||||
|
||||
;; These tests look up locale names and expects to get
|
||||
;; "GB" instead of "UK".
|
||||
(substitute* "non262/Intl/DisplayNames/language.js"
|
||||
(("Traditionell, GB")
|
||||
"Traditionell, UK"))
|
||||
(substitute* "non262/Intl/DisplayNames/region.js"
|
||||
(("\"GB\": \"GB\"")
|
||||
"\"GB\": \"UK\""))
|
||||
|
||||
;; XXX: Some localized time formats have changed, and
|
||||
;; substitution fails for accented characters, even though
|
||||
;; it works in the REPL(?). Just delete these for now.
|
||||
(delete-file "non262/Intl/Date/toLocaleString_timeZone.js")
|
||||
(delete-file "non262/Intl/Date/toLocaleDateString_timeZone.js")
|
||||
|
||||
;; Similarly, these get an unexpected "A" suffix when looking
|
||||
;; up a time in the "ar-MA-u-ca-islamicc" locale, which is
|
||||
;; tricky to substitute.
|
||||
(delete-file "non262/Intl/DateTimeFormat/format_timeZone.js")
|
||||
(delete-file "non262/Intl/DateTimeFormat/format.js")
|
||||
|
||||
;; This file compares a generated list of ICU locale names
|
||||
;; with actual lookups. Some have changed slightly, i.e.
|
||||
;; daf-Latn-ZZ -> daf-Latn-CI, so drop it for simplicity.
|
||||
(delete-file "non262/Intl/Locale/likely-subtags-generated.js"))))
|
||||
(add-before 'check 'pre-check
|
||||
(apply invoke "python" "../configure.py"
|
||||
"--enable-project=js"
|
||||
(string-append "--prefix=" #$output)
|
||||
configure-flags)))
|
||||
(add-before 'check 'adjust-tests
|
||||
(lambda _
|
||||
(with-directory-excursion "../js/src/tests"
|
||||
(substitute* "shell/os.js"
|
||||
|
@ -206,35 +170,44 @@
|
|||
((".*killed process should not have exitStatus.*")
|
||||
""))
|
||||
|
||||
;; XXX: Delete all tests that test time zone functionality,
|
||||
;; because the test suite uses /etc/localtime to figure out
|
||||
;; the offset from the hardware clock, which does not work
|
||||
;; in the build container. See <tests/non262/Date/shell.js>.
|
||||
(delete-file-recursively "non262/Date")
|
||||
(delete-file "non262/Intl/DateTimeFormat/tz-environment-variable.js")
|
||||
;; The test suite expects a lightly patched ICU. Disable tests
|
||||
;; that do not work with the system version. See
|
||||
;; "intl/icu-patches" for clues.
|
||||
|
||||
(setenv "JSTESTS_EXTRA_ARGS"
|
||||
(string-join
|
||||
(list
|
||||
;; Do not run tests marked as "random".
|
||||
"--exclude-random"
|
||||
;; Exclude web platform tests.
|
||||
"--wpt=disabled"
|
||||
;; Respect the daemons configured number of jobs.
|
||||
(string-append "--worker-count="
|
||||
(number->string (parallel-job-count))))))))))))
|
||||
;; See <https://unicode-org.atlassian.net/browse/ICU-20992> and
|
||||
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=1636984> and
|
||||
;; related patch for why this is failing.
|
||||
(delete-file "non262/Intl/DateTimeFormat/\
|
||||
fractional-second-digits-append-item.js")
|
||||
;; FIXME: got "0 \u251CAM/PM: noon\u2524", expected "0 (AM/PM: noon)"
|
||||
(delete-file "non262/Intl/DateTimeFormat/day-period-hour-cycle.js")
|
||||
;; FIXME: got "en-US-posix", expected "en-US-POSIX".
|
||||
(delete-file "non262/Intl/available-locales-supported.js")
|
||||
;; FIXME: got "en-US", expected "en-US-POSIX"
|
||||
(delete-file "non262/Intl/available-locales-resolved.js"))))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
(setenv "JSTESTS_EXTRA_ARGS"
|
||||
(string-join
|
||||
(list
|
||||
;; Do not run tests marked as "random".
|
||||
"--exclude-random"
|
||||
;; Exclude web platform tests.
|
||||
"--wpt=disabled"
|
||||
;; Respect the daemons configured number of jobs.
|
||||
(string-append "--worker-count="
|
||||
(number->string (parallel-job-count)))))))))))
|
||||
(native-inputs
|
||||
(list autoconf-2.13
|
||||
automake
|
||||
;; TODO(staging): Use the default LLVM in the next rebuild cycle.
|
||||
llvm-9 ;for llvm-objdump
|
||||
(list autoconf
|
||||
llvm ;for llvm-objdump
|
||||
m4
|
||||
perl
|
||||
pkg-config
|
||||
python-3
|
||||
python-wrapper
|
||||
rust
|
||||
`(,rust "cargo")))
|
||||
(inputs
|
||||
(list icu4c readline zlib))
|
||||
(list icu4c-71 readline zlib))
|
||||
(propagated-inputs
|
||||
(list nspr)) ; in the Requires.private field of mozjs-*.pc
|
||||
(home-page
|
||||
|
@ -260,7 +233,39 @@ in C/C++.")
|
|||
(substitute-keyword-arguments (package-arguments mozjs)
|
||||
((#:phases phases)
|
||||
#~(modify-phases #$phases
|
||||
(delete 'adjust-for-icu-68)
|
||||
(add-before 'check 'disable-timezone-tests
|
||||
(lambda _
|
||||
(with-directory-excursion "../js/src/tests"
|
||||
;; FIXME: Assertion failed: got "2021a", expected "2021a3"?
|
||||
(delete-file "non262/Intl/DateTimeFormat/timeZone_version.js")
|
||||
;; XXX: Delete all tests that test time zone functionality,
|
||||
;; because the test suite uses /etc/localtime to figure out
|
||||
;; the offset from the hardware clock, which does not work
|
||||
;; in the build container. See <tests/non262/Date/shell.js>.
|
||||
(delete-file-recursively "non262/Date")
|
||||
(delete-file
|
||||
"non262/Intl/DateTimeFormat/tz-environment-variable.js"))))))))
|
||||
(inputs (modify-inputs (package-inputs mozjs)
|
||||
(replace "icu4c" icu4c)))))
|
||||
|
||||
(define-public mozjs-78
|
||||
(package
|
||||
(inherit mozjs)
|
||||
(name "mozjs")
|
||||
(version "78.15.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://archive.mozilla.org/pub/firefox"
|
||||
"/releases/" version "esr/source/firefox-"
|
||||
version "esr.source.tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0l91cxdc5v9fps79ckb1kid4gw6v5qng1jd9zvaacwaiv628shx4"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments mozjs)
|
||||
((#:phases phases)
|
||||
#~(modify-phases #$phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key configure-flags #:allow-other-keys)
|
||||
;; The configure script does not accept environment variables as
|
||||
|
@ -271,11 +276,43 @@ in C/C++.")
|
|||
(setenv "SHELL" (which "sh"))
|
||||
(setenv "CONFIG_SHELL" (which "sh"))
|
||||
(setenv "AUTOCONF" (which "autoconf"))
|
||||
(apply invoke "python" "../configure.py"
|
||||
"--enable-project=js"
|
||||
(string-append "--prefix=" #$output)
|
||||
configure-flags)))
|
||||
(add-before 'check 'adjust-tests
|
||||
(apply invoke "../js/src/configure"
|
||||
(cons (string-append "--prefix=" #$output)
|
||||
configure-flags))))
|
||||
(replace 'adjust-tests
|
||||
(lambda _
|
||||
(with-directory-excursion "../js/src/tests"
|
||||
;; The test suite expects a lightly patched ICU 67. Since
|
||||
;; Guix is about to switch to ICU 68, massage the tests to
|
||||
;; work with that instead of patching ICU. Try removing this
|
||||
;; phase for newer versions of mozjs.
|
||||
|
||||
;; These tests look up locale names and expects to get
|
||||
;; "GB" instead of "UK".
|
||||
(substitute* "non262/Intl/DisplayNames/language.js"
|
||||
(("Traditionell, GB")
|
||||
"Traditionell, UK"))
|
||||
(substitute* "non262/Intl/DisplayNames/region.js"
|
||||
(("\"GB\": \"GB\"")
|
||||
"\"GB\": \"UK\""))
|
||||
|
||||
;; XXX: Some localized time formats have changed, and
|
||||
;; substitution fails for accented characters, even though
|
||||
;; it works in the REPL(?). Just delete these for now.
|
||||
(delete-file "non262/Intl/Date/toLocaleString_timeZone.js")
|
||||
(delete-file "non262/Intl/Date/toLocaleDateString_timeZone.js")
|
||||
|
||||
;; Similarly, these get an unexpected "A" suffix when looking
|
||||
;; up a time in the "ar-MA-u-ca-islamicc" locale, which is
|
||||
;; tricky to substitute.
|
||||
(delete-file "non262/Intl/DateTimeFormat/format_timeZone.js")
|
||||
(delete-file "non262/Intl/DateTimeFormat/format.js")
|
||||
|
||||
;; This file compares a generated list of ICU locale names
|
||||
;; with actual lookups. Some have changed slightly, i.e.
|
||||
;; daf-Latn-ZZ -> daf-Latn-CI, so drop it for simplicity.
|
||||
(delete-file "non262/Intl/Locale/likely-subtags-generated.js"))))
|
||||
(replace 'pre-check
|
||||
(lambda _
|
||||
(with-directory-excursion "../js/src/tests"
|
||||
(substitute* "shell/os.js"
|
||||
|
@ -283,69 +320,35 @@ in C/C++.")
|
|||
((".*killed process should not have exitStatus.*")
|
||||
""))
|
||||
|
||||
;; The test suite expects a lightly patched ICU. Disable tests
|
||||
;; that do not work with the system version. See
|
||||
;; "intl/icu-patches" for clues.
|
||||
|
||||
;; See <https://unicode-org.atlassian.net/browse/ICU-20992> and
|
||||
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=1636984> and
|
||||
;; related patch for why this is failing.
|
||||
(delete-file "non262/Intl/DateTimeFormat/\
|
||||
fractional-second-digits-append-item.js")
|
||||
;; FIXME: got "0 \u251CAM/PM: noon\u2524", expected "0 (AM/PM: noon)"
|
||||
(delete-file "non262/Intl/DateTimeFormat/day-period-hour-cycle.js")
|
||||
;; FIXME: got "en-US-posix", expected "en-US-POSIX".
|
||||
(delete-file "non262/Intl/available-locales-supported.js")
|
||||
;; FIXME: got "en-US", expected "en-US-POSIX"
|
||||
(delete-file "non262/Intl/available-locales-resolved.js")
|
||||
|
||||
;; FIXME: Assertion failed: got "2021a", expected "2021a3"?
|
||||
(delete-file "non262/Intl/DateTimeFormat/timeZone_version.js")
|
||||
;; XXX: Delete all tests that test time zone functionality,
|
||||
;; because the test suite uses /etc/localtime to figure out
|
||||
;; the offset from the hardware clock, which does not work
|
||||
;; in the build container. See <tests/non262/Date/shell.js>.
|
||||
(delete-file-recursively "non262/Date")
|
||||
(delete-file
|
||||
"non262/Intl/DateTimeFormat/tz-environment-variable.js"))))
|
||||
(replace 'pre-check
|
||||
(lambda _
|
||||
(setenv "JSTESTS_EXTRA_ARGS"
|
||||
(string-join
|
||||
(list
|
||||
;; Do not run tests marked as "random".
|
||||
"--exclude-random"
|
||||
;; Exclude web platform tests.
|
||||
"--wpt=disabled"
|
||||
;; Respect the daemons configured number of jobs.
|
||||
(string-append "--worker-count="
|
||||
(number->string (parallel-job-count))))))))))))
|
||||
(native-inputs (modify-inputs (package-native-inputs mozjs)
|
||||
(replace "autoconf" autoconf)
|
||||
(replace "llvm" llvm)
|
||||
(replace "python" python-wrapper)
|
||||
(append m4)))))
|
||||
(delete-file "non262/Intl/DateTimeFormat/tz-environment-variable.js")
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; Temporary packaging of rust-1.59, pending inclusion in (gnu packages rust)
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(define rust-1.58-promise
|
||||
(delay
|
||||
(let ((rust-bootstrapped-package
|
||||
(@@ (gnu packages rust)
|
||||
rust-bootstrapped-package)))
|
||||
(rust-bootstrapped-package
|
||||
rust "1.58.1" "1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8"))))
|
||||
|
||||
(define rust-1.59-promise
|
||||
(delay
|
||||
(let ((rust-bootstrapped-package
|
||||
(@@ (gnu packages rust)
|
||||
rust-bootstrapped-package)))
|
||||
(rust-bootstrapped-package
|
||||
(force rust-1.58-promise)
|
||||
"1.59.0" "1yc5bwcbmbwyvpfq7zvra78l0r8y3lbv60kbr62fzz2vx2pfxj57"))))
|
||||
(setenv "JSTESTS_EXTRA_ARGS"
|
||||
(string-join
|
||||
(list
|
||||
;; Do not run tests marked as "random".
|
||||
"--exclude-random"
|
||||
;; Exclude web platform tests.
|
||||
"--wpt=disabled"
|
||||
;; Respect the daemons configured number of jobs.
|
||||
(string-append "--worker-count="
|
||||
(number->string
|
||||
(parallel-job-count)))))))))))))
|
||||
(native-inputs
|
||||
(list autoconf-2.13
|
||||
automake
|
||||
llvm ;for llvm-objdump
|
||||
perl
|
||||
pkg-config
|
||||
python-3
|
||||
rust
|
||||
`(,rust "cargo")))
|
||||
(inputs
|
||||
(list icu4c readline zlib))))
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; Temporary packaging of rust-cbindgen-0.23 and its dependencies
|
||||
|
@ -863,8 +866,8 @@ fractional-second-digits-append-item.js")
|
|||
;; ("icecat-use-system-media-libs.patch"
|
||||
;; ,(search-patch "icecat-use-system-media-libs.patch"))
|
||||
;; TODO: Change the following lines to use 'rust' when it's >= 1.59.
|
||||
(force rust-1.59-promise)
|
||||
`(,(force rust-1.59-promise) "cargo")
|
||||
rust
|
||||
`(,rust "cargo")
|
||||
(force rust-cbindgen-0.23-promise)
|
||||
llvm
|
||||
clang
|
||||
|
@ -1539,8 +1542,8 @@ ca495991b7852b855"))
|
|||
(file-name (string-append "thunderbird-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"16wlpcv1n64crcgk4gcl92r37dlpw26izvam82pbp5f8c25amlnk")))))
|
||||
("cargo" ,(force rust-1.59-promise) "cargo")
|
||||
"078jrxpzqj45l84i39a9fq023j71ngca5gs2ngpjsbily51bzx09")))))
|
||||
("cargo" ,rust "cargo")
|
||||
("clang" ,clang)
|
||||
("llvm" ,llvm)
|
||||
("m4" ,m4)
|
||||
|
@ -1549,7 +1552,7 @@ ca495991b7852b855"))
|
|||
("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python-wrapper)
|
||||
("rust" ,(force rust-1.59-promise))
|
||||
("rust" ,rust)
|
||||
("rust-cbindgen" ,(force rust-cbindgen-0.23-promise))
|
||||
("which" ,which)
|
||||
("yasm" ,yasm)))
|
||||
|
|
|
@ -1197,13 +1197,13 @@ with strong support for multi-part, multi-channel use cases.")
|
|||
(("/var/tmp") "/tmp"))))
|
||||
(add-after 'change-directory 'increase-test-timeout
|
||||
(lambda _
|
||||
;; On armhf-linux, we need to override the CTest default
|
||||
;; On some architectures, we need to override the CTest default
|
||||
;; timeout of 1500 seconds for the OpenEXR.IlmImf test.
|
||||
(substitute* "IlmImfTest/CMakeLists.txt"
|
||||
(("add_test\\(NAME OpenEXR\\.IlmImf.*" all)
|
||||
(string-append
|
||||
all
|
||||
"set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 2000)")))
|
||||
"set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 15000)")))
|
||||
#t))
|
||||
,@(if (not (target-64bit?))
|
||||
`((add-after 'change-directory 'disable-broken-test
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
|
||||
;;; Copyright © 2015, 2016 Sou Bunnbu <iyzsong@gmail.com>
|
||||
;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017, 2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
|
@ -29,6 +29,7 @@
|
|||
(define-module (gnu packages gstreamer)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system cmake)
|
||||
|
@ -404,7 +405,7 @@ arrays of data.")
|
|||
(define-public gstreamer-docs
|
||||
(package
|
||||
(name "gstreamer-docs")
|
||||
(version "1.18.5")
|
||||
(version "1.20.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -412,7 +413,7 @@ arrays of data.")
|
|||
"/gstreamer-docs-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xvqrqv1zxqdpvd02dvr0xspk30c8b940vvnr9x75a08nx0x75xh"))))
|
||||
"1gziccq5f4fy23q6dm8nwbmzh68gn9rfbqw0xcn4r8yn82545z3k"))))
|
||||
(build-system trivial-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build utils))
|
||||
|
@ -464,7 +465,7 @@ the GStreamer multimedia framework.")
|
|||
(define-public gstreamer
|
||||
(package
|
||||
(name "gstreamer")
|
||||
(version "1.18.5")
|
||||
(version "1.20.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -473,33 +474,26 @@ the GStreamer multimedia framework.")
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"02p8my6dzmm4rvd93s3qnh8w5bm9bh4f7gdydbsvnn9llqr251jm"))))
|
||||
"0aisl8nazcfi4b5j6fz8zwpp0k9csb022zniz65b2pxxpdjayzb0"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
,@%common-gstreamer-phases
|
||||
;; FIXME: Since switching to the meson-build-system, two tests
|
||||
;; started failing on i686. See
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/issues/499>.
|
||||
,@(if (string-prefix? "i686" (or (%current-target-system)
|
||||
(%current-system)))
|
||||
`((add-after 'unpack 'disable-some-tests
|
||||
(lambda _
|
||||
(substitute* "tests/check/gst/gstsystemclock.c"
|
||||
(("tcase_add_test \\(tc_chain, test_stress_cleanup_unschedule.*")
|
||||
"")
|
||||
(("tcase_add_test \\(tc_chain, test_stress_reschedule.*")
|
||||
"")))))
|
||||
'())
|
||||
(add-after 'unpack 'disable-problematic-tests
|
||||
(lambda _
|
||||
;; Disable the 'pipelines-seek' test, which appears to be load
|
||||
;; sensitive (see:
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/854).
|
||||
(substitute* "tests/check/meson.build"
|
||||
((".*'pipelines/seek.c'.*")
|
||||
"")))))))
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
#$@%common-gstreamer-phases
|
||||
#$@(if (string-prefix? "i686" (or (%current-target-system)
|
||||
(%current-system)))
|
||||
;; FIXME: These tests consistently fail in the Guix CI:
|
||||
;; https://issues.guix.gnu.org/57868
|
||||
'((add-after 'unpack 'disable-systemclock-test
|
||||
(lambda _
|
||||
(substitute* "tests/check/gst/gstsystemclock.c"
|
||||
(("tcase_add_test \\(tc_chain, \
|
||||
test_stress_cleanup_unschedule.*")
|
||||
"")
|
||||
(("tcase_add_test \\(tc_chain, \
|
||||
test_stress_reschedule.*")
|
||||
"")))))
|
||||
'()))))
|
||||
(propagated-inputs
|
||||
;; In gstreamer-1.0.pc:
|
||||
;; Requires: glib-2.0, gobject-2.0
|
||||
|
@ -507,15 +501,14 @@ the GStreamer multimedia framework.")
|
|||
(list elfutils ; libdw
|
||||
glib libunwind))
|
||||
(native-inputs
|
||||
`(("bash-completion" ,bash-completion)
|
||||
("bison" ,bison)
|
||||
("flex" ,flex)
|
||||
("gettext" ,gettext-minimal)
|
||||
("glib" ,glib "bin")
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python-wrapper" ,python-wrapper)))
|
||||
(list bash-completion
|
||||
bison flex
|
||||
gettext-minimal
|
||||
`(,glib "bin")
|
||||
gobject-introspection
|
||||
perl
|
||||
pkg-config
|
||||
python-wrapper))
|
||||
(inputs
|
||||
(list gmp libcap
|
||||
;; For tests.
|
||||
|
@ -542,7 +535,7 @@ This package provides the core library and elements.")
|
|||
(define-public gst-plugins-base
|
||||
(package
|
||||
(name "gst-plugins-base")
|
||||
(version "1.18.5")
|
||||
(version "1.20.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -550,75 +543,87 @@ This package provides the core library and elements.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"18vg8kk7p2p8za8zaqg0v7z6898yw5a3b12vvl7xn02pb3s7l2wn"))))
|
||||
"17rw8wj1x1bg153m9z76pdvgz5k93m3riyalfpzq00x7h7fv6c3y"))))
|
||||
(build-system meson-build-system)
|
||||
(propagated-inputs
|
||||
`(("glib" ,glib) ;required by gstreamer-sdp-1.0.pc
|
||||
("gstreamer" ,gstreamer) ;required by gstreamer-plugins-base-1.0.pc
|
||||
;; wayland-client.h is referred to in
|
||||
;; include/gstreamer-1.0/gst/gl/wayland/gstgldisplay_wayland.h
|
||||
("wayland" ,wayland)
|
||||
;; XXX: Do not enable Orc optimizations on ARM systems because
|
||||
;; it leads to two test failures.
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/683
|
||||
,@(if (string-prefix? "arm" (or (%current-target-system)
|
||||
(%current-system)))
|
||||
'()
|
||||
`(("orc" ,orc))))) ;required by gstreamer-audio-1.0.pc
|
||||
(list glib ;required by gstreamer-sdp-1.0.pc
|
||||
gstreamer ;required by gstreamer-plugins-base-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
|
||||
wayland
|
||||
orc)) ;required by gstreamer-audio-1.0.pc
|
||||
(inputs
|
||||
;; TODO: Add libvorbisidec
|
||||
`(("cdparanoia" ,cdparanoia)
|
||||
("pango" ,pango)
|
||||
("libogg" ,libogg)
|
||||
("libtheora" ,libtheora)
|
||||
("libvorbis" ,libvorbis)
|
||||
("libx11" ,libx11)
|
||||
("zlib" ,zlib)
|
||||
("libXext" ,libxext)
|
||||
("libxv" ,libxv)
|
||||
("alsa-lib" ,alsa-lib)
|
||||
("opus" ,opus)
|
||||
("graphene" ,graphene)
|
||||
("iso-codes" ,iso-codes)
|
||||
("libgudev" ,libgudev)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libvisual" ,libvisual)
|
||||
("mesa" ,mesa)
|
||||
("wayland-protocols" ,wayland-protocols)))
|
||||
(list alsa-lib
|
||||
cdparanoia
|
||||
graphene
|
||||
iso-codes
|
||||
libjpeg-turbo
|
||||
libogg
|
||||
libpng
|
||||
libtheora
|
||||
libvisual
|
||||
libvorbis
|
||||
libx11
|
||||
libxext
|
||||
libxv
|
||||
mesa
|
||||
opus
|
||||
pango
|
||||
wayland-protocols
|
||||
zlib))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("glib:bin" ,glib "bin")
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
("python-wrapper" ,python-wrapper)
|
||||
("gettext" ,gettext-minimal)
|
||||
("xorg-server" ,xorg-server-for-tests)))
|
||||
(list pkg-config
|
||||
`(,glib "bin")
|
||||
gobject-introspection
|
||||
python-wrapper
|
||||
gettext-minimal
|
||||
xorg-server-for-tests))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
,@%common-gstreamer-phases
|
||||
(add-after 'unpack 'disable-problematic-tests
|
||||
(lambda _
|
||||
(substitute* "tests/check/meson.build"
|
||||
;; This test causes nondeterministic failures (see:
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/950).
|
||||
((".*'elements/appsrc.c'.*")
|
||||
""))))
|
||||
(add-before 'configure 'patch
|
||||
(lambda _
|
||||
(substitute* "tests/check/libs/pbutils.c"
|
||||
(("/bin/sh") (which "sh")))))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
;; Tests require a running X server.
|
||||
(system "Xvfb :1 +extension GLX &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
;; Tests write to $HOME.
|
||||
(setenv "HOME" (getcwd))
|
||||
;; Tests look for $XDG_RUNTIME_DIR.
|
||||
(setenv "XDG_RUNTIME_DIR" (getcwd))
|
||||
;; For missing '/etc/machine-id'.
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0"))))))
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
#$@%common-gstreamer-phases
|
||||
(add-after 'unpack 'disable-problematic-tests
|
||||
(lambda _
|
||||
(substitute* "tests/check/meson.build"
|
||||
;; This test causes nondeterministic failures (see:
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/950).
|
||||
((".*'elements/appsrc.c'.*")
|
||||
""))
|
||||
;; Some other tests fail on other architectures.
|
||||
#$@(cond
|
||||
((target-x86-32?)
|
||||
#~((substitute* "tests/check/meson.build"
|
||||
((".*'libs/libsabi\\.c'.*") ""))))
|
||||
((target-riscv64?)
|
||||
#~((substitute* "tests/check/meson.build"
|
||||
((".*'libs/gstglcolorconvert\\.c'.*") "")
|
||||
((".*'libs/gstglcontext\\.c'.*") "")
|
||||
((".*'libs/gstglmemory\\.c'.*") "")
|
||||
((".*'libs/gstglupload\\.c'.*") "")
|
||||
((".*'elements/glimagesink\\.c'.*") "")
|
||||
((".*'pipelines/gl-launch-lines\\.c'.*") "")
|
||||
((".*'elements/glstereo\\.c'.*") "")
|
||||
((".*'elements/glmixer\\.c'.*") ""))))
|
||||
(else
|
||||
#~()))))
|
||||
(add-before 'configure 'patch
|
||||
(lambda _
|
||||
(substitute* "tests/check/libs/pbutils.c"
|
||||
(("/bin/sh") (which "sh")))))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
;; Tests require a running X server.
|
||||
(system "Xvfb :1 +extension GLX &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
;; Tests write to $HOME.
|
||||
(setenv "HOME" (getcwd))
|
||||
;; Tests look for $XDG_RUNTIME_DIR.
|
||||
(setenv "XDG_RUNTIME_DIR" (getcwd))
|
||||
;; For missing '/etc/machine-id'.
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0"))))))
|
||||
(home-page "https://gstreamer.freedesktop.org/")
|
||||
(synopsis
|
||||
"Plugins for the GStreamer multimedia library")
|
||||
|
@ -629,7 +634,7 @@ for the GStreamer multimedia library.")
|
|||
(define-public gst-plugins-good
|
||||
(package
|
||||
(name "gst-plugins-good")
|
||||
(version "1.18.5")
|
||||
(version "1.20.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -637,74 +642,87 @@ for the GStreamer multimedia library.")
|
|||
(string-append
|
||||
"https://gstreamer.freedesktop.org/src/" name "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(patches (search-patches "gst-plugins-good-fix-test.patch"))
|
||||
(sha256
|
||||
(base32 "0svrapawych2s3lm4lx3x023zxq5kcx50jnfmh0qigszfskyxbis"))))
|
||||
(base32 "1dv8b2md1xk6d45ir1wzbvqhxbvm6mxv881rjl0brnjwpw3c5wzq"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
,@%common-gstreamer-phases
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
;; Tests require a running X server.
|
||||
(system "Xvfb :1 +extension GLX &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
;; Tests write to $HOME.
|
||||
(setenv "HOME" (getcwd))
|
||||
;; Tests look for $XDG_RUNTIME_DIR.
|
||||
(setenv "XDG_RUNTIME_DIR" (getcwd))
|
||||
;; For missing '/etc/machine-id'.
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0")
|
||||
#t)))))
|
||||
(list
|
||||
#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
#$@%common-gstreamer-phases
|
||||
(add-after 'unpack 'absolutize-libsoup-library
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(define libsoup
|
||||
(search-input-file inputs "lib/libsoup-3.0.so"))
|
||||
|
||||
(substitute* "ext/soup/gstsouploader.c"
|
||||
(("(#define LIBSOUP_3_SONAME ).+$" _ prefix)
|
||||
(string-append prefix "\"" libsoup "\"\n")))))
|
||||
(add-after 'unpack 'skip-failing-tests
|
||||
(lambda _
|
||||
(substitute* "tests/check/meson.build"
|
||||
;; Reported as shaky upstream, see
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/785>
|
||||
(("\\[ 'elements/flvmux' \\]") "[ 'elements/flvmux', true ]"))))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
;; Tests require a running X server.
|
||||
(system "Xvfb :1 +extension GLX &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
;; Tests write to $HOME.
|
||||
(setenv "HOME" (getcwd))
|
||||
;; Tests look for $XDG_RUNTIME_DIR.
|
||||
(setenv "XDG_RUNTIME_DIR" (getcwd))
|
||||
;; For missing '/etc/machine-id'.
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0"))))))
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
("glib:bin" ,glib "bin")
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
||||
("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python-wrapper" ,python-wrapper)
|
||||
("xmllint" ,libxml2)
|
||||
("xorg-server" ,xorg-server-for-tests)))
|
||||
(list gettext-minimal
|
||||
`(,glib "bin")
|
||||
gobject-introspection
|
||||
gsettings-desktop-schemas
|
||||
libxml2
|
||||
perl
|
||||
pkg-config
|
||||
python-wrapper
|
||||
xorg-server-for-tests))
|
||||
(inputs
|
||||
`(("aalib" ,aalib)
|
||||
("bzip2" ,bzip2)
|
||||
("cairo" ,cairo)
|
||||
("flac" ,flac)
|
||||
("librsvg" ,(librsvg-for-system))
|
||||
("glib" ,glib)
|
||||
("glib-networking" ,glib-networking)
|
||||
("glu" ,glu)
|
||||
("gtk+" ,gtk+)
|
||||
("jack" ,jack-2)
|
||||
("lame" ,lame)
|
||||
("libavc1394" ,libavc1394)
|
||||
("libcaca" ,libcaca)
|
||||
("libdv" ,libdv)
|
||||
("libgudev" ,libgudev)
|
||||
("libiec61883" ,libiec61883)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libshout" ,libshout)
|
||||
("libsoup" ,libsoup)
|
||||
("libvpx" ,libvpx)
|
||||
("libx11" ,libx11)
|
||||
("libxdamage" ,libxdamage)
|
||||
("libxfixes" ,libxfixes)
|
||||
("libxext" ,libxext)
|
||||
("libxshm" ,libxshmfence)
|
||||
("mesa" ,mesa)
|
||||
("mpg123" ,mpg123)
|
||||
("orc" ,orc)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
("speex" ,speex)
|
||||
("taglib" ,taglib)
|
||||
("twolame" ,twolame)
|
||||
("v4l-utils" ,v4l-utils)
|
||||
("wavpack" ,wavpack)
|
||||
("zlib" ,zlib)))
|
||||
(list aalib
|
||||
bzip2
|
||||
cairo
|
||||
flac
|
||||
(librsvg-for-system)
|
||||
glib
|
||||
glib-networking
|
||||
glu
|
||||
gtk+
|
||||
jack-2
|
||||
lame
|
||||
libavc1394
|
||||
libcaca
|
||||
libdv
|
||||
libgudev
|
||||
libiec61883
|
||||
libjpeg-turbo
|
||||
libpng
|
||||
libshout
|
||||
libsoup
|
||||
libvpx
|
||||
libx11
|
||||
libxdamage
|
||||
libxfixes
|
||||
libxext
|
||||
libxshmfence
|
||||
mesa
|
||||
mpg123
|
||||
orc
|
||||
pulseaudio
|
||||
speex
|
||||
taglib
|
||||
twolame
|
||||
v4l-utils
|
||||
wavpack
|
||||
zlib))
|
||||
(propagated-inputs
|
||||
(list gstreamer gst-plugins-base))
|
||||
(synopsis "GStreamer plugins and helper libraries")
|
||||
|
@ -719,14 +737,14 @@ model to base your own plug-in on, here it is.")
|
|||
(define-public gst-plugins-bad
|
||||
(package
|
||||
(name "gst-plugins-bad")
|
||||
(version "1.18.5")
|
||||
(version "1.20.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://gstreamer.freedesktop.org/src/"
|
||||
name "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"13k7mm2wmsbhd04a20v9lj4afpf0w33ambpwlrw8bl7hjhxr4r51"))
|
||||
"0kys6m5hg5bc30wfg8qa3s7dmkdz3kj1j8lhvn3267fxalxw24bs"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -734,179 +752,177 @@ model to base your own plug-in on, here it is.")
|
|||
(delete-file-recursively "ext/sctp/usrsctp")))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-Dsctp-internal-usrsctp=disabled")
|
||||
#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
,@%common-gstreamer-phases
|
||||
,@(if (string-prefix? "arm" (or (%current-target-system)
|
||||
(%current-system)))
|
||||
;; Disable test that fails on ARMv7.
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/1188
|
||||
`((add-after 'unpack 'disable-asfmux-test
|
||||
(lambda _
|
||||
(substitute* "tests/check/meson.build"
|
||||
(("\\[\\['elements/asfmux\\.c'\\]\\],")
|
||||
"")))))
|
||||
'())
|
||||
(add-after 'unpack 'adjust-tests
|
||||
(lambda* (#:key native-inputs inputs #:allow-other-keys)
|
||||
(let ((gst-plugins-good (assoc-ref (or native-inputs inputs)
|
||||
"gst-plugins-good")))
|
||||
(substitute* "tests/check/meson.build"
|
||||
;; Make gst-plugin-good available for tests, see
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1426
|
||||
(("'GST_PLUGIN_SYSTEM_PATH_1_0', ''")
|
||||
(string-append "'GST_PLUGIN_SYSTEM_PATH_1_0', '"
|
||||
gst-plugins-good "/lib/gstreamer-1.0'"))
|
||||
(list
|
||||
#:configure-flags #~(list "-Dsctp-internal-usrsctp=disabled")
|
||||
#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
#$@%common-gstreamer-phases
|
||||
#$@(if (string-prefix? "arm" (or (%current-target-system)
|
||||
(%current-system)))
|
||||
;; Disable test that fails on ARMv7.
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/1188
|
||||
`((add-after 'unpack 'disable-asfmux-test
|
||||
(lambda _
|
||||
(substitute* "tests/check/meson.build"
|
||||
(("\\[\\['elements/asfmux\\.c'\\]\\],")
|
||||
"")))))
|
||||
'())
|
||||
(add-after 'unpack 'adjust-tests
|
||||
(lambda* (#:key native-inputs inputs #:allow-other-keys)
|
||||
(let ((gst-plugins-good (assoc-ref (or native-inputs inputs)
|
||||
"gst-plugins-good")))
|
||||
(substitute* "tests/check/meson.build"
|
||||
;; Make gst-plugin-good available for tests, see
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1426
|
||||
(("'GST_PLUGIN_SYSTEM_PATH_1_0', ''")
|
||||
(string-append "'GST_PLUGIN_SYSTEM_PATH_1_0', '"
|
||||
gst-plugins-good "/lib/gstreamer-1.0'"))
|
||||
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1136
|
||||
((".*elements/msdkh264enc\\.c.*") "")
|
||||
((".*elements/svthevcenc\\.c.*") "")
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1136
|
||||
((".*elements/msdkh264enc\\.c.*") "")
|
||||
((".*elements/svthevcenc\\.c.*") "")
|
||||
|
||||
;; The 'elements_shm.test_shm_live' test sometimes times out
|
||||
;; (see:
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790).
|
||||
((".*'elements/shm\\.c'.*") "")
|
||||
;; The 'elements_shm.test_shm_live' test sometimes times out
|
||||
;; (see:
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790).
|
||||
((".*'elements/shm\\.c'.*") "")
|
||||
|
||||
;; FIXME: Why is this failing.
|
||||
((".*elements/dash_mpd\\.c.*") "")
|
||||
;; FIXME: Why is this failing.
|
||||
((".*elements/dash_mpd\\.c.*") "")
|
||||
|
||||
;; These tests are flaky and occasionally time out:
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/932
|
||||
((".*elements/curlhttpsrc\\.c.*") "")
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412
|
||||
((".*elements/dtls\\.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.
|
||||
(system "Xvfb :1 +extension GLX &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
;; Tests write to $HOME.
|
||||
(setenv "HOME" (getcwd))
|
||||
;; Tests look for $XDG_RUNTIME_DIR.
|
||||
(setenv "XDG_RUNTIME_DIR" (getcwd))
|
||||
;; For missing '/etc/machine-id'.
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0"))))))
|
||||
;; These tests are flaky and occasionally time out:
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/932
|
||||
((".*elements/curlhttpsrc\\.c.*") "")
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412
|
||||
((".*elements/dtls\\.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.
|
||||
(system "Xvfb :1 +extension GLX &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
;; Tests write to $HOME.
|
||||
(setenv "HOME" (getcwd))
|
||||
;; Tests look for $XDG_RUNTIME_DIR.
|
||||
(setenv "XDG_RUNTIME_DIR" (getcwd))
|
||||
;; For missing '/etc/machine-id'.
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0"))))))
|
||||
(propagated-inputs
|
||||
(list gstreamer gst-plugins-base))
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
||||
("gst-plugins-good" ,gst-plugins-good) ;for tests
|
||||
("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python-wrapper)
|
||||
("xorg-server" ,xorg-server-for-tests)))
|
||||
(list gettext-minimal
|
||||
`(,glib "bin") ; for glib-mkenums, etc.
|
||||
gobject-introspection
|
||||
gsettings-desktop-schemas
|
||||
gst-plugins-good ;for tests
|
||||
perl
|
||||
pkg-config
|
||||
python-wrapper
|
||||
xorg-server-for-tests))
|
||||
(inputs
|
||||
`(("bluez" ,bluez)
|
||||
("bzip2" ,bzip2)
|
||||
("cairo" ,cairo)
|
||||
;; ("ccextractor" ,ccextractor)
|
||||
("chromaprint" ,chromaprint)
|
||||
("curl" ,curl)
|
||||
("directfb" ,directfb)
|
||||
;;("dssim" ,dssim)
|
||||
("faac" ,faac)
|
||||
("faad2" ,faad2)
|
||||
("flite" ,flite)
|
||||
("fluidsynth" ,fluidsynth)
|
||||
("glib" ,glib)
|
||||
("glib-networking" ,glib-networking)
|
||||
("glu" ,glu)
|
||||
("gsm" ,gsm)
|
||||
("gtk+" ,gtk+)
|
||||
("iqa" ,iqa)
|
||||
("ladspa" ,ladspa)
|
||||
("lcms" ,lcms)
|
||||
("libaom" ,libaom)
|
||||
("libass" ,libass)
|
||||
("libbs2b" ,libbs2b)
|
||||
("libdc1394" ,libdc1394)
|
||||
("libdca" ,libdca)
|
||||
("libde265" ,libde265)
|
||||
("libdrm" ,libdrm)
|
||||
("libdvdnav" ,libdvdnav)
|
||||
("libdvdread" ,libdvdread)
|
||||
("libexif" ,libexif)
|
||||
("libfdk" ,libfdk)
|
||||
("libgcrypt" ,libgcrypt)
|
||||
("libgme" ,libgme)
|
||||
("libgudev" ,libgudev)
|
||||
("libkate" ,libkate)
|
||||
,@(if (target-x86?)
|
||||
`(("libmfx" ,mediasdk))
|
||||
'())
|
||||
("libmms" ,libmms)
|
||||
("libmodplug" ,libmodplug)
|
||||
("libmpcdec" ,libmpcdec)
|
||||
("libnice" ,libnice)
|
||||
("libofa" ,libofa)
|
||||
("libopenmpt" ,libopenmpt)
|
||||
("librsvg" ,(librsvg-for-system))
|
||||
("libsndfile" ,libsndfile)
|
||||
("libsrtp" ,libsrtp)
|
||||
("libssh2" ,libssh2)
|
||||
("libtiff" ,libtiff)
|
||||
("libusb" ,libusb)
|
||||
("libva" ,libva)
|
||||
("libvdpau" ,libvdpau)
|
||||
("libwebp" ,libwebp)
|
||||
("libx11" ,libx11)
|
||||
("libxcb" ,libxcb)
|
||||
("libxext" ,libxext)
|
||||
("libxkbcommon" ,libxkbcommon)
|
||||
("libxml2" ,libxml2)
|
||||
("libxshm" ,libxshmfence)
|
||||
("lilv" ,lilv)
|
||||
("lrdf" ,lrdf)
|
||||
("lv2" ,lv2)
|
||||
("mesa" ,mesa)
|
||||
("mjpegtools" ,mjpegtools)
|
||||
("neon" ,neon)
|
||||
("nettle" ,nettle)
|
||||
("openal" ,openal)
|
||||
;; ("opencv" ,opencv)
|
||||
("openexr" ,openexr)
|
||||
("openh264" ,openh264)
|
||||
("openjpeg" ,openjpeg)
|
||||
;; ("openni2" ,openni2)
|
||||
("opensles" ,opensles)
|
||||
("openssl" ,openssl)
|
||||
("opus" ,opus)
|
||||
("orc" ,orc)
|
||||
("pango" ,pango)
|
||||
("rtmp" ,rtmpdump)
|
||||
("sbc" ,sbc)
|
||||
("sctp" ,lksctp-tools)
|
||||
("soundtouch" ,soundtouch)
|
||||
("spandsp" ,spandsp)
|
||||
("srt" ,srt)
|
||||
,@(if (target-x86-64?)
|
||||
`(("svthevcenc" ,svt-hevc))
|
||||
'())
|
||||
("tinyalsa" ,tinyalsa)
|
||||
("transcode" ,transcode)
|
||||
("usrsctp" ,usrsctp)
|
||||
("v4l" ,v4l-utils)
|
||||
("voaacenc" ,vo-aacenc)
|
||||
("voamrwbenc" ,vo-amrwbenc)
|
||||
("vulkan-headers" ,vulkan-headers)
|
||||
("vulkan-loader" ,vulkan-loader)
|
||||
("x265" ,x265)
|
||||
("wayland" ,wayland)
|
||||
("webrtcdsp" ,webrtc-audio-processing)
|
||||
("wildmidi" ,wildmidi)
|
||||
("wpebackend-fdo" ,wpebackend-fdo)
|
||||
("zbar" ,zbar)
|
||||
("zxing" ,zxing-cpp-1.2)))
|
||||
(append
|
||||
(if (target-x86?) (list mediasdk) '())
|
||||
(if (target-x86-64?) (list svt-hevc) '())
|
||||
(list bluez
|
||||
bzip2
|
||||
cairo
|
||||
;; ccextractor
|
||||
chromaprint
|
||||
curl
|
||||
directfb
|
||||
;; dssim
|
||||
faac
|
||||
faad2
|
||||
flite
|
||||
fluidsynth
|
||||
glib
|
||||
glib-networking
|
||||
glu
|
||||
gsm
|
||||
gtk+
|
||||
iqa
|
||||
ladspa
|
||||
lcms
|
||||
libaom
|
||||
libass
|
||||
libbs2b
|
||||
libdc1394
|
||||
libdca
|
||||
libde265
|
||||
libdrm
|
||||
libdvdnav
|
||||
libdvdread
|
||||
libexif
|
||||
libfdk
|
||||
libgcrypt
|
||||
libgme
|
||||
libgudev
|
||||
libkate
|
||||
libmms
|
||||
libmodplug
|
||||
libmpcdec
|
||||
libnice
|
||||
libofa
|
||||
libopenmpt
|
||||
(librsvg-for-system)
|
||||
libsndfile
|
||||
libsrtp
|
||||
libssh2
|
||||
libtiff
|
||||
libusb
|
||||
libva
|
||||
libvdpau
|
||||
libwebp
|
||||
libx11
|
||||
libxcb
|
||||
libxext
|
||||
libxkbcommon
|
||||
libxml2
|
||||
libxshmfence
|
||||
lilv
|
||||
lrdf
|
||||
lv2
|
||||
mesa
|
||||
mjpegtools
|
||||
neon
|
||||
nettle
|
||||
openal
|
||||
;; opencv
|
||||
openexr
|
||||
openh264
|
||||
openjpeg
|
||||
;; openni2
|
||||
opensles
|
||||
openssl-1.1
|
||||
opus
|
||||
orc
|
||||
pango
|
||||
rtmpdump
|
||||
sbc
|
||||
lksctp-tools
|
||||
soundtouch
|
||||
spandsp
|
||||
srt
|
||||
tinyalsa
|
||||
transcode
|
||||
usrsctp
|
||||
v4l-utils
|
||||
vo-aacenc
|
||||
vo-amrwbenc
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
x265
|
||||
wayland
|
||||
webrtc-audio-processing
|
||||
wildmidi
|
||||
wpebackend-fdo
|
||||
zbar
|
||||
zxing-cpp-1.2)))
|
||||
(home-page "https://gstreamer.freedesktop.org/")
|
||||
(synopsis "Plugins for the GStreamer multimedia library")
|
||||
(description
|
||||
|
@ -917,7 +933,7 @@ par compared to the rest.")
|
|||
(define-public gst-plugins-ugly
|
||||
(package
|
||||
(name "gst-plugins-ugly")
|
||||
(version "1.18.5")
|
||||
(version "1.20.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -925,33 +941,33 @@ par compared to the rest.")
|
|||
(string-append "https://gstreamer.freedesktop.org/src/"
|
||||
name "/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1nb6kz3gbn8r0sld6xkm16qpgyb2bvhafb7sff9rgagqk0z80cnz"))))
|
||||
(base32 "1zdfsq0zm1d3wj3w3z44bf3v28clr8yd6qzmkjs09hq9k9w21alc"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
,@%common-gstreamer-phases
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
;; Tests require a running X server.
|
||||
(system "Xvfb :1 +extension GLX &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
;; Tests write to $HOME.
|
||||
(setenv "HOME" (getcwd))
|
||||
;; Tests look for $XDG_RUNTIME_DIR.
|
||||
(setenv "XDG_RUNTIME_DIR" (getcwd))
|
||||
;; For missing '/etc/machine-id'.
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0"))))))
|
||||
(list #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
#$@%common-gstreamer-phases
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
;; Tests require a running X server.
|
||||
(system "Xvfb :1 +extension GLX &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
;; Tests write to $HOME.
|
||||
(setenv "HOME" (getcwd))
|
||||
;; Tests look for $XDG_RUNTIME_DIR.
|
||||
(setenv "XDG_RUNTIME_DIR" (getcwd))
|
||||
;; For missing '/etc/machine-id'.
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0"))))))
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
("glib:bin" ,glib "bin")
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
||||
("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python-wrapper" ,python-wrapper)
|
||||
("xorg-server" ,xorg-server-for-tests)))
|
||||
(list gettext-minimal
|
||||
`(,glib "bin")
|
||||
gobject-introspection
|
||||
gsettings-desktop-schemas
|
||||
perl
|
||||
pkg-config
|
||||
python-wrapper
|
||||
xorg-server-for-tests))
|
||||
(inputs
|
||||
(list glib
|
||||
glib-networking
|
||||
|
@ -974,7 +990,7 @@ think twice about shipping them.")
|
|||
(define-public gst-libav
|
||||
(package
|
||||
(name "gst-libav")
|
||||
(version "1.18.5")
|
||||
(version "1.20.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -983,7 +999,7 @@ think twice about shipping them.")
|
|||
"https://gstreamer.freedesktop.org/src/" name "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0j55jgk9sbhinfx2gsg21q609x6yzrixrn5xxlxd378fj6500bl2"))))
|
||||
(base32 "1zkxybdzdkn07wwmj0rrgxyvbry472dggjv2chdsmpzwc02x3v9z"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
(list perl pkg-config python-wrapper ruby))
|
||||
|
@ -1000,7 +1016,7 @@ decoders, muxers, and demuxers provided by FFmpeg.")
|
|||
(define-public gst-editing-services
|
||||
(package
|
||||
(name "gst-editing-services")
|
||||
(version "1.18.5")
|
||||
(version "1.20.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -1008,27 +1024,27 @@ decoders, muxers, and demuxers provided by FFmpeg.")
|
|||
"gst-editing-services-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1x8db4021qv4ypq1g6n5q2awrb7glr4xp1h650c3w7q59lwsix4a"))))
|
||||
"18msiadg6wi1636ylp02yfiwphxlz39gh3vbxchl9qpvd7g9dn2z"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
;; FIXME: 16/22 failing tests.
|
||||
`(#:tests? #f
|
||||
#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
|
||||
#:phases (modify-phases %standard-phases
|
||||
,@%common-gstreamer-phases)))
|
||||
(list
|
||||
#:tests? #f ; FIXME: 16/23 failing tests.
|
||||
#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
#$@%common-gstreamer-phases)))
|
||||
(propagated-inputs
|
||||
(list gstreamer gst-plugins-base))
|
||||
(inputs
|
||||
(list glib glib-networking gtk+ libxml2))
|
||||
(native-inputs
|
||||
`(("flex" ,flex)
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
("glib:bin" ,glib "bin")
|
||||
("gst-plugins-bad" ,gst-plugins-bad)
|
||||
("gst-plugins-good" ,gst-plugins-good)
|
||||
("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python-wrapper)))
|
||||
(list flex
|
||||
gobject-introspection
|
||||
`(,glib "bin")
|
||||
gst-plugins-bad
|
||||
gst-plugins-good
|
||||
perl
|
||||
pkg-config
|
||||
python-wrapper))
|
||||
(home-page "https://gstreamer.freedesktop.org/")
|
||||
(synopsis "GStreamer library for non-linear editors")
|
||||
(description
|
||||
|
@ -1043,25 +1059,32 @@ given, also pass them to the build system instead of the ones used by PKG."
|
|||
(package/inherit pkg
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments pkg)
|
||||
((#:configure-flags flags `(,@(or configure-flags '())))
|
||||
`(append
|
||||
((#:configure-flags flags #~'())
|
||||
#~(append
|
||||
(list
|
||||
,@(map (lambda (plugin)
|
||||
(string-append "-D" plugin "=enabled"))
|
||||
plugins))
|
||||
(list ,@(or configure-flags flags))))
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'unpack 'disable-auto-plugins
|
||||
(lambda _
|
||||
(substitute* "meson_options.txt"
|
||||
(("'auto'") "'disabled'"))
|
||||
#t)))))))))
|
||||
#$@(map (lambda (plugin)
|
||||
(string-append "-D" plugin "=enabled"))
|
||||
plugins))
|
||||
#$(or configure-flags flags)))
|
||||
((#:phases phases)
|
||||
#~(modify-phases #$phases
|
||||
(add-after 'unpack 'disable-auto-plugins
|
||||
(lambda _
|
||||
(substitute* "meson_options.txt"
|
||||
(("'auto'") "'disabled'")))))))))))
|
||||
|
||||
(define-public gst-plugins-bad-minimal
|
||||
(package
|
||||
(inherit (gst-plugins/selection gst-plugins-bad #:plugins '()))
|
||||
(name "gst-plugins-bad-minimal")
|
||||
(description "This package provides the smallest selection of GStreamer's
|
||||
\"bad\" plugin set, essentially containing libraries and the gst-transcoder
|
||||
binary, but none of the actual plugins.")))
|
||||
|
||||
(define-public python-gst
|
||||
(package
|
||||
(name "python-gst")
|
||||
(version "1.18.5")
|
||||
(version "1.20.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -1069,18 +1092,19 @@ given, also pass them to the build system instead of the ones used by PKG."
|
|||
"gst-python-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0lmwwmr3wm56qlrdrb0d5cpmqxkcmarz61wmp1nrv5852f3qadjk"))))
|
||||
"1p6g05k88nbbv5x9madsvphxcdkfl1z0lmp39p6bhmg9x8h82d6v"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build meson-build-system)
|
||||
(list
|
||||
#:modules `((guix build meson-build-system)
|
||||
(guix build utils)
|
||||
((guix build python-build-system) #:prefix python:))
|
||||
#:imported-modules (,@%meson-build-system-modules
|
||||
#:imported-modules `(,@%meson-build-system-modules
|
||||
(guix build python-build-system))
|
||||
#:configure-flags
|
||||
(list (string-append
|
||||
"-Dpygi-overrides-dir="
|
||||
(python:site-packages %build-inputs %outputs) "/gi/overrides"))))
|
||||
#:configure-flags
|
||||
#~(list (string-append
|
||||
"-Dpygi-overrides-dir="
|
||||
(python:site-packages %build-inputs %outputs) "/gi/overrides"))))
|
||||
(native-inputs
|
||||
(list pkg-config python))
|
||||
(propagated-inputs
|
||||
|
@ -1090,7 +1114,8 @@ given, also pass them to the build system instead of the ones used by PKG."
|
|||
(description
|
||||
"This package contains GObject Introspection overrides for Python that can
|
||||
be used by Python applications using GStreamer.")
|
||||
(license license:lgpl2.1+)))
|
||||
(license license:lgpl2.1+)
|
||||
(properties `((upstream-name . "gst-python")))))
|
||||
|
||||
(define-public gst123
|
||||
(package
|
||||
|
|
|
@ -1342,8 +1342,8 @@ application suites.")
|
|||
(list cairo
|
||||
fontconfig
|
||||
(if (target-x86-64?)
|
||||
librsvg-bootstrap
|
||||
librsvg-2.40)
|
||||
librsvg-bootstrap
|
||||
librsvg-2.40)
|
||||
glib
|
||||
graphene
|
||||
libepoxy
|
||||
|
@ -2285,13 +2285,13 @@ information.")
|
|||
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))))
|
||||
(find-files (string-append out "/bin")))))))))
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
("glib:bin" ,glib "bin")
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
("itstool" ,itstool)
|
||||
("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python-wrapper" ,python-wrapper)))
|
||||
(list gettext-minimal
|
||||
`(,glib "bin")
|
||||
gobject-introspection
|
||||
itstool
|
||||
perl
|
||||
pkg-config
|
||||
python-wrapper))
|
||||
(inputs
|
||||
(list bc
|
||||
dblatex
|
||||
|
@ -2305,7 +2305,6 @@ information.")
|
|||
python-lxml
|
||||
python-parameterized
|
||||
python-pygments
|
||||
python-unittest2
|
||||
source-highlight
|
||||
yelp-tools))
|
||||
(home-page "https://wiki.gnome.org/DocumentationProject/GtkDoc")
|
||||
|
@ -2330,8 +2329,8 @@ with some extra work.")
|
|||
(define-public gtk-doc/stable
|
||||
(hidden-package
|
||||
(package/inherit gtk-doc
|
||||
(inputs (alist-replace "dblatex" `(,dblatex/stable)
|
||||
(package-inputs gtk-doc))))))
|
||||
(inputs (modify-inputs (package-inputs gtk-doc)
|
||||
(replace "dblatex" dblatex/stable))))))
|
||||
|
||||
(define-public gtk-engines
|
||||
(package
|
||||
|
|
|
@ -618,6 +618,21 @@ Unix-style DSV format and RFC 4180 format.")
|
|||
(search-patches "guile-fibers-wait-for-io-readiness.patch"
|
||||
"guile-fibers-epoll-instance-is-dead.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:make-flags
|
||||
#~(list "GUILE_AUTO_COMPILE=0")
|
||||
#:phases
|
||||
(if (target-x86-64?)
|
||||
#~%standard-phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'check 'disable-some-tests
|
||||
(lambda _
|
||||
;; This test can take more than an hour on some systems.
|
||||
(substitute* "tests/basic.scm"
|
||||
((".*spawn-fiber loop-to-1e4.*") ""))
|
||||
;; These tests can take more than an hour and/or segfault.
|
||||
(substitute* "Makefile"
|
||||
(("tests/speedup.scm") ""))))))))
|
||||
(native-inputs
|
||||
(list texinfo pkg-config autoconf automake libtool
|
||||
guile-3.0 ;for 'guild compile
|
||||
|
|
|
@ -408,7 +408,7 @@ libraries are included in this package.")
|
|||
(define-public ghc-7
|
||||
(package
|
||||
(name "ghc")
|
||||
(version "7.10.2")
|
||||
(version "7.10.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -416,7 +416,7 @@ libraries are included in this package.")
|
|||
version "/" name "-" version "-src.tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal"))))
|
||||
"1vsgmic8csczl62ciz51iv8nhrkm72lyhbz7p7id13y2w7fcx46g"))))
|
||||
(build-system gnu-build-system)
|
||||
(supported-systems '("i686-linux" "x86_64-linux"))
|
||||
(outputs '("out" "doc"))
|
||||
|
@ -432,7 +432,7 @@ libraries are included in this package.")
|
|||
version "/" name "-" version "-testsuite.tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qp9da9ar87zbyn6wjgacd2ic1vgzbi3cklxnhsmjqyafv9qaj4b"))))))
|
||||
"0fk4xjw1x5lk2ifvgqij06lrbf1vxq9qfix86h9r16c0bilm3hah"))))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("python" ,python-2) ; for tests (fails with python-3)
|
||||
|
@ -444,7 +444,8 @@ libraries are included in this package.")
|
|||
ghc-bootstrap-x86_64-7.8.4
|
||||
ghc-bootstrap-i686-7.8.4))))
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
(list
|
||||
#:test-target "test"
|
||||
;; We get a smaller number of test failures by disabling parallel test
|
||||
;; execution.
|
||||
#:parallel-tests? #f
|
||||
|
@ -454,117 +455,108 @@ libraries are included in this package.")
|
|||
;; then complains that they don't match.
|
||||
#:build #f
|
||||
|
||||
#:modules ((guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
(srfi srfi-26)
|
||||
(srfi srfi-1))
|
||||
#:modules '((guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
(srfi srfi-26)
|
||||
(srfi srfi-1))
|
||||
#:configure-flags
|
||||
(list
|
||||
(string-append "--with-gmp-libraries="
|
||||
(assoc-ref %build-inputs "gmp") "/lib")
|
||||
(string-append "--with-gmp-includes="
|
||||
(assoc-ref %build-inputs "gmp") "/include")
|
||||
"--with-system-libffi"
|
||||
(string-append "--with-ffi-libraries="
|
||||
(assoc-ref %build-inputs "libffi") "/lib")
|
||||
(string-append "--with-ffi-includes="
|
||||
(assoc-ref %build-inputs "libffi") "/include"))
|
||||
#~(list
|
||||
(string-append "--with-gmp-libraries="
|
||||
(assoc-ref %build-inputs "gmp") "/lib")
|
||||
(string-append "--with-gmp-includes="
|
||||
(assoc-ref %build-inputs "gmp") "/include")
|
||||
"--with-system-libffi"
|
||||
(string-append "--with-ffi-libraries="
|
||||
(assoc-ref %build-inputs "libffi") "/lib")
|
||||
(string-append "--with-ffi-includes="
|
||||
(assoc-ref %build-inputs "libffi") "/include"))
|
||||
;; FIXME: The user-guide needs dblatex, docbook-xsl and docbook-utils.
|
||||
;; Currently we do not have the last one.
|
||||
;; #:make-flags
|
||||
;; (list "BUILD_DOCBOOK_HTML = YES")
|
||||
#:phases
|
||||
(let* ((ghc-bootstrap-path
|
||||
(string-append (getcwd) "/" ,name "-" ,version "/ghc-bin"))
|
||||
(ghc-bootstrap-prefix
|
||||
(string-append ghc-bootstrap-path "/usr" )))
|
||||
(alist-cons-after
|
||||
'unpack-bin 'unpack-testsuite-and-fix-bins
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(with-directory-excursion ".."
|
||||
(copy-file (assoc-ref inputs "ghc-testsuite")
|
||||
"ghc-testsuite.tar.xz")
|
||||
(invoke "tar" "xvf" "ghc-testsuite.tar.xz"))
|
||||
(substitute*
|
||||
(list "testsuite/timeout/Makefile"
|
||||
"testsuite/timeout/timeout.py"
|
||||
"testsuite/timeout/timeout.hs"
|
||||
"testsuite/tests/rename/prog006/Setup.lhs"
|
||||
"testsuite/tests/programs/life_space_leak/life.test"
|
||||
"libraries/process/System/Process/Internals.hs"
|
||||
"libraries/unix/cbits/execvpe.c")
|
||||
(("/bin/sh") (which "sh"))
|
||||
(("/bin/rm") "rm"))
|
||||
#t)
|
||||
(alist-cons-after
|
||||
'unpack 'unpack-bin
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(mkdir-p ghc-bootstrap-prefix)
|
||||
(with-directory-excursion ghc-bootstrap-path
|
||||
(copy-file (assoc-ref inputs "ghc-binary")
|
||||
"ghc-bin.tar.xz")
|
||||
(invoke "tar" "xvf" "ghc-bin.tar.xz")))
|
||||
(alist-cons-before
|
||||
'install-bin 'configure-bin
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((binaries
|
||||
(list
|
||||
"./utils/ghc-pwd/dist-install/build/tmp/ghc-pwd"
|
||||
"./utils/hpc/dist-install/build/tmp/hpc"
|
||||
"./utils/haddock/dist/build/tmp/haddock"
|
||||
"./utils/hsc2hs/dist-install/build/tmp/hsc2hs"
|
||||
"./utils/runghc/dist-install/build/tmp/runghc"
|
||||
"./utils/ghc-cabal/dist-install/build/tmp/ghc-cabal"
|
||||
"./utils/hp2ps/dist/build/tmp/hp2ps"
|
||||
"./utils/ghc-pkg/dist-install/build/tmp/ghc-pkg"
|
||||
"./utils/unlit/dist/build/tmp/unlit"
|
||||
"./ghc/stage2/build/tmp/ghc-stage2"))
|
||||
(gmp (assoc-ref inputs "gmp"))
|
||||
(gmp-lib (string-append gmp "/lib"))
|
||||
(gmp-include (string-append gmp "/include"))
|
||||
(ncurses-lib
|
||||
(dirname (search-input-file inputs "/lib/libncurses.so")))
|
||||
(ld-so (search-input-file inputs ,(glibc-dynamic-linker)))
|
||||
(libtinfo-dir
|
||||
(string-append ghc-bootstrap-prefix
|
||||
"/lib/ghc-7.8.4/terminfo-0.4.0.0")))
|
||||
(with-directory-excursion
|
||||
(string-append ghc-bootstrap-path "/ghc-7.8.4")
|
||||
(setenv "CONFIG_SHELL" (which "bash"))
|
||||
(setenv "LD_LIBRARY_PATH" gmp-lib)
|
||||
;; The binaries have "/lib64/ld-linux-x86-64.so.2" hardcoded.
|
||||
(for-each
|
||||
(cut invoke "patchelf" "--set-interpreter" ld-so <>)
|
||||
binaries)
|
||||
;; The binaries include a reference to libtinfo.so.5 which
|
||||
;; is a subset of libncurses.so.5. We create a symlink in a
|
||||
;; directory included in the bootstrap binaries rpath.
|
||||
(mkdir-p libtinfo-dir)
|
||||
(symlink
|
||||
(string-append ncurses-lib "/libncursesw.so."
|
||||
;; Extract "6.0" from "6.0-20170930" if a
|
||||
;; dash-separated version tag exists.
|
||||
,(let* ((v (package-version ncurses))
|
||||
(d (or (string-index v #\-)
|
||||
(string-length v))))
|
||||
(version-major+minor (string-take v d))))
|
||||
(string-append libtinfo-dir "/libtinfo.so.5"))
|
||||
|
||||
(setenv "PATH"
|
||||
(string-append (getenv "PATH") ":"
|
||||
ghc-bootstrap-prefix "/bin"))
|
||||
(invoke
|
||||
(string-append (getcwd) "/configure")
|
||||
(string-append "--prefix=" ghc-bootstrap-prefix)
|
||||
(string-append "--with-gmp-libraries=" gmp-lib)
|
||||
(string-append "--with-gmp-includes=" gmp-include)))))
|
||||
(alist-cons-before
|
||||
'configure 'install-bin
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(with-directory-excursion
|
||||
#~(let* ((ghc-bootstrap-path
|
||||
(string-append (getcwd) "/" #$name "-" #$version "/ghc-bin"))
|
||||
(ghc-bootstrap-prefix
|
||||
(string-append ghc-bootstrap-path "/usr" )))
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'unpack-bin
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(mkdir-p ghc-bootstrap-prefix)
|
||||
(with-directory-excursion ghc-bootstrap-path
|
||||
(invoke "tar" "xvf" (assoc-ref inputs "ghc-binary")))))
|
||||
(add-after 'unpack-bin 'unpack-testsuite-and-fix-bins
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(with-directory-excursion ".."
|
||||
(invoke "tar" "xvf" (assoc-ref inputs "ghc-testsuite")))
|
||||
(substitute*
|
||||
(list "testsuite/timeout/Makefile"
|
||||
"testsuite/timeout/timeout.py"
|
||||
"testsuite/timeout/timeout.hs"
|
||||
"testsuite/tests/rename/prog006/Setup.lhs"
|
||||
"testsuite/tests/programs/life_space_leak/life.test"
|
||||
"libraries/process/System/Process/Internals.hs"
|
||||
"libraries/unix/cbits/execvpe.c")
|
||||
(("/bin/sh") (search-input-file inputs "/bin/sh"))
|
||||
(("/bin/rm") "rm"))))
|
||||
(add-before 'configure 'install-bin
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(with-directory-excursion
|
||||
(string-append ghc-bootstrap-path "/ghc-7.8.4")
|
||||
(invoke "make" "install")))
|
||||
%standard-phases)))))))
|
||||
(invoke "make" "install"))))
|
||||
(add-before 'install-bin 'configure-bin
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((binaries
|
||||
(list
|
||||
"./utils/ghc-pwd/dist-install/build/tmp/ghc-pwd"
|
||||
"./utils/hpc/dist-install/build/tmp/hpc"
|
||||
"./utils/haddock/dist/build/tmp/haddock"
|
||||
"./utils/hsc2hs/dist-install/build/tmp/hsc2hs"
|
||||
"./utils/runghc/dist-install/build/tmp/runghc"
|
||||
"./utils/ghc-cabal/dist-install/build/tmp/ghc-cabal"
|
||||
"./utils/hp2ps/dist/build/tmp/hp2ps"
|
||||
"./utils/ghc-pkg/dist-install/build/tmp/ghc-pkg"
|
||||
"./utils/unlit/dist/build/tmp/unlit"
|
||||
"./ghc/stage2/build/tmp/ghc-stage2"))
|
||||
(gmp (assoc-ref inputs "gmp"))
|
||||
(gmp-lib (string-append gmp "/lib"))
|
||||
(gmp-include (string-append gmp "/include"))
|
||||
(ncurses-lib
|
||||
(dirname (search-input-file inputs "/lib/libncurses.so")))
|
||||
(ld-so (search-input-file inputs #$(glibc-dynamic-linker)))
|
||||
(libtinfo-dir
|
||||
(string-append ghc-bootstrap-prefix
|
||||
"/lib/ghc-7.8.4/terminfo-0.4.0.0")))
|
||||
(with-directory-excursion
|
||||
(string-append ghc-bootstrap-path "/ghc-7.8.4")
|
||||
(setenv "CONFIG_SHELL" (which "bash"))
|
||||
(setenv "LD_LIBRARY_PATH" gmp-lib)
|
||||
;; The binaries have "/lib64/ld-linux-x86-64.so.2" hardcoded.
|
||||
(for-each
|
||||
(cut invoke "patchelf" "--set-interpreter" ld-so <>)
|
||||
binaries)
|
||||
;; The binaries include a reference to libtinfo.so.5 which
|
||||
;; is a subset of libncurses.so.5. We create a symlink in a
|
||||
;; directory included in the bootstrap binaries rpath.
|
||||
(mkdir-p libtinfo-dir)
|
||||
(symlink
|
||||
(string-append ncurses-lib "/libncursesw.so."
|
||||
;; Extract "6.0" from "6.0-20170930" if a
|
||||
;; dash-separated version tag exists.
|
||||
#$(let* ((v (package-version ncurses))
|
||||
(d (or (string-index v #\-)
|
||||
(string-length v))))
|
||||
(version-major+minor (string-take v d))))
|
||||
(string-append libtinfo-dir "/libtinfo.so.5"))
|
||||
|
||||
(setenv "PATH"
|
||||
(string-append (getenv "PATH") ":"
|
||||
ghc-bootstrap-prefix "/bin"))
|
||||
(invoke
|
||||
(string-append (getcwd) "/configure")
|
||||
(string-append "--prefix=" ghc-bootstrap-prefix)
|
||||
(string-append "--with-gmp-libraries=" gmp-lib)
|
||||
(string-append "--with-gmp-includes=" gmp-include))))))))))
|
||||
(native-search-paths (list (search-path-specification
|
||||
(variable "GHC_PACKAGE_PATH")
|
||||
(files (list
|
||||
|
@ -595,25 +587,24 @@ interactive environment for the functional language Haskell.")
|
|||
(supported-systems '("i686-linux" "x86_64-linux"))
|
||||
(outputs '("out" "doc"))
|
||||
(inputs
|
||||
`(("gmp" ,gmp)
|
||||
("ncurses" ,ncurses)
|
||||
("libffi" ,libffi)
|
||||
("ghc-testsuite"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://www.haskell.org/ghc/dist/"
|
||||
version "/" name "-" version "-testsuite.tar.xz"))
|
||||
(sha256
|
||||
(base32 "1wjc3x68l305bl1h1ijd3yhqp2vqj83lkp3kqbr94qmmkqlms8sj"))))))
|
||||
(list gmp ncurses libffi))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("python" ,python-2) ; for tests
|
||||
("ghostscript" ,ghostscript) ; for tests
|
||||
;; GHC is built with GHC.
|
||||
("ghc-bootstrap" ,ghc-7)))
|
||||
("ghc-bootstrap" ,ghc-7)
|
||||
("ghc-testsuite"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://www.haskell.org/ghc/dist/"
|
||||
version "/" name "-" version "-testsuite.tar.xz"))
|
||||
(sha256
|
||||
(base32 "1wjc3x68l305bl1h1ijd3yhqp2vqj83lkp3kqbr94qmmkqlms8sj")))) ))
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
(list
|
||||
#:test-target "test"
|
||||
;; We get a smaller number of test failures by disabling parallel test
|
||||
;; execution.
|
||||
#:parallel-tests? #f
|
||||
|
@ -624,53 +615,48 @@ interactive environment for the functional language Haskell.")
|
|||
#:build #f
|
||||
|
||||
#:configure-flags
|
||||
(list
|
||||
(string-append "--with-gmp-libraries="
|
||||
(assoc-ref %build-inputs "gmp") "/lib")
|
||||
(string-append "--with-gmp-includes="
|
||||
(assoc-ref %build-inputs "gmp") "/include")
|
||||
"--with-system-libffi"
|
||||
(string-append "--with-ffi-libraries="
|
||||
(assoc-ref %build-inputs "libffi") "/lib")
|
||||
(string-append "--with-ffi-includes="
|
||||
(assoc-ref %build-inputs "libffi") "/include")
|
||||
(string-append "--with-curses-libraries="
|
||||
(assoc-ref %build-inputs "ncurses") "/lib")
|
||||
(string-append "--with-curses-includes="
|
||||
(assoc-ref %build-inputs "ncurses") "/include"))
|
||||
#~(list
|
||||
(string-append "--with-gmp-libraries="
|
||||
(assoc-ref %build-inputs "gmp") "/lib")
|
||||
(string-append "--with-gmp-includes="
|
||||
(assoc-ref %build-inputs "gmp") "/include")
|
||||
"--with-system-libffi"
|
||||
(string-append "--with-ffi-libraries="
|
||||
(assoc-ref %build-inputs "libffi") "/lib")
|
||||
(string-append "--with-ffi-includes="
|
||||
(assoc-ref %build-inputs "libffi") "/include")
|
||||
(string-append "--with-curses-libraries="
|
||||
(assoc-ref %build-inputs "ncurses") "/lib")
|
||||
(string-append "--with-curses-includes="
|
||||
(assoc-ref %build-inputs "ncurses") "/include"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'unpack-testsuite
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(with-directory-excursion ".."
|
||||
(copy-file (assoc-ref inputs "ghc-testsuite")
|
||||
"ghc-testsuite.tar.xz")
|
||||
(zero? (system* "tar" "xvf" "ghc-testsuite.tar.xz")))))
|
||||
(add-before 'build 'fix-lib-paths
|
||||
(lambda _
|
||||
(substitute*
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'unpack-testsuite
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(with-directory-excursion ".."
|
||||
(invoke "tar" "xvf" (assoc-ref inputs "ghc-testsuite")))))
|
||||
(add-before 'build 'fix-lib-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute*
|
||||
(list "libraries/process/System/Process/Posix.hs"
|
||||
"libraries/process/tests/process001.hs"
|
||||
"libraries/process/tests/process002.hs"
|
||||
"libraries/unix/cbits/execvpe.c")
|
||||
(("/bin/sh") (which "sh"))
|
||||
(("/bin/ls") (which "ls")))
|
||||
#t))
|
||||
(add-before 'build 'fix-environment
|
||||
(lambda _
|
||||
(unsetenv "GHC_PACKAGE_PATH")
|
||||
(setenv "CONFIG_SHELL" (which "bash"))
|
||||
#t))
|
||||
(add-before 'check 'fix-testsuite
|
||||
(lambda _
|
||||
(substitute*
|
||||
(("/bin/sh") (search-input-file inputs "/bin/sh"))
|
||||
(("/bin/ls") (search-input-file inputs "/bin/ls")))))
|
||||
(add-before 'build 'fix-environment
|
||||
(lambda _
|
||||
(unsetenv "GHC_PACKAGE_PATH")
|
||||
(setenv "CONFIG_SHELL" (which "bash"))))
|
||||
(add-before 'check 'fix-testsuite
|
||||
(lambda _
|
||||
(substitute*
|
||||
(list "testsuite/timeout/Makefile"
|
||||
"testsuite/timeout/timeout.py"
|
||||
"testsuite/timeout/timeout.hs"
|
||||
"testsuite/tests/programs/life_space_leak/life.test")
|
||||
(("/bin/sh") (which "sh"))
|
||||
(("/bin/rm") "rm"))
|
||||
#t)))))
|
||||
(("/bin/sh") (which "sh"))
|
||||
(("/bin/rm") "rm")))))))
|
||||
(native-search-paths (list (search-path-specification
|
||||
(variable "GHC_PACKAGE_PATH")
|
||||
(files (list
|
||||
|
@ -695,13 +681,11 @@ interactive environment for the functional language Haskell.")
|
|||
version "/" name "-" version "-src.tar.xz"))
|
||||
(sha256
|
||||
(base32 "1ch4j2asg7pr52ai1hwzykxyj553wndg7wq93i47ql4fllspf48i"))))
|
||||
(inputs
|
||||
(list gmp ncurses libffi))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("python" ,python) ; for tests
|
||||
("ghostscript" ,ghostscript) ; for tests
|
||||
;; GHC 8.4.3 is built with GHC 8.
|
||||
;; GHC 8.4.4 is built with GHC >= 8.0.
|
||||
("ghc-bootstrap" ,ghc-8.0)
|
||||
("ghc-testsuite"
|
||||
,(origin
|
||||
|
@ -713,92 +697,39 @@ interactive environment for the functional language Haskell.")
|
|||
(base32
|
||||
"0s8lf9sxj7n89pjagi58b3fahnp34qvmwhnn0j1fbg6955vbrfj6"))))))
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
;; We get a smaller number of test failures by disabling parallel test
|
||||
;; execution.
|
||||
#:parallel-tests? #f
|
||||
|
||||
;; Don't pass --build=<triplet>, because the configure script
|
||||
;; auto-detects slightly different triplets for --host and --target and
|
||||
;; then complains that they don't match.
|
||||
#:build #f
|
||||
|
||||
#:configure-flags
|
||||
(list
|
||||
(string-append "--with-gmp-libraries="
|
||||
(assoc-ref %build-inputs "gmp") "/lib")
|
||||
(string-append "--with-gmp-includes="
|
||||
(assoc-ref %build-inputs "gmp") "/include")
|
||||
"--with-system-libffi"
|
||||
(string-append "--with-ffi-libraries="
|
||||
(assoc-ref %build-inputs "libffi") "/lib")
|
||||
(string-append "--with-ffi-includes="
|
||||
(assoc-ref %build-inputs "libffi") "/include")
|
||||
(string-append "--with-curses-libraries="
|
||||
(assoc-ref %build-inputs "ncurses") "/lib")
|
||||
(string-append "--with-curses-includes="
|
||||
(assoc-ref %build-inputs "ncurses") "/include"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'unpack-testsuite
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(invoke "tar" "xvf"
|
||||
(assoc-ref inputs "ghc-testsuite")
|
||||
"--strip-components=1")
|
||||
#t))
|
||||
;; This phase patches the 'ghc-pkg' command so that it sorts the list
|
||||
;; of packages in the binary cache it generates.
|
||||
(add-before 'build 'fix-ghc-pkg-nondeterminism
|
||||
(lambda _
|
||||
(substitute* "utils/ghc-pkg/Main.hs"
|
||||
(("confs = map \\(path </>\\) \\$ filter \\(\".conf\" `isSuffixOf`\\) fs")
|
||||
"confs = map (path </>) $ filter (\".conf\" `isSuffixOf`) (sort fs)"))
|
||||
#t))
|
||||
(add-after 'unpack-testsuite 'fix-shell-wrappers
|
||||
(lambda _
|
||||
(substitute* '("driver/ghci/ghc.mk"
|
||||
"utils/mkdirhier/ghc.mk"
|
||||
"rules/shell-wrapper.mk")
|
||||
(("echo '#!/bin/sh'")
|
||||
(format #f "echo '#!~a'" (which "sh"))))
|
||||
#t))
|
||||
;; This is necessary because the configure system no longer uses
|
||||
;; “AC_PATH_” but “AC_CHECK_”, setting the variables to just the
|
||||
;; plain command names.
|
||||
(add-before 'configure 'set-target-programs
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((binutils (assoc-ref inputs "binutils"))
|
||||
(gcc (assoc-ref inputs "gcc"))
|
||||
(ld-wrapper (assoc-ref inputs "ld-wrapper")))
|
||||
(setenv "CC" (string-append gcc "/bin/gcc"))
|
||||
(setenv "CXX" (string-append gcc "/bin/g++"))
|
||||
(setenv "LD" (string-append ld-wrapper "/bin/ld"))
|
||||
(setenv "NM" (string-append binutils "/bin/nm"))
|
||||
(setenv "RANLIB" (string-append binutils "/bin/ranlib"))
|
||||
(setenv "STRIP" (string-append binutils "/bin/strip"))
|
||||
;; The 'ar' command does not follow the same pattern.
|
||||
(setenv "fp_prog_ar" (string-append binutils "/bin/ar"))
|
||||
#t)))
|
||||
(add-before 'build 'fix-references
|
||||
(lambda _
|
||||
(substitute* '("testsuite/timeout/Makefile"
|
||||
"testsuite/timeout/timeout.py"
|
||||
"testsuite/timeout/timeout.hs"
|
||||
"testsuite/tests/programs/life_space_leak/life.test"
|
||||
;; libraries
|
||||
"libraries/process/System/Process/Posix.hs"
|
||||
"libraries/process/tests/process001.hs"
|
||||
"libraries/process/tests/process002.hs"
|
||||
"libraries/unix/cbits/execvpe.c")
|
||||
(("/bin/sh") (which "sh"))
|
||||
(("/bin/ls") (which "ls"))
|
||||
(("/bin/rm") "rm"))
|
||||
#t))
|
||||
(add-before 'build 'fix-environment
|
||||
(lambda _
|
||||
(unsetenv "GHC_PACKAGE_PATH")
|
||||
(setenv "CONFIG_SHELL" (which "bash"))
|
||||
#t)))))
|
||||
(substitute-keyword-arguments (package-arguments ghc-8.0)
|
||||
((#:phases phases)
|
||||
#~(modify-phases #$phases
|
||||
;; This phase patches the 'ghc-pkg' command so that it sorts the list
|
||||
;; of packages in the binary cache it generates.
|
||||
(add-before 'build 'fix-ghc-pkg-nondeterminism
|
||||
(lambda _
|
||||
(substitute* "utils/ghc-pkg/Main.hs"
|
||||
(("confs = map \\(path </>\\) \\$ filter \\(\".conf\" `isSuffixOf`\\) fs")
|
||||
"confs = map (path </>) $ filter (\".conf\" `isSuffixOf`) (sort fs)"))))
|
||||
(add-after 'unpack-testsuite 'fix-shell-wrappers
|
||||
(lambda _
|
||||
(substitute* '("driver/ghci/ghc.mk"
|
||||
"utils/mkdirhier/ghc.mk"
|
||||
"rules/shell-wrapper.mk")
|
||||
(("echo '#!/bin/sh'")
|
||||
(format #f "echo '#!~a'" (which "sh"))))))
|
||||
;; This is necessary because the configure system no longer uses
|
||||
;; “AC_PATH_” but “AC_CHECK_”, setting the variables to just the
|
||||
;; plain command names.
|
||||
(add-before 'configure 'set-target-programs
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((binutils (assoc-ref inputs "binutils"))
|
||||
(gcc (assoc-ref inputs "gcc"))
|
||||
(ld-wrapper (assoc-ref inputs "ld-wrapper")))
|
||||
(setenv "CC" (string-append gcc "/bin/gcc"))
|
||||
(setenv "CXX" (string-append gcc "/bin/g++"))
|
||||
(setenv "LD" (string-append ld-wrapper "/bin/ld"))
|
||||
(setenv "NM" (string-append binutils "/bin/nm"))
|
||||
(setenv "RANLIB" (string-append binutils "/bin/ranlib"))
|
||||
(setenv "STRIP" (string-append binutils "/bin/strip"))
|
||||
;; The 'ar' command does not follow the same pattern.
|
||||
(setenv "fp_prog_ar" (string-append binutils "/bin/ar")))))))))
|
||||
(native-search-paths (list (search-path-specification
|
||||
(variable "GHC_PACKAGE_PATH")
|
||||
(files (list
|
||||
|
@ -838,10 +769,10 @@ interactive environment for the functional language Haskell.")
|
|||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments ghc-8.4)
|
||||
((#:make-flags make-flags ''())
|
||||
`(cons "EXTRA_RUNTEST_OPTS=--skip-perf-tests"
|
||||
,make-flags))
|
||||
#~(cons "EXTRA_RUNTEST_OPTS=--skip-perf-tests"
|
||||
#$make-flags))
|
||||
((#:phases phases '%standard-phases)
|
||||
`(modify-phases ,phases
|
||||
#~(modify-phases #$phases
|
||||
(add-after 'install 'remove-unnecessary-references
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(substitute* (find-files (string-append (assoc-ref outputs "out") "/lib/")
|
||||
|
@ -866,8 +797,7 @@ interactive environment for the functional language Haskell.")
|
|||
(new (string-append out subdir)))
|
||||
(mkdir-p (dirname new))
|
||||
(rename-file haddock-file new)))
|
||||
(find-files doc "\\.haddock$")))
|
||||
#t))
|
||||
(find-files doc "\\.haddock$")))))
|
||||
(add-after 'unpack-testsuite 'skip-tests
|
||||
(lambda _
|
||||
;; These two tests refer to the root user, which doesn't exist
|
||||
|
@ -875,8 +805,7 @@ interactive environment for the functional language Haskell.")
|
|||
(substitute* "libraries/unix/tests/all.T"
|
||||
(("^test\\('T8108'") "# guix skipped: test('T8108'"))
|
||||
(substitute* "libraries/unix/tests/libposix/all.T"
|
||||
(("^test\\('posix010'") "# guix skipped: test('posix010'"))
|
||||
#t))))))
|
||||
(("^test\\('posix010'") "# guix skipped: test('posix010'"))))))))
|
||||
(native-search-paths (list (search-path-specification
|
||||
(variable "GHC_PACKAGE_PATH")
|
||||
(files (list
|
||||
|
@ -916,19 +845,17 @@ interactive environment for the functional language Haskell.")
|
|||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments ghc-8.6)
|
||||
((#:phases phases '%standard-phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'fix-references 'fix-cc-reference
|
||||
#~(modify-phases #$phases
|
||||
(add-before 'build 'fix-cc-reference
|
||||
(lambda _
|
||||
(substitute* "utils/hsc2hs/Common.hs"
|
||||
(("\"cc\"") "\"gcc\""))
|
||||
#t))
|
||||
(("\"cc\"") "\"gcc\""))))
|
||||
(add-after 'unpack-testsuite 'skip-more-tests
|
||||
(lambda _
|
||||
;; XXX: This test fails because our ld-wrapper script
|
||||
;; mangles the response file passed to the linker.
|
||||
(substitute* "testsuite/tests/hp2ps/all.T"
|
||||
(("^test\\('T15904'") "# guix skipped: test('T15904'"))
|
||||
#t))))))
|
||||
(("^test\\('T15904'") "# guix skipped: test('T15904'"))))))))
|
||||
(native-search-paths (list (search-path-specification
|
||||
(variable "GHC_PACKAGE_PATH")
|
||||
(files (list
|
||||
|
@ -949,7 +876,8 @@ interactive environment for the functional language Haskell.")
|
|||
(sha256
|
||||
(base32 "179ws2q0dinl1a39wm9j37xzwm84zfz3c5543vz8v479khigdvp3"))))
|
||||
(native-inputs
|
||||
`(("ghc-bootstrap" ,ghc-8.8)
|
||||
`(;; GHC 8.10.7 must be built with GHC >= 8.6.
|
||||
("ghc-bootstrap" ,ghc-8.6)
|
||||
("ghc-testsuite"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
|
@ -969,7 +897,7 @@ interactive environment for the functional language Haskell.")
|
|||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments ghc-8.8)
|
||||
((#:phases phases '%standard-phases)
|
||||
`(modify-phases ,phases
|
||||
#~(modify-phases #$phases
|
||||
(add-after 'unpack-testsuite 'patch-more-shebangs
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((bash (assoc-ref inputs "bash")))
|
||||
|
@ -983,20 +911,16 @@ interactive environment for the functional language Haskell.")
|
|||
(("extra_files" all) (string-append "[" all))
|
||||
(("\\]\\), " all)
|
||||
(string-append all "expect_broken(0)], ")))))
|
||||
;; TODO: Turn this into an undconditional patch on the next rebuild.
|
||||
,@(if (string-prefix? "i686" (or (%current-target-system)
|
||||
(%current-system)))
|
||||
'((add-after 'skip-more-tests 'skip-failing-tests-i686
|
||||
(lambda _
|
||||
(substitute* '("testsuite/tests/codeGen/should_compile/all.T")
|
||||
(("(test\\('T15155l', )when\\(unregisterised\\(\\), skip\\)" all before)
|
||||
(string-append before "when(arch('i386'), skip)")))
|
||||
;; Unexpected failures:
|
||||
;; quasiquotation/T14028.run T14028 [bad stderr] (dyn)
|
||||
(substitute* '("testsuite/tests/quasiquotation/all.T")
|
||||
(("unless\\(config.have_ext_interp, skip\\),")
|
||||
"unless(config.have_ext_interp, skip), when(arch('i386'), skip),")))))
|
||||
'())))))
|
||||
(add-after 'skip-more-tests 'skip-failing-tests-i686
|
||||
(lambda _
|
||||
(substitute* '("testsuite/tests/codeGen/should_compile/all.T")
|
||||
(("(test\\('T15155l', )when\\(unregisterised\\(\\), skip\\)" all before)
|
||||
(string-append before "when(arch('i386'), skip)")))
|
||||
;; Unexpected failures:
|
||||
;; quasiquotation/T14028.run T14028 [bad stderr] (dyn)
|
||||
(substitute* '("testsuite/tests/quasiquotation/all.T")
|
||||
(("unless\\(config.have_ext_interp, skip\\),")
|
||||
"unless(config.have_ext_interp, skip), when(arch('i386'), skip),"))))))))
|
||||
(native-search-paths (list (search-path-specification
|
||||
(variable "GHC_PACKAGE_PATH")
|
||||
(files (list
|
||||
|
|
|
@ -152,22 +152,6 @@ C/C++ part.")
|
|||
(string-append "//" all))))))))
|
||||
(package-arguments icu4c)))))
|
||||
|
||||
(define-public icu4c-67
|
||||
(package
|
||||
(inherit icu4c)
|
||||
(version "67.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/unicode-org/icu/releases/download/release-"
|
||||
(string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
|
||||
"/icu4c-"
|
||||
(string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
|
||||
"-src.tgz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1p6mhvxl0xr2n0g6xdps3mwzwlv6mjsz3xlpm793p9aiybb0ra4l"))))))
|
||||
|
||||
(define-public icu4c-68
|
||||
(package
|
||||
(inherit icu4c)
|
||||
|
|
|
@ -979,7 +979,7 @@ Metafile}, and @acronym{EMF+, Enhanced Metafile Plus} files.")
|
|||
(define-public imlib2
|
||||
(package
|
||||
(name "imlib2")
|
||||
(version "1.9.0")
|
||||
(version "1.9.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -987,7 +987,7 @@ Metafile}, and @acronym{EMF+, Enhanced Metafile Plus} files.")
|
|||
"/imlib2-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0l662h74i3mzl5ligj1352rf8bf48drasj97wygr2037gk5fijas"))))
|
||||
"0hsdfs7wa5f7fwb5nfgqzvf29bp59rgy0i0c4m6mvgpzpww408ja"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags (list "--disable-static")))
|
||||
|
@ -1274,7 +1274,7 @@ language bindings to VIGRA.")
|
|||
(define-public libwebp
|
||||
(package
|
||||
(name "libwebp")
|
||||
(version "1.2.0")
|
||||
(version "1.2.2")
|
||||
(source
|
||||
(origin
|
||||
;; No tarballs are provided for >0.6.1.
|
||||
|
@ -1285,14 +1285,14 @@ language bindings to VIGRA.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1rgblphsd56033w7lpkrzl7m5w0fi7wavxri1ayzlg8fhpmmqp4k"))))
|
||||
"1khqkm5j9aiii9jfsbxzzyz3x33sifzcx537cyjyb3a2g2rl969k"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("freeglut" ,freeglut)
|
||||
("giflib" ,giflib)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("libpng" ,libpng)
|
||||
("libtiff" ,libtiff)))
|
||||
(list freeglut
|
||||
giflib
|
||||
libjpeg-turbo
|
||||
libpng
|
||||
libtiff))
|
||||
(native-inputs
|
||||
(list autoconf automake libtool))
|
||||
(arguments
|
||||
|
@ -1327,9 +1327,7 @@ channels.")
|
|||
(build-system gnu-build-system)
|
||||
(propagated-inputs
|
||||
;; These are all in the 'Libs.private' field of libmng.pc.
|
||||
`(("lcms" ,lcms)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("zlib" ,zlib)))
|
||||
(list lcms libjpeg-turbo zlib))
|
||||
(home-page "https://www.libmng.com/")
|
||||
(synopsis "Library for handling MNG files")
|
||||
(description
|
||||
|
|
|
@ -46,19 +46,8 @@
|
|||
(base32
|
||||
"1q6x9c5x4x0x4q11iygldsmxdyzhz1mb4n8im76glwsgqsqyjs80"))))
|
||||
(build-system gnu-build-system)
|
||||
;; TODO(staging): Unconditionally move inputs to native-inputs.
|
||||
(native-inputs
|
||||
(if (%current-target-system)
|
||||
`(("python" ,python-wrapper)
|
||||
("perl" ,perl)
|
||||
("gettext" ,gettext-minimal))
|
||||
'()))
|
||||
(inputs
|
||||
`(,@(if (%current-target-system)
|
||||
'()
|
||||
`(("gettext" ,gettext-minimal)
|
||||
("perl" ,perl)
|
||||
("python" ,python-wrapper)))))
|
||||
(list gettext-minimal perl python-wrapper))
|
||||
(synopsis "Various ISO standards")
|
||||
(description
|
||||
"This package provides lists of various ISO standards (e.g. country,
|
||||
|
|
|
@ -82,6 +82,10 @@
|
|||
"1jk3bmiw61ypcchqkk1fyg5wh8wpggk574wxyfyaic870zh3lhgq")
|
||||
(julia-patch "libunwind-cfa-rsp"
|
||||
"1aswjhvysahhldbzh1afbf0hsjxrvs6xidsz2i7s1cjkjbdiia1z"))))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments libunwind)
|
||||
;; Skip tests on this older and patched version of libunwind.
|
||||
((#:tests? _ #t) #f)))
|
||||
(home-page "https://github.com/JuliaLang/tree/master/deps/")))
|
||||
|
||||
(define (julia-patch-url version name)
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -42,14 +42,14 @@
|
|||
(define-public ktuberling
|
||||
(package
|
||||
(name "ktuberling")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/ktuberling-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0mlv9qllg70p26dbrcsr820c70d3ib88hapc1z6wgjhdpmc12ni1"))))
|
||||
(base32 "19kyk7r7lkzwcvhhn1jjgrcdkq8gfmzgyrvvcbm4qkx7jd27v1ia"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools perl))
|
||||
|
@ -91,14 +91,14 @@ This package is part of the KDE games module.")
|
|||
(define-public picmi
|
||||
(package
|
||||
(name "picmi")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/picmi-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1dfq9m4njh0czz8zws46rkz6xq2n6xra5w223m3s2f5civiw5msz"))))
|
||||
(base32 "0nn00sila4zn4r28dh84jvqqrrs31sh9vwd76nalm7y14xrxwn46"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -127,14 +127,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kolf
|
||||
(package
|
||||
(name "kolf")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kolf-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1lpp6pzr5dgd4si4a8c7hcvgxgqy0bgyhkx9m6jqb0zhll6dxj10"))))
|
||||
(base32 "0mmmj9rxrbpf9clj49zgflrlic8qafzw2r2by5knhsn15mq59bd3"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -174,14 +174,14 @@ This package is part of the KDE games module.")
|
|||
(define-public libkmahjongg
|
||||
(package
|
||||
(name "libkmahjongg")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/"
|
||||
version "/src/libkmahjongg-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "10ljzbf7qki5flydankrbksaihhkqpfyljb8c71fbwqwmkr7rgfq"))))
|
||||
(base32 "1y123bygi4iil8qglv2fx81qnlqpjpx3s4fmq8sffkilcz875nw8"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules))
|
||||
|
@ -205,14 +205,14 @@ other Mah Jongg like games.")
|
|||
(define-public kmahjongg
|
||||
(package
|
||||
(name "kmahjongg")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/"
|
||||
version "/src/kmahjongg-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1fcj4jb2zzbaxp7cp04w36y0c7lh77yzin66fmvrcxkl11xi2wwd"))))
|
||||
(base32 "0lvia7ghnp8wx2xndzipv8grdsdn3i96xlsy6wspna1k884x8ylw"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -244,14 +244,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kshisen
|
||||
(package
|
||||
(name "kshisen")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/"
|
||||
version "/src/kshisen-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1hrwr0f1kidivsp8lnwdbqz3xxagjvjwh72r3gma8smfilybygfb"))))
|
||||
(base32 "004qr0kmw0c6ahif1mf2f88a849ws3kap7p2ksvljmyyl38x2sbs"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules
|
||||
|
@ -283,14 +283,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kajongg
|
||||
(package
|
||||
(name "kajongg")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/"
|
||||
version "/src/kajongg-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "03fdbnx7zx7vgcxvwd1h1098ks9gq162bwz35fhpyzpynr667m5r"))))
|
||||
(base32 "15b2l0zsyzrir791w9sdf65kvn6528b8vxdrya3f425nvsxsx7ix"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -345,14 +345,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kbreakout
|
||||
(package
|
||||
(name "kbreakout")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kbreakout-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0kqj2cx0ny3qq65c6w5fpnzmrwl9irg8slzvpd3anck5cnvma3j4"))))
|
||||
(base32 "1pvxxl7m46ihjkzaq261xfsynikyrbrr67d4vh5pxfj6pipzrgkp"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -382,14 +382,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kmines
|
||||
(package
|
||||
(name "kmines")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kmines-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0hqjwh3jq2npqwkvh67fyn2xnq8swiasdw5jz8f0ikl0k28id775"))))
|
||||
(base32 "1w6bqlzhbm3vc09jyxfg8vgn0a2nknfz1shbsfamc36jsy2sr758"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -419,14 +419,14 @@ This package is part of the KDE games module.")
|
|||
(define-public konquest
|
||||
(package
|
||||
(name "konquest")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/"
|
||||
version "/src/konquest-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0lnwj06vv4qx05hr8pzysnvrxh8y04asajrph0rsj37v8hs9g5lh"))))
|
||||
(base32 "1kylv730plii7grzccaclg5lkmgwhdgh2ya7h7lpnb8zaapy3kbr"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -458,14 +458,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kbounce
|
||||
(package
|
||||
(name "kbounce")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/"
|
||||
version "/src/kbounce-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0ymy0z1qlw3n653xs3dsa1xm78q4xaj09dnnci4km77rzis26vb6"))))
|
||||
(base32 "187f0hz19xj17h5dzj0nw3r9zas3sppiswhgnzma9snl1w0rfzwh"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -496,14 +496,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kblocks
|
||||
(package
|
||||
(name "kblocks")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/"
|
||||
version "/src/kblocks-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "09yfm9mzbamp294cvc5finq6ilxvxr68i0dnb0m72pa4sfzmij32"))))
|
||||
(base32 "18hdzkwv8lscm9xsi0d99pq219y0m9bqdqv3k15g7gz0sryxvyva"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -536,14 +536,14 @@ This package is part of the KDE games module.")
|
|||
(define-public ksudoku
|
||||
(package
|
||||
(name "ksudoku")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/"
|
||||
version "/src/ksudoku-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0pj6ry7ak1rnpb93mqypaxrcbmrhwg9ir6zhb3ybzfkfcrh67g12"))))
|
||||
(base32 "116dgc9hh6fq6x0w4rd4kjd2qy93hq6bmxwk5jmm21lqwrszr6hw"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -596,14 +596,14 @@ This package is part of the KDE games module.")
|
|||
(define-public klines
|
||||
(package
|
||||
(name "klines")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/klines-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0y8lnwawrkl4ixn7v4dg48k2zpr083krv7dv4d94b2dpkh7xfvih"))))
|
||||
(base32 "15z5gcncyr1i7xipnsvr2lvdi9wdqm8if3ylimksxhgr5dkvz9vz"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -639,14 +639,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kgoldrunner
|
||||
(package
|
||||
(name "kgoldrunner")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kgoldrunner-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "17ra5d3r9ajy2inj17gwd5xphzhvbzx5kpvdwyj6msx4dd9wxgfi"))))
|
||||
(base32 "1ga0djplhgqbfrvq0m7ymd30lsi7kc23chaqmc0vy3g61y9274da"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -679,14 +679,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kdiamond
|
||||
(package
|
||||
(name "kdiamond")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kdiamond-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1iyxrx3422asa58kh0siwvi1svds5kccrym6gdfpdhlmhmciqlzi"))))
|
||||
(base32 "1ca1hxzzvpwm3ms9m0xd7x4r011n7bjlsc4l333q0xjy5vwlrz3s"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -717,14 +717,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kfourinline
|
||||
(package
|
||||
(name "kfourinline")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kfourinline-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0plx3lv35fc8q9svbyl71mms3ji6zn58j306bvm1f8kkgg0x395b"))))
|
||||
(base32 "163aii9bala14bhc9j503xk86jcnmnn327fmx3c68ryp0s89rx97"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -755,14 +755,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kblackbox
|
||||
(package
|
||||
(name "kblackbox")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kblackbox-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0la5w44b0gl72g3wfp0pw8gwnm287lh7nd9k5ikpszw5nn49db0h"))))
|
||||
(base32 "0im7mb93yrbliavil5bcqymcq6a4sjq1pj52ysq8gqqwf7jrw1gx"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -795,14 +795,14 @@ This package is part of the KDE games module.")
|
|||
(define-public knetwalk
|
||||
(package
|
||||
(name "knetwalk")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/knetwalk-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "060kj06vpigdy570izsjfgnmqqrpmb8bkr9arqc109hg3avl5wjz"))))
|
||||
(base32 "0w1bpx04yn7xsyf4h8ymw887ir9ifbwxynqllh8xn4chwd21ipgp"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -836,14 +836,14 @@ This package is part of the KDE games module.")
|
|||
(define-public bomber
|
||||
(package
|
||||
(name "bomber")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/bomber-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1fjcwm591jgx3bgqpi0j5fnb2l2r2h3r6lav3vhaxz4rkf56pg2a"))))
|
||||
(base32 "0cxyp5c119r0bkqzx0mnbfdb2i1h0ra0kp30zx0nmvma1rxrrvgf"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -877,14 +877,14 @@ This package is part of the KDE games module.")
|
|||
(define-public granatier
|
||||
(package
|
||||
(name "granatier")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/granatier-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1fyh7zyacb3pnlfd29jw2jmyl8a7sjw354pi234nd5x5999xw5z6"))))
|
||||
(base32 "1ylywj579j252hj6lz5ghvmiiqf9yb2lncqbypbibdr34irs5if9"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -914,14 +914,14 @@ This package is part of the KDE games module.")
|
|||
(define-public ksirk
|
||||
(package
|
||||
(name "ksirk")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/ksirk-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "10y7nm0x6zcc0gh3am69bbxyyb8azbbfyrdqsa023ggr7n04cn21"))))
|
||||
(base32 "0c1ls3i2jqcrmdy3zhb25ml9lhdy4gjdcvv4j5z8x5wig265qbwx"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -969,14 +969,14 @@ This package is part of the KDE games module.")
|
|||
(define-public palapeli
|
||||
(package
|
||||
(name "palapeli")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/palapeli-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0xxz9g4zxljlg20g88a5lkbwzzm9yg4vxnrfigk8m018cz0nqd5b"))))
|
||||
(base32 "0bwi5y5mrf6h1vhyhs5sxwx8hdv0hkknpscpg5q54f6hw6cwf4qv"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -1016,14 +1016,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kiriki
|
||||
(package
|
||||
(name "kiriki")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kiriki-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0milc8fl1rj4yrwdvm60ampd47dyiys1xvqi5f0g7y6mgymgyk4x"))))
|
||||
(base32 "1ijl4hjck4wvxplcjzqw9ahadnbvd8hk61qn04kbyz6mrp67xgrn"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -1054,14 +1054,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kigo
|
||||
(package
|
||||
(name "kigo")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kigo-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "088752yzmfsnppd27p8hld4x5s7sw5fagm08024l5ra1mlicdfz9"))))
|
||||
(base32 "0wav6pmljbki2ipgzp82gb2j861b2bj1c2x4ydqn106aqcm0ci71"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -1100,14 +1100,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kubrick
|
||||
(package
|
||||
(name "kubrick")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kubrick-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0h3mypwd67sss08j5vvrih5f5ss85m9kax6412y40xmsm51lz2pq"))))
|
||||
(base32 "09hxrigckvpxw1ipzlhq5fb5hpzrb5h65b55m6di3nj6ys2x50v9"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -1141,14 +1141,14 @@ This package is part of the KDE games module.")
|
|||
(define-public lskat
|
||||
(package
|
||||
(name "lskat")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/lskat-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1wg9zxp64kwjxqs4qw0h7j8yhgffbmvh8j9d4dgmz45dscngnjli"))))
|
||||
(base32 "07pkrgn9pgwwcc903iqmdp49i26ijkkb795jbwyhdg3nqgck9ar9"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -1179,14 +1179,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kapman
|
||||
(package
|
||||
(name "kapman")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kapman-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "14x3v6li4r3gzzwfd6ar9saq2rhc7yxs0sp9ygalzq8vq4d7i1kh"))))
|
||||
(base32 "0clh3nyc3kan0hbbzzca3sd09nl2hd36y7f6g5pv2cp6i1m4757y"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -1218,14 +1218,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kspaceduel
|
||||
(package
|
||||
(name "kspaceduel")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kspaceduel-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1aixh6ygif2cm1a5g32sl5y6b5x68139pzihaxq4334c6avamdai"))))
|
||||
(base32 "1yb7y1f5rcw4jacpf9vpzbragm2ywwb3mkjhq67x7x99q6r9iz55"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -1253,14 +1253,14 @@ This package is part of the KDE games module.")
|
|||
(define-public bovo
|
||||
(package
|
||||
(name "bovo")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/bovo-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "18qbac366m0xma3ary11q9zxz0wgnysppcl7kpypl6ic3nf61wqz"))))
|
||||
(base32 "1yz4x7fmllmp57yxfipqkldgf38haldah81d2qmc5jlahvy3j23p"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -1289,14 +1289,14 @@ This package is part of the KDE games module.")
|
|||
(define-public killbots
|
||||
(package
|
||||
(name "killbots")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/killbots-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1296gww42nwnai7y6m2qpjqpyc30p7z9chfv5rv0n48jvdhva88y"))))
|
||||
(base32 "07ak86a4v0v8b0nny8n246j3lab5zr8sq0ra9k48cdy53xmq909j"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -1330,14 +1330,14 @@ This package is part of the KDE games module.")
|
|||
(define-public ksnakeduel
|
||||
(package
|
||||
(name "ksnakeduel")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/ksnakeduel-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0mp6g258n3xzvgf23jnhkw10xgwqwqdzqfdc6r9jq6a6m8v77swz"))))
|
||||
(base32 "0hi812hsjnyp1ds3wwv2wr58az6m2zsq97nywsncc0d3b5cxzsza"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -1368,14 +1368,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kollision
|
||||
(package
|
||||
(name "kollision")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kollision-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "180ybafizpwjsg80npy0l9142cjsnlyxwv9dz3bq6r8v4smn2g6b"))))
|
||||
(base32 "0ra83qmvzd4n6d7df2i8bh81y70lxa48i115x9h9ik52b2a48mxf"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -1405,14 +1405,14 @@ This package is part of the KDE games module.")
|
|||
(define-public knavalbattle
|
||||
(package
|
||||
(name "knavalbattle")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/knavalbattle-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "03rqf4avn61b0v340ymmzgp7s0axygjgxq1nlp5aaqbx70zcb4lq"))))
|
||||
(base32 "0i7hf58b3gylld6d7q2aq5w6dksa32z5y1dcaj8nm1lpgcndmj0s"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -1445,14 +1445,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kreversi
|
||||
(package
|
||||
(name "kreversi")
|
||||
(version "20.08.3")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kreversi-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0d3y072q61xcik9lf0pz0c9njvarwlvf6hqv5fp5jyqaf2902pmi"))))
|
||||
(base32 "0gyj0a6hj6jps5z97wdw0nwp0mvnib6v062bcy4dp3c14lhl9r4p"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -1487,14 +1487,14 @@ This package is part of the KDE games module.")
|
|||
(define-public ksquares
|
||||
(package
|
||||
(name "ksquares")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/ksquares-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0chd30byl2kww1k699vkygrxq2wdyvi84m2bimk23q96fl8h831y"))))
|
||||
(base32 "05cz0d83570awnh0faam3y5fxzafzkxaj3wijka1vcbigxk350c5"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -1523,14 +1523,14 @@ This package is part of the KDE games module.")
|
|||
(define-public kjumpingcube
|
||||
(package
|
||||
(name "kjumpingcube")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kjumpingcube-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1mk73il4jh15z5pm3fp65hsyvmrga11c3h7w96yamy2n2bbniapq"))))
|
||||
(base32 "0m9ajl9lq52yn498g0kvsbwa0xmihlqli7zw644c282ni934bwhn"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
|
||||
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -20,6 +22,7 @@
|
|||
(define-module (gnu packages kde-internet)
|
||||
#:use-module (guix build-system qt)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix utils)
|
||||
|
@ -46,6 +49,7 @@
|
|||
#:use-module (gnu packages linphone)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages video)
|
||||
#:use-module (gnu packages vnc)
|
||||
#:use-module (gnu packages web)
|
||||
#:use-module (gnu packages xiph)
|
||||
#:use-module (gnu packages xml))
|
||||
|
@ -83,7 +87,7 @@
|
|||
kwidgetsaddons
|
||||
kxmlgui
|
||||
;; TODO: telepathy
|
||||
oxygen-icons ; default icon set
|
||||
breeze-icons ; default icon set
|
||||
purpose
|
||||
qca
|
||||
qoauth
|
||||
|
@ -113,17 +117,17 @@ Other notable features include:
|
|||
(define-public kget
|
||||
(package
|
||||
(name "kget")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kget-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1swx58wcig8zq8ibhczhcw7l8mqjm7pq8zca9gmny9kda5q04f5m"))))
|
||||
(base32 "0rqznsyphnq0zi65wvrl9mwqm9268wgihkr104i87pp5kfiah5yp"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules pkg-config))
|
||||
(list extra-cmake-modules kdoctools pkg-config))
|
||||
(inputs
|
||||
(list boost
|
||||
gmp
|
||||
|
@ -136,7 +140,6 @@ Other notable features include:
|
|||
kcrash
|
||||
kdbusaddons
|
||||
kdelibs4support ;; KLocale
|
||||
kdoctools
|
||||
ki18n
|
||||
kiconthemes
|
||||
kio
|
||||
|
@ -154,15 +157,23 @@ Other notable features include:
|
|||
libktorrent
|
||||
;; TODO: libmms
|
||||
;; TODO: LibKWorkspace - plasma-workspace?
|
||||
oxygen-icons ; default icon set
|
||||
breeze-icons ; default icon set
|
||||
qca
|
||||
qgpgme
|
||||
qtbase-5))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests? ;; FIXME: two tests fails.
|
||||
(invoke "ctest" "-E" "(schedulertest|filedeletertest)"))
|
||||
#t)))))
|
||||
(home-page "http://www.kde.org/")
|
||||
(synopsis "Versatile and user-friendly download manager")
|
||||
(description "KGet is an advanced download manager with support for
|
||||
Metalink and Bittorrent. Downloads are added to the list, where they can be
|
||||
paused, queued, or scheduled for later. KGet supports download via FTP anf
|
||||
paused, queued, or scheduled for later. KGet supports download via FTP anf
|
||||
HTTP(S) as well as pausing downloads.
|
||||
|
||||
This package is part of the KDE networking module.")
|
||||
|
@ -172,14 +183,14 @@ This package is part of the KDE networking module.")
|
|||
(define-public konversation
|
||||
(package
|
||||
(name "konversation")
|
||||
(version "1.7.7")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/konversation/" version
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/konversation-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "19qqq9s8k0cl71ib33xn07f26j5ji2g4336jk65im6452cf1dv27"))))
|
||||
(base32 "08b4vnm66hbbnvkkh1p0a82pd2aj4zy5a8indfv3fzczsfpx6gp0"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -198,19 +209,21 @@ This package is part of the KDE networking module.")
|
|||
kidletime
|
||||
kio
|
||||
kitemviews
|
||||
knewstuff
|
||||
knotifications
|
||||
knotifyconfig
|
||||
kparts
|
||||
kwallet
|
||||
kwidgetsaddons
|
||||
kwindowsystem
|
||||
oxygen-icons ; default icon set
|
||||
breeze-icons ; default icon set
|
||||
phonon
|
||||
qtbase-5
|
||||
qca
|
||||
qtmultimedia-5
|
||||
solid
|
||||
sonnet))
|
||||
(home-page "https://kde.org/applications/internet/org.kde.konversations")
|
||||
(home-page "https://apps.kde.org/konversation/")
|
||||
(synopsis "Graphical Internet Relay Chat (IRC) client for KDE")
|
||||
(description "Konversation is a graphical Internet Relay Chat client (IRC)
|
||||
with KDE support.
|
||||
|
@ -242,14 +255,14 @@ Features are:
|
|||
(define-public kopete
|
||||
(package
|
||||
(name "kopete")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kopete-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "149gi9hkyl825kf046iqkam3gkzfwdc2sihbf8gs6njachzvb81y"))))
|
||||
(base32 "0fc9m2xgsjmsypqllqb3cp1y2m28dqh48r1qg2xgkfyqa70dnvp9"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools pkg-config))
|
||||
|
@ -277,6 +290,7 @@ Features are:
|
|||
knotifyconfig
|
||||
kparts
|
||||
kpimtextedit
|
||||
ksyntaxhighlighting
|
||||
ktexteditor
|
||||
kwallet
|
||||
;; TODO: Libgadu
|
||||
|
@ -287,7 +301,7 @@ Features are:
|
|||
libsrtp
|
||||
libxml2
|
||||
libxslt
|
||||
;; TODO: Mediastreamer
|
||||
mediastreamer2
|
||||
openssl
|
||||
ortp
|
||||
phonon
|
||||
|
@ -299,7 +313,7 @@ Features are:
|
|||
;; TODO: Xmms
|
||||
zlib))
|
||||
;; TODO: enable video support
|
||||
(home-page "https://kde.org/applications/internet/org.kde.kopete")
|
||||
(home-page "https://apps.kde.org/kopete/")
|
||||
(synopsis "Instant messaging and chat application")
|
||||
(description "Kopete is an instant messenger supporting Jabber/XMPP ,AIM,
|
||||
ICQ, Gadu-Gadu, Novell GroupWise Messenger, and more. It is designed to be a
|
||||
|
@ -318,14 +332,14 @@ This package is part of the KDE networking module.")
|
|||
(define-public krdc
|
||||
(package
|
||||
(name "krdc")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/krdc-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1hp23k3nsrcxpv2qiynjgm71zn3l6ds00cpd4frc68szgiblrw9r"))))
|
||||
(base32 "0bs8q3na924lnmra5608jwnn0dqczvh0f72nn43673ib3m1mddlr"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -340,16 +354,17 @@ This package is part of the KDE networking module.")
|
|||
kiconthemes
|
||||
knotifications
|
||||
knotifyconfig
|
||||
knotifyconfig
|
||||
kwallet
|
||||
kwidgetsaddons
|
||||
kwindowsystem
|
||||
kxmlgui
|
||||
libssh
|
||||
;; TODO: libvnc{server,client} - is not tigervnc-{server,client}
|
||||
oxygen-icons ; default icon set
|
||||
libvnc
|
||||
breeze-icons ; default icon set
|
||||
qtbase-5))
|
||||
(home-page "https://kde.org/applications/internet/org.kde.krdc")
|
||||
(arguments ;; FIXEME: libvnc can't be found for some reason.
|
||||
(list #:configure-flags #~(list "-DWITH_VNC=NO")))
|
||||
(home-page "https://apps.kde.org/krdc/")
|
||||
(synopsis "Remote desktop client")
|
||||
(description "KRDC is a client application that allows you to view or even
|
||||
control the desktop session on another machine that is running a compatible
|
||||
|
@ -362,14 +377,14 @@ This package is part of the KDE networking module.")
|
|||
(define-public ktorrent
|
||||
(package
|
||||
(name "ktorrent")
|
||||
(version "5.1.2")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/ktorrent/" version
|
||||
"/ktorrent-" version ".tar.xz"))
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/ktorrent-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0kwd0npxfg4mdh7f3xadd2zjlqalpb1jxk61505qpcgcssijf534"))))
|
||||
(base32 "1h95hf4ki2xi2c9bzdg18p6d1757gzqknf6gn1ls6lwqy6p0pr4h"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -383,7 +398,6 @@ This package is part of the KDE networking module.")
|
|||
kcoreaddons
|
||||
kcrash
|
||||
kdbusaddons
|
||||
kdewebkit
|
||||
kdnssd
|
||||
ki18n
|
||||
kiconthemes
|
||||
|
@ -399,7 +413,7 @@ This package is part of the KDE networking module.")
|
|||
libgcrypt
|
||||
libktorrent
|
||||
;; TODO: LibKWorkspace -> plasma-workspace?
|
||||
oxygen-icons ; default icon set
|
||||
breeze-icons ; default icon set
|
||||
phonon
|
||||
qtbase-5
|
||||
qtscript
|
||||
|
@ -407,7 +421,7 @@ This package is part of the KDE networking module.")
|
|||
solid
|
||||
syndication
|
||||
taglib))
|
||||
(home-page "https://kde.org/applications/internet/org.kde.ktorrent")
|
||||
(home-page "https://apps.kde.org/ktorrent/")
|
||||
(synopsis "BitTorrent client")
|
||||
(description "KTorrent is a BitTorrent application by KDE which allows you
|
||||
to download files using the BitTorrent protocol. It enables you to run
|
||||
|
@ -418,15 +432,14 @@ a full-featured client for BitTorrent.")
|
|||
(define-public libktorrent
|
||||
(package
|
||||
(name "libktorrent")
|
||||
(version "2.1.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde//stable/ktorrent/"
|
||||
(package-version ktorrent)
|
||||
"/libktorrent-" version ".tar.xz"))
|
||||
(uri (string-append "mirror://kde/stable/release-service/"
|
||||
version "/src/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0051zh8bb4p9wmcfn5ql987brhsaiw9880xdck7b5dm1a05mri2w"))))
|
||||
(base32 "098ac7b5wa7v6svqv4rx1w44j18pr22qgr236fj94r2kpl2nq79q"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules))
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
|
||||
;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2022 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
|
||||
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -55,14 +57,14 @@
|
|||
(define-public audiocd-kio
|
||||
(package
|
||||
(name "audiocd-kio")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/audiocd-kio-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0qlnxxbayqhz25jbvzis27jw2zbw1pmacp8rv7v5wa7zfqn3kmyk"))))
|
||||
(base32 "0d6pbsh1fbhwwr2c4kf9b17dhzzx2jsmgamawcp4kn7pw9i7i8ql"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -78,7 +80,7 @@
|
|||
libvorbis
|
||||
phonon
|
||||
qtbase-5))
|
||||
(home-page "https://kde.org/applications/multimedia/org.kde.kio_audiocd")
|
||||
(home-page "https://apps.kde.org/kio_audiocd/")
|
||||
(synopsis "Transparent audio CD integration for applications using the KDE
|
||||
Platform")
|
||||
(description "KIO AudioCD is a KIO slave that enables KIO-aware
|
||||
|
@ -94,14 +96,14 @@ This package is part of the KDE multimedia module.")
|
|||
(define-public dragon
|
||||
(package
|
||||
(name "dragon")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/dragon-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1sssg20a1vpwk816lp5jgwahilaswb9f3hgfqvc73il4g11ky1xj"))))
|
||||
(base32 "0284shnqwbh1953ym197qaqgjwrnva77zi55lvvykg5cq42x512s"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -120,12 +122,24 @@ This package is part of the KDE multimedia module.")
|
|||
kwidgetsaddons
|
||||
kwindowsystem
|
||||
kxmlgui
|
||||
oxygen-icons ; default icon set
|
||||
breeze-icons ; default icon set
|
||||
phonon
|
||||
phonon-backend-gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
qtbase-5
|
||||
solid))
|
||||
(home-page "https://kde.org/applications/multimedia/org.kde.dragonplayer")
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'qt-wrap 'gst-wrap
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
|
||||
(wrap-program (string-append out "/bin/dragon")
|
||||
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))
|
||||
#t))))))
|
||||
(home-page "https://apps.kde.org/dragonplayer/")
|
||||
(synopsis "Simple video player")
|
||||
(description "Dragon Player is a multimedia player where the focus is on
|
||||
simplicity, instead of features. Dragon Player does one thing, and only one
|
||||
|
@ -140,14 +154,14 @@ This package is part of the KDE multimedia module.")
|
|||
(define-public elisa
|
||||
(package
|
||||
(name "elisa")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/elisa-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "02450lsnbd37fms1i2bb9qc9wir4vym6qqd9p5hr6a6s6qwfs6qf"))))
|
||||
(base32 "1v2h7ayyrv6f6hdkl78x1nrv5x0l6n8dh0xrfm5fnii4f694iik8"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules pkg-config dbus kdoctools
|
||||
|
@ -163,6 +177,7 @@ This package is part of the KDE multimedia module.")
|
|||
kdeclarative
|
||||
kfilemetadata
|
||||
ki18n
|
||||
kiconthemes
|
||||
kio
|
||||
kirigami
|
||||
kmediaplayer
|
||||
|
@ -170,7 +185,7 @@ This package is part of the KDE multimedia module.")
|
|||
kpackage
|
||||
kwidgetsaddons
|
||||
kxmlgui
|
||||
oxygen-icons ; default icon set
|
||||
breeze-icons ; default icon set
|
||||
phonon
|
||||
qtbase-5
|
||||
qtdeclarative-5
|
||||
|
@ -183,7 +198,8 @@ This package is part of the KDE multimedia module.")
|
|||
;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt
|
||||
vlc))
|
||||
(arguments
|
||||
`(#:phases
|
||||
`(#:tests? #f ;; many tests fail
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'start-xorg-server
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
|
@ -198,7 +214,7 @@ This package is part of the KDE multimedia module.")
|
|||
(setenv "CTEST_OUTPUT_ON_FAILURE" "1")
|
||||
(invoke "dbus-launch" "make" test-target))
|
||||
#t)))))
|
||||
(home-page "https://kde.org/applications/multimedia/org.kde.elisa")
|
||||
(home-page "https://apps.kde.org/elisa/")
|
||||
(synopsis "Powerful music player for Plasma 5")
|
||||
(description "Elisa is a simple music player aiming to provide a nice
|
||||
experience for its users. Elisa browses music by album, artist or
|
||||
|
@ -211,20 +227,20 @@ its own database. You can build and play your own playlist.")
|
|||
(define-public ffmpegthumbs
|
||||
(package
|
||||
(name "ffmpegthumbs")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/ffmpegthumbs-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "17l50z33a1h5zkrrfkb261yi2hms66qj36l1mndq7mvs97y2ggmc"))))
|
||||
(base32 "1jl7l3n2lfg71kbzwjn5nrm3qlgilhnvs67iil162mnv52gf3c0v"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules pkg-config))
|
||||
(inputs
|
||||
(list ffmpeg kconfig ki18n kio qtbase-5))
|
||||
(home-page "https://kde.org/applications/multimedia/org.kde.ffmpegthumbs")
|
||||
(list ffmpeg kconfig ki18n kio taglib qtbase-5))
|
||||
(home-page "https://apps.kde.org/ffmpegthumbs/")
|
||||
(synopsis "Video thumbnail generator for KDE using ffmpeg")
|
||||
(description "
|
||||
FFMpegThumbs is a video thumbnail generator for KDE file managers
|
||||
|
@ -237,14 +253,14 @@ This package is part of the KDE multimedia module.")
|
|||
(define-public juk
|
||||
(package
|
||||
(name "juk")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/juk-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "06vsh7knyhcbcbf632jhldbqpzfkdyils2l8dbcdw5nj5hhgzzmr"))))
|
||||
(base32 "12pnbx17r1103w39gglybdzs8kcpwghy5lc4q9fqk89s1r7l3c7h"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -265,13 +281,13 @@ This package is part of the KDE multimedia module.")
|
|||
kwidgetsaddons
|
||||
kwindowsystem
|
||||
kxmlgui
|
||||
oxygen-icons ; default icon set
|
||||
breeze-icons ; default icon set
|
||||
phonon
|
||||
phonon-backend-gstreamer
|
||||
qtbase-5
|
||||
qtsvg-5
|
||||
taglib))
|
||||
(home-page "https://kde.org/applications/multimedia/org.kde.juk")
|
||||
(home-page "https://apps.kde.org/juk/")
|
||||
(synopsis "Music jukebox / music player")
|
||||
(description "JuK is a powerful music player capable of managing a large
|
||||
music collection.
|
||||
|
@ -291,7 +307,7 @@ This package is part of the KDE multimedia module.")
|
|||
(define-public kid3
|
||||
(package
|
||||
(name "kid3")
|
||||
(version "3.9.0")
|
||||
(version "3.9.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -300,7 +316,7 @@ This package is part of the KDE multimedia module.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "02r3cnwr05mcxjawzip3jl1lfijvzfbbafq3saipjjjp4kiq9bk4"))))
|
||||
(base32 "1rq0742rm3y5ps7878qd7xhhiizy6d6ls6hdjqa6z5sq077s5lz9"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
@ -349,14 +365,14 @@ variety of formats.")
|
|||
(define-public k3b
|
||||
(package
|
||||
(name "k3b")
|
||||
(version "20.04.2")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/k3b-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "15wm987hz6rfs9ds9l1gbs6gdsardj1ywvk6zmpvj2i2190y4b3q"))))
|
||||
(base32 "1bizk66ad2yq8xszjqvv2ghk069d0l6iczn5rlna1p3zigr43ysl"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -430,14 +446,14 @@ variety of formats.")
|
|||
libsamplerate
|
||||
libsndfile
|
||||
libvorbis
|
||||
oxygen-icons ; default icon set
|
||||
breeze-icons ; default icon set
|
||||
qtbase-5
|
||||
shared-mime-info
|
||||
solid
|
||||
sox
|
||||
taglib
|
||||
zlib))
|
||||
(home-page "https://kde.org/applications/multimedia/org.kde.k3b")
|
||||
(home-page "https://apps.kde.org/k3b/")
|
||||
(synopsis "Sophisticated CD/DVD burning application")
|
||||
(description "K3b is CD-writing software which intends to be feature-rich
|
||||
and provide an easily usable interface. Features include burning audio CDs
|
||||
|
@ -473,7 +489,7 @@ available CD drives.")
|
|||
kwindowsystem
|
||||
kxmlgui
|
||||
libxscrnsaver
|
||||
oxygen-icons ; default icon set
|
||||
breeze-icons ; default icon set
|
||||
qtbase-5
|
||||
qtx11extras
|
||||
solid
|
||||
|
@ -488,7 +504,7 @@ available CD drives.")
|
|||
(("\\s*qPrintable\\(transponder\\.getTransmissionType\\(\\)\\)\\);")
|
||||
"transponder.getTransmissionType());"))
|
||||
#t)))))
|
||||
(home-page "https://kde.org/applications/multimedia/org.kde.kaffeine")
|
||||
(home-page "https://apps.kde.org/kaffeine/")
|
||||
(synopsis "Versatile media player for KDE")
|
||||
(description "Kaffeine is a media player for KDE. While it supports
|
||||
multiple Phonon backends, its default backend is Xine, giving Kaffeine a wide
|
||||
|
@ -503,14 +519,14 @@ autoloading of subtitle files for use while playing video.")
|
|||
(define-public kamoso
|
||||
(package
|
||||
(name "kamoso")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kamoso-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0c47j315kjfikd3b6x18786k3gqymicjjslpm0a58zdxl3wpqfay"))))
|
||||
(base32 "0br7dbnm2ypdl55pscp8wr0vwrgprycrxxj206b5r1l9ysx9aqip"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
|
@ -526,7 +542,7 @@ autoloading of subtitle files for use while playing video.")
|
|||
kirigami
|
||||
knotifications
|
||||
kparts
|
||||
oxygen-icons ; default icon set
|
||||
breeze-icons ; default icon set
|
||||
purpose
|
||||
qtbase-5
|
||||
qtdeclarative-5
|
||||
|
@ -535,12 +551,8 @@ autoloading of subtitle files for use while playing video.")
|
|||
qtquickcontrols2-5 ; not listed as dependency
|
||||
qtx11extras))
|
||||
(arguments
|
||||
(list #:tests? #f ; test program gets built, but is not found
|
||||
#:configure-flags
|
||||
#~(list (string-append "-DCMAKE_CXX_FLAGS=-I"
|
||||
#$(this-package-input "gst-plugins-base")
|
||||
"/include/gstreamer-1.0"))))
|
||||
(home-page "https://kde.org/applications/multimedia/org.kde.kamoso")
|
||||
(list #:tests? #f)) ; test program gets built, but is not found
|
||||
(home-page "https://apps.kde.org/kamoso/")
|
||||
(synopsis "Take pictures and videos out of your webcam")
|
||||
(description "Kamoso is a simple and friendly program to use your
|
||||
camera. Use it to take pictures and make videos to share.")
|
||||
|
@ -550,14 +562,14 @@ camera. Use it to take pictures and make videos to share.")
|
|||
(define-public kmix
|
||||
(package
|
||||
(name "kmix")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kmix-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1na52ypp57wqrc6pl1khinx9i6fidv1k97nnxcy8zb4l7d5sh1nd"))))
|
||||
(base32 "0zc96l9mnn763pw54ki715sw3wm4z6rjdz2zzsjc6l5iwcqzwqq8"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools pkg-config))
|
||||
|
@ -578,12 +590,12 @@ camera. Use it to take pictures and make videos to share.")
|
|||
kwindowsystem
|
||||
kxmlgui
|
||||
libcanberra
|
||||
oxygen-icons ; default icon set
|
||||
breeze-icons ; default icon set
|
||||
plasma-framework
|
||||
pulseaudio
|
||||
qtbase-5
|
||||
solid))
|
||||
(home-page "https://kde.org/applications/multimedia/org.kde.kmix")
|
||||
(home-page "https://apps.kde.org/kmix/")
|
||||
(synopsis "Volume control and mixer")
|
||||
(description "KMix is an audio device mixer, used to adjust volume, select
|
||||
recording inputs, and set other hardware options.
|
||||
|
@ -593,54 +605,59 @@ This package is part of the KDE multimedia module.")
|
|||
(list license:gpl2+ license:lgpl2.0+ license:fdl1.2+))))
|
||||
|
||||
(define-public kmplayer
|
||||
(package
|
||||
(name "kmplayer")
|
||||
(version "0.12.0b")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/kmplayer/0.12"
|
||||
"/kmplayer-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "0wzdxym4fc83wvqyhcwid65yv59a2wvp1lq303cn124mpnlwx62y"))
|
||||
(patches (search-patches
|
||||
"kmplayer-aarch64.patch"
|
||||
"kmplayer-upstream_Fix-build-with-Qt-5.9.patch"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules pkg-config kdoctools))
|
||||
(inputs
|
||||
(list kconfig
|
||||
kcoreaddons
|
||||
kdelibs4support
|
||||
ki18n
|
||||
kinit
|
||||
kio
|
||||
kparts
|
||||
kmediaplayer
|
||||
kwidgetsaddons
|
||||
libxcb ;; FIXME: why does cmake not find XEVIE and XPRINT?
|
||||
oxygen-icons ; default icon set
|
||||
phonon
|
||||
qtbase-5
|
||||
cairo
|
||||
qtsvg-5
|
||||
qtx11extras
|
||||
xcb-util
|
||||
xcb-util-cursor
|
||||
xcb-util-errors
|
||||
xcb-util-image
|
||||
xcb-util-keysyms
|
||||
xcb-util-wm))
|
||||
(arguments
|
||||
(list #:configure-flags
|
||||
#~(list (string-append
|
||||
"-DCMAKE_CXX_FLAGS=-I"
|
||||
#$(this-package-input "qtx11extras")
|
||||
"/include/qt5"))))
|
||||
(home-page "https://apps.kde.org/kmplayer/")
|
||||
(synopsis "Media player using mplayer/phonon as backend")
|
||||
(description "Kmplayer can play all the audio/video supported by
|
||||
;; The latest release was in 2016, and does not work with the newer
|
||||
;; KDE libraries.
|
||||
(let ((commit "88e85308b71dc5e58cc655b5b9a13cd71b78233f")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "kmplayer")
|
||||
(version (git-version "0.12.0b" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://invent.kde.org/multimedia/kmplayer")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1pzk0js499diqabpwxjq6nnwpmj1ikpyyykzjbm844xcbm74cl19"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules pkg-config kdoctools))
|
||||
(inputs
|
||||
(list kbookmarks
|
||||
kconfig
|
||||
kcoreaddons
|
||||
kdelibs4support
|
||||
ki18n
|
||||
kinit
|
||||
kio
|
||||
kparts
|
||||
kmediaplayer
|
||||
kwidgetsaddons
|
||||
libxcb ;; FIXME: why does cmake not find XEVIE and XPRINT?
|
||||
breeze-icons ; default icon set
|
||||
phonon
|
||||
qtbase-5
|
||||
cairo
|
||||
qtsvg-5
|
||||
qtx11extras
|
||||
xcb-util
|
||||
xcb-util-cursor
|
||||
xcb-util-errors
|
||||
xcb-util-image
|
||||
xcb-util-keysyms
|
||||
xcb-util-wm))
|
||||
(arguments
|
||||
(list #:configure-flags
|
||||
#~(list (string-append
|
||||
"-DCMAKE_CXX_FLAGS=-I"
|
||||
#$(this-package-input "qtx11extras")
|
||||
"/include/qt5"))))
|
||||
(home-page "https://apps.kde.org/kmplayer/")
|
||||
(synopsis "Media player using mplayer/phonon as backend")
|
||||
(description "Kmplayer can play all the audio/video supported by
|
||||
mplayer/phonon from a local file or URL and be embedded in Konqueror and
|
||||
KHTML. It also plays DVDs.
|
||||
|
||||
|
@ -654,20 +671,20 @@ Some features:
|
|||
@item Broadcasting, http streaming, using ffserver/ffmpeg
|
||||
@item For TV sources, you need v4lctl (part of the xawtv package)
|
||||
@end itemize")
|
||||
(license ;; GPL for programs, LGPL for libraries, FDL for documentation
|
||||
(list license:gpl2+ license:lgpl2.0+ license:fdl1.2+))))
|
||||
(license ;; GPL for programs, LGPL for libraries, FDL for documentation
|
||||
(list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))))
|
||||
|
||||
(define-public kwave
|
||||
(package
|
||||
(name "kwave")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kwave-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0ysa873pc2gip95cxr8yv7ifd9qql5zg6h67i9n9q3iqa6v58iyw"))))
|
||||
(base32 "0j6ck44lkfcnaa0rymv2aqvdcy0zbybbklm1s6mvbgdpfsh0rhkm"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules (librsvg-for-system) pkg-config kdoctools))
|
||||
|
@ -694,12 +711,12 @@ Some features:
|
|||
libsamplerate
|
||||
libvorbis
|
||||
opus
|
||||
oxygen-icons ; default icon set
|
||||
breeze-icons ; default icon set
|
||||
pulseaudio
|
||||
qtbase-5
|
||||
qtmultimedia-5
|
||||
zlib))
|
||||
(home-page "https://kde.org/applications/multimedia/org.kde.kwave")
|
||||
(home-page "https://apps.kde.org/kwave/")
|
||||
(synopsis "Sound editor for KDE")
|
||||
(description "Kwave is a sound editor designed for the KDE Desktop
|
||||
Environment.
|
||||
|
@ -734,14 +751,14 @@ Its features include:
|
|||
(define-public libkcddb
|
||||
(package
|
||||
(name "libkcddb")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/libkcddb-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1fwryaj8ldmsqhl5qxjda8by9i7xlb97r8p9rqzckw697hkfhs0h"))))
|
||||
(base32 "1js5r8hxqabnygmavfjvjbfy5c7978bmwm2rqlgsfyn17fkmf2y8"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -764,14 +781,14 @@ Its features include:
|
|||
(define-public libkcompactdisc
|
||||
(package
|
||||
(name "libkcompactdisc")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/libkcompactdisc-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0iy4i0hxqsrnndd4iqkww7v1rqry7kvi5paxdw5qjfffwn8kcsbx"))))
|
||||
(base32 "0fv9dbx74xs42iiw67bvjpxga0d126q2nfs8n4hiv3z2xda9n4ic"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules))
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -5,7 +5,7 @@
|
|||
;;; Copyright © 2017, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2020 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
|
||||
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -29,6 +29,7 @@
|
|||
#:use-module (guix gexp)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system qt)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages glib)
|
||||
|
@ -45,14 +46,14 @@
|
|||
(define-public breeze
|
||||
(package
|
||||
(name "breeze")
|
||||
(version "5.19.5")
|
||||
(version "5.25.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/plasma/" version "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0dpk1w7zcafrzf46j060i1qb0fwqpsflkfzr6gcar81llmjnc4b1"))))
|
||||
"0za75ckgfcdxrh2qxgyl2c1273g2xqwmd55njsis1yvwryadypqw"))))
|
||||
(build-system qt-build-system)
|
||||
;; TODO: Warning at /gnu/store/…-kpackage-5.34.0/…/KF5PackageMacros.cmake:
|
||||
;; warnings during generation of metainfo for org.kde.breezedark.desktop:
|
||||
|
@ -75,6 +76,7 @@
|
|||
kdecoration
|
||||
kguiaddons
|
||||
ki18n
|
||||
kirigami
|
||||
kiconthemes ; for optional kde-frameworkintegration
|
||||
kpackage
|
||||
kwayland ; optional
|
||||
|
@ -115,19 +117,19 @@ Breeze is the default theme for the KDE Plasma desktop.")
|
|||
(define-public kdecoration
|
||||
(package
|
||||
(name "kdecoration")
|
||||
(version "5.19.5")
|
||||
(version "5.25.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/plasma/" version
|
||||
"/kdecoration-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0pn8n7zyb0adzjnn92vmbcf7pmpss60k9k1rk5llamj016xzfgnf"))))
|
||||
"0b6ynqkndmlac89hv339k365m7wykp9y238df62jlq4vpr1r9x9y"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules))
|
||||
(inputs
|
||||
(list ki18n qtbase-5))
|
||||
(list kcoreaddons ki18n qtbase-5))
|
||||
(home-page "https://invent.kde.org/plasma/kdecoration")
|
||||
(synopsis "Plugin based library to create window decorations")
|
||||
(description "KDecoration is a library to create window decorations.
|
||||
|
@ -138,14 +140,14 @@ manager which re-parents a Client window to a window decoration frame.")
|
|||
(define-public ksshaskpass
|
||||
(package
|
||||
(name "ksshaskpass")
|
||||
(version "5.19.5")
|
||||
(version "5.25.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/plasma/" version
|
||||
"/ksshaskpass-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1k2va2v9051f71w78dn3gihk642iyy5yzrkcfnp97fag8g6dpisi"))))
|
||||
"0sfl77szvfq9c7v0gsv5nnf7h5kxigyy2z2p1cwmhm1pq4n606nk"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -162,14 +164,14 @@ call it if it is not associated to a terminal.")
|
|||
(define-public layer-shell-qt
|
||||
(package
|
||||
(name "layer-shell-qt")
|
||||
(version "5.24.1")
|
||||
(version "5.25.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/plasma/" version
|
||||
"/layer-shell-qt-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1aq089pws39w9ncsiqzgg3qvfg5hc5a74pzra0smdpy5ipfsb6a4"))))
|
||||
"06rxqm4wh4mcszrwb2dbgpxj3dqfx0rccyyjp091lbsncqm1gib0"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules pkg-config))
|
||||
|
@ -188,14 +190,14 @@ call it if it is not associated to a terminal.")
|
|||
(define-public kscreenlocker
|
||||
(package
|
||||
(name "kscreenlocker")
|
||||
(version "5.19.5")
|
||||
(version "5.25.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/plasma/" version
|
||||
"/kscreenlocker-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1fd5sqaqx9kj3kr0bgxpllhcm5arf8bc9pkpd9yk9c8xjy0j0fxi"))))
|
||||
"1kii3r3j89avwyb00wrw80k5sj0q4wqgmy1q0yxfps9jk729k3wc"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;; TODO: make tests pass
|
||||
|
@ -213,35 +215,37 @@ call it if it is not associated to a terminal.")
|
|||
(if tests?
|
||||
(begin
|
||||
(setenv "CTEST_OUTPUT_ON_FAILURE" "1")
|
||||
(invoke "dbus-launch" "ctest" ".")))
|
||||
(invoke "dbus-launch" "ctest")))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
(list extra-cmake-modules pkg-config
|
||||
;; For tests.
|
||||
dbus xorg-server-for-tests))
|
||||
(inputs
|
||||
`(("kcmutils" ,kcmutils)
|
||||
("kcrash" ,kcrash)
|
||||
("kdeclarative" ,kdeclarative)
|
||||
("kglobalaccel" ,kglobalaccel)
|
||||
("ki18n" ,ki18n)
|
||||
("kidletime" ,kidletime)
|
||||
("knotifications" ,knotifications)
|
||||
("ktextwidgets" ,ktextwidgets)
|
||||
("kwayland" ,kwayland)
|
||||
("kwindowsystem" ,kwindowsystem)
|
||||
("kxmlgui" ,kxmlgui)
|
||||
("libseccomp" ,libseccomp) ;for sandboxing the look'n'feel package
|
||||
("libxcursor" ,libxcursor) ;missing in CMakeList.txt
|
||||
("libxi" ,libxi) ;XInput, required for grabbing XInput2 devices
|
||||
("linux-pam" ,linux-pam)
|
||||
("logind" ,elogind) ;optional loginctl support
|
||||
("qtbase" ,qtbase-5)
|
||||
("qtdeclarative-5" ,qtdeclarative-5)
|
||||
("qtx11extras" ,qtx11extras)
|
||||
("solid" ,solid)
|
||||
("wayland" ,wayland)
|
||||
("xcb-util-keysyms" ,xcb-util-keysyms)))
|
||||
(list kcmutils
|
||||
kconfig
|
||||
kcrash
|
||||
kdeclarative
|
||||
kglobalaccel
|
||||
ki18n
|
||||
kidletime
|
||||
knotifications
|
||||
ktextwidgets
|
||||
kwayland
|
||||
kwindowsystem
|
||||
kxmlgui
|
||||
layer-shell-qt
|
||||
libseccomp ;for sandboxing the look'n'feel package
|
||||
libxcursor ;missing in CMakeList.txt
|
||||
libxi ;XInput, required for grabbing XInput2 devices
|
||||
linux-pam
|
||||
elogind ;optional loginctl support
|
||||
qtbase-5
|
||||
qtdeclarative-5
|
||||
qtx11extras
|
||||
solid
|
||||
wayland
|
||||
xcb-util-keysyms))
|
||||
(home-page "https://invent.kde.org/plasma/kscreenlocker")
|
||||
(synopsis "Screen locking library")
|
||||
(description
|
||||
|
@ -251,21 +255,22 @@ call it if it is not associated to a terminal.")
|
|||
(define-public libkscreen
|
||||
(package
|
||||
(name "libkscreen")
|
||||
(version "5.19.5")
|
||||
(version "5.25.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/plasma/" version "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0rf1pm0yyc069f4n5s9ipdx4glzfr9zvv5cbrmn4q9i4v6z1qd8i"))))
|
||||
(base32 "1mxkrk04wcyw4xbfiyxbp5iwnhqr10yk39zx5bbjd9zag0vdi7z5"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules
|
||||
;; For testing.
|
||||
dbus))
|
||||
(inputs
|
||||
(list kwayland libxrandr qtbase-5 qtx11extras))
|
||||
(list kwayland libxrandr plasma-wayland-protocols
|
||||
qtbase-5 qtwayland-5 wayland qtx11extras))
|
||||
(arguments
|
||||
'(#:tests? #f)) ; FIXME: 55% tests passed, 5 tests failed out of 11
|
||||
(home-page "https://community.kde.org/Solid/Projects/ScreenManagement")
|
||||
|
@ -278,56 +283,53 @@ basic needs and easy to configure for those who want special setups.")
|
|||
(define-public libksysguard
|
||||
(package
|
||||
(name "libksysguard")
|
||||
(version "5.19.5")
|
||||
(version "5.25.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde//stable/plasma/" version
|
||||
(uri (string-append "mirror://kde/stable/plasma/" version
|
||||
"/libksysguard-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1kd0h3p8bf9k5pqp0frhr81pa0yyrpkckg9zznirk9p1v88v7bfq"))))
|
||||
(base32 "1mrrrxjvqmrnkjwafvqrd2hlvl9gr9y4hn7dv0gf70lp5bl06i89"))))
|
||||
(native-inputs
|
||||
(list extra-cmake-modules pkg-config))
|
||||
(list extra-cmake-modules pkg-config qttools-5))
|
||||
(inputs
|
||||
`(("kconfigwidgets" ,kconfigwidgets)
|
||||
("kiconthemes" ,kiconthemes)
|
||||
("kwindowsystem" ,kwindowsystem)
|
||||
("ki18n" ,ki18n)
|
||||
("kauth" ,kauth)
|
||||
("kcompletion" ,kcompletion)
|
||||
("kconfig" ,kconfig)
|
||||
("kcoreaddons" ,kcoreaddons)
|
||||
("kdeclarative" ,kdeclarative)
|
||||
("kglobalaccel" ,kglobalaccel)
|
||||
("kio" ,kio)
|
||||
("knewstuff" ,knewstuff)
|
||||
("kwidgetsaddons" ,kwidgetsaddons)
|
||||
("kservice" ,kservice)
|
||||
("qtbase" ,qtbase-5)
|
||||
("qtdeclarative-5" ,qtdeclarative-5)
|
||||
("qtscript" ,qtscript)
|
||||
("qtwebkit" ,qtwebkit)
|
||||
("qtx11extras" ,qtx11extras)
|
||||
("plasma" ,plasma-framework)
|
||||
("zlib" ,zlib)))
|
||||
(list kauth
|
||||
kcompletion
|
||||
kconfig
|
||||
kconfigwidgets
|
||||
kcoreaddons
|
||||
kdeclarative
|
||||
kglobalaccel
|
||||
ki18n
|
||||
kiconthemes
|
||||
kio
|
||||
knewstuff
|
||||
kservice
|
||||
kwidgetsaddons
|
||||
kwindowsystem
|
||||
libnl
|
||||
libcap
|
||||
libpcap
|
||||
`(,lm-sensors "lib")
|
||||
plasma-framework
|
||||
qtbase-5
|
||||
qtdeclarative-5
|
||||
qtscript
|
||||
qtwebchannel-5
|
||||
qtwebengine-5
|
||||
qtwebkit
|
||||
qtx11extras
|
||||
zlib))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
(list #:configure-flags
|
||||
#~`(,(string-append "-DKDE_INSTALL_DATADIR="
|
||||
#$output "/share"))
|
||||
#:phases
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'configure 'patch-cmakelists
|
||||
(lambda _
|
||||
;; TODO: Verify: This should no longer be necessary, since
|
||||
;; KF5AuthConfig.cmake.in contains this already.
|
||||
(substitute* "processcore/CMakeLists.txt"
|
||||
(("KAUTH_HELPER_INSTALL_DIR")
|
||||
"KDE_INSTALL_LIBEXECDIR"))))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
;; TODO: Fix this failing test-case
|
||||
(invoke "ctest" "-E" "processtest"))))))
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
;; TODO: Fix this failing test-case
|
||||
(invoke "ctest" "-E" "processtest")))))))
|
||||
(home-page "https://userbase.kde.org/KSysGuard")
|
||||
(synopsis "Network enabled task and system monitoring")
|
||||
(description "KSysGuard can obtain information on system load and
|
||||
|
@ -335,3 +337,52 @@ manage running processes. It obtains this information by interacting
|
|||
with a ksysguardd daemon, which may also run on a remote system.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public kwayland-server
|
||||
(package
|
||||
(name "kwayland-server")
|
||||
(version "5.24.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://kde/stable/plasma/" version
|
||||
"/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1279nqhy1qyz84dkn23rvzak8bg71hbrp09jlhv9mkjdb3bhnyfi"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules pkg-config))
|
||||
(inputs
|
||||
(list plasma-wayland-protocols
|
||||
qtbase-5
|
||||
qtwayland-5
|
||||
kwayland
|
||||
wayland
|
||||
wayland-protocols-next))
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-install-path
|
||||
(lambda _
|
||||
;; Fixes errors including nonexistant /include/KF5
|
||||
(substitute* "src/server/CMakeLists.txt"
|
||||
(("KF5_INSTALL") "KDE_INSTALL"))))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(setenv "HOME" (getcwd))
|
||||
(setenv "XDG_RUNTIME_DIR" (getcwd))
|
||||
(setenv "QT_QPA_PLATFORM" "offscreen")
|
||||
(invoke "ctest" "-E"
|
||||
;; This test fails inconsistently.
|
||||
"kwayland-testDragAndDrop")))))))
|
||||
(home-page "https://api.kde.org/kwayland-server/html/index.html")
|
||||
(synopsis "KDE wayland server component")
|
||||
(description
|
||||
"KWayland is a Qt-style API to interact with the wayland-client and
|
||||
wayland-server API.")
|
||||
;; Most files are LGPL2.1 or LGPL3.0 only, at the users option.
|
||||
(license (list license:lgpl2.1 license:lgpl3
|
||||
;; src/server/drm_fourcc.h carries the MIT license.
|
||||
license:expat))))
|
||||
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
|
||||
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -25,6 +27,7 @@
|
|||
#:use-module (guix utils)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages kde)
|
||||
#:use-module (gnu packages kde-frameworks)
|
||||
#:use-module (gnu packages linux)
|
||||
|
@ -39,14 +42,14 @@
|
|||
(define-public dolphin
|
||||
(package
|
||||
(name "dolphin")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/dolphin-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0xr5s0s40i2bsfjfapvpa7dxh9s4604cxirg97xcaacd6fdvhpds"))))
|
||||
(base32 "07ian9aai9mjygn6bgxanv8h16i83wf69nkl8c9qynwbz4fkwmwf"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools ruby ruby-test-unit))
|
||||
|
@ -69,14 +72,15 @@
|
|||
knotifications
|
||||
kparts
|
||||
ktextwidgets
|
||||
kuserfeedback
|
||||
kwindowsystem
|
||||
oxygen-icons ;; default icon set
|
||||
breeze-icons ;; default icon set
|
||||
phonon
|
||||
qtbase-5
|
||||
solid))
|
||||
(arguments
|
||||
`(#:tests? #f)) ;; TODO: 4/15 tests fail even with offscreen
|
||||
(home-page "https://kde.org/applications/system/org.kde.dolphin")
|
||||
(home-page "https://apps.kde.org/dolphin/")
|
||||
(synopsis "File manager for KDE")
|
||||
(description "Dolphin is a file manager for KDE focusing on usability.
|
||||
The main features of Dolphin are:
|
||||
|
@ -95,14 +99,14 @@ The main features of Dolphin are:
|
|||
(define-public dolphin-plugins
|
||||
(package
|
||||
(name "dolphin-plugins")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/dolphin-plugins-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "12g44s6g7ma6avp15l45l42qyzbglswvahm2wji79zdls5vjnz7r"))))
|
||||
(base32 "1ii1xrz22caxcgrr9ibzkh7nvw1h9d8xb5a2fadni0makk02qjif"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules))
|
||||
|
@ -111,8 +115,9 @@ The main features of Dolphin are:
|
|||
ki18n
|
||||
kio
|
||||
ktexteditor
|
||||
ksyntaxhighlighting
|
||||
kxmlgui
|
||||
oxygen-icons ;; default icon set
|
||||
breeze-icons ;; default icon set
|
||||
qtbase-5))
|
||||
(home-page "http://www.kde.org/")
|
||||
(synopsis "VCS-Plugins for Dolphin")
|
||||
|
@ -123,14 +128,14 @@ Dolphin with the version control systems: Bzr, Git, Mercurial, Subversion.")
|
|||
(define-public khelpcenter
|
||||
(package
|
||||
(name "khelpcenter")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/khelpcenter-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0wxzjragvjcfc7c4qja8wzpshhaywficj7f7wkmppzybcsxwn9qb"))))
|
||||
(base32 "0ga270imh1ssifj0w3434z9hgrmn0dqrschygywy1z2hcpyx991d"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -151,12 +156,22 @@ Dolphin with the version control systems: Bzr, Git, Mercurial, Subversion.")
|
|||
kservice
|
||||
kwindowsystem
|
||||
libxml2
|
||||
oxygen-icons ;; default icon set
|
||||
breeze-icons ;; default icon set
|
||||
qtbase-5
|
||||
xapian))
|
||||
(arguments
|
||||
`(#:tests? #f)) ;; 1/1 test fails
|
||||
(home-page "https://kde.org/applications/system/org.kde.Help")
|
||||
`(#:tests? #f ;; 1/1 test fails
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'wrap-executable
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out")))
|
||||
;; Since qt-wrap selectors do not wrap for /share/kf5
|
||||
;; directories, we need this so khelpcenter can find html4.css.
|
||||
(wrap-program (string-append out "/bin/khelpcenter")
|
||||
`("XDG_DATA_DIRS" suffix
|
||||
(,(string-append (assoc-ref inputs "khtml") "/share"))))))))))
|
||||
(home-page "https://apps.kde.org/khelpcenter/")
|
||||
(synopsis "KDE documentation viewer")
|
||||
(description "KHelpCenter uses meta data files which describe the
|
||||
documentation available in the system. Each document is represented by a meta
|
||||
|
@ -172,17 +187,17 @@ document meta data file.")
|
|||
(define-public konsole
|
||||
(package
|
||||
(name "konsole")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/konsole-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0ckr7bjkyaw0gr5kx569jfnhkhwmlk4lqk41ng61qwxlb4bsdbdm"))))
|
||||
(base32 "19yrhjjbwq7kaip05ig8raqnh87k5dg57jck2zrsdrhq2f4nb3ql"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
(list extra-cmake-modules kdoctools zlib))
|
||||
(inputs
|
||||
(list kbookmarks
|
||||
kcompletion
|
||||
|
@ -207,7 +222,7 @@ document meta data file.")
|
|||
kwidgetsaddons
|
||||
kwindowsystem
|
||||
kxmlgui
|
||||
oxygen-icons ;; default icon set
|
||||
breeze-icons ;; default icon set
|
||||
qtbase-5
|
||||
qtscript))
|
||||
(arguments
|
||||
|
@ -226,14 +241,14 @@ This package is part of the KDE base applications module.")
|
|||
(define-public krfb
|
||||
(package
|
||||
(name "krfb")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/krfb-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "092ijn88jpmgk2zwz37vzf35jisl234mc3krc9jl7bd955akx51k"))))
|
||||
(base32 "09h05al7ivf9pzf2p6mnja1124746fawmr3vdk6rggjjw0p0wgn1"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules pkg-config kdoctools))
|
||||
|
@ -247,19 +262,23 @@ This package is part of the KDE base applications module.")
|
|||
ki18n
|
||||
knotifications
|
||||
kwallet
|
||||
kwayland
|
||||
kwidgetsaddons
|
||||
kwindowsystem
|
||||
kxmlgui
|
||||
libvnc
|
||||
libxcb
|
||||
libxtst
|
||||
oxygen-icons ;; default icon set
|
||||
breeze-icons ;; default icon set
|
||||
pipewire-0.3
|
||||
plasma-wayland-protocols
|
||||
qtbase-5
|
||||
qtwayland-5
|
||||
qtx11extras
|
||||
wayland
|
||||
xcb-util-image
|
||||
zlib))
|
||||
(home-page "https://kde.org/applications/internet/org.kde.krfb")
|
||||
(home-page "https://apps.kde.org/krfb/")
|
||||
(synopsis "Desktop Sharing utility")
|
||||
(description "KDE Desktop Sharing is a server application that allows you
|
||||
to share your current session with a user on another machine. The desktop
|
||||
|
@ -276,14 +295,14 @@ This package is part of the KDE networking module.")
|
|||
(define-public ksystemlog
|
||||
(package
|
||||
(name "ksystemlog")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/ksystemlog-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1826h89ynvlxdwzyqil2d79cvynglww6fax7qp41wxasgarxhsni"))))
|
||||
(base32 "0x9j3m0kndbaxldsk2rh8zawz0nqqdpn1xf36m4zzymm3b034glv"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -300,9 +319,9 @@ This package is part of the KDE networking module.")
|
|||
ktextwidgets
|
||||
kwidgetsaddons
|
||||
kxmlgui
|
||||
oxygen-icons ;; default icon set
|
||||
breeze-icons ;; default icon set
|
||||
qtbase-5))
|
||||
(home-page "https://kde.org/applications/system/org.kde.ksystemlog")
|
||||
(home-page "https://apps.kde.org/ksystemlog/")
|
||||
(synopsis "System log viewer")
|
||||
(description "This program is developed for being used by beginner users,
|
||||
which don't know how to find information about their Linux system, and how the
|
||||
|
@ -315,14 +334,14 @@ This package is part of the KDE administration module.")
|
|||
(define-public yakuake
|
||||
(package
|
||||
(name "yakuake")
|
||||
(version "20.12.1")
|
||||
(version "22.04.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/yakuake-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"02pal9xx1wbpw7dimvs2aw1xnyjqlvbjlybkkfhf8x7c6m1r63aa"))))
|
||||
"0h5c8j65m6gylvwrj4sag4rlx92brbfllyrwpi7kwfjbwf7a5j1k"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules))
|
||||
|
@ -348,7 +367,7 @@ This package is part of the KDE administration module.")
|
|||
qtbase-5
|
||||
qtsvg-5
|
||||
qtx11extras))
|
||||
(home-page "https://www.kde.org/applications/system/yakuake/")
|
||||
(home-page "https://apps.kde.org/yakuake/")
|
||||
(synopsis "Quad-style terminal emulator for KDE")
|
||||
(description "Yakuake is a drop-down terminal emulator based on KDE Konsole
|
||||
technology. Features include:
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
|
||||
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -25,6 +27,7 @@
|
|||
#:use-module (guix packages)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages backup)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages cmake)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages gnome)
|
||||
|
@ -40,14 +43,14 @@
|
|||
(define-public ark
|
||||
(package
|
||||
(name "ark")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/ark-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0g5bfa1lc7mhrc2ngd4ldf33dpwr7gqrj95kp897pf632wwj23iw"))
|
||||
"1wjy90qkkzafwcw8d4v9cyhmc3sgfipc1085hq2ghqhvrgdyzs00"))
|
||||
;; The libarchive package in Guix does not support
|
||||
;; xar; disable related tests.
|
||||
(patches (search-patches "ark-skip-xar-test.patch"))))
|
||||
|
@ -79,7 +82,8 @@
|
|||
(native-inputs
|
||||
(list extra-cmake-modules pkg-config kdoctools xorg-server))
|
||||
(inputs
|
||||
(list breeze-icons
|
||||
(list bash-minimal
|
||||
breeze-icons
|
||||
karchive
|
||||
kconfig
|
||||
kcrash
|
||||
|
@ -113,14 +117,14 @@ well as CD-ROM images.")
|
|||
(define-public kate
|
||||
(package
|
||||
(name "kate")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kate-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0nrby307syrqlxrf9lwdzc9c15ifw47418qwszqwg345ma2pww7i"))))
|
||||
(base32 "0dnlr1cld6lqanqv98bss66w2bi2y78vqb8jx26addn2r1w4ygkf"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -139,11 +143,12 @@ well as CD-ROM images.")
|
|||
kjobwidgets
|
||||
kparts
|
||||
ktexteditor
|
||||
ksyntaxhighlighting
|
||||
kwallet
|
||||
plasma-framework
|
||||
kwindowsystem
|
||||
kxmlgui
|
||||
oxygen-icons ;; default icon set
|
||||
breeze-icons ;; default icon set
|
||||
qtbase-5
|
||||
qtscript))
|
||||
(arguments
|
||||
|
@ -178,14 +183,14 @@ Kate's features include:
|
|||
(define-public kmag
|
||||
(package
|
||||
(name "kmag")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kmag-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "18lk8i2r90gvw8q5j179xgpniih92mwk06krk7w4jv98yinqf6m5"))))
|
||||
(base32 "08jwv2wnb67vjgz5pv1nn6rwl9ldj8dfd74l6va9vz4x5pk7d859"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -193,7 +198,7 @@ Kate's features include:
|
|||
(list ki18n
|
||||
kio
|
||||
kxmlgui
|
||||
oxygen-icons ;; default icon set
|
||||
breeze-icons ;; default icon set
|
||||
;; TODO: QAccessibilityClient - libqaccessibilityclien
|
||||
qtbase-5))
|
||||
(home-page "https://apps.kde.org/kmag/")
|
||||
|
@ -208,14 +213,14 @@ artists to web-designers to people with low vision.")
|
|||
(define-public kmousetool
|
||||
(package
|
||||
(name "kmousetool")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kmousetool-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "01j6bx8zihns4ip8maj0gb3w3bhx1ha2ljhfmsm6lcyay531ay98"))))
|
||||
(base32 "13pvdhhf3fdkaiyjp0ijqm5qdffabyw7qq2051l1nqv6i7w6lgwx"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -232,7 +237,7 @@ artists to web-designers to people with low vision.")
|
|||
libxtst
|
||||
libxt
|
||||
phonon
|
||||
oxygen-icons ;; default icon set
|
||||
breeze-icons ;; default icon set
|
||||
qtbase-5))
|
||||
(home-page "https://apps.kde.org/kmousetool/")
|
||||
(synopsis "Automatic mouse click and mouse manipulation tool for the
|
||||
|
@ -246,14 +251,14 @@ whom pressing buttons hurts.")
|
|||
(define-public kmouth
|
||||
(package
|
||||
(name "kmouth")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kmouth-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1afgxlys9mvmc3rd33g7gchfb0ylx83x3x0a0qf3dra6cpgsgcg7"))))
|
||||
(base32 "0lzaw7qqvpqzfz4nb2lk8l06c4yxacfg5982yk33g5q0j7r19bpy"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -267,7 +272,7 @@ whom pressing buttons hurts.")
|
|||
kio
|
||||
kwidgetsaddons
|
||||
kxmlgui
|
||||
oxygen-icons ;; default icon set
|
||||
breeze-icons ;; default icon set
|
||||
qtbase-5
|
||||
qtspeech))
|
||||
(home-page "https://apps.kde.org/kmouth/")
|
||||
|
@ -305,7 +310,7 @@ sentences to be re-spoken.")
|
|||
ki18n
|
||||
kwidgetsaddons
|
||||
kxmlgui
|
||||
oxygen-icons ;; default icon set
|
||||
breeze-icons ;; default icon set
|
||||
qtbase-5))
|
||||
(home-page "https://apps.kde.org/kronometer/")
|
||||
(synopsis "Simple stopwatch application")
|
||||
|
@ -348,7 +353,7 @@ to save the times and resume them later.")
|
|||
kwidgetsaddons
|
||||
kwindowsystem
|
||||
kxmlgui
|
||||
oxygen-icons ;; default icon set
|
||||
breeze-icons ;; default icon set
|
||||
qtbase-5
|
||||
solid
|
||||
zlib))
|
||||
|
@ -395,15 +400,14 @@ either be created or generated from a image.")
|
|||
(define-public okteta
|
||||
(package
|
||||
(name "okteta")
|
||||
(version "17.12.3")
|
||||
(version "0.26.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
;; TODO: Why is this not in "stable" anymore
|
||||
(uri (string-append "mirror://kde/Attic/applications/" version
|
||||
(uri (string-append "mirror://kde/stable/okteta/" version
|
||||
"/src/okteta-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"))))
|
||||
(base32 "1yszs3w78dqdr5d8djf6gp4abzc5lcms859imqcq50wl9r6lr18n"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools qttools-5 shared-mime-info))
|
||||
|
@ -423,9 +427,10 @@ either be created or generated from a image.")
|
|||
kservice
|
||||
kwidgetsaddons
|
||||
kxmlgui
|
||||
oxygen-icons ;; default icon set
|
||||
breeze-icons ;; default icon set
|
||||
qca
|
||||
qtbase-5
|
||||
qtdeclarative-5
|
||||
qtscript))
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -480,7 +485,7 @@ redone.")
|
|||
ktextwidgets
|
||||
kwindowsystem
|
||||
kxmlgui
|
||||
oxygen-icons ;; default icon set
|
||||
breeze-icons ;; default icon set
|
||||
qtbase-5))
|
||||
(home-page "https://apps.kde.org/rsibreak/")
|
||||
(synopsis "Assists in the Recovery and Prevention of Repetitive Strain
|
||||
|
@ -526,7 +531,7 @@ remind you to take a break now and then.")
|
|||
kwindowsystem
|
||||
kxmlgui
|
||||
samba
|
||||
oxygen-icons ;; default icon set
|
||||
breeze-icons ;; default icon set
|
||||
plasma-framework
|
||||
qtbase-5
|
||||
qtdeclarative-5
|
||||
|
@ -566,14 +571,14 @@ Features:
|
|||
(define-public sweeper
|
||||
(package
|
||||
(name "sweeper")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/sweeper-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1az3c2khnh51bbmqpamj4p26d3a0ff4l5rd3vcrylg94mk7wgh59"))))
|
||||
(base32 "0kda4a5d9a11am2y6f91bx8v3nb8mw9qh671nskvgkx46x1pww21"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -588,7 +593,7 @@ Features:
|
|||
kio
|
||||
ktextwidgets
|
||||
kxmlgui
|
||||
oxygen-icons ;; default icon set
|
||||
breeze-icons ;; default icon set
|
||||
qtbase-5))
|
||||
(home-page "https://apps.kde.org/sweeper/")
|
||||
(synopsis "Temporary file and history cleaner")
|
||||
|
|
|
@ -15,6 +15,8 @@
|
|||
;;; Copyright © 2021 Alexandros Theodotou <alex@zrythm.org>
|
||||
;;; Copyright © 2021 la snesne <lasnesne@lagunposprasihopre.org>
|
||||
;;; Copyright © 2021, 2022 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
|
||||
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -60,6 +62,7 @@
|
|||
#:use-module (gnu packages ebook)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages geo)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages ghostscript)
|
||||
|
@ -81,6 +84,7 @@
|
|||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages photo)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages polkit)
|
||||
#:use-module (gnu packages protobuf)
|
||||
#:use-module (gnu packages pulseaudio)
|
||||
#:use-module (gnu packages python)
|
||||
|
@ -95,26 +99,21 @@
|
|||
(define-public baloo-widgets
|
||||
(package
|
||||
(name "baloo-widgets")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/baloo-widgets-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1x4v79vhvc5ixkbsf3jyjz5ig1lf78rfw3r7g3llpb4j1kcp3wh0"))))
|
||||
(base32 "0084bnrlbdypdwzxi9gfxcywhyjd1z2cmh7p6gv0zhc9f7h6ffnp"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules))
|
||||
(inputs
|
||||
(list baloo kconfig ki18n kio qtbase-5))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'check-setup
|
||||
(lambda _
|
||||
(setenv "QT_QPA_PLATFORM" "offscreen")
|
||||
#t)))))
|
||||
`(#:tests? #f)) ;; tests fail
|
||||
(home-page "https://community.kde.org/Baloo")
|
||||
(synopsis "Wigets for use with Baloo")
|
||||
(description "Baloo is a framework for searching and managing metadata.
|
||||
|
@ -124,15 +123,14 @@ This package contains GUI widgets for baloo.")
|
|||
(define-public grantleetheme
|
||||
(package
|
||||
(name "grantleetheme")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/grantleetheme-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0gabc5cb0sf00s7m5v2jnq55qsrdbrq6nqd15y1i15p788zifsjx"))
|
||||
(patches (search-patches "grantlee-merge-theme-dirs.patch"))))
|
||||
(base32 "50c6s1g3vp5sdhpiciz1j6rsryld7hcc6lvmxdlsvms2bbcmnj7l"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments `(#:tests? #f)) ; unexpected error in the test suite.
|
||||
(native-inputs
|
||||
|
@ -153,14 +151,14 @@ This package contains GUI widgets for baloo.")
|
|||
(define-public akregator
|
||||
(package
|
||||
(name "akregator")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/akregator-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1711yhwsdq9iyc3wm3a4xmz81p73hvvc0h58sasc89ifpry50k2p"))))
|
||||
(base32 "9yy5c29zxpli4cddknmdvjkgii3j7pvw6lhwqfrqjc8jh83gm8f8"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -222,7 +220,7 @@ browser for easy news reading.")
|
|||
(define-public kdenlive
|
||||
(package
|
||||
(name "kdenlive")
|
||||
(version "21.12.3")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -231,7 +229,7 @@ browser for easy news reading.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "19fs5zhz1nv5cvf709c5741nri139pl5mzpf2xnd4sqj0rmyv228"))))
|
||||
(base32 "0v545kd5rm5isy4cx21fp3pi49mvsv1r1ahp0jhim8s6b7ghrh64"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
;; XXX: there is a single test that spawns other tests and
|
||||
|
@ -306,68 +304,65 @@ projects.")
|
|||
(define-public kdevelop
|
||||
(package
|
||||
(name "kdevelop")
|
||||
(version "5.6.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/kdevelop"
|
||||
"/" version "/src/kdevelop-"
|
||||
version ".tar.xz"))
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kdevelop-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "02ip5r67hjfpywkm3mz86n6wbqcr7996ifzfd2fyzsvm4998hi4y"))))
|
||||
(base32 "03dwllxy96sy20kdsc3sll0n6bhh6gdmpjl821flsxv0jb5naplv"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules pkg-config shared-mime-info qttools-5))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("clang" ,clang)
|
||||
("grantlee" ,grantlee)
|
||||
("karchive" ,karchive)
|
||||
("kcmutils" ,kcmutils)
|
||||
("kcrash" ,kcrash)
|
||||
("kdeclarative" ,kdeclarative)
|
||||
("kdoctools" ,kdoctools)
|
||||
("kguiaddons" ,kguiaddons)
|
||||
("ki18n" ,ki18n)
|
||||
("kiconthemes" ,kiconthemes)
|
||||
("kio" ,kio) ;; not checked as requirement
|
||||
("kitemmodels" ,kitemmodels)
|
||||
("kitemviews" ,kitemviews)
|
||||
("kjobwidgets" ,kjobwidgets)
|
||||
("knotifications" ,knotifications)
|
||||
("knotifyconfig" ,knotifyconfig)
|
||||
("kparts" ,kparts)
|
||||
("kservice" ,kservice)
|
||||
("ktexteditor" ,ktexteditor)
|
||||
("kwindowsystem" ,kwindowsystem)
|
||||
("kxmlgui" ,kxmlgui)
|
||||
("libkomparediff2" ,libkomparediff2)
|
||||
("oxygen-icons" ,oxygen-icons)
|
||||
("qtbase" ,qtbase-5)
|
||||
("qtdeclarative-5" ,qtdeclarative-5)
|
||||
("qtquickcontrols-5" ,qtquickcontrols-5) ;; not checked as requirement
|
||||
("qtquickcontrols2-5" ,qtquickcontrols2-5) ;; not checked as requirement
|
||||
("qtwebkit" ,qtwebkit)
|
||||
("threadweaver" ,threadweaver)
|
||||
|
||||
;; recommendes
|
||||
("astyle" ,astyle)
|
||||
("kdevelop-pg-qt" ,kdevelop-pg-qt)
|
||||
("libksysguard" ,libksysguard)
|
||||
|
||||
;; optional
|
||||
("apr" ,apr) ; required for subversion support
|
||||
("apr-util" ,apr-util) ; required for subversion support
|
||||
("attica" ,attica)
|
||||
("kconfigwidgets" ,kconfigwidgets)
|
||||
("knewstuff" ,knewstuff)
|
||||
("krunner" ,krunner)
|
||||
;; TODO: OktetaGui, OktetaKastenControllers
|
||||
("plasma" ,plasma-framework)
|
||||
;; TODO: purpose
|
||||
("sonnet" ,sonnet)
|
||||
("subversion" ,subversion)))
|
||||
(inputs (list boost
|
||||
clang
|
||||
grantlee
|
||||
karchive
|
||||
kcmutils
|
||||
kcrash
|
||||
kdeclarative
|
||||
kdoctools
|
||||
kguiaddons
|
||||
ki18n
|
||||
kiconthemes
|
||||
kio ;; not checked as requirement
|
||||
kitemmodels
|
||||
kitemviews
|
||||
kjobwidgets
|
||||
knotifications
|
||||
knotifyconfig
|
||||
kparts
|
||||
kservice
|
||||
ksyntaxhighlighting
|
||||
ktexteditor
|
||||
kwindowsystem
|
||||
kxmlgui
|
||||
libkomparediff2
|
||||
breeze-icons
|
||||
qtbase-5
|
||||
qtdeclarative-5
|
||||
qtquickcontrols-5 ;; not checked as requirement
|
||||
qtquickcontrols2-5 ;; not checked as requirement
|
||||
qtwebkit
|
||||
threadweaver
|
||||
;; recommendes
|
||||
astyle
|
||||
kdevelop-pg-qt
|
||||
libksysguard
|
||||
|
||||
;; optional
|
||||
apr ; required for subversion support
|
||||
apr-util ; required for subversion support
|
||||
attica
|
||||
kconfigwidgets
|
||||
knewstuff
|
||||
krunner
|
||||
;; TODO: OktetaGui, OktetaKastenControllers
|
||||
plasma-framework
|
||||
;; TODO: purpose
|
||||
sonnet
|
||||
subversion))
|
||||
;; run-time packages - TODO
|
||||
;; ClazyStandalone
|
||||
;; Cppcheck
|
||||
|
@ -404,7 +399,7 @@ software (Git, Subversion, Mercurial, CVS and Bazaar).")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1kfab4p717acbdkcdi41d98vwch7v431gb2qi6s38hmclsf8bf8g"))))
|
||||
(base32 "3kfab4p717acbdkcdi41d98vwch7v431gb2qi6s38hmclsf8bf8g"))))
|
||||
(native-inputs
|
||||
(list extra-cmake-modules))
|
||||
(inputs
|
||||
|
@ -422,14 +417,14 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).")
|
|||
(define-public kdiagram
|
||||
(package
|
||||
(name "kdiagram")
|
||||
(version "2.7.0")
|
||||
(version "2.8.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/kdiagram/" version
|
||||
"/kdiagram-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1pgvf2q8b59hw0jg5ajmj5nrn4q8cgnifpvdd0fynk2ml6zym8k3"))
|
||||
(base32 "07s3kwv0mqvb64x8nz4w1yb3hbk28yzkw4qg1jibai7as4xsv7ap"))
|
||||
(patches (search-patches
|
||||
"kdiagram-Fix-missing-link-libraries.patch"))))
|
||||
(build-system qt-build-system)
|
||||
|
@ -460,7 +455,7 @@ illustrate project schedules.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "088q3kkv2wq426w000iq14wy3a45rrnn0bmsdks6caz4vq04ccay"))))
|
||||
(base32 "888q3kkv2wq426w000iq14wy3a45rrnn0bmsdks6caz4vq04ccay"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list "-DBUILD_TESTS=ON"))) ; disabled by default
|
||||
|
@ -485,7 +480,7 @@ expression library, that is used in Krita.")
|
|||
"mirror://kde/stable/krita/" version "/krita-" version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0iaypyv21zxvhr989r9j9nlhx642jc89xphz1qaw9q1y0yjiy7gd"))))
|
||||
(base32 "2iaypyv21zxvhr989r9j9nlhx642jc89xphz1qaw9q1y0yjiy7gd"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
|
@ -525,7 +520,7 @@ expression library, that is used in Krita.")
|
|||
libheif
|
||||
libmypaint
|
||||
libpng
|
||||
libraw-0.18
|
||||
libraw
|
||||
libtiff
|
||||
libwebp
|
||||
libx11
|
||||
|
@ -577,7 +572,7 @@ features include brush stabilizers, brush engines and wrap-around mode.")
|
|||
qtbase-5
|
||||
qtsvg-5
|
||||
qtxmlpatterns))
|
||||
(home-page "https://apps.kde.org/en/massif-visualizer")
|
||||
(home-page "https://apps.kde.org/massif-visualizer/")
|
||||
(synopsis "Visualize massif data generated by Valgrind")
|
||||
(description
|
||||
"Massif Visualizer is a tool that visualizes massif data.
|
||||
|
@ -589,14 +584,14 @@ compressed massif files can also be opened transparently.")
|
|||
(define-public libkomparediff2
|
||||
(package
|
||||
(name "libkomparediff2")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/libkomparediff2-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0m8m7sgpf2f4nxpaaymyvihlk0pcyblyd99mcbibrnyr5kzkzzdc"))))
|
||||
(base32 "1vaxbx7c6r7skh3452blxyrngfcsdyjmmvcg6j2wcsn04m01mw8k"))))
|
||||
(native-inputs
|
||||
(list extra-cmake-modules pkg-config))
|
||||
(inputs
|
||||
|
@ -620,14 +615,14 @@ used in KDE development tools Kompare and KDevelop.")
|
|||
(define-public qca
|
||||
(package
|
||||
(name "qca")
|
||||
(version "2.3.3")
|
||||
(version "2.3.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/qca/" version
|
||||
"/qca-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0rvvf97la95lah67jcj0p06n4br0pc2mri0q1hn4x522hndqybjn"))))
|
||||
(base32 "1i7m5y3dfwij9cyjp72ya5zd2skgp7mfmrmf7bvrbzg3ly0mhsbb"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
|
@ -644,16 +639,15 @@ cards.")
|
|||
(define-public kpmcore
|
||||
(package
|
||||
(name "kpmcore")
|
||||
(version "4.1.0")
|
||||
(version "22.04.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://kde/stable/kpmcore"
|
||||
"/" version "/src/"
|
||||
name "-" version ".tar.xz"))
|
||||
"mirror://kde/stable/release-service/" version
|
||||
"/src/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0jsig7algmab9h0fb09my0axjqzw83zgscamhzl8931lribs6idm"))))
|
||||
"04qslli4vnbnl329zynbinlwaigxr9xpswra5n0v710p92as0qif"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules pkg-config))
|
||||
|
@ -662,9 +656,19 @@ cards.")
|
|||
kcoreaddons
|
||||
ki18n
|
||||
kwidgetsaddons
|
||||
polkit-qt
|
||||
qtbase-5
|
||||
qca
|
||||
`(,util-linux "lib")))
|
||||
(arguments
|
||||
`(#:tests? #f ;; 4/6 tests fail do to no plugin instance
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-cmake-install-directories
|
||||
(lambda _
|
||||
(substitute* "src/util/CMakeLists.txt"
|
||||
(("DESTINATION \\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}")
|
||||
"DESTINATION share/polkit-1/actions")))))))
|
||||
(home-page "https://community.kde.org/Frameworks")
|
||||
(synopsis "Library for managing partitions")
|
||||
(description "Library for managing partitions.")
|
||||
|
@ -699,7 +703,7 @@ different notification systems.")
|
|||
(define-public kdeconnect
|
||||
(package
|
||||
(name "kdeconnect")
|
||||
(version "20.04.2")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -708,47 +712,47 @@ different notification systems.")
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0yq3afbbcc9gmlcachvh3xz3gdj57092fpagp36l5knw8gr0d9ip"))))
|
||||
"015gxglclds2vmjr4bv51yfv840bafzgrl71cnwgnwwy8rrh9x4x"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-DBUILD_TESTING=ON"
|
||||
"-DKDE_INSTALL_LIBEXECDIR=libexec")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'adjust-include-header
|
||||
(lambda _
|
||||
(substitute* "plugins/runcommand/runcommandplugin.cpp"
|
||||
(("<kcmutils_version.h>")
|
||||
"<KF5/kcmutils_version.h>")))))
|
||||
"-DKDE_INSTALL_LIBEXECDIR=libexec"
|
||||
;; So kdeconnect.so isn't installed to lib/plugins
|
||||
"-DPLUGIN_INSTALL_DIR=lib/qt5/plugins")
|
||||
#:tests? #f)) ; tests fail hard in our build environment
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("kdoctools" ,kdoctools)
|
||||
("libxtst" ,libxtst)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python-wrapper)))
|
||||
(list extra-cmake-modules
|
||||
kdoctools
|
||||
libxtst
|
||||
pkg-config
|
||||
python-wrapper))
|
||||
(inputs
|
||||
(list kcmutils
|
||||
kconfigwidgets
|
||||
kdbusaddons
|
||||
kguiaddons
|
||||
ki18n
|
||||
kiconthemes
|
||||
kio
|
||||
kirigami
|
||||
knotifications
|
||||
kpackage
|
||||
kpeople
|
||||
kpeoplevcard
|
||||
kwayland
|
||||
libfakekey
|
||||
pulseaudio-qt
|
||||
qca
|
||||
qqc2-desktop-style
|
||||
qtbase-5
|
||||
qtdeclarative-5
|
||||
qtgraphicaleffects
|
||||
qtmultimedia-5
|
||||
qtquickcontrols-5
|
||||
qtquickcontrols2-5
|
||||
qtx11extras))
|
||||
qtx11extras
|
||||
qtwayland-5
|
||||
wayland))
|
||||
(home-page "https://community.kde.org/KDEConnect")
|
||||
(synopsis "Enable your devices to communicate with each other")
|
||||
(description "KDE Connect is a project that enables all your devices to
|
||||
|
@ -770,7 +774,7 @@ communicate with each other. Here's a few things KDE Connect can do:
|
|||
(define-public labplot
|
||||
(package
|
||||
(name "labplot")
|
||||
(version "2.8.2")
|
||||
(version "2.9.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -778,7 +782,7 @@ communicate with each other. Here's a few things KDE Connect can do:
|
|||
"/" version "/labplot-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1yhxnchwb4n83sxrbn4im41g2sqr0xsim2y242mvyd8pjzd83icf"))))
|
||||
(base32 "1wi19gj18yhrim1cb2dwgpnc2yvydm87h41fcg670ampy24i98z5"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -795,7 +799,7 @@ communicate with each other. Here's a few things KDE Connect can do:
|
|||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
;; This test fails, I don't know why.
|
||||
(invoke "ctest" "-E" "parsertest")))))))
|
||||
(invoke "ctest" "-E" "(ParserTest|ReadStatFilterTest)")))))))
|
||||
(native-inputs (list bison
|
||||
extra-cmake-modules
|
||||
pkg-config
|
||||
|
@ -846,7 +850,7 @@ to perform data analysis.")
|
|||
(define-public kqtquickcharts
|
||||
(package
|
||||
(name "kqtquickcharts")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -854,7 +858,7 @@ to perform data analysis.")
|
|||
version "/src/kqtquickcharts-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1wxp35mf9zlpgzi4msdl86b2krdq2ipqw371gyx23r7j84vdyxi3"))))
|
||||
"0bm7rdysvlfnfnvy87ii3kxl238q83vw0ia58zsnwjmkxmlgf6mp"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules))
|
||||
|
@ -870,14 +874,14 @@ charts.")
|
|||
(define-public kdf
|
||||
(package
|
||||
(name "kdf")
|
||||
(version "20.12.1")
|
||||
(version "22.04.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/"
|
||||
version "/src/kdf-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ba67hs4vlb3qyvdzhnpmf8p62df12s8aqw4hzf9vnxff3qix5k1"))))
|
||||
"1m0dwk3inqzk9kjjzgsaam15lnpbhzjfmwrzv8sazfk44scnr2v1"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
|
@ -930,14 +934,14 @@ timers for each task can be started, stopped, changed, or looped.")
|
|||
(define-public kcachegrind
|
||||
(package
|
||||
(name "kcachegrind")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/kcachegrind-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fx17s6fj1pxl1mgfrqhchk8sihkbji1x8y3nhb1r0971wzd1nsc"))))
|
||||
"12ckn90hqm2c5c58xqkzgcih64jk4kwkgz4q0f5ns1rxv3pidz5n"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules perl python qttools-5 kdoctools))
|
||||
|
@ -964,14 +968,14 @@ Python, PHP, and Perl.")
|
|||
(define-public libkdegames
|
||||
(package
|
||||
(name "libkdegames")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/libkdegames-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1xsrrvhwjwi5aajcaxydmzc69i4yx6shs8ly8vr85njc188ycg13"))))
|
||||
(base32 "0igq87anam9x2mclb0lkvwhrxk62y1f4xl14a4dhd97mqsc5pbzn"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules))
|
||||
|
@ -1002,7 +1006,7 @@ Python, PHP, and Perl.")
|
|||
qtbase-5
|
||||
qtdeclarative-5
|
||||
qtsvg-5))
|
||||
(home-page "https://games.kde.org/")
|
||||
(home-page "https://apps.kde.org/categories/games/")
|
||||
(synopsis "Runtime library for kdegames")
|
||||
(description "Runtime library for kdegames")
|
||||
(license (list license:gpl2+ license:fdl1.2+))))
|
||||
|
@ -1010,7 +1014,7 @@ Python, PHP, and Perl.")
|
|||
(define-public marble-qt
|
||||
(package
|
||||
(name "marble-qt")
|
||||
(version "21.12.3")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -1019,7 +1023,8 @@ Python, PHP, and Perl.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1h5a7did4shi3z5l0ad9arl6xr79xpjr7dbzx5l8xpp771pb0pcj"))))
|
||||
(base32
|
||||
"1saacnrl0hkl32nq96l1bgn9yrsz455q96jdxzp7ax8iaa5nmdiz"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
;; FIXME: libmarblewidget-qt5.so.28 not found. Also enable the
|
||||
|
@ -1066,14 +1071,14 @@ creating routes by drag and drop and more.")
|
|||
(define-public okular
|
||||
(package
|
||||
(name "okular")
|
||||
(version "20.12.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0gpm7n47yijsjg4yba561j5pbvd98hgvr93w1kvzk851nb87m89c"))))
|
||||
(base32 "03jpwgrhjgyx14g1h3lxhnyib88ck0qkqcxh4fpc398xwdr3amkw"))))
|
||||
(build-system qt-build-system)
|
||||
;; The tests fail because they can't find the proper mimetype plugins:
|
||||
;; "org.kde.okular.core: No plugin for mimetype '"image/jpeg"'."
|
||||
|
@ -1121,7 +1126,7 @@ creating routes by drag and drop and more.")
|
|||
threadweaver
|
||||
kcrash
|
||||
kjs))
|
||||
(home-page "https://kde.org/applications/graphics/okular/")
|
||||
(home-page "https://apps.kde.org/okular/")
|
||||
(synopsis "Document viewer")
|
||||
(description
|
||||
"Okular is a document viewer developed for KDE. It can display files in
|
||||
|
@ -1131,7 +1136,7 @@ a variety of formats, including PDF, PostScript, DejaVu, and EPub.")
|
|||
(define-public poxml
|
||||
(package
|
||||
(name "poxml")
|
||||
(version "20.12.1")
|
||||
(version "22.04.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -1139,13 +1144,13 @@ a variety of formats, including PDF, PostScript, DejaVu, and EPub.")
|
|||
"/src/poxml-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1smjvblx0jcv3afs2sr4qcmvhqd44iw24hvr9fppa3nxhrmjwmlk"))))
|
||||
"1nrp0i3a39pw4pzcanpmjyks3pl1lyfj3zq61ii8xx402xw1ip2w"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules kdoctools))
|
||||
(inputs
|
||||
(list gettext-minimal qtbase-5))
|
||||
(home-page "https://kde.org/applications/development")
|
||||
(home-page "https://apps.kde.org/development/")
|
||||
(synopsis "Tools for translating DocBook XML files with Gettext")
|
||||
(description "This is a collection of tools that facilitate translating
|
||||
DocBook XML files using Gettext message files (PO files). Also included are
|
||||
|
@ -1156,14 +1161,14 @@ PO template files.")
|
|||
(define-public kdegraphics-mobipocket
|
||||
(package
|
||||
(name "kdegraphics-mobipocket")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0fm880lp9g60zgrkjyh4jxws6x0s77l9ia4f8pza3w8sxcbbswk5"))))
|
||||
(base32 "12yrwa22c4qxsf10fv76fzaaj5xlv5lmrwcqvf6qhgr6f9qsw7sj"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules))
|
||||
|
@ -1178,14 +1183,14 @@ Mobipocket e-books in Dolphin and other KDE apps.")
|
|||
(define-public libkexiv2
|
||||
(package
|
||||
(name "libkexiv2")
|
||||
(version "20.12.0")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/" name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0k0iinf7s8qlk3fwvq7iic1b4zn2gm65rfd58q7d3wb1i1j2hjjk"))))
|
||||
(base32 "0p43z69yh5jk8m1hn3xynjpgzxpkc89h0dafj5964qx4xp4vxl19"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules))
|
||||
|
@ -1200,20 +1205,20 @@ picture metadata as EXIF/IPTC and XMP.")
|
|||
(define-public zeroconf-ioslave
|
||||
(package
|
||||
(name "zeroconf-ioslave")
|
||||
(version "20.04.1")
|
||||
(version "22.04.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||
"/src/zeroconf-ioslave-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1qck5jyc4psslpibhki8sz8aj0hsnx8z791vzyn10lmdzn71vx8c"))))
|
||||
(base32 "0jbrdbphxn77dg2a4wzsm7q24455j4d1xhd4rj5iwhq4ywiig9i1"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules))
|
||||
(inputs
|
||||
(list kdbusaddons kdnssd ki18n kio qtbase-5))
|
||||
(home-page "https://kde.org/applications/internet/org.kde.zeroconf_ioslave")
|
||||
(home-page "https://apps.kde.org/kio_zeroconf/")
|
||||
(synopsis "DNS-SD Service Discovery Monitor")
|
||||
(description "Adds an entry to Dolphin's Network page to show local
|
||||
services such as printers which advertise themselves with DNSSD (called Avahi
|
||||
|
@ -1227,14 +1232,14 @@ or Bonjour by other projects).")
|
|||
;; FIXME: Check https://www.reddit.com/r/kde/comments/f7ojg9 for insights
|
||||
(package
|
||||
(name "kuserfeedback")
|
||||
(version "1.0.0")
|
||||
(version "1.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/kuserfeedback/"
|
||||
"/kuserfeedback-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1dwx9fscnfp3zsxdir774skn8xvad2dvscnaaw3ji6mrnkmm6bss"))))
|
||||
(base32 "0r7jcc88n5b4rc0asjzh7m7g33i35k3z99l08qkrn92kn4ickakn"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list extra-cmake-modules
|
||||
|
|
|
@ -82,13 +82,13 @@ conversions for values passed between the two languages.")
|
|||
(define-public python-cffi
|
||||
(package
|
||||
(name "python-cffi")
|
||||
(version "1.14.4")
|
||||
(version "1.15.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "cffi" version))
|
||||
(sha256
|
||||
(base32 "0v080s7vlrjz9z823x2yh36yc8drwpvvir6w8wfkkzd7k2z5qihs"))))
|
||||
(base32 "1y9lr651svbzf1m03s4lqbnbv2byx8f6f0ml7hjm24vvlfwvy06l"))))
|
||||
(build-system python-build-system)
|
||||
(inputs
|
||||
(list libffi))
|
||||
|
@ -118,9 +118,8 @@ conversions for values passed between the two languages.")
|
|||
;; using find_library or the like with their name fail when the
|
||||
;; resolved .so object is a linker script rather than an ELF
|
||||
;; binary (this is a limitation of the ctype library of Python).
|
||||
(let* ((glibc (assoc-ref inputs "libc"))
|
||||
(libm (string-append glibc "/lib/libm.so.6"))
|
||||
(libc (string-append glibc "/lib/libc.so.6")))
|
||||
(let ((libm (search-input-file inputs "lib/libm.so.6"))
|
||||
(libc (search-input-file inputs "lib/libc.so.6")))
|
||||
(substitute* '("testing/cffi0/test_function.py"
|
||||
"testing/cffi0/test_parsing.py"
|
||||
"testing/cffi0/test_unicode_literals.py"
|
||||
|
@ -140,18 +139,6 @@ conversions for values passed between the two languages.")
|
|||
(description "Foreign Function Interface for Python calling C code.")
|
||||
(license expat)))
|
||||
|
||||
;; TODO(staging): Merge with the above.
|
||||
(define-public python-cffi-1.15
|
||||
(package
|
||||
(inherit python-cffi)
|
||||
(version "1.15.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "cffi" version))
|
||||
(sha256
|
||||
(base32 "0m3rz2pqfmyfagx0bhj2jlbr2h58j3wr3cyv1agxkhlnm1k0s3wj"))))))
|
||||
|
||||
(define-public python-cffi-documentation
|
||||
(package
|
||||
(name "python-cffi-documentation")
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -20,28 +22,32 @@
|
|||
|
||||
(define-module (gnu packages libunwind)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix licenses))
|
||||
|
||||
(define-public libunwind
|
||||
(package
|
||||
(name "libunwind")
|
||||
(version "1.5.0")
|
||||
(version "1.6.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://savannah/libunwind/libunwind-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"05qhzcg1xag3l5m3c805np6k342gc0f3g087b7g16jidv59pccwh"))))
|
||||
"0xj9g6a9q7v7zz6lymf3f6011synibgawi4wi384bywid5kfqsja"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; FIXME: As of glibc 2.25, we get 1 out of 34 test failures (2 are
|
||||
;; expected to fail).
|
||||
;; Report them upstream.
|
||||
'(#:tests? #f))
|
||||
`(;; Two tests are failing with newer toolchains:
|
||||
;; https://github.com/libunwind/libunwind/issues/363
|
||||
#:make-flags
|
||||
'("XFAIL_TESTS=run-coredump-unwind run-coredump-unwind-mdi")
|
||||
;; A different collection of tests fails for each architecture.
|
||||
#:tests? ,(and (not (%current-target-system))
|
||||
(target-x86-64?))))
|
||||
(home-page "https://www.nongnu.org/libunwind")
|
||||
(synopsis "Determining the call chain of a program")
|
||||
(description
|
||||
|
|
|
@ -5386,7 +5386,7 @@ Bluetooth audio output devices like headphones or loudspeakers.")
|
|||
(define-public bluez
|
||||
(package
|
||||
(name "bluez")
|
||||
(version "5.61")
|
||||
(version "5.64")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -5394,53 +5394,49 @@ Bluetooth audio output devices like headphones or loudspeakers.")
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fs2kjsdhylxniqhii63i85fjszbqbz3iddwmgz4nmbr472xdbw3"))))
|
||||
"0d6yl7l5zrlx5w3y503k72m9xsydx6gi1c65icchq1xknrjpwhxf"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(let ((out (assoc-ref %outputs "out")))
|
||||
(list "--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
"--enable-library"
|
||||
"--disable-systemd"
|
||||
;; TODO: is this needed? Not installed by default since 5.55.
|
||||
"--enable-hid2hci"
|
||||
;; Install dbus/udev files to the correct location.
|
||||
(string-append "--with-dbusconfdir=" out "/etc")
|
||||
(string-append "--with-udevdir=" out "/lib/udev")))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; Test unit/test-gatt fails unpredictably. Seems to be a timing
|
||||
;; issue (discussion on upstream mailing list:
|
||||
;; https://marc.info/?t=149578476300002&r=1&w=2)
|
||||
(add-before 'check 'skip-wonky-test
|
||||
(list
|
||||
#:configure-flags
|
||||
#~(list "--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
"--enable-library"
|
||||
"--disable-systemd"
|
||||
;; TODO: is this needed? Not installed by default since 5.55.
|
||||
"--enable-hid2hci"
|
||||
;; Install dbus/udev files to the correct location.
|
||||
(string-append "--with-dbusconfdir=" #$output "/etc")
|
||||
(string-append "--with-udevdir=" #$output "/lib/udev"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; Test unit/test-gatt fails unpredictably. Seems to be a timing
|
||||
;; issue (discussion on upstream mailing list:
|
||||
;; https://marc.info/?t=149578476300002&r=1&w=2)
|
||||
(add-before 'check 'skip-wonky-test
|
||||
(lambda _
|
||||
(substitute* "unit/test-gatt.c"
|
||||
(("tester_init\\(&argc, &argv\\);") "return 77;"))
|
||||
#t))
|
||||
(add-after 'install 'post-install
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(servicedir (string-append out "/share/dbus-1/services"))
|
||||
(service "obexd/src/org.bluez.obex.service")
|
||||
(rule (string-append
|
||||
out "/lib/udev/rules.d/97-hid2hci.rules")))
|
||||
;; Install the obex dbus service file.
|
||||
(substitute* service
|
||||
(("/bin/false")
|
||||
(string-append out "/libexec/bluetooth/obexd")))
|
||||
(install-file service servicedir)
|
||||
;; Fix paths in the udev rule.
|
||||
(substitute* rule
|
||||
(("hid2hci --method")
|
||||
(string-append out "/lib/udev/hid2hci --method"))
|
||||
(("/sbin/udevadm")
|
||||
(search-input-file inputs "/bin/udevadm")))
|
||||
#t))))))
|
||||
(("tester_init\\(&argc, &argv\\);") "return 77;"))))
|
||||
(add-after 'install 'post-install
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out #$output)
|
||||
(servicedir (string-append out "/share/dbus-1/services"))
|
||||
(service "obexd/src/org.bluez.obex.service")
|
||||
(rule (string-append
|
||||
out "/lib/udev/rules.d/97-hid2hci.rules")))
|
||||
;; Install the obex dbus service file.
|
||||
(substitute* service
|
||||
(("/bin/false")
|
||||
(string-append out "/libexec/bluetooth/obexd")))
|
||||
(install-file service servicedir)
|
||||
;; Fix paths in the udev rule.
|
||||
(substitute* rule
|
||||
(("hid2hci --method")
|
||||
(string-append out "/lib/udev/hid2hci --method"))
|
||||
(("/sbin/udevadm")
|
||||
(search-input-file inputs "/bin/udevadm")))))))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("rst2man" ,python-docutils)
|
||||
("gettext" ,gettext-minimal)))
|
||||
(list pkg-config python-docutils gettext-minimal))
|
||||
(inputs
|
||||
(list glib dbus eudev libical readline))
|
||||
(home-page "http://www.bluez.org/")
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
|
||||
;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca>
|
||||
;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2018-2020, 2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
|
||||
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
|
||||
|
@ -712,6 +712,15 @@ timeouts.")
|
|||
(inputs (list sbcl-alexandria))
|
||||
(native-inputs (list sbcl-fiveam))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'adjust-test-sleep
|
||||
(lambda _
|
||||
;; 0.001 is too short for some slower machines.
|
||||
(substitute* "test/bordeaux-threads-test.lisp"
|
||||
(("sleep 0\\.001") "sleep 0.002")))))))
|
||||
(synopsis "Portable shared-state concurrency library for Common Lisp")
|
||||
(description "BORDEAUX-THREADS is a proposed standard for a minimal
|
||||
MP/Threading interface. It is similar to the CLIM-SYS threading and lock
|
||||
|
|
|
@ -4873,7 +4873,7 @@ Fresnel integrals, and similar related functions as well.")
|
|||
(define-public suitesparse
|
||||
(package
|
||||
(name "suitesparse")
|
||||
(version "5.10.1")
|
||||
(version "5.12.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -4883,7 +4883,7 @@ Fresnel integrals, and similar related functions as well.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"19gx5wlgqnqpgz6mvam9lalyzpbfwgqhppps8z3np9sh0mgaiyw9"))
|
||||
"0zpl51pfpv7ap7z97jlryba2la1qdmzm11bhzkn55wlb03xzi6k6"))
|
||||
(patches (search-patches "suitesparse-mongoose-cmake.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
|
|
|
@ -40,52 +40,52 @@
|
|||
(define-public nspr
|
||||
(package
|
||||
(name "nspr")
|
||||
(version "4.31")
|
||||
(version "4.34")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v"
|
||||
version "/src/nspr-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1j5b2m8cjlhnnv8sq34587avaagkqvh521w4f95miwgvsn3xlaap"))))
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v"
|
||||
version "/src/nspr-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"177rxcf3lglabs7sgwcvf72ww4v56qa71lc495wl13sxs4f03vxy"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
;; For 'compile-et.pl' and 'nspr-config'.
|
||||
(list perl ;for 'compile-et.pl'
|
||||
bash-minimal)) ;for 'nspr-config'
|
||||
(list perl ;for 'compile-et.pl'
|
||||
bash-minimal)) ;for 'nspr-config'
|
||||
(native-inputs
|
||||
(list perl))
|
||||
(arguments
|
||||
`(;; Prevent the 'native' perl from sneaking into the closure.
|
||||
;; XXX it would be nice to do the same for 'bash-minimal',
|
||||
;; but using 'canonical-package' causes loops.
|
||||
,@(if (%current-target-system)
|
||||
`(#:disallowed-references
|
||||
(,(gexp-input (this-package-native-input "perl") #:native? #t)))
|
||||
'())
|
||||
#:tests? #f ; no check target
|
||||
#:configure-flags
|
||||
(list "--disable-static"
|
||||
"--enable-64bit"
|
||||
(string-append "LDFLAGS=-Wl,-rpath="
|
||||
(assoc-ref %outputs "out") "/lib")
|
||||
;; Mozilla deviates from Autotools conventions
|
||||
;; due to historical reasons. Adjust to Mozilla conventions,
|
||||
;; otherwise the Makefile will try to use TARGET-gcc
|
||||
;; as a ‘native’ compiler.
|
||||
,@(if (%current-target-system)
|
||||
`(,(string-append "--host="
|
||||
(nix-system->gnu-triplet (%current-system)))
|
||||
,(string-append "--target=" (%current-target-system)))
|
||||
'()))
|
||||
;; Use fixed timestamps for reproducibility.
|
||||
#:make-flags '("SH_DATE='1970-01-01 00:00:01'"
|
||||
;; This is epoch 1 in microseconds.
|
||||
"SH_NOW=100000")
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'configure 'chdir
|
||||
(lambda _ (chdir "nspr") #t)))))
|
||||
(list
|
||||
;; Prevent the 'native' perl from sneaking into the closure.
|
||||
;; XXX it would be nice to do the same for 'bash-minimal',
|
||||
;; but using 'canonical-package' causes loops.
|
||||
#:disallowed-references
|
||||
(if (%current-target-system)
|
||||
(list (gexp-input (this-package-native-input "perl") #:native? #t))
|
||||
#f)
|
||||
#:tests? #f ;no check target
|
||||
#:configure-flags
|
||||
#~(list "--disable-static"
|
||||
"--enable-64bit"
|
||||
(string-append "LDFLAGS=-Wl,-rpath="
|
||||
(assoc-ref %outputs "out") "/lib")
|
||||
;; Mozilla deviates from Autotools conventions
|
||||
;; due to historical reasons. Adjust to Mozilla conventions,
|
||||
;; otherwise the Makefile will try to use TARGET-gcc
|
||||
;; as a ‘native’ compiler.
|
||||
#$@(if (%current-target-system)
|
||||
#~((string-append "--host="
|
||||
#$(nix-system->gnu-triplet (%current-system)))
|
||||
(string-append "--target=" #$(%current-target-system)))
|
||||
#~()))
|
||||
;; Use fixed timestamps for reproducibility.
|
||||
#:make-flags #~'("SH_DATE='1970-01-01 00:00:01'"
|
||||
;; This is epoch 1 in microseconds.
|
||||
"SH_NOW=100000")
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
(add-before 'configure 'chdir
|
||||
(lambda _ (chdir "nspr") #t)))))
|
||||
(home-page
|
||||
"https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR")
|
||||
(synopsis "Netscape API for system level and libc-like functions")
|
||||
|
@ -112,7 +112,7 @@ in the Mozilla clients.")
|
|||
(name "nss")
|
||||
;; Also update and test the nss-certs package, which duplicates version and
|
||||
;; source to avoid a top-level variable reference & module cycle.
|
||||
(version "3.72")
|
||||
(version "3.81")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (let ((version-with-underscores
|
||||
|
@ -123,7 +123,7 @@ in the Mozilla clients.")
|
|||
"nss-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0bnh683nij6s0gvjcgwhyw5d3yx9fpm42pxj5bm97r0ky6ghm9kf"))
|
||||
"19ncvhz45dhr0nmymwkxspq9l44gaafkspxiwxbqs1hpnqxmzgx8"))
|
||||
;; Create nss.pc and nss-config.
|
||||
(patches (search-patches "nss-3.56-pkgconfig.patch"
|
||||
"nss-getcwd-nonnull.patch"
|
||||
|
@ -137,82 +137,84 @@ in the Mozilla clients.")
|
|||
(build-system gnu-build-system)
|
||||
(outputs '("out" "bin"))
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
(let* ((out (assoc-ref %outputs "out"))
|
||||
(nspr (string-append (assoc-ref %build-inputs "nspr")))
|
||||
(rpath (string-append "-Wl,-rpath=" out "/lib/nss")))
|
||||
(list "-C" "nss" (string-append "PREFIX=" out)
|
||||
"NSDISTMODE=copy"
|
||||
"NSS_USE_SYSTEM_SQLITE=1"
|
||||
;; The gtests fail to compile on riscv64.
|
||||
;; Skipping them doesn't affect the test suite.
|
||||
,@(if (target-riscv64?)
|
||||
`("NSS_DISABLE_GTESTS=1")
|
||||
'())
|
||||
(string-append "NSPR_INCLUDE_DIR=" nspr "/include/nspr")
|
||||
;; Add $out/lib/nss to RPATH.
|
||||
(string-append "RPATH=" rpath)
|
||||
(string-append "LDFLAGS=" rpath)))
|
||||
#:modules ((guix build gnu-build-system)
|
||||
(list
|
||||
#:make-flags
|
||||
#~(let ((rpath (string-append "-Wl,-rpath=" #$output "/lib/nss")))
|
||||
(list "-C" "nss"
|
||||
(string-append "PREFIX=" #$output)
|
||||
"NSDISTMODE=copy"
|
||||
"NSS_USE_SYSTEM_SQLITE=1"
|
||||
;; The gtests fail to compile on riscv64.
|
||||
;; Skipping them doesn't affect the test suite.
|
||||
#$@(if (target-riscv64?)
|
||||
#~("NSS_DISABLE_GTESTS=1")
|
||||
#~())
|
||||
(string-append "NSPR_INCLUDE_DIR="
|
||||
(search-input-directory %build-inputs
|
||||
"include/nspr"))
|
||||
;; Add $out/lib/nss to RPATH.
|
||||
(string-append "RPATH=" rpath)
|
||||
(string-append "LDFLAGS=" rpath)))
|
||||
#:modules '((guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
(ice-9 ftw)
|
||||
(ice-9 match)
|
||||
(srfi srfi-26))
|
||||
#:tests? ,(not (or (%current-target-system)
|
||||
;; Tests take more than 30 hours on riscv64-linux.
|
||||
(target-riscv64?)))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda _
|
||||
(setenv "CC" ,(cc-for-target))
|
||||
;; Tells NSS to build for the 64-bit ABI if we are 64-bit system.
|
||||
,@(if (target-64bit?)
|
||||
`((setenv "USE_64" "1"))
|
||||
'())))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(if tests?
|
||||
(begin
|
||||
;; Use 127.0.0.1 instead of $HOST.$DOMSUF as HOSTADDR for
|
||||
;; testing. The latter requires a working DNS or /etc/hosts.
|
||||
(setenv "DOMSUF" "localdomain")
|
||||
(setenv "USE_IP" "TRUE")
|
||||
(setenv "IP_ADDRESS" "127.0.0.1")
|
||||
#:tests? (not (or (%current-target-system)
|
||||
;; Tests take more than 30 hours on riscv64-linux.
|
||||
(target-riscv64?)))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda _
|
||||
(setenv "CC" #$(cc-for-target))
|
||||
;; Tells NSS to build for the 64-bit ABI if we are 64-bit system.
|
||||
#$@(if (target-64bit?)
|
||||
#~((setenv "USE_64" "1"))
|
||||
#~())))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(if tests?
|
||||
(begin
|
||||
;; Use 127.0.0.1 instead of $HOST.$DOMSUF as HOSTADDR for
|
||||
;; testing. The latter requires a working DNS or /etc/hosts.
|
||||
(setenv "DOMSUF" "localdomain")
|
||||
(setenv "USE_IP" "TRUE")
|
||||
(setenv "IP_ADDRESS" "127.0.0.1")
|
||||
|
||||
;; The "PayPalEE.cert" certificate expires every six months,
|
||||
;; leading to test failures:
|
||||
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To
|
||||
;; work around that, set the time to roughly the release date.
|
||||
(invoke "faketime" "2021-09-30" "./nss/tests/all.sh"))
|
||||
(format #t "test suite not run~%"))))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append (assoc-ref outputs "bin") "/bin"))
|
||||
(inc (string-append out "/include/nss"))
|
||||
(lib (string-append out "/lib/nss"))
|
||||
(obj (match (scandir "dist" (cut string-suffix? "OBJ" <>))
|
||||
((obj) (string-append "dist/" obj)))))
|
||||
;; Install nss-config to $out/bin.
|
||||
(install-file (string-append obj "/bin/nss-config")
|
||||
(string-append out "/bin"))
|
||||
(delete-file (string-append obj "/bin/nss-config"))
|
||||
;; Install nss.pc to $out/lib/pkgconfig.
|
||||
(install-file (string-append obj "/lib/pkgconfig/nss.pc")
|
||||
(string-append out "/lib/pkgconfig"))
|
||||
(delete-file (string-append obj "/lib/pkgconfig/nss.pc"))
|
||||
(rmdir (string-append obj "/lib/pkgconfig"))
|
||||
;; Install other files.
|
||||
(copy-recursively "dist/public/nss" inc)
|
||||
(copy-recursively (string-append obj "/bin") bin)
|
||||
(copy-recursively (string-append obj "/lib") lib)))))))
|
||||
;; The "PayPalEE.cert" certificate expires every six months,
|
||||
;; leading to test failures:
|
||||
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To
|
||||
;; work around that, set the time to roughly the release date.
|
||||
(invoke "faketime" "2022-06-01" "./nss/tests/all.sh"))
|
||||
(format #t "test suite not run~%"))))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append (assoc-ref outputs "bin") "/bin"))
|
||||
(inc (string-append out "/include/nss"))
|
||||
(lib (string-append out "/lib/nss"))
|
||||
(obj (match (scandir "dist" (cut string-suffix? "OBJ" <>))
|
||||
((obj) (string-append "dist/" obj)))))
|
||||
;; Install nss-config to $out/bin.
|
||||
(install-file (string-append obj "/bin/nss-config")
|
||||
(string-append out "/bin"))
|
||||
(delete-file (string-append obj "/bin/nss-config"))
|
||||
;; Install nss.pc to $out/lib/pkgconfig.
|
||||
(install-file (string-append obj "/lib/pkgconfig/nss.pc")
|
||||
(string-append out "/lib/pkgconfig"))
|
||||
(delete-file (string-append obj "/lib/pkgconfig/nss.pc"))
|
||||
(rmdir (string-append obj "/lib/pkgconfig"))
|
||||
;; Install other files.
|
||||
(copy-recursively "dist/public/nss" inc)
|
||||
(copy-recursively (string-append obj "/bin") bin)
|
||||
(copy-recursively (string-append obj "/lib") lib)))))))
|
||||
(inputs
|
||||
(list sqlite zlib))
|
||||
(propagated-inputs
|
||||
(list nspr)) ;required by nss.pc.
|
||||
(list nspr)) ;required by nss.pc.
|
||||
(native-inputs
|
||||
(list perl libfaketime)) ;for tests
|
||||
(list perl libfaketime)) ;for tests
|
||||
|
||||
;; The NSS test suite takes around 48 hours on Loongson 3A (MIPS) when
|
||||
;; another build is happening concurrently on the same machine.
|
||||
|
|
|
@ -1,19 +1,18 @@
|
|||
From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001
|
||||
From: gnidorah <gnidorah@users.noreply.github.com>
|
||||
Date: Fri, 22 Dec 2017 17:36:03 +0300
|
||||
Subject: [PATCH] Revert "Make Akonadi installation properly relocatable"
|
||||
From 4b90a0bd4411a66bbe6ecf85ce89a60a58bee969 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||
Date: Sun, 25 Apr 2021 08:01:21 -0500
|
||||
Subject: [PATCH 3/3] akonadi revert make relocatable
|
||||
|
||||
This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a.
|
||||
---
|
||||
CMakeLists.txt | 3 ---
|
||||
KF5AkonadiConfig.cmake.in | 6 +++---
|
||||
2 files changed, 3 insertions(+), 6 deletions(-)
|
||||
|
||||
Index: akonadi-19.08.0/CMakeLists.txt
|
||||
===================================================================
|
||||
--- akonadi-19.08.0.orig/CMakeLists.txt
|
||||
+++ akonadi-19.08.0/CMakeLists.txt
|
||||
@@ -306,9 +306,6 @@ configure_package_config_file(
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4e8cc81..63161b7 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -368,9 +368,6 @@ configure_package_config_file(
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
|
||||
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
|
||||
|
@ -21,29 +20,25 @@ Index: akonadi-19.08.0/CMakeLists.txt
|
|||
- AKONADI_INCLUDE_DIR
|
||||
- KF5Akonadi_DATA_DIR
|
||||
)
|
||||
|
||||
|
||||
install(FILES
|
||||
Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in
|
||||
===================================================================
|
||||
--- akonadi-19.08.0.orig/KF5AkonadiConfig.cmake.in
|
||||
+++ akonadi-19.08.0/KF5AkonadiConfig.cmake.in
|
||||
@@ -26,8 +26,8 @@ if(BUILD_TESTING)
|
||||
find_dependency(Qt5Test "@QT_REQUIRED_VERSION@")
|
||||
endif()
|
||||
|
||||
diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
|
||||
index bcf7320..1574319 100644
|
||||
--- a/KF5AkonadiConfig.cmake.in
|
||||
+++ b/KF5AkonadiConfig.cmake.in
|
||||
@@ -1,10 +1,10 @@
|
||||
@PACKAGE_INIT@
|
||||
|
||||
-set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
|
||||
-set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@")
|
||||
+set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
|
||||
+set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@")
|
||||
|
||||
find_dependency(Boost "@Boost_MINIMUM_VERSION@")
|
||||
|
||||
@@ -35,7 +35,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5Ako
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake)
|
||||
|
||||
|
||||
# The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed
|
||||
-set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@")
|
||||
+set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@")
|
||||
|
||||
####################################################################################
|
||||
# CMAKE_AUTOMOC
|
||||
|
||||
# set the directories
|
||||
if(NOT AKONADI_INSTALL_DIR)
|
||||
--
|
||||
2.31.1
|
||||
|
|
|
@ -1,26 +1,26 @@
|
|||
This is based on the respectve patch from NixPkgs, but with the parts pinning
|
||||
mysql and postgresql executables removed. The our package definition on why.
|
||||
mysql and postgresql executables removed. See our package definition on why.
|
||||
|
||||
diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
|
||||
--- a/src/akonadicontrol/agentmanager.cpp
|
||||
+++ b/src/akonadicontrol/agentmanager.cpp
|
||||
@@ -61,7 +61,7 @@ public:
|
||||
[]() {
|
||||
QCoreApplication::instance()->exit(255);
|
||||
});
|
||||
@@ -47,7 +47,7 @@ public:
|
||||
connect(this, &Akonadi::ProcessControl::unableToStart, this, []() {
|
||||
QCoreApplication::instance()->exit(255);
|
||||
});
|
||||
- start(QStringLiteral("akonadiserver"), args, RestartOnCrash);
|
||||
+ start(QLatin1String(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash);
|
||||
+ start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash);
|
||||
}
|
||||
|
||||
|
||||
~StorageProcessControl() override
|
||||
@@ -84,7 +84,7 @@ public:
|
||||
[]() {
|
||||
qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!";
|
||||
});
|
||||
@@ -69,7 +69,7 @@ public:
|
||||
connect(this, &Akonadi::ProcessControl::unableToStart, this, []() {
|
||||
qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!";
|
||||
});
|
||||
- start(QStringLiteral("akonadi_agent_server"), args, RestartOnCrash);
|
||||
+ start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash);
|
||||
+ start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash);
|
||||
}
|
||||
|
||||
|
||||
~AgentServerProcessControl() override
|
||||
diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
|
||||
--- a/src/akonadicontrol/agentprocessinstance.cpp
|
||||
|
@ -37,12 +37,12 @@ diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/ag
|
|||
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
|
||||
--- a/src/server/storage/dbconfigmysql.cpp
|
||||
+++ b/src/server/storage/dbconfigmysql.cpp
|
||||
@@ -209,7 +209,7 @@ bool DbConfigMysql::startInternalServer()
|
||||
@@ -215,7 +215,7 @@ bool DbConfigMysql::startInternalServer()
|
||||
#endif
|
||||
|
||||
|
||||
// generate config file
|
||||
- const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf"));
|
||||
+ const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
|
||||
const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf"));
|
||||
const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf"));
|
||||
const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
|
||||
if (globalConfig.isEmpty()) {
|
||||
|
|
|
@ -2,12 +2,12 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
|
|||
===================================================================
|
||||
--- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp
|
||||
+++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
|
||||
@@ -235,8 +235,7 @@ bool DbConfigMysql::startInternalServer(
|
||||
@@ -260,8 +260,7 @@ bool DbConfigMysql::startInternalServer(
|
||||
bool confUpdate = false;
|
||||
QFile actualFile(actualConfig);
|
||||
// update conf only if either global (or local) is newer than actual
|
||||
- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) ||
|
||||
- (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) {
|
||||
- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified())
|
||||
- || (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) {
|
||||
+ if (true) {
|
||||
QFile globalFile(globalConfig);
|
||||
QFile localFile(localConfig);
|
||||
|
|
|
@ -0,0 +1,42 @@
|
|||
https://salsa.debian.org/firebird-team/firebird3.0/-/raw/master/debian/patches/out/riscv64-prefix.patch
|
||||
|
||||
Description: add builds/posix/prefix.linux_riscv64, missing upstream
|
||||
It appears the commit adding RiscV64 support
|
||||
(1e8e7858db84750a77006d307bf28e9686f9414e) misses the build prefix file
|
||||
Here's one submitted by Manuel A. Fernandez Montecelo
|
||||
Author: Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com>
|
||||
Bug: http://tracker.firebirdsql.org/browse/CORE-5851
|
||||
Bug-Debian: https://bugs.debian.org/895257
|
||||
Author: Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com>
|
||||
|
||||
--- /dev/null
|
||||
+++ b/builds/posix/prefix.linux_riscv64
|
||||
@@ -0,0 +1,28 @@
|
||||
+# The contents of this file are subject to the Interbase Public
|
||||
+# License Version 1.0 (the "License"); you may not use this file
|
||||
+# except in compliance with the License. You may obtain a copy
|
||||
+# of the License at http://www.Inprise.com/IPL.html
|
||||
+#
|
||||
+# Software distributed under the License is distributed on an
|
||||
+# "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
|
||||
+# or implied. See the License for the specific language governing
|
||||
+# rights and limitations under the License.
|
||||
+#
|
||||
+# The Original Code was created by Inprise Corporation
|
||||
+# and its predecessors. Portions created by Inprise Corporation are
|
||||
+# Copyright (C) Inprise Corporation.
|
||||
+#
|
||||
+# All Rights Reserved.
|
||||
+# Contributor(s): ______________________________________.
|
||||
+# Start of file prefix.linux: $(VERSION) $(PLATFORM)
|
||||
+# 14 Apr 2008 Alan Barclay alan AT escribe.co.uk
|
||||
+# 2018, "Manuel A. Fernandez Montecelo" <manuel.montezelo@gmail.com>
|
||||
+
|
||||
+
|
||||
+#LD=@CXX@
|
||||
+
|
||||
+#PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC
|
||||
+#DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch
|
||||
+
|
||||
+PROD_FLAGS=-O3 -DLINUX -DRISCV64 -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0 -std=gnu++03 -fno-delete-null-pointer-checks
|
||||
+DEV_FLAGS=-ggdb -DLINUX -DRISCV64 -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor
|
|
@ -0,0 +1,108 @@
|
|||
https://salsa.debian.org/firebird-team/firebird3.0/-/raw/master/debian/patches/upstream/riscv64-support.patch
|
||||
|
||||
1e8e7858db84750a77006d307bf28e9686f9414e Patch for CORE-5779: support for riscv64, also some code fixes related with prior ports
|
||||
Minor corrections compared to the commit above due to whitespace/spelling
|
||||
differences with 3.0 version
|
||||
Bug-Debian: https://bugs.debian.org/895257
|
||||
Bug: http://tracker.firebirdsql.org/browse/CORE-5779
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -251,6 +251,18 @@ dnl CPU_TYPE=ppc64
|
||||
libdir=/usr/lib64
|
||||
;;
|
||||
|
||||
+ riscv64*-*-linux*)
|
||||
+ MAKEFILE_PREFIX=linux_riscv64
|
||||
+ INSTALL_PREFIX=linux
|
||||
+ PLATFORM=LINUX
|
||||
+ AC_DEFINE(LINUX, 1, [Define this if OS is Linux])
|
||||
+ EDITLINE_FLG=Y
|
||||
+ SHRLIB_EXT=so
|
||||
+ STD_EDITLINE=true
|
||||
+ STD_ICU=true
|
||||
+ libdir=/usr/lib64
|
||||
+ ;;
|
||||
+
|
||||
powerpc64le-*-linux*)
|
||||
MAKEFILE_PREFIX=linux_powerpc64el
|
||||
INSTALL_PREFIX=linux
|
||||
--- a/src/common/classes/DbImplementation.cpp
|
||||
+++ b/src/common/classes/DbImplementation.cpp
|
||||
@@ -49,6 +49,7 @@ static const UCHAR CpuAlpha = 14;
|
||||
static const UCHAR CpuArm64 = 15;
|
||||
static const UCHAR CpuPowerPc64el = 16;
|
||||
static const UCHAR CpuM68k = 17;
|
||||
+static const UCHAR CpuRiscV64 = 18;
|
||||
|
||||
static const UCHAR OsWindows = 0;
|
||||
static const UCHAR OsLinux = 1;
|
||||
@@ -89,7 +90,8 @@ const char* hardware[] = {
|
||||
"Alpha",
|
||||
"ARM64",
|
||||
"PowerPC64el",
|
||||
- "M68k"
|
||||
+ "M68k",
|
||||
+ "RiscV64"
|
||||
};
|
||||
|
||||
const char* operatingSystem[] = {
|
||||
@@ -116,22 +118,22 @@ const char* compiler[] = {
|
||||
// This table lists pre-fb3 implementation codes
|
||||
const UCHAR backwardTable[FB_NELEM(hardware) * FB_NELEM(operatingSystem)] =
|
||||
{
|
||||
-// Intel AMD Sparc PPC PPC64 MIPSEL MIPS ARM IA64 s390 s390x SH SHEB HPPA Alpha ARM64 PowerPC64el
|
||||
-/* Windows */ 50, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-/* Linux */ 60, 66, 65, 69, 86, 71, 72, 75, 76, 79, 78, 80, 81, 82, 83, 84, 85,
|
||||
-/* Darwin */ 70, 73, 0, 63, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-/* Solaris */ 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-/* HPUX */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0,
|
||||
-/* AIX */ 0, 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-/* MVS */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-/* FreeBSD */ 61, 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-/* NetBSD */ 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
|
||||
+// Intel AMD Sparc PPC PPC64 MIPSEL MIPS ARM IA64 s390 s390x SH SHEB HPPA Alpha ARM64 PPC64el M68k RiscV64
|
||||
+/* Windows */ 50, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
+/* Linux */ 60, 66, 65, 69, 86, 71, 72, 75, 76, 79, 78, 80, 81, 82, 83, 84, 85, 87, 88,
|
||||
+/* Darwin */ 70, 73, 0, 63, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
+/* Solaris */ 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
+/* HPUX */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0,
|
||||
+/* AIX */ 0, 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
+/* MVS */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
+/* FreeBSD */ 61, 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
+/* NetBSD */ 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
|
||||
};
|
||||
|
||||
const UCHAR backEndianess[FB_NELEM(hardware)] =
|
||||
{
|
||||
-// Intel AMD Sparc PPC PPC64 MIPSEL MIPS ARM IA64 s390 s390x SH SHEB HPPA Alpha ARM64 PowerPC64el M68k
|
||||
- 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1
|
||||
+// Intel AMD Sparc PPC PPC64 MIPSEL MIPS ARM IA64 s390 s390x SH SHEB HPPA Alpha ARM64 PPC64el M68k RiscV64
|
||||
+ 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0,
|
||||
};
|
||||
|
||||
} // anonymous namespace
|
||||
--- a/src/common/common.h
|
||||
+++ b/src/common/common.h
|
||||
@@ -135,6 +135,10 @@
|
||||
#define FB_CPU CpuArm64
|
||||
#endif /* ARM64 */
|
||||
|
||||
+#ifdef RISCV64
|
||||
+#define FB_CPU CpuRiscV64
|
||||
+#endif /* RISCV64 */
|
||||
+
|
||||
#ifdef sparc
|
||||
#define FB_CPU CpuUltraSparc
|
||||
#define RISC_ALIGNMENT
|
||||
--- a/src/jrd/inf_pub.h
|
||||
+++ b/src/jrd/inf_pub.h
|
||||
@@ -247,7 +247,7 @@ enum info_db_implementations
|
||||
isc_info_db_impl_linux_ppc64el = 85,
|
||||
isc_info_db_impl_linux_ppc64 = 86,
|
||||
isc_info_db_impl_linux_m68k = 87,
|
||||
-
|
||||
+ isc_info_db_impl_linux_riscv64 = 88,
|
||||
|
||||
isc_info_db_impl_last_value // Leave this LAST!
|
||||
};
|
|
@ -1,53 +0,0 @@
|
|||
Fix build failure with GCC 10.
|
||||
|
||||
Taken from upstream:
|
||||
https://github.com/dcnieho/FreeGLUT/commit/b9998bbc1e1c329f6bf69c24606a2be7a4973b8c
|
||||
|
||||
diff --git a/src/fg_gl2.c b/src/fg_gl2.c
|
||||
--- a/src/fg_gl2.c
|
||||
+++ b/src/fg_gl2.c
|
||||
@@ -27,6 +27,20 @@
|
||||
#include "fg_internal.h"
|
||||
#include "fg_gl2.h"
|
||||
|
||||
+#ifndef GL_ES_VERSION_2_0
|
||||
+/* GLES2 has the corresponding entry points built-in, and these fgh-prefixed
|
||||
+ * names are defined in fg_gl2.h header to reference them, for any other case,
|
||||
+ * define them as function pointers here.
|
||||
+ */
|
||||
+FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
|
||||
+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
|
||||
+FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
|
||||
+FGH_PFNGLBUFFERDATAPROC fghBufferData;
|
||||
+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
|
||||
+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
|
||||
+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
|
||||
+#endif
|
||||
+
|
||||
void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
|
||||
if (fgStructure.CurrentWindow != NULL)
|
||||
fgStructure.CurrentWindow->Window.attribute_v_coord = attrib;
|
||||
diff --git a/src/fg_gl2.h b/src/fg_gl2.h
|
||||
--- a/src/fg_gl2.h
|
||||
+++ b/src/fg_gl2.h
|
||||
@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
|
||||
typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
|
||||
typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
|
||||
|
||||
-FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
|
||||
-FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
|
||||
-FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
|
||||
-FGH_PFNGLBUFFERDATAPROC fghBufferData;
|
||||
-FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
|
||||
-FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
|
||||
-FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
|
||||
+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
|
||||
+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
|
||||
+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
|
||||
+extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
|
||||
+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
|
||||
+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
|
||||
+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
|
||||
|
||||
# endif
|
||||
|
|
@ -1,163 +0,0 @@
|
|||
Taken from nixpkgs, see
|
||||
grantleetheme: merge themes across multiple prefixes
|
||||
<https://github.com/NixOS/nixpkgs/commits/master/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch>
|
||||
|
||||
|
||||
diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp
|
||||
index 27d5bc8..8d43140 100644
|
||||
--- a/src/grantleetheme.cpp
|
||||
+++ b/src/grantleetheme.cpp
|
||||
@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePrivate &other)
|
||||
, description(other.description)
|
||||
, name(other.name)
|
||||
, dirName(other.dirName)
|
||||
- , absolutePath(other.absolutePath)
|
||||
+ , absolutePaths(other.absolutePaths)
|
||||
, author(other.author)
|
||||
, email(other.email)
|
||||
, loader(other.loader)
|
||||
@@ -64,12 +64,15 @@ void ThemePrivate::setupEngine()
|
||||
|
||||
void ThemePrivate::setupLoader()
|
||||
{
|
||||
- // Get the parent dir with themes, we set the theme directory separately
|
||||
- QDir dir(absolutePath);
|
||||
- dir.cdUp();
|
||||
+ QStringList templateDirs;
|
||||
+ for (const QString& path : absolutePaths) {
|
||||
+ QDir dir(path);
|
||||
+ dir.cdUp();
|
||||
+ templateDirs << dir.absolutePath();
|
||||
+ }
|
||||
|
||||
loader = QSharedPointer<GrantleeTheme::QtResourceTemplateLoader>::create();
|
||||
- loader->setTemplateDirs({ dir.absolutePath() });
|
||||
+ loader->setTemplateDirs(templateDirs);
|
||||
loader->setTheme(dirName);
|
||||
|
||||
if (!sEngine) {
|
||||
@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, const QString &dirName, const QString &de
|
||||
KConfigGroup group(&config, QStringLiteral("Desktop Entry"));
|
||||
if (group.isValid()) {
|
||||
d->dirName = dirName;
|
||||
- d->absolutePath = themePath;
|
||||
+ d->absolutePaths = QStringList(themePath);
|
||||
d->name = group.readEntry("Name", QString());
|
||||
d->description = group.readEntry("Description", QString());
|
||||
d->themeFileName = group.readEntry("FileName", QString());
|
||||
@@ -140,7 +143,7 @@ Theme::~Theme()
|
||||
|
||||
bool Theme::operator==(const Theme &other) const
|
||||
{
|
||||
- return isValid() && other.isValid() && d->absolutePath == other.absolutePath();
|
||||
+ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths();
|
||||
}
|
||||
|
||||
Theme &Theme::operator=(const Theme &other)
|
||||
@@ -184,7 +187,15 @@ QString Theme::dirName() const
|
||||
|
||||
QString Theme::absolutePath() const
|
||||
{
|
||||
- return d->absolutePath;
|
||||
+ if (! d->absolutePaths.isEmpty()) {
|
||||
+ return d->absolutePaths.first();
|
||||
+ };
|
||||
+ return QString();
|
||||
+}
|
||||
+
|
||||
+QStringList Theme::absolutePaths() const
|
||||
+{
|
||||
+ return d->absolutePaths;
|
||||
}
|
||||
|
||||
QString Theme::author() const
|
||||
@@ -223,6 +231,13 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con
|
||||
return result;
|
||||
}
|
||||
|
||||
+void Theme::addThemeDir(const QString& path)
|
||||
+{
|
||||
+ QDir dir(path);
|
||||
+ dir.cdUp();
|
||||
+ d->absolutePaths << dir.absolutePath();
|
||||
+}
|
||||
+
|
||||
void Theme::addPluginPath(const QString &path)
|
||||
{
|
||||
if (!ThemePrivate::sEngine) {
|
||||
diff --git a/src/grantleetheme.h b/src/grantleetheme.h
|
||||
index a25c27b..be38299 100644
|
||||
--- a/src/grantleetheme.h
|
||||
+++ b/src/grantleetheme.h
|
||||
@@ -48,11 +48,14 @@ public:
|
||||
Q_REQUIRED_RESULT QStringList displayExtraVariables() const;
|
||||
Q_REQUIRED_RESULT QString dirName() const;
|
||||
Q_REQUIRED_RESULT QString absolutePath() const;
|
||||
+ Q_REQUIRED_RESULT QStringList absolutePaths() const;
|
||||
Q_REQUIRED_RESULT QString author() const;
|
||||
Q_REQUIRED_RESULT QString authorEmail() const;
|
||||
|
||||
Q_REQUIRED_RESULT QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray());
|
||||
|
||||
+ void addThemeDir(const QString&);
|
||||
+
|
||||
static void addPluginPath(const QString &path);
|
||||
|
||||
private:
|
||||
diff --git a/src/grantleetheme_p.h b/src/grantleetheme_p.h
|
||||
index eb73dcb..00510e9 100644
|
||||
--- a/src/grantleetheme_p.h
|
||||
+++ b/src/grantleetheme_p.h
|
||||
@@ -43,7 +43,7 @@ public:
|
||||
QString description;
|
||||
QString name;
|
||||
QString dirName;
|
||||
- QString absolutePath;
|
||||
+ QStringList absolutePaths;
|
||||
QString author;
|
||||
QString email;
|
||||
|
||||
diff --git a/src/grantleethememanager.cpp b/src/grantleethememanager.cpp
|
||||
index 606d717..dc99041 100644
|
||||
--- a/src/grantleethememanager.cpp
|
||||
+++ b/src/grantleethememanager.cpp
|
||||
@@ -125,25 +125,18 @@ public:
|
||||
|
||||
for (const QString &directory : qAsConst(themesDirectories)) {
|
||||
QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot);
|
||||
- QStringList alreadyLoadedThemeName;
|
||||
while (dirIt.hasNext()) {
|
||||
dirIt.next();
|
||||
const QString dirName = dirIt.fileName();
|
||||
GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
|
||||
if (theme.isValid()) {
|
||||
QString themeName = theme.name();
|
||||
- if (alreadyLoadedThemeName.contains(themeName)) {
|
||||
- int i = 2;
|
||||
- const QString originalName(theme.name());
|
||||
- while (alreadyLoadedThemeName.contains(themeName)) {
|
||||
- themeName = originalName + QStringLiteral(" (%1)").arg(i);
|
||||
- ++i;
|
||||
- }
|
||||
- theme.d->name = themeName;
|
||||
+ QMap<QString, GrantleeTheme::Theme>::iterator i = themes.find(dirName);
|
||||
+ if (i != themes.end()) {
|
||||
+ i.value().addThemeDir(dirIt.filePath());
|
||||
+ } else {
|
||||
+ themes.insert(dirName, theme);
|
||||
}
|
||||
- alreadyLoadedThemeName << themeName;
|
||||
- themes.insert(dirName, theme);
|
||||
- //qDebug()<<" theme.name()"<<theme.name();
|
||||
}
|
||||
}
|
||||
watch->addDir(directory);
|
||||
@@ -366,7 +359,7 @@ QString ThemeManager::pathFromThemes(const QString &themesRelativePath, const QS
|
||||
GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
|
||||
if (theme.isValid()) {
|
||||
if (dirName == themeName) {
|
||||
- return theme.absolutePath();
|
||||
+ return theme.absolutePaths().first();
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,94 +0,0 @@
|
|||
Fix a broken test:
|
||||
|
||||
https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/803
|
||||
|
||||
Patches copied from upstream source repository:
|
||||
|
||||
https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/commit/2ce5909f3a0b0da3abb7b794215d6b8b72a3b7fa
|
||||
https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/commit/f5310ce346180a717f091f2f09bcbb3ddfb15436
|
||||
|
||||
From 2ce5909f3a0b0da3abb7b794215d6b8b72a3b7fa Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
|
||||
Date: Thu, 12 Nov 2020 23:38:21 +0000
|
||||
Subject: [PATCH 1/2] tests: qtdemux: fix crash on 32-bit architectures
|
||||
|
||||
Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/803
|
||||
|
||||
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/815>
|
||||
---
|
||||
tests/check/elements/qtdemux.c | 14 ++++++++------
|
||||
1 file changed, 8 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/tests/check/elements/qtdemux.c b/tests/check/elements/qtdemux.c
|
||||
index 5271c6576..0c748278b 100644
|
||||
--- a/tests/check/elements/qtdemux.c
|
||||
+++ b/tests/check/elements/qtdemux.c
|
||||
@@ -797,9 +797,10 @@ GST_START_TEST (test_qtdemux_pad_names)
|
||||
"protection-system", G_TYPE_STRING,
|
||||
"9a04f079-9840-4286-ab92-e65be0885f95", NULL);
|
||||
caps =
|
||||
- gst_caps_new_simple ("video/quicktime", "variant", G_TYPE_STRING,
|
||||
- "mss-fragmented", "timesacle", G_TYPE_UINT64, 10000000, "media-caps",
|
||||
- GST_TYPE_CAPS, mediacaps, NULL);
|
||||
+ gst_caps_new_simple ("video/quicktime",
|
||||
+ "variant", G_TYPE_STRING, "mss-fragmented",
|
||||
+ "timesacle", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
|
||||
+ "media-caps", GST_TYPE_CAPS, mediacaps, NULL);
|
||||
|
||||
/* Send segment event* */
|
||||
event = gst_event_new_caps (caps);
|
||||
@@ -852,9 +853,10 @@ GST_START_TEST (test_qtdemux_pad_names)
|
||||
"protection-system", G_TYPE_STRING,
|
||||
"9a04f079-9840-4286-ab92-e65be0885f95", NULL);
|
||||
caps =
|
||||
- gst_caps_new_simple ("video/quicktime", "variant", G_TYPE_STRING,
|
||||
- "mss-fragmented", "timesacle", G_TYPE_UINT64, 10000000, "media-caps",
|
||||
- GST_TYPE_CAPS, mediacaps, NULL);
|
||||
+ gst_caps_new_simple ("video/quicktime",
|
||||
+ "variant", G_TYPE_STRING, "mss-fragmented",
|
||||
+ "timesacle", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
|
||||
+ "media-caps", GST_TYPE_CAPS, mediacaps, NULL);
|
||||
|
||||
/* Send segment event* */
|
||||
event = gst_event_new_caps (caps);
|
||||
--
|
||||
2.30.0
|
||||
|
||||
|
||||
From f5310ce346180a717f091f2f09bcbb3ddfb15436 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
|
||||
Date: Thu, 12 Nov 2020 23:39:21 +0000
|
||||
Subject: [PATCH 2/2] tests: qtdemux: fix typo in caps field
|
||||
|
||||
timesacle -> timescale
|
||||
|
||||
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/815>
|
||||
---
|
||||
tests/check/elements/qtdemux.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/check/elements/qtdemux.c b/tests/check/elements/qtdemux.c
|
||||
index 0c748278b..4a14c45c0 100644
|
||||
--- a/tests/check/elements/qtdemux.c
|
||||
+++ b/tests/check/elements/qtdemux.c
|
||||
@@ -799,7 +799,7 @@ GST_START_TEST (test_qtdemux_pad_names)
|
||||
caps =
|
||||
gst_caps_new_simple ("video/quicktime",
|
||||
"variant", G_TYPE_STRING, "mss-fragmented",
|
||||
- "timesacle", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
|
||||
+ "timescale", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
|
||||
"media-caps", GST_TYPE_CAPS, mediacaps, NULL);
|
||||
|
||||
/* Send segment event* */
|
||||
@@ -855,7 +855,7 @@ GST_START_TEST (test_qtdemux_pad_names)
|
||||
caps =
|
||||
gst_caps_new_simple ("video/quicktime",
|
||||
"variant", G_TYPE_STRING, "mss-fragmented",
|
||||
- "timesacle", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
|
||||
+ "timescale", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
|
||||
"media-caps", GST_TYPE_CAPS, mediacaps, NULL);
|
||||
|
||||
/* Send segment event* */
|
||||
--
|
||||
2.30.0
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
Add placeholder for kinit's store file name.
|
||||
|
||||
diff --git a/src/kdeinitinterface.cpp b/src/kdeinitinterface.cpp
|
||||
index 22fa5e5..3d40937 100644
|
||||
--- a/src/kdeinitinterface.cpp
|
||||
+++ b/src/kdeinitinterface.cpp
|
||||
@@ -52,7 +52,7 @@ void KDEInitInterface::ensureKdeinitRunning()
|
||||
// If not found in system paths, search other paths
|
||||
if (srv.isEmpty()) {
|
||||
const QStringList searchPaths = QStringList()
|
||||
- << QCoreApplication::applicationDirPath() // then look where our application binary is located
|
||||
+ << QString::fromUtf8("@SUBSTITUTEME@/bin") // using QStringLiteral would be more efficient, but breaks guix store reference detection.
|
||||
<< QLibraryInfo::location(QLibraryInfo::BinariesPath); // look where exec path is (can be set in qt.conf)
|
||||
srv = QStandardPaths::findExecutable(QStringLiteral("kdeinit5"), searchPaths);
|
||||
if (srv.isEmpty()) {
|
|
@ -21,27 +21,6 @@ pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
|
|||
#endif
|
||||
};
|
||||
#endif
|
||||
@@ -1533,20 +1531,6 @@ static int initXconnection()
|
||||
}
|
||||
#endif
|
||||
|
||||
-#ifndef Q_OS_OSX
|
||||
-// Find a shared lib in the lib dir, e.g. libkio.so.
|
||||
-// Completely unrelated to plugins.
|
||||
-static QString findSharedLib(const QString &lib)
|
||||
-{
|
||||
- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/") + lib;
|
||||
- if (QFile::exists(path)) {
|
||||
- return path;
|
||||
- }
|
||||
- // We could also look in LD_LIBRARY_PATH, but really, who installs the main libs in different prefixes?
|
||||
- return QString();
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
extern "C" {
|
||||
|
||||
static void secondary_child_handler(int)
|
||||
@@ -1673,7 +1673,7 @@
|
||||
#if defined(Q_OS_UNIX) && !defined(Q_OS_OSX)
|
||||
if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) {
|
||||
|
|
|
@ -1,37 +0,0 @@
|
|||
Search libraries in GUIX_KF5INIT_LIB_PATH.
|
||||
|
||||
Based on an idea by NixOs
|
||||
pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch
|
||||
|
||||
===================================================================
|
||||
--- kinit-5.32.0/src/kdeinit/kinit.cpp.orig 2017-10-22 21:02:20.908765455 +0200
|
||||
+++ kinit-5.32.0/src/kdeinit/kinit.cpp 2017-10-22 21:03:25.312818248 +0200
|
||||
@@ -623,20 +623,18 @@
|
||||
if (libpath_relative) {
|
||||
// NB: Because Qt makes the actual dlopen() call, the
|
||||
// RUNPATH of kdeinit is *not* respected - see
|
||||
// https://sourceware.org/bugzilla/show_bug.cgi?id=13945
|
||||
// - so we try hacking it in ourselves
|
||||
- QString install_lib_dir = QFile::decodeName(
|
||||
- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
|
||||
- QString orig_libpath = libpath;
|
||||
- libpath = install_lib_dir + libpath;
|
||||
- l.setFileName(libpath);
|
||||
- if (!l.load()) {
|
||||
- libpath = orig_libpath;
|
||||
- l.setFileName(libpath);
|
||||
- l.load();
|
||||
- }
|
||||
+ // Try to load the library relative to the active profiles.
|
||||
+ QByteArrayList profiles = qgetenv("KDEINIT5_LIBRARY_PATH").split(':');
|
||||
+ for (const QByteArray &profile: profiles) {
|
||||
+ if (!profile.isEmpty()) {
|
||||
+ l.setFileName(QFile::decodeName(profile) + QStringLiteral("/") + libpath);
|
||||
+ if (l.load()) break;
|
||||
+ }
|
||||
+ }
|
||||
} else {
|
||||
l.load();
|
||||
}
|
||||
if (!l.isLoaded()) {
|
||||
QString ltdlError(l.errorString());
|
|
@ -1,30 +1,24 @@
|
|||
Adopted from NixOS
|
||||
pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch
|
||||
From af54a2a37655df26a33bc6783cb472c38f65322f Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||
Date: Sun, 28 Mar 2021 10:31:12 -0500
|
||||
Subject: [PATCH 1/2] Remove impure smbd search path
|
||||
|
||||
===================================================================
|
||||
--- kio-5.17.0.orig/src/core/ksambashare.cpp
|
||||
+++ kio-5.17.0/src/core/ksambashare.cpp
|
||||
@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate(
|
||||
|
||||
---
|
||||
src/core/ksambashare.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/core/ksambashare.cpp b/src/core/ksambashare.cpp
|
||||
index e810ce4..7cfb4e6 100644
|
||||
--- a/src/core/ksambashare.cpp
|
||||
+++ b/src/core/ksambashare.cpp
|
||||
@@ -61,7 +61,7 @@ KSambaSharePrivate::~KSambaSharePrivate()
|
||||
bool KSambaSharePrivate::isSambaInstalled()
|
||||
{
|
||||
- if (QFile::exists(QStringLiteral("/usr/sbin/smbd"))
|
||||
- || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) {
|
||||
- return true;
|
||||
+ const QByteArray pathEnv = qgetenv("PATH");
|
||||
+ if (!pathEnv.isEmpty()) {
|
||||
+ QLatin1Char pathSep(':');
|
||||
+ QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts);
|
||||
+ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) {
|
||||
+ it->append(QStringLiteral("/smbd"));
|
||||
+ if (QFile::exists(*it)) {
|
||||
+ return true;
|
||||
+ }
|
||||
+ }
|
||||
const bool daemonExists =
|
||||
- !QStandardPaths::findExecutable(QStringLiteral("smbd"), {QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/")}).isEmpty();
|
||||
+ !QStandardPaths::findExecutable(QStringLiteral("smbd")).isEmpty();
|
||||
if (!daemonExists) {
|
||||
qCDebug(KIO_CORE_SAMBASHARE) << "KSambaShare: Could not find smbd";
|
||||
}
|
||||
|
||||
- //qDebug() << "Samba is not installed!";
|
||||
-
|
||||
return false;
|
||||
}
|
||||
|
||||
--
|
||||
2.30.1
|
||||
|
|
|
@ -1,41 +0,0 @@
|
|||
From 6b0a3a60870499b20ce9ae2ea07cbc5ee53cbdd2 Mon Sep 17 00:00:00 2001
|
||||
From: Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
Date: Tue, 21 Jan 2020 23:23:38 +0100
|
||||
Subject: [PATCH] Fix missing link libraries.
|
||||
|
||||
See <https://phabricator.kde.org/D26821>
|
||||
|
||||
These are only actually missing if the libraries reside in different
|
||||
prefixes, as it is the case in Guix or Nix.
|
||||
---
|
||||
agents/archivemailagent/CMakeLists.txt | 1 +
|
||||
agents/followupreminderagent/CMakeLists.txt | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/agents/archivemailagent/CMakeLists.txt b/agents/archivemailagent/CMakeLists.txt
|
||||
index 95c6249de..d0ddcd475 100644
|
||||
--- a/agents/archivemailagent/CMakeLists.txt
|
||||
+++ b/agents/archivemailagent/CMakeLists.txt
|
||||
@@ -22,6 +22,7 @@ ki18n_wrap_ui(libarchivemailagent_SRCS ui/archivemailwidget.ui )
|
||||
add_library(archivemailagent STATIC ${libarchivemailagent_SRCS})
|
||||
target_link_libraries(archivemailagent
|
||||
KF5::MailCommon
|
||||
+ KF5::Libkdepim
|
||||
KF5::I18n
|
||||
KF5::Notifications
|
||||
KF5::KIOWidgets
|
||||
diff --git a/agents/followupreminderagent/CMakeLists.txt b/agents/followupreminderagent/CMakeLists.txt
|
||||
index 9ae7eaa29..527044807 100644
|
||||
--- a/agents/followupreminderagent/CMakeLists.txt
|
||||
+++ b/agents/followupreminderagent/CMakeLists.txt
|
||||
@@ -27,6 +27,7 @@ target_link_libraries(followupreminderagent
|
||||
KF5::AkonadiMime
|
||||
KF5::AkonadiAgentBase
|
||||
KF5::DBusAddons
|
||||
+ KF5::FollowupReminder
|
||||
KF5::XmlGui
|
||||
KF5::KIOWidgets
|
||||
KF5::Notifications
|
||||
--
|
||||
2.21.1
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
Index: b/src/moz-sdk/prcpucfg.h
|
||||
===================================================================
|
||||
--- a/src/moz-sdk/prcpucfg.h
|
||||
+++ b/src/moz-sdk/prcpucfg.h
|
||||
@@ -288,6 +288,52 @@
|
||||
#define PR_BYTES_PER_WORD_LOG2 3
|
||||
#define PR_BYTES_PER_DWORD_LOG2 3
|
||||
|
||||
+#elif defined(__aarch64__)
|
||||
+
|
||||
+#define IS_LITTLE_ENDIAN 1
|
||||
+#undef IS_BIG_ENDIAN
|
||||
+#define IS_64
|
||||
+
|
||||
+#define PR_BYTES_PER_BYTE 1
|
||||
+#define PR_BYTES_PER_SHORT 2
|
||||
+#define PR_BYTES_PER_INT 4
|
||||
+#define PR_BYTES_PER_INT64 8
|
||||
+#define PR_BYTES_PER_LONG 8
|
||||
+#define PR_BYTES_PER_FLOAT 4
|
||||
+#define PR_BYTES_PER_DOUBLE 8
|
||||
+#define PR_BYTES_PER_WORD 8
|
||||
+#define PR_BYTES_PER_DWORD 8
|
||||
+
|
||||
+#define PR_BITS_PER_BYTE 8
|
||||
+#define PR_BITS_PER_SHORT 16
|
||||
+#define PR_BITS_PER_INT 32
|
||||
+#define PR_BITS_PER_INT64 64
|
||||
+#define PR_BITS_PER_LONG 64
|
||||
+#define PR_BITS_PER_FLOAT 32
|
||||
+#define PR_BITS_PER_DOUBLE 64
|
||||
+#define PR_BITS_PER_WORD 64
|
||||
+
|
||||
+#define PR_BITS_PER_BYTE_LOG2 3
|
||||
+#define PR_BITS_PER_SHORT_LOG2 4
|
||||
+#define PR_BITS_PER_INT_LOG2 5
|
||||
+#define PR_BITS_PER_INT64_LOG2 6
|
||||
+#define PR_BITS_PER_LONG_LOG2 6
|
||||
+#define PR_BITS_PER_FLOAT_LOG2 5
|
||||
+#define PR_BITS_PER_DOUBLE_LOG2 6
|
||||
+#define PR_BITS_PER_WORD_LOG2 6
|
||||
+
|
||||
+#define PR_ALIGN_OF_SHORT 2
|
||||
+#define PR_ALIGN_OF_INT 4
|
||||
+#define PR_ALIGN_OF_LONG 8
|
||||
+#define PR_ALIGN_OF_INT64 8
|
||||
+#define PR_ALIGN_OF_FLOAT 4
|
||||
+#define PR_ALIGN_OF_DOUBLE 8
|
||||
+#define PR_ALIGN_OF_POINTER 8
|
||||
+#define PR_ALIGN_OF_WORD 8
|
||||
+
|
||||
+#define PR_BYTES_PER_WORD_LOG2 3
|
||||
+#define PR_BYTES_PER_DWORD_LOG2 3
|
||||
+
|
||||
#elif defined(__mc68000__)
|
||||
|
||||
#undef IS_LITTLE_ENDIAN
|
|
@ -1,42 +0,0 @@
|
|||
From 3def65075c09af4961cd399e8e78ed78cca72e65 Mon Sep 17 00:00:00 2001
|
||||
From: Wolfgang Bauer <wbauer@tmo.at>
|
||||
Date: Wed, 11 Oct 2017 22:16:02 +0200
|
||||
Subject: [PATCH] Fix build with Qt 5.9
|
||||
|
||||
Summary:
|
||||
moc 5.9 errors out when building:
|
||||
Error: Plugin Metadata file "" could not be opened: file to open is a directory
|
||||
|
||||
Same issue and fix as https://phabricator.kde.org/D5392 for khtml.
|
||||
|
||||
CCBUG: 377490
|
||||
|
||||
Test Plan: builds fine now with Qt 5.9.0rc and also earlier versions.
|
||||
|
||||
Reviewers: vriezen, pino
|
||||
|
||||
Reviewed By: pino
|
||||
|
||||
Subscribers: pino
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D5985
|
||||
---
|
||||
src/kmplayer_part.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/kmplayer_part.h b/src/kmplayer_part.h
|
||||
index f90f85d..0fddbaa 100644
|
||||
--- a/src/kmplayer_part.h
|
||||
+++ b/src/kmplayer_part.h
|
||||
@@ -36,7 +36,7 @@ namespace KMPlayer {
|
||||
|
||||
class KMPlayerFactory : public KPluginFactory {
|
||||
Q_OBJECT
|
||||
- Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory" FILE "")
|
||||
+ Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory")
|
||||
Q_INTERFACES(KPluginFactory)
|
||||
public:
|
||||
KMPlayerFactory();
|
||||
--
|
||||
2.14.2
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
|
||||
index 5aec9fd..b15c933 100644
|
||||
--- a/src/kpackage/package.cpp
|
||||
+++ b/src/kpackage/package.cpp
|
||||
@@ -820,7 +820,7 @@ PackagePrivate::PackagePrivate()
|
||||
: QSharedData(),
|
||||
fallbackPackage(nullptr),
|
||||
metadata(nullptr),
|
||||
- externalPaths(false),
|
||||
+ externalPaths(true),
|
||||
valid(false),
|
||||
checkedValid(false)
|
||||
{
|
|
@ -1,25 +0,0 @@
|
|||
From 668010ebc9fd84d9dc60f90b9a4ebf3c7054977f Mon Sep 17 00:00:00 2001
|
||||
From: Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
Date: Sun, 25 Oct 2020 20:11:13 +0000
|
||||
Subject: [PATCH] Fix build errors if PREFIX is different from ECM's PREFIX.
|
||||
|
||||
See <https://bugs.kde.org/424483> for details.
|
||||
---
|
||||
KF5PackageMacros.cmake | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/KF5PackageMacros.cmake b/KF5PackageMacros.cmake
|
||||
index f4c1d1d..acd3798 100644
|
||||
--- a/KF5PackageMacros.cmake
|
||||
+++ b/KF5PackageMacros.cmake
|
||||
@@ -1,6 +1,5 @@
|
||||
|
||||
-find_package(ECM 1.6.0 CONFIG REQUIRED)
|
||||
-include(${ECM_KDE_MODULE_DIR}/KDEInstallDirs.cmake)
|
||||
+include(KDEInstallDirs)
|
||||
|
||||
set(KPACKAGE_RELATIVE_DATA_INSTALL_DIR "kpackage")
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
|
@ -1,59 +1,23 @@
|
|||
From 732861dda9c466841a09329a0b2c992f2b78c40a Mon Sep 17 00:00:00 2001
|
||||
From: Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
Date: Tue, 21 Jan 2020 23:15:23 +0100
|
||||
Subject: [PATCH] Fix missing link libraries.
|
||||
|
||||
See <https://phabricator.kde.org/D26818>
|
||||
|
||||
These are only actually missing if the libraries reside in different
|
||||
prefixes, as it is the case in Guix or Nix.
|
||||
---
|
||||
src/ksieveui/autocreatescripts/tests/CMakeLists.txt | 2 ++
|
||||
src/ksieveui/scriptsparsing/autotests/CMakeLists.txt | 2 +-
|
||||
src/ksieveui/scriptsparsing/tests/CMakeLists.txt | 8 ++++++--
|
||||
3 files changed, 9 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/ksieveui/autocreatescripts/tests/CMakeLists.txt b/src/ksieveui/autocreatescripts/tests/CMakeLists.txt
|
||||
index 8a482b4..c43216c 100644
|
||||
--- a/src/ksieveui/autocreatescripts/tests/CMakeLists.txt
|
||||
+++ b/src/ksieveui/autocreatescripts/tests/CMakeLists.txt
|
||||
@@ -15,6 +16,7 @@ set(parsingscript_gui_SRCS parsingscript_gui.cpp ../../tests/capability.cpp)
|
||||
add_executable(parsingscript_gui ${parsingscript_gui_SRCS})
|
||||
target_link_libraries(parsingscript_gui
|
||||
KF5::KIOCore
|
||||
+ KF5::SyntaxHighlighting
|
||||
KF5::KSieveUi
|
||||
KF5::KSieve
|
||||
KF5::PimCommon
|
||||
diff --git a/src/ksieveui/scriptsparsing/autotests/CMakeLists.txt b/src/ksieveui/scriptsparsing/autotests/CMakeLists.txt
|
||||
index e41a74e..31703ef 100644
|
||||
--- a/src/ksieveui/scriptsparsing/autotests/CMakeLists.txt
|
||||
+++ b/src/ksieveui/scriptsparsing/autotests/CMakeLists.txt
|
||||
@@ -5,7 +5,7 @@ macro(add_sieveeditor_xmlprintingscriptbuilding _source _extrasource)
|
||||
ecm_add_test(${_test}
|
||||
TEST_NAME ${_name}
|
||||
NAME_PREFIX "sieveeditor-xmlprintingscriptbuilding-"
|
||||
- LINK_LIBRARIES Qt5::Test KF5::I18n KF5::KSieveUi
|
||||
+ LINK_LIBRARIES Qt5::Test KF5::I18n KF5::KSieveUi KF5::SyntaxHighlighting
|
||||
)
|
||||
endmacro()
|
||||
add_sieveeditor_xmlprintingscriptbuilding(xmlprintingscriptbuildertest.cpp "" "")
|
||||
diff --git a/src/ksieveui/scriptsparsing/tests/CMakeLists.txt b/src/ksieveui/scriptsparsing/tests/CMakeLists.txt
|
||||
index a252039..99a1aaa 100644
|
||||
--- a/src/ksieveui/scriptsparsing/tests/CMakeLists.txt
|
||||
+++ b/src/ksieveui/scriptsparsing/tests/CMakeLists.txt
|
||||
@@ -9,5 +9,9 @@ set(xmlsieveparsing_SRCS
|
||||
)
|
||||
|
||||
add_executable(xmlsieveparsing ${xmlsieveparsing_SRCS} )
|
||||
-target_link_libraries(xmlsieveparsing KF5::KSieveUi KF5::KSieve KF5::I18n)
|
||||
-
|
||||
+target_link_libraries(xmlsieveparsing
|
||||
+ KF5::KSieveUi
|
||||
+ KF5::SyntaxHighlighting
|
||||
+ KF5::KSieve
|
||||
+ KF5::I18n
|
||||
+)
|
||||
--
|
||||
2.21.1
|
||||
diff --git a/src/ksieveui/CMakeLists.txt b/src/ksieveui/CMakeLists.txt
|
||||
--- a/src/ksieveui/CMakeLists.txt
|
||||
+++ b/src/ksieveui/CMakeLists.txt
|
||||
@@ -255,6 +255,7 @@ target_link_libraries(KF5KSieveUi
|
||||
KF5::KManageSieve
|
||||
KF5::KSieve
|
||||
KF5::PimCommon
|
||||
+ KF5::SyntaxHighlighting
|
||||
PRIVATE
|
||||
KF5::Libkdepim
|
||||
KF5::Archive
|
||||
@@ -269,7 +270,6 @@ target_link_libraries(KF5KSieveUi
|
||||
KF5::I18n
|
||||
KF5::SonnetUi
|
||||
Qt::PrintSupport
|
||||
- KF5::SyntaxHighlighting
|
||||
)
|
||||
|
||||
set_target_properties(KF5KSieveUi PROPERTIES
|
||||
--
|
||||
2.33.0
|
||||
|
|
|
@ -0,0 +1,48 @@
|
|||
Patch sent upstream for review:
|
||||
https://github.com/thepowersgang/mrustc/pull/276
|
||||
|
||||
diff --git a/src/trans/target.cpp b/src/trans/target.cpp
|
||||
index 420a2870..4d5eefb3 100644
|
||||
--- a/src/trans/target.cpp
|
||||
+++ b/src/trans/target.cpp
|
||||
@@ -65,6 +65,13 @@ const TargetArch ARCH_POWERPC64LE = {
|
||||
{ /*atomic(u8)=*/true, true, true, true, true },
|
||||
TargetArch::Alignments(2, 4, 8, 16, 4, 8, 8)
|
||||
};
|
||||
+// This is a guess
|
||||
+const TargetArch ARCH_RISCV64 = {
|
||||
+ "riscv64",
|
||||
+ 64, false,
|
||||
+ { /*atomic(u8)=*/true, true, true, true, true },
|
||||
+ TargetArch::Alignments(2, 4, 8, 16, 4, 8, 8)
|
||||
+};
|
||||
TargetSpec g_target;
|
||||
|
||||
|
||||
@@ -455,6 +462,13 @@ namespace
|
||||
ARCH_POWERPC64LE
|
||||
};
|
||||
}
|
||||
+ else if(target_name == "riscv64-unknown-linux-gnu")
|
||||
+ {
|
||||
+ return TargetSpec {
|
||||
+ "unix", "linux", "gnu", {CodegenMode::Gnu11, false, "riscv64-unknown-linux-gnu", BACKEND_C_OPTS_GNU},
|
||||
+ ARCH_RISCV64
|
||||
+ };
|
||||
+ }
|
||||
else if(target_name == "i586-pc-windows-gnu")
|
||||
{
|
||||
return TargetSpec {
|
||||
diff --git a/tools/common/target_detect.h b/tools/common/target_detect.h
|
||||
index a052da6b..42fea91a 100644
|
||||
--- a/tools/common/target_detect.h
|
||||
+++ b/tools/common/target_detect.h
|
||||
@@ -34,6 +34,8 @@
|
||||
# define DEFAULT_TARGET_NAME "powerpc64-unknown-linux-gnu"
|
||||
# elif defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)
|
||||
# define DEFAULT_TARGET_NAME "powerpc64le-unknown-linux-gnu"
|
||||
+# elif defined(__riscv) && __riscv_xlen == 64
|
||||
+# define DEFAULT_TARGET_NAME "riscv64-unknown-linux-gnu"
|
||||
# else
|
||||
# warning "Unable to detect a suitable default target (linux-gnu)"
|
||||
# endif
|
|
@ -1,82 +0,0 @@
|
|||
Fixes CVE-2021-4034, local privilege escalation with 'pkexec':
|
||||
|
||||
https://www.openwall.com/lists/oss-security/2022/01/25/11
|
||||
|
||||
Patch from <https://gitlab.freedesktop.org/polkit/polkit/-/commit/a2bf5c9c83b6ae46cbd5c779d3055bff81ded683>.
|
||||
|
||||
From a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Rybar <jrybar@redhat.com>
|
||||
Date: Tue, 25 Jan 2022 17:21:46 +0000
|
||||
Subject: [PATCH] pkexec: local privilege escalation (CVE-2021-4034)
|
||||
|
||||
---
|
||||
src/programs/pkcheck.c | 5 +++++
|
||||
src/programs/pkexec.c | 23 ++++++++++++++++++++---
|
||||
2 files changed, 25 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/programs/pkcheck.c b/src/programs/pkcheck.c
|
||||
index f1bb4e1..768525c 100644
|
||||
--- a/src/programs/pkcheck.c
|
||||
+++ b/src/programs/pkcheck.c
|
||||
@@ -363,6 +363,11 @@ main (int argc, char *argv[])
|
||||
local_agent_handle = NULL;
|
||||
ret = 126;
|
||||
|
||||
+ if (argc < 1)
|
||||
+ {
|
||||
+ exit(126);
|
||||
+ }
|
||||
+
|
||||
/* Disable remote file access from GIO. */
|
||||
setenv ("GIO_USE_VFS", "local", 1);
|
||||
|
||||
diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c
|
||||
index 7698c5c..84e5ef6 100644
|
||||
--- a/src/programs/pkexec.c
|
||||
+++ b/src/programs/pkexec.c
|
||||
@@ -488,6 +488,15 @@ main (int argc, char *argv[])
|
||||
pid_t pid_of_caller;
|
||||
gpointer local_agent_handle;
|
||||
|
||||
+
|
||||
+ /*
|
||||
+ * If 'pkexec' is called THIS wrong, someone's probably evil-doing. Don't be nice, just bail out.
|
||||
+ */
|
||||
+ if (argc<1)
|
||||
+ {
|
||||
+ exit(127);
|
||||
+ }
|
||||
+
|
||||
ret = 127;
|
||||
authority = NULL;
|
||||
subject = NULL;
|
||||
@@ -614,10 +623,10 @@ main (int argc, char *argv[])
|
||||
|
||||
path = g_strdup (pwstruct.pw_shell);
|
||||
if (!path)
|
||||
- {
|
||||
+ {
|
||||
g_printerr ("No shell configured or error retrieving pw_shell\n");
|
||||
goto out;
|
||||
- }
|
||||
+ }
|
||||
/* If you change this, be sure to change the if (!command_line)
|
||||
case below too */
|
||||
command_line = g_strdup (path);
|
||||
@@ -636,7 +645,15 @@ main (int argc, char *argv[])
|
||||
goto out;
|
||||
}
|
||||
g_free (path);
|
||||
- argv[n] = path = s;
|
||||
+ path = s;
|
||||
+
|
||||
+ /* argc<2 and pkexec runs just shell, argv is guaranteed to be null-terminated.
|
||||
+ * /-less shell shouldn't happen, but let's be defensive and don't write to null-termination
|
||||
+ */
|
||||
+ if (argv[n] != NULL)
|
||||
+ {
|
||||
+ argv[n] = path;
|
||||
+ }
|
||||
}
|
||||
if (access (path, F_OK) != 0)
|
||||
{
|
|
@ -1,15 +0,0 @@
|
|||
Even when the polkit configure script detects elogind, it does not use
|
||||
it. This patch ensures that elogind is used when it is detected.
|
||||
|
||||
diff -ruN a/configure b/configure
|
||||
--- a/configure 1969-12-31 19:00:01.000000000 -0500
|
||||
+++ b/configure 2021-11-19 00:04:55.581385020 -0500
|
||||
@@ -20390,7 +20390,7 @@
|
||||
|
||||
|
||||
|
||||
- if test "$have_libsystemd" = "yes"; then
|
||||
+ if test "$have_libsystemd" = "yes" || test "$have_libelogind" = "yes"; then
|
||||
HAVE_LIBSYSTEMD_TRUE=
|
||||
HAVE_LIBSYSTEMD_FALSE='#'
|
||||
else
|
|
@ -0,0 +1,30 @@
|
|||
Don't install systemd units unless using libsystemd session tracking.
|
||||
|
||||
Submitted upstream:
|
||||
|
||||
https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/134
|
||||
|
||||
diff --git a/data/meson.build b/data/meson.build
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -26,7 +26,7 @@ if enable_pam
|
||||
)
|
||||
endif
|
||||
|
||||
-if enable_logind
|
||||
+if session_tracking == 'libsystemd-login'
|
||||
configure_file(
|
||||
input: 'polkit.service.in',
|
||||
output: '@BASENAME@',
|
||||
diff --git a/meson.build b/meson.build
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -199,7 +199,7 @@ if enable_logind
|
||||
|
||||
# systemd unit / service files
|
||||
systemd_systemdsystemunitdir = get_option('systemdsystemunitdir')
|
||||
- if systemd_systemdsystemunitdir == ''
|
||||
+ if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login'
|
||||
systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
|
||||
# FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used
|
||||
systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
|
File diff suppressed because it is too large
Load Diff
|
@ -1,41 +0,0 @@
|
|||
https://www.postgresql.org/message-id/dea97b6d-f55f-1f6d-9109-504aa7dfa421@gentoo.org
|
||||
|
||||
The attached patch adds native spinlock support to PostgreSQL on RISC-V
|
||||
systems. As suspected by Richard W.M. Jones of Red Hat back in 2016, the
|
||||
__sync_lock_test_and_set() approach applied on arm and arm64 works here
|
||||
as well.
|
||||
|
||||
|
||||
Tested against PostgreSQL 13.3 on a physical rv64gc system (BeagleV
|
||||
Starlight beta board) - builds and installs fine, all tests pass. From
|
||||
what I can see in gcc documentation this should in theory work on rv32
|
||||
(and possibly rv128) as well, therefore the patch as it stands covers
|
||||
all RISC-V systems (i.e. doesn't check the value of __risc_xlen) - but I
|
||||
haven't confirmed this experimentally.
|
||||
|
||||
--- a/src/include/storage/s_lock.h
|
||||
+++ b/src/include/storage/s_lock.h
|
||||
@@ -315,12 +315,12 @@
|
||||
#endif /* __ia64__ || __ia64 */
|
||||
|
||||
/*
|
||||
- * On ARM and ARM64, we use __sync_lock_test_and_set(int *, int) if available.
|
||||
+ * On ARM, ARM64 and RISC-V, we use __sync_lock_test_and_set(int *, int) if available.
|
||||
*
|
||||
* We use the int-width variant of the builtin because it works on more chips
|
||||
* than other widths.
|
||||
*/
|
||||
-#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64)
|
||||
+#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64) || defined(__riscv)
|
||||
#ifdef HAVE_GCC__SYNC_INT32_TAS
|
||||
#define HAS_TEST_AND_SET
|
||||
|
||||
@@ -337,7 +337,7 @@
|
||||
#define S_UNLOCK(lock) __sync_lock_release(lock)
|
||||
|
||||
#endif /* HAVE_GCC__SYNC_INT32_TAS */
|
||||
-#endif /* __arm__ || __arm || __aarch64__ || __aarch64 */
|
||||
+#endif /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */
|
||||
|
||||
|
||||
/* S/390 and S/390x Linux (32- and 64-bit zSeries) */
|
|
@ -0,0 +1,43 @@
|
|||
Add compatibility with newer versions of pytest.
|
||||
|
||||
Taken from upstream:
|
||||
|
||||
https://github.com/dateutil/dateutil/commit/2bdd63158b7f981fc6d70a869680451bdfd8d848
|
||||
|
||||
diff --git a/dateutil/test/test_internals.py b/dateutil/test/test_internals.py
|
||||
index 53081314..b32e6723 100644
|
||||
--- a/dateutil/test/test_internals.py
|
||||
+++ b/dateutil/test/test_internals.py
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
import sys
|
||||
import pytest
|
||||
+import warnings
|
||||
|
||||
from dateutil.parser._parser import _ymd
|
||||
from dateutil import tz
|
||||
@@ -65,18 +66,17 @@ def test_parser_parser_private_not_warns():
|
||||
from dateutil.parser._parser import _timelex, _tzparser
|
||||
from dateutil.parser._parser import _parsetz
|
||||
|
||||
- with pytest.warns(None) as recorder:
|
||||
+ with warnings.catch_warnings():
|
||||
+ warnings.simplefilter("error")
|
||||
_tzparser()
|
||||
- assert len(recorder) == 0
|
||||
|
||||
- with pytest.warns(None) as recorder:
|
||||
+ with warnings.catch_warnings():
|
||||
+ warnings.simplefilter("error")
|
||||
_timelex('2014-03-03')
|
||||
|
||||
- assert len(recorder) == 0
|
||||
-
|
||||
- with pytest.warns(None) as recorder:
|
||||
+ with warnings.catch_warnings():
|
||||
+ warnings.simplefilter("error")
|
||||
_parsetz('+05:00')
|
||||
- assert len(recorder) == 0
|
||||
|
||||
|
||||
@pytest.mark.tzstr
|
|
@ -0,0 +1,11 @@
|
|||
Description: Avoid dependency on byebug to reduce package closure
|
||||
significantly, see https://issues.guix.gnu.org/55997
|
||||
diff --git a/lib/hydra.rb b/lib/hydra.rb
|
||||
index 29fbad2..6b5058a 100644
|
||||
--- a/lib/hydra.rb
|
||||
+++ b/lib/hydra.rb
|
||||
@@ -1,4 +1,3 @@
|
||||
-require 'byebug' unless ENV['RACK_ENV'] == "production"
|
||||
require 'pp'
|
||||
|
||||
module CoreExt
|
|
@ -1,99 +0,0 @@
|
|||
# This modified patch is to disable the hunk applying to LLVM, unbundled in Guix.
|
||||
|
||||
# Add mrustc slice length intrinsics
|
||||
--- src/libcore/intrinsics.rs
|
||||
+++ src/libcore/intrinsics.rs
|
||||
@@ -685,4 +685,8 @@
|
||||
pub fn min_align_of_val<T: ?Sized>(_: &T) -> usize;
|
||||
|
||||
+ /// Obtain the length of a slice pointer
|
||||
+ #[cfg(rust_compiler="mrustc")]
|
||||
+ pub fn mrustc_slice_len<T>(pointer: *const [T]) -> usize;
|
||||
+
|
||||
/// Gets a static string slice containing the name of a type.
|
||||
pub fn type_name<T: ?Sized>() -> &'static str;
|
||||
|
||||
--- src/libcore/slice/mod.rs
|
||||
+++ src/libcore/slice/mod.rs
|
||||
@@ -68,5 +68,8 @@
|
||||
pub const fn len(&self) -> usize {
|
||||
- unsafe {
|
||||
- crate::ptr::Repr { rust: self }.raw.len
|
||||
- }
|
||||
+ #[cfg(not(rust_compiler="mrustc"))]
|
||||
+ #[cfg_attr(not(bootstrap), allow_internal_unstable(const_fn_union))]
|
||||
+ const fn len_inner<T>(s: &[T]) -> usize { unsafe { crate::ptr::Repr { rust: s }.raw.len } };
|
||||
+ #[cfg(rust_compiler="mrustc")]
|
||||
+ const fn len_inner<T>(s: &[T]) -> usize { unsafe { crate::intrinsics::mrustc_slice_len(s) } }
|
||||
+ len_inner(self)
|
||||
}
|
||||
#
|
||||
# Static-link rustc_codegen_llvm so the generated rustc is standalone
|
||||
# > Note: Interacts with `rustc-1.39.0-overrides.toml`
|
||||
#
|
||||
--- src/librustc_interface/util.rs
|
||||
+++ src/librustc_interface/util.rs
|
||||
@@ -421,2 +421,4 @@
|
||||
pub fn get_codegen_sysroot(backend_name: &str) -> fn() -> Box<dyn CodegenBackend> {
|
||||
+ #[cfg(rust_compiler="mrustc")]
|
||||
+ { if(backend_name == "llvm") { extern "Rust" { fn __rustc_codegen_backend() -> Box<dyn CodegenBackend>; } return || unsafe { __rustc_codegen_backend() } } }
|
||||
// For now we only allow this function to be called once as it'll dlopen a
|
||||
# Disable most architecture intrinsics
|
||||
--- src/stdarch/crates/std_detect/src/detect/mod.rs
|
||||
+++ src/stdarch/crates/std_detect/src/detect/mod.rs
|
||||
@@ -74,4 +74,7 @@
|
||||
// this run-time detection logic is never called.
|
||||
#[path = "os/other.rs"]
|
||||
mod os;
|
||||
+ } else if #[cfg(rust_compiler="mrustc")] {
|
||||
+ #[path = "os/other.rs"]
|
||||
+ mod os;
|
||||
} else if #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] {
|
||||
--- vendor/ppv-lite86/src/lib.rs
|
||||
+++ vendor/ppv-lite86/src/lib.rs
|
||||
@@ -12,10 +12,10 @@
|
||||
-#[cfg(all(feature = "simd", target_arch = "x86_64", not(miri)))]
|
||||
+#[cfg(all(feature = "simd", target_arch = "x86_64", not(miri), not(rust_compiler="mrustc")))]
|
||||
pub mod x86_64;
|
||||
-#[cfg(all(feature = "simd", target_arch = "x86_64", not(miri)))]
|
||||
+#[cfg(all(feature = "simd", target_arch = "x86_64", not(miri), not(rust_compiler="mrustc")))]
|
||||
use self::x86_64 as arch;
|
||||
|
||||
-#[cfg(any(miri, not(all(feature = "simd", any(target_arch = "x86_64")))))]
|
||||
+#[cfg(any(miri, rust_compiler="mrustc", not(all(feature = "simd", any(target_arch = "x86_64")))))]
|
||||
pub mod generic;
|
||||
-#[cfg(any(miri, not(all(feature = "simd", any(target_arch = "x86_64")))))]
|
||||
+#[cfg(any(miri, rust_compiler="mrustc", not(all(feature = "simd", any(target_arch = "x86_64")))))]
|
||||
use self::generic as arch;
|
||||
|
||||
# diff --git a/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h b/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h
|
||||
# index da9d9d5bfdc0..3d47471f0ef0 100644
|
||||
# --- src/llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h
|
||||
# +++ src/llvm-project/llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h
|
||||
# @@ -16,6 +16,8 @@
|
||||
# #include "llvm/Demangle/DemangleConfig.h"
|
||||
# #include "llvm/Demangle/StringView.h"
|
||||
# #include <array>
|
||||
# +#include <cstdint>
|
||||
# +#include <string>
|
||||
|
||||
# namespace llvm {
|
||||
# namespace itanium_demangle {
|
||||
##
|
||||
## gcc (used by mrustc) has 16-byte uint128_t alignment, while rustc uses 8
|
||||
##
|
||||
#--- src/libsyntax/ast.rs
|
||||
#+++ src/libsyntax/ast.rs
|
||||
#@@ -986,2 +986,2 @@
|
||||
#-#[cfg(target_arch = "x86_64")]
|
||||
#-static_assert_size!(Expr, 96);
|
||||
#+//#[cfg(target_arch = "x86_64")]
|
||||
#+//static_assert_size!(Expr, 96);
|
||||
#--- src/librustc/ty/sty.rs
|
||||
#+++ src/librustc/ty/sty.rs
|
||||
#@@ -2258,2 +2258,2 @@
|
||||
#-#[cfg(target_arch = "x86_64")]
|
||||
#-static_assert_size!(Const<'_>, 40);
|
||||
#+//#[cfg(target_arch = "x86_64")]
|
||||
#+//static_assert_size!(Const<'_>, 40);
|
||||
|
|
@ -0,0 +1,117 @@
|
|||
# mrustc is much better at enum packing, so causes almost all of these to be smaller by one pointer
|
||||
--- compiler/rustc_ast/src/ast.rs
|
||||
+++ compiler/rustc_ast/src/ast.rs
|
||||
@@ -1075,7 +1075,7 @@ pub struct Expr {
|
||||
}
|
||||
|
||||
// `Expr` is used a lot. Make sure it doesn't unintentionally get bigger.
|
||||
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
+#[cfg(all(not(rust_compiler = "mrustc"), target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
rustc_data_structures::static_assert_size!(Expr, 104);
|
||||
|
||||
impl Expr {
|
||||
@@ -2779,7 +2779,7 @@ pub enum AssocItemKind {
|
||||
MacCall(MacCall),
|
||||
}
|
||||
|
||||
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
+#[cfg(all(not(rust_compiler = "mrustc"), target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
rustc_data_structures::static_assert_size!(AssocItemKind, 72);
|
||||
|
||||
impl AssocItemKind {
|
||||
@@ -2831,7 +2831,7 @@ pub enum ForeignItemKind {
|
||||
MacCall(MacCall),
|
||||
}
|
||||
|
||||
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
+#[cfg(all(not(rust_compiler="mrustc"),target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
rustc_data_structures::static_assert_size!(ForeignItemKind, 72);
|
||||
|
||||
impl From<ForeignItemKind> for ItemKind {
|
||||
--- compiler/rustc_hir/src/hir.rs
|
||||
+++ compiler/rustc_hir/src/hir.rs
|
||||
@@ -3050,3 +3050,3 @@
|
||||
// Some nodes are used a lot. Make sure they don't unintentionally get bigger.
|
||||
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
+#[cfg(all(not(rust_compiler="mrustc"),target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
mod size_asserts {
|
||||
--- compiler/rustc_middle/src/mir/interpret/error.rs
|
||||
+++ compiler/rustc_middle/src/mir/interpret/error.rs
|
||||
@@ -452,2 +452,2 @@
|
||||
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
+#[cfg(all(not(rust_compiler="mrustc"), target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
static_assert_size!(InterpError<'_>, 64);
|
||||
--- compiler/rustc_middle/src/mir/mod.rs
|
||||
+++ compiler/rustc_middle/src/mir/mod.rs
|
||||
@@ -2203,2 +2203,2 @@
|
||||
-#[cfg(target_arch = "x86_64")]
|
||||
+#[cfg(all(not(rust_compiler="mrustc"), target_arch = "x86_64"))]
|
||||
static_assert_size!(AggregateKind<'_>, 48);
|
||||
--- compiler/rustc_middle/src/thir.rs
|
||||
+++ compiler/rustc_middle/src/thir.rs
|
||||
@@ -147,2 +147,2 @@
|
||||
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
+#[cfg(all(not(rust_compiler="mrustc"), target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
rustc_data_structures::static_assert_size!(Expr<'_>, 144);
|
||||
--- compiler/rustc_mir/src/interpret/place.rs
|
||||
+++ compiler/rustc_mir/src/interpret/place.rs
|
||||
@@ -91,2 +91,2 @@
|
||||
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
+#[cfg(all(not(rust_compiler = "mrustc"), target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
rustc_data_structures::static_assert_size!(Place, 64);
|
||||
@@ -100,2 +100,2 @@
|
||||
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
+#[cfg(all(not(rust_compiler = "mrustc"), target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
rustc_data_structures::static_assert_size!(PlaceTy<'_>, 80);
|
||||
--- compiler/rustc_mir/src/interpret/operand.rs
|
||||
+++ compiler/rustc_mir/src/interpret/operand.rs
|
||||
@@ -35,2 +35,2 @@
|
||||
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
+#[cfg(all(not(rust_compiler = "mrustc"), target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
rustc_data_structures::static_assert_size!(Immediate, 56);
|
||||
@@ -90,2 +90,2 @@
|
||||
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
+#[cfg(all(not(rust_compiler = "mrustc"), target_arch = "x86_64", target_pointer_width = "64"))]
|
||||
rustc_data_structures::static_assert_size!(ImmTy<'_>, 72);
|
||||
|
||||
#
|
||||
# Disable crc32fast's use of stdarch
|
||||
#
|
||||
--- vendor/crc32fast/src/specialized/mod.rs
|
||||
+++ vendor/crc32fast/src/specialized/mod.rs
|
||||
@@ -1,5 +1,6 @@
|
||||
cfg_if! {
|
||||
if #[cfg(all(
|
||||
+ not(rust_compiler = "mrustc"),
|
||||
crc32fast_stdarchx86,
|
||||
any(target_arch = "x86", target_arch = "x86_64")
|
||||
))] {
|
||||
|
||||
#
|
||||
# Disable std_detect's detection logic (use the same logic as miri)
|
||||
#
|
||||
--- library/stdarch/crates/std_detect/src/detect/mod.rs
|
||||
+++ library/stdarch/crates/std_detect/src/detect/mod.rs
|
||||
@@ -88,2 +88,2 @@
|
||||
cfg_if! {
|
||||
- if #[cfg(miri)] {
|
||||
+ if #[cfg(any(miri, rust_compiler = "mrustc"))] {
|
||||
|
||||
# PPV-Lite also needs to know that we're pretending to be miri
|
||||
--- vendor/ppv-lite86/src/lib.rs
|
||||
+++ vendor/ppv-lite86/src/lib.rs
|
||||
@@ -12,9 +12,9 @@
|
||||
-#[cfg(all(feature = "simd", target_arch = "x86_64", not(miri)))]
|
||||
+#[cfg(all(feature = "simd", target_arch = "x86_64", not(miri), not(rust_compiler = "mrustc")))]
|
||||
pub mod x86_64;
|
||||
-#[cfg(all(feature = "simd", target_arch = "x86_64", not(miri)))]
|
||||
+#[cfg(all(feature = "simd", target_arch = "x86_64", not(miri), not(rust_compiler = "mrustc")))]
|
||||
use self::x86_64 as arch;
|
||||
|
||||
-#[cfg(any(miri, not(all(feature = "simd", any(target_arch = "x86_64")))))]
|
||||
+#[cfg(any(miri, rust_compiler = "mrustc", not(all(feature = "simd", any(target_arch = "x86_64")))))]
|
||||
pub mod generic;
|
||||
-#[cfg(any(miri, not(all(feature = "simd", any(target_arch = "x86_64")))))]
|
||||
+#[cfg(any(miri, rust_compiler = "mrustc", not(all(feature = "simd", any(target_arch = "x86_64")))))]
|
||||
use self::generic as arch;
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
Description: Avoid dependency on byebug to reduce package closure
|
||||
significantly, see https://issues.guix.gnu.org/55997
|
||||
diff --git a/lib/tex/hyphen/language.rb b/lib/tex/hyphen/language.rb
|
||||
index 12831417..df6daa39 100644
|
||||
--- a/lib/tex/hyphen/language.rb
|
||||
+++ b/lib/tex/hyphen/language.rb
|
||||
@@ -1,6 +1,5 @@
|
||||
require 'yaml'
|
||||
require 'hydra'
|
||||
-require 'byebug'
|
||||
|
||||
require_relative 'path'
|
||||
|
|
@ -8573,7 +8573,7 @@ for a given module is comprehensive.")
|
|||
(define-public perl-pod-parser
|
||||
(package
|
||||
(name "perl-pod-parser")
|
||||
(version "1.63")
|
||||
(version "1.65")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -8581,7 +8581,7 @@ for a given module is comprehensive.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1k8clxxdjag56zm6cv38c3q81gj7xphfhh98l21jynwp55hvbq6v"))))
|
||||
"12mj07a34shx5h203l693fra7ip9hc49zrd7w8gsa5llcpnbv9rv"))))
|
||||
(build-system perl-build-system)
|
||||
(home-page "https://metacpan.org/release/Pod-Parser")
|
||||
(synopsis "Modules for parsing/translating POD format documents")
|
||||
|
|
|
@ -204,17 +204,6 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others).")
|
|||
;; both two licensing modes for your changes/additions."
|
||||
(license (list license:lgpl2.1 license:cddl1.0))))
|
||||
|
||||
(define-public libraw-0.18
|
||||
(package (inherit libraw)
|
||||
(name "libraw")
|
||||
(version "0.18.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.libraw.org/data/LibRaw-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1m2khr2cij8z6lawgbmdksjn14fpnjsy8ad4qahnpqapm1slsxap"))))))
|
||||
|
||||
(define-public libexif
|
||||
(package
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
|
||||
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
|
||||
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -28,14 +30,16 @@
|
|||
(define-module (gnu packages polkit)
|
||||
#:use-module ((guix licenses) #:select (lgpl2.0+))
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix memoization)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix build utils)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gtk)
|
||||
|
@ -53,102 +57,75 @@
|
|||
(define-public polkit-mozjs
|
||||
(package
|
||||
(name "polkit")
|
||||
(version "0.120")
|
||||
(version "121")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://www.freedesktop.org/software/polkit/releases/"
|
||||
name "-" version ".tar.gz"))
|
||||
(patches (search-patches "polkit-disable-systemd.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"00zfg9b9ivkcj2jcf5b92cpvvyljz8cmfwj86lkvy5rihnd5jypf"))
|
||||
(patches (search-patches "polkit-configure-elogind.patch"
|
||||
"polkit-CVE-2021-4034.patch"))
|
||||
"1apz3bh7nbpmlp1cr00pb8z8wp0c7yb23ninb959jz3r38saxiwx"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
(use-modules (guix build utils))
|
||||
;; Disable broken test.
|
||||
(substitute* "test/Makefile.in"
|
||||
(("SUBDIRS = mocklibc . polkit polkitbackend")
|
||||
"SUBDIRS = mocklibc . polkit"))
|
||||
;; Disable a test that requires Python, D-Bus and a few
|
||||
;; libraries and fails with "ERROR: timed out waiting for bus
|
||||
;; process to terminate".
|
||||
(substitute* "test/polkitbackend/Makefile.am"
|
||||
(("TEST_PROGS \\+= polkitbackendjsauthoritytest-wrapper.py")
|
||||
(substitute* "test/meson.build"
|
||||
(("subdir\\('polkitbackend'\\)")
|
||||
""))
|
||||
;; Guix System's polkit
|
||||
;; service stores actions under /etc/polkit-1/actions.
|
||||
;; Look up actions and rules from /etc/polkit ...
|
||||
(substitute* "src/polkitbackend/meson.build"
|
||||
(("'-DPACKAGE_SYSCONF_DIR=.*,")
|
||||
"'-DPACKAGE_SYSCONF_DIR=\"/etc\"',"))
|
||||
(substitute* "src/polkitbackend/polkitbackendinteractiveauthority.c"
|
||||
(("PACKAGE_DATA_DIR \"/polkit-1/actions\"")
|
||||
"PACKAGE_SYSCONF_DIR \"/polkit-1/actions\""))
|
||||
;; ... but install package files below the prefix.
|
||||
(substitute* "meson.build"
|
||||
(("pk_sysconfdir = get_option\\('sysconfdir'\\)")
|
||||
"pk_sysconfdir = get_option('prefix') + '/etc'"))
|
||||
;; Set the setuid helper's real location.
|
||||
(substitute* "src/polkitagent/polkitagentsession.c"
|
||||
(("PACKAGE_PREFIX \"/lib/polkit-1/polkit-agent-helper-1\"")
|
||||
"\"/run/setuid-programs/polkit-agent-helper-1\""))))))
|
||||
(build-system gnu-build-system)
|
||||
(build-system meson-build-system)
|
||||
(inputs
|
||||
(list expat linux-pam elogind mozjs nspr))
|
||||
(list elogind
|
||||
expat
|
||||
linux-pam
|
||||
mozjs-91
|
||||
nspr))
|
||||
(propagated-inputs
|
||||
(list glib)) ; required by polkit-gobject-1.pc
|
||||
(list glib)) ;required by polkit-gobject-1.pc
|
||||
(native-inputs
|
||||
(list pkg-config
|
||||
`(,glib "bin") ;for glib-mkenums
|
||||
intltool
|
||||
gettext-minimal
|
||||
perl
|
||||
`(,glib "bin") ;for glib-mkenums
|
||||
gobject-introspection
|
||||
libxslt ;for man page generation
|
||||
docbook-xsl)) ;for man page generation
|
||||
libxml2 ;for man page generation
|
||||
libxslt ;for man page generation
|
||||
docbook-xsl)) ;for man page generation
|
||||
(arguments
|
||||
`(#:configure-flags '("--sysconfdir=/etc"
|
||||
"--enable-man-pages"
|
||||
;; Prevent ‘configure: error: cannot check for
|
||||
;; file existence when cross compiling’.
|
||||
,@(if (%current-target-system)
|
||||
'("--with-os-type=unknown")
|
||||
'()))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after
|
||||
'unpack 'fix-introspection-install-dir
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(substitute* (find-files "." "Makefile.in")
|
||||
(("@INTROSPECTION_GIRDIR@")
|
||||
(string-append out "/share/gir-1.0/"))
|
||||
(("@INTROSPECTION_TYPELIBDIR@")
|
||||
(string-append out "/lib/girepository-1.0/"))))))
|
||||
;; TODO: Core-updates: Unify on the cross-build version.
|
||||
,@(if (%current-target-system)
|
||||
`((add-after 'unpack 'fix-manpage-generation
|
||||
(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
||||
(let ((xsldoc (string-append (assoc-ref (or native-inputs inputs)
|
||||
"docbook-xsl")
|
||||
"/xml/xsl/docbook-xsl-"
|
||||
,(package-version docbook-xsl))))
|
||||
(substitute* '("docs/man/Makefile.am" "docs/man/Makefile.in")
|
||||
(("http://docbook.sourceforge.net/release/xsl/current")
|
||||
xsldoc))))))
|
||||
`((add-after 'unpack 'fix-manpage-generation
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((xsldoc (string-append (assoc-ref inputs "docbook-xsl")
|
||||
"/xml/xsl/docbook-xsl-"
|
||||
,(package-version docbook-xsl))))
|
||||
(substitute* '("docs/man/Makefile.am" "docs/man/Makefile.in")
|
||||
(("http://docbook.sourceforge.net/release/xsl/current")
|
||||
xsldoc)))))))
|
||||
(replace
|
||||
'install
|
||||
(lambda* (#:key outputs (make-flags '()) #:allow-other-keys)
|
||||
;; Override sysconfdir during "make install", to avoid attempting
|
||||
;; to install in /etc, and to instead install the skeletons in the
|
||||
;; output directory.
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(apply invoke "make" "install"
|
||||
(string-append "sysconfdir=" out "/etc")
|
||||
(string-append "polkit_actiondir="
|
||||
out "/share/polkit-1/actions")
|
||||
make-flags)))))))
|
||||
(list #:configure-flags
|
||||
#~'("--sysconfdir=/etc"
|
||||
"-Dsession_tracking=libelogind"
|
||||
"-Dman=true"
|
||||
"-Dtests=true"
|
||||
"-Djs_engine=mozjs"
|
||||
;; Work around broken gobject-introspection detection when
|
||||
;; cross-compiling. The build system probes for the _target_
|
||||
;; gobject-introspection, but if we change it to native, Meson
|
||||
;; fails with:
|
||||
;; ERROR: Pkg-config binary for machine MachineChoice.BUILD
|
||||
;; not found, giving up.
|
||||
;; Just disable introspection for now.
|
||||
#$@(if (%current-target-system)
|
||||
'("-Dintrospection=false")
|
||||
'()))))
|
||||
(home-page "https://www.freedesktop.org/wiki/Software/polkit/")
|
||||
(synopsis "Authorization API for privilege management")
|
||||
(description "Polkit is an application-level toolkit for defining and
|
||||
|
@ -164,25 +141,10 @@ for unprivileged applications.")
|
|||
(let ((base polkit-mozjs))
|
||||
(package/inherit base
|
||||
(name "polkit-duktape")
|
||||
(source
|
||||
(origin
|
||||
(inherit (package-source base))
|
||||
(patches
|
||||
(append
|
||||
(search-patches "polkit-use-duktape.patch")
|
||||
(origin-patches (package-source base))))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments base)
|
||||
((#:configure-flags flags)
|
||||
`(cons "--with-duktape" ,flags))
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'unpack 'force-gnu-build-system-bootstrap
|
||||
(lambda _
|
||||
(delete-file "configure")))))))
|
||||
(native-inputs
|
||||
(modify-inputs (package-native-inputs base)
|
||||
(prepend autoconf automake libtool)))
|
||||
#~(delete "-Djs_engine=mozjs" #$flags))))
|
||||
(inputs
|
||||
(modify-inputs (package-inputs base)
|
||||
(replace "mozjs" duktape))))))
|
||||
|
|
|
@ -503,13 +503,13 @@ for example, for recording or replaying web content.")
|
|||
(define-public python-certifi
|
||||
(package
|
||||
(name "python-certifi")
|
||||
(version "2021.10.8")
|
||||
(version "2022.6.15")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "certifi" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0wl8ln7acd797i1q7mmb430l6hqwhmk4bd37x8ycw02b3my4x23q"))))
|
||||
"03c2l11lgljx0kz17cvdc4hlc3p1594ajdih9zq0a4dig285mj44"))))
|
||||
(build-system python-build-system)
|
||||
(arguments '(#:tests? #f)) ;no tests
|
||||
(home-page "https://certifi.io/")
|
||||
|
|
|
@ -424,7 +424,7 @@ library.")
|
|||
(inputs
|
||||
(list which xclip xsel))
|
||||
(native-inputs
|
||||
(list python-cython-0.29.32
|
||||
(list python-cython
|
||||
python-beautifulsoup4
|
||||
python-lxml
|
||||
python-html5lib
|
||||
|
|
|
@ -2841,13 +2841,13 @@ APIs.")
|
|||
(define-public python-requests
|
||||
(package
|
||||
(name "python-requests")
|
||||
(version "2.27.1")
|
||||
(version "2.28.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "requests" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0qcsbi919d689xqlgyhw9zkppp1fs6k09wwffa3ri6d8smpwbmv8"))))
|
||||
"10vrr7bijzrypvms3g2sgz8vya7f9ymmcv423ikampgy0aqrjmbw"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
(list python-certifi
|
||||
|
@ -3191,14 +3191,14 @@ addon for removing tracking fields from URLs.")
|
|||
(define-public python-urllib3
|
||||
(package
|
||||
(name "python-urllib3")
|
||||
(version "1.26.8")
|
||||
(version "1.26.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "urllib3" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0g18xk7gfm88gr4bp3f58vgvsbzwps3sq2kqhv5xyz9ylvck6z0f"))))
|
||||
"13j4mkk6vgix4bixfqk3fhydsl3r5f61z94ss4fmwsl0fxjg3fma"))))
|
||||
(build-system python-build-system)
|
||||
(arguments `(#:tests? #f))
|
||||
(propagated-inputs
|
||||
|
@ -5740,6 +5740,12 @@ files.")
|
|||
(base32
|
||||
"1vk7g5z977mi89hamwiqawpmibwvv9ghrf3pqva1waxmyc7gyjb5"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'check 'extend-test-timeout
|
||||
(lambda _
|
||||
(setenv "WEBSOCKETS_TESTS_TIMEOUT_FACTOR" "10"))))))
|
||||
(home-page "https://github.com/aaugustin/websockets")
|
||||
(synopsis
|
||||
"Python implementation of the WebSocket Protocol (RFC 6455 & 7692)")
|
||||
|
|
|
@ -1380,14 +1380,14 @@ by @code{binstar}, @code{binstar-build}, and @code{chalmers}.")
|
|||
(define-public python-babel
|
||||
(package
|
||||
(name "python-babel")
|
||||
(version "2.9.0")
|
||||
(version "2.10.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Babel" version))
|
||||
(sha256
|
||||
(base32
|
||||
"018yg7g2pa6vjixx1nx41cfispgfi0azzp0a1chlycbj8jsil0ys"))))
|
||||
"0l9cvfmsz0hlvcinxaf6xf2f02ldgw3xq9i1fc7lk5zf24vma53n"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
(list python-freezegun python-pytest tzdata-for-tests))
|
||||
|
@ -3506,14 +3506,14 @@ interfaces.")
|
|||
(define-public python-click
|
||||
(package
|
||||
(name "python-click")
|
||||
(version "8.1.2")
|
||||
(version "8.1.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "click" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0whs38a2i0561kwbgigs6vic9r0a1887m2v1aw3rmv6r2kz0g5s7"))))
|
||||
"13kvp8visj5xh9d43brnda6q0kc1s40flxa5cw0p0a9hzf5dr0kn"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -3904,21 +3904,14 @@ JavaScript-like message boxes. Types of dialog boxes include:
|
|||
(package
|
||||
(name "python-pympler")
|
||||
(home-page "https://pythonhosted.org/Pympler/")
|
||||
(version "0.9")
|
||||
(version "1.0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Pympler" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0ivfw2k86nbw9ck9swidl4422w7bhjldxwj90a4sy5r1cbgygjzj"))))
|
||||
"1ynkqpv2akldmvkll5vh5zhwj433s1d59iv0f76lygyak4silgwr"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
(delete 'check)
|
||||
(add-after 'install 'check
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(add-installed-pythonpath inputs outputs)
|
||||
(invoke "python" "setup.py" "test"))))))
|
||||
(synopsis "Measure, monitor and analyze memory behavior")
|
||||
(description
|
||||
"Pympler is a development tool to measure, monitor and analyze
|
||||
|
@ -5644,13 +5637,13 @@ provides additional functionality on the produced Mallard documents.")
|
|||
(define-public python-cython
|
||||
(package
|
||||
(name "python-cython")
|
||||
(version "0.29.24")
|
||||
(version "0.29.32")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Cython" version))
|
||||
(sha256
|
||||
(base32 "0hw4gs18rh4slij1fg252argxhraypld9apbqbl60230qc3lvw6d"))))
|
||||
(base32 "1xqsihpqnfal29nb5kmw8z71nd4jbsnbz7p3lkr094xpb13wycw7"))))
|
||||
(build-system python-build-system)
|
||||
;; we need the full python package and not just the python-wrapper
|
||||
;; because we need libpython3.3m.so
|
||||
|
@ -5686,18 +5679,6 @@ programming language and the extended Cython programming language. It makes
|
|||
writing C extensions for Python as easy as Python itself.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
;; Newer version required for Pandas.
|
||||
(define-public python-cython-0.29.32
|
||||
(package
|
||||
(inherit python-cython)
|
||||
(version "0.29.32")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Cython" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1xqsihpqnfal29nb5kmw8z71nd4jbsnbz7p3lkr094xpb13wycw7"))))))
|
||||
|
||||
(define-public python-cython-3
|
||||
(package
|
||||
(inherit python-cython)
|
||||
|
@ -5893,7 +5874,7 @@ capabilities.")
|
|||
python-pandas
|
||||
python-pydata-sphinx-theme
|
||||
python-scipy ;used by matplotlib
|
||||
python-sphinx
|
||||
python-sphinx-4
|
||||
python-sphinx-panels
|
||||
texinfo
|
||||
texlive-bin
|
||||
|
@ -7198,13 +7179,13 @@ retrieve text and metadata from PDFs as well as merge entire files together.")
|
|||
(define-public python-pillow
|
||||
(package
|
||||
(name "python-pillow")
|
||||
(version "9.0.0")
|
||||
(version "9.2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Pillow" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0gjry0yqryd2678sm47jhdnbghzxn5wk8pgyaqwr4qi7x5ijjvpf"))
|
||||
"011wgm1mssjchpva9wsi2a07im9czyjvik137xlp5f0g7vykdrkm"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet '(begin
|
||||
(delete-file-recursively "src/thirdparty")))))
|
||||
|
@ -13874,14 +13855,14 @@ simulation, statistical modeling, machine learning and much more.")
|
|||
(define-public python-chardet
|
||||
(package
|
||||
(name "python-chardet")
|
||||
(version "4.0.0")
|
||||
(version "5.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "chardet" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ykr04qyhgpc0h5b7dhqw4g92b1xv7ki2ky910mhy4mlbnhm6vqd"))))
|
||||
"1amqmz8731ly6f9rkbk09w4jqgmmgyxykd1bawhgrdbqzlmxys03"))))
|
||||
(native-inputs
|
||||
(list python-pytest))
|
||||
(build-system python-build-system)
|
||||
|
@ -13890,7 +13871,10 @@ simulation, statistical modeling, machine learning and much more.")
|
|||
#~(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(invoke "pytest" "-vv")))
|
||||
(invoke "pytest" "-vv" "-k"
|
||||
;; Disable test that fails sporadically:
|
||||
;; https://github.com/chardet/chardet/issues/256
|
||||
"not test_detect_all_and_detect_one_should_agree")))
|
||||
;; This package provides a 'chardetect' executable that only
|
||||
;; depends on Python, so customize the wrap phase to avoid
|
||||
;; adding pytest and friends in order to save size.
|
||||
|
@ -13918,13 +13902,13 @@ automatically detect a wide range of file encodings.")
|
|||
(define-public python-charset-normalizer
|
||||
(package
|
||||
(name "python-charset-normalizer")
|
||||
(version "2.0.11")
|
||||
(version "2.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "charset-normalizer" version))
|
||||
(sha256
|
||||
(base32 "071pi2kd222rjjrjdllffqv3iz4bfaj93a9bfs65907fd6fqlfcq"))))
|
||||
(base32 "04zlajr77f6c7ai59l46as1idi0jjgbvj72lh4v5wfpz2s070pjp"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
|
@ -19442,15 +19426,12 @@ from the header, as well as section details and data available.")
|
|||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
,@(if (target-riscv64?)
|
||||
;; TODO: Remove the conditional on staging.
|
||||
`((add-after 'unpack 'remove-test-hypothesis-deadlines
|
||||
(lambda _
|
||||
(substitute* "tests/test_make.py"
|
||||
(("assume, given") "assume, given, settings")
|
||||
(("( +)@given" all spaces)
|
||||
(string-append spaces "@settings(deadline=None)\n" all))))))
|
||||
'())
|
||||
(add-after 'unpack 'remove-test-hypothesis-deadlines
|
||||
(lambda _
|
||||
(substitute* "tests/test_make.py"
|
||||
(("assume, given") "assume, given, settings")
|
||||
(("( +)@given" all spaces)
|
||||
(string-append spaces "@settings(deadline=None)\n" all)))))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
|
|
|
@ -268,29 +268,33 @@ system, and the core design of Django is reused in Grantlee.")
|
|||
;; We can't use a mirror:// scheme because these URLs are not exact copies:
|
||||
;; the layout differs between them.
|
||||
(list (string-append "https://download.qt.io/official_releases/qt/"
|
||||
(version-major+minor version) "/" version
|
||||
"/submodules/" component "-everywhere-opensource-src-"
|
||||
version ".tar.xz")
|
||||
(string-append "https://download.qt.io/official_releases/qt/"
|
||||
(version-major+minor version) "/" version
|
||||
"/submodules/" component "-everywhere-src-"
|
||||
version ".tar.xz")
|
||||
(string-append "https://download.qt.io/archive/qt/"
|
||||
(version-major+minor version) "/" version
|
||||
"/submodules/" component "-everywhere-src-"
|
||||
"/submodules/" component "-everywhere-opensource-src-"
|
||||
version ".tar.xz")
|
||||
(let ((directory (string-append "qt5" (string-drop component 2))))
|
||||
(string-append "http://sources.buildroot.net/" directory "/"
|
||||
component "-everywhere-src-" version ".tar.xz"))
|
||||
component "-everywhere-opensource-src-" version ".tar.xz"))
|
||||
(string-append "https://distfiles.macports.org/qt5/"
|
||||
component "-everywhere-src-" version ".tar.xz")))
|
||||
component "-everywhere-opensource-src-" version ".tar.xz")))
|
||||
|
||||
(define-public qtbase-5
|
||||
(package
|
||||
(name "qtbase")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1y70libf2x52lpbqvhz10lpk7nyl1ajjwzjxly9pjdpfj4jsv7wh"))
|
||||
"1p2fa94m1y8qzhdfi2d7dck93qh1lgsinibwl1wy92bwmacwfhhc"))
|
||||
;; Use TZDIR to avoid depending on package "tzdata".
|
||||
(patches (search-patches "qtbase-use-TZDIR.patch"
|
||||
"qtbase-moc-ignore-gcc-macro.patch"
|
||||
|
@ -344,8 +348,7 @@ system, and the core design of Django is reused in Grantlee.")
|
|||
("nss" ,nss)
|
||||
("openssl" ,openssl)
|
||||
("pcre2" ,pcre2)
|
||||
;; TODO: Switch to 'postgres' in the next rebuild cycle.
|
||||
("postgresql" ,postgresql-13)
|
||||
("postgresql" ,postgresql)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
("sqlite" ,sqlite)
|
||||
("unixodbc" ,unixodbc)
|
||||
|
@ -850,13 +853,13 @@ came with the @{qtgraphicaleffects} Qt 5 package.")
|
|||
(package
|
||||
(inherit qtbase-5)
|
||||
(name "qtsvg")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0pjqrdmd1991x9h4rl8sf81pkd89hfd5h1a2gp3fjw96pk0w5hwb"))))
|
||||
"0cdhmhxngv4y7kl5vbcii4l4anbz0hj7dvhlddy1agyl19j9xky4"))))
|
||||
(propagated-inputs `())
|
||||
(native-inputs (list perl))
|
||||
(inputs
|
||||
|
@ -901,8 +904,7 @@ HostLibraries=lib
|
|||
[EffectiveSourcePaths]
|
||||
HostPrefix=~a
|
||||
HostData=lib/qt5
|
||||
" out out qtbase)))
|
||||
#t)))
|
||||
" out out qtbase))))))
|
||||
(replace 'configure
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; Valid QT_BUILD_PARTS variables are:
|
||||
|
@ -911,8 +913,7 @@ HostData=lib/qt5
|
|||
(add-before 'check 'set-display
|
||||
(lambda _
|
||||
;; make Qt render "offscreen", required for tests
|
||||
(setenv "QT_QPA_PLATFORM" "offscreen")
|
||||
#t)))))
|
||||
(setenv "QT_QPA_PLATFORM" "offscreen"))))))
|
||||
(synopsis "Qt module for displaying SVGs")
|
||||
(description "The QtSvg module provides classes for displaying the
|
||||
contents of SVG files.")))
|
||||
|
@ -951,28 +952,17 @@ HostData=lib/qt5
|
|||
(define-public qtimageformats
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtimageformats")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1msk8a0z8rr16hkp2fnv668vf6wayiydqgc2mcklaa04rv3qb0mz"))
|
||||
"1xjb2z2h1ajw7z9cwq8djpdvjwalpnmirwcwrlbjqv5r4ghmi82a"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
(delete-file-recursively "src/3rdparty")
|
||||
#t))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'unpack 'fix-build
|
||||
(lambda _
|
||||
(substitute* "src/plugins/imageformats/jp2/qjp2handler.cpp"
|
||||
(("^#include <jasper/jasper.h>")
|
||||
"#include <jasper/jasper.h>\n#include <QtCore/qmath.h>"))
|
||||
#t))))))
|
||||
(delete-file-recursively "src/3rdparty")))))
|
||||
(native-inputs `())
|
||||
(inputs
|
||||
(list jasper
|
||||
|
@ -989,13 +979,13 @@ support for MNG, TGA, TIFF and WBMP image formats.")))
|
|||
(define-public qtx11extras
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtx11extras")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0gkfzj195v9flwljnqpdz3a532618yn4h2577nlsai56x4p7053h"))))
|
||||
"0wxsrnnkkn68myy211rfz98brs7j3qmx3hmy097vh5avgsmw11bn"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
@ -1009,23 +999,24 @@ from within Qt 5.")))
|
|||
(define-public qtxmlpatterns
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtxmlpatterns")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ypj5jpa31rlx8yfw3y9jia212lfnxvnqkvygs6ihjf3lxi23skn"))))
|
||||
"065vj1gk5i4cg0f9spksyb9ps4px0vssx262y77aakvw408vfmq5"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:tests? _ #f) #f) ; TODO: Enable the tests
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'unpack 'disable-network-tests
|
||||
(lambda _ (substitute* "tests/auto/auto.pro"
|
||||
(("qxmlquery") "# qxmlquery")
|
||||
(("xmlpatterns ") "# xmlpatterns"))
|
||||
#t))))))
|
||||
(("xmlpatterns ") "# xmlpatterns"))))
|
||||
(add-after 'unpack 'skip-qquickxmllistmodel-test
|
||||
(lambda _ (substitute* "tests/auto/auto.pro"
|
||||
((".*qquickxmllistmodel.*") ""))))))))
|
||||
(native-inputs (list perl qtdeclarative-5))
|
||||
(inputs (list qtbase-5))
|
||||
(synopsis "Qt XML patterns module")
|
||||
|
@ -1036,13 +1027,13 @@ xmlpatternsvalidator.")))
|
|||
(define-public qtdeclarative-5
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtdeclarative")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0lancdn7y0lrlmyn5cbdm0izd5yprvd5n77nhkb7a3wl2sbx0066"))))
|
||||
"0ji5131g7h2mrgxw1wxc5mcvmsn3fbw64j28gzpa25gv3vcnkhaw"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:tests? _ #f) #f) ;TODO: Enable the tests
|
||||
|
@ -1055,8 +1046,17 @@ xmlpatternsvalidator.")))
|
|||
;; is provided by qtdeclarative-5.
|
||||
(substitute*
|
||||
"lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake"
|
||||
(("\\$\\{_qt5Core_install_prefix\\}") out)))
|
||||
#t))))))
|
||||
(("\\$\\{_qt5Core_install_prefix\\}") out)))))
|
||||
;; TODO: Add phase unconditionally.
|
||||
,@(if (target-riscv64?)
|
||||
'((add-after 'unpack 'fix-linking-riscv64
|
||||
(lambda _
|
||||
(substitute* "src/qml/qml.pro"
|
||||
(("DEFINES \\+= QT_NO_FOREACH")
|
||||
(string-append
|
||||
"isEqual(QT_ARCH, \"riscv64\"): QMAKE_LIBS += -latomic\n\n"
|
||||
"DEFINES += QT_NO_FOREACH"))))))
|
||||
'())))))
|
||||
(native-inputs
|
||||
(list perl
|
||||
pkg-config
|
||||
|
@ -1204,13 +1204,13 @@ integrate QML code with JavaScript and C++.")
|
|||
(define-public qtconnectivity
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtconnectivity")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"185zci61ip1wpjrygcw2m6v55lvninc0b8y2p3jh6qgpf5w35003"))))
|
||||
"0b2dnxw1rjbp1srhgns148cwl99f50mx29588dal3avv0f73s597"))))
|
||||
(native-inputs
|
||||
(list perl pkg-config qtdeclarative-5))
|
||||
(inputs
|
||||
|
@ -1222,13 +1222,13 @@ with Bluetooth and NFC.")))
|
|||
(define-public qtwebsockets-5
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtwebsockets")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0gr399fn5n8j3m9d3vv01vcbr1cb7pw043j04cnnxzrlvn2jvd50"))))
|
||||
"0f120rfqnmlffjhrm5jbpipk1qsbzp1a2v3q8gz94hz6n9dqpav6"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
@ -1284,13 +1284,13 @@ consume data received from the server, or both.")
|
|||
(define-public qtsensors
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtsensors")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0fa81r7bn1mf9ynwsx524a55dx1q0jb4vda6j48ssb4lx7wi201z"))))
|
||||
"0zlhm4js02niibb23rw87wf4ik0gy4ai08fwprnwy7zf4rm1ss3d"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:parallel-tests? _ #f) #f) ; can lead to race condition
|
||||
|
@ -1299,9 +1299,8 @@ consume data received from the server, or both.")
|
|||
(add-after 'unpack 'fix-tests
|
||||
(lambda _
|
||||
(substitute* "tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp"
|
||||
(("2000") "5000") ;lengthen test timeout
|
||||
(("QTest::newRow(\"twist\") << \"twist\"") "")) ;failing test
|
||||
#t))))))
|
||||
(("2000") "5000") ;lengthen test timeout
|
||||
(("QTest::newRow(\"twist\") << \"twist\"") "")))))))) ;failing test
|
||||
(native-inputs
|
||||
(list perl qtdeclarative-5))
|
||||
(inputs (list qtbase-5))
|
||||
|
@ -1314,13 +1313,13 @@ recognition API for devices.")))
|
|||
(package
|
||||
(inherit qtsvg-5)
|
||||
(name "qtmultimedia")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1xbd6kc7i0iablqdkvfrajpi32cbq7j6ajbfyyyalcai1s0mhdqc"))
|
||||
"0q76iy1frcgm85mid17lh4p6gnn04n19n6zklgpv4w3md1ng97xw"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -1328,8 +1327,7 @@ recognition API for devices.")))
|
|||
"examples/multimedia/spectrum/3rdparty")
|
||||
;; We also prevent the spectrum example from being built.
|
||||
(substitute* "examples/multimedia/multimedia.pro"
|
||||
(("spectrum") "#"))
|
||||
#t))))
|
||||
(("spectrum") "#"))))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:phases phases)
|
||||
|
@ -1453,14 +1451,14 @@ set of plugins for interacting with pulseaudio and GStreamer.")
|
|||
(define-public qtwayland-5
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtwayland")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(patches (search-patches "qtwayland-gcc-11.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ddfx4nak16xx0zh1kl836zxvpbixmmjyplsmfmg65pqkwi34dqr"))))
|
||||
"0yy8qf9kn15iqsxi2r7jbcsc0vsdyfz7bbxmfn4i9qmz1yvg0jgr"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:phases phases)
|
||||
|
@ -1474,13 +1472,11 @@ set of plugins for interacting with pulseaudio and GStreamer.")
|
|||
"m_waitingFrameCallbacks\\.empty\\(\\)\\);"))
|
||||
"")
|
||||
(("QTRY_COMPARE\\(bufferSpy\\.count\\(\\), 1\\);")
|
||||
""))
|
||||
#t))
|
||||
""))))
|
||||
(add-before 'check 'set-test-environment
|
||||
(lambda _
|
||||
;; Do not fail just because /etc/machine-id is missing.
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0")
|
||||
#t))))))
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0")))))))
|
||||
(native-inputs
|
||||
(list glib perl pkg-config qtdeclarative-5))
|
||||
(inputs
|
||||
|
@ -1553,13 +1549,13 @@ compositor libraries.")
|
|||
(define-public qtserialport
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtserialport")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"17gp5qzg4wdg8qlxk2p3mh8x1vk33rf33wic3fy0cws193bmkiar"))))
|
||||
"0xg2djwhrj5jqamawlp75g70nmwbp2ph2hh1pm45s36jkxm0k7al"))))
|
||||
(native-inputs (list perl))
|
||||
(inputs
|
||||
(list qtbase-5 eudev))
|
||||
|
@ -1574,8 +1570,7 @@ compositor libraries.")
|
|||
;; otherwise the lib will be searched in LD_LIBRARY_PATH which
|
||||
;; typically is not set in guix.
|
||||
(("^\\s*(udevLibrary->setFileNameAndVersion\\(QStringLiteral\\(\")(udev\"\\),\\s*[0-9]+\\);)" _ a b)
|
||||
(string-append a (assoc-ref inputs "eudev") "/lib/lib" b)))
|
||||
#t))))))
|
||||
(string-append a (assoc-ref inputs "eudev") "/lib/lib" b)))))))))
|
||||
(synopsis "Qt Serial Port module")
|
||||
(description "The Qt Serial Port module provides the library for
|
||||
interacting with serial ports from within Qt.")))
|
||||
|
@ -1583,13 +1578,13 @@ interacting with serial ports from within Qt.")))
|
|||
(define-public qtserialbus
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtserialbus")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"125x6756fjpldqy6wbw6cg7ngjh2016aiq92bchh719z1mf7xsxf"))))
|
||||
"180gm1jvqfn0h3251zafdd1wd3af00phwaa5qljsbrj6s6ywj79j"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:phases phases '%standard-phases)
|
||||
|
@ -1601,8 +1596,7 @@ interacting with serial ports from within Qt.")))
|
|||
"/lib/libsocketcan.so")))
|
||||
(substitute* "src/plugins/canbus/socketcan/libsocketcan.cpp"
|
||||
(("QStringLiteral\\(\"socketcan\"\\)")
|
||||
(format #f "QStringLiteral(~s)" libcansocket.so)))
|
||||
#t)))))))
|
||||
(format #f "QStringLiteral(~s)" libcansocket.so))))))))))
|
||||
(inputs
|
||||
(list libsocketcan qtbase-5 qtserialport))
|
||||
(synopsis "Qt Serial Bus module")
|
||||
|
@ -1613,13 +1607,13 @@ and others.")))
|
|||
(define-public qtwebchannel-5
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtwebchannel")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1h9y634phvvk557mhmf9z4lmxr41rl8x9mqy2lzp31mk8ffffzqj"))))
|
||||
"1w8mcpdqlphgg3a6yfq18liwlj2nkwrafv0n80h242x5l2mk3ljf"))))
|
||||
(native-inputs
|
||||
(list perl qtdeclarative-5 qtwebsockets-5))
|
||||
(inputs (list qtbase-5))
|
||||
|
@ -1669,21 +1663,20 @@ application).")
|
|||
(define-public qtwebglplugin
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtwebglplugin")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0ihlnhv8ldkqz82v3j7j22lrhk17b6ghra8sx85y2agd2ysq5rw1"))))
|
||||
"1m0p4ssykw07lbip2qyv6w34f8ng13bxb63j0w446f5w0492nn9f"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'unpack 'disable-network-tests
|
||||
(lambda _ (substitute* "tests/plugins/platforms/platforms.pro"
|
||||
(("webgl") "# webgl"))
|
||||
#t))))))
|
||||
(("webgl") "# webgl"))))))))
|
||||
(native-inputs '())
|
||||
(inputs
|
||||
(list mesa qtbase-5 qtdeclarative-5 qtwebsockets-5 zlib))
|
||||
|
@ -1698,13 +1691,13 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements")))
|
|||
(define-public qtwebview
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtwebview")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1rw1wibmbxlj6xc86qs3y8h42al1vczqiksyxzaylxs9gqb4d7xy"))))
|
||||
"0arwaky3jy5ql3z4d8f7k7diidzb1kncdans7pn50hsa1bzacfal"))))
|
||||
(native-inputs
|
||||
(list perl))
|
||||
(inputs
|
||||
|
@ -1717,19 +1710,21 @@ native APIs where it makes sense.")))
|
|||
(define-public qtlocation
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtlocation")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
(version-major+minor version) "/" version
|
||||
"/submodules/" name "-everywhere-src-"
|
||||
version ".tar.xz"))
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"184jychnlfhplpwc5cdcsapwljgwvzk5qpf3val4kpq8w44wnkwq"))))
|
||||
"0mlhhhcxx3gpr9kh04c6fljxcj50c2j21r0wb9f7d7nk4flip7b2"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
((#:tests? _ #f) #f) ; TODO: Enable the tests
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
(setenv "HOME" "/tmp")))))))
|
||||
(native-inputs
|
||||
(list perl qtdeclarative-5 qtquickcontrols-5 qtserialport))
|
||||
(inputs
|
||||
|
@ -1773,13 +1768,13 @@ plugin for Adobe After Effects.")
|
|||
(define-public qttools-5
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qttools")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1k618f7v6jaj0ygy8d7jvgb8zjr47sn55kiskbdkkizp3z7d12f1"))))
|
||||
"0v7wkzq9i8w3qrw0z8al7lb6clr57lfisyb1fm9cnhi73fvph1vd"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
@ -1822,13 +1817,13 @@ that helps in Qt development.")
|
|||
(define-public qtscript
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtscript")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0gk74hk488k9ldacxbxcranr3arf8ifqg8kz9nm1rgdgd59p36d2"))
|
||||
"17yk0p8ci47xlfpllc17arlycng47wrnnskimskzz85bspabc8pm"))
|
||||
(patches (search-patches "qtscript-disable-tests.patch"))))
|
||||
(native-inputs
|
||||
(list perl qttools-5))
|
||||
|
@ -1842,13 +1837,13 @@ ECMAScript and Qt.")))
|
|||
(define-public qtquickcontrols-5
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtquickcontrols")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1dczakl868mg0lnwpf082jjc5976ycn879li1vqlgw5ihirzp4y3"))))
|
||||
"0mjw25wcgd2bvjz9rr4qjydb423c63615rcx1vws4jmydqdihssr"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
@ -1862,13 +1857,13 @@ can be used to build complete interfaces in Qt Quick.")))
|
|||
(define-public qtquickcontrols2-5
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtquickcontrols2")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"06c9vrwvbjmzapmfa25y34lgjkzg57xxbm92nr6wkv5qykjnq6v7"))))
|
||||
"1cxg4ml07k1zcyi5m4lx06sz8f5l67isb5vhk7nakxm0wnn7p8y4"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
@ -1889,13 +1884,13 @@ not available.")))
|
|||
(define-public qtgraphicaleffects
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtgraphicaleffects")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1r6zfc0qga2ax155js7c8y5rx6vgayf582s921j09mb797v6g3gc"))))
|
||||
"0xznn5zqp6xrqfgl54l8cig9asqf9m2hz0p3ga514rh8spmdazr3"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
@ -1912,13 +1907,13 @@ coloring, and many more.")))
|
|||
(define-public qtgamepad
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtgamepad")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0p07bg93fdfn4gr2kv38qgnws5znhswajrxdfs8xc9l3i7vi2xn7"))))
|
||||
"0wa4d8f025hlp4bmdzdy5wcahm9wjg6bkwig8dpw9nrsj3idz5b0"))))
|
||||
(native-inputs
|
||||
(list perl pkg-config))
|
||||
(inputs
|
||||
|
@ -1938,21 +1933,23 @@ and mobile applications targeting TV-like form factors.")))
|
|||
(define-public qtscxml
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtscxml")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1p5771b9hnpchfcdgy0zkhwg09a6xq88934aggp0rij1k85mkfb0"))
|
||||
"0xf5mqsrw16h8xjglymgfc8qg2qa5bi4fgdl4j3dkhvvpr7vrphp"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
(delete-file-recursively "tests/3rdparty")
|
||||
;; the scion test refers to the bundled 3rd party test code.
|
||||
(substitute* "tests/auto/auto.pro"
|
||||
(("scion") "#"))
|
||||
#t))))
|
||||
(("scion") "#"))))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
(inputs
|
||||
(list qtbase-5 qtdeclarative-5))
|
||||
(synopsis "Qt SCXML module")
|
||||
|
@ -1995,13 +1992,13 @@ information and perform area based monitoring.")
|
|||
(define-public qtpurchasing
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtpurchasing")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"09rjx53519dfk4qj2gbn3vlxyriasyb747wpg1p11y7jkwqhs4l7"))))
|
||||
"04z6mwzn73gg56hgs7gividinfgndx4kmcnp7w6h3wamrdlkfdx7"))))
|
||||
(inputs
|
||||
(list qtbase-5 qtdeclarative-5))
|
||||
(synopsis "Qt Purchasing module")
|
||||
|
@ -2011,16 +2008,22 @@ purchasing goods and services.")))
|
|||
(define-public qtcharts
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtcharts")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"049x7z8zcp9jixmdv2fjscy2ggpd6za9hkdbb2bqp2mxjm0hwxg0"))))
|
||||
"0y051i1837bfybkf8cm7cx8k5wjmbi47pxawaaz6wm0hd2z5b4qi"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'unpack 'remove-failing-test
|
||||
(lambda _
|
||||
(substitute* "tests/auto/auto.pro"
|
||||
(("qml") "# qml")
|
||||
(("qml-qtquicktest") "# qml-qtquicktest"))))))))
|
||||
(inputs
|
||||
(list qtbase-5 qtdeclarative-5))
|
||||
(synopsis "Qt Charts module")
|
||||
|
@ -2034,13 +2037,13 @@ selecting one of the charts themes.")
|
|||
(define-public qtdatavis3d
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtdatavis3d")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1zdn3vm0nfy9ny7c783aabp3mhlnqhi9fw2rljn7ibbksmsnasi2"))))
|
||||
"0sczwqlc36jdywf7bqxz0hm6mr7fn8p1fsnc33jliiqzn9yrg77x"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
@ -2057,23 +2060,13 @@ customized by using themes or by adding custom items and labels to them.")
|
|||
(define-public qtnetworkauth-5
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtnetworkauth")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"11fdgacv4syr8bff2vdw7rb0dg1gcqpdf37hm3pn31d6z91frhpw"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'unpack 'remove-failing-test
|
||||
(lambda _
|
||||
;; These tests can't find their test data.
|
||||
(substitute* "tests/auto/auto.pro"
|
||||
(("oauth1 ") "# oauth1 "))
|
||||
#t))))))
|
||||
"0c7mz715rlpg0cqgs6s0aszmslyamkhnpamc1iij6i571sj5j2f1"))))
|
||||
(inputs
|
||||
(list qtbase-5))
|
||||
(synopsis "Qt Network Authorization module")
|
||||
|
@ -2103,13 +2096,13 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.")
|
|||
(define-public qtremoteobjects
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtremoteobjects")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1hngbp0vkr35rpsrac7b9vx6f360v8v2g0fffzm590l8j2ybd0b7"))))
|
||||
"1m0xcqlbxsfn0cd4ajin1h3i4l51dajmkw91v0r4a61xi14i0kks"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:phases phases)
|
||||
|
@ -2123,8 +2116,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.")
|
|||
;; disable failing tests: they need network
|
||||
(substitute* "tests/auto/auto.pro"
|
||||
(("integration_multiprocess proxy_multiprocess integration_external restart")
|
||||
"integration_multiprocess"))
|
||||
#t))))))
|
||||
"integration_multiprocess"))))))))
|
||||
(inputs
|
||||
(list qtbase-5 qtdeclarative-5))
|
||||
(synopsis "Qt Remote Objects module")
|
||||
|
@ -2136,14 +2128,13 @@ processes or computers.")))
|
|||
(define-public qtspeech
|
||||
(package (inherit qtsvg-5)
|
||||
(name "qtspeech")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1xc3x3ghnhgchsg1kgj156yg69wn4rwjx8r28i1jd05hxjggn468"))))
|
||||
|
||||
"0xskp9dzjy5nqszygk8gwvjyiylgynx5sq3nk2vi3zwgfdh5jpm4"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
@ -2192,14 +2183,14 @@ using the Enchant spell-checking library.")
|
|||
(package
|
||||
(inherit qtsvg-5)
|
||||
(name "qtwebengine")
|
||||
(version (package-version qtbase-5))
|
||||
(version "5.15.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (qt-urls name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1q4idxdm81sx102xc12ixj0xpfx52d6vwvs3jpapnkyq8c7cmby8"))
|
||||
"0zahr9w6rqdxwh2whsgk3fhcszs7wa9j95lq4sqi8xzin2wcgl17"))
|
||||
(modules '((ice-9 ftw)
|
||||
(ice-9 match)
|
||||
(srfi srfi-1)
|
||||
|
@ -2235,6 +2226,13 @@ using the Enchant spell-checking library.")
|
|||
"third_party/boringssl/src/third_party/fiat"
|
||||
"third_party/breakpad"
|
||||
"third_party/brotli"
|
||||
"third_party/catapult/common/py_vulcanize/py_vulcanize"
|
||||
"third_party/catapult/common/py_vulcanize/third_party"
|
||||
"third_party/catapult/third_party/beautifulsoup4"
|
||||
"third_party/catapult/third_party/html5lib-python"
|
||||
"third_party/catapult/third_party/polymer/components"
|
||||
"third_party/catapult/tracing"
|
||||
"third_party/catapult/tracing/third_party"
|
||||
"third_party/ced"
|
||||
"third_party/cld_3"
|
||||
"third_party/closure_compiler"
|
||||
|
@ -2245,10 +2243,8 @@ using the Enchant spell-checking library.")
|
|||
"third_party/dav1d"
|
||||
"third_party/dawn"
|
||||
"third_party/devtools-frontend"
|
||||
"third_party/devtools-frontend/src/front_end/third_party/fabricjs"
|
||||
"third_party/devtools-frontend/src/front_end/third_party/lighthouse"
|
||||
"third_party/devtools-frontend/src/front_end/third_party/wasmparser"
|
||||
"third_party/devtools-frontend/src/third_party/axe-core"
|
||||
"third_party/devtools-frontend/src/front_end/third_party"
|
||||
"third_party/devtools-frontend/src/third_party/typescript"
|
||||
"third_party/emoji-segmenter"
|
||||
"third_party/ffmpeg"
|
||||
"third_party/googletest"
|
||||
|
@ -2263,6 +2259,7 @@ using the Enchant spell-checking library.")
|
|||
"third_party/khronos"
|
||||
"third_party/leveldatabase"
|
||||
"third_party/libaddressinput"
|
||||
"third_party/libavif"
|
||||
"third_party/libgifcodec"
|
||||
"third_party/libjingle_xmpp"
|
||||
"third_party/libjpeg_turbo"
|
||||
|
@ -2276,6 +2273,7 @@ using the Enchant spell-checking library.")
|
|||
"third_party/libxml"
|
||||
"third_party/libxslt"
|
||||
"third_party/libyuv"
|
||||
"third_party/lottie"
|
||||
"third_party/lss"
|
||||
"third_party/mako"
|
||||
"third_party/markupsafe"
|
||||
|
@ -2283,6 +2281,7 @@ using the Enchant spell-checking library.")
|
|||
"third_party/metrics_proto"
|
||||
"third_party/modp_b64"
|
||||
"third_party/nasm"
|
||||
"third_party/node"
|
||||
"third_party/one_euro_filter"
|
||||
"third_party/openh264/src/codec/api/svc"
|
||||
"third_party/opus"
|
||||
|
@ -2307,15 +2306,16 @@ using the Enchant spell-checking library.")
|
|||
"third_party/skia/include/third_party/skcms/skcms.h"
|
||||
"third_party/skia/include/third_party/vulkan"
|
||||
"third_party/skia/third_party/skcms"
|
||||
"third_party/skia/third_party/vulkanmemoryallocator"
|
||||
"third_party/smhasher"
|
||||
"third_party/snappy"
|
||||
"third_party/sqlite"
|
||||
"third_party/usb_ids"
|
||||
"third_party/usrsctp"
|
||||
"third_party/vulkan_memory_allocator"
|
||||
"third_party/web-animations-js"
|
||||
"third_party/webrtc"
|
||||
"third_party/webrtc/common_audio/third_party/fft4g"
|
||||
"third_party/webrtc/common_audio/third_party/ooura/fft_size_128"
|
||||
"third_party/webrtc/common_audio/third_party/ooura/fft_size_256"
|
||||
"third_party/webrtc/common_audio/third_party/spl_sqrt_floor"
|
||||
"third_party/webrtc/modules/third_party/fft"
|
||||
"third_party/webrtc/modules/third_party/g711"
|
||||
|
@ -2326,7 +2326,7 @@ using the Enchant spell-checking library.")
|
|||
"third_party/widevine/cdm/widevine_cdm_common.h"
|
||||
"third_party/widevine/cdm/widevine_cdm_version.h"
|
||||
"third_party/woff2"
|
||||
"third_party/yasm"
|
||||
"third_party/xcbproto"
|
||||
"third_party/zlib"
|
||||
"url/third_party/mozilla"
|
||||
"v8/src/third_party/utf8-decoder"
|
||||
|
@ -2399,16 +2399,19 @@ using the Enchant spell-checking library.")
|
|||
|
||||
;; Use relative header locations instead of hard coded ones.
|
||||
(substitute*
|
||||
"base/third_party/dynamic_annotations/dynamic_annotations.c"
|
||||
"base/third_party/dynamic_annotations/dynamic_annotations.c"
|
||||
(("base/third_party/valgrind") "valgrind"))
|
||||
(substitute*
|
||||
"third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h"
|
||||
'("third_party/breakpad/breakpad/src/common/linux/http_upload.cc"
|
||||
"third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h")
|
||||
(("third_party/curl") "curl"))
|
||||
(substitute*
|
||||
'("components/viz/common/gpu/vulkan_context_provider.h"
|
||||
"components/viz/common/resources/resource_format_utils_vulkan.h"
|
||||
"gpu/config/gpu_util.cc")
|
||||
(("third_party/vulkan/include/")
|
||||
'("components/viz/common/gpu/vulkan_context_provider.h"
|
||||
"components/viz/common/resources/resource_format_utils.h"
|
||||
"gpu/config/gpu_info_collector_win.cc"
|
||||
"gpu/config/gpu_util.cc"
|
||||
"gpu/config/vulkan_info.h")
|
||||
(("third_party/vulkan_headers/include/")
|
||||
""))
|
||||
|
||||
;; Replace Google Analytics bundle with an empty file and hope
|
||||
|
@ -2428,6 +2431,7 @@ using the Enchant spell-checking library.")
|
|||
flex
|
||||
gperf
|
||||
ninja
|
||||
node
|
||||
perl
|
||||
pkg-config
|
||||
python2-six
|
||||
|
@ -2455,6 +2459,7 @@ using the Enchant spell-checking library.")
|
|||
libxcb
|
||||
libxcomposite
|
||||
libxcursor
|
||||
libxkbfile
|
||||
libxi
|
||||
libxkbcommon
|
||||
;; FIXME: libxml2 needs to built with icu support though it links to
|
||||
|
@ -3031,7 +3036,7 @@ module provides support functions to the automatically generated code.")
|
|||
(define-public python-pyqt
|
||||
(package
|
||||
(name "python-pyqt")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -3044,7 +3049,7 @@ module provides support functions to the automatically generated code.")
|
|||
(file-name (string-append "PyQt5-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1z74295i69cha52llsqffzhb5zz7qnbjc64h8qg21l91jgf0harp"))
|
||||
"0aya963kkmbwfwmpd0p6k85y4g7wl5zarjqxxfgir403zalbf4dl"))
|
||||
(patches (search-patches "pyqt-configure.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
|
@ -3122,14 +3127,14 @@ contain over 620 classes.")
|
|||
(define-public python-pyqt5-sip
|
||||
(package
|
||||
(name "python-pyqt5-sip")
|
||||
(version "12.8.1")
|
||||
(version "12.10.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "PyQt5_sip" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1gg032ys4pccwkdzmdryadc9a4lq85nr05pag9swrsdykbdl9s9h"))))
|
||||
"09771b6fdn0rx34l5a0wzcd899yd57zxp5sw3bsqhd25biwhiq4p"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ;; No test code.
|
||||
|
@ -3141,7 +3146,7 @@ contain over 620 classes.")
|
|||
(define-public python-pyqtwebengine
|
||||
(package
|
||||
(name "python-pyqtwebengine")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -3153,7 +3158,7 @@ contain over 620 classes.")
|
|||
"/PyQtWebEngine-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0d56ak71r14w4f9r96vaj34qcn2rbln3s6ildvvyc707fjkzwwjd"))))
|
||||
"0hdr0g0rzlhsnylhfk826pq1lw8p9dqcr8yma2wy9dgjrj6n0ixb"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list python python-sip
|
||||
|
@ -3822,7 +3827,7 @@ color-related widgets.")
|
|||
(define-public python-shiboken-2
|
||||
(package
|
||||
(name "python-shiboken-2")
|
||||
(version "5.15.2")
|
||||
(version "5.15.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases"
|
||||
|
@ -3831,7 +3836,7 @@ color-related widgets.")
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"060ljj1nzyp4zfz2vasbv2i7gs5rfkkjwxxbisd0fdw01d5m01mk"))))
|
||||
"0cwvw6695215498rsbm2xzkwaxdr3w7zfvy4kc62c01k6pxs881r"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
(list clang-toolchain
|
||||
|
|
|
@ -3113,24 +3113,40 @@ two hashes.")
|
|||
(home-page "https://github.com/liufengyun/hashdiff")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public ruby-hydra
|
||||
(define-public ruby-hydra-minimal
|
||||
;; No releases yet.
|
||||
(let ((commit "5abfa378743756ae4d9306cc134bcc482f5c9525")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "ruby-hydra")
|
||||
(name "ruby-hydra-minimal")
|
||||
(version (git-version "0.0" revision commit))
|
||||
(home-page "https://github.com/hyphenation/hydra")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference (url home-page) (commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
;; byebug is a non-essential debugging utility that brings in
|
||||
;; many dependencies.
|
||||
(patches (search-patches "ruby-hydra-minimal-no-byebug.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1cik398l2765y3d9sdhjzki3303hkry58ac6jlkiy7iy62nm529f"))))
|
||||
(build-system ruby-build-system)
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
;; Avoid rspec dependency.
|
||||
'(#:tests? #f))
|
||||
(synopsis "Ruby hyphenation patterns")
|
||||
(description
|
||||
"ruby-hydra-minimal is a Ruby library for working with hyphenation patterns.
|
||||
It is a low-dependency variant of ruby-hydra.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public ruby-hydra
|
||||
(package
|
||||
(inherit ruby-hydra-minimal)
|
||||
(name "ruby-hydra")
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'make-files-writable
|
||||
(lambda _
|
||||
(for-each make-file-writable (find-files "."))
|
||||
|
@ -3138,14 +3154,12 @@ two hashes.")
|
|||
(replace 'check
|
||||
(lambda _
|
||||
(invoke "rspec"))))))
|
||||
(native-inputs
|
||||
(list ruby-rspec))
|
||||
(propagated-inputs
|
||||
(list ruby-byebug))
|
||||
(synopsis "Ruby hyphenation patterns")
|
||||
(description
|
||||
"ruby-hydra is a Ruby library for working with hyphenation patterns.")
|
||||
(license license:expat))))
|
||||
(native-inputs
|
||||
(list ruby-rspec))
|
||||
(propagated-inputs
|
||||
(list ruby-byebug))
|
||||
(description
|
||||
"ruby-hydra is a Ruby library for working with hyphenation patterns.")))
|
||||
|
||||
(define-public ruby-shindo
|
||||
(package
|
||||
|
@ -5006,19 +5020,16 @@ to reproduce user environments.")
|
|||
(base32
|
||||
"15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"))))))
|
||||
|
||||
;; TODO: In the next rebuild cycle, provide texlive a version of ruby-hydra
|
||||
;; that does not depend on byebug and rspec, so that their dependencies can
|
||||
;; be updated more freely. For now pin this version to avoid rebuilds.
|
||||
(define-public ruby-nokogiri-1.10
|
||||
(define-public ruby-nokogiri
|
||||
(package
|
||||
(name "ruby-nokogiri")
|
||||
(version "1.10.9")
|
||||
(version "1.12.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (rubygems-uri "nokogiri" version))
|
||||
(sha256
|
||||
(base32
|
||||
"12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"))))
|
||||
"1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"))))
|
||||
(build-system ruby-build-system)
|
||||
(arguments
|
||||
;; Tests fail because Nokogiri can only test with an installed extension,
|
||||
|
@ -5027,28 +5038,13 @@ to reproduce user environments.")
|
|||
#:gem-flags (list "--" "--use-system-libraries"
|
||||
(string-append "--with-xml2-include="
|
||||
(assoc-ref %build-inputs "libxml2")
|
||||
"/include/libxml2" ))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'patch-extconf
|
||||
;; 'pkg-config' is not included in the GEM_PATH during
|
||||
;; installation, so we add it directly to the load path.
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let* ((pkg-config (assoc-ref inputs "ruby-pkg-config")))
|
||||
(substitute* "ext/nokogiri/extconf.rb"
|
||||
(("gem 'pkg-config'.*")
|
||||
(string-append "$:.unshift '"
|
||||
pkg-config "/lib/ruby/vendor_ruby"
|
||||
"/gems/pkg-config-"
|
||||
,(package-version ruby-pkg-config)
|
||||
"/lib'\n"))))
|
||||
#t)))))
|
||||
"/include/libxml2" ))))
|
||||
(native-inputs
|
||||
(list ruby-hoe))
|
||||
(inputs
|
||||
(list zlib libxml2 libxslt))
|
||||
(propagated-inputs
|
||||
(list ruby-mini-portile-2 ruby-pkg-config))
|
||||
(list ruby-mini-portile-2.6.1 ruby-pkg-config))
|
||||
(synopsis "HTML, XML, SAX, and Reader parser for Ruby")
|
||||
(description "Nokogiri (鋸) parses and searches XML/HTML, and features
|
||||
both CSS3 selector and XPath 1.0 support.")
|
||||
|
@ -5067,26 +5063,6 @@ both CSS3 selector and XPath 1.0 support.")
|
|||
(base32
|
||||
"1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"))))))
|
||||
|
||||
(define-public ruby-nokogiri
|
||||
(package
|
||||
(inherit ruby-nokogiri-1.10)
|
||||
(version "1.12.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (rubygems-uri "nokogiri" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"))))
|
||||
(arguments
|
||||
'(#:tests? #f ;XXX: no tests in rubygem
|
||||
#:gem-flags (list "--" "--use-system-libraries"
|
||||
(string-append "--with-xml2-include="
|
||||
(assoc-ref %build-inputs "libxml2")
|
||||
"/include/libxml2"))))
|
||||
(propagated-inputs
|
||||
(modify-inputs (package-propagated-inputs ruby-nokogiri-1.10)
|
||||
(replace "ruby-mini-portile" ruby-mini-portile-2.6.1)))))
|
||||
|
||||
(define-public ruby-method-source
|
||||
(package
|
||||
(name "ruby-method-source")
|
||||
|
@ -6756,8 +6732,7 @@ tree-like structures. It is similar to Ruby's built-in @code{TSort} module.")
|
|||
(build-system ruby-build-system)
|
||||
(propagated-inputs
|
||||
(list ruby-tdiff
|
||||
;; Use a fixed version to prevent rebuilds; see ruby-nokogiri TODO.
|
||||
ruby-nokogiri-1.10))
|
||||
ruby-nokogiri))
|
||||
(native-inputs
|
||||
(list ruby-rspec ruby-yard ruby-rubygems-tasks))
|
||||
(synopsis "Calculate the differences between two XML/HTML documents")
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
;;; Copyright © 2016 Nikita <nikita@n0.is>
|
||||
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
|
||||
;;; Copyright © 2017, 2018 Nikolai Merinov <nikolai.merinov@member.fsf.org>
|
||||
;;; Copyright © 2017, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2019-2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Danny Milosavljevic <dannym+a@scratchpost.org>
|
||||
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
|
||||
|
@ -14,6 +14,7 @@
|
|||
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021 (unmatched parenthesis <paren@disroot.org>
|
||||
;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2022 Jim Newsome <jnewsome@torproject.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -99,6 +100,7 @@
|
|||
("armhf-linux" "armv7-unknown-linux-gnueabihf")
|
||||
("aarch64-linux" "aarch64-unknown-linux-gnu")
|
||||
("mips64el-linux" "mips64el-unknown-linux-gnuabi64")
|
||||
("riscv64-linux" "riscv64gc-unknown-linux-gnu")
|
||||
(_ (nix-system->gnu-triplet system))))
|
||||
|
||||
(define* (rust-uri version #:key (dist "static"))
|
||||
|
@ -136,25 +138,26 @@
|
|||
(file-name (git-file-name name (git-version version revision commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"0f7kh4n2663sn0z3xib8gzw0s97qpvwag40g2vs3bfjlrbpgi9z0")))))
|
||||
"0f7kh4n2663sn0z3xib8gzw0s97qpvwag40g2vs3bfjlrbpgi9z0"))
|
||||
(patches (search-patches "mrustc-riscv64-support.patch")))))
|
||||
|
||||
;;; Rust 1.39 is special in that it is built with mrustc, which shortens the
|
||||
;;; Rust 1.54 is special in that it is built with mrustc, which shortens the
|
||||
;;; bootstrap path.
|
||||
(define rust-1.39
|
||||
(define rust-bootstrap
|
||||
(package
|
||||
(name "rust")
|
||||
(version "1.39.0")
|
||||
(version "1.54.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (rust-uri version))
|
||||
(sha256 (base32 "0mwkc1bnil2cfyf6nglpvbn2y0zfbv44zfhsd5qg4c9rm6vgd8dl"))
|
||||
(sha256 (base32 "0xk9dhfff16caambmwij67zgshd8v9djw6ha0fnnanlv7rii31dc"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet '(for-each delete-file-recursively
|
||||
'("src/llvm-emscripten"
|
||||
"src/llvm-project"
|
||||
"vendor/jemalloc-sys/jemalloc")))
|
||||
(patches (search-patches "rustc-1.39.0-src.patch"))
|
||||
(snippet
|
||||
'(begin
|
||||
(for-each delete-file-recursively
|
||||
'("src/llvm-project"))))
|
||||
(patches (search-patches "rustc-1.54.0-src.patch"))
|
||||
(patch-flags '("-p0")))) ;default is -p1
|
||||
(outputs '("out" "cargo"))
|
||||
(properties '((timeout . 72000) ;20 hours
|
||||
|
@ -162,12 +165,19 @@
|
|||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("libcurl" ,curl)
|
||||
("libssh2" ,libssh2)
|
||||
("llvm" ,llvm-9)
|
||||
("openssl" ,openssl)
|
||||
("llvm" ,llvm)
|
||||
("openssl" ,openssl-1.1)
|
||||
("zlib" ,zlib)))
|
||||
(native-inputs
|
||||
`(("bison" ,bison)
|
||||
;; A compiler bug in gcc 10/11/12/13 prevents us from using gcc-10.4. See:
|
||||
;; https://github.com/thepowersgang/mrustc/issues/266
|
||||
;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105860
|
||||
("gcc" ,gcc-9)
|
||||
;; TODO: STARTFILE_PREFIX_SPEC is fixed on gcc<10 on core-updates.
|
||||
,@(if (target-riscv64?)
|
||||
`(("gcc:lib" ,gcc-9 "lib"))
|
||||
'())
|
||||
("flex" ,flex)
|
||||
("pkg-config" ,pkg-config)
|
||||
;; Required for the libstd sources.
|
||||
|
@ -206,25 +216,24 @@
|
|||
;; to be at this location, and it simplifies things to make it
|
||||
;; so.
|
||||
(symlink (getcwd)
|
||||
(string-append "../mrustc/rustc-" ,version "-src"))))
|
||||
(string-append "../mrustc/rustc-" ,version "-src"))
|
||||
(with-output-to-file "dl-version"
|
||||
(lambda _
|
||||
(format #t "~a~%"
|
||||
,version)))))
|
||||
(add-after 'setup-mrustc-sources 'patch-makefiles
|
||||
;; This disables building the (unbundled) LLVM.
|
||||
(lambda* (#:key inputs parallel-build? #:allow-other-keys)
|
||||
(let ((llvm (assoc-ref inputs "llvm"))
|
||||
(job-spec (format #f "-j~a"
|
||||
(if parallel-build?
|
||||
(number->string (parallel-job-count))
|
||||
"1"))))
|
||||
(let ((llvm (assoc-ref inputs "llvm")))
|
||||
(with-directory-excursion "../mrustc"
|
||||
(substitute* '("minicargo.mk"
|
||||
"run_rustc/Makefile")
|
||||
;; Use the system-provided LLVM.
|
||||
(("LLVM_CONFIG := .*")
|
||||
(string-append "LLVM_CONFIG := " llvm "/bin/llvm-config\n"))
|
||||
(("\\$\\(LLVM_CONFIG\\): .*")
|
||||
"$(LLVM_CONFIG):\n")
|
||||
(("\\$Vcd \\$\\(RUSTCSRC\\)build && \\$\\(MAKE\\).*")
|
||||
"true\n"))
|
||||
(string-append "LLVM_CONFIG := " llvm "/bin/llvm-config\n")))
|
||||
(substitute* "minicargo.mk"
|
||||
;; Do not try to fetch sources from the Internet.
|
||||
(("@curl.*") ""))
|
||||
(substitute* "Makefile"
|
||||
;; Patch date and git obtained version information.
|
||||
((" -D VERSION_GIT_FULLHASH=.*")
|
||||
|
@ -269,9 +278,6 @@
|
|||
(setenv "CXX" "g++")
|
||||
;; The Guix LLVM package installs only shared libraries.
|
||||
(setenv "LLVM_LINK_SHARED" "1")
|
||||
;; This is a workaround for
|
||||
;; https://github.com/thepowersgang/mrustc/issues/138.
|
||||
(setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "yes")
|
||||
;; rustc still insists on having 'cc' on PATH in some places
|
||||
;; (e.g. when building the 'test' library crate).
|
||||
(mkdir-p "/tmp/bin")
|
||||
|
@ -283,22 +289,36 @@
|
|||
(let* ((src-root (getcwd))
|
||||
(job-count (if parallel-build?
|
||||
(parallel-job-count)
|
||||
1))
|
||||
(job-spec (string-append "-j" (number->string job-count))))
|
||||
1)))
|
||||
;; Adapted from:
|
||||
;; https://github.com/dtolnay/bootstrap/blob/master/build.sh.
|
||||
;; https://github.com/dtolnay/bootstrap/blob/master/build-1.54.0.sh.
|
||||
(chdir "../mrustc")
|
||||
(setenv "MINICARGO_FLAGS" job-spec)
|
||||
;; Use PARLEVEL since both minicargo and mrustc use it
|
||||
;; to set the level of parallelism.
|
||||
(setenv "PARLEVEL" (number->string job-count))
|
||||
(setenv "CARGO_BUILD_JOBS" (number->string job-count))
|
||||
(display "Building mrustc...\n")
|
||||
(apply invoke "make" make-flags)
|
||||
|
||||
;; This doesn't seem to build anything, but it
|
||||
;; sets additional minicargo flags.
|
||||
(display "Building RUSTCSRC...\n")
|
||||
(apply invoke "make" "RUSTCSRC" make-flags)
|
||||
|
||||
;; This probably doesn't need to be called explicitly.
|
||||
(display "Building LIBS...\n")
|
||||
(apply invoke "make" "-f" "minicargo.mk" "LIBS" make-flags)
|
||||
|
||||
(display "Building rustc...\n")
|
||||
(apply invoke "make" "-f" "minicargo.mk" "output/rustc"
|
||||
job-spec make-flags)
|
||||
make-flags)
|
||||
|
||||
(display "Building cargo...\n")
|
||||
(apply invoke "make" "-f" "minicargo.mk" "output/cargo"
|
||||
job-spec make-flags)
|
||||
make-flags)
|
||||
|
||||
;; This one isn't listed in the build script.
|
||||
(display "Rebuilding stdlib with rustc...\n")
|
||||
;; Note: invoking make with -j would cause a compiler error
|
||||
;; (unexpected panic).
|
||||
(apply invoke "make" "-C" "run_rustc" make-flags))))
|
||||
(replace 'install
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
|
@ -324,42 +344,38 @@
|
|||
safety and thread safety guarantees.")
|
||||
(home-page "https://github.com/thepowersgang/mrustc")
|
||||
|
||||
;; So far mrustc is (x86_64|aarch64)-only. It may support i686 soon:
|
||||
;; The intermediate generated code is known to be inefficient and
|
||||
;; therefore the build process needs 8GB of RAM while building.
|
||||
;; It may support i686 soon:
|
||||
;; <https://github.com/thepowersgang/mrustc/issues/78>.
|
||||
(supported-systems '("x86_64-linux" "aarch64-linux"))
|
||||
(supported-systems '("x86_64-linux" "aarch64-linux" "riscv64-linux"))
|
||||
|
||||
;; Dual licensed.
|
||||
(license (list license:asl2.0 license:expat))))
|
||||
|
||||
(define rust-1.40
|
||||
(define rust-1.55
|
||||
(package
|
||||
(name "rust")
|
||||
(version "1.40.0")
|
||||
(version "1.55.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (rust-uri version))
|
||||
(sha256 (base32 "1ba9llwhqm49w7sz3z0gqscj039m53ky9wxzhaj11z6yg1ah15yx"))
|
||||
(sha256 (base32 "07l28f7grdmi65naq71pbmvdd61hwcpi40ry7kp7dy7m233rldxj"))
|
||||
(modules '((guix build utils)))
|
||||
;; llvm-emscripten is no longer bundled, as that codegen backend got
|
||||
;; removed.
|
||||
(snippet '(for-each delete-file-recursively
|
||||
'("src/llvm-project"
|
||||
"vendor/jemalloc-sys/jemalloc")))))
|
||||
(snippet
|
||||
'(begin
|
||||
(for-each delete-file-recursively
|
||||
'("src/llvm-project"
|
||||
"vendor/tikv-jemalloc-sys/jemalloc"))
|
||||
;; Add support for riscv64-linux.
|
||||
(substitute* "vendor/tikv-jemallocator/src/lib.rs"
|
||||
((" target_arch = \"s390x\"," all)
|
||||
(string-append all "\n target_arch = \"riscv64\",")))))))
|
||||
(outputs '("out" "cargo"))
|
||||
(properties '((timeout . 72000) ;20 hours
|
||||
(max-silent-time . 18000))) ;5 hours (for armel)
|
||||
(build-system gnu-build-system)
|
||||
;; Rust 1.40 does not ship rustc-internal libraries by default (see
|
||||
;; rustc-dev-split). This means that librustc_driver.so is no longer
|
||||
;; available in lib/rustlib/$target/lib, which is the directory
|
||||
;; included in the runpath of librustc_codegen_llvm-llvm.so. This is
|
||||
;; detected by our validate-runpath phase as an error, but it is
|
||||
;; harmless as the codegen backend is loaded by librustc_driver.so
|
||||
;; itself, which must at that point have been already loaded. As such,
|
||||
;; we skip validating the runpath for Rust 1.40. Rust 1.41 stopped
|
||||
;; putting the codegen backend in a separate library, which makes this
|
||||
;; workaround only necessary for this release.
|
||||
(arguments
|
||||
`(#:validate-runpath? #f
|
||||
;; Only the final Rust is tested, not the intermediate bootstrap ones,
|
||||
|
@ -380,24 +396,16 @@ safety and thread safety guarantees.")
|
|||
(setenv "CC" (search-input-file inputs "/bin/gcc"))
|
||||
;; The Guix LLVM package installs only shared libraries.
|
||||
(setenv "LLVM_LINK_SHARED" "1")))
|
||||
(add-after 'unpack 'set-linker-locale-to-utf8
|
||||
(lambda _
|
||||
(substitute* (find-files "." "^linker.rs$")
|
||||
(("linker.env\\(\"LC_ALL\", \"C\"\\);")
|
||||
"linker.env(\"LC_ALL\", \"en_US.UTF-8\");"))))
|
||||
(add-after 'unpack 'add-cc-shim-to-path
|
||||
(lambda _
|
||||
(mkdir-p "/tmp/bin")
|
||||
(symlink (which "gcc") "/tmp/bin/cc")
|
||||
(setenv "PATH" (string-append "/tmp/bin:" (getenv "PATH")))))
|
||||
(add-after 'unpack 'neuter-tidy
|
||||
;; We often need to patch tests with various Guix-specific paths.
|
||||
;; This often increases the line length and makes tidy, rustc's
|
||||
;; style checker, complain. We could insert additional newlines or
|
||||
;; add an "// ignore-tidy-linelength" comment, but as an ignore
|
||||
;; comment must be used, both approaches are fragile due to
|
||||
;; upstream formatting changes. As such, disable running the
|
||||
;; linter during tests, since it's intended for rustc developers
|
||||
;; anyway.
|
||||
(lambda _
|
||||
(substitute* "src/bootstrap/builder.rs"
|
||||
((".*::Tidy,.*")
|
||||
""))))
|
||||
(replace 'configure
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
|
@ -443,13 +451,14 @@ ar = \"" binutils "/bin/ar" "\"
|
|||
[dist]
|
||||
") port))))))
|
||||
(replace 'build
|
||||
;; The standard library source location moved in this release.
|
||||
(lambda* (#:key parallel-build? #:allow-other-keys)
|
||||
(let ((job-spec (string-append
|
||||
"-j" (if parallel-build?
|
||||
(number->string (parallel-job-count))
|
||||
"1"))))
|
||||
(invoke "./x.py" job-spec "build" "--stage=1"
|
||||
"src/libstd"
|
||||
"library/std"
|
||||
"src/tools/cargo"))))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
|
@ -490,12 +499,12 @@ ar = \"" binutils "/bin/ar" "\"
|
|||
`(("cmake" ,cmake-minimal)
|
||||
("pkg-config" ,pkg-config) ; For "cargo"
|
||||
("python" ,python-wrapper)
|
||||
("rustc-bootstrap" ,rust-1.39)
|
||||
("cargo-bootstrap" ,rust-1.39 "cargo")
|
||||
("rustc-bootstrap" ,rust-bootstrap)
|
||||
("cargo-bootstrap" ,rust-bootstrap "cargo")
|
||||
("which" ,which)))
|
||||
(inputs
|
||||
`(("jemalloc" ,jemalloc)
|
||||
("llvm" ,llvm-9)
|
||||
("llvm" ,llvm)
|
||||
("openssl" ,openssl)
|
||||
("libssh2" ,libssh2) ; For "cargo"
|
||||
("libcurl" ,curl))) ; For "cargo"
|
||||
|
@ -519,10 +528,10 @@ safety and thread safety guarantees.")
|
|||
;; Dual licensed.
|
||||
(license (list license:asl2.0 license:expat))))
|
||||
|
||||
(define rust-1.41
|
||||
(define rust-1.56
|
||||
(let ((base-rust (rust-bootstrapped-package
|
||||
rust-1.40 "1.41.1"
|
||||
"0ws5x0fxv57fyllsa6025h3q6j9v3m8nb3syl4x0hgkddq0kvj9q")))
|
||||
rust-1.55 "1.56.1"
|
||||
"04cmqx7nn63hzz7z27b2b0dj2qx18rck9ifvip43s6dampx8v2f3")))
|
||||
(package
|
||||
(inherit base-rust)
|
||||
(arguments
|
||||
|
@ -539,115 +548,66 @@ safety and thread safety guarantees.")
|
|||
(string-append name "\"" ,%cargo-reference-hash "\"")))
|
||||
(generate-all-checksums "vendor"))))))))))
|
||||
|
||||
(define rust-1.42
|
||||
(rust-bootstrapped-package
|
||||
rust-1.41 "1.42.0" "0x9lxs82may6c0iln0b908cxyn1cv7h03n5cmbx3j1bas4qzks6j"))
|
||||
|
||||
(define rust-1.43
|
||||
(rust-bootstrapped-package
|
||||
rust-1.42 "1.43.0" "18akhk0wz1my6y9vhardriy2ysc482z0fnjdcgs9gy59kmnarxkm"))
|
||||
|
||||
;; This version requires llvm <= 11.
|
||||
(define rust-1.44
|
||||
(rust-bootstrapped-package
|
||||
rust-1.43 "1.44.1"
|
||||
"0ww4z2v3gxgn3zddqzwqya1gln04p91ykbrflnpdbmcd575n8bky"))
|
||||
|
||||
(define rust-1.45
|
||||
(let ((base-rust (rust-bootstrapped-package
|
||||
rust-1.44 "1.45.2"
|
||||
"0273a1g3f59plyi1n0azf21qjzwml1yqdnj5z472crz37qggr8xp")))
|
||||
(package
|
||||
(inherit base-rust)
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments base-rust)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'unpack 'set-linker-locale-to-utf8
|
||||
(lambda _
|
||||
(substitute* (find-files "." "^linker.rs$")
|
||||
(("linker.env\\(\"LC_ALL\", \"C\"\\);")
|
||||
"linker.env(\"LC_ALL\", \"en_US.UTF-8\");")))))))))))
|
||||
|
||||
(define rust-1.46
|
||||
(rust-bootstrapped-package
|
||||
rust-1.45 "1.46.0" "0a17jby2pd050s24cy4dfc0gzvgcl585v3vvyfilniyvjrqknsid"))
|
||||
|
||||
(define rust-1.47
|
||||
(let ((base-rust (rust-bootstrapped-package
|
||||
rust-1.46 "1.47.0"
|
||||
"07fqd2vp7cf1ka3hr207dnnz93ymxml4935vp74g4is79h3dz19i")))
|
||||
(package/inherit base-rust
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments base-rust)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(replace 'build
|
||||
;; The standard library source location moved in this release.
|
||||
(lambda* (#:key parallel-build? #:allow-other-keys)
|
||||
(let ((job-spec (string-append
|
||||
"-j" (if parallel-build?
|
||||
(number->string (parallel-job-count))
|
||||
"1"))))
|
||||
(invoke "./x.py" job-spec "build" "--stage=1"
|
||||
"library/std"
|
||||
"src/tools/cargo")))))))))))
|
||||
|
||||
(define rust-1.48
|
||||
(rust-bootstrapped-package
|
||||
rust-1.47 "1.48.0" "0fz4gbb5hp5qalrl9lcl8yw4kk7ai7wx511jb28nypbxninkwxhf"))
|
||||
|
||||
(define rust-1.49
|
||||
(rust-bootstrapped-package
|
||||
rust-1.48 "1.49.0" "0yf7kll517398dgqsr7m3gldzj0iwsp3ggzxrayckpqzvylfy2mm"))
|
||||
|
||||
(define rust-1.50
|
||||
(rust-bootstrapped-package
|
||||
rust-1.49 "1.50.0" "0pjs7j62maiyvkmhp9zrxl528g2n0fphp4rq6ap7aqdv0a6qz5wm"))
|
||||
|
||||
(define rust-1.51
|
||||
(rust-bootstrapped-package
|
||||
rust-1.50 "1.51.0" "0ixqkqglv3isxbvl4ldr4byrkx692wghsz3fasy1pn5kr2prnsvs"))
|
||||
|
||||
;;; The LLVM requiriment has been bumped to version 10 in Rust 1.52. Use the
|
||||
;;; latest available.
|
||||
(define rust-1.52
|
||||
(let ((base-rust (rust-bootstrapped-package
|
||||
rust-1.51 "1.52.1"
|
||||
"165zs3xzp9dravybwslqs1qhn35agp6wacmzpymqg3qfdni26vrs")))
|
||||
(package
|
||||
(inherit base-rust)
|
||||
(inputs (alist-replace "llvm" (list llvm-12)
|
||||
(package-inputs base-rust))))))
|
||||
|
||||
(define rust-1.53
|
||||
(rust-bootstrapped-package
|
||||
rust-1.52 "1.53.0" "1f95p259dfp5ca118bg107rj3rqwlswy65dxn3hg8sqgl4wwmxsw"))
|
||||
|
||||
(define rust-1.54
|
||||
(let ((base-rust
|
||||
(rust-bootstrapped-package
|
||||
rust-1.53
|
||||
"1.54.0" "0xk9dhfff16caambmwij67zgshd8v9djw6ha0fnnanlv7rii31dc")))
|
||||
(package/inherit base-rust
|
||||
(source
|
||||
(origin
|
||||
(inherit (package-source base-rust))
|
||||
(snippet '(delete-file-recursively "src/llvm-project")))))))
|
||||
|
||||
(define rust-1.55
|
||||
(rust-bootstrapped-package
|
||||
rust-1.54 "1.55.0" "07l28f7grdmi65naq71pbmvdd61hwcpi40ry7kp7dy7m233rldxj"))
|
||||
|
||||
(define rust-1.56
|
||||
(rust-bootstrapped-package
|
||||
rust-1.55 "1.56.1" "04cmqx7nn63hzz7z27b2b0dj2qx18rck9ifvip43s6dampx8v2f3"))
|
||||
|
||||
(define rust-1.57
|
||||
(rust-bootstrapped-package
|
||||
;; Verified that it *doesn't* build with 1.55. e.g.:
|
||||
;; * feature `edition2021` is required
|
||||
rust-1.56 "1.57.0" "06jw8ka2p3kls8p0gd4p0chhhb1ia1mlvj96zn78n7qvp71zjiim"))
|
||||
|
||||
(define rust-1.58
|
||||
(rust-bootstrapped-package
|
||||
;; Verified that it *doesn't* build with 1.56. e.g.:
|
||||
;; * error: attributes starting with `rustc` are reserved for use by the
|
||||
;; `rustc` compiler
|
||||
;; * error: cannot find attribute `rustc_do_not_const_check` in this scope
|
||||
;; * error[E0522]: definition of an unknown language item:
|
||||
;; `const_eval_select_ct`
|
||||
rust-1.57 "1.58.1" "1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8"))
|
||||
|
||||
(define rust-1.59
|
||||
(let ((base-rust
|
||||
(rust-bootstrapped-package
|
||||
rust-1.56 "1.57.0"
|
||||
"06jw8ka2p3kls8p0gd4p0chhhb1ia1mlvj96zn78n7qvp71zjiim")))
|
||||
(rust-bootstrapped-package
|
||||
;; Verified that it *doesn't* build with 1.57. e.g.:
|
||||
;; * error: `doc(primitive)` should never have been stable
|
||||
;; * error[E0522]: definition of an unknown language item:
|
||||
;; `generator_return`
|
||||
;; * error[E0206]: the trait `Copy` may not be implemented for this type
|
||||
rust-1.58 "1.59.0" "1yc5bwcbmbwyvpfq7zvra78l0r8y3lbv60kbr62fzz2vx2pfxj57")))
|
||||
(package
|
||||
(inherit base-rust)
|
||||
(arguments
|
||||
(if (target-riscv64?)
|
||||
(substitute-keyword-arguments (package-arguments base-rust)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'unpack 'revert-riscv-pause-instruction
|
||||
(lambda _
|
||||
;; This fails with:
|
||||
;; error: unknown directive, referring to '.insn'.
|
||||
;; This is due to building with llvm < 14.
|
||||
;; https://github.com/rust-lang/stdarch/issues/1291
|
||||
;; Partial roll-back from this commit:
|
||||
;; https://github.com/rust-lang/stdarch/pull/1271
|
||||
(substitute*
|
||||
"library/stdarch/crates/core_arch/src/riscv_shared/mod.rs"
|
||||
(("\\.insn i 0x0F, 0, x0, x0, 0x010") ".word 0x0100000F")))))))
|
||||
(package-arguments base-rust))))))
|
||||
|
||||
(define rust-1.60
|
||||
(rust-bootstrapped-package
|
||||
;; Verified that it *doesn't* build with 1.58. e.g.:
|
||||
;; * error: unknown codegen option: `symbol-mangling-version`
|
||||
rust-1.59 "1.60.0" "1drqr0a26x1rb2w3kj0i6abhgbs3jx5qqkrcwbwdlx7n3inq5ji0"))
|
||||
|
||||
;;; Note: Only the latest versions of Rust are supported and tested. The
|
||||
;;; intermediate rusts are built for bootstrapping purposes and should not
|
||||
;;; be relied upon. This is to ease maintenance and reduce the time
|
||||
;;; required to build the full Rust bootstrap chain.
|
||||
;;;
|
||||
;;; Here we take the latest included Rust, make it public, and re-enable tests
|
||||
;;; and extra components such as rustfmt.
|
||||
(define-public rust
|
||||
(let ((base-rust rust-1.60))
|
||||
(package
|
||||
(inherit base-rust)
|
||||
(outputs (cons "rustfmt" (package-outputs base-rust)))
|
||||
|
@ -786,12 +746,6 @@ safety and thread safety guarantees.")
|
|||
`("procps" ,procps)
|
||||
(package-native-inputs base-rust))))))
|
||||
|
||||
;;; Note: Only the latest versions of Rust are supported and tested. The
|
||||
;;; intermediate rusts are built for bootstrapping purposes and should not
|
||||
;;; be relied upon. This is to ease maintenance and reduce the time
|
||||
;;; required to build the full Rust bootstrap chain.
|
||||
(define-public rust rust-1.57)
|
||||
|
||||
(define-public rust-src
|
||||
(hidden-package
|
||||
(package
|
||||
|
|
|
@ -62,17 +62,17 @@
|
|||
(define-public python-sphinx
|
||||
(package
|
||||
(name "python-sphinx")
|
||||
(version "4.5.0")
|
||||
(version "5.1.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Sphinx" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1rp28jryxwy24y8vpacclqihbizyi6b1s6id86pibvm46ybcmy3v"))))
|
||||
"12cdy3m5c09lpf2bbxzbhm5v5y9fk7jgm94qrzggpq86waj28cms"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
|
@ -111,10 +111,6 @@
|
|||
texlive-etoolbox
|
||||
texlive-generic-ltxcmds
|
||||
texlive-hyperref
|
||||
;; TODO: Remove texlive-stringenc and texlive-zapfding after
|
||||
;; propagating them in texlive-hyperref in next rebuild cycle.
|
||||
texlive-stringenc
|
||||
texlive-zapfding
|
||||
texlive-latex-base ;alltt, atbegshi, makeidx, textcomp
|
||||
texlive-latex-cmap
|
||||
texlive-latex-fancyhdr
|
||||
|
@ -148,6 +144,18 @@ for Python projects or other documents consisting of multiple reStructuredText
|
|||
sources.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
;; Some packages do not support Sphinx 5 yet. Remove when unused.
|
||||
(define-public python-sphinx-4
|
||||
(package
|
||||
(inherit python-sphinx)
|
||||
(version "4.5.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Sphinx" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1rp28jryxwy24y8vpacclqihbizyi6b1s6id86pibvm46ybcmy3v"))))))
|
||||
|
||||
(define-public python-sphinxcontrib-apidoc
|
||||
(package
|
||||
(name "python-sphinxcontrib-apidoc")
|
||||
|
@ -365,14 +373,16 @@ Blog, News or Announcements section to a Sphinx website.")
|
|||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "pytest")))))))
|
||||
(propagated-inputs (list python-docutils python-sphinx))
|
||||
(propagated-inputs (list python-docutils python-sphinx-4))
|
||||
(native-inputs
|
||||
(list python-pytest
|
||||
python-pytest-regressions))
|
||||
(home-page "https://github.com/executablebooks/sphinx-panels")
|
||||
(synopsis "Sphinx extension for creating panels in a grid layout")
|
||||
(description
|
||||
"This package provides a sphinx extension for creating panels in a grid layout.")
|
||||
"This package provides a sphinx extension for creating panels in a
|
||||
grid layout. It is no longer maintained and users are encouraged to use
|
||||
@code{sphinx-design} instead.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-sphinx-tabs
|
||||
|
|
|
@ -159,6 +159,7 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used."
|
|||
(file-name (string-append "hyph-utf8-scripts-"
|
||||
(number->string %texlive-revision)
|
||||
"-checkout"))
|
||||
(patches (search-patches "texlive-hyph-utf8-no-byebug.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"04xzf5gr3ylyh3ls09imrx4mwq3qp1k97r9njzlan6hlff875rx2"))))
|
||||
|
@ -188,7 +189,8 @@ files from LOCATIONS with expected checksum HASH. CODE is not currently in use.
|
|||
(string-append root "/tex/generic/hyph-utf8/patterns/quote")))
|
||||
(mkdir "scripts")
|
||||
(copy-recursively
|
||||
(assoc-ref inputs "hyph-utf8-scripts") "scripts")
|
||||
(dirname (search-input-file inputs "hyph-utf8.rb"))
|
||||
"scripts")
|
||||
|
||||
;; Prepare target directories
|
||||
(mkdir-p patterns)
|
||||
|
@ -226,9 +228,7 @@ files from LOCATIONS with expected checksum HASH. CODE is not currently in use.
|
|||
(string-append "File.join(\"" ptex "\"")))
|
||||
(invoke "ruby" "generate-ptex-patterns.rb")))))))))
|
||||
(native-inputs
|
||||
`(("ruby" ,ruby)
|
||||
("ruby-hydra" ,ruby-hydra)
|
||||
("hyph-utf8-scripts" ,hyph-utf8-scripts)))
|
||||
(list ruby ruby-hydra-minimal hyph-utf8-scripts))
|
||||
(home-page "https://ctan.org/pkg/hyph-utf8"))))
|
||||
|
||||
(define texlive-extra-src
|
||||
|
@ -3429,12 +3429,10 @@ XML, using UTF-8 or a suitable 8-bit encoding.")
|
|||
texlive-latex-refcount
|
||||
texlive-latex-rerunfilecheck
|
||||
texlive-url
|
||||
;; TODO: Add this in next rebuild cycle.
|
||||
;;texlive-cm
|
||||
;;texlive-latex-graphics ;for keyval
|
||||
;;texlive-stringenc
|
||||
;;texlive-zapfding
|
||||
))
|
||||
texlive-cm
|
||||
texlive-latex-graphics ;for keyval
|
||||
texlive-stringenc
|
||||
texlive-zapfding))
|
||||
(home-page "https://www.ctan.org/pkg/hyperref")
|
||||
(synopsis "Extensive support for hypertext in LaTeX")
|
||||
(description
|
||||
|
|
|
@ -196,6 +196,7 @@ Pendulum instances.")
|
|||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "python-dateutil" version))
|
||||
(patches (search-patches "python-dateutil-pytest-compat.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"11iy7m4bp2lgfkcl0r6xzf34bvk7ppjmsyn2ygfikbi72v6cl8q1"))))
|
||||
|
|
|
@ -335,6 +335,7 @@ the SVT-HEVC encoder, it is possible to spread video encoding processing across
|
|||
multiple Intel's Xeon processors to achieve a real advantage of processing
|
||||
efficiency.")
|
||||
(home-page "https://01.org/svt")
|
||||
;; Specifically targets x86_64 Intel hardware.
|
||||
(supported-systems '("x86_64-linux"))
|
||||
(license (license:non-copyleft "file:///LICENSE.md"))))
|
||||
|
||||
|
@ -1500,14 +1501,14 @@ quality and performance.")
|
|||
(define-public libva
|
||||
(package
|
||||
(name "libva")
|
||||
(version "2.13.0")
|
||||
(version "2.15.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/intel/libva/releases/download/"
|
||||
version "/libva-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "0q6l193x9whd80sjd5mx8cb7c0fcljb19nhfpla5h49nkzrq7lzs"))))
|
||||
(base32 "1jhy8qzfp4ydbxs9qd9km7k5wq8r4s2vq20r1q07lgld8l4x93i5"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
|
@ -1519,27 +1520,24 @@ quality and performance.")
|
|||
mesa
|
||||
wayland))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before
|
||||
'build 'fix-dlopen-paths
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(list
|
||||
;; Most drivers are in mesa's $prefix/lib/dri, so use that. (Can be
|
||||
;; overridden at run-time via LIBVA_DRIVERS_PATH.)
|
||||
#:configure-flags
|
||||
#~(list (string-append "--with-drivers-path="
|
||||
(search-input-directory %build-inputs "lib/dri")))
|
||||
;; However, we can't write to mesa's store directory, so override the
|
||||
;; following make variable to install the dummy driver to libva's
|
||||
;; $prefix/lib/dri directory.
|
||||
#:make-flags
|
||||
#~(list (string-append "dummy_drv_video_ladir=" #$output "/lib/dri"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'build 'fix-dlopen-paths
|
||||
(lambda _
|
||||
(substitute* "va/drm/va_drm_auth_x11.c"
|
||||
(("\"libva-x11\\.so\\.%d\"")
|
||||
(string-append "\"" out "/lib/libva-x11.so.%d\"")))
|
||||
#t))))
|
||||
;; Most drivers are in mesa's $prefix/lib/dri, so use that. (Can be
|
||||
;; overridden at run-time via LIBVA_DRIVERS_PATH.)
|
||||
#:configure-flags
|
||||
(list (string-append "--with-drivers-path="
|
||||
(assoc-ref %build-inputs "mesa") "/lib/dri"))
|
||||
;; However, we can't write to mesa's store directory, so override the
|
||||
;; following make variable to install the dummy driver to libva's
|
||||
;; $prefix/lib/dri directory.
|
||||
#:make-flags
|
||||
(list (string-append "dummy_drv_video_ladir="
|
||||
(assoc-ref %outputs "out") "/lib/dri"))))
|
||||
(string-append "\"" #$output "/lib/libva-x11.so.%d\""))))))))
|
||||
(home-page "https://www.freedesktop.org/wiki/Software/vaapi/")
|
||||
(synopsis "Video acceleration library")
|
||||
(description "The main motivation for VA-API (Video Acceleration API) is
|
||||
|
@ -1728,6 +1726,10 @@ operate properly.")
|
|||
;; The static libraries are 23 MiB
|
||||
"--disable-static"
|
||||
|
||||
#$@(if (target-riscv64?)
|
||||
'("--extra-cflags=-fPIC")
|
||||
'())
|
||||
|
||||
;; Runtime cpu detection is not implemented on
|
||||
;; MIPS, so we disable some features.
|
||||
"--disable-mips32r2"
|
||||
|
@ -4388,7 +4390,7 @@ tools for styling them, including a built-in real-time video preview.")
|
|||
(gst-plugins/selection gst-plugins-bad #:plugins
|
||||
'("debugutils" "transcode")
|
||||
#:configure-flags
|
||||
'("-Dintrospection=enabled"))
|
||||
#~'("-Dintrospection=enabled"))
|
||||
gst-libav
|
||||
gsound
|
||||
gtk+
|
||||
|
|
|
@ -236,12 +236,14 @@ engine that uses Wayland for graphics output.")
|
|||
enchant
|
||||
geoclue
|
||||
gst-plugins-base
|
||||
gst-plugins-bad-minimal
|
||||
gtk+-2
|
||||
harfbuzz
|
||||
hyphen
|
||||
icu4c
|
||||
lcms
|
||||
libgcrypt
|
||||
libgudev
|
||||
libjpeg-turbo
|
||||
libmanette
|
||||
libnotify
|
||||
|
|
Reference in New Issue