Compare commits

...

16 commits

Author SHA1 Message Date
Andy Tai
c889cdbfd9
gnu: xpra: Update to 6.4.1.
* gnu/packages/xorg.scm (xpra): Update to 6.4.1.
[source](origin): Update patch file names.
[arguments]<#:phases>{fix-paths}: Adapt substitution.
* gnu/packages/patches/xpra-6.0-systemd-run.patch: Delete.
* gnu/packages/patches/xpra-6.4-systemd-run.patch: New file.
* gnu/packages/patches/xpra-6.1-install_libs.patch: Delete.
* gnu/packages/patches/xpra-6.4-install_libs.patch: New file.
* gnu/local.mk: Unregister deleted files and register new files.

Change-Id: Ib026b49114f5afca39ee8ec1a8a209cd6c11c7d6
Signed-off-by: Andreas Enge <andreas@enge.fr>
2026-01-23 23:39:42 +01:00
Andreas Enge
1d66e6ae69
gnu: plasma-desktop: Remove outdated input.
signon-plugin-oauth2 uses signond, whereas plasma-desktop uses signond-qt6;
and plasma-desktop does not retain a reference to signon-plugin-oauth2.

* gnu/packages/kde-plasma.scm (plasma-desktop)[inputs]: Remove
signon-plugin-oauth2.

Fixes: guix/guix#5440
Change-Id: I0f5b0debf996d3ea9d71f16e996bd2874292ef6f
2026-01-23 23:12:15 +01:00
Andreas Enge
620e9d349b
gnu: libaccounts-qt6: Disinherit from libaccounts-qt.
* gnu/packages/qt.scm (libaccounts-qt6): Copy fields from libaccounts-qt
instead of inheriting.

Change-Id: Ia22b9ec8c231233ddfb0554e6c664005d0f773de
2026-01-23 23:11:11 +01:00
Andreas Enge
e9f0424879
gnu: libaccounts-qt6: Correct input for Qt6.
* gnu/packages/qt.scm (libaccounts-qt6)[inputs]: Replace signond
by signond-qt6.

Change-Id: Ie395a5815323ed2456fad61d780faa9a136891f4
2026-01-23 23:11:11 +01:00
Andreas Enge
9d1a45ffac
gnu: akonadi: Correct input for Qt6.
* gnu/packages/kde-pim.scm (akonadi)[inputs]: Replace signond
by signond-qt6.

Change-Id: I5c5466720f40f83d323c34bb58fbcaa6addb9b5c
2026-01-23 23:11:03 +01:00
Mazin AlHaddad
f7643a61fd
gnu: i3-wm: Update to 4.25.
* gnu/packages/wm.scm (i3-wm): Update to 4.25.

Merges guix/guix!4973

Change-Id: Id0b3dd4cd74a4b663fc25f17103e81f11fb8e36a
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-01-23 20:09:38 +01:00
Charles Roelli
8d78346633
gnu: prosody-rest: New package.
* gnu/packages/messaging.scm: Add.

Merges guix/guix!4969

Change-Id: I3c262e081d742338c4929029fa932ace301f62ee
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-01-23 20:02:49 +01:00
Sergey Trofimov
c33cee95bb
gnu: emacs-nerd-icons: Update to 0.1.0-2.d41902f.
* gnu/packages/emacs-xyz.scm
(emacs-nerd-icons): Update to 0.1.0-2.d41902f.

Merges guix/guix!5419

Change-Id: Idf458215d87b005badf5dfc8ab7761b134c00d83
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-01-23 19:50:21 +01:00
Sergey Trofimov
5ab6cd8b11
gnu: emacs-evil-mc: Update to 0.0.4-0.7e363dd.
* gnu/packages/emacs-xyz.scm (emacs-evil-mc): Update to 0.0.4-0.7e363dd.

Merges guix/guix!5419

Change-Id: Id6e47b283fd9352ffd49f9eea00e4311f44ca5b1
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-01-23 19:50:21 +01:00
Sergey Trofimov
024ad78ab4
gnu: emacs-general: Update to 0.1-0.a48768f.
* gnu/packages/emacs-xyz.scm (emacs-general): Update to 0.1-0.a48768f.
[native-inputs]: Remove emacs-use-package and emacs-which-key.

Merges guix/guix!5419

Change-Id: Ia3737288ac8aacfeef5ad8fb2e36b773b809ae90
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
Modified-by: Cayetano Santos <csantosb@inventati.org>
2026-01-23 19:49:45 +01:00
Nguyễn Gia Phong
147bcc9716
gnu: aflplusplus: Update to 4.35c.
* gnu/packages/debug.scm (aflplusplus): Update to 4.35c.

Merges guix/guix!5560

Change-Id: I9e00abb6c06430b110c11bfffe4f0e8a2612d6f7
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
2026-01-23 19:38:26 +01:00
Nguyễn Gia Phong
9835913650
gnu: qemu-for-aflplusplus: Update to 5.2.50-1.60ebd56.
* gnu/packages/debug.scm (qemu-for-aflplusplus): Update to
5.2.50-1.60ebd56.

Merges guix/guix!5560

Change-Id: I3f2ebbdf751e8df31319f0e47dc6da83585cb273
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
Modified-by: Cayetano Santos <csantosb@inventati.org>
2026-01-23 19:38:16 +01:00
Cayetano Santos
188aac989a
gnu: Add umf.
* gnu/packages/oneapi.scm (umf): New variable.

Merges guix/guix!5722

Change-Id: I6a569bc31bfd90a29ad6bd62a498ebf8e61bd81d
2026-01-23 19:16:28 +01:00
Cayetano Santos
9ca817728e
gnu: Add level-zero.
* gnu/packages/oneapi.scm (level-zero): New variable.

Merges guix/guix!5722

Change-Id: I9abf986364904eb7d6727e33ef033e5256ced65f
2026-01-23 19:16:18 +01:00
Cayetano Santos
58fb3cf516
gnu: Add neorv32.
* gnu/packages/hdl.scm: New variable.
* CODEOWNERS: Regenerate.
* gnu/local.mk: Register.
* po/packages/POTFILES.in: Likewise.
* etc/teams.scm (electronics)<#:scope>: Add "gnu/packages/hdl.scm".

Change-Id: I188087a03272b9a63f23fd96c9cd2af7228dc0d9
2026-01-23 18:26:00 +01:00
Cayetano Santos
386f2917ae
gnu: ieee-p1076: Fix paths.
* gnu/packages/electronics.scm (ieee-p1076)[arguments]: Correct paths
in #:install-plan.
[native-search-paths]: Update.

Change-Id: I4d424104ec3b5944cf61778791f8d102ee43a624
2026-01-23 18:26:00 +01:00
17 changed files with 284 additions and 57 deletions

View file

@ -146,6 +146,7 @@ gnu/system/examples/lightweight-desktop\.tmpl @guix/documentation
gnu/system/examples/desktop\.tmpl @guix/documentation
gnu/packages/electronics\.scm @guix/electronics
gnu/packages/hdl\.scm @guix/electronics
gnu/packages/libftdi\.scm @guix/electronics
gnu/packages/engineering\.scm @guix/electronics
gnu/packages/flashing-tools\.scm @guix/electronics

View file

@ -630,6 +630,7 @@ of Rebar and Mix build systems and Hex.pm importer."
#:name "Electronics team"
#:description "Electronics and hardware related packages."
#:scope (list "gnu/packages/electronics.scm"
"gnu/packages/hdl.scm"
"gnu/packages/libftdi.scm"
"gnu/packages/engineering.scm"
"gnu/packages/flashing-tools.scm")))

View file

@ -367,6 +367,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/haskell-web.scm \
%D%/packages/haskell-xyz.scm \
%D%/packages/haxe.scm \
%D%/packages/hdl.scm \
%D%/packages/heads.scm \
%D%/packages/hexedit.scm \
%D%/packages/high-availability.scm \
@ -2525,8 +2526,8 @@ dist_patch_DATA = \
%D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch \
%D%/packages/patches/xpra-5.0-install_libs.patch \
%D%/packages/patches/xpra-5.0-systemd-run.patch \
%D%/packages/patches/xpra-6.0-systemd-run.patch \
%D%/packages/patches/xpra-6.1-install_libs.patch \
%D%/packages/patches/xpra-6.4-systemd-run.patch \
%D%/packages/patches/xpra-6.4-install_libs.patch \
%D%/packages/patches/xterm-370-explicit-xcursor.patch \
%D%/packages/patches/xygrib-fix-finding-data.patch \
%D%/packages/patches/xygrib-newer-proj.patch \

View file

@ -531,8 +531,8 @@ server and embedded PowerPC, and S390 guests.")
(define-public qemu-for-aflplusplus
(let ((base qemu-minimal)
(commit "790d2124fd054621d3c0d3ec31bea114b60601f9")
(revision "0"))
(commit "60ebd5624c60589e276cf287516b925a9ee35b87")
(revision "1"))
(hidden-package
(package
(inherit base)
@ -546,7 +546,7 @@ server and embedded PowerPC, and S390 guests.")
(recursive? #t)))
(file-name (git-file-name name version))
(sha256
(base32 "1l2kl8768l4mbkiaj63zn6gsdn3qpl3rg7s6h62rmd7599ar3xn3"))))
(base32 "1vz7k1ssfnlimkpc01fqin27r2k4a23cwpxj2bbmsp7d3175bjbz"))))
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:configure-flags _ #~'())
@ -610,7 +610,7 @@ server and embedded PowerPC, and S390 guests.")
(package
(inherit american-fuzzy-lop)
(name "aflplusplus")
(version "4.34c")
(version "4.35c")
(source (origin
(method git-fetch)
(uri (git-reference
@ -619,7 +619,7 @@ server and embedded PowerPC, and S390 guests.")
(file-name (git-file-name name version))
(sha256
(base32
"14pllv986zwzbqarbsif02k618yns4fvqd3br6irzfcwivpysqfa"))))
"0mwamvyv2ckfxrrns4cnhx9gf2dn9jjgi9dc1qp3cwjasbghg5lg"))))
(arguments
(substitute-keyword-arguments (package-arguments american-fuzzy-lop)
((#:make-flags _ ''())

View file

@ -424,13 +424,13 @@ ensuring that a design refactor preserves correctness in all conditions.")
;; pass 1055 of 1648
#:tests? #f
#:install-plan
#~'(("ieee" "share/ieee/p1076/ieee" #:include ("vhdl"))
("std" "share/ieee/p1076/std" #:include ("vhdl")))))
#~'(("ieee" "share/ieee-p1076/ieee" #:include ("vhdl"))
("std" "share/ieee-p1076/std" #:include ("vhdl")))))
(native-search-paths
(list (search-path-specification
(variable "IEEE-1076")
(variable "FW_IEEE_p1076")
(separator #f)
(files (list "share/ieee/p1076")))))
(files (list "share/ieee-p1076")))))
(home-page "https://IEEE-P1076.gitlab.io")
(synopsis "VHDL libraries corresponding to the IEEE 1076 standard")
(description

View file

@ -32402,11 +32402,11 @@ defaults.")
(license license:gpl3+)))
(define-public emacs-evil-mc
(let ((commit "1cabb869fe70cef49f7dc06f015c3ade1a969c8c")
(revision "2"))
(let ((commit "7e363dd6b0a39751e13eb76f2e9b7b13c7054a43")
(revision "0"))
(package
(name "emacs-evil-mc")
(version (git-version "0.0.3" revision commit))
(version (git-version "0.0.4" revision commit))
(source
(origin
(method git-fetch)
@ -32415,7 +32415,7 @@ defaults.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0p83p90faq1p02lmsfs7zrnky3cyzgy8z4m83a81r9kakjzhkrnb"))))
(base32 "0gzy2mqcdxhkg0hmxqzbjy5ihfal1s21wxd04mrikqri54sck4z5"))))
(build-system emacs-build-system)
(arguments
(list #:test-command
@ -34698,8 +34698,8 @@ files are easily readable and they work nicely with version control systems.")
(license license:gpl3+)))
(define-public emacs-nerd-icons
(let ((commit "4bd9795f1f3f47cb874e10ff5c3845e037f0b3e2")
(revision "1"))
(let ((commit "d41902fe68a94fcf4394f25a89ba2d510bec4461")
(revision "2"))
(package
(name "emacs-nerd-icons")
(version (git-version "0.1.0" revision commit))
@ -34711,10 +34711,11 @@ files are easily readable and they work nicely with version control systems.")
(file-name (git-file-name name version))
(sha256
(base32
"1imklm81jsq2jdjprsjm8pdq701c4l0rgn7l0f3l3xs602kg49l1"))))
"08j8sw8ik55pd0jw1nar90016nnd5bicd5mhrm202xzigqmx2bxl"))))
(build-system emacs-build-system)
(arguments
(list #:include #~(cons "^data\\/" %default-include)))
(list #:include #~(cons "^data\\/" %default-include)
#:tests? #f)) ; no tests
(synopsis "Library for easily using nerd font icons inside Emacs")
(description "Nerd-icons an alternative to all-the-icons. It works on both
GUI and terminal, and requires a nerd font installed on your system.")
@ -35308,11 +35309,11 @@ advice to be recorded and displayed.")
(license license:gpl3+)))
(define-public emacs-general
(let ((commit "a0b17d207badf462311b2eef7c065b884462cb7c")
(revision "4"))
(let ((commit "a48768f85a655fe77b5f45c2880b420da1b1b9c3")
(revision "0"))
(package
(name "emacs-general")
(version (git-version "0" revision commit))
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
@ -35320,11 +35321,11 @@ advice to be recorded and displayed.")
(url "https://github.com/noctuid/general.el")
(commit commit)))
(sha256
(base32 "0wn5rk3gkimdklip392mnjrmkymgrb7q9skifi03cbpjam1anzvv"))
(base32 "19k82p8pwyh3krq8i6l6calwy9wddqklj1klkdyawgh5ar230vb2"))
(file-name (git-file-name name version))))
(build-system emacs-build-system)
(native-inputs
(list emacs-buttercup emacs-evil emacs-which-key emacs-use-package))
(list emacs-buttercup emacs-evil))
(arguments
`(#:test-command '("buttercup" "-L" "test/test-general.el")))
(home-page "https://github.com/noctuid/general.el")

89
gnu/packages/hdl.scm Normal file
View file

@ -0,0 +1,89 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages hdl)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system copy)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (gnu packages electronics))
(define-public neorv32
(package
(name "neorv32")
(version "1.12.7")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/stnolting/neorv32")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"030djnf5ww4b2w6lhb9lpprq2iawf8v93rmmgfgnbr56k4blyyk6"))))
(outputs
'("out" "neorv32"))
(build-system copy-build-system)
(arguments
(list
#:tests? #f ;FIXME: nvc checksum errors inside the build env
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(substitute* '("rtl/file_list_cpu.f" "rtl/file_list_soc.f")
(("NEORV32_RTL_PATH_PLACEHOLDER") "rtl"))
(for-each
(lambda (f)
(invoke
"sh" "-c"
(format #f "cat rtl/~a.f | xargs nvc --work=neorv32 -a" f)))
'("file_list_soc" "file_list_cpu"))
(for-each
(lambda (f)
(invoke "nvc" "--work=neorv32" "-a" f))
`("sim/sim_uart_rx.vhd"
,@(find-files "sim" "x.*\\.vhd$")
"sim/neorv32_tb.vhd"))
(invoke "nvc" "--work=neorv32" "-e" "neorv32_tb")
(invoke "nvc" "--work=neorv32" "-r" "--stop-time=10ms"
"neorv32_tb")))))
#:install-plan
#~'(("rtl" "share/neorv32/work/rtl"
#:exclude-regexp (".*\\.f$" ".*\\.sh$"))
("rtl" "share/neorv32/neorv32/rtl"
#:exclude-regexp (".*\\.f$" ".*\\.sh$")
#:output "neorv32"))))
(native-inputs (list nvc))
(native-search-paths
(list (search-path-specification
(variable "FW_NEORV32")
(separator #f)
(files (list "share/neorv32")))))
(home-page "https://stnolting.github.io/neorv32/")
(synopsis "RISC-V soft core CPU in VHDL")
(description
"Neorv32 is a small, customizable 32 bits microcontroller-like system on
chip written in platform-independent VHDL.")
(properties
`((output-synopsis "out" "Instance this design library as work")
(output-synopsis "neorv32" "Instance this design library as neorv32")))
(license license:bsd-3)))

View file

@ -204,7 +204,7 @@ multi-floor indoor maps.")
;; Do NOT add mysql or postgresql to the inputs. Otherwise the binaries
;; and wrapped files will refer to them, even if the user choices none
;; of these. Executables are searched on $PATH then.
signond))
signond-qt6))
(propagated-inputs (list sqlite kaccounts-integration))
(arguments
(list #:qtbase qtbase

View file

@ -2088,7 +2088,6 @@ the KDE Plasma 6 desktop.")
;; require QtWaylandScanner
qtwayland))
(inputs (list packagekit-qt6
signon-plugin-oauth2
signond-qt6
attica
appstream-qt6

View file

@ -1627,6 +1627,13 @@ to affiliated users who are not in the room. This is a custom extension by
Tigase to allow push notifications from MUCs to users who are not currently
connected.")))
(define-public prosody-rest
(package
(inherit (prosody-module "mod_rest"))
(synopsis "REST API support")
(description "This module adds an API for sending and receiving XMPP
stanzas.")))
(define-public prosody-smacks
(package
(inherit (prosody-module "mod_smacks"))

View file

@ -20,7 +20,11 @@
#:use-module (gnu packages)
#:use-module (gnu packages check)
#:use-module (gnu packages cpp)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
#:use-module (gnu packages logging)
#:use-module (gnu packages mpi)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages swig)
#:use-module (guix build-system cmake)
@ -30,6 +34,47 @@
#:use-module (guix packages)
#:use-module (guix utils))
(define-public level-zero
(package
(name "level-zero")
(version "1.27.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/oneapi-src/level-zero/")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(snippet
#~(begin
(use-modules (guix build utils))
(with-directory-excursion "third_party"
(delete-file-recursively "spdlog_headers"))))
(sha256
(base32
"1f08046g4anbqn3sk8fdpi6xdb8pkq1y28a5rxrai9rmah1v07kw"))))
(build-system cmake-build-system)
(arguments
(list
#:tests? #f
#:configure-flags
#~(list "-DSYSTEM_SPDLOG=ON"
(string-append "-DVERSION_SHA=" #$version))))
(inputs (list spdlog-1.13))
(native-inputs (list pkg-config python-minimal-wrapper))
(home-page
"https://oneapi-src.github.io/level-zero-spec/level-zero/latest/index.html")
(synopsis "OneAPI Level Zero specification headers and loader")
(description
"Level Zero contains the following components of oneAPI:
@itemize
@item copies of the Level Zero Specification API C/C++ header files
@item loader
@item validation layer
@item tracing layer
@end itemize")
(license license:expat)))
;;; Updates and replaces oneapi-dnnl in (gnu packages machine-learning)
(define-public onednn
;; See doc/build/build.md.
@ -211,3 +256,54 @@ eliminate tedious threading implementation work. It provides parallel loop
constructs, asynchronous tasks, synchronization primitives, atomic operations,
and more. @code{python-onetbb} enables threading composability between two or
more thread-enabled Python libraries.")))
(define-public umf
(package
(name "umf")
(version "1.0.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/oneapi-src/unified-memory-framework/")
(commit (string-append "v" version))))
(sha256
(base32
"16svxs1damgv29fcksw7538lyvrfa33b5ziwn7sjf85d2z091flg"))))
(build-system cmake-build-system)
(arguments
(list
#:tests? #f ;errors with "function not implemented"
#:configure-flags
#~(list "-DUMF_BUILD_CUDA_PROVIDER=OFF"
"-DUMF_BUILD_EXAMPLES=OFF")
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'set-ld-library-path
(lambda _
(for-each
(lambda (f)
(delete-file (format #f "test/~a" f)))
'("test_memspace_highest_capacity"
"test_memtarget"))
(setenv "LD_LIBRARY_PATH"
(string-append #$(this-package-input "onetbb")
"/lib"))))
(add-after 'unpack 'fix-googletest
(lambda _
(substitute* "test/CMakeLists.txt"
(("FetchContent_MakeAvailable\\(googletest\\)")
"find_package(GTest REQUIRED)")))))))
(inputs
(list `(,hwloc "lib") level-zero numactl onetbb))
(native-inputs
(list pkg-config python-minimal-wrapper googletest))
(home-page "https://oneapi-src.github.io/unified-memory-framework/")
(synopsis "OneAPI @acronym{UMG, Unified Memory Framework}")
(description
"The UMF is a library for constructing allocators and memory pools. It
also contains broadly useful abstractions and utilities for memory
management. UMF allows users to manage multiple memory pools characterized by
different attributes, allowing certain allocation types to be isolated from
others and allocated using different hardware resources as required..")
(license license:asl2.0)))

View file

@ -4,11 +4,11 @@ This workaround for Gentoo interferes with our use of --no-compile during
the 'install stage.
diff --git a/setup.py b/setup.py
index be7a3758e8..28dc1be191 100755
index bd65109379..a97a310ea3 100755
--- a/setup.py
+++ b/setup.py
@@ -953,8 +953,6 @@ if modules_ENABLED:
# Utility methods for building with Cython
@@ -1081,8 +1081,6 @@ if verbose_ENABLED and not os.environ.get("DISTUTILS_DEBUG"):
def do_add_cython_ext(*args, **kwargs) -> None:
- if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv):
@ -16,17 +16,19 @@ index be7a3758e8..28dc1be191 100755
if not cython_ENABLED:
raise ValueError(f"cannot build {args}: cython compilation is disabled")
if cython_tracing_ENABLED:
@@ -2175,9 +2173,6 @@ else:
if root_prefix.endswith("/usr"):
# ie: "/" or "/usr/src/rpmbuild/BUILDROOT/xpra-0.18.0-0.20160513r12573.fc23.x86_64/"
root_prefix = root_prefix[:-4]
@@ -2301,11 +2299,6 @@ else:
def _get_root_prefix(self) -> str:
root_prefix = ""
- for x in sys.argv:
- if x.startswith("--root="):
- root_prefix = x[len("--root="):]
print(f" root_prefix={root_prefix!r}")
build_xpra_conf(root_prefix)
@@ -2320,13 +2315,6 @@ else:
- return x[len("--root="):]
- if x.startswith("--prefix="):
- root_prefix = x[len("--prefix="):]
if not root_prefix:
install_dir = self._get_install_dir()
root_prefix = install_dir.rstrip("/")
@@ -2466,13 +2459,6 @@ else:
if uinput_ENABLED:
add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"])

View file

@ -3,10 +3,10 @@ Distriction specific patch, not going upstream
Disable systemd-run if the command is not found.
diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py
index 1c5e8ddaad..084aabe792 100755
index 734e488eb9..36410d2d85 100755
--- a/xpra/scripts/main.py
+++ b/xpra/scripts/main.py
@@ -396,23 +396,26 @@ def use_systemd_run(s) -> bool:
@@ -437,20 +437,26 @@ def use_systemd_run(s) -> bool:
cmd = ["systemd-run", "--quiet"]
if getuid() != 0:
cmd += ["--user"]
@ -18,10 +18,7 @@ index 1c5e8ddaad..084aabe792 100755
- except TimeoutExpired: # pragma: no cover
- r = None
- if r is None:
- try:
- proc.terminate()
- except Exception:
- pass
- noerr(proc.terminate)
+ cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"]
+ proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False)
try:
@ -45,4 +42,4 @@ index 1c5e8ddaad..084aabe792 100755
+ return False
def verify_gir():
def verify_gir() -> None:

View file

@ -6212,12 +6212,44 @@ credentials and service-specific settings.")
(define-public libaccounts-qt6
(package
(inherit libaccounts-qt)
(name "libaccounts-qt6")
(native-inputs (modify-inputs (package-native-inputs libaccounts-qt)
(replace "qtbase" qtbase)
(replace "qttools" qttools)))
(synopsis "Qt6 bindings for libaccounts-glib")))
(version "1.17")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/accounts-sso/libaccounts-qt")
(commit (string-append "VERSION_" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0859nsksgfrj6ynj74awj1fr6slwcjavs989xc7mbgpvi87n1xlq"))))
(build-system gnu-build-system)
(arguments
(list #:tests? #f ;TODO
#:phases
#~(modify-phases %standard-phases
(replace 'configure
(lambda _
(substitute* "tests/tst_libaccounts.pro"
(("QMAKE_RPATHDIR = \\$\\$\\{QMAKE_LIBDIR\\}")
(string-append "QMAKE_RPATHDIR ="
#$output "/lib")))
(invoke "qmake"
(string-append "PREFIX=" #$output)
(string-append "LIBDIR=" #$output "/lib")))))))
;; * SignOnQt5 (required version >= 8.55), D-Bus service which performs
;; user authentication on behalf of its clients,
;; <https://gitlab.com/accounts-sso/signond>
(native-inputs (list doxygen pkg-config qtbase qttools))
(inputs (list glib signond-qt6 libaccounts-glib))
(home-page "https://accounts-sso.gitlab.io/")
(synopsis "Qt6 bindings for libaccounts-glib")
(description
"Accounts SSO is a framework for application developers who
wish to acquire, use and store web account details and credentials. It
handles the authentication process of an account and securely stores the
credentials and service-specific settings.")
(license license:lgpl2.1+)))
(define-public libsignon-glib
(package

View file

@ -647,14 +647,14 @@ commands would.")
(define-public i3-wm
(package
(name "i3-wm")
(version "4.22")
(version "4.25")
(source (origin
(method url-fetch)
(uri (string-append "https://i3wm.org/downloads/i3-"
version ".tar.xz"))
(sha256
(base32
"0jrya4rhh46sivlmqaqc4n9abpp1yn1ajhi616gn75cxwl8rjqr8"))))
"0hiffrsvgi2fwibp8l7icxwsj1q5lg2h5lb44wj5cksan7wxxsvy"))))
(build-system meson-build-system)
(arguments
(list

View file

@ -6520,7 +6520,7 @@ basic eye-candy effects.")
(define-public xpra
(package
(name "xpra")
(version "6.3.6")
(version "6.4.1")
(source
(origin
(method git-fetch)
@ -6529,9 +6529,9 @@ basic eye-candy effects.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0lrhj1xipgx839bvjwp2mbxf72c1c5g3y66vcaqs0zzk50zvyxwi"))
(patches (search-patches "xpra-6.0-systemd-run.patch"
"xpra-6.1-install_libs.patch"))))
(base32 "0y6b70g16bh1pbjzmwsrrdjgnm0vgw8ff934n1y69vfb93sdfbc0"))
(patches (search-patches "xpra-6.4-systemd-run.patch"
"xpra-6.4-install_libs.patch"))))
(build-system pyproject-build-system)
(inputs
(list bash-minimal ; for wrap-program
@ -6617,7 +6617,7 @@ basic eye-candy effects.")
"EndSection\n\n"))
(substitute* '("xpra/scripts/config.py"
"fs/etc/xpra/conf.d/60_server.conf.in"
"tests/unittests/unit/server/mixins/notification_test.py")
"tests/unittests/unit/server/subsystem/notification_test.py")
;; The trailing -- is intentional, so we only replace it inside
;; a command line.
(("dbus-launch --")

View file

@ -198,6 +198,7 @@ gnu/packages/haskell-web.scm
gnu/packages/haskell-xyz.scm
gnu/packages/haskell.scm
gnu/packages/haxe.scm
gnu/packages/hdl.scm
gnu/packages/heads.scm
gnu/packages/hexedit.scm
gnu/packages/high-availability.scm