summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xetc/committer.scm.in15
-rw-r--r--gnu/installer/services.scm8
-rw-r--r--gnu/packages/admin.scm4
-rw-r--r--gnu/packages/engineering.scm20
-rw-r--r--gnu/packages/firmware.scm1
-rw-r--r--gnu/packages/games.scm4
-rw-r--r--gnu/packages/kde-graphics.scm3
-rw-r--r--gnu/packages/pdf.scm5
-rw-r--r--gnu/packages/prolog.scm4
-rw-r--r--gnu/packages/scribus.scm6
-rw-r--r--gnu/packages/xdisorg.scm6
-rw-r--r--gnu/system/install.scm1
12 files changed, 48 insertions, 29 deletions
diff --git a/etc/committer.scm.in b/etc/committer.scm.in
index 7bc07f3c88..5a6532fd72 100755
--- a/etc/committer.scm.in
+++ b/etc/committer.scm.in
@@ -283,15 +283,20 @@ corresponding to the top-level definition containing the staged changes."
(define variable-name
(second old))
(define version
- (and=> ((xpath:node-or
+ (match ((xpath:node-or
(xpath:sxpath '(*any* *any* package version *any*))
;; For let binding
(xpath:sxpath '(*any* *any* (*any*) package version *any*)))
(cons '*TOP* new))
- first))
- (format port
- "gnu: ~a: Update to ~a.~%~%* ~a (~a): Update to ~a.~%"
- variable-name version file-name variable-name version)
+ (() #f)
+ ((version . rest) version)))
+ (if version
+ (format port
+ "gnu: ~a: Update to ~a.~%~%* ~a (~a): Update to ~a.~%"
+ variable-name version file-name variable-name version)
+ (format port
+ "gnu: ~a: Update.~%~%* ~a (~a): Update.~%"
+ variable-name file-name variable-name))
(for-each (lambda (field)
(let ((old-values (get-values old field))
(new-values (get-values new field)))
diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm
index b208a20138..3e47caf4c2 100644
--- a/gnu/installer/services.scm
+++ b/gnu/installer/services.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2023 Denys Nykula <vegan@libre.net.ua>
+;;; Copyright © 2025 Florian Pelz <pelzflorian@pelzflorian.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -194,8 +195,11 @@
(if (target-hurd?)
'%base-services/hurd
'%base-services)))
- (native-console-font (match (getenv "LANGUAGE")
- ((or "be" "bg" "el" "eo" "kk" "ky"
+ (native-console-font (match (false-if-exception
+ (string-take (getenv "LANGUAGE") 2))
+ ((or "el" ;easier with more complete Greek font
+ ;; These need Cyrillic:
+ "be" "bg" "kk" "ky"
"mk" "mn" "ru" "sr" "tg" "uk")
"LatGrkCyr-8x16")
(_ #f)))
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index e48e4102cb..8cee618c53 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -583,14 +583,14 @@ interface and is based on GNU Guile.")
(define-public shepherd-1.0
(package
(inherit shepherd-0.10)
- (version "1.0.7")
+ (version "1.0.8")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/shepherd/shepherd-"
version ".tar.gz"))
(sha256
(base32
- "15vmfbnah4p978zs4j95fl7m3sy98z1brgyz2m8s30zfh5srnnij"))))
+ "1xbzf7vmanb36hfb0kc9a240x7xnkynsfs6hcz2kj0xzf19h1srv"))))
(arguments
(substitute-keyword-arguments (package-arguments shepherd-0.10)
((#:configure-flags flags #~'())
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 719a861f84..c639655196 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1166,24 +1166,32 @@ Emacs).")
`("PATH" ":" prefix
(,(string-append python "/bin:"))))))))))
(native-search-paths
+ ;; Currently, KiCad environment variables are single-valued
+ ;; (see https://gitlab.com/kicad/code/kicad/-/issues/14792).
(list (search-path-specification
(variable "KICAD") ;to find kicad-doc
- (files '("")))
+ (files '(""))
+ (separator #f))
(search-path-specification
(variable "KICAD9_TEMPLATE_DIR")
- (files '("share/kicad/template")))
+ (files '("share/kicad/template"))
+ (separator #f))
(search-path-specification
(variable "KICAD9_SYMBOL_DIR")
- (files '("share/kicad/symbols")))
+ (files '("share/kicad/symbols"))
+ (separator #f))
(search-path-specification
(variable "KICAD9_FOOTPRINT_DIR")
- (files '("share/kicad/footprints")))
+ (files '("share/kicad/footprints"))
+ (separator #f))
(search-path-specification
(variable "KICAD9_3DMODEL_DIR")
- (files '("share/kicad/3dmodels")))
+ (files '("share/kicad/3dmodels"))
+ (separator #f))
(search-path-specification
(variable "KICAD_STOCK_DATA_HOME")
- (files '("share/kicad")))))
+ (files '("share/kicad"))
+ (separator #f))))
(native-inputs (list boost
desktop-file-utils
gettext-minimal
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 0b37502321..950d91930d 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -1634,6 +1634,7 @@ corresponding layout." layout))
gnu-make
grep
python
+ python-appdirs
python-dotty-dict
python-hid
python-hjson
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 72b26faedd..abd281504c 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -11736,7 +11736,7 @@ Xjump game, using SDL instead of Xlib.")
(define-public xmoto
(package
(name "xmoto")
- (version "0.6.2")
+ (version "0.6.3")
(source
(origin
(method git-fetch)
@@ -11745,7 +11745,7 @@ Xjump game, using SDL instead of Xlib.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "14z3yqpiyv4y5l37b12kf8ipgsmb9krb4b5d9adlrry0j43hd7wz"))
+ (base32 "08yi6sgz349s7wa07dyrlbhpkmi25arz0c849qgpsj65vr8n7n8c"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-1)))
diff --git a/gnu/packages/kde-graphics.scm b/gnu/packages/kde-graphics.scm
index b2edf3947f..bad92269e6 100644
--- a/gnu/packages/kde-graphics.scm
+++ b/gnu/packages/kde-graphics.scm
@@ -557,8 +557,7 @@ painting, image manipulating and icon editing.")
gettext-minimal
kitemmodels
pkg-config
- qwt
- vc))
+ qwt))
(inputs
(list bash-minimal
boost
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index dba033cf82..cefe21fcc8 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -1151,7 +1151,7 @@ using a stylus.")
(define-public xournalpp
(package
(name "xournalpp")
- (version "1.2.6")
+ (version "1.2.8")
(source
(origin
(method git-fetch)
@@ -1160,7 +1160,7 @@ using a stylus.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1wsks4wwv4d6y2drd64c0p8986l5sv09pnlvpd7hl4asszxmybjm"))))
+ (base32 "134qmx6nvxfpfbx3sb6ss0vc5jcxlhysk699aaklpid03p8ps0y9"))))
(build-system cmake-build-system)
(arguments
(list
@@ -1201,6 +1201,7 @@ using a stylus.")
(list adwaita-icon-theme
alsa-lib
gtk+
+ gtksourceview-4
(librsvg-for-system)
libsndfile
libxml2
diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm
index e7c729b393..cc81f7400d 100644
--- a/gnu/packages/prolog.scm
+++ b/gnu/packages/prolog.scm
@@ -189,7 +189,7 @@ it.")
(define-public trealla
(package
(name "trealla")
- (version "2.83.20")
+ (version "2.83.21")
(source
(origin
(method git-fetch)
@@ -198,7 +198,7 @@ it.")
(url "https://github.com/trealla-prolog/trealla")
(commit (string-append "v" version))))
(sha256
- (base32 "0jz66ic4pm979cslnwfxrl26c1qwdlpi81d7sv5asiq2lflc8pxw"))
+ (base32 "18qa91g395kqi7a7rrhrfbrx2w5yil3rg8k3fmfng47i8i7522hm"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(native-inputs
diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm
index 2ae5c01c91..ca08a18853 100644
--- a/gnu/packages/scribus.scm
+++ b/gnu/packages/scribus.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2018, 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2017, 2018, 2021, 2022, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2017, 2018, 2021, 2022, 2024, 2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -50,14 +50,14 @@
(define-public scribus
(package
(name "scribus")
- (version "1.6.3")
+ (version "1.6.4")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/scribus/scribus/"
version "/scribus-" version ".tar.gz"))
(sha256
- (base32 "1dfj0jg5p25rq9i9bkcmnx96sasdf5w06m009lkkv0d41c3c62hh"))))
+ (base32 "1ddsga862wwq2lb12rlsm6009gfx9nxx3s5323jifs53fs1y3knp"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;no test target
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index f810ee394e..a967992d67 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -44,7 +44,7 @@
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2020-2021, 2023-2025 Zheng Junjie <z572@z572.online>
;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop>
-;;; Copyright © 2021, 2022, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2021, 2022, 2024, 2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021 Renzo Poddighe <renzo@poddighe.nl>
;;; Copyright © 2021 Paul A. Patience <paul@apatience.com>
@@ -1524,14 +1524,14 @@ transparent text on your screen.")
(define-public wob
(package
(name "wob")
- (version "0.15.1")
+ (version "0.16")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/francma/wob/releases/download/"
version "/wob-" version ".tar.gz"))
(sha256
- (base32 "1632y0yr1ig5nihs6kqyvfi117815zszhnfvaabm97qkf5blkj5p"))))
+ (base32 "18p5l045kajnwv8ms751sb29q8ay6ycv9ni7iyx7nr26n5cm3vql"))))
(build-system meson-build-system)
(native-inputs
(list pkg-config scdoc))
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index ea2e624b1a..5041dadf15 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -102,6 +102,7 @@
("en" . "System Installation")
("es" . "Instalación del sistema")
("fr" . "Installation du système")
+ ("it" . "Installazione del Sistema")
("pt_BR" . "Instalação do sistema")
("ru" . "Установка системы")
("zh_CN" . "系统安装")))
generated by cgit v1.2.3 (git 2.50.1) at 2025-10-22 12:32:19 +0000