diff options
Diffstat (limited to 'gnu/packages')
142 files changed, 11535 insertions, 7030 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4dba607bd6..113b8e2481 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -67,6 +67,7 @@ ;;; Copyright © 2024 dan <i@dan.games> ;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com> ;;; Copyright © 2024 Richard Sent <richard@freakingpenguin.com> +;;; Copyright © 2024 Vinicius Monego <monego@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -384,11 +385,9 @@ interface and is based on GNU Guile.") "/lib/guile/3.0/site-ccache")))))) #~%standard-phases))) - ;; Note: Use 'guile-3.0-latest' to address the continuation-related memory - ;; leak reported at <https://issues.guix.gnu.org/58631>. - (native-inputs (list pkg-config guile-3.0-latest + (native-inputs (list pkg-config guile-3.0 guile-fibers-1.1)) ;for cross-compilation - (inputs (list guile-3.0-latest guile-fibers-1.1)))) + (inputs (list guile-3.0 guile-fibers-1.1)))) (define-public shepherd-0.10 (package @@ -2715,7 +2714,7 @@ environment variable is set and output is to tty.") (define-public lr (package (name "lr") - (version "1.5.1") + (version "1.6") (source (origin (method git-fetch) @@ -2724,10 +2723,10 @@ environment variable is set and output is to tty.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1wv2acm4r5y5gg6f64v2hiwpg1f3lnr4fy1a9zssw77fmdc7ys3j")))) + (base32 "0qixmvxikyz02348xc0a718m9b1pzcazvf36rjbdk6ayn66g9hsd")))) (build-system gnu-build-system) (arguments - `(#:tests? #f + `(#:tests? #f ; There are no tests. #:make-flags (list (string-append "CC=" ,(cc-for-target)) (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases @@ -2862,13 +2861,13 @@ specified directories.") (define-public ansible-core (package (name "ansible-core") - (version "2.15.5") + (version "2.17.1") (source (origin (method url-fetch) - (uri (pypi-uri "ansible-core" version)) + (uri (pypi-uri "ansible_core" version)) (sha256 - (base32 "00hnwjk4dxgxbz4xlza2wqx20yks5xr7074hzlzsyja3ip5kkicc")))) + (base32 "007ginimzbizx2c3fp3vccizscyki0fp4yg3bzl3qz6ipdqrsi26")))) (build-system python-build-system) (arguments `(#:modules ((guix build python-build-system) @@ -3000,13 +2999,13 @@ provides the following commands: (define-public ansible (package (name "ansible") - (version "8.5.0") + (version "10.1.0") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 - (base32 "0bazj5h12wraf30bb2schzwk553y20n9vh45km4b5kgmvadm0z1j")))) + (base32 "0apj783acx4jzkf3bnibn4y5jc6jd8ly7l0rdqq8f1jpgxal933x")))) (build-system python-build-system) (propagated-inputs (list ansible-core)) ;; The Ansible collections are found by ansible-core via the Python search @@ -6146,7 +6145,6 @@ file or files to several hosts.") (arguments (list #:import-path "github.com/digitalocean/doctl/cmd/doctl" #:unpack-path "github.com/digitalocean/doctl" - #:go go-1.19 #:build-flags #~(list (string-append "-ldflags=-X github.com/digitalocean/doctl.Label=release" " -X github.com/digitalocean/doctl.Major=" diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index ad1e70c62c..0a928cd631 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -922,7 +922,7 @@ algorithms from the FORTRAN library MINPACK.") (define-public symengine (package (name "symengine") - (version "0.11.2") + (version "0.12.0") (source (origin (method git-fetch) @@ -931,7 +931,7 @@ algorithms from the FORTRAN library MINPACK.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0j6vd72hjj9fnsw5iiykmkrw8vyjcyyycgib2zxlmlzi6sj4618b")))) + (base32 "0vi9d0isfpdhraigpw5zffcqh5fy08anax7kji7csm3n6jx9zy29")))) (build-system cmake-build-system) (arguments '(#:configure-flags diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 2ce0d66894..01ef7304d9 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1608,7 +1608,7 @@ deconvolution). Such post-processing is not performed by Stackistry.") openssl qtbase-5 qtcharts - qtlocation + qtlocation-5 qtmultimedia-5 qtpositioning qtscript diff --git a/gnu/packages/aux-files/emacs/comp-integrity-next.el b/gnu/packages/aux-files/emacs/comp-integrity-next.el new file mode 100644 index 0000000000..74ee0952f4 --- /dev/null +++ b/gnu/packages/aux-files/emacs/comp-integrity-next.el @@ -0,0 +1,121 @@ +(require 'ert) + +(eval-when-compile + (defmacro expect-feature (&optional feature) + `(progn + (eval-when-compile + (or (not ',feature) + (require ',feature))))) + + (defmacro expect-native (fun &optional feature) + `(progn + (expect-feature ,feature) + (should (native-comp-function-p (symbol-function ',fun))))) + + + (defmacro expect-native-if-bound (fun &optional feature) + `(and (expect-feature ,feature) + (boundp ',fun) + (should (native-comp-function-p (symbol-function ',fun))))) + + (defmacro expect-builtin (fun &optional feature) + `(should (primitive-function-p (symbol-function ',fun))))) + +(expect-native abbrev-mode) +(expect-native backquote-process) +(expect-native mode-line-widen) +(expect-native buffer-menu) +(expect-native button-mode) +(expect-native byte-run-strip-symbol-positions) +(expect-native case-table-get-table) +(expect-native cconv-convert) +(expect-native use-default-char-width-table) +(expect-native cl-generic-p) +(expect-native cl-struct-define) +(expect-native-if-bound x-setup-function-keys) +(expect-native encode-composition-rule) +(expect-native custom-declare-face) +(expect-native minibuffer-prompt-properties--setter) +(expect-native custom-add-choice) +(expect-native debug-early) +(expect-native display-table-slot disp-table) +(expect-native dnd-open-file) +(expect-native dos-mode25 dos-fns) +(expect-native find-file-text dos-w32) +(expect-native-if-bound dynamic-setting-handle-config-changed-event) +(expect-native easy-menu-item-present-p) +(expect-native eldoc-mode) +(expect-native electric-indent-mode) +(expect-native elisp-mode-syntax-propertize) +(expect-native getenv) +(expect-native epa-file-find-file-hook) +(expect-native face-list) +(expect-native find-file-noselect) +(expect-native fill-region) +(expect-native font-lock-change-mode) +(expect-native font-lock-add-keywords) +(expect-native-if-bound fontset-plain-name) +(expect-native format-read) +(expect-native frame-edges) +(expect-native-if-bound fringe-mode) +(expect-native help-quick) +(expect-native-if-bound image-type) +(expect-native indent-region) +(expect-native indian-compose-regexp) +(expect-native msdos-setup-keyboard term/internal) +(expect-native isearch-abort) +(expect-native iso-transl-set-language) +(expect-native jit-lock-mode) +(expect-native jka-compr-build-file-regexp) +(expect-native keymap-global-set) +(expect-native forward-sexp) +(expect-native lisp-string-in-doc-position-p) +(expect-native ls-lisp-set-options ls-lisp) +(expect-native macroexp-compiling-p) +(expect-native map-y-or-n-p) +(expect-native menu-find-file-existing) +(expect-native completion-boundaries) +(expect-native egyptian-shape-grouping) +(expect-native mouse-double-click-time) +(expect-native convert-define-charset-argument) +(expect-native coding-system-change-eol-conversion) +(expect-native store-substring mule-util) +(expect-native-if-bound mouse-wheel-change-button) +(expect-native advice-function-mapc) +(expect-native comment-string-strip) +(expect-builtin obarray-make) +(expect-native obarray-map) +(expect-native oclosure-type) +(expect-native forward-page) +(expect-native sentence-end) +(expect-native show-paren-function) +(expect-native pgtk-dnd-init-frame pgtk-dnd) +(expect-native prog-context-menu) +(expect-native-if-bound regexp-opt) +(expect-native get-register) +(expect-native query-replace-descr) +(expect-native rfn-eshadow-setup-minibuffer) +(expect-native read-multiple-choice) +(expect-native-if-bound scroll-bar-scale) +(expect-native gui-select-text) +(expect-native seq-first) +(expect-native hack-read-symbol-shorthands) +(expect-native next-error-find-buffer) +(expect-native exit-splash-screen) +(expect-native buffer-local-boundp) +(expect-native syntax-propertize-multiline) +(expect-native tab-bar-mode) +(expect-native tabulated-list-put-tag) +(expect-native text-mode) +(expect-native timer-activate) +(expect-native tool-bar-mode) +(expect-native tooltip-mode) +(expect-native tty-color-desc) +(expect-native ucs-normalize-hfs-nfd-comp-p ucs-normalize) +(expect-native uniquify-item-p) +(expect-native vc-mode) +(expect-native emacs-version) +(expect-native define-widget) +(expect-native window-right) +(expect-native x-dnd-init-frame x-dnd) +(expect-native-if-bound x-handle-no-bitmap-icon) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 637a873fbf..19c261ea82 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -952,7 +952,11 @@ is like a time machine for your data.") (search-patches "restic-0.9.6-fix-tests-for-go1.15.patch")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/restic/restic" + `(;; XXX: Tests failed on a newer version of Golang, newer version of + ;; restic does not provide vendor folder any longer which means - a + ;; long way of packaging missing inputs. + #:go ,go-1.17 + #:import-path "github.com/restic/restic" ;; We don't need to install the source code for end-user applications. #:install-source? #f #:phases diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1a50b78dd8..cc9969d96a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1932,18 +1932,18 @@ https://www.ncbi.nlm.nih.gov/geo/query/acc.cgi?acc=GSE110554.") (define-public r-genelendatabase (package (name "r-genelendatabase") - (version "1.39.0") + (version "1.40.1") (source (origin (method url-fetch) (uri (bioconductor-uri "geneLenDataBase" version 'experiment)) (sha256 - (base32 "0rdd5nq34xd85r4i4b84ibih31mq99ljvgkm7zdv4gfggrdvi6gb")))) + (base32 "0c8f0sqgrg7rc2vs9id9xzbwwv3zhy6ylqiisji20rw9ipzgv7k8")))) (properties `((upstream-name . "geneLenDataBase"))) (build-system r-build-system) (propagated-inputs - (list r-genomicfeatures r-rtracklayer)) + (list r-genomicfeatures r-rtracklayer r-txdbmaker)) (home-page "https://bioconductor.org/packages/geneLenDataBase/") (synopsis "Lengths of mRNA transcripts for a number of genomes") (description @@ -3212,13 +3212,13 @@ datasets.") (define-public r-alabaster-base (package (name "r-alabaster-base") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (bioconductor-uri "alabaster.base" version)) (sha256 - (base32 "1id8cs3m1kpcfmk9aa957vy7svf7aam4kzyzic36rxcqmarr130h")))) + (base32 "1yf4j6dwva1d16fb8ss5hrpmj71azwjk9aqpad9wpnfapaldjzhb")))) (properties `((upstream-name . "alabaster.base"))) (build-system r-build-system) (inputs (list zlib)) @@ -3243,13 +3243,13 @@ applications can enrich this metadata with context-specific properties.") (define-public r-alabaster-matrix (package (name "r-alabaster-matrix") - (version "1.4.0") + (version "1.4.2") (source (origin (method url-fetch) (uri (bioconductor-uri "alabaster.matrix" version)) (sha256 - (base32 "00k0lylyhz6glqhd463bbmmldqhv5i7an9nw95md7x2m43c9gzyk")))) + (base32 "1b32qs2baq9s492a332vh1hpyxq62z16xj2w17m8wh8a4mcabry8")))) (properties `((upstream-name . "alabaster.matrix"))) (build-system r-build-system) (propagated-inputs (list r-alabaster-base @@ -3276,13 +3276,13 @@ can enrich this metadata with context-specific properties.") (define-public r-alabaster-ranges (package (name "r-alabaster-ranges") - (version "1.4.0") + (version "1.4.2") (source (origin (method url-fetch) (uri (bioconductor-uri "alabaster.ranges" version)) (sha256 - (base32 "0kjafvd4pc3bxnpjz0nvs07sdy65ad0hyzwq0nv7cifbzw9qajay")))) + (base32 "16r5wdlw2g9qnbvzpx5c5c04xa5dkwrmqlyc81iixkx6j98gsz2w")))) (properties `((upstream-name . "alabaster.ranges"))) (build-system r-build-system) (propagated-inputs (list r-alabaster-base @@ -3353,13 +3353,13 @@ handled by @code{alabaster.base}.") (define-public r-alabaster-se (package (name "r-alabaster-se") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (bioconductor-uri "alabaster.se" version)) (sha256 - (base32 "15jggzbkl2v1jlng3bsqyf8sfvihn9amsbfgdygv04zh0kbx4i46")))) + (base32 "134r4pwaa4nsmdgqxs16w3adn482zl70lgyd4s96pmx7hqm9i1vx")))) (properties `((upstream-name . "alabaster.se"))) (build-system r-build-system) (propagated-inputs (list r-alabaster-base @@ -4312,13 +4312,13 @@ model as latent variables.") (define-public r-asics (package (name "r-asics") - (version "2.20.0") + (version "2.20.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ASICS" version)) (sha256 (base32 - "1lqw7xmbihx9k9nm43pix0gha4j58brm0wzqf6jmag7zrgc9i6q4")))) + "0halznbl3bflnn38rh9h5a5f0dsc88n6x6kwdffbpnin9i192q1k")))) (properties `((upstream-name . "ASICS"))) (build-system r-build-system) (propagated-inputs @@ -5591,13 +5591,13 @@ make mapping WGBS data to their probe IDs easier.") (define-public r-decoupler (package (name "r-decoupler") - (version "2.9.7") + (version "2.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "decoupleR" version)) (sha256 - (base32 "0zi6shh1dn8kli66dyywwgy1s809yms0jrl6lkwvzn88rms7yaqb")))) + (base32 "060ww5hlzk0dvh7a52i1nrz1s2xq5mmlw70rxpcs6d4j08k1cmic")))) (properties `((upstream-name . "decoupleR"))) (build-system r-build-system) (propagated-inputs @@ -5743,13 +5743,13 @@ fold changes mean and variability for each selected gene.") (define-public r-delayedarray (package (name "r-delayedarray") - (version "0.30.0") + (version "0.30.1") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedArray" version)) (sha256 (base32 - "1hjkh8xsqlfwhwxs3snpx9in58plv67aj9gsw1x8842kxfric7m7")))) + "0n6pparz2fg8wgrgcwciibqz3iyrnlmk5hdvnzjppcraxanz8sm6")))) (properties `((upstream-name . "DelayedArray"))) (build-system r-build-system) @@ -5884,13 +5884,13 @@ calculation in parallel.") (define-public r-dmrcate (package (name "r-dmrcate") - (version "3.0.0") + (version "3.0.3") (source (origin (method url-fetch) (uri (bioconductor-uri "DMRcate" version)) (sha256 (base32 - "1s83p6chchsx68qsfzqclpl3wq6fqy2r3namr8l3rrxp9b49342i")))) + "0xgsbsr3g04yiyjlc161424wcvlbik208sz0rzqssw4fj255i88q")))) (properties `((upstream-name . "DMRcate"))) (build-system r-build-system) (propagated-inputs @@ -6005,13 +6005,13 @@ pseudo-cells, and downsampling of the count matrix.") (define-public r-dsb (package (name "r-dsb") - (version "1.0.3") + (version "1.0.4") (source (origin (method url-fetch) (uri (cran-uri "dsb" version)) (sha256 - (base32 "1xzhd4q04c1vql49r6m4zskpx7f5hkl5hmdgr3gsbxb73xfs51v2")))) + (base32 "16y0l3nmg88ihsr03f5n151jirypf7pxy6q0cgx2vpmdnqynlh61")))) (properties `((upstream-name . "dsb"))) (build-system r-build-system) (propagated-inputs (list r-limma r-magrittr r-mclust)) @@ -7002,13 +7002,13 @@ on Bioconductor or which replace R functions.") (define-public r-biomart (package (name "r-biomart") - (version "2.60.0") + (version "2.60.1") (source (origin (method url-fetch) (uri (bioconductor-uri "biomaRt" version)) (sha256 (base32 - "0vsjldksykgs6z7afn8kbqzl489irvvzrzq75kqkhavyhxnavqkq")))) + "0mzdxpagxwiwyznhd7h93cgy01a2j85rgb5dpnkzgp4sxw01n7rb")))) (properties `((upstream-name . "biomaRt"))) (build-system r-build-system) @@ -7137,13 +7137,13 @@ objects.") (define-public r-biostrings (package (name "r-biostrings") - (version "2.72.0") + (version "2.72.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Biostrings" version)) (sha256 (base32 - "06vh7xa6lsw7y3b3z9s5266s00balr4si3l68hh15dwcsg3md6mh")))) + "067vy2v7spbdsknvi0fcpdi085kn8v20pyrhkc7wy357v21h7hgs")))) (properties `((upstream-name . "Biostrings"))) (build-system r-build-system) @@ -7271,13 +7271,13 @@ analysis.") (define-public r-champ (package (name "r-champ") - (version "2.32.0") + (version "2.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ChAMP" version)) (sha256 (base32 - "1gdcdx34bxffd6ch354qx7yjngx3lj9chv5frwjyk56jq12vjjk7")))) + "06q539yhbmbp7qr71cwjai2vdw5nnhhjdv2ajlqmlyjpg04arc7v")))) (properties `((upstream-name . "ChAMP"))) (build-system r-build-system) (propagated-inputs @@ -7855,13 +7855,13 @@ parameter configurations.") (define-public r-enmix (package (name "r-enmix") - (version "1.40.0") + (version "1.40.2") (source (origin (method url-fetch) (uri (bioconductor-uri "ENmix" version)) (sha256 (base32 - "0cafz7bw5xha0lb3g8hfnbyj17ccb12falacxzlv4zy36mr3wxl7")))) + "1x8rzdzymibypb65axx3sgxsgrj5d1fldj9j70acvg46lqhmq8f2")))) (properties `((upstream-name . "ENmix"))) (build-system r-build-system) (propagated-inputs @@ -8119,13 +8119,13 @@ genomic intervals. In addition, it can use BAM or BigWig files as input.") (define-public r-genomeinfodb (package (name "r-genomeinfodb") - (version "1.40.0") + (version "1.40.1") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomeInfoDb" version)) (sha256 (base32 - "12w3mgrv2rrlarpxws7m647akpscrqmzdsxnzl8hdicrh7wiydcx")))) + "155wj17pbdbixyg6mimv06wg3ylll8ysqh7rffjp65fw662jwhw0")))) (properties `((upstream-name . "GenomeInfoDb"))) (build-system r-build-system) @@ -8285,13 +8285,13 @@ provide added flexibility for data combination and manipulation.") (define-public r-genomicranges (package (name "r-genomicranges") - (version "1.56.0") + (version "1.56.1") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicRanges" version)) (sha256 (base32 - "18z890h4mwgizwqpz0hglgd0gmvv269cccb6i4rl3x93b519i0wx")))) + "0g0ld9i58pdxw2pwxi9nzj82mkryag457pvh6cvbvhb28pfamkma")))) (properties `((upstream-name . "GenomicRanges"))) (build-system r-build-system) @@ -8453,13 +8453,13 @@ Enrichment Analysis} (GSEA).") (define-public r-gsva (package (name "r-gsva") - (version "1.52.0") + (version "1.52.3") (source (origin (method url-fetch) (uri (bioconductor-uri "GSVA" version)) (sha256 (base32 - "10qv2m3gq5vzrqhcw1p4sx8szwl7a0kxf5n8xxhpplkxxq0yd3cn")))) + "08nxg3q350n5gf975r6b0zq4cr7lchv2i811crc4xbb7q39kw8k4")))) (properties `((upstream-name . "GSVA"))) (build-system r-build-system) (propagated-inputs (list r-biobase @@ -8494,16 +8494,16 @@ manner.") (define-public r-gypsum (package (name "r-gypsum") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (bioconductor-uri "gypsum" version)) (sha256 - (base32 "0y5qpl19zpf5w3a1jhr4wgklp73izs3jrgbfi0axz1vgzkdsjss4")))) + (base32 "1zrmxmlnbiifc2p5mn10y3vpmyzqjimd2hvc3s9c0j0iv6ryxjv0")))) (properties `((upstream-name . "gypsum"))) (build-system r-build-system) - (propagated-inputs (list r-filelock r-httr2 r-jsonlite r-paws-storage)) + (propagated-inputs (list r-filelock r-httr2 r-jsonlite)) (native-inputs (list r-knitr)) (home-page "https://github.com/ArtifactDB/gypsum-R") (synopsis "Interface to the gypsum REST API") @@ -8946,14 +8946,14 @@ Shiny-based display methods for Bioconductor objects.") (define-public r-keggrest (package (name "r-keggrest") - (version "1.44.0") + (version "1.44.1") (source (origin (method url-fetch) (uri (bioconductor-uri "KEGGREST" version)) (sha256 (base32 - "1xvi11ywr3vj2m8fpqblzg2pmj1vsc0dm8fgggv6w96l6x6sfyf0")))) + "09qdsdbz5ha3b2fafwv80n6pdajjgsc5w52n1dy6ds41vxgf0jis")))) (properties `((upstream-name . "KEGGREST"))) (build-system r-build-system) (propagated-inputs @@ -9022,13 +9022,13 @@ Binomial data via estimation of latent structure in the natural parameter.") (define-public r-limma (package (name "r-limma") - (version "3.60.0") + (version "3.60.3") (source (origin (method url-fetch) (uri (bioconductor-uri "limma" version)) (sha256 (base32 - "1aizqwnyk53jsbk7g9jpcyj5004yxwslrxglhamj1c55gdcr7akg")))) + "0fy3lmjrhy7301v9far5n6c3m4n3nad463rgy2fka3bk4jls6ipg")))) (build-system r-build-system) (native-inputs (list r-knitr)) (propagated-inputs (list r-statmod)) @@ -9428,13 +9428,13 @@ time-series data (including a graphical user interface).") (define-public r-mmuphin (package (name "r-mmuphin") - (version "1.18.0") + (version "1.18.1") (source (origin (method url-fetch) (uri (bioconductor-uri "MMUPHin" version)) (sha256 - (base32 "0wvsngvxik4j1bz4w32482ffczh6qj3kzghqhh8l02cbd2908z55")) + (base32 "0wh998bjbf8zkfrzmrnm8dmm7960w5dnaq1yyc1hl105al0j33aj")) ;; Delete generated files. (snippet '(for-each delete-file @@ -11363,13 +11363,13 @@ reference point and sorted by a user defined feature.") (define-public r-sesame (package (name "r-sesame") - (version "1.22.0") + (version "1.22.2") (source (origin (method url-fetch) (uri (bioconductor-uri "sesame" version)) (sha256 (base32 - "0qz4vhz1iczz4n4wigzqkmkbsvq5ql04x1gawxv4f8ii61npp0h4")))) + "1d2vjglpbhmr4fjp3zwipf0nwj5pms4l9q1xngyxrsbr26x7jp1d")))) (properties `((upstream-name . "sesame"))) (build-system r-build-system) (propagated-inputs (list r-biocfilecache @@ -11378,7 +11378,6 @@ reference point and sorted by a user defined feature.") r-genomeinfodb r-genomicranges r-ggplot2 - r-illuminaio r-iranges r-mass r-preprocesscore @@ -12005,13 +12004,13 @@ tools either included in speaq or available elsewhere on CRAN.") (define-public r-spectra (package (name "r-spectra") - (version "1.14.0") + (version "1.14.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Spectra" version)) (sha256 (base32 - "1ibbc3gkzh49cj45j2qdhsjhyrjj4ly3wckksiagc73wfag5hd2s")))) + "0mvfndd7n7varrzmv9cd3ygwbdn97x5qcgmzcxc6hr76lnkwp8al")))) (properties `((upstream-name . "Spectra"))) (build-system r-build-system) (propagated-inputs (list r-biocgenerics @@ -12060,13 +12059,13 @@ Biology at (define-public r-stringdb (package (name "r-stringdb") - (version "2.16.0") + (version "2.16.4") (source (origin (method url-fetch) (uri (bioconductor-uri "STRINGdb" version)) (sha256 - (base32 "1bn21hqvcl1a4knj7iygwqx79s49ggjaw30fj6478h7khha6556b")))) + (base32 "02fim09w9s38hvgp1g3fxqabd5r2fjysljlfrya2nr17drqkzqyx")))) (properties `((upstream-name . "STRINGdb"))) (build-system r-build-system) (propagated-inputs @@ -12334,13 +12333,13 @@ dependencies between GO terms can be implemented and applied.") (define-public r-txdbmaker (package (name "r-txdbmaker") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (bioconductor-uri "txdbmaker" version)) (sha256 - (base32 "099x6v4crp953jcgqipj0001kxg7gv5h0r4mmvh1cg7j69w0zd5m")))) + (base32 "1nl7lr0x0kicd44gvwrdslcnnlmqaf57rgp1gb22yvz3lfzjziqi")))) (properties `((upstream-name . "txdbmaker"))) (build-system r-build-system) (propagated-inputs (list r-annotationdbi @@ -12659,13 +12658,13 @@ libraries for systems that do not have these available via other means.") (define-public r-zellkonverter (package (name "r-zellkonverter") - (version "1.14.0") + (version "1.14.1") (source (origin (method url-fetch) (uri (bioconductor-uri "zellkonverter" version)) (sha256 - (base32 "13qkj9adv5is4fas667kxzc2zgni3ayl5hbimakq8y4mw6qj04dn")))) + (base32 "1fyy3v1papg46cclk5fg8iqmg0671ccr82alvv41hk5d85ck04aq")))) (properties `((upstream-name . "zellkonverter"))) (build-system r-build-system) (propagated-inputs @@ -12753,14 +12752,14 @@ packages.") (define-public r-oligo (package (name "r-oligo") - (version "1.68.0") + (version "1.68.2") (source (origin (method url-fetch) (uri (bioconductor-uri "oligo" version)) (sha256 (base32 - "0mv031fsy1g3k0brxx8z7d1ryg0z2nxihrs22n6ln2jk240lkyfx")))) + "0ch6b4rg5v6fj0fgniqiigx1gnnqgwji90bxqngllman388bx867")))) (properties `((upstream-name . "oligo"))) (build-system r-build-system) (inputs (list zlib)) @@ -12789,13 +12788,13 @@ Affymetrix (CEL files) and NimbleGen arrays (XYS files).") (define-public r-qfeatures (package (name "r-qfeatures") - (version "1.14.0") + (version "1.14.1") (source (origin (method url-fetch) (uri (bioconductor-uri "QFeatures" version)) (sha256 (base32 - "0qkbbpgkrlk8k4mj3463pdcimdvpx201gk55wil6v6z56yaifsc5")))) + "1sgvabfad3zibrg449y7hw8l59yb2d8q01x7lp841m45b1g0q9d8")))) (properties `((upstream-name . "QFeatures"))) (build-system r-build-system) (propagated-inputs (list r-annotationfilter @@ -12808,6 +12807,7 @@ Affymetrix (CEL files) and NimbleGen arrays (XYS files).") r-multiassayexperiment r-plotly r-protgenerics + r-reshape2 r-s4vectors r-summarizedexperiment r-tidyr @@ -12933,13 +12933,13 @@ spectrometry} data.") (define-public r-apeglm (package (name "r-apeglm") - (version "1.26.0") + (version "1.26.1") (source (origin (method url-fetch) (uri (bioconductor-uri "apeglm" version)) (sha256 (base32 - "0l84sf4ikx0q031wf0k26n9ikwmgs4nm7v7bky47q3ik29mh7wgs")))) + "039my876v0k2mr50w90w3phj4cq55awf5ks07kr2fnm7w211gxvs")))) (properties `((upstream-name . "apeglm"))) (build-system r-build-system) (propagated-inputs @@ -13812,14 +13812,14 @@ trees and clusters to other programs.") (define-public r-goseq (package (name "r-goseq") - (version "1.54.0") + (version "1.56.0") (source (origin (method url-fetch) (uri (bioconductor-uri "goseq" version)) (sha256 (base32 - "0waw5hhxh8yab8fqw9gnd3l39s6wkmp8690rhs4llarpqz6ssrhk")))) + "0bc7dcpz0agbc42f8agf05amyhpavz55fdp622if5af5dn1ww6pr")))) (build-system r-build-system) (propagated-inputs (list r-annotationdbi @@ -14775,14 +14775,14 @@ interactive exploration of results.") (define-public r-residualmatrix (package (name "r-residualmatrix") - (version "1.14.0") + (version "1.14.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ResidualMatrix" version)) (sha256 (base32 - "1q27zzl570q22nk4xjpnpa674p76hzzvilynx9i6awnzs10zjggn")))) + "1zq75i20kv0lgnh19zbhw5khxrag627ynqjvh3rj5kxbhj1l2z7c")))) (properties `((upstream-name . "ResidualMatrix"))) (build-system r-build-system) @@ -16196,14 +16196,14 @@ to multiple hypothesis correction.") (define-public r-dose (package (name "r-dose") - (version "3.30.0") + (version "3.30.1") (source (origin (method url-fetch) (uri (bioconductor-uri "DOSE" version)) (sha256 (base32 - "0hwbl3kcbjpjpdnqcq3ilk2qz3g87nybgv3kyd8fmh935jm66v6s")))) + "1kyrr1xxcif45ynyq4wsv2247bjily5sgzn17m1g3ypw2hkqcj53")))) (properties `((upstream-name . "DOSE"))) (build-system r-build-system) (propagated-inputs @@ -17664,14 +17664,14 @@ based on @dfn{Continuous Wavelet Transform} (CWT).") (define-public r-xcms (package (name "r-xcms") - (version "4.2.0") + (version "4.2.2") (source (origin (method url-fetch) (uri (bioconductor-uri "xcms" version)) (sha256 (base32 - "1cq0jk9xyk5y5mi39zi4gvrpzx65qngfml76bygkhm2lzgy3nddb")))) + "1zk9l4ll3047fj0rngvjka2hkg2by26n2h3xm1iyvfiw5068y74y")))) (build-system r-build-system) (propagated-inputs (list r-biobase @@ -19037,14 +19037,14 @@ package.") (define-public r-opencyto (package (name "r-opencyto") - (version "2.16.0") + (version "2.16.1") (source (origin (method url-fetch) (uri (bioconductor-uri "openCyto" version)) (sha256 (base32 - "08dn7k3jlicj755rwhpw48fmi9via79vd34imaffwdzq3aldi83m")))) + "13ndjvm3l5pl1jgv7bqp78didqq3rx6br4p1ncqqp68mm048f2ll")))) (properties `((upstream-name . "openCyto"))) (build-system r-build-system) (propagated-inputs @@ -20287,14 +20287,14 @@ using whole genome sequencing data.") (define-public r-activepathways (package (name "r-activepathways") - (version "2.0.3") + (version "2.0.4") (source (origin (method url-fetch) (uri (cran-uri "ActivePathways" version)) (sha256 (base32 - "0mgvxpqaq0jncr1kzmwhqkv3pajx2fz6vwhv5arw7fgla6w09p9h")))) + "07nmlkgznbv46kxy5s13bs7p3z9cxsynh6csbid6qsvqrpzv78pk")))) (properties `((upstream-name . "ActivePathways"))) (build-system r-build-system) @@ -21024,13 +21024,13 @@ different graph related packages produced by Bioconductor.") (define-public r-biocstyle (package (name "r-biocstyle") - (version "2.32.0") + (version "2.32.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocStyle" version)) (sha256 (base32 - "1vm9wj4hzzjivdi6rnxyhxwqscdvbmc45w9zq17h3r53qnva530x")))) + "1m0nn2m548726w576mx8mx29xj428q1rkpn7z7a7m8kzgcvvgkkr")))) (properties `((upstream-name . "BiocStyle"))) (build-system r-build-system) @@ -21165,14 +21165,14 @@ db and resource files to AWS S3 buckets.") (define-public r-multiassayexperiment (package (name "r-multiassayexperiment") - (version "1.30.1") + (version "1.30.2") (source (origin (method url-fetch) (uri (bioconductor-uri "MultiAssayExperiment" version)) (sha256 (base32 - "07sfcc2cd68qmspcm4ypp3cg05d20fbpwiz5ik4lqsa0hw0j2dhw")))) + "1j74ql0lz2xf0jsf4cjfapdmxbf6hb22699d3dyj8gwd1s92myjz")))) (properties `((upstream-name . "MultiAssayExperiment"))) (build-system r-build-system) @@ -21751,13 +21751,13 @@ routines.") (define-public r-s4arrays (package (name "r-s4arrays") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (bioconductor-uri "S4Arrays" version)) (sha256 (base32 - "1k7nxvlj7cjkhm0i30a93x9ll66mpci19l93qjs2540fvbp9n86y")))) + "0wdzp1q6hyks4afm217yl2n770jsqaqxix71imni1r0qbxdfkdwl")))) (properties `((upstream-name . "S4Arrays"))) (build-system r-build-system) (propagated-inputs @@ -22583,13 +22583,13 @@ variable and significantly correlated genes.") (define-public r-sparsearray (package (name "r-sparsearray") - (version "1.4.1") + (version "1.4.8") (source (origin (method url-fetch) (uri (bioconductor-uri "SparseArray" version)) (sha256 - (base32 "1kik0g208x58kycc9njp28fiacia2i8f1m5ljz9pfyw6mn1cspwm")))) + (base32 "1ahwv6ih1700h1sccv9wh7hr5bhdif0ji5jbmsprnhjxfgn6xidm")))) (properties `((upstream-name . "SparseArray"))) (build-system r-build-system) (propagated-inputs (list r-biocgenerics @@ -23320,14 +23320,14 @@ on the plot.") (define-public r-abn (package (name "r-abn") - (version "3.0.6") + (version "3.1.1") (source (origin (method url-fetch) (uri (cran-uri "abn" version)) (sha256 (base32 - "0833070j4q553kc4g5wydln3q63g0igaam9h3rbylxcs0p1v2psj")))) + "1sixgahjcy82yiiixgxiqbm8jcajqz0m3h0hwwm202iwzi3vyhiv")))) (build-system r-build-system) (inputs (list gsl)) @@ -25015,14 +25015,14 @@ embeddings and functions to build new reference.") (define-public r-tximeta (package (name "r-tximeta") - (version "1.22.0") + (version "1.22.1") (source (origin (method url-fetch) (uri (bioconductor-uri "tximeta" version)) (sha256 (base32 - "11fxd0ybp3d8l12k1f06qhnmq9s52d5g1fzc4rj20gafyy9fz496")))) + "0lmkxl7zlp6z4i32jyy914kiwacnz89jnd2kqma81mq81r389p06")))) (properties `((upstream-name . "tximeta"))) (build-system r-build-system) (propagated-inputs diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index cc973837a3..4072df50d7 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -53,6 +53,7 @@ #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages man) #:use-module (gnu packages mtools) #:use-module (gnu packages ncurses) @@ -132,7 +133,17 @@ ;; Counterintuitively, this *disables* a spurious Python dependency by ;; calling the ‘true’ binary instead. Python is only needed during ;; bootstrapping (for genptl.py), not when building from a release. - #~(list "PYTHON=true") + #~(append + (list "PYTHON=true") + ;; This needs to be compiled with clang for powerpc64le. + (if #$(and=> (%current-target-system) + target-ppc64le?) + (list "TARGET_CC=powerpc64le-linux-gnu-clang") + '()) + (if #$(and (target-ppc64le? (%current-system)) + (not (%current-target-system))) + (list "CC=clang") + '())) ;; GRUB fails to load modules stripped with --strip-unneeded. #:strip-flags @@ -185,6 +196,13 @@ (substitute* "Makefile.in" (("grub_cmd_date grub_cmd_set_date grub_cmd_sleep") "grub_cmd_date grub_cmd_sleep")))) + #$@(if (target-ppc64le?) + #~((add-before 'check 'skip-tests + (lambda _ + (substitute* "Makefile.in" + ((" grub_cmd_date ") " ") + ((" pseries_test ") " "))))) + #~()) (add-before 'check 'disable-pixel-perfect-test (lambda _ ;; This test compares many screenshots rendered with an older @@ -204,6 +222,15 @@ ;; is required for generating alternative keyboard layouts. console-setup) + ;; 64-bit PowerPC hardware boots in big-endian mode and then for + ;; powerpc64le it switches to little-endian mode. Therefore we + ;; need a compiler which can generate both big-endian and + ;; little-endian binaries for the bootloader and the utilities + ;; and building with clang is the easiest option. + (if (target-ppc64le?) + (list clang) + '()) + ;; Depend on LVM2 for libdevmapper, used by 'grub-probe' and ;; 'grub-install' to recognize mapped devices (LUKS, etc.) (if (member (or (%current-target-system) @@ -286,10 +313,7 @@ menu to select one of the installed operating systems.") (delete "help2man" "texinfo" "parted" "qemu" "xorriso"))) (arguments (substitute-keyword-arguments (package-arguments grub) - ((#:configure-flags _ #~'()) - #~(list "PYTHON=true")) - ((#:tests? _ #t) - #f) + ((#:tests? _ #t) #f) ((#:phases phases #~%standard-phases) #~(modify-phases #$phases (replace 'patch-stuff diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 550a5d0f1d..3bfcf5a37e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -73,6 +73,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages boost) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) @@ -87,6 +88,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages maths) + #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -989,6 +991,63 @@ macros for defining tests, grouping them into suites, and providing a test runner. It is quite unopinionated with most of its features being optional.") (license license:isc))) +(define-public klee-uclibc + (let ((commit "955d502cc1f0688e82348304b053ad787056c754")) + (package + (name "klee-uclibc") + (version (git-version "20230612" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klee/klee-uclibc") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12fnr5mq80cxwvv09gi844mi31jgi8067swagxnlxlhxj4mi125j")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;upstream uClibc tests do not work in the fork + #:strip-directories '() ;only ships a static library, so don't strip anything. + #:phases (modify-phases %standard-phases + ;; Disable locales as these would have to be downloaded and + ;; shouldn't really be needed for symbolic execution either. + (add-after 'unpack 'patch-config + (lambda _ + (substitute* "klee-premade-configs/x86_64/config" + (("UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y") + "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n") + (("UCLIBC_PREGENERATED_LOCALE_DATA=y") + "UCLIBC_PREGENERATED_LOCALE_DATA=n") + (("UCLIBC_HAS_LOCALE=y") + "UCLIBC_HAS_LOCALE=n") + (("UCLIBC_HAS_XLOCALE=y") + "UCLIBC_HAS_XLOCALE=n")))) + + ;; Upstream uses a custom non-GNU configure script written + ;; in Python, replace the default configure phase accordingly. + (replace 'configure + (lambda _ + (invoke "./configure" "--make-llvm-lib" + "--enable-release"))) + + ;; Custom install phase to only install the libc.a file manually. + ;; This is the only file which is used/needed by KLEE itself. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "lib/libc.a" + (string-append (assoc-ref outputs "out") + "/lib/klee"))))))) + ;; ncurses is only needed for the `make menuconfig` interface. + (native-inputs (list clang-13 llvm-13 python ncurses)) + (synopsis "Variant of uClibc tailored to symbolic execution") + (description + "Modified version of uClibc for symbolic execution of +Unix userland software. This library can only be used in conjunction +with the @code{klee} package.") + (home-page "https://klee-se.org/") + (license license:lgpl2.1)))) + (define-public klee (package (name "klee") @@ -1004,13 +1063,32 @@ runner. It is quite unopinionated with most of its features being optional.") (base32 "1nma6dqi8chjb97llsa8mzyskgsg4dx56lm8j514j5wmr8vkafz6")))) (arguments (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "CMakeLists.txt" + (("\\$\\{KLEE_UCLIBC_PATH\\}/lib/libc\\.a") + "${KLEE_UCLIBC_PATH}")))) + (add-after 'install 'wrap-hooks + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lib (string-append out "/lib"))) + ;; Ensure that KLEE finds runtime libraries (e.g. uclibc). + (wrap-program (string-append bin "/klee") + `("KLEE_RUNTIME_LIBRARY_PATH" = + (,(string-append lib "/klee/runtime/")))))))) #:configure-flags #~(list (string-append "-DLLVMCC=" (search-input-file %build-inputs "/bin/clang")) (string-append "-DLLVMCXX=" - (search-input-file %build-inputs "/bin/clang++"))))) + (search-input-file %build-inputs "/bin/clang++")) + (string-append "-DKLEE_UCLIBC_PATH=" + (search-input-file %build-inputs "/lib/klee/libc.a")) + "-DENABLE_POSIX_RUNTIME=ON"))) (native-inputs (list clang-13 llvm-13 python-lit)) - (inputs (list gperftools sqlite z3)) + (inputs (list bash-minimal klee-uclibc gperftools sqlite z3)) (build-system cmake-build-system) (home-page "https://klee-se.org/") (synopsis "Symbolic execution engine") @@ -3396,8 +3474,8 @@ provides a simple way to achieve this.") (license license:gpl2))) (define-public rapidcheck - (let ((commit "a5724ea5b0b00147109b0605c377f1e54c353ba2") - (revision "0")) + (let ((commit "ff6af6fc683159deb51c543b065eba14dfcf329b") + (revision "1")) (package (name "rapidcheck") (version (git-version "0.0.0" revision commit)) @@ -3410,24 +3488,33 @@ provides a simple way to achieve this.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0f2dmsym8ibnwkaidxmgp73mg0sdniwsyn6ppskh74246h29bbcy")))) + (base32 "1s2qva1amhs887jcdj12ppxk9kkfvy25xy7vzhkwb7rljr3gj713")) + (modules '((guix build utils))) + (snippet + #~(begin + (make-file-writable "ext/CMakeLists.txt") + (call-with-output-file "ext/CMakeLists.txt" + (lambda (out) + (display "find_package(Catch2 REQUIRED GLOBAL)\n" out) + (display "find_package(GTest GLOBAL)\n" out) + (display "find_package(Boost GLOBAL)\n" out))) + (substitute* "extras/boost/test/CMakeLists.txt" + (("^([ ]*)boost" all spaces) + (string-append spaces "Boost::boost"))))))) (arguments (list - #:tests? #f ;require fetching submodules - #:configure-flags #~(list "-DCMAKE_POSITION_INDEPENDENT_CODE=ON") - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'install-extra-headers - (lambda _ - (with-directory-excursion "../source/extras" - (for-each - (lambda (dir) - (let ((dir (string-append dir "/include/rapidcheck/")) - (dest (string-append #$output - "/include/rapidcheck"))) - (copy-recursively dir dest))) - '("boost" "boost_test" "catch" "gmock" "gtest")))))))) + #:configure-flags #~(list "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" + "-DRC_ENABLE_BOOST=on" + "-DRC_ENABLE_CATCH=on" + "-DRC_ENABLE_DOCTEST=on" + "-DRC_ENABLE_GTEST=on" + "-DRC_ENABLE_TESTS=on"))) (build-system cmake-build-system) + (inputs (list boost + catch2 + doctest + googletest)) + (native-inputs (list catch2 googletest)) (home-page "https://github.com/emil-e/rapidcheck") (synopsis "Property based testing framework for C++") (description "Rapidcheck is a property based testing framework for C++. diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index db582fa821..47edc56e87 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -130,8 +130,9 @@ Scheme machine types, or '#f' if none is defined." #f) ((target-ppc32? system) "ppc32") - ((target-riscv64? system) - "rv64") + ;; This is apparently not ready in chez-scheme-for-racket. + ;((target-riscv64? system) + ; "rv64") ((string-prefix? "loongarch64-" system) "la64") (else @@ -297,7 +298,7 @@ will name the threaded machine type unless THREADS? is provided as #f." (name "chez-scheme-for-racket") ;; The version should match `(scheme-version-number #t)`. ;; See s/cmacros.ss c. line 360. - (version "9.9.9-pre-release.23") + (version "10.1.0-pre-release.1") (source #f) (build-system gnu-build-system) (inputs `(,@(if (nix-system->native-chez-machine-type) @@ -329,8 +330,6 @@ will name the threaded machine type unless THREADS? is provided as #f." (ice-9 match) (srfi srfi-34)) #:out-of-source? #t - ;; Intermittent failures: https://github.com/cisco/ChezScheme/issues/809 - #:tests? #f #:test-target "test" ; test-one test-some-fast test-some test test-more #:configure-flags #~`(,@(let* ((chez+version (strip-store-file-name #$output)) @@ -509,6 +508,7 @@ version of Chez Scheme.") "1q66vafhiwk617z51qkm1v64r3bxqhhf5lzrmsa4l9d5yhvlyk09")) (file-name (git-file-name name version)) (patches (search-patches "chez-scheme-backport-configure.patch" + "chez-scheme-backport-signal.patch" "chez-scheme-bin-sh.patch")) (snippet #~(begin (use-modules (guix build utils)) diff --git a/gnu/packages/chicken.scm b/gnu/packages/chicken.scm index 8f5e8ce98d..d48a0c89c0 100644 --- a/gnu/packages/chicken.scm +++ b/gnu/packages/chicken.scm @@ -33,14 +33,14 @@ (define-public chicken (package (name "chicken") - (version "5.3.0") + (version "5.4.0") (source (origin (method url-fetch) (uri (string-append "https://code.call-cc.org/releases/" version "/chicken-" version ".tar.gz")) (sha256 (base32 - "0xhdvcdwlv9vbhxh7k0fzd32ybhc7fn83y9fj48dhzp1z7c9kbf3")))) + "0pzcrnzkjw2sa44vy59wbygvlc3nva8zisprkdnvyrqi3jk4lp9w")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 4bcc198bcb..ccb4a153ad 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -60,8 +60,8 @@ #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR))) (define-public cuirass - (let ((commit "e4b42065046b5d19d5c16647933326df476b0a79") - (revision "4")) + (let ((commit "0eaf7b69bed87ac8f5ff10ad904a83a025192577") + (revision "6")) (package (name "cuirass") (version (git-version "1.2.0" revision commit)) @@ -74,7 +74,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "14k849w00h0n13n1xq9hwxpa9n9mg8laa45sbxb7r8ibxd525gf5")))) + "0kc7jgxsjk0bnd02c09rsbqs82rkwyxjsyzy33cb1c8hblf3fbkg")))) (build-system gnu-build-system) (arguments (list #:modules `((guix build utils) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index ac025e0e3d..370b7714f1 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2636,7 +2636,7 @@ file compression algorithm.") (define-public xarchiver (package (name "xarchiver") - (version "0.5.4.21") + (version "0.5.4.23") (source (origin (method git-fetch) @@ -2645,7 +2645,7 @@ file compression algorithm.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0m3vq1mh2vg5r7vhnwjkfhix6i2cm15z82xsi6zaqvc4zkswb2m5")))) + (base32 "0ccxp106c3r759l1bjaszz3fwlw10qzzlsd9mnmpksnlwfwjkmb8")))) (build-system glib-or-gtk-build-system) (native-inputs (list gettext-minimal intltool libxslt pkg-config)) diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index 818a80b94e..ffb6762142 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -24,6 +24,7 @@ #:use-module (guix git-download) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) + #:use-module (gnu packages golang-check) #:use-module (gnu packages golang-web) #:use-module (gnu packages golang-xyz) #:use-module (gnu packages version-control) @@ -48,7 +49,6 @@ (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/twpayne/chezmoi" #:install-source? #f #:phases @@ -80,51 +80,63 @@ "secretkeepassxc.txt" "secretlastpass.txt" "secretonepassword.txt" - "secretpass.txt"))))))) + "secretpass.txt")))) + ;; FIXME: Pattern embedded: cannot embed directory embedded: + ;; contains no embeddable files. + ;; + ;; This happens due to Golang can't determine the valid directory of + ;; the module which is sourced during setup environment phase, but + ;; easy resolved after coping to expected directory "vendor" within + ;; the current package, see details in Golang source: + ;; + ;; - URL: <https://github.com/golang/go/blob/> + ;; - commit: 82c14346d89ec0eeca114f9ca0e88516b2cda454 + ;; - file: src/cmd/go/internal/load/pkg.go#L2059 + (add-before 'build 'copy-input-to-vendor-directory + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (mkdir "vendor") + (copy-recursively + (string-append + #$(this-package-native-input "go-github-com-charmbracelet-glamour") + "/src/github.com") + "vendor/github.com") + (copy-recursively + (string-append + #$(this-package-native-input "go-github-com-alecthomas-chroma-v2") + "/src/github.com") + "vendor/github.com")))) + (add-before 'install 'remove-vendor-directory + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (delete-file-recursively "vendor"))))))) (native-inputs - (list go-github-com-alecthomas-chroma - go-github-com-aymerick-douceur + (list go-github-com-alecthomas-chroma-v2 go-github-com-bmatcuk-doublestar-v2 go-github-com-charmbracelet-glamour - go-github-com-chris-ramon-douceur go-github-com-coreos-go-semver - go-github-com-danwakefield-fnmatch - go-github-com-dlclark-regexp2 - go-github-com-godbus-dbus go-github-com-google-go-github-v33 - go-github-com-google-go-querystring - go-github-com-google-goterm go-github-com-google-renameio - go-github-com-gorilla-css - go-github-com-lucasb-eyer-go-colorful go-github-com-masterminds-sprig-v3 - go-github-com-mattn-go-isatty - go-github-com-mattn-go-runewidth - go-github-com-microcosm-cc-bluemonday - go-github-com-muesli-reflow-ansi - go-github-com-muesli-reflow-indent - go-github-com-muesli-reflow-padding - go-github-com-muesli-reflow-wordwrap - go-github-com-muesli-termenv - go-github-com-olekukonko-tablewriter go-github-com-pelletier-go-toml go-github-com-pkg-diff go-github-com-rogpeppe-go-internal go-github-com-sergi-go-diff go-github-com-spf13-cobra go-github-com-spf13-viper + go-github-com-stretchr-testify go-github-com-twpayne-go-shell go-github-com-twpayne-go-vfs go-github-com-twpayne-go-vfsafero - go-github-com-twpayne-go-xdg - go-github-com-yuin-goldmark + go-github-com-twpayne-go-xdg-v3 go-github-com-zalando-go-keyring go-github-go-git go-go-etcd-io-bbolt - go-golang-org-x-net go-golang-org-x-oauth2 + go-golang-org-x-sys go-golang-org-x-term - go-gopkg-in-errgo-fmt-errors)) + go-gopkg-in-yaml-v2 + go-howett-net-plist)) (home-page "https://www.chezmoi.io/") (synopsis "Personal configuration files manager") (description "This package helps to manage personal configuration files diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 72acfaba45..0361470483 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -456,7 +456,7 @@ Its main purpose is to support the key usage by @code{docker-init}: (define-public podman (package (name "podman") - (version "5.1.1") + (version "5.1.2") (source (origin (method git-fetch) @@ -464,7 +464,7 @@ Its main purpose is to support the key usage by @code{docker-init}: (url "https://github.com/containers/podman") (commit (string-append "v" version)))) (sha256 - (base32 "1rhlwd350ll472jn7gm4nbkfkbm609d5s97wdqfb7lfagqwi1vny")) + (base32 "1v0qqzfl0nqkqmqimv89nrggb7n1ryhqpdi8v7yn2c7m0dm8xq91")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 40181358ba..ee945fcc68 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -314,23 +314,21 @@ use by the C++ Core Guidelines maintained by the Standard C++ Foundation.") (name "c2ffi") ;; As per the c2ffi README: the first three elements are encoding the ;; required Clang/LLVM version, and the last one is the c2ffi revision. - (version "16.0.0.0") + (version "18.1.0.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/rpav/c2ffi") - ;; Upstream is not tagging releases consistently. - ;; (commit (string-append "v" version)) - (commit "097cbe61ca02dc79ea60859aa056975131a9d985"))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1mqhw4838chl495gaj9z0731ahkmqb4f3wlc1qalk82fdsaniyd5")) + (base32 "03hw650wjrc4jb4ra8bwc4rnprr0fpnf3wlxzacfjysvl25jb0j6")) (modules '((guix build utils))) (snippet '(substitute* "CMakeLists.txt" ;; Guix seems to be packaging LLVM libs separately thus -lLLVM - ;; won't work, every used library must be specified explicitly. + ;; won't work. Instead every library used must be listed. (("c2ffi PUBLIC clang-cpp LLVM") "c2ffi PUBLIC clang-cpp LLVMCore LLVMSupport LLVMMCParser \ LLVMOption LLVMBitReader LLVMProfileData"))))) @@ -346,9 +344,9 @@ LLVMOption LLVMBitReader LLVMProfileData"))))) (when tests? (invoke "./bin/c2ffi" "--help"))))))) (native-inputs - (list clang-16)) ; CMakeLists.txt invokes `clang -print-resource-dir` + (list clang-18)) ; CMakeLists.txt invokes `clang -print-resource-dir` (inputs - (list clang-16)) ; Compiled with gcc, but links against libclang-cpp.so + (list clang-18)) ; Compiled with gcc, but links against libclang-cpp.so (home-page "https://github.com/rpav/c2ffi") (synopsis "Clang-based FFI wrapper generator") (description diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 274432d194..32ee25e1ae 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -102,6 +102,7 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages rust) #:use-module (gnu packages ssh) #:use-module (gnu packages sqlite) #:use-module (gnu packages statistics) @@ -332,14 +333,14 @@ multiple and joint correspondence analysis.") (define-public r-cachem (package (name "r-cachem") - (version "1.0.8") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "cachem" version)) (sha256 (base32 - "1hj5gw040pdrl3iwvwbgyrs91jcar0pwr3kmf23wwpb1zqcsk77a")))) + "089f963h59z4n0sj3isjq2h7zw2485qw38jv8zdnbn755by3j22m")))) (properties `((upstream-name . "cachem"))) (build-system r-build-system) (propagated-inputs @@ -383,13 +384,13 @@ evaluation.") (define-public r-castor (package (name "r-castor") - (version "1.8.0") + (version "1.8.2") (source (origin (method url-fetch) (uri (cran-uri "castor" version)) (sha256 (base32 - "0caw206hndfzypj33w6npvppdc5hhq1q71wriqd0ck9f238rfi3c")))) + "1850i35qsxw7dkkblixnp4h5zhwg0ysx8rzns5h0kr9lwmil6biw")))) (properties `((upstream-name . "castor"))) (build-system r-build-system) (propagated-inputs (list r-jsonlite r-matrix r-naturalsort r-rcpp @@ -536,13 +537,13 @@ Shiny applications.") (define-public r-consort (package (name "r-consort") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (cran-uri "consort" version)) (sha256 (base32 - "03xkypy4r84mdif6m331c27haxnyi1s87vvj2f83xxw0m0s5im5j")))) + "12gr1diyy2azy1fbh8z129lkm0ahwvm98j5hqxv93yp089a02l8c")))) (properties `((upstream-name . "consort"))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -559,13 +560,13 @@ labels on the node can also be achieved.") (define-public r-collapse (package (name "r-collapse") - (version "2.0.13") + (version "2.0.14") (source (origin (method url-fetch) (uri (cran-uri "collapse" version)) (sha256 - (base32 "11i1zw9c9fp5rnhd14b8ivqas38v8qywmmh9w4iaxrb02s77qwz5")))) + (base32 "0njmis9a0jc8xmdxgxhpydsj2ygb89hg402gpqaw1h5bcwwpf0m8")))) (properties `((upstream-name . "collapse"))) (build-system r-build-system) (propagated-inputs (list r-rcpp)) @@ -610,13 +611,13 @@ queues, stacks, deques, dicts and ordered dicts.") (define-public r-correlation (package (name "r-correlation") - (version "0.8.4") + (version "0.8.5") (source (origin (method url-fetch) (uri (cran-uri "correlation" version)) (sha256 (base32 - "07fz7wmvrcd6b023jhj3bsrvg4w6i7f1v99jslm0gj84vzmnqzbs")))) + "0b5vq7lvvwcv0sw54548ncn85nq6i78dpm44dfvrl23vg65pff0y")))) (properties `((upstream-name . "correlation"))) (build-system r-build-system) (propagated-inputs (list r-bayestestr r-datawizard r-insight r-parameters)) @@ -630,6 +631,26 @@ correlations, multilevel correlations, polychoric correlations, biweight correlations, distance correlations and more.") (license license:gpl3))) +(define-public r-countrycode + (package + (name "r-countrycode") + (version "1.6.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "countrycode" version)) + (sha256 + (base32 "1dix4prcavwbi7l7ifw1frvpmqqdcrvk4c45xl7ckg6068713nzr")))) + (properties `((upstream-name . "countrycode"))) + (build-system r-build-system) + (home-page "https://vincentarelbundock.github.io/countrycode/") + (synopsis "Convert country names and country codes") + (description + "This package lets you standardize country names, convert them into one +of 40 different coding schemes, convert between coding schemes, and assign +region descriptors.") + (license license:gpl3))) + (define-public r-cplm (package (name "r-cplm") @@ -741,14 +762,14 @@ functions are included.") (define-public r-datawizard (package (name "r-datawizard") - (version "0.10.0") + (version "0.11.0") (source (origin (method url-fetch) (uri (cran-uri "datawizard" version)) (sha256 (base32 - "0z3sds2mlmyd40xrjy6lcrym5sl1hcn2dxxfmljv2667vk9nrbmg")))) + "0cghk6flxxsz079sw8l4aw1h4girg7mwl61237a7ymmhvny70d4k")))) (properties `((upstream-name . "datawizard"))) (build-system r-build-system) (propagated-inputs @@ -766,16 +787,16 @@ wrangling backend for the packages in the @code{easystats} ecosystem.") (define-public r-dbscan (package (name "r-dbscan") - (version "1.1-12") + (version "1.2-0") (source (origin (method url-fetch) (uri (cran-uri "dbscan" version)) (sha256 - (base32 "1snfcf5jy3chh5nmvn7ashhlyv35nkajlfrlk9kzpy4jnfyv3y2n")))) + (base32 "0rv2h5i539ivkgwblfapjpfl09hgxvidkk6x1wmgc6hp30nbl2bj")))) (properties `((upstream-name . "dbscan"))) (build-system r-build-system) - (propagated-inputs (list r-rcpp)) + (propagated-inputs (list r-generics r-rcpp)) (native-inputs (list r-knitr)) (home-page "https://github.com/mhahsler/dbscan") (synopsis "Density-based spatial clustering of applications with noise") @@ -1273,13 +1294,13 @@ such as counts or binary matrices.") (define-public r-googlevis (package (name "r-googlevis") - (version "0.7.1") + (version "0.7.3") (source (origin (method url-fetch) (uri (cran-uri "googleVis" version)) (sha256 - (base32 "067jcwbq0a06wbpaa46ngjs3hkpvz8q6v8019f15yr58kq2k2n9k")))) + (base32 "0swcf2vl3mvp2bsd7nra917pajyh27j2k3vmmrb6n8g55mazyisn")))) (properties `((upstream-name . "googleVis"))) (build-system r-build-system) (propagated-inputs (list r-jsonlite)) @@ -1710,13 +1731,13 @@ datum to another.") (define-public r-rocit (package (name "r-rocit") - (version "2.1.1") + (version "2.1.2") (source (origin (method url-fetch) (uri (cran-uri "ROCit" version)) (sha256 - (base32 "0sd6ckh7k8aqwhzzp3qff6g7d03klbr0mbp403pib3823c8pqa55")))) + (base32 "17s7wi248vj6wbcxb6z0fdsw8bijjxva4sldlqcz4m73ccnrdikf")))) (properties `((upstream-name . "ROCit"))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -2235,13 +2256,13 @@ degree elevation and curve fitting.") (define-public r-biglm (package (name "r-biglm") - (version "0.9-2.1") + (version "0.9-3") (source (origin (method url-fetch) (uri (cran-uri "biglm" version)) (sha256 - (base32 "0iy9xr2bq42wlizgwlz7w5kh9206yqkw9h2cr6mcsmizgjg3rkvd")))) + (base32 "0n0dkazq74s3lml0ds9l38kzgapckjrvwyi62qb1y14cqlylhpc0")))) (properties `((upstream-name . "biglm"))) (build-system r-build-system) (propagated-inputs (list r-dbi)) @@ -2431,19 +2452,20 @@ size and can be easily tested locally before being sent to a remote.") (define-public r-climaemet (package (name "r-climaemet") - (version "1.2.1") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "climaemet" version)) (sha256 (base32 - "1h3j8w6m568swa6qkfg107wvfdfg816p92y8ayss6acrrmrvax89")))) + "1ccf7639zk56m60cqd6z8h4s6nsvhv76d8ndbk832d9lak13b7wb")))) (properties `((upstream-name . "climaemet"))) (build-system r-build-system) (propagated-inputs - (list r-dplyr + (list r-cli + r-dplyr r-ggplot2 - r-httr + r-httr2 r-jsonlite r-rappdirs r-readr @@ -2580,13 +2602,13 @@ known as Dynamic Linear Models.") (define-public r-zcompositions (package (name "r-zcompositions") - (version "1.5.0-3") + (version "1.5.0-4") (source (origin (method url-fetch) (uri (cran-uri "zCompositions" version)) (sha256 (base32 - "1gbwx3vgx5viqnn5jsszild6ikyc2pmf1hdjc9475caf9xx9l589")))) + "1bvaw6m95hz8hd5p8h1d482b45r3w82dyj3sxlijf12s0qg8w63k")))) (properties `((upstream-name . "zCompositions"))) (build-system r-build-system) (propagated-inputs @@ -2731,14 +2753,14 @@ variables.") (define-public r-ggpp (package (name "r-ggpp") - (version "0.5.7") + (version "0.5.8-1") (source (origin (method url-fetch) (uri (cran-uri "ggpp" version)) (sha256 (base32 - "0gd8dbcja4qjwjh414mp2xf8hnjlrp4zm4ac8j59kqxzpwxv8n04")))) + "1jk3x679rvkj3if14cai99w5sk0nj07rhppwwd7i7a1daal0grh5")))) (properties `((upstream-name . "ggpp"))) (build-system r-build-system) (propagated-inputs @@ -2935,13 +2957,13 @@ axis} (SMA), and @dfn{ranged major axis} (RMA).") (define-public r-ggpmisc (package (name "r-ggpmisc") - (version "0.5.6") + (version "0.6.0") (source (origin (method url-fetch) (uri (cran-uri "ggpmisc" version)) (sha256 (base32 - "0w514js5q6xchbbw2x3085d7parwa8nqaj4fvjplhpfah6rya2dv")))) + "145w1pbwjdahgs06v8lms3ynpqryrrr4v0h8bgsmaqqkq1hjixmi")))) (build-system r-build-system) (propagated-inputs (list r-confintr @@ -3003,6 +3025,25 @@ axis, or summary graphics on a continuous axis such as a boxplot or a density distribution.") (license license:expat))) +(define-public r-gparotation + (package + (name "r-gparotation") + (version "2024.3-1") + (source + (origin + (method url-fetch) + (uri (cran-uri "GPArotation" version)) + (sha256 + (base32 "1njl4qg5jgmx14r41q1kzfmhf4zga3yjkig0h7ar35bq56pmgxl8")))) + (properties `((upstream-name . "GPArotation"))) + (build-system r-build-system) + (home-page "https://optimizer.r-forge.r-project.org/GPArotation_www/") + (synopsis "Gradient projection factor rotation") + (description + "This package provides gradient projection algorithms for factor +rotation. For details see @code{?GPArotation}.") + (license license:gpl2+))) + (define-public r-gprofiler (package (name "r-gprofiler") @@ -3218,13 +3259,13 @@ level p-values.") (define-public r-swagger (package (name "r-swagger") - (version "3.33.1") + (version "5.17.14.1") (source (origin (method url-fetch) (uri (cran-uri "swagger" version)) (sha256 (base32 - "1ldgmy5vjzd11z5yl5a518wkw6y0l469b2zf0lp12hk19jq6k0sj")))) + "0ykmz3j1n06w1injcnlkb3xv79vwiyv94j74m950rfrbv97dda58")))) (properties `((upstream-name . "swagger"))) (build-system r-build-system) (home-page "https://github.com/rstudio/swagger") @@ -3892,13 +3933,13 @@ high-dimensional data.") (define-public r-mc2d (package (name "r-mc2d") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (cran-uri "mc2d" version)) (sha256 (base32 - "07h2gvmdfqjydikxksbqhikihg46fv6xyn8vk5kyni6x75gp9abk")))) + "06kva55vm2cldd95caw5hfx0xjadyhgkqi0y9pyz7hs3zg0zq9xy")))) (properties `((upstream-name . "mc2d"))) (build-system r-build-system) (propagated-inputs (list r-ggplot2 r-ggpubr r-mvtnorm)) @@ -4082,18 +4123,17 @@ Analysis Approach Using R. Chapman-Hall, 2019, (define-public r-vegan (package (name "r-vegan") - (version "2.6-4") + (version "2.6-6.1") (source (origin (method url-fetch) (uri (cran-uri "vegan" version)) (sha256 (base32 - "01hxlb5sy0d28ajq993fqs4z0qjcyl610d0ahjyjpbkrpszd92jx")))) + "0q0bp7xxmab1gcqk8wwm81sdvhccdvz5vqyn0grbwfb619q5wakx")))) (build-system r-build-system) (native-inputs - (list r-knitr ; needed for vignettes - gfortran)) + (list gfortran r-knitr)) (propagated-inputs (list r-cluster r-lattice r-mass r-mgcv r-permute)) (home-page "https://cran.r-project.org/web/packages/vegan") @@ -4108,23 +4148,23 @@ data types as well.") (define-public r-tglkmeans (package (name "r-tglkmeans") - (version "0.5.4") + (version "0.5.5") (source (origin (method url-fetch) (uri (cran-uri "tglkmeans" version)) (sha256 - (base32 "1plg03k9r4sp8ck5qcj8shblr8378bynyyc7yqwcqv856vkl9icd")))) + (base32 "0hdnxgkxpgb8jm9aygv3wlhd42blm5nz906vlpl72blgcyc77hhh")))) (properties `((upstream-name . "tglkmeans"))) (build-system r-build-system) (propagated-inputs (list r-cli r-dofuture + r-dorng r-dplyr r-future r-ggplot2 r-magrittr r-matrix - r-metacell r-plyr r-purrr r-rcpp @@ -4346,13 +4386,13 @@ scraping tasks, inspired by libraries like @code{BeautifulSoup}.") (define-public r-secretbase (package (name "r-secretbase") - (version "0.5.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "secretbase" version)) (sha256 - (base32 "04xxjz4b9lpixgpa547rb9y2d370rs6jy1vyr6z24zkia1fmybg4")))) + (base32 "1lnmkppw6scgdd3qd45jfvnrxx5bsa4b37z212aq6ss7xxjlv8wh")))) (properties `((upstream-name . "secretbase"))) (build-system r-build-system) (home-page "https://shikokuchuo.net/secretbase/") @@ -4523,13 +4563,13 @@ that.") (define-public r-deming (package (name "r-deming") - (version "1.4") + (version "1.4-1") (source (origin (method url-fetch) (uri (cran-uri "deming" version)) (sha256 - (base32 "1yx3qrbik6jpqgsi0gqgc7y2cra13qlisg2gq8rvnv57nvcvb421")))) + (base32 "1jipary7wqb9gmj4mfrz4ym5ir44q2rhknxx6ah1f5lpkcsjm6c6")))) (properties `((upstream-name . "deming"))) (build-system r-build-system) (propagated-inputs (list r-boot)) @@ -4766,15 +4806,16 @@ sliding semi-landmarks and semi-automated surface landmark placement.") (define-public r-hgnchelper (package (name "r-hgnchelper") - (version "0.8.1") + (version "0.8.14") (source (origin (method url-fetch) (uri (cran-uri "HGNChelper" version)) (sha256 (base32 - "0qwkk5658j4j6w2wgvxkp38cyvscjp93d3zc7gb97vcihqx0ngxa")))) + "0rhqpzq6z57wzydwcz0ry61al68l3mll79s5hz8by7hy61izj5k5")))) (properties `((upstream-name . "HGNChelper"))) (build-system r-build-system) + (propagated-inputs (list r-splitstackshape)) (native-inputs (list r-knitr)) (home-page "https://github.com/waldronlab/HGNChelper") (synopsis @@ -5269,14 +5310,14 @@ speed increase from creating dummy variables through @code{model.matrix()}.") (define-public r-fastmap (package (name "r-fastmap") - (version "1.1.1") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "fastmap" version)) (sha256 (base32 - "0wvibiy16i30nzg5k80md68lpz7g6iwbl02j4fyqmbhns2fq08rn")))) + "0ilj7gcbnha6l61sqzk6wrj6l08mxyay49957izha7axj6i09nmi")))) (properties `((upstream-name . "fastmap"))) (build-system r-build-system) (home-page "https://r-lib.github.io/fastmap/") @@ -5629,7 +5670,7 @@ previewing themes in real time.") (define-public r-shiny (package (name "r-shiny") - (version "1.8.0") + (version "1.8.1") (source (origin (method git-fetch) @@ -5639,7 +5680,7 @@ previewing themes in real time.") (file-name (git-file-name name version)) (sha256 (base32 - "0rfrch2147yhp2vkr3198gn1ww00ckzcw4i6rywfl38c6fdw9vr1")) + "06prh7r00dy1i2nlcls9cpfiw86lbyzbgcf9hbj54j6kfv8mh5fw")) (snippet '(for-each delete-file '("inst/www/shared/bootstrap/js/bootstrap.min.js" @@ -6514,6 +6555,26 @@ named elements: the @code{status}, the @code{headers}, and the @code{body}.") work well on small screens.") (license license:gpl3))) +(define-public r-minty + (package + (name "r-minty") + (version "0.0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "minty" version)) + (sha256 + (base32 "1kbs4f36s5bnjpc5wcqawbk154n9wjpf549hsjj4xdcg7ihcdgfg")))) + (properties `((upstream-name . "minty"))) + (build-system r-build-system) + (propagated-inputs (list r-cpp11 r-tzdb)) + (home-page "https://gesistsa.github.io/minty/") + (synopsis "Minimal type guesser") + (description + "This is a port of the type guesser from the @code{readr} package, the +so-called readr first edition parsing engine, now superseded by vroom.") + (license license:expat))) + (define-public r-feather (package (name "r-feather") @@ -7132,22 +7193,23 @@ is configured appropriately so R can use them.") (define-public r-pkgload (package (name "r-pkgload") - (version "1.3.4") + (version "1.4.0") (source (origin (method url-fetch) (uri (cran-uri "pkgload" version)) (sha256 (base32 - "1ki6k7l7dpb6bncvvcndrv5764jb1adrzs5iaxicakfsija4pc30")))) + "0jbmlvii40q6ymdhislmgby6dpf9585xl9d5cf8g4nn2kig8ir09")))) (build-system r-build-system) (propagated-inputs (list r-cli - r-crayon r-desc r-fs r-glue + r-lifecycle r-pkgbuild + r-processx r-rlang r-rprojroot r-withr)) @@ -7162,13 +7224,13 @@ you to rapidly iterate while developing a package.") (define-public r-pki (package (name "r-pki") - (version "0.1-12") + (version "0.1-14") (source (origin (method url-fetch) (uri (cran-uri "PKI" version)) (sha256 - (base32 "0nidg6l9nrmpyimi502fydy22r247w9i4ngb2xdbxjvfhr17m0xd")))) + (base32 "0rkr3gf5aqkrxi134kwggsyj151nwcwndy8d8q2vfy5rfwcyh960")))) (properties `((upstream-name . "PKI"))) (build-system r-build-system) (inputs (list openssl zlib)) @@ -7582,17 +7644,18 @@ graphics packages that comes with the base installation.") (define-public r-ctrdata (package (name "r-ctrdata") - (version "1.17.2") + (version "1.19.0") (source (origin (method url-fetch) (uri (cran-uri "ctrdata" version)) (sha256 (base32 - "0xsi3yc08gg9h5zh9h9r2d2ixv36f6wblmkcv51h9nfmawjyd8f8")))) + "00wp5jf2sa4l28ffl109r87xvjm8c5i7nl09azypnml6rf0mqrhr")))) (properties `((upstream-name . "ctrdata"))) (build-system r-build-system) (propagated-inputs (list r-clipr + r-countrycode r-curl r-digest r-dplyr @@ -7971,13 +8034,13 @@ way.") (define-public r-restrserve (package (name "r-restrserve") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) (uri (cran-uri "RestRserve" version)) (sha256 - (base32 "0jbzalk17jg4qm99005q69pyk76c0wjvdwzjp25npzcvlbsxa194")))) + (base32 "0d5ppgasaqpgvdi1spxlhp4ywpafbphlhkqfcfvgxrdm6y9igl2c")))) (build-system r-build-system) (propagated-inputs (list r-checkmate @@ -8145,13 +8208,13 @@ do-it-yourself toolkit allows users to define their own Lambert W x (define-public r-lamw (package (name "r-lamw") - (version "2.2.3") + (version "2.2.4") (source (origin (method url-fetch) (uri (cran-uri "lamW" version)) (sha256 (base32 - "0jq3xq2ll4lpj8f5aqwazqlb978nzyk7hln4iwlzrlkkcqc35qm1")))) + "1h1plx9d6kzgdv20sx7pjfkz54jw11pkqrspgw4hh1kgk6hpbgsz")))) (properties `((upstream-name . "lamW"))) (build-system r-build-system) (propagated-inputs (list r-rcpp r-rcppparallel)) @@ -8261,13 +8324,13 @@ provides an interactive R manager and worker environment.") (define-public r-rmumps (package (name "r-rmumps") - (version "5.2.1-29") + (version "5.2.1-30") (source (origin (method url-fetch) (uri (cran-uri "rmumps" version)) (sha256 - (base32 "1sxx5kyp331dmiyqd4l5m3mdcmlpm1vbdm6cd3kgvnz8ympphlwr")))) + (base32 "0mz6dmb16dd8pflyd29ikj0wjlfbp4ri3xvc3fgmh26v1mvvaic4")))) (properties `((upstream-name . "rmumps") (updater-extra-inputs . ("zlib")))) @@ -9018,17 +9081,18 @@ contexts.") (define-public r-cvxr (package (name "r-cvxr") - (version "1.0-12") + (version "1.0-14") (source (origin (method url-fetch) (uri (cran-uri "CVXR" version)) (sha256 (base32 - "1igzi231rkqi7pc5ak8b29a8x7fry0yqs8vg2m4i5ab9jdm8fsp7")))) + "1nvwym5fwkyqkw8dpar571kr5695w7yrih6w9vnhswikp717q0jd")))) (properties `((upstream-name . "CVXR"))) (build-system r-build-system) (propagated-inputs (list r-bit64 + r-clarabel r-ecosolver r-gmp r-matrix @@ -9177,14 +9241,14 @@ regression using Kernel Ridge Regression.") (define-public r-prodlim (package (name "r-prodlim") - (version "2023.08.28") + (version "2024.06.25") (source (origin (method url-fetch) (uri (cran-uri "prodlim" version)) (sha256 (base32 - "1s2xalxfq2q6a9ssz01vzpldpa98q3cl5icap0k2xr5v72gj40l0")))) + "0r3780j04wy3ihrhvfm3qcwa9xjrxl43bcllzzq7xaki85jiz5j6")))) (build-system r-build-system) (propagated-inputs (list r-data-table @@ -9399,17 +9463,17 @@ to access PostgreSQL database systems.") (define-public r-rpostgres (package (name "r-rpostgres") - (version "1.4.6") + (version "1.4.7") (source (origin (method url-fetch) (uri (cran-uri "RPostgres" version)) (sha256 (base32 - "1ld03r9rzfxx6gzy3yn8jhzp9sp2qd9wydpxz955ggjxwdklpvnr")))) + "0939ysl9m35aknnh3xk92xxymk1g0xqnjb2khq55m8nq7gcg3l9x")))) (properties `((upstream-name . "RPostgres"))) (build-system r-build-system) - (inputs (list postgresql)) + (inputs (list openssl postgresql)) (propagated-inputs (list r-bit64 r-blob @@ -9587,17 +9651,17 @@ problems as well as resampling based estimators of prediction error.") (define-public r-psych (package (name "r-psych") - (version "2.4.3") + (version "2.4.6.26") (source (origin (method url-fetch) (uri (cran-uri "psych" version)) (sha256 (base32 - "0ic479y314knn20m1cjlp15lji7f70xrg95ln570pgkhrk5853bi")))) + "1gnjpcpqlviyyj5myhy440fj1zwx14b9jwhp5907yyhhw2ail69d")))) (build-system r-build-system) (propagated-inputs - (list r-lattice r-mnormt r-nlme)) + (list r-gparotation r-lattice r-mnormt r-nlme)) (native-inputs (list r-knitr)) (home-page "https://cran.r-project.org/web/packages/psych/") @@ -9640,19 +9704,18 @@ by base R methods related to model fitting.") (define-public r-broom (package (name "r-broom") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) (uri (cran-uri "broom" version)) (sha256 (base32 - "14fr17cvpy6jzdffzrf46xah70xcq2nkbjyxmkyzwbz3kvpdsxwx")))) + "1kxwkyhm4m586v2kp15r4q2zsarnkrkzmgl17n6y7ggzilj3dkr4")))) (build-system r-build-system) (propagated-inputs (list r-backports r-dplyr - r-ellipsis r-generics r-glue r-lifecycle @@ -9842,6 +9905,29 @@ functions of a stable variate, as well as generalized regression models for the parameters of a stable distribution.") (license license:gpl2+))) +(define-public r-stabm + (package + (name "r-stabm") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "stabm" version)) + (sha256 + (base32 "1vslidq2pzpwhsrsklghaqsdjjf4w4wqs2dng0p68zhrv5vlivhq")))) + (properties `((upstream-name . "stabm"))) + (build-system r-build-system) + (propagated-inputs (list r-checkmate r-matrix)) + (native-inputs (list r-knitr)) + (home-page "https://bommert.github.io/stabm/") + (synopsis "Stability measures for feature selection") + (description + "This package provides an implementation of many measures for the +assessment of the stability of feature selection. Both simple measures and +measures which take into account the similarities between features are +available.") + (license license:lgpl3))) + (define-public r-statip (package (name "r-statip") @@ -9989,14 +10075,14 @@ of the text. All return names of the encodings are iconv-compatible.") (define-public r-ucminf (package (name "r-ucminf") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (cran-uri "ucminf" version)) (sha256 (base32 - "10ycpzxx73div9vpzmkhy524yd47kzmpl7ajpm248clsv6ivngpd")))) + "0adxynpi6mn5n37i1260yr6z7dm39dadr4nwrxks2jgsd7knmnsb")))) (build-system r-build-system) (native-inputs (list gfortran)) (home-page "https://cran.r-project.org/web/packages/ucminf/") @@ -10505,14 +10591,14 @@ training models for classification or ranking.") (define-public r-xts (package (name "r-xts") - (version "0.13.2") + (version "0.14.0") (source (origin (method url-fetch) (uri (cran-uri "xts" version)) (sha256 (base32 - "1yqx1x395hvdav1fvmpwrfm8sir398ky1bi0x5zsm7acbkv91maa")) + "1nfgbwzibzjni2p8ssvrsyhf75y1g53j1z6kp8ashxlqzbp1d2yj")) (modules '((guix build utils))) (snippet '(with-directory-excursion "inst/doc" @@ -10649,13 +10735,13 @@ VCF data and familiar R software.") (define-public r-rvcg (package (name "r-rvcg") - (version "0.22.2") + (version "0.23") (source (origin (method url-fetch) (uri (cran-uri "Rvcg" version)) (sha256 (base32 - "077p4c16nqi6ayxv1i31cr6sw9fwnxpmfkmrrhzh02khpi2c2jg5")))) + "0jdhl769r99g0x9kaf1cymzjd96z2pdnha7wyy221q3w3iy81whz")))) (properties `((upstream-name . "Rvcg"))) (build-system r-build-system) (propagated-inputs (list r-rcpp r-rcpparmadillo r-rcppeigen)) @@ -10843,14 +10929,14 @@ multivariate function estimation using smoothing splines.") (define-public r-cli (package (name "r-cli") - (version "3.6.2") + (version "3.6.3") (source (origin (method url-fetch) (uri (cran-uri "cli" version)) (sha256 (base32 - "0lg131q9l8wpnggc3jlrjl1ri3dw0d1pi4nr1zlnlaqvf7ilj1sc")))) + "0ha8mijnzlz1cxsjk502j2gzspd8fnk3j79bvnqm871225ghi5a2")))) (build-system r-build-system) (home-page "https://github.com/r-lib/cli#readme") (synopsis "Helpers for developing command line interfaces") @@ -11153,13 +11239,13 @@ iVAT).") (define-public r-xfun (package (name "r-xfun") - (version "0.43") + (version "0.45") (source (origin (method url-fetch) (uri (cran-uri "xfun" version)) (sha256 - (base32 "1hqn9r4xk0jjm1kafn7r8jbpciqciw8gh1vqch0wlvzda8m4dbar")))) + (base32 "049nk6h9xbdn2i6m07s26rqn790adww2y6mya03v95yj5xfg05iq")))) (build-system r-build-system) (properties ;; knitr itself depends on xfun @@ -11907,14 +11993,14 @@ documents.") (define-public r-leaps (package (name "r-leaps") - (version "3.1") + (version "3.2") (source (origin (method url-fetch) (uri (cran-uri "leaps" version)) (sha256 (base32 - "1dn3yl1p03n0iynd1vsdkrr0fhmvgrmfkv37y7n371765h83lz1x")))) + "1bbgm6l12gj1y28ks21awxphpmp07hb0ffiyrw7dqp3fcyxvxmm0")))) (build-system r-build-system) (native-inputs (list gfortran)) (home-page "https://cran.r-project.org/web/packages/leaps/") @@ -12050,14 +12136,14 @@ financial trading strategies.") (define-public r-tseries (package (name "r-tseries") - (version "0.10-55") + (version "0.10-56") (source (origin (method url-fetch) (uri (cran-uri "tseries" version)) (sha256 (base32 - "03jb2ij4jyhrbygi0gha549vq262kx1ffjmy12rf0gak0qmq5iwp")))) + "1s7sz95j6mm4708s3hffrnfkmdjgj43gba07wr6v24fg9xygq7m8")))) (build-system r-build-system) (propagated-inputs (list r-jsonlite r-quadprog r-quantmod r-zoo)) @@ -12198,16 +12284,16 @@ chaotic time series analysis.") (define-public r-fresh (package (name "r-fresh") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (cran-uri "fresh" version)) (sha256 (base32 - "1787mm6w2s5x9scxy7r9cb77rgpmy4ngwkn4z8g3gs48mrab4bd9")))) + "19ki4hxlqzshdmy981gcvbn8wxqa893p5rs55l0q7iipkcmhf9jq")))) (properties `((upstream-name . "fresh"))) (build-system r-build-system) - (propagated-inputs (list r-htmltools r-rstudioapi r-sass r-shiny)) + (propagated-inputs (list r-bslib r-htmltools r-rstudioapi r-sass r-shiny)) (native-inputs (list r-knitr)) (home-page "https://github.com/dreamRs/fresh") (synopsis "Create custom Bootstrap themes to use in Shiny") @@ -12220,14 +12306,14 @@ flexdashboard.") (define-public r-urca (package (name "r-urca") - (version "1.3-3") + (version "1.3-4") (source (origin (method url-fetch) (uri (cran-uri "urca" version)) (sha256 (base32 - "1wg9f691pif59xds43gnnw77mmzc9xpnhhvaksk2b0szffvaifj3")))) + "05nb1an5a8r0w6gca6cf40nws2v4hxhznz8kyfm7q7hz0kjnqggy")))) (build-system r-build-system) (propagated-inputs (list r-nlme)) (native-inputs (list gfortran)) @@ -12839,14 +12925,14 @@ local smoothers and many more.") (define-public r-radiant-data (package (name "r-radiant-data") - (version "1.6.3") + (version "1.6.6") (source (origin (method url-fetch) (uri (cran-uri "radiant.data" version)) (sha256 (base32 - "1nwiw5dps0030f893gs0fixis6xigfr8y8rqhi3l505yx2bsrjbj")) + "09cbd21bvj4a3n5r1ch638y5dgi7xmmg1y62i6ixcjhbr8wypjmn")) (modules '((guix build utils))) (snippet '(delete-file "inst/assets/html2canvas/html2canvas.min.js")))) @@ -12967,14 +13053,14 @@ plots) for multivariate and time series-like data.") (define-public r-signal (package (name "r-signal") - (version "1.8-0") + (version "1.8-1") (source (origin (method url-fetch) (uri (cran-uri "signal" version)) (sha256 (base32 - "1126p631zm0wc4h9ghqai5yb9vklpz676fygb0d0aavs2raaijw9")))) + "1c7fw5akdm8f44zgdafsgz2fpn6kfwifaw29yakl7zykq89vq8m3")))) (build-system r-build-system) (propagated-inputs (list r-mass)) (native-inputs (list gfortran)) @@ -13600,14 +13686,14 @@ dependency on Java.") (define-public r-rio (package (name "r-rio") - (version "1.0.1") + (version "1.1.1") (source (origin (method url-fetch) (uri (cran-uri "rio" version)) (sha256 (base32 - "1vkvajlmp8kgmkadamy0xm885whfkwacq2jxcrshz1w8amy16k3m")))) + "0llvdd4vdxpvjvbya3b6kh04h0k48ijy4dkjl77ynvhlh9wyzw9y")))) (build-system r-build-system) (propagated-inputs (list r-curl @@ -13616,8 +13702,8 @@ dependency on Java.") r-haven r-lifecycle r-r-utils + r-readr r-readxl - r-stringi r-tibble r-writexl)) (native-inputs @@ -13878,14 +13964,14 @@ it.") (define-public r-rgexf (package (name "r-rgexf") - (version "0.16.2") + (version "0.16.3") (source (origin (method url-fetch) (uri (cran-uri "rgexf" version)) (sha256 (base32 - "00c2zka1n3k7p1l0mlchr063s6x58p9r3fb64d4wgl4rvsq55q3f")) + "1c1rqgr7qsj61gp2frm197k396xfdspvmmwr56izwb09225cbp6d")) ;; Delete minified JavaScript files (snippet '(for-each delete-file @@ -14075,13 +14161,13 @@ the source data frame.") (define-public r-rapiclient (package (name "r-rapiclient") - (version "0.1.4") + (version "0.1.5") (source (origin (method url-fetch) (uri (cran-uri "rapiclient" version)) (sha256 (base32 - "0k92557f90mrmsbfsyvjv377qi04zdh6lqhgnqx51z95f5198kd8")))) + "1xp6mmk2rrlk0wmvv23k1dgr7pydw46iinvd138167frmr0rdica")))) (properties `((upstream-name . "rapiclient"))) (build-system r-build-system) (propagated-inputs @@ -14297,14 +14383,14 @@ always locate the files relative to your project root.") (define-public r-reticulate (package (name "r-reticulate") - (version "1.36.1") + (version "1.38.0") (source (origin (method url-fetch) (uri (cran-uri "reticulate" version)) (sha256 (base32 - "0c6x6fm8pqw4dj5x2xn12l01piaday0fv588hx903mw3lks3fzbw")))) + "13favs31kzzff7ii0fxsdwvwb3iijasn2mg57ghcv8si4cz32byb")))) (build-system r-build-system) (arguments (list @@ -14443,14 +14529,14 @@ Sequence logos can easily be combined with other ggplot2 plots.") (define-public r-ggsci (package (name "r-ggsci") - (version "3.0.3") + (version "3.2.0") (source (origin (method url-fetch) (uri (cran-uri "ggsci" version)) (sha256 (base32 - "1m806aqp97pp57i6dl5ykmfhd4lvd1gpamzghks8fx1nksh935mx")))) + "0jiwkk2ij1qnsaqr6354wihj057ia1arrfpjpll00x63056fvn21")))) (build-system r-build-system) (propagated-inputs (list r-ggplot2 r-scales)) @@ -14886,14 +14972,14 @@ run basic analyses on pupillometry experiments.") (define-public r-gbrd (package (name "r-gbrd") - (version "0.4-11") + (version "0.4.12") (source (origin (method url-fetch) (uri (cran-uri "gbRd" version)) (sha256 (base32 - "06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82")))) + "0f13hg6nckl4aflwd49g4x2adxjfgah2yga70z1m8jszhhm1vka8")))) (properties `((upstream-name . "gbRd"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/gbRd/") @@ -15176,14 +15262,14 @@ parse and convert strings into cases like snake or camel among others.") (define-public r-prediction (package (name "r-prediction") - (version "0.3.17") + (version "0.3.18") (source (origin (method url-fetch) (uri (cran-uri "prediction" version)) (sha256 (base32 - "09fwg3cv7s5mzlcnwp4a04h0ps9m5qlb533p1cpqlinwl72lj4dq")))) + "194p2zbypslkd7slnvqw2z456xxwfzjxd11dirhpffjcsizkgrnh")))) (build-system r-build-system) (propagated-inputs (list r-data-table)) @@ -15220,14 +15306,14 @@ Decomposition in R (Beaton et al 2014) <doi:10.1016/j.csda.2013.11.006>.") (define-public r-insight (package (name "r-insight") - (version "0.19.11") + (version "0.20.1") (source (origin (method url-fetch) (uri (cran-uri "insight" version)) (sha256 (base32 - "0za6f3bvkybd84jyazg1n03lhzl1w3mpca5c0qsygkgbbyhiddbj")))) + "19lg5dipnwlfxzcpq2mj348f8pnzn6i7sj77hf5ppzha370acgy2")))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -15274,17 +15360,18 @@ vice versa), or to deal with multiple declared missing values.") (define-public r-sjmisc (package (name "r-sjmisc") - (version "2.8.9") + (version "2.8.10") (source (origin (method url-fetch) (uri (cran-uri "sjmisc" version)) (sha256 (base32 - "1gzkq95ckxr0vhrzggflzli9hs7zr8c0yym9zn1wf74yrr0mgc3q")))) + "12y5aa820h95dbak9zd2rbg1hc0636b2dpg0mn9mkb76a4ssnr1d")))) (build-system r-build-system) (propagated-inputs - (list r-dplyr + (list r-datawizard + r-dplyr r-insight r-magrittr r-purrr @@ -15306,13 +15393,13 @@ tidyverse workflow.") (define-public r-nodbi (package (name "r-nodbi") - (version "0.10.4") + (version "0.10.5") (source (origin (method url-fetch) (uri (cran-uri "nodbi" version)) (sha256 (base32 - "0q4nsxic1jlraipdc6zi711c3316n9wgq1cgbywhjlxb52qhkmd7")))) + "0cbwzclym2r28d1m662sg6krkpczsmpzigjzp3fhkkd7j7i1w9yi")))) (properties `((upstream-name . "nodbi"))) (build-system r-build-system) (propagated-inputs @@ -15441,13 +15528,13 @@ libxlsxwriter.") (define-public r-writexls (package (name "r-writexls") - (version "6.5.0") + (version "6.6.0") (source (origin (method url-fetch) (uri (cran-uri "WriteXLS" version)) (sha256 (base32 - "1rkc0r6l7cfz7h83i7gw6g0nlyy347mdh6bj73j0f8mdv3nmwwn4")))) + "0adpwd80hhw6i965wp1w74s85vzq2gv5pf98zcvjwaqvpkrs25xw")))) (properties `((upstream-name . "WriteXLS"))) (build-system r-build-system) (inputs (list perl)) @@ -15488,14 +15575,14 @@ location measures.") (define-public r-biasedurn (package (name "r-biasedurn") - (version "2.0.11") + (version "2.0.12") (source (origin (method url-fetch) (uri (cran-uri "BiasedUrn" version)) (sha256 (base32 - "0dvmkrdmhfh4swilyxf10y856kx0zf9sj1gc0g62bm6r5jhz35b2")))) + "14jpijms81pgl4zyqrhwwdfj0jmlmml21blspvin8lqw8fbbbcr9")))) (properties `((upstream-name . "BiasedUrn"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/BiasedUrn/") @@ -15706,14 +15793,14 @@ the work.") (define-public r-doby (package (name "r-doby") - (version "4.6.21") + (version "4.6.22") (source (origin (method url-fetch) (uri (cran-uri "doBy" version)) (sha256 (base32 - "01s9kls9j1nvygh0cc2bfd6n5sjccaalvfw3zx8sv7r2p4clgsij")))) + "038b1gs039br4xzv6axij2fzdzahmk718qm4akg77bwqvqvf59ra")))) (properties `((upstream-name . "doBy"))) (build-system r-build-system) (propagated-inputs @@ -15727,7 +15814,6 @@ the work.") r-matrix r-microbenchmark r-modelr - r-pbkrtest r-rlang r-tibble r-tidyr)) @@ -17322,14 +17408,14 @@ analysis.") (define-public r-gee (package (name "r-gee") - (version "4.13-26") + (version "4.13-27") (source (origin (method url-fetch) (uri (cran-uri "gee" version)) (sha256 (base32 - "1323qv2hiinixmwcb8rfvf5qmkffnnq9f1g8kj9amwsimfsm71cs")))) + "1754173msjxhkpl95v6z8c73vhz7ivfil0xfs25smrlgslzpgd1z")))) (properties `((upstream-name . "gee"))) (build-system r-build-system) (native-inputs @@ -17404,13 +17490,13 @@ were influenced by the drake R package by Will Landau (2018) (define-public r-targets (package (name "r-targets") - (version "1.7.0") + (version "1.7.1") (source (origin (method url-fetch) (uri (cran-uri "targets" version)) (sha256 (base32 - "1h939mvyxd1wjakcbxjxcmn6a7i23ya1kc89aqwarizsj00hdjil")))) + "1r4pg990nhmyg4i15qgqafvqas4vh5rvcki3iaff2hyrfdcmy6vy")))) (properties `((upstream-name . "targets"))) (build-system r-build-system) (propagated-inputs (list r-base64url @@ -17581,16 +17667,16 @@ estimation problem.") (define-public r-quickjsr (package (name "r-quickjsr") - (version "1.1.3") + (version "1.2.2") (source (origin (method url-fetch) (uri (cran-uri "QuickJSR" version)) (sha256 (base32 - "0ccp7dx2jhlarfn48jc0mhci5kkj0r3ibh6rjnxswvp3yg2x2bgd")))) + "1vb8b591imq737zin77sh3icld87pqk5mssmn7ddzj45cn22z12i")))) (properties `((upstream-name . "QuickJSR"))) (build-system r-build-system) - (propagated-inputs (list r-jsonlite r-r6 r-rcpp)) + (native-inputs (list r-knitr)) (home-page "https://cran.r-project.org/package=QuickJSR") (synopsis "Interface for the QuickJS lightweight JavaScript engine") (description @@ -17848,14 +17934,14 @@ the differences were not significantly different.") (define-public r-emmeans (package (name "r-emmeans") - (version "1.10.1") + (version "1.10.3") (source (origin (method url-fetch) (uri (cran-uri "emmeans" version)) (sha256 (base32 - "175az87aj2zrjsi94vvca612krbhry7yqq6l03ybq31jhj7vc2fa")))) + "01c2d0kb36lrff5l49kyfl2j3byzblmhw2jkz215hhl8jmyk0akv")))) (build-system r-build-system) (propagated-inputs (list r-estimability r-mvtnorm r-numderiv)) @@ -17985,14 +18071,14 @@ Bayesian modeling.") (define-public r-tmb (package (name "r-tmb") - (version "1.9.11") + (version "1.9.13") (source (origin (method url-fetch) (uri (cran-uri "TMB" version)) (sha256 (base32 - "07z9565rn64k3ysvcgq6s792qg1v102gd9in5ifigm140zc4l45j")))) + "0yr9xnl57cgw1q210iip5fxbgqd6pswiw0kgwf23v3glkadqq4gb")))) (properties `((upstream-name . "TMB"))) (build-system r-build-system) (propagated-inputs @@ -18012,33 +18098,16 @@ detection, parallelism through BLAS and parallel user templates.") (define-public r-sjstats (package (name "r-sjstats") - (version "0.18.2") + (version "0.19.0") (source (origin (method url-fetch) (uri (cran-uri "sjstats" version)) (sha256 - (base32 "0a1y6bqyvgs0avzasr8g6vwcxcnj4d9g0rfz2qiznwadpjzqw66h")))) + (base32 "07qv32gnrhrl21zgj1xp1gqdqjn6ax1nf40s11nmpag8r0xgvqnk")))) (build-system r-build-system) (propagated-inputs - (list r-bayestestr - r-broom - r-datawizard - r-dplyr - r-effectsize - r-emmeans - r-insight - r-lme4 - r-magrittr - r-mass - r-modelr - r-parameters - r-performance - r-purrr - r-rlang - r-sjlabelled - r-sjmisc - r-tidyr)) + (list r-datawizard r-effectsize r-insight r-parameters r-performance)) (home-page "https://github.com/strengejacke/sjstats") (synopsis "Functions for common statistical computations") (description @@ -18117,14 +18186,14 @@ ROPE percentage and pd).") (define-public r-performance (package (name "r-performance") - (version "0.11.0") + (version "0.12.0") (source (origin (method url-fetch) (uri (cran-uri "performance" version)) (sha256 (base32 - "03zs162lah8yv2x2q829ifc3jwy7m89r6md4ildjz8qmfjf0js82")))) + "0py6b1mix26z7fmarya7gfa9bwb8ymsr7z78ag8kld6ih3slga7z")))) (build-system r-build-system) (propagated-inputs (list r-bayestestr r-datawizard r-insight)) @@ -18143,14 +18212,14 @@ effects models and Bayesian models.") (define-public r-ggeffects (package (name "r-ggeffects") - (version "1.5.2") + (version "1.7.0") (source (origin (method url-fetch) (uri (cran-uri "ggeffects" version)) (sha256 (base32 - "1f5ralb5fkcv2rflsl0y9lgwdmx6zzv3s1087lql9x5vjd1hkvcg")))) + "1pbg6iwnbh7cwdzhb44knnbv70lkcgjzrzwyhdzv28vmyc7qy9cj")))) (build-system r-build-system) (propagated-inputs (list r-insight)) @@ -18217,13 +18286,13 @@ efficient computation even with very large data sets.") (define-public r-sjplot (package (name "r-sjplot") - (version "2.8.15") + (version "2.8.16") (source (origin (method url-fetch) (uri (cran-uri "sjPlot" version)) (sha256 - (base32 "10lvn8dnckpjjpapmf0d2zwjkzjvs4iiswd3rmijzviz4ichhxjs")))) + (base32 "093nmn1gq8i4kr5nhwby883rxpdiyb959shqvfnvplwcnnv762ji")))) (properties `((upstream-name . "sjPlot"))) (build-system r-build-system) (propagated-inputs @@ -20023,17 +20092,17 @@ can be made by using glyphs.") (define-public r-waveslim (package (name "r-waveslim") - (version "1.8.4") + (version "1.8.5") (source (origin (method url-fetch) (uri (cran-uri "waveslim" version)) (sha256 (base32 - "1510xpkgrhdw394m5anxccdczjikcxazyd09ix2z73i15akyx3j0")))) + "0xd7006skrsvkwj4pkxqbfsbs58rfcpfcfk1lf0gsd2y0wisi60y")))) (build-system r-build-system) - (native-inputs - (list gfortran)) + (propagated-inputs + (list r-multitaper)) (home-page "http://waveslim.blogspot.com") (synopsis "Basic wavelet routines for signal processing") (description @@ -20338,13 +20407,13 @@ while other are highly specific for the special data format used for (define-public r-qmri (package (name "r-qmri") - (version "1.2.7") + (version "1.2.7.6") (source (origin (method url-fetch) (uri (cran-uri "qMRI" version)) (sha256 (base32 - "0jiwvnhmm4zwqydqkzsygwkm23nc0zzjz5w7yckwdfc5zafch4hk")))) + "0mbxgg80p159vkz05hbzvvip7h5y5rpvjrjnq1vivz855dk0053g")))) (properties `((upstream-name . "qMRI"))) (build-system r-build-system) (propagated-inputs (list r-adimpro r-aws r-awsmethods r-oro-nifti @@ -20701,14 +20770,14 @@ and compatibility with @code{ape} objects.") (define-public r-rnifti (package (name "r-rnifti") - (version "1.6.1") + (version "1.7.0") (source (origin (method url-fetch) (uri (cran-uri "RNifti" version)) (sha256 (base32 - "0wn06fnq5c7f0vwakryb75vzkjh03dqz2z57lgmn68hwgssnpalc")))) + "1s0q1vs6hzg1xadk43rxqxi55swkl7pgsnw45im5vgsz1wxgg375")))) (properties `((upstream-name . "RNifti"))) (build-system r-build-system) (inputs (list zlib)) @@ -20812,13 +20881,13 @@ handling.") (define-public r-gridpattern (package (name "r-gridpattern") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (cran-uri "gridpattern" version)) (sha256 - (base32 "0rkhwk3h5rd3z52dnjc5rq1gbay17r208zfqbkh9gj9kn8rb2wb8")))) + (base32 "1fa787m4ns3s7xnai1kqplz32nhy4pa1v6w7kzyjv9qlyfhvrw92")))) (properties `((upstream-name . "gridpattern"))) (build-system r-build-system) (propagated-inputs @@ -21767,13 +21836,13 @@ Differences with other sparse matrix packages are: (define-public r-fields (package (name "r-fields") - (version "15.2") + (version "16.2") (source (origin (method url-fetch) (uri (cran-uri "fields" version)) (sha256 - (base32 "0gdddigzbzlhrbp6h2ma5b05m68pmggrkcd80hzgjbjj64ihy9qz")))) + (base32 "1r5kld45dgigbaavcx3c88ci0jd66zxan3fh2wypwvj7sl69a41r")))) (build-system r-build-system) (propagated-inputs (list r-maps r-spam r-viridislite)) @@ -22207,13 +22276,13 @@ But it can also be used to do data analysis for small scale data sets.") (define-public r-cmprsk (package (name "r-cmprsk") - (version "2.2-11") + (version "2.2-12") (source (origin (method url-fetch) (uri (cran-uri "cmprsk" version)) (sha256 - (base32 "050f24l5ab1ds9824c7yjahimf6pg8ih2k83jzpzfb0n5k5jfh44")))) + (base32 "1p5c0i8prz88pgzb5dwpajlrxa0d72019sp9vysppb0fps9wngkp")))) (build-system r-build-system) (propagated-inputs (list r-survival)) @@ -22255,14 +22324,14 @@ model with finite state space using the Aalen-Johansen estimator.") (define-public r-epi (package (name "r-epi") - (version "2.48") + (version "2.51") (source (origin (method url-fetch) (uri (cran-uri "Epi" version)) (sha256 (base32 - "06965d2x47hb1c7dbqyhhywgr7k9xdcms1v08m2cx52qg6cdkiyp")))) + "0m9rvh21l9lqdlv71jrbix10g97wy2ryjv4zdjykfldhzzn4siik")))) (properties `((upstream-name . "Epi"))) (build-system r-build-system) (propagated-inputs @@ -23185,21 +23254,24 @@ marginal histograms/boxplots/density plots to ggplot2 scatterplots.") (define-public r-ggpattern (package (name "r-ggpattern") - (version "1.0.1") + (version "1.1.1") (source (origin (method url-fetch) (uri (cran-uri "ggpattern" version)) (sha256 - (base32 "1b9bfxlg64gr39bz58fp6jmg4nziwk8rk94rzpjsqhfhpwi2lrgr")))) + (base32 "1xlh1y6q10iqk1mbwdrr1vqmgmim3z27znbb5sbwgmm9yfxzj37s")))) (properties `((upstream-name . "ggpattern"))) (build-system r-build-system) (propagated-inputs - (list r-ggplot2 + (list r-cli + r-ggplot2 r-glue r-gridpattern + r-lifecycle r-rlang - r-scales)) + r-scales + r-vctrs)) (native-inputs (list r-knitr r-ragg r-rmarkdown)) (home-page "https://github.com/coolbutuseless/ggpattern") (synopsis "Ggplot2 pattern geoms") @@ -23302,14 +23374,14 @@ probabilities from a standard bivariate normal CDF.") (define-public r-lavaan (package (name "r-lavaan") - (version "0.6-17") + (version "0.6-18") (source (origin (method url-fetch) (uri (cran-uri "lavaan" version)) (sha256 (base32 - "1bppbv17b35h48vfci6zplix9zb5isi210za52cs9yyc68g2acwj")))) + "0lfz92dgqna6r6fcn2slads0gkqanqbny85jih9j08sadk6wl1xr")))) (build-system r-build-system) (propagated-inputs (list r-mass r-mnormt r-numderiv r-pbivnorm r-quadprog)) @@ -24020,13 +24092,13 @@ utilities for sequence data management under the ACNUC system.") (define-public r-unigd (package (name "r-unigd") - (version "0.1.1") + (version "0.1.2") (source (origin (method url-fetch) (uri (cran-uri "unigd" version)) (sha256 - (base32 "0q6nix6pqjg7adfyisg6zn7hzwkdmz1dhd34c6a58dsg2yq1qh1a")))) + (base32 "0iykjsfi8rjayrb4nhnm8ifdlsaxr7918bk6ackgfj1qz5g33wr7")))) (properties `((upstream-name . "unigd"))) (build-system r-build-system) (inputs (list cairo fontconfig freetype libpng zlib)) @@ -24089,6 +24161,41 @@ classes.") "This package provides simple bindings to Unidata's udunits library.") (license license:gpl2))) +(define-public r-clarabel + (package + (name "r-clarabel") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "clarabel" version)) + (sha256 + (base32 "1g66y8s4v7qzm92dhnsmng28sm4lf6wggb4kc6arvp75z0i315jh")))) + (properties `((upstream-name . "clarabel"))) + (build-system r-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-variables-for-rust + (lambda _ + (setenv "CC" #$(cc-for-target))))))) + (native-inputs (list r-knitr rust `(,rust "cargo"))) + (home-page "https://oxfordcontrol.github.io/clarabel-r/") + (synopsis "Interior point conic optimization solver") + (description + "This package provides a versatile interior point solver that solves +@dfn{linear programs} (LPs), @dfn{quadratic programs} (QPs), @dfn{second-order +cone programs} (SOCPs), @dfn{semidefinite programs} (SDPs), and problems with +exponential and power cone constraints (@url{https://clarabel.org/stable/}). +For quadratic objectives, unlike interior point solvers based on the standard +@dfn{homogeneous self-dual embedding} (HSDE) model, Clarabel handles quadratic +objective without requiring any epigraphical reformulation of its objective +function. It can therefore be significantly faster than other HSDE-based +solvers for problems with quadratic objective functions. Infeasible problems +are detected using using a homogeneous embedding technique.") + (license license:asl2.0))) + (define-public r-classint (package (name "r-classint") @@ -24116,14 +24223,14 @@ univariate class intervals for mapping or other graphics purposes.") (define-public r-spdata (package (name "r-spdata") - (version "2.3.0") + (version "2.3.1") (source (origin (method url-fetch) (uri (cran-uri "spData" version)) (sha256 (base32 - "12w4chk71vqy1chij79928ppxdg2cz03hx9bgs5cgwj9f1ciyb2b")))) + "0x80qzn12lrr8al5igj5nass3aqasg65drhdrb2p9cmp4chpydwc")))) (properties `((upstream-name . "spData"))) (build-system r-build-system) (propagated-inputs @@ -24322,13 +24429,13 @@ or raster data cubes) are handled by package stars'.") (define-public r-spdep (package (name "r-spdep") - (version "1.3-3") + (version "1.3-5") (source (origin (method url-fetch) (uri (cran-uri "spdep" version)) (sha256 (base32 - "06j26v0w33vyh5ilq1cn0rh8z0lrr3n0lxwxc7bsk2w524d3v6yw")) + "09p6aqzg109vnbh56nf0v4qj34l4dmh8ak3d9y7l04mwvl3gm3ms")) (snippet '(for-each delete-file '("inst/doc/CO69.html" "inst/doc/CO69.R" @@ -24497,13 +24604,13 @@ lspec, polyclass, and polymars.") (define-public r-rms (package (name "r-rms") - (version "6.8-0") + (version "6.8-1") (source (origin (method url-fetch) (uri (cran-uri "rms" version)) (sha256 - (base32 "1cd6m6i2ild2f2x9rkyd2aqb33q3xy0596bs3dnvr2mnh5fcar5d")))) + (base32 "0sjr4lwvh05ji8s6jk2f4imnyzsaw8f1iqds8b1661s395bm8f4x")))) (build-system r-build-system) (propagated-inputs (list r-cluster @@ -24883,13 +24990,13 @@ that accept short and long options.") (define-public r-osqp (package (name "r-osqp") - (version "0.6.3.2") + (version "0.6.3.3") (source (origin (method url-fetch) (uri (cran-uri "osqp" version)) (sha256 (base32 - "0i1jh3fr8d45b7inq9s6iyqszhh18hps8jpzkm0hzgj2k8r3nm0q")))) + "1fzmw813iab07vnc714zyaszbnsagbmba7j69la36hvnqx78wggz")))) (properties `((upstream-name . "osqp"))) (build-system r-build-system) (propagated-inputs (list r-matrix r-r6 r-rcpp)) @@ -24994,14 +25101,14 @@ handle missing genotypes at some SNPs.") (define-public r-r2html (package (name "r-r2html") - (version "2.3.3") + (version "2.3.4") (source (origin (method url-fetch) (uri (cran-uri "R2HTML" version)) (sha256 (base32 - "12qg9rp1j26h2f48dfg5k9jds26ycacv3f3ymk686ks43hd1hzja")))) + "1a8yy9xf5gdh3s2rzmv5b28hhdqc5g34hygcrxn8drs0i2j97vdr")))) (properties `((upstream-name . "R2HTML"))) (build-system r-build-system) (home-page "https://github.com/nalimilan/R2HTML") @@ -25691,18 +25798,17 @@ proteomics applications).") (define-public r-pamr (package (name "r-pamr") - (version "1.56.2") + (version "1.57") (source (origin (method url-fetch) (uri (cran-uri "pamr" version)) (sha256 (base32 - "0n7wpgzdadngj44ddsg3171wap4qhiaap75ndr6g768r3mv6q119")))) + "0gdgaspan6j4qw98357mdk7rs6r1abzzfrp63jzf99gi41v8z5h1")))) (build-system r-build-system) (propagated-inputs (list r-cluster r-survival)) - (native-inputs (list gfortran)) (home-page "https://cran.r-project.org/web/packages/pamr/") (synopsis "Prediction Analysis for Microarrays") (description @@ -25812,14 +25918,14 @@ graphics using Vega.") (define-public r-gbm (package (name "r-gbm") - (version "2.1.9") + (version "2.2.2") (source (origin (method url-fetch) (uri (cran-uri "gbm" version)) (sha256 (base32 - "1r5d8mkg4z14l3743h39r35r0qqjx5p40ixdkcc5iyjab0fzm24x")))) + "1x64a0cq9ys49i3z4df0grk506n55i7yj1ljysf9g60cq6xd56h2")))) (build-system r-build-system) (propagated-inputs (list r-lattice r-survival)) @@ -25992,18 +26098,18 @@ function for computing a matrix of correlation p-values.") (define-public r-ggfun (package (name "r-ggfun") - (version "0.1.4") + (version "0.1.5") (source (origin (method url-fetch) (uri (cran-uri "ggfun" version)) (sha256 (base32 - "1i1kcpcy3ik5p9c8742cq3syg8civ7iq6ff1fr0240gl3ca1lx6w")))) + "1lqngd9333vlai88q2w5hrp9mmzdlvjx9pvn7zr9fx61d3yh2v7y")))) (properties `((upstream-name . "ggfun"))) (build-system r-build-system) (propagated-inputs - (list r-cli r-ggplot2 r-rlang)) + (list r-cli r-dplyr r-ggplot2 r-rlang)) (native-inputs (list r-knitr)) (home-page "https://cran.r-project.org/package=ggfun") (synopsis "Miscellaneous functions for ggplot2") @@ -26330,14 +26436,14 @@ external dependencies. This package has is implemented purely in R.") (define-public r-aplot (package (name "r-aplot") - (version "0.2.2") + (version "0.2.3") (source (origin (method url-fetch) (uri (cran-uri "aplot" version)) (sha256 (base32 - "094bzrcjybs2dk2plmxf80mbx9dz1hi5m7gp8bbs5qqh03xn7wf7")))) + "0shd66q2hagddc0nd96lljin0nyqwp1qq4b485r3z4wr042n5c0z")))) (properties `((upstream-name . "aplot"))) (build-system r-build-system) (propagated-inputs @@ -26401,14 +26507,14 @@ colored by the number of neighboring points. This is useful to visualize the (define-public r-arrow (package (name "r-arrow") - (version "15.0.1") + (version "16.1.0") (source (origin (method url-fetch) (uri (cran-uri "arrow" version)) (sha256 (base32 - "070pp0p5h1ij7pg34l5grrx4vwfihagnvnk4kj7l3w0gh8y88ibz")))) + "1vz7vjm8j1k1ng2za3y1qdsrzhbx2p6zy48vsas6bkdywxp5ihb6")))) (properties `((upstream-name . "arrow"))) (build-system r-build-system) (inputs @@ -26516,14 +26622,14 @@ on, for a performance vs accuracy trade-off.") (define-public r-rsparse (package (name "r-rsparse") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (cran-uri "rsparse" version)) (sha256 (base32 - "15kdllm2lh6xdlv4j0ljyj5pczhx26s9d8cac7953zbb0sd45chz")))) + "0a40mhbzlakjsf6wj00p8pqr6slhn7gxsgq2rycp3yg478ajwqyp")))) (properties `((upstream-name . "rsparse"))) (build-system r-build-system) (propagated-inputs @@ -26975,14 +27081,14 @@ dimensional low-discrepancy sequence.") (define-public r-dqrng (package (name "r-dqrng") - (version "0.3.2") + (version "0.4.1") (source (origin (method url-fetch) (uri (cran-uri "dqrng" version)) (sha256 (base32 - "171y7487flla0vqxmzvf9nls7vn046vplcgzvyiva3d418hwl0nd")))) + "13r8agil10q0phzwh1vlsrwv7i15k43mc93iphw2ag0c08szk79x")))) (build-system r-build-system) (propagated-inputs (list r-bh r-rcpp r-sitmo)) @@ -27071,14 +27177,14 @@ classification and regression models.") (define-public r-dae (package (name "r-dae") - (version "3.2.25") + (version "3.2.28") (source (origin (method url-fetch) (uri (cran-uri "dae" version)) (sha256 (base32 - "168kisjgfc8cp7j6frgpci7qxw548rynpi9wv008k8hfszkfkgny")))) + "13a3j3d8qm1phkp4x0pdqa6p36j6xlakhmkrqcb9x0bpcfzbwfyl")))) (build-system r-build-system) (arguments '(#:phases @@ -28034,18 +28140,18 @@ both R code and compiled C/C++/FORTRAN code.") (define-public r-systemfonts (package (name "r-systemfonts") - (version "1.0.6") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "systemfonts" version)) (sha256 (base32 - "1mqxb2njfnk5rfwkqc940xbpwd3dh25zac4sapv5mjyddrxnwn6i")))) + "0i5n7zhpmllgmz7064s3v85ycsvkrd9qr8r6q172h803sadhch8r")))) (properties `((upstream-name . "systemfonts"))) (build-system r-build-system) (propagated-inputs - (list r-cpp11)) + (list r-cpp11 r-lifecycle)) (inputs (list fontconfig freetype zlib)) (native-inputs @@ -28089,14 +28195,14 @@ emphasize hidden group structures in networks or focus on specific nodes.") (define-public r-terra (package (name "r-terra") - (version "1.7-71") + (version "1.7-78") (source (origin (method url-fetch) (uri (cran-uri "terra" version)) (sha256 (base32 - "0dq47d5irkplgxcv0h0xgawwf9cc48vygg94zdiqppg5cspz7dqx")))) + "0zjb5m5nh1r307g9lm5s6va5hsvmy4b06c7pznp724waknvmd2b5")))) (properties `((upstream-name . "terra"))) (build-system r-build-system) (inputs @@ -28215,14 +28321,14 @@ in pipelines.") (define-public r-parameters (package (name "r-parameters") - (version "0.21.6") + (version "0.22.0") (source (origin (method url-fetch) (uri (cran-uri "parameters" version)) (sha256 (base32 - "004ld3m9qdq3bwl8qmp3h700kzqlgbmgz739d7fpiqgrs0s2gv83")))) + "19g3sfmvvrarkgyl5p278fcpmybvsih8ancfbhp53w0gm80629z8")))) (properties `((upstream-name . "parameters"))) (build-system r-build-system) (propagated-inputs @@ -29478,14 +29584,14 @@ See e.g. Gentle (2003) @url{doi:10.1007/b97336}.") (define-public r-lhs (package (name "r-lhs") - (version "1.1.6") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "lhs" version)) (sha256 (base32 - "0gyjdic714pqvq2jv1v0vh7hl9s83sg2zxx2gdkp38z6xx2cwzz3")))) + "0907icg9bl7h8a7wr8a60f59b8y89qj9rx1f7vxiybrjdcy7fjvb")))) (properties `((upstream-name . "lhs"))) (build-system r-build-system) (propagated-inputs (list r-rcpp)) @@ -31211,13 +31317,13 @@ It also provides a small number of bug fixes to the original code.") (define-public r-torch (package (name "r-torch") - (version "0.12.0") + (version "0.13.0") (source (origin (method url-fetch) (uri (cran-uri "torch" version)) (sha256 - (base32 "024c8szg3xa2zrl5406jx3bmazbjwp2f07ja7m61ja0dr3z7lvbq")))) + (base32 "1vy855ahji98np2q5j5fag2zcnv4ki5mysxwg3y5kdns6mifd5ns")))) (properties `((upstream-name . "torch"))) (build-system r-build-system) (arguments @@ -31270,14 +31376,14 @@ also supports low-level tensor operations and GPU acceleration.") (define-public r-additivitytests (package (name "r-additivitytests") - (version "1.1-4.1") + (version "1.1-4.2") (source (origin (method url-fetch) (uri (cran-uri "additivityTests" version)) (sha256 (base32 - "00kzfv86z6kk0gvbz9mg3p6xi5fb8cn74rhslr17rdpd02md0884")))) + "07fms1mf71ycq6w2k3hmgl6q3sc5x4qkm7d0diymbbgpbpxggwh8")))) (properties `((upstream-name . "additivityTests"))) (build-system r-build-system) @@ -32178,14 +32284,14 @@ Raftery, Appl.Statistics, 1989); it includes inference and basic methods.") (define-public r-forecast (package (name "r-forecast") - (version "8.22.0") + (version "8.23.0") (source (origin (method url-fetch) (uri (cran-uri "forecast" version)) (sha256 (base32 - "09s5fdyzc6f5l8dy7ynjmd6l5fk3wvz59q0kfv2fd9da5c1mqd8w")))) + "100qi8cgr5dz3qskrgrsjn77m7szs5rfpgqfdwlgp67l708x9hzz")))) (properties `((upstream-name . "forecast"))) (build-system r-build-system) (propagated-inputs @@ -32201,6 +32307,7 @@ Raftery, Appl.Statistics, 1989); it includes inference and basic methods.") r-timedate r-tseries r-urca + r-withr r-zoo)) (native-inputs (list r-knitr)) ; needed for vignettes @@ -32773,14 +32880,14 @@ perform @dfn{exploratory mediation} (XMed).") (define-public r-stanheaders (package (name "r-stanheaders") - (version "2.32.7") + (version "2.32.9") (source (origin (method url-fetch) (uri (cran-uri "StanHeaders" version)) (sha256 (base32 - "1dlgq0laz5j4ryiz589xhd97fk89q63255wkdbddixfg6cq02ypf")))) + "0cqb5q9pi02vahr4fif07p4r3p2sik953a9i78z1j00j9srzxc17")))) (properties `((upstream-name . "StanHeaders"))) (build-system r-build-system) (inputs (list pandoc)) @@ -33346,14 +33453,14 @@ and reproducible way.") (define-public r-rsconnect (package (name "r-rsconnect") - (version "1.2.2") + (version "1.3.1") (source (origin (method url-fetch) (uri (cran-uri "rsconnect" version)) (sha256 (base32 - "19n0j7g2yy45qp5zgs5lz1cm1d7p6d0h8bwqcsfp9mnr2zzc0yr5")))) + "0msmrdw7933xics464asyy9v2gm5b4jb8gr4nfhy54x45n1qmpj7")))) (properties `((upstream-name . "rsconnect"))) (build-system r-build-system) (propagated-inputs @@ -33370,7 +33477,7 @@ and reproducible way.") r-rstudioapi r-yaml)) (native-inputs - (list r-knitr)) + (list r-knitr r-rmarkdown)) (home-page "https://github.com/rstudio/rsconnect") (synopsis "Deployment interface for R Markdown documents and Shiny applications") (description @@ -34739,14 +34846,14 @@ multi-state models.") (define-public r-scatterpie (package (name "r-scatterpie") - (version "0.2.2") + (version "0.2.3") (source (origin (method url-fetch) (uri (cran-uri "scatterpie" version)) (sha256 (base32 - "1q36g6rqggrysnjqarxbyjw3y3z244k0zh1a49w6j4149k8qc462")))) + "0iv4i775s22j3wg6mhsdx5d9zdb23v4fanfnznp2jiwkzxr10kvh")))) (properties `((upstream-name . "scatterpie"))) (build-system r-build-system) (propagated-inputs @@ -34909,14 +35016,14 @@ counting and recursive k-means partitioning.") (define-public r-hardhat (package (name "r-hardhat") - (version "1.3.1") + (version "1.4.0") (source (origin (method url-fetch) (uri (cran-uri "hardhat" version)) (sha256 (base32 - "0v0vvvyy075f0j9ppqkhys6w2k7zmfdg0v77l430582nhrvp99hf")))) + "1bdkn80ab25n1rn3n3x1b3gs157888fak3s7i7c0r54gzkfj7l26")))) (properties `((upstream-name . "hardhat"))) (build-system r-build-system) (propagated-inputs @@ -34939,14 +35046,14 @@ input.") (define-public r-lightgbm (package (name "r-lightgbm") - (version "4.3.0") + (version "4.4.0") (source (origin (method url-fetch) (uri (cran-uri "lightgbm" version)) (sha256 (base32 - "1kk2jj7d1adqi9x1q3jij7fy8h9vc6bvzcz7jhi4bd9cybw8gpnh")))) + "082xmr33ki16i52a3z6lv9niv46pi4dbp0j3qn421sxml4115sf1")))) (properties `((upstream-name . "lightgbm"))) (build-system r-build-system) (propagated-inputs @@ -35468,14 +35575,14 @@ Kolmogorov-Smirnov, ANOVA) are also supported.") (define-public r-spatstat-utils (package (name "r-spatstat-utils") - (version "3.0-4") + (version "3.0-5") (source (origin (method url-fetch) (uri (cran-uri "spatstat.utils" version)) (sha256 (base32 - "1i1w1ys29s22jfjvliqnbw3zi6zar8bxxz3r8za182p2w0wqwhax")))) + "15pm4fpc3fvqkh9kh4i0pgalxbxfp9y3blsyaw37s07v41gnd67b")))) (properties `((upstream-name . "spatstat.utils"))) (build-system r-build-system) @@ -35489,14 +35596,14 @@ which may also be useful for other purposes.") (define-public r-spatstat-sparse (package (name "r-spatstat-sparse") - (version "3.0-3") + (version "3.1-0") (source (origin (method url-fetch) (uri (cran-uri "spatstat.sparse" version)) (sha256 (base32 - "0scdk3ns4nl1v1avbggnsinfpvl4i8391qy3x1iwxvkimr14xg3b")))) + "1sdv9d3f5xc87qiwbfjikl12h2vkmdfq2faal5wbhfc3h72mvgk3")))) (properties `((upstream-name . "spatstat.sparse"))) (build-system r-build-system) @@ -35513,14 +35620,14 @@ matrix calculations that are common in statistics, such as quadratic forms.") (define-public r-spatstat-data (package (name "r-spatstat-data") - (version "3.0-4") + (version "3.1-2") (source (origin (method url-fetch) (uri (cran-uri "spatstat.data" version)) (sha256 (base32 - "1s0ns5nhgigfn3d9rdy3f4ymnwj1w71v26iphkhwxddm9qzk80yi")))) + "0xqb94xm095qwxkhfrjqv7qwyxfs9i2xrwq06ir0y15q0dil36wv")))) (properties `((upstream-name . "spatstat.data"))) (build-system r-build-system) (propagated-inputs @@ -35826,14 +35933,14 @@ model.") (define-public r-clusterr (package (name "r-clusterr") - (version "1.3.2") + (version "1.3.3") (source (origin (method url-fetch) (uri (cran-uri "ClusterR" version)) (sha256 (base32 - "1bs1sl3yy90zx4ni0lhvdivzfas6i4v9203m59njvk5df9x82ffp")))) + "0vmj0q6sjh8adr22mhm6hyfnzsw09dk1qn75rz5i3mmhrd7y7mr6")))) (properties `((upstream-name . "ClusterR"))) (build-system r-build-system) (propagated-inputs @@ -37285,14 +37392,14 @@ expressive statistical grammar that coheres with the Tidy design framework.") (define-public r-modeldata (package (name "r-modeldata") - (version "1.3.0") + (version "1.4.0") (source (origin (method url-fetch) (uri (cran-uri "modeldata" version)) (sha256 (base32 - "035gyxgs9byij9d5vpw35a96f7xlhfj3k6c140mql4yfplm5rk23")))) + "15cfvvhf1c8zaanxdrrh934kz8250j0r5k6df0qkl5dz8cqv8sgb")))) (properties `((upstream-name . "modeldata"))) (build-system r-build-system) (propagated-inputs @@ -37596,12 +37703,12 @@ genome scans.") (define-public r-qtl2 (package (name "r-qtl2") - (version "0.34") + (version "0.36") (source (origin (method url-fetch) (uri (cran-uri "qtl2" version)) (sha256 - (base32 "1h3wim850b2xk09z9vgnyfp20k7vg94zf7szcrlw5nf1w9gn4wzy")))) + (base32 "0sy4j3f1dw7w7qcp3lsc5mmd8kwa5qaxcl8c4236a8zbzkvvnp5j")))) (build-system r-build-system) (propagated-inputs (list r-data-table @@ -38280,13 +38387,13 @@ well as email and push notifications.") (define-public r-mlr (package (name "r-mlr") - (version "2.19.1") + (version "2.19.2") (source (origin (method url-fetch) (uri (cran-uri "mlr" version)) (sha256 (base32 - "00jjhvaqifj6glqsyzixlp56bvlch5smck8kk3klcmwx9pasyllx")))) + "1icpa3xa0f7l40i52l3pl43m98j69r75qnqf1yp7wyh6y54p1rl5")))) (properties `((upstream-name . "mlr"))) (build-system r-build-system) (inputs (list gdal @@ -38449,13 +38556,13 @@ supported. Partial scoring of multivariate filter methods is supported.") (define-public r-mlr3fselect (package (name "r-mlr3fselect") - (version "0.12.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3fselect" version)) (sha256 - (base32 "1f18y4ahnjzlwk9pfs87i80kb6z84hgyc5cdlj3mafawq790hg1h")))) + (base32 "0bw5gxcxydvh14j6zy9q1k32b84v76lm6ksa4dh1l6pck14a76pj")))) (properties `((upstream-name . "mlr3fselect"))) (build-system r-build-system) (propagated-inputs (list r-bbotk @@ -38465,7 +38572,8 @@ supported. Partial scoring of multivariate filter methods is supported.") r-mlr3 r-mlr3misc r-paradox - r-r6)) + r-r6 + r-stabm)) (home-page "https://mlr3fselect.mlr-org.com") (synopsis "Feature selection for mlr3") (description @@ -38479,13 +38587,13 @@ the performance of optimized feature sets with nested resampling.") (define-public r-mlr3hyperband (package (name "r-mlr3hyperband") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3hyperband" version)) (sha256 - (base32 "1x6vfhadxlb4c9q61d5qv957mkyfwdwchzbg3flfd0j28b4bck1p")))) + (base32 "1sr9bccy1zmbj83i6nlwkfmi98b40bl1l9q4lzl8n0knnavnzcj7")))) (properties `((upstream-name . "mlr3hyperband"))) (build-system r-build-system) (propagated-inputs (list r-bbotk @@ -38510,13 +38618,13 @@ black-box optimization in bbotk.") (define-public r-mlr3mbo (package (name "r-mlr3mbo") - (version "0.2.2") + (version "0.2.3") (source (origin (method url-fetch) (uri (cran-uri "mlr3mbo" version)) (sha256 - (base32 "0jdj5dx6jb7n0g950h0j8jhafdj5mcalv5vxfiyf07myr6mjipri")))) + (base32 "0qdd0g8qnfrafkqw79mhb652chf7lqmkcyra6afxamy7jardjr0g")))) (properties `((upstream-name . "mlr3mbo"))) (build-system r-build-system) (propagated-inputs (list r-bbotk @@ -38568,13 +38676,13 @@ are.") (define-public r-mlr3misc (package (name "r-mlr3misc") - (version "0.15.0") + (version "0.15.1") (source (origin (method url-fetch) (uri (cran-uri "mlr3misc" version)) (sha256 (base32 - "1l40l0sx1dgs2rdblx7pd9nk93flad6y1mvppzg7qf4cyn8gfc3x")))) + "1yakq3ir3i46h1a1vnqqdlp4qznnwwk7zmjv7v831jmah9fzf5m3")))) (build-system r-build-system) (propagated-inputs (list r-backports r-checkmate r-data-table r-digest r-r6)) @@ -38590,13 +38698,13 @@ package also supersedes the package @code{BBmisc}.") (define-public r-mlr3pipelines (package (name "r-mlr3pipelines") - (version "0.5.2") + (version "0.6.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3pipelines" version)) (sha256 (base32 - "1glp4z5wnvcsil37gzvbvazn73088vilks9c5limnwhz8f454147")))) + "09wivgnj3jj39ngrxjip6ss0138fvjsmn4dmi5v0a78ppvsr96sp")))) (build-system r-build-system) (propagated-inputs (list r-backports @@ -38654,13 +38762,13 @@ performing ordinal regression.") (define-public r-mlr3tuningspaces (package (name "r-mlr3tuningspaces") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (cran-uri "mlr3tuningspaces" version)) (sha256 - (base32 "1snrd7xq388mvqh0ydaxvx8k9iwp40g06c3irp0m718jw3wsz5vm")))) + (base32 "0zcmhzrr9b3blg49dx3zmxnm5qh87k0rlka0vk2jp59ifd2yggrr")))) (properties `((upstream-name . "mlr3tuningspaces"))) (build-system r-build-system) (propagated-inputs (list r-checkmate @@ -38682,13 +38790,13 @@ work for a wide range of data sets.") (define-public r-mlr3verse (package (name "r-mlr3verse") - (version "0.2.8") + (version "0.3.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3verse" version)) (sha256 - (base32 "0ld4vch1qdq3gh8vhj38s2wz7acn5z7f8hxmnwnrq22g44gckd8s")))) + (base32 "1azkpmkki8c02vpz98ixsx17civk86dq7c8wwnvm9jlg3spr8hhd")))) (properties `((upstream-name . "mlr3verse"))) (build-system r-build-system) (propagated-inputs (list r-bbotk @@ -38718,13 +38826,13 @@ installation and loading of the core mlr3 packages.") (define-public r-mlr3viz (package (name "r-mlr3viz") - (version "0.8.0") + (version "0.9.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3viz" version)) (sha256 - (base32 "1m2f54yqhk1bd4c30vd1z509yblz6y4i8qkwhg73aa1sflnsycvf")))) + (base32 "1dm0xkrmd4c9hs22rxpxvvd4xxki4nxh2x7s06s2d7n3dhr4l3xh")))) (properties `((upstream-name . "mlr3viz"))) (build-system r-build-system) (propagated-inputs (list r-checkmate @@ -38746,16 +38854,17 @@ barplots, boxplots, histograms, ROC curves, and precision-recall curves.") (define-public r-paradox (package (name "r-paradox") - (version "0.11.1") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "paradox" version)) (sha256 (base32 - "0igza40ycirnf5chs7z2nnh0w6d48v4wv102zn2vnvh0kkvgv3hd")))) + "0lll3sjyn0hmxfzg71zk53f3fddibvq7762ax7gxjgiy6zgi9mny")))) (build-system r-build-system) (propagated-inputs (list r-backports r-checkmate r-data-table r-mlr3misc r-r6)) + (native-inputs (list r-knitr)) (home-page "https://paradox.mlr-org.com/") (synopsis "Define and work with parameter spaces for complex algorithms") (description "With this package it is possible to define parameter spaces, @@ -38767,13 +38876,13 @@ implemented as @code{R6} classes.") (define-public r-mlr3 (package (name "r-mlr3") - (version "0.19.0") + (version "0.20.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3" version)) (sha256 (base32 - "0dgik4lfrw5m2sqxp33kzkdp7ihlcm27y5p5g5b9wah7h7ramiqs")))) + "1wqcvgqjwfp9lah6kpxcwsz5cpd57agxfjhhggfzp8lnva5p443v")))) (build-system r-build-system) (propagated-inputs (list r-backports @@ -38805,13 +38914,13 @@ computational operations, add-on packages provide additional functionality.") (define-public r-mlr3learners (package (name "r-mlr3learners") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3learners" version)) (sha256 (base32 - "06gz6h19cnb62js1b35nddy453dyj64mr788p8ww56kgfk6yzxr8")))) + "0skfxmmqxfxxm0m9r46pvixnlpqfjqb3hmg2ggvgjnk47klha8v2")))) (build-system r-build-system) (propagated-inputs (list r-checkmate @@ -38832,14 +38941,14 @@ vector machines, and gradient boosting.") (define-public r-bbotk (package (name "r-bbotk") - (version "0.8.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "bbotk" version)) (sha256 (base32 - "1ggfl1lhvjnnkxib4svqd82agrvjcg1101cbf4g2c0kzgzm1jaj6")))) + "0w1f54lwhllf16iw9irgfv4nsn26ikw1m3wlrk5ilcs3z83zakk8")))) (properties `((upstream-name . "bbotk"))) (build-system r-build-system) (propagated-inputs @@ -38862,13 +38971,13 @@ annealing.") (define-public r-mlr3tuning (package (name "r-mlr3tuning") - (version "0.20.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3tuning" version)) (sha256 (base32 - "1y1cqfqdx9v0lfb4619y2hw6clhhjzi7hjwrpwzdpd7ymcx3dgi3")))) + "0lmczwydnd2fbvb43vqxvy58clygipwpqrnydhc8hlmnjy9vbzc6")))) (build-system r-build-system) (propagated-inputs (list r-bbotk @@ -39128,20 +39237,20 @@ clusterings as resolution increases.") (define-public r-textshaping (package (name "r-textshaping") - (version "0.3.7") + (version "0.4.0") (source (origin (method url-fetch) (uri (cran-uri "textshaping" version)) (sha256 (base32 - "0hpcjz66ykji89g2lzpp6hfkz10388py8vn2ss08n4xl3yz4v4ps")))) + "0ylx4fdvm64cxcy62q84in3nrj7q8r7mvd8vwq6mcy5jddw41s9m")))) (properties `((upstream-name . "textshaping"))) (build-system r-build-system) (inputs (list freetype fribidi harfbuzz zlib)) (propagated-inputs - (list r-cpp11 r-systemfonts)) + (list r-cpp11 r-lifecycle r-systemfonts)) (native-inputs (list pkg-config r-knitr)) (home-page "https://github.com/r-lib/textshaping") @@ -39156,14 +39265,14 @@ the font tool-set provided by the @code{systemfonts} package.") (define-public r-ragg (package (name "r-ragg") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (cran-uri "ragg" version)) (sha256 (base32 - "1p3bhbcgkllgmby9rdc1hillb5qgmc22blpmvdhd5j9ndywv2h0w")))) + "0cb9dcp47pl0nizwy0a2ml8hm11bhf7ay20j237hmmgx159a8dw0")))) (properties `((upstream-name . "ragg"))) (build-system r-build-system) (inputs @@ -39184,14 +39293,14 @@ AGG to use as alternative to the raster devices provided through the (define-public r-downlit (package (name "r-downlit") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) (uri (cran-uri "downlit" version)) (sha256 (base32 - "1gdk6rj3539vnm979spd8py0rpvlaniyiy336abi39g8xjcbw3vc")))) + "0a7q90623ahcadqg0b3a0qylachq7nghf50f0v0lip2axvf7ghsm")))) (properties `((upstream-name . "downlit"))) (build-system r-build-system) (propagated-inputs @@ -39654,20 +39763,19 @@ functionalities in strex.") (define-public r-readods (package (name "r-readods") - (version "2.2.0") + (version "2.3.0") (source (origin (method url-fetch) (uri (cran-uri "readODS" version)) (sha256 (base32 - "1f87bnvjxalr0gp651axpyq4abzirxq7l3mirbak0c4b4l2phb1n")))) + "14849i7c48ilx212kp5zh33fkvps7j2b89kpy007wk5kzpw0y4hy")))) (properties `((upstream-name . "readODS"))) (build-system r-build-system) (propagated-inputs (list r-cellranger - r-cpp11 - r-readr + r-minty r-stringi r-tibble r-vctrs @@ -40095,14 +40203,14 @@ BTM-WWW13.pdf}.") (define-public r-delaporte (package (name "r-delaporte") - (version "8.4.0") + (version "8.4.1") (source (origin (method url-fetch) (uri (cran-uri "Delaporte" version)) (sha256 (base32 - "1jqz2qxig35rhmwvazmsl3a081dylfq2jfz3bjpj61y4c55mnwar")))) + "1gv0js21x5sh54vjkvyh41ph1ixk1nw7ajm111fwz95prd9wx04v")))) (properties `((upstream-name . "Delaporte"))) (build-system r-build-system) (native-inputs (list gfortran)) @@ -40572,13 +40680,13 @@ reading and writing arbitrary protocol-buffer data in R.") (define-public r-opencpu (package (name "r-opencpu") - (version "2.2.11") + (version "2.2.12") (source (origin (method url-fetch) (uri (cran-uri "opencpu" version)) (sha256 - (base32 "1hdvfbzc8xmv8hrmchad590f91s4vq1nq83wi2ffh4n7q6ixr03s")) + (base32 "144rq0lyag4b93gshjaf4zghshnvx5vcbnahy4x43f22r0zq5gkv")) (snippet '(for-each delete-file '("inst/test/jquery-1.10.2.min.js" @@ -40707,14 +40815,14 @@ the @code{raster} package that is suitable for extracting raster values using (define-public r-rapiserialize (package (name "r-rapiserialize") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) (uri (cran-uri "RApiSerialize" version)) (sha256 (base32 - "02k0l8bi849b2102ysb102xky4p84i9v2r4w6fab7bgf32wvph4w")))) + "0azl8qykls635qxd4lcqmznvpqb5ldy6hqx3p7icqamvx9ckfhcz")))) (properties `((upstream-name . "RApiSerialize"))) (build-system r-build-system) (home-page @@ -40731,17 +40839,17 @@ package.") (define-public r-qs (package (name "r-qs") - (version "0.26.1") + (version "0.26.3") (source (origin (method url-fetch) (uri (cran-uri "qs" version)) (sha256 (base32 - "0qmgnc4igy8mjzarm30cgi4z75hh8f01kvcs6n6s63cy4qk30vs6")))) + "1qqy6aada9jkq0z6bmzb5vhb18cdxvy7b6nwjd8saqaidqgs80c8")))) (properties `((upstream-name . "qs"))) (build-system r-build-system) - (inputs (list lz4 (list zstd "lib"))) + (inputs (list lz4 zlib (list zstd "lib"))) (propagated-inputs (list r-bh r-rapiserialize r-rcpp r-stringfish)) (native-inputs @@ -41169,14 +41277,14 @@ fully reproducible.") (define-public r-paws-common (package (name "r-paws-common") - (version "0.7.2") + (version "0.7.3") (source (origin (method url-fetch) (uri (cran-uri "paws.common" version)) (sha256 (base32 - "0d1gj8z3c592cadngfhp8w8m6nd1ffb8k0wj8r2w1bldniq5yx70")))) + "1h7xsddwjhjx5n3fns16nhk249h6mypk80d3jp7lwpianhdll90m")))) (properties `((upstream-name . "paws.common"))) (build-system r-build-system) (propagated-inputs @@ -41224,14 +41332,14 @@ service, and more.") (define-public r-paws-cost-management (package (name "r-paws-cost-management") - (version "0.5.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (cran-uri "paws.cost.management" version)) (sha256 (base32 - "1fvxird0kmwhj930j7hm95h34c0vsf8p0lh6qrnz9d9i689fiw92")))) + "03mpmwg3lnky9ylpc4707a10y7b1hv228c0jc0yik0zfvrka0h64")))) (properties `((upstream-name . "paws.cost.management"))) (build-system r-build-system) @@ -41316,14 +41424,14 @@ Simple Notification Service (SNS) publish/subscribe messaging, and more.") (define-public r-paws-security-identity (package (name "r-paws-security-identity") - (version "0.5.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (cran-uri "paws.security.identity" version)) (sha256 (base32 - "01gh761ykc4h81whn649bm28b01njqm1kjqkn9l4n7hhnalddy06")))) + "14zcvd2cf2015r7b4y69176czznz69nzjp344ys262a8r31nliz5")))) (properties `((upstream-name . "paws.security.identity"))) (build-system r-build-system) @@ -41389,14 +41497,14 @@ natural language processing, speech recognition, translation, and more.") (define-public r-paws-management (package (name "r-paws-management") - (version "0.5.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (cran-uri "paws.management" version)) (sha256 (base32 - "0k40lrgxx91bijj3648zsgj55x120mhmx8dyx3hm2yvh2k96ks7h")))) + "0yxh3lr5b9cgsq9gmbjwfikiv38wa4d82mrq0fdqidhcsqfbz62g")))) (properties `((upstream-name . "paws.management"))) (build-system r-build-system) @@ -41483,14 +41591,14 @@ services, including Simple Storage Service (S3).") (define-public r-paws-compute (package (name "r-paws-compute") - (version "0.5.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (cran-uri "paws.compute" version)) (sha256 (base32 - "1vsxwzqgk0004nmfy79pd0zc208fczay95p7h16mzqgds9586ma1")))) + "0s1d7gj7lb6fra4l6h3c74v3hsp701qbiqirnk0q0qm7ild5399r")))) (properties `((upstream-name . "paws.compute"))) (build-system r-build-system) (propagated-inputs @@ -41506,14 +41614,14 @@ functions-as-a-service, containers, batch processing, and more.") (define-public r-paws (package (name "r-paws") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (cran-uri "paws" version)) (sha256 (base32 - "1dwk1fnsrykvgz4l3hiapcqvvajwr3kmwxl3gza07nh573j8439h")))) + "1w8jzkcr86s67rclx994zkfwqqy02mlj2gk52a198dxg737w5nw0")))) (properties `((upstream-name . "paws"))) (build-system r-build-system) (propagated-inputs @@ -41626,14 +41734,14 @@ internally managed by a zoolog thesaurus.") (define-public r-filehash (package (name "r-filehash") - (version "2.4-5") + (version "2.4-6") (source (origin (method url-fetch) (uri (cran-uri "filehash" version)) (sha256 (base32 - "0b52bnsqp65s3r4aw9mvfwfnjmsrqq8ndcadwig547nn9mwy47iv")))) + "1cc1xq6vpk5cmsr4w5i6nvkx36grd38dds4lys4gmijlldml92sm")))) (properties `((upstream-name . "filehash"))) (build-system r-build-system) (propagated-inputs (list r-digest)) @@ -42152,27 +42260,27 @@ present in the @code{testthat} package.") (define-public r-zoltr (package (name "r-zoltr") - (version "0.5.1") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "zoltr" version)) (sha256 (base32 - "12zh7y3pwidclscgvd0b0iaqq9j5y8mc8xd6pz4vs0jy5qs3ahar")))) + "0j1zyclfhl1njwyg7x4jg4vqaphiikplqa8b4ch9hrzlvjjw7zk8")))) (properties `((upstream-name . "zoltr"))) (build-system r-build-system) (propagated-inputs (list r-base64url + r-data-table r-dplyr r-httr r-jsonlite + r-lubridate r-magrittr r-mmwrweek - r-mockery r-readr - r-rlang - r-webmockr)) + r-rlang)) (native-inputs (list r-knitr)) (home-page "https://github.com/reichlab/zoltr") (synopsis "Interface to the Zoltar forecast repository API") @@ -42456,13 +42564,13 @@ for rendering equations in the HTML help files.") (define-public r-spacefillr (package (name "r-spacefillr") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (cran-uri "spacefillr" version)) (sha256 (base32 - "0raaw9ib8b2dzkh4w28wpxcgxs7ky328yaayb64lc39syf7g19dv")))) + "08ghp7ym454911yymqa15mq8d3my2qpc7mphj17akm8pyskymnkc")))) (properties `((upstream-name . "spacefillr"))) (build-system r-build-system) (propagated-inputs (list r-rcpp)) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 61328fec39..96a59e8024 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -59,7 +59,7 @@ ;;; Copyright © 2022 muradm <mail@muradm.net> ;;; Copyright © 2022 Thomas Albers Raviola <thomas@thomaslabs.org> ;;; Copyright © 2021, 2022 jgart <jgart@dismail.de> -;;; Copyright © 2023 Felix Gruber <felgru@posteo.ne +;;; Copyright © 2023, 2024 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2023 Munyoki Kilyungi <me@bonfacemunyoki.com> ;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com> @@ -195,7 +195,7 @@ (define-public duckdb (package (name "duckdb") - (version "0.9.2") + (version "1.0.0") (source (origin (method git-fetch) @@ -205,7 +205,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0dbsxyiz7c8sxflbfj87qv0b2s69zk802vsk5h00ra8w8fcbqlj0")) + "11yqgnf354g3fjj0rvsw8zzz915vf9i3jxmpchpwy09yzxd72cbg")) (modules '((guix build utils))) (snippet #~(begin @@ -614,6 +614,38 @@ the API, and provides features such as: @end itemize") (license license:bsd-3))) +(define-public python-adbc-driver-manager + (package + (name "python-adbc-driver-manager") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "adbc_driver_manager" version)) + (sha256 + (base32 "00i3zg6rbzdz767j9w22ajw8rxwbhkrmzwwlmx11q56cvnig0cm3")))) + (build-system pyproject-build-system) + (arguments + (list + ;; TODO: Pack arrow-adbc/c/driver/sqlite for tests. + #:tests? #f + #:build-backend "setuptools.build_meta")) + (propagated-inputs + (list python-typing-extensions)) + (native-inputs + (list python-cython-3 + python-pytest)) + (home-page "https://arrow.apache.org/adbc/") + (synopsis "Generic entrypoint for ADBC drivers in Python") + (description + "This package contains bindings for the ADBC Driver Manager, as well as a +@url{https://peps.python.org/pep-0249/,DBAPI 2.0/PEP 249-compatible} interface +on top. This can be used to load ADBC drivers at runtime and use them from +Python. Backend-specific packages like @code{adbc_driver_postgresql} wrap +this package in a more convenient interface, and should be preferred where +they exist.") + (license license:asl2.0))) + (define-public python-prisma (package (name "python-prisma") @@ -4618,7 +4650,7 @@ with integrated support for finding required rows quickly.") (define-public apache-arrow (package (name "apache-arrow") - (version "15.0.1") + (version "16.1.0") (source (origin (method git-fetch) @@ -4628,7 +4660,7 @@ with integrated support for finding required rows quickly.") (file-name (git-file-name name version)) (sha256 (base32 - "0zrcwsq9c976xncc1kg6lw24s5r3ag8vfzhmcnkvi5z2c9x4lvvc")))) + "1xl7apk7yaiv7cikpw5h846bsqb935cr3212b8bzhxqvkswxsm7f")))) (build-system cmake-build-system) (arguments (list @@ -5471,7 +5503,6 @@ compatible with SQLite using a graphical user interface.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:install-source? #f #:import-path "github.com/lighttiger2505/sqls")) (native-inputs diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index e82fce1fa9..e85f228119 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -75,7 +75,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "269") + (version "272") (source (origin (method git-fetch) @@ -84,7 +84,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0q2yy6aznb4sjkza06gpi01p9npp9crhcnkl5fgh32jlx1ab8sbq")))) + (base32 "1dq0q41vsmnwnf8049r962x818cgm4aq5gfjavj9yjmc3dxfc76c")))) (build-system python-build-system) (arguments (list diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 9b161182e4..ee76647475 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1308,7 +1308,6 @@ on your file system and offers to remove it. @command{rmlint} can find: (build-system go-build-system) (arguments (list - #:go go-1.18 #:install-source? #f #:import-path "github.com/gokcehan/lf")) (native-inputs diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 6a6437ff0c..eccf2e199e 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -81,55 +81,70 @@ "0mxrh0z9x4r4bli25g746n66adwnf3r42lzq0yssc50v9y7fc1a1")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules pkg-config qttools-5)) + (list extra-cmake-modules pkg-config qttools)) (inputs (list elogind glib libxcb libxkbcommon linux-pam - qtbase-5 - qtdeclarative-5 - ;; Some user-defined themes use QtQuick components internally. Adding - ;; QtQuick & co. here; they end up in QML2_IMPORT_PATH thanks to - ;; 'wrap-qt-program'. - qtgraphicaleffects - qtquickcontrols-5 - qtquickcontrols2-5 - qtsvg-5 + qtdeclarative + qtsvg shadow - wayland)) + wayland + qtwayland + qtbase + xsetroot)) (arguments - (list - #:configure-flags - #~(list - "-DENABLE_WAYLAND=ON" - "-DENABLE_PAM=ON" - ;; PAM is configured by pam service. - "-DINSTALL_PAM_CONFIGURATION=OFF" - ;; Both flags are required for elogind support. - "-DNO_SYSTEMD=ON" - "-DUSE_ELOGIND=ON" - "-DCONFIG_FILE=/etc/sddm.conf" - ;; Set path to /etc/login.defs. - ;; An alternative would be to use -DUID_MIN and -DUID_MAX. - (string-append "-DLOGIN_DEFS_PATH=" - #$(this-package-input "shadow") - "/etc/login.defs") - (string-append "-DCMAKE_CXX_FLAGS=-I" - #$(this-package-input - "qtdeclarative") "/include/qt5") - (string-append "-DQT_IMPORTS_DIR=" - #$output "/lib/qt5/qml") - (string-append "-DCMAKE_INSTALL_SYSCONFDIR=" - #$output "/etc")) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'embed-loginctl-reference - (lambda _ - (substitute* "CMakeLists.txt" - (("/usr/bin/loginctl") - (which "loginctl")))))))) + (let* ((qtbase (this-package-input "qtbase")) + (qt6? (string= "6" (version-major (package-version qtbase))))) + (list + #:qtbase qtbase + #:configure-flags + #~(list + #$@(if qt6? + #~("-DBUILD_WITH_QT6=ON") + #~()) + "-DENABLE_WAYLAND=ON" + "-DENABLE_PAM=ON" + ;; PAM is configured by pam service. + "-DINSTALL_PAM_CONFIGURATION=OFF" + ;; Both flags are required for elogind support. + "-DNO_SYSTEMD=ON" + "-DUSE_ELOGIND=ON" + "-DCONFIG_FILE=/etc/sddm.conf" + ;; Set path to /etc/login.defs. + ;; An alternative would be to use -DUID_MIN and -DUID_MAX. + (string-append "-DLOGIN_DEFS_PATH=" + #$(this-package-input "shadow") + "/etc/login.defs") + (string-append + "-DCMAKE_CXX_FLAGS=-I" + #$(this-package-input "qtdeclarative") "/include/qt" #$(if qt6? "6" "5")) + (string-append "-DQT_IMPORTS_DIR=" + #$output "/lib/qt" #$(if qt6? "6" "5") "/qml") + (string-append "-DCMAKE_INSTALL_SYSCONFDIR=" + #$output "/etc")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'embed-loginctl-reference + (lambda _ + (substitute* "CMakeLists.txt" + (("/usr/bin/loginctl") + (which "loginctl"))))) + (add-after 'unpack 'embed-xsetroot-reference + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("src/daemon/XorgDisplayServer.cpp" + "src/helper/xorguserhelper.cpp") + (("xsetroot") + (search-input-file inputs "/bin/xsetroot"))))) + #$@(if qt6? + #~((add-after 'unpack 'fix-QML_IMPORT_PATH + (lambda _ + (substitute* "src/daemon/Greeter.cpp" + (("QML2_IMPORT_PATH") + "QML_IMPORT_PATH"))))) + #~()))))) (synopsis "QML based X11 and Wayland display manager") (description "SDDM is a display manager for X11 and Wayland aiming to be fast, simple and beautiful. SDDM is themeable and puts no restrictions on the @@ -139,6 +154,19 @@ to create smooth, animated user interfaces.") ;; QML files are MIT licensed and images are CC BY 3.0. (license (list license:gpl2+ license:expat license:cc-by3.0)))) +(define-public sddm-qt5 + (package + (inherit sddm) + (name "sddm-qt5") + (native-inputs (modify-inputs (package-native-inputs sddm) + (replace "qttools" qttools-5))) + (inputs (modify-inputs (package-inputs sddm) + (replace "qtbase" qtbase-5) + (replace "qtsvg" qtsvg-5) + (replace "qtdeclarative" qtdeclarative-5) + (replace "qtwayland" qtwayland-5) + (append qtgraphicaleffects qtquickcontrols-5 qtquickcontrols2-5))))) + (define-public abstractdark-sddm-theme (let ((commit "e817d4b27981080cd3b398fe928619ffa16c52e7") (revision "0")) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 12fbaf1d0c..2a047ba790 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2022 Maxim Cournoyer <maxim.counoyer@gmail.com> ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2024 Felix Gruber <felgru@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -410,52 +411,49 @@ the Net to search for documents which are not on the local system.") (license license:lgpl2.1+))) (define-public zeal - (let ((commit "1cfa7c637f745be9d98777f06b4f8dec90892bf2") - (revision "1")) - (package - (name "zeal") - (version (git-version "0.6.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/zealdocs/zeal") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1m7pp3cwc21x03718vhwfd9j2n8md3hv5dp10s234vcsd755s7a3")))) - (build-system qt-build-system) - (arguments - `(#:tests? #f ;no tests - #:phases - (modify-phases %standard-phases + (package + (name "zeal") + (version "0.7.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zealdocs/zeal") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1yz9zz18rh1d67w40ib4pna70vqkwa9i9nyj423rjysv5rdj2pzp")))) + (build-system qt-build-system) + (arguments + (list + #:tests? #f ;no tests + #:phases + #~(modify-phases %standard-phases (add-after 'wrap 'wrap-qt-process-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/zeal")) - (qt-process-path (string-append - (assoc-ref inputs "qtwebengine-5") - "/lib/qt5/libexec/QtWebEngineProcess"))) + (lambda* (#:key inputs #:allow-other-keys) + (let* ((bin (string-append #$output "/bin/zeal")) + (qt-process-path + (search-input-file inputs + "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-program bin - `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))) - #t)))))) - (native-inputs - (list extra-cmake-modules pkg-config)) - (inputs - `(("libarchive" ,libarchive) - ("sqlite" ,sqlite) - ("qtbase" ,qtbase-5) - ("qtdeclarative-5" ,qtdeclarative-5) - ("qtwebchannel-5" ,qtwebchannel-5) - ("qtwebengine-5" ,qtwebengine-5) - ("qtquickcontrols-5" ,qtquickcontrols-5) - ("qtx11extras" ,qtx11extras) - ("xcb-util-keyms" ,xcb-util-keysyms))) - (home-page "https://zealdocs.org/") - (synopsis "Offline documentation browser inspired by Dash") - (description "Zeal is a simple offline documentation browser + `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) + (native-inputs + (list extra-cmake-modules pkg-config)) + (inputs + (list libarchive + sqlite + qtbase-5 + qtdeclarative-5 + qtwebchannel-5 + qtwebengine-5 + qtquickcontrols-5 + qtx11extras + xcb-util-keysyms)) + (home-page "https://zealdocs.org/") + (synopsis "Offline documentation browser inspired by Dash") + (description "Zeal is a simple offline documentation browser inspired by Dash.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public markdeep (package diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 4e809f1098..4a14e44a6b 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -114,7 +114,6 @@ (build-system go-build-system) (arguments (list - #:go go-1.18 #:install-source? #f #:import-path "github.com/xalanq/cf-tool" #:phases @@ -221,7 +220,7 @@ of categories with some of the activities available in that category. (define-public gcompris-qt (package (name "gcompris-qt") - (version "3.2") + (version "4.1") (source (origin (method url-fetch) @@ -229,7 +228,7 @@ of categories with some of the activities available in that category. "mirror://kde/stable/gcompris/qt/src/gcompris-qt-" version ".tar.xz")) (sha256 - (base32 "06yisr5qd2ri8qgpmlri0yic45fdfcdjn12anp17f6kvv83lk2js")))) + (base32 "1186ba3vn59fqdpgbvnvxqm8a3b7ginmw1sb3m5fr2az40xiqg9z")))) (build-system qt-build-system) (arguments `(#:phases @@ -678,34 +677,56 @@ hours.") language and very flexible regarding to new or unknown keyboard layouts.") (license license:gpl3+))) +(define-public kqtquickcharts + (package + (name "kqtquickcharts") + (version "24.05.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/kqtquickcharts-" version ".tar.xz")) + (sha256 + (base32 + "0b0nqg77lzfw6accfsr4yg9fgq78skryd1qwkqf1zijhq4h65708")))) + (build-system qt-build-system) + (native-inputs (list extra-cmake-modules)) + (inputs (list qtdeclarative-5)) + (home-page "https://invent.kde.org/libraries/kqtquickcharts") + (synopsis "QtQuick plugin to render beautiful and interactive charts") + (description + "This package provides a QtQuick plugin to render beautiful and interactive +charts.") + (license (list license:lgpl2.0+ license:gpl2+)))) + (define-public ktouch (package (name "ktouch") - (version "21.12.2") + (version "24.05.2") (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/ktouch-" version ".tar.xz")) - (sha256 - (base32 "1rq2n8395sb17rqd295axv2pbwzhqs8ikjqx5ryn4lv1713alabl")))) + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/ktouch-" version ".tar.xz")) + (sha256 + (base32 "1636s1brigmd7wbmjlfgz2qlrrp592rrk9nylh9bi0j1nf3xa8c5")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools pkg-config)) + (list extra-cmake-modules kdoctools-5 pkg-config)) (inputs - (list kcmutils - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kdeclarative - ki18n - kiconthemes - kitemviews - ktextwidgets - kwidgetsaddons - kwindowsystem - kxmlgui + (list kcmutils-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kdeclarative-5 + ki18n-5 + kiconthemes-5 + kitemviews-5 + ktextwidgets-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 + kqtquickcharts libxcb libxkbfile qtbase-5 diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index e646fe7dd6..895ede25dd 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -41,7 +41,7 @@ (define-public elixir (package (name "elixir") - (version "1.17.1") + (version "1.17.2") (source (origin (method git-fetch) @@ -50,7 +50,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1nav5mv52l2sd37rhdnr4scqfnnnb04r481qabdqvfmfdvikxc3b")) + (base32 "063pfz6ljy22b4nyvk8pi8ggqb6nmzqcca08vnl3h9xgh1zzddpj")) (patches (search-patches "elixir-path-length.patch")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 76cd340e5e..75be8999ae 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1269,6 +1269,25 @@ out of the box.") is based off of Slim mode.") (license license:gpl3+))) +(define-public emacs-sed-mode + (package + (name "emacs-sed-mode") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/sed-mode-" version + ".tar")) + (sha256 + (base32 "0zhga0xsffdcinh10di046n6wbx35gi1zknnqzgm9wvnm2iqxlyn")))) + (build-system emacs-build-system) + (home-page "https://elpa.gnu.org/packages/sed-mode.html") + (synopsis "Major mode to edit sed scripts") + (description + "The Sed major mode provides basic support for sed scripts. The +functionalities supported are font-locking and auto-indentation.") + (license license:gpl3+))) + (define-public emacs-spaceline-all-the-icons (package (name "emacs-spaceline-all-the-icons") @@ -3730,6 +3749,43 @@ framework as the user interface, which integrates well with Vertico or Selectrum.") (license license:gpl3+))) +(define-public emacs-empv + (let ((commit "8cc9b0a425b6989d30f91bf90e9b09bd00581f07") + (revision "1")) + (package + (name "emacs-empv") + (version (git-version "4.3.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/isamert/empv.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06dphwj9vi39dbpif3kzp6azs80klh13s9l22a6ddz91kmds2myy")))) + (build-system emacs-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'set-default-binaries + (lambda* (#:key inputs #:allow-other-keys) + (emacs-substitute-variables "empv.el" + ("empv-fd-binary" (search-input-file inputs "/bin/fd")) + ("empv-mpv-binary" (search-input-file inputs "/bin/mpv")))))))) + (inputs (list fd mpv)) + (propagated-inputs (list emacs-compat emacs-consult emacs-s)) + (home-page "https://github.com/isamert/empv.el") + (synopsis + "Emacs multimedia player, media library manager, YouTube frontend") + (description + "This package is an Emacs multimedia player based on mpv. It offers +a comprehensive interface to mpv, including convenient features such as an +embedded radio manager, YouTube integration, and a local music and video +library manager.") + (license license:gpl3+)))) + (define-public emacs-marginalia-emprise (package (name "emacs-marginalia-emprise") @@ -17794,7 +17850,7 @@ you to deal with multiple log levels.") (define-public emacs-denote (package (name "emacs-denote") - (version "2.3.5") + (version "3.0.6") (source (origin (method git-fetch) @@ -17803,7 +17859,7 @@ you to deal with multiple log levels.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "11rdmwdjaqzzrhnyidk02z2gd98qih8pnrc1vvbxvai50w8bdg2m")))) + (base32 "0m5cdzk1mjcg5wrmgrgk165pwwgq3wjfcxzqs0xhrz6l033rsfwq")))) (build-system emacs-build-system) (native-inputs (list texinfo)) (home-page "https://protesilaos.com/emacs/denote/") @@ -17983,6 +18039,31 @@ files in Emacs. Files of this type (e.g., @file{BUILD.gn} or @file{*.gni}) are common in Chromium-derived projects.") (license license:bsd-3))) +(define-public emacs-gnosis + (package + (name "emacs-gnosis") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.thanosapollo.org/gnosis") + (commit version))) + (sha256 + (base32 + "19mzyg4hg6mplv3s2kb8xiaw06zkbj7a3gvfvy51cwvb8k979ap6")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-compat emacs-emacsql)) + (home-page "https://thanosapollo.org/projects/gnosis") + (synopsis "Spaced repetition system for GNU Emacs") + (description + "Gnosis is a spaced repetition system for note-taking and self-testing +where notes are formatted as Question/Answer/Explanation. Notes are reviewed +at spaced intervals based on the success or failure in recalling the answer to +each question.") + (license license:gpl3+))) + (define-public emacs-drag-stuff (package (name "emacs-drag-stuff") @@ -20272,8 +20353,8 @@ one if it fails.") (define-public emacs-jabber ;; No releases available. - (let ((commit "af0315e174fa6446d5c4dd3e6465d48912950e58") - (revision "0")) + (let ((commit "e766d84b81d5df6abc30fcbbb94f7c8640ea54e2") + (revision "1")) (package (name "emacs-jabber") (version (git-version "0.8.92" revision commit)) @@ -20285,7 +20366,7 @@ one if it fails.") (file-name (git-file-name name version)) (sha256 (base32 - "08q0hbm4pvp8sf261w1ihqa93sg8blfybfkhq7wrnvgs6kasgwvq")))) + "0b6msdyvhjr4v4j8hl6kmcjks88iq001w1fhjgfvg8ii9n77n6xn")))) (build-system emacs-build-system) (arguments (list @@ -23246,8 +23327,8 @@ object has been freed.") (license license:unlicense))) (define-public emacs-emacsql - (let ((commit "29194a63ede3ee24c7457c2fde03b0f1320ca4b1") - (revision "1")) + (let ((commit "efddd69c5e69214dbbe921fbf90f938501414894") + (revision "2")) (package (name "emacs-emacsql") (version (git-version "3.1.1" revision commit)) @@ -23259,7 +23340,7 @@ object has been freed.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "14yj53xxqi3009bdj39k2fqwyc896yp2m7gdkgyv47wlkh1xwzxh")))) + (base32 "1abwc7kzlmk6z68glnya6kxffrrqrhgpwrpzqpjc1l179gg1i1rg")))) (build-system emacs-build-system) (arguments (list @@ -26400,6 +26481,27 @@ perform regression test for packages that provide font-lock rules.") It follows DrRacket concepts where applicable.") (license license:gpl2+)))) +(define-public emacs-ob-racket + (package + (name "emacs-ob-racket") + (version "1.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hasu/emacs-ob-racket") + (commit version))) + (sha256 + (base32 + "0bqhxi1nikxwc0gyqsnxc7ya2s41vc06w39s24qz64kja8zqzzya")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (home-page "https://github.com/hasu/emacs-ob-racket") + (synopsis "Org Babel support for Racket") + (description + "This package adds spport for working with Racket code blocks with +Org Babel in Org mode.") + (license license:gpl3+))) + (define-public emacs-grep-context (let ((commit "5a4e3efdf775755c1bbefcfe4b461c1166d81d7d") (revision "1")) @@ -29210,10 +29312,10 @@ and comments.") (license license:gpl3+)))) (define-public emacs-yeetube - (let ((commit "c9721a295f4fd30a44e94b3424151fa8a14d22ae")) ;version bump + (let ((commit "5c0a3efd2fb5cc25a6a90741ad198e31fdb15640")) ;version bump (package (name "emacs-yeetube") - (version "2.1.6") + (version "2.1.7") (source (origin (method git-fetch) @@ -29222,7 +29324,7 @@ and comments.") (commit commit))) (sha256 (base32 - "0lrcs0n30h800sm6py4av44a3fcfgasmj223mnl76q34syyrgz6k")) + "0a3pm8cz6yl5s2xnbnjvdwm8mf5hyman419xl4fyyfgwy6vrxp70")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments @@ -29244,13 +29346,12 @@ and comments.") (inputs (list mpv torsocks yt-dlp)) (propagated-inputs (list emacs-compat)) (home-page "https://thanosapollo.org/projects/yeetube/") - (synopsis "Youtube and Invidious front-end for Emacs") + (synopsis "Youtube front-end for Emacs") (description - "This package offers an Emacs interface that allows you to search YouTube -or an Invidious instance for a specific query. The search results are shown -as links in an Org mode buffer. The videos can be opened to a user-defined + "This package provides the ability to scrape YouTube, with the results +displayed in a tabulated list format. The videos can be opened with a user-defined video player (by default @command{mpv}) or downloaded using @command{yt-dlp}. -This package also includes a @code{yt-dlp} front-end.") +This package also includes a minimal @code{yt-dlp} wrapper.") (license license:gpl3+)))) (define-public emacs-org-web-tools @@ -33032,10 +33133,64 @@ You might want to use this to globally set dir-local variables that apply to all of your projects, then override or add variables on a per-project basis.") (license license:gpl3+)))) +(define-public emacs-casual-avy + (package + (name "emacs-casual-avy") + (version "1.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kickingvegas/casual-avy") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1n369d7yk6wr5b1145zxviiri1n2f8pzfmzchcnii34zwa2y7x2y")))) + (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "lisp")))))) + (propagated-inputs (list emacs-casual-lib emacs-avy)) + (home-page "https://github.com/kickingvegas/casual-avy") + (synopsis "Transient-based porcelain for avy") + (description + "Casual Avy is an opinionated Transient-based porcelain for Emacs Avy.") + (license license:gpl3+))) + +(define-public emacs-casual-calc + (package + (name "emacs-casual-calc") + (version "1.10.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kickingvegas/casual-calc") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qdi6p3aybg0zwscf35l2dx51q7h4rz2g7r4xf7ml520dag7h5cw")))) + (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "lisp")))))) + (propagated-inputs (list emacs-casual-lib)) + (home-page "https://github.com/kickingvegas/casual-calc") + (synopsis "Transient-based porcelain for calc") + (description + "Casual Calc is an opinionated Transient-based porcelain for Emacs Calc.") + (license license:gpl3+))) + (define-public emacs-casual-dired (package (name "emacs-casual-dired") - (version "1.5.0") + (version "1.6.0") (source (origin (method git-fetch) @@ -33044,7 +33199,7 @@ all of your projects, then override or add variables on a per-project basis.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "17a2jgm01hjhq1nkx50bm5qakb0inf0x6vry57n33jq4ay1kfnfq")))) + (base32 "01yyhamslbnzf7w2hn5c8gpjjnw1aclyf9265pvdnxsyb4jdyi5k")))) (build-system emacs-build-system) (arguments (list @@ -34861,43 +35016,45 @@ contrast and few colors.") (license license:gpl3+)))) (define-public emacs-doom-themes - (package - (name "emacs-doom-themes") - (version "2.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hlissner/emacs-doom-themes") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "120pcas0l1m6w551qxfcl2fx0aysjqp91nn47zdxrr8rs01654wr")))) - (build-system emacs-build-system) - (native-inputs - (list emacs-ert-runner)) - (arguments - (list #:tests? #t - #:test-command #~(list "ert-runner") - #:modules '((guix build emacs-build-system) - (guix build utils) - (guix build emacs-utils) - (srfi srfi-1)) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'move-themes - (lambda _ - ;; Move the source files to the top level, which is in the - ;; EMACSLOADPATH. - (for-each (lambda (f) - (rename-file f (basename f))) - (append - (find-files "./themes" ".*\\.el$") - (find-files "./extensions" ".*\\.el$")))))))) - (synopsis "Wide collection of color themes for Emacs") - (description "Emacs-doom-themes contains numerous popular color themes for + (let ((commit "188ab05eefe2bdc46b4464aadb4a52ff9cb42f7f") + (revision "0")) + (package + (name "emacs-doom-themes") + (version (git-version "2.3.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/doomemacs/themes") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08avm5jfp887r2l77s6i0zn72wlv4kp47b2vzv3kywf3d0gkpgp8")))) + (build-system emacs-build-system) + (native-inputs + (list emacs-ert-runner)) + (arguments + (list #:tests? #t + #:test-command #~(list "ert-runner") + #:modules '((guix build emacs-build-system) + (guix build utils) + (guix build emacs-utils) + (srfi srfi-1)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'move-themes + (lambda _ + ;; Move the source files to the top level, which is in the + ;; EMACSLOADPATH. + (for-each (lambda (f) + (rename-file f (basename f))) + (append + (find-files "./themes" ".*\\.el$") + (find-files "./extensions" ".*\\.el$")))))))) + (synopsis "Wide collection of color themes for Emacs") + (description "Emacs-doom-themes contains numerous popular color themes for Emacs that integrate with major modes like Org-mode.") - (home-page "https://github.com/hlissner/emacs-doom-themes") - (license license:expat))) + (home-page "https://github.com/doomemacs/themes") + (license license:expat)))) (define-public emacs-modus-themes (package @@ -35182,6 +35339,28 @@ when the command was not found in Eshell. The suggestions are found after the commands that bear resemblance to the input command.") (license license:gpl3+))) +(define-public emacs-eshell-git-prompt + (package + (name "emacs-eshell-git-prompt") + (version "0.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xuchunyang/eshell-git-prompt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13b7nr0819pgzyvh0szi0zjyazgpxmsbqcz65cccyhh2pq48zb7j")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-dash)) + (home-page "https://github.com/xuchunyang/eshell-git-prompt") + (synopsis "Themes for Emacs Shell (Eshell) prompt") + (description + "This package provides a variety of themes for Emacs Shell (Eshell) +prompt.") + (license license:gpl3+))) + (define-public emacs-unfill (package (name "emacs-unfill") diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6557180139..ed186d221c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -566,12 +566,12 @@ editor (with wide ints)" ) #~(cons "--with-wide-int" #$flags)))))) (define-public emacs-next-minimal - (let ((commit "170c6557922dad7e6e9bc0d6dadf6c080108fd42") - (revision "2")) + (let ((commit "4e22ef870c4b650f29c4441ac51b6a2ac506ea57") + (revision "1")) (package (inherit emacs-minimal) (name "emacs-next-minimal") - (version (git-version "30.0.50" revision commit)) + (version (git-version "30.0.60" revision commit)) (source (origin (method git-fetch) @@ -580,7 +580,7 @@ editor (with wide ints)" ) (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "04carva3b6h9fnlzazrsxsj41hcnjc26kxjij07l159azi40l6sk")) + (base32 "1zl9ffj3ph4msr1r4qw09x1wljpv2lbr7ypqd0p3q89m2qpvfn80")) (patches (search-patches "emacs-next-exec-path.patch" "emacs-fix-scheme-indent-function.patch" @@ -598,7 +598,28 @@ editor (with wide ints)" ) (string-drop (package-name emacs) (string-length "emacs")))))) (version version) - (source source))) + (source source) + (arguments + (substitute-keyword-arguments (package-arguments emacs) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'validate-comp-integrity + (lambda* (#:key outputs #:allow-other-keys) + #$(cond + ((%current-target-system) + #~(display + "Cannot validate native compilation on cross builds.\n")) + ((member (%current-system) '("armhf-linux" "i686-linux")) + #~(display "Integrity test is broken on 32 bit systems.\n")) + (else + #~(invoke + (string-append (assoc-ref outputs "out") "/bin/emacs") + "--batch" + "--load" + #$(local-file + (search-auxiliary-file + "emacs/comp-integrity-next.el")) + "-f" "ert-run-tests-batch-and-exit"))))))))))) (define-public emacs-next (emacs->emacs-next emacs)) (define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk)) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 4471de9040..f2b93666b1 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -61,11 +61,13 @@ #:use-module (gnu packages boost) #:use-module (gnu packages cdrom) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages containers) #:use-module (gnu packages cross-base) #:use-module (gnu packages curl) #:use-module (gnu packages digest) + #:use-module (gnu packages engineering) #:use-module (gnu packages elf) #:use-module (gnu packages flex) #:use-module (gnu packages fltk) @@ -113,6 +115,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system python) + #:use-module (guix build-system pyproject) #:use-module (guix build-system qt)) (define-public vice @@ -2296,106 +2299,24 @@ graphic filters. Some of its features include: (license license:gpl2+) (supported-systems (list "x86_64-linux")))) -;; python-pwntools requires a -rc release of unicorn (define-public unicorn - (let ((unless-x86 - (lambda (code) - (if (member (%current-system) '("x86_64-linux" "i686-linux")) - '() - code)))) - (package - (name "unicorn") - (version "1.0.2-rc4") - ;; NOTE: unicorn ships a bundled QEMU, but with a lot of custom modifications. - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/unicorn-engine/unicorn") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "17nyccgk7hpc4hab24yn57f1xnmr7kq4px98zbp2bkwcrxny8gwy")))) - (outputs '("out" "python")) - ;; The main library is not written in Python, but the build process has - ;; little in common with any defined build system, so we might as well - ;; build on top of python-build-system and make use of all - ;; the Python-specific phases that can be reused. - (build-system python-build-system) - (arguments - `(#:modules ((srfi srfi-26) - (guix build python-build-system) - (guix build utils)) - #:phases - (modify-phases %standard-phases - (add-before 'build 'build-library - (lambda* (#:key inputs #:allow-other-keys) - (invoke "make" - "-j" (number->string (parallel-job-count)) - "UNICORN_STATIC=no" - "CC=gcc"))) - (add-after 'build-library 'install-library - (lambda* (#:key outputs #:allow-other-keys) - (invoke "make" "install" - "UNICORN_STATIC=no" - (string-append - "PREFIX=" - (assoc-ref outputs "out"))))) - (add-before 'build 'prepare-bindings - (lambda* (#:key outputs #:allow-other-keys) - (chdir "bindings/python") - ;; Set this environment variable so that the Python bindings - ;; don't build their own copy of the shared object, but use - ;; a dummy value such that the bindings test suite uses the - ;; same mechanism for loading the library as any other user. - (setenv "LIBUNICORN_PATH" "1") - (substitute* "unicorn/unicorn.py" - (("_path_list = \\[.*") - (string-append - "_path_list = [\"" - (assoc-ref outputs "out") - ;; eat the rest of the list - "/lib\"] + 0*["))) - #t)) - (add-before 'check 'check-library - (lambda* (#:key outputs #:allow-other-keys) - (for-each - (lambda (suite) - (with-directory-excursion - (string-append "../../tests/" suite) - (invoke "make" "test" "CC=gcc" - ,@(unless-x86 - '("AS=i686-unknown-linux-gnu-as" - "OBJCOPY=i686-unknown-linux-gnu-objcopy"))))) - '("unit" "regress")) - #t)) - (add-after 'install 'install-samples - (lambda* (#:key outputs #:allow-other-keys) - (let* ((python-samples (find-files "." "sample_.*")) - (c-samples (find-files "../../samples" ".*\\.c")) - (python-docdir - (string-append (assoc-ref outputs "python") - "/share/doc/unicorn/samples")) - (c-docdir - (string-append (assoc-ref outputs "out") - "/share/doc/unicorn/samples"))) - (for-each (cut install-file <> c-docdir) c-samples) - (for-each (cut install-file <> python-docdir) python-samples) - #t)))))) - (native-inputs - ;; NOTE: cross-binutils needs to be wrapped with unless-x86, as otherwise - ;; the linker provided by the package will be used, circumventing the ld-wrapper. - `(,@(unless-x86 - `(("assembler-for-tests" ,(cross-binutils "i686-unknown-linux-gnu")))) - ("cmocka" ,cmocka) - ("hexdump-for-tests" ,util-linux))) - (home-page "https://www.unicorn-engine.org") - (synopsis "Unicorn CPU emulator framework") - (description - "Unicorn is a lightweight, multi-platform, multi-architecture CPU emulator -framework based on QEMU.") - (license license:gpl2+)))) + (package + (name "unicorn") + (version "2.0.1.post1") + (source + (origin + (method url-fetch) + (uri (pypi-uri name version)) + (sha256 + (base32 "0mlfs8qfi0clyncfkbxp6in0cpl747510i6bqymwid43xcirbikz")))) + (build-system pyproject-build-system) + (native-inputs (list cmake pkg-config)) + (home-page "https://www.unicorn-engine.org") + (synopsis "Generic CPU emulator framework") + (description + "Uniforn is a lightweight, multi-platform, multi-architecture CPU +emulator framework based on QEMU.") + (license license:gpl2+))) (define-public ppsspp (package @@ -2702,6 +2623,55 @@ cache visualization. Developed at FEE CTU for computer architecture classes.") stack-machine, written in ANSI C. Graphical output is implemented using SDL2.") (license license:expat)))) +(define-public python-keystone-engine + (package + (name "python-keystone-engine") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "keystone-engine" version)) + (sha256 + (base32 "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig")))) + (native-inputs (list cmake)) + (build-system pyproject-build-system) + (home-page "https://www.keystone-engine.org") + (synopsis + "Lightweight multi-platform, multi-architecture assembler framework") + (description + "Keystone is a lightweight multi-platform, multi-architecture +assembler framework. It supports a wide-range of different architectures +and offers an intuitive architecture-neutral API for interacting with +assembly for these architectures.") + (license license:gpl2))) + +(define-public python-archinfo + (package + (name "python-archinfo") + ;; Must be the same version as python-angr. + (version "9.2.46") + (source + (origin + (method url-fetch) + (uri (pypi-uri "archinfo" version)) + (sha256 + (base32 "037xfq3wcf8ngayxz9623l4646m780v2102mfbygpzbkkjha1966")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-capstone python-keystone-engine)) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest")))))))) + (home-page "https://github.com/angr/archinfo") + (synopsis "Extract architecture-specific information from binaries") + (description + "Collection of classes that contain architecture-specific information +information. Useful for cross-architecture tools (such as @code{python-pyvex}).") + (license license:bsd-2))) + (define-public emu8051 (let ((commit "5dc681275151c4a5d7b85ec9ff4ceb1b25abd5a8") (revision "1")) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 64335d89f7..4e465ddb7d 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -819,7 +819,7 @@ required for Fritzing app.") (native-inputs (list pkg-config qttools-5)) (inputs - (list kcoreaddons kwidgetsaddons qtbase-5 qtsvg-5 sqlite)) + (list kcoreaddons-5 kwidgetsaddons-5 qtbase-5 qtsvg-5 sqlite)) (home-page "https://qelectrotech.org/") (synopsis "CAD/CAE editor focusing on schematics drawing features") (description "QElectroTech, or QET in short, is a desktop application to @@ -1670,7 +1670,7 @@ fully-vectorial and three-dimensional methods.") (define-public meep (package (name "meep") - (version "1.28.0") + (version "1.29.0") (source (origin (method url-fetch) (uri @@ -1679,7 +1679,7 @@ fully-vectorial and three-dimensional methods.") version "/meep-" version ".tar.gz")) (sha256 (base32 - "199a29mb64cfv89azzdh8arpy9ib6050cqh86yw5ypm5jhy6178v")))) + "1511849g6wlpa42kfrj6zvmc3ivad9ync8r01xp2ld7r5j39y9v8")))) (build-system gnu-build-system) (arguments (list #:configure-flags @@ -1787,6 +1787,7 @@ analyzer (FFT) and frequency sweep plot.") (version "5.0.1") (source (origin (method git-fetch) + (patches (search-patches "capstone-fix-python-constants.patch")) (uri (git-reference (url "https://github.com/capstone-engine/capstone") (commit version))) @@ -1798,7 +1799,7 @@ analyzer (FFT) and frequency sweep plot.") (arguments `(#:tests? #f #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - "CC=gcc") + (string-append "CC=" ,(cc-for-target))) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script @@ -2626,10 +2627,69 @@ specification can be downloaded at @url{http://3mf.io/specification/}.") measurement devices and test equipment via GPIB, RS232, Ethernet or USB.") (license license:expat))) +(define-public python-pandapower + (package + (name "python-pandapower") + (version "2.14.9") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pandapower" version ".zip")) + (sha256 + (base32 "0c5vgiq795kd5q4wcy2x7s3l7x9xdj2nqyfx188dmhgqckrym161")))) + (build-system pyproject-build-system) + (native-inputs (list python-pyproj python-pytest unzip)) + (propagated-inputs (list python-deepdiff + python-geojson + python-networkx + python-numpy + python-packaging + python-pandas + python-scipy + python-tqdm + python-typing-extensions)) + (home-page "https://www.pandapower.org/") + (synopsis "Power system modelling and analysis") + (description "@code{pandapower} is an easy to use network calculation +program aimed to automate the analysis and optimization of power systems. +It uses the data analysis library @code{pandas} and is compatible with the +commonly used @code{MATPOWER} / @code{PYPOWER} case format. @code{pandapower} +allows using different solvers including an improved Newton-Raphson power flow +implementation, all @code{PYPOWER} solvers, the C++ library solvers for fast +steady-state distribution power system analysis of @code{PowerGridModel}, the +Newton-Raphson power flow solvers in the C++ library lightsim2grid, and the +@code{PowerModels.jl} library.") + (license license:bsd-3))) + +(define-public python-pandapipes + (package + (name "python-pandapipes") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pandapipes" version ".zip")) + (sha256 + (base32 "06yqqd25hxa6q49qcbpy0njwxkqzfhbff4frrrxd84391njgvdhq")))) + (build-system pyproject-build-system) + (native-inputs (list python-nbmake + python-pytest + python-pytest-xdist + unzip)) + (propagated-inputs (list python-matplotlib + python-pandapower + python-shapely)) + (home-page "http://www.pandapipes.org") + (synopsis "Simulation of multi energy grids") + (description + "This package provides a pipeflow calculation tool that complements +@code{pandapower} in the simulation of multi energy grids.") + (license license:bsd-3))) + (define-public python-scikit-rf (package (name "python-scikit-rf") - (version "1.0.0") + (version "1.1.0") (source (origin (method git-fetch) ;PyPI misses some files required for tests (uri (git-reference @@ -2637,7 +2697,7 @@ measurement devices and test equipment via GPIB, RS232, Ethernet or USB.") (commit (string-append "v" version)))) (sha256 (base32 - "0qfijh2r93jn3za2h9wdv2y49gd4alcww35zrdvmxrx6kbv67m2f")) + "0ji1c8b9cbgb0w18dx976hza690npkypz8kav4a3yin2wysjvf64")) (file-name (git-file-name name version)))) (build-system pyproject-build-system) (propagated-inputs (list python-matplotlib @@ -2663,6 +2723,41 @@ measurement devices and test equipment via GPIB, RS232, Ethernet or USB.") Microwave engineering.") (license license:bsd-3))) +(define-public python-lcapy + (package + (name "python-lcapy") + (version "1.23") + (source + (origin + (method url-fetch) + (uri (pypi-uri "lcapy" version)) + (sha256 + (base32 "13swd2nd2s20hixy4as924sr223flcvcy9zw3qlzsrcvhppzb84n")))) + (build-system pyproject-build-system) + (arguments + (list + ;; This test fails by FileNotFoundError (a schematic file), possibly + ;; because it's not included in PyPI. + #:test-flags #~(list "-k" "not test_circuitgraph"))) + (propagated-inputs (list python-ipython + python-matplotlib + python-networkx + python-numpy + python-property-cached + python-scipy + python-sympy + python-wheel)) + (native-inputs (list python-pytest)) + (home-page "https://github.com/mph-/lcapy") + (synopsis "Symbolic linear circuit analysis") + (description "Lcapy is a Python package for linear circuit analysis. It +uses SymPy for symbolic mathematics. + +Lcapy can symbolically analyse circuits described with netlists or by +series/parallel combinations of components. It can also manipulate +ontinuous-time and discret-time expressions.") + (license license:lgpl2.1+))) + (define-public openscad (package (name "openscad") diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index aba0be21e7..c45913f09c 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2022 Dominic Martinez <dom@dominicm.dev> ;;; Copyright © 2022 dan <i@dan.games> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -317,18 +318,22 @@ IM module for GTK+3 applications. (base32 "0jdisavns5k718vrnh2lmmyrnys101szbw107d200nfl4i26wllj")))) (build-system cmake-build-system) (arguments - `(#:configure-flags - (list (string-append "-DCMAKE_INSTALL_QT5PLUGINDIR=" - %output "/lib/qt5/plugins") - "-DENABLE_QT4=Off"))) - (inputs - `(("fcitx5" ,fcitx5) - ("libxcb" ,libxcb) - ("libxkbcommon" ,libxkbcommon) - ("qtbase" ,qtbase-5) - ("gettext" ,gettext-minimal))) - (native-inputs - (list extra-cmake-modules)) + (list #:configure-flags + #~(list (string-append "-DCMAKE_INSTALL_QT5PLUGINDIR=" + #$output "/lib/qt5/plugins") + (string-append "-DCMAKE_INSTALL_QT6PLUGINDIR=" + #$output "/lib/qt6/plugins") + "-DENABLE_QT4=Off" + "-DENABLE_QT6=ON"))) + (inputs (list fcitx5 + libxcb + libxkbcommon + qtbase-5 + qtbase + qtwayland + wayland + gettext-minimal)) + (native-inputs (list extra-cmake-modules)) (home-page "https://github.com/fcitx/fcitx5-qt") (synopsis "Qt library and IM module for Fcitx 5") (description "Fcitx5-qt provides Qt library for development and IM module @@ -439,19 +444,20 @@ including input methods previous bundled inside Fcitx 4: (sha256 (base32 "1pnwrj6kgha91djfvd2439nbhrmjargpw8ashhb91y5h3cdz7vhz")))) (build-system cmake-build-system) + (arguments (list #:configure-flags #~(list "-DUSE_QT6=ON"))) (inputs (list fcitx5 fcitx5-qt - qtbase-5 - qtx11extras - qtdeclarative-5 - qtquickcontrols2-5 + qtbase + qtdeclarative + ksvg + kcmutils ki18n kpackage kdeclarative kiconthemes kcoreaddons - plasma-framework + libplasma kitemviews kwidgetsaddons kwindowsystem diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index fa7da35898..707937b78c 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1956,7 +1956,6 @@ memory-efficient.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/oniony/TMSU" #:unpack-path "github.com/oniony/TMSU" #:install-source? #f diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 767de69823..7f230f2806 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2018 Adriano Peluso <catonano@gmail.com> ;;; Copyright © 2018-2022 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> -;;; Copyright © 2019-2023 Guillaume Le Vaillant <glv@posteo.net> +;;; Copyright © 2019-2024 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net> ;;; Copyright © 2019 Sebastian Schott <sschott@mailbox.org> @@ -296,14 +296,14 @@ Accounting.") (define-public homebank (package (name "homebank") - (version "5.7.4") + (version "5.8.1") (source (origin (method url-fetch) (uri (string-append "https://www.gethomebank.org/public/sources" "/homebank-" version ".tar.gz")) (sha256 (base32 - "1r2lpf2qjvyc9l4llgy6453dn527pylvd49kr6ihrskmr1373kj2")))) + "00fwadn6q2hryx7q1xf5fhb5q3ywfnlb1r4xxn7yq6ilzvm5zhv0")))) (build-system glib-or-gtk-build-system) (native-inputs (list pkg-config intltool)) @@ -1690,9 +1690,8 @@ trezord as a regular user instead of needing to it run as root.") (file-name (git-file-name name version)))) (build-system go-build-system) (arguments - `(#:import-path "github.com/trezor/trezord-go" - ;; Requires go 1.18 or later: https://github.com/trezor/trezord-go/commit/f559ee5079679aeb5f897c65318d3310f78223ca - #:go ,go-1.20)) + `(#:go ,go-1.18 + #:import-path "github.com/trezor/trezord-go")) (native-inputs (list go-github-com-gorilla-csrf go-github-com-gorilla-handlers @@ -2175,15 +2174,15 @@ editing on the Web.") (define-public quantlib (package (name "quantlib") - (version "1.26") + (version "1.34") (source (origin (method url-fetch) (uri (string-append - "https://github.com/lballabio/QuantLib/releases/download/QuantLib-v" + "https://github.com/lballabio/QuantLib/releases/download/v" version "/QuantLib-" version ".tar.gz")) (sha256 - (base32 "1sbk6rg51x5xpa93xmqmrj32a1l9vba51xck0017cxzblg0nrzh4")))) + (base32 "0l7yn9bal0csyix0ydzcfj003kma4sx7w5hyfxhh6mbnxn6am1zb")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -2228,13 +2227,13 @@ interactive controls. This package provides a GTK+ graphical user interface (define-public python-ta-lib (package (name "python-ta-lib") - (version "0.4.21") + (version "0.4.32") (source (origin (method url-fetch) (uri (pypi-uri "TA-Lib" version)) (sha256 - (base32 "17sf222mq2vx924f15qlz5czkkq5vsnsjy9ibwkrk8lalr6g5lkl")))) + (base32 "186sgkpggy50gs2pa2p22zppl57xgfhpmja5l13xiskv44iw6x7v")))) (build-system python-build-system) (inputs (list ta-lib)) @@ -2379,7 +2378,7 @@ mining.") (define-public p2pool (package (name "p2pool") - (version "3.10") + (version "4.0") (source (origin (method git-fetch) @@ -2388,7 +2387,7 @@ mining.") (commit (string-append "v" version)) (recursive? #t))) (file-name (git-file-name name version)) - (sha256 (base32 "0lp9slfwaq3wp4x6xpsiazam5lv6dz57m20adzlzzk0anb1ascr0")) + (sha256 (base32 "0x6s7fm5gn0q2274b2nja8hj84cvmxp4rr9x4xw050sxj74880jh")) (modules '((guix build utils))) (snippet #~(for-each delete-file-recursively @@ -2397,10 +2396,11 @@ mining.") "external/src/curl" "external/src/libuv" "external/src/libzmq" - "external/src/rapidjson"))))) + "external/src/rapidjson" + "external/src/robin-hood-hashing"))))) (build-system cmake-build-system) (inputs - (list cppzmq curl gss libuv rapidjson zeromq)) + (list cppzmq curl gss libuv rapidjson robin-hood-hashing zeromq)) (arguments (list ; FIXME: Linking fails when LTO is activated. #:configure-flags #~(list "-DWITH_LTO=OFF") @@ -2411,7 +2411,7 @@ mining.") (when tests? (mkdir-p "tests") (chdir "tests") - (invoke "cmake" "../../source/tests") + (invoke "cmake" "-DWITH_LTO=OFF" "../../source/tests") (invoke "make" "-j" (number->string (parallel-job-count))) (invoke "gzip" "-d" "sidechain_dump.dat.gz") (invoke "gzip" "-d" "sidechain_dump_mini.dat.gz") diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 0ed6609c26..7908e1a3fc 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -882,6 +882,9 @@ Executables included are: @item @code{VfrCompile}: Parse preprocessed UEFI and Framework VFR files. @item @code{VolInfo}: Display the contents of a firmware volume. @end itemize") + ;; See BaseTools/Source/C/GNUmakefile + (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux" + "aarch64-linux" "riscv64-linux")) (license license:bsd-2))) (define* (make-ovmf-firmware arch) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index a21c6b4d5a..8d9e5ff3d1 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -197,6 +197,26 @@ fonts have been designed to work well in user interface (UI) environments as well as other mediums.") (license license:silofl1.1))) +(define-public font-lilex + (package + (name "font-lilex") + (version "2.510") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/mishamyrt/Lilex/releases/download/" + version + "/Lilex.zip")) + (sha256 + (base32 + "0dq54qk4q1ymdqnp0skxdxzhx475g2gihzs8ijx0nffa29fwzn9g")))) + (build-system font-build-system) + (home-page "https://github.com/mishamyrt/Lilex") + (synopsis "IBM Plex typeface with extended character sets and ligatures") + (description "Lilex is a modern programming font containing a set of +ligatures for common programming multi-character combinations.") + (license license:silofl1.1))) + (define-public font-inconsolata (package (name "font-inconsolata") @@ -2498,6 +2518,34 @@ formatting.") (home-page "https://madmalik.github.io/mononoki/") (license license:silofl1.1))) +(define-public font-paytone-one + (let ((version "0") + (commit "b1438bc11966d48a1e9e8943b7b8a32dcb0c533c") + (revision "0")) + (package + (name "font-paytone-one") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/googlefonts/paytoneFont") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gbmrjx8yj8xjh6fs0pzh8j0kxvwvhhjlp16gmv5c7i6b8s7r4r2")))) + (build-system font-build-system) + (home-page "https://github.com/googlefonts/paytoneFont") + (synopsis "Sans serif typeface") + (description "Paytone One is a sans serif typeface developed for +use as a display and headlining webfont. + +The face has a slight casual appearance with ample round bowls. The +slanted stroke terminals add some visual play to the overall appearance +of the font.") + (license license:silofl1.1)))) + (define-public font-plemoljp (package (name "font-plemoljp") diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 6941450436..222ea0fb0b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -143,7 +143,7 @@ (define-public appstream (package (name "appstream") - (version "0.16.4") + (version "1.0.3") (source (origin (method url-fetch) @@ -152,9 +152,7 @@ "appstream/releases/" "AppStream-" version ".tar.xz")) (sha256 - (base32 "1val1b3dggn9g33q2r9q7wsl75a64x4lcvswvkcjjbvakkbj5xyl")) - (patches - (search-patches "appstream-force-reload-stemmer.patch")))) + (base32 "195snvg2jw5ywqxz02xfb570yhxvaqp9d4w5a2lpay2fck7zddjs")))) (build-system meson-build-system) (arguments (list @@ -166,9 +164,9 @@ (lambda* (#:key inputs #:allow-other-keys) (let ((libstemmer.h (search-input-file inputs "include/libstemmer.h"))) - (substitute* "meson.build" - (("/usr/include") - (dirname libstemmer.h)))))) + (substitute* "meson.build" + (("/usr/include") + (dirname libstemmer.h)))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd))))))) @@ -184,7 +182,8 @@ itstool libxslt pkg-config - python-wrapper)) + python-wrapper + gi-docgen)) (inputs (list curl libsoup-minimal-2 libstemmer libxmlb libxml2 libyaml lmdb)) (propagated-inputs @@ -213,7 +212,21 @@ application-centers for distributions.") (arguments (substitute-keyword-arguments (package-arguments appstream) ((#:configure-flags flags #~'()) - #~(append '("-Dqt=true") #$flags)))))) + #~(append '("-Dqt=true" "-Dqt-versions=5") #$flags)))))) + +(define-public appstream-qt6 + (package/inherit appstream + (name "appstream-qt6") + (native-inputs + (modify-inputs (package-native-inputs appstream) + (prepend qttools))) + (inputs + (modify-inputs (package-inputs appstream) + (prepend qtbase))) + (arguments + (substitute-keyword-arguments (package-arguments appstream) + ((#:configure-flags flags #~'()) + #~(append '("-Dqt=true" "-Dqt-versions=6") #$flags)))))) (define-public farstream (package @@ -1405,6 +1418,19 @@ protocol either in Wayland core, or some other protocol in wayland-protocols.") . "https://wayland.freedesktop.org/releases.html"))) (license license:expat))) +(define-public wayland-protocols-next + (package (inherit wayland-protocols) + (name "wayland-protocols-next") + (version "1.36") + (source (origin + (method url-fetch) + (uri (string-append "https://gitlab.freedesktop.org/wayland/" + "wayland-protocols/-/releases/" version "/downloads/" + "wayland-protocols-" version ".tar.xz")) + (sha256 + (base32 + "14kyxywpfkgpjpkrybs28q1s2prnz30k1b4zap5a3ybrbvh4vzbi")))))) + (define-public wayland-utils (package (name "wayland-utils") @@ -3111,16 +3137,22 @@ interfaces.") (define-public xdg-desktop-portal-kde (package (name "xdg-desktop-portal-kde") - (version "5.27.6") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0wzp21l521d9z9mnfgiapzljqpg5qc5ghyzndpr8cz54c2bf9mdf")))) + "0dksk5zs4w79n9l8wspwdgzx2fj1xafsjjk4d6bv2hrhhly7bnxr")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules pkg-config)) + (arguments (list + #:tests? #f ;; colorschemetest test fail, because require dbus. + #:qtbase qtbase)) + (native-inputs (list extra-cmake-modules pkg-config + ;; require by test. + python-minimal + python-pygobject)) (inputs (list cups kcoreaddons kconfig @@ -3129,20 +3161,22 @@ interfaces.") kio kirigami knotifications - plasma-framework + libplasma plasma-wayland-protocols + kstatusnotifieritem kwayland kwidgetsaddons kwindowsystem kiconthemes - qtdeclarative-5 - qtwayland-5 + qtdeclarative + qtwayland wayland kglobalaccel kguiaddons libxkbcommon - kio-fuse wayland-protocols)) + (propagated-inputs + (list xdg-desktop-portal)) (synopsis "Backend implementation for xdg-desktop-portal using Qt/KF5") (description "This package provides a backend implementation for xdg-desktop-portal that is using Qt/KF5.") diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 1146939408..954a4ad4a0 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1489,13 +1489,13 @@ surface (i.e., gridding) with a hint of machine learning.") (define-public python-cartopy (package (name "python-cartopy") - (version "0.22.0") + (version "0.23.0") (source (origin (method url-fetch) (uri (pypi-uri "Cartopy" version)) (sha256 - (base32 "0jdv92az0b7qxdvalh29kasw3knsl570cz7q3vql67ck400zj05k")))) + (base32 "0xknmq73pvkm3k718zrsx8p4r83dbskwqna9v4qvmwh1ayrkf7r3")))) (build-system pyproject-build-system) (arguments (list @@ -1506,8 +1506,16 @@ surface (i.e., gridding) with a hint of machine learning.") "-m" "not natural_earth and not network" "-k" (string-append - ;; This one too but it's not marked as such. - "not test_gridliner_labels_bbox_style" + ;; These ones too but are not marked as such. + "not test_feature_artist_draw" + " and not test_feature_artist_draw_facecolor_list" + " and not test_feature_artist_draw_cmap" + " and not test_feature_artist_draw_styled_feature" + " and not test_feature_artist_draw_styler" + " and not test_gridliner_constrained_adjust_datalim" + " and not test_gridliner_remove" + " and not test_gridliner_title_adjust" + " and not test_gridliner_labels_bbox_style" ;; Accuracy problems " and not test_single_spole" " and not test_single_npole" @@ -2507,7 +2515,7 @@ data.") proj qtbase-5 qtdeclarative-5 - qtlocation + qtlocation-5 qtwebchannel-5 qtwebengine-5 quazip @@ -2743,7 +2751,7 @@ track your position right from your laptop.") proj qtbase-5 qtimageformats-5 - qtlocation + qtlocation-5 qtsensors-5 zlib)) (native-inputs @@ -3205,7 +3213,7 @@ SET\\(PYQT5_SIP_DIR \"\\$\\{Python_SITEARCH\\}/PyQt5/bindings\"\\)") qtbase-5 qtdeclarative-5 qtkeychain - qtlocation + qtlocation-5 qtmultimedia-5 qtserialport-5 qtsvg-5 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b4caaf29a7..88e647dd65 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -78,6 +78,7 @@ ;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw> ;;; Copyright © 2023 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2024 Dariqq <dariqq@posteo.net> +;;; Copyright © 2024 James Smith <jsubuntuxp@disroot.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -11555,34 +11556,34 @@ views can be printed as PDF or PostScript files, or exported to HTML.") (define-public lollypop (package (name "lollypop") - (version "1.4.35") + (version "1.4.40") (source (origin (method url-fetch) (uri (string-append "https://adishatz.org/lollypop/" "lollypop-" version ".tar.xz")) (sha256 - (base32 "0rvwj18x1gs7fgvniijzvlmgmzcgr7il22zclzsn5nkl8xbwgzk0")))) + (base32 "1laj5xwfz2bz29scga2ahhnhlgll4a0n21wwy8mlr4jsl81g0jsa")))) (build-system meson-build-system) (arguments - `(#:imported-modules (,@%meson-build-system-modules - (guix build python-build-system)) - #:modules ((guix build meson-build-system) - ((guix build python-build-system) #:prefix python:) - (guix build utils)) - #:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-gtk-update-icon-cache - (lambda _ - (setenv "DESTDIR" "/"))) - (add-after 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (wrap-program (search-input-file outputs "bin/lollypop") - `("GI_TYPELIB_PATH" ":" prefix - (,(getenv "GI_TYPELIB_PATH")))))) - (add-after 'install 'wrap-python - (assoc-ref python:%standard-phases 'wrap))))) + (list #:imported-modules `(,@%meson-build-system-modules + (guix build python-build-system)) + #:modules '((guix build meson-build-system) + ((guix build python-build-system) #:prefix python:) + (guix build utils)) + #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-gtk-update-icon-cache + (lambda _ + (setenv "DESTDIR" "/"))) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/lollypop") + (list "GI_TYPELIB_PATH" ":" 'prefix + (list (getenv "GI_TYPELIB_PATH")))))) + (add-after 'install 'wrap-python + (assoc-ref python:%standard-phases 'wrap))))) (native-inputs (list gettext-minimal `(,glib "bin") ; For glib-compile-resources @@ -13510,17 +13511,17 @@ profiler via Sysprof, debugging support, and more.") (define-public komikku (package (name "komikku") - (version "1.34.2") + (version "1.46.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/valos/Komikku/") + (url "https://codeberg.org/valos/Komikku/") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "044m3z7h1hi2avx4z6qgjzhgn1fkf1iclxhr4j7pb6flbqvwnxhs")))) + "1ggg4hgd1kyc69b06kcgvvjwmz72xgjakva19gs3nrszr4cinank")))) (build-system meson-build-system) (arguments (list @@ -13546,7 +13547,9 @@ profiler via Sysprof, debugging support, and more.") (lambda* (#:key outputs #:allow-other-keys) (wrap-program (search-input-file outputs "bin/komikku") `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))) + `("GDK_PIXBUF_MODULE_FILE" = + (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))) (inputs (list bash-minimal gtk @@ -13572,7 +13575,8 @@ profiler via Sysprof, debugging support, and more.") python-rarfile python-requests python-unidecode - webkitgtk)) + webkitgtk + webp-pixbuf-loader)) (native-inputs (list blueprint-compiler desktop-file-utils @@ -13580,7 +13584,7 @@ profiler via Sysprof, debugging support, and more.") `(,glib "bin") gobject-introspection pkg-config)) - (home-page "https://gitlab.com/valos/Komikku") + (home-page "https://apps.gnome.org/Komikku") (synopsis "Manga reader for GNOME") (description "Komikku is an online/offline manga reader for GNOME, developed with the aim of being used with the Librem 5 phone.") @@ -13752,7 +13756,7 @@ Document Analysis and Recognition program.") (define-public libadwaita (package (name "libadwaita") - (version "1.4.0") + (version "1.5.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libadwaita/" @@ -13760,7 +13764,7 @@ Document Analysis and Recognition program.") "libadwaita-" version ".tar.xz")) (sha256 (base32 - "1hj7kxza6263x662v4ffndlz8dhfx19cz3y4iwhnhdflaj50j6p5")))) + "05icswk84kf4pbcybv8j9r9n98q1dgr1m7zn6k72p4dlbh0fxyn9")))) (build-system meson-build-system) (arguments `(#:phases diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index ce99c04e39..af024b2a04 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2019, 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 Prafulla Giri <pratheblackdiamond@gmail.com> ;;; Copyright © 2020 Christopher Lam <christopher.lck@gmail.com> -;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com> +;;; Copyright © 2023, 2024 gemmaro <gemmaro.dev@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,14 +66,14 @@ ;; directory. (package (name "gnucash") - (version "5.6") + (version "5.8") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/" version "/gnucash-" version ".tar.bz2")) (sha256 - (base32 "1l8vy8dj48hz385ldwnx3bpdsqyc8lsigwm1gjgygwshcdi2rd5l")))) + (base32 "14r5nmml40icxbjfz4giis6kiplvjna17j1fd6c4b78bf3xj7j52")))) (outputs '("out" "doc" "debug" "python")) (build-system cmake-build-system) (arguments @@ -219,7 +219,7 @@ installed as well as Yelp, the Gnome help browser.") "mirror://sourceforge/gnucash/gnucash%20%28stable%29/" version "/gnucash-docs-" version revision ".tar.gz")) (sha256 - (base32 "00izzaswwp78ix0zdr8618lk2c21had4im04yrggqx4h34ldmnca")))) + (base32 "0gssmbwwiafp4g9v5waz5935bkgyzbna76ryz5lhc294b3n49wxq")))) (build-system cmake-build-system) ;; These are native-inputs because they are only required for building the ;; documentation. diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index e7c583a266..14c25998d8 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -466,6 +466,19 @@ and every application benefits from this.") (properties '((ftp-server . "ftp.gnupg.org") (ftp-directory . "/gcrypt/gpgme"))))) +(define-public gpgme-1.23 + (hidden-package + (package + (inherit gpgme) + (name "gpgme") + (version "1.23.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnupg/gpgme/gpgme-" version ".tar.bz2")) + (sha256 + (base32 "092jrqdmdggjhl0swpvci8cscdcx0hbbr897an0vdk1wyfqyi6cl"))))))) + (define-public qgpgme (package (inherit gpgme) @@ -495,6 +508,32 @@ QGpgME was originally developed as part of libkleo and incorporated into gpgpme starting with version 1.7.") (license license:gpl2+))) ;; Note: this differs from gpgme +(define-public qgpgme-qt6-1.23 + (package + (inherit gpgme-1.23) + (name "qgpgme-qt6") + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'chdir-and-symlink + (lambda* (#:key inputs #:allow-other-keys) + (let ((gpgme (assoc-ref inputs "gpgme"))) + (symlink (string-append gpgme "/lib/libgpgmepp.la") + "lang/cpp/src/libgpgmepp.la") + (symlink (string-append gpgme "/lib/libgpgme.la") + "src/libgpgme.la")) + (chdir "lang/qt")))))) + (propagated-inputs (list gpgme-1.23)) ;required by QGpgmeConfig.cmake + (native-inputs + (modify-inputs (package-native-inputs gpgme-1.23) + (prepend pkg-config))) + (inputs + (modify-inputs (package-inputs gpgme-1.23) + (prepend qtbase))) + (synopsis "Qt API bindings for gpgme") + (description "QGpgme provides a very high level Qt API around GpgMEpp.") + (license license:gpl2+))) + (define-public guile-gcrypt (package (name "guile-gcrypt") diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e6d29d5f90..3e7818ba43 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -532,9 +532,9 @@ variable defined below. It requires guile-json to be installed." ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-base-version "115.12.0") -(define %icecat-version (string-append %icecat-base-version "-guix0-preview1")) -(define %icecat-build-id "20240611000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-base-version "115.13.0") +(define %icecat-version (string-append %icecat-base-version "-guix1")) +(define %icecat-build-id "20240709000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -554,12 +554,12 @@ variable defined below. It requires guile-json to be installed." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "1vx88wc10fjkvqdqf3ab65qk3km7z0mlyf9plxjhabxvl0jid7mm")))) + "0p2x1prwa1yn2d3i7vgjc4gg64x4si43l68aav9881hhjwc0v8iz")))) ;; The upstream-icecat-base-version may be older than the ;; %icecat-base-version. - (upstream-icecat-base-version "115.12.0") - (gnuzilla-commit "f200ffe88821f66234591096bcbe87b0c11f8da0") + (upstream-icecat-base-version "115.13.0") + (gnuzilla-commit "445980b18666c8214e5c62db3ae7108d5694242f") (gnuzilla-source (origin (method git-fetch) @@ -571,7 +571,7 @@ variable defined below. It requires guile-json to be installed." (string-take gnuzilla-commit 8))) (sha256 (base32 - "154rjpn4vr2hqyrfbpwp6dvkzsv1cwisdf82v7dsda55012qaxg7")))) + "12jdlr86kr26h2ml5j8pjsjc8lpjxw05hqpirvlgj317xv0amyz1")))) ;; 'search-patch' returns either a valid file name or #f, so wrap it ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. @@ -1142,11 +1142,7 @@ variable defined below. It requires guile-json to be installed." software, which does not recommend non-free plugins and addons. It also features built-in privacy-protecting features. This package also includes the @command{geckodriver} command, which can be useful for automated web -testing. - -WARNING: IceCat 115 has not yet been released by the upstream IceCat project. -This is a preview release, and does not currently meet the privacy-respecting -standards of the IceCat project.") +testing.") (license license:mpl2.0) ;and others, see toolkit/content/license.html (properties `((ftp-directory . "/gnu/gnuzilla") diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index 086dbaeb17..fbad61e269 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -40,7 +40,8 @@ #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) - #:use-module (gnu packages)) + #:use-module (gnu packages) + #:use-module (gnu packages gcc)) ;;; Commentary: ;;; @@ -58,7 +59,7 @@ (define-public go-github-com-yuin-goldmark (package (name "go-github-com-yuin-goldmark") - (version "1.2.1") + (version "1.7.4") (source (origin (method git-fetch) @@ -67,53 +68,145 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "12rsnsf65drcp0jfw2jl9w589vsn3pxdk1zh3v9q908iigngrcmy")))) + (base32 "01807xs8501cyhkrrgg6k9ghl9jrw6dp0ry9knygck48canckxs2")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/yuin/goldmark")) + (list + #:import-path "github.com/yuin/goldmark" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) (home-page "https://github.com/yuin/goldmark/") (synopsis "Markdown parser") - (description "This package provides a markdown parser.") + (description + "This package provides a markdown parser.") + (license license:expat))) + +(define-public go-github-com-yuin-goldmark-emoji + (package + (name "go-github-com-yuin-goldmark-emoji") + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yuin/goldmark-emoji") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1mx8rkxd3ksvgi41jvf365x9mf00sxiqq4wm75x4sasd2lgcbrl4")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/yuin/goldmark-emoji")) + (propagated-inputs + (list go-github-com-yuin-goldmark)) + (home-page "https://github.com/yuin/goldmark-emoji") + (synopsis "Emoji extension for the goldmark markdown parser") + (description + "This package provides an emoji is a extension for the +@url{http://github.com/yuin/goldmark,goldmark}.") (license license:expat))) (define-public go-golang-org-x-crypto (package (name "go-golang-org-x-crypto") - (version "0.14.0") + (version "0.25.0") (source (origin (method git-fetch) (uri (git-reference (url "https://go.googlesource.com/crypto") (commit (string-append "v" version)))) - (file-name (string-append "go.googlesource.com-crypto-" - version "-checkout")) + (file-name (git-file-name name version)) (sha256 - (base32 "08124qkp0l0blq6rw68llfbf84kp99255q0yvxyv27c05b0wkh66")))) + (base32 "1cnglyy3fhvnnynazfdrikkwcxv3rlxamvfxink2z241lncvwkxy")))) (build-system go-build-system) (arguments - '(#:import-path "golang.org/x/crypto" - ;; Source-only package - #:tests? #f - #:phases - (modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) + (list + #:import-path "golang.org/x/crypto" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-test-files + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + (list + ;; Network access requried: go mod download -json + ;; github.com/google/wycheproof@v0.0.0-20191219022705-2196000605e4. + "internal/wycheproof/aead_test.go" + "internal/wycheproof/aes_cbc_test.go" + "internal/wycheproof/dsa_test.go" + "internal/wycheproof/ecdh_stdlib_test.go" + "internal/wycheproof/ecdh_test.go" + "internal/wycheproof/ecdsa_test.go" + "internal/wycheproof/eddsa_test.go" + "internal/wycheproof/hkdf_test.go" + "internal/wycheproof/hmac_test.go" + "internal/wycheproof/rsa_oaep_decrypt_test.go" + "internal/wycheproof/rsa_pss_test.go" + "internal/wycheproof/rsa_signature_test.go" + "internal/wycheproof/wycheproof_test.go"))))) + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" + ;; acme - cycle with go-golang-org-x-net + "./argon2/..." + "./bcrypt/..." + "./blake2b/..." + "./blake2s/..." + "./blowfish/..." + "./bn256/..." + "./cast5/..." + "./chacha20/..." + "./chacha20poly1305/..." + "./cryptobyte/..." + "./curve25519/..." + "./ed25519/..." + "./hkdf/..." + "./internal/..." + "./md4/..." + "./nacl/..." + "./ocsp/..." + "./openpgp/..." + "./otr/..." + "./pbkdf2/..." + "./pkcs12/..." + "./poly1305/..." + "./ripemd160/..." + "./salsa20/..." + "./scrypt/..." + "./sha3/..." + "./ssh/..." + "./tea/..." + "./twofish/..." + "./x509roots/..." + "./xtea/..." + "./xts/...")))))))) (propagated-inputs - (list go-golang-org-x-net - go-golang-org-x-sys - go-golang-org-x-term - go-golang-org-x-text)) + (list go-golang-org-x-sys go-golang-org-x-term)) (home-page "https://go.googlesource.com/crypto/") (synopsis "Supplementary cryptographic libraries in Go") - (description "This package provides supplementary cryptographic libraries -for the Go language.") + (description + "This package provides supplementary cryptographic libraries for the Go +language.") (license license:bsd-3))) (define-public go-golang-org-x-exp (package (name "go-golang-org-x-exp") - (version "0.0.0-20221004215720-b9f4876ce741") + (version "0.0.0-20240613232115-7f521ea00fb8") (source (origin (method git-fetch) @@ -122,7 +215,20 @@ for the Go language.") (commit (go-version->git-ref version)))) (file-name (git-file-name name version)) (sha256 - (base32 "030b929xyg8dpp6f4qbyg63msi6zgzj9sqmvnyphfcrjkqf7nr41")))) + (base32 "0ccjgv19w5p9sbcq12czmfnkjwv3b7hfljifwax6r9wk4dx0fcn7")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Submodules with their own go.mod files and packed as separated + ;; packages: + ;; + ;; - golang.org/x/exp/event + ;; - golang.org/x/exp/jsonrpc2 + ;; - golang.org/x/exp/shiny + ;; - golang.org/x/exp/sumbdb + ;; - golang.org/x/exp/typeparams + (for-each delete-file-recursively + (list "event" "jsonrpc2" "shiny" "sumdb" "typeparams")))))) (build-system go-build-system) (arguments '(#:import-path "golang.org/x/exp" @@ -136,12 +242,10 @@ for the Go language.") @code{old} directory) packages.") (license license:bsd-3))) -;; It's for the Kubo update; remove it when it is no longer needed. -(define-public go-golang-org-x-exp-2023 +(define-public go-golang-org-x-exp-typeparams (package - (inherit go-golang-org-x-exp) - (name "go-golang-org-x-exp") - (version "0.0.0-20230725012225-302865e7556b") + (name "go-golang-org-x-exp-typeparams") + (version "0.0.0-20240707233637-46b078467d37") (source (origin (method git-fetch) @@ -150,122 +254,161 @@ for the Go language.") (commit (go-version->git-ref version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1fkmi0zjwv70n9d9q9bmzch2zvf7xm3d65qh63zll6dljq2lh4b8")))))) + (base32 "17pwikql9x1bm5ci0kk4mlad7smkph0cgq1pi2b43gnhjz8m96l0")))) + (build-system go-build-system) + (arguments + (list + #:import-path "golang.org/x/exp/typeparams" + #:unpack-path "golang.org/x/exp")) + (home-page "https://pkg.go.dev/golang.org/x/exp/typeparams") + (synopsis "Golang common utilities for writing tools") + (description + "Package typeparams contains common utilities for writing tools that +interact with generic Go code, as introduced with Go 1.18. + +Many of the types and functions in this package are proxies for the new APIs +introduced in the standard library with Go 1.18. For example, the +typeparams.Union type is an alias for @code{go/types.Union}, and the +@code{ForTypeSpec} function returns the value of the +@code{go/ast.TypeSpec.TypeParams} field. At Go versions older than 1.18 these +helpers are implemented as stubs, allowing users of this package to write code +that handles generic constructs inline,even if the Go version being used to +compile does not support generics.") + (license license:bsd-3))) (define-public go-golang-org-x-image - (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d") - (revision "1")) - (package - (name "go-golang-org-x-image") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/image") - (commit commit))) - (file-name (string-append "go.googlesource.com-image-" - version "-checkout")) - (sha256 - (base32 "0i2p2girc1sfcic6xs6vrq0fp3szfx057xppksb67kliywjjrm5x")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/image" - ;; Source-only package - #:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'build)))) - (home-page "https://go.googlesource.com/image") - (synopsis "Supplemental Go image libraries") - (description "This package provides supplemental Go libraries for image -processing.") - (license license:bsd-3)))) + (package + (name "go-golang-org-x-image") + (version "0.18.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/image") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0d7zwdsg06km24vhx6dzk1w26wpi3yhx9jfkf9jnsp5chv5pzlw3")))) + (build-system go-build-system) + (arguments + (list + #:import-path "golang.org/x/image" + #:phases + #~(modify-phases %standard-phases + ;; XXX: go-build-system can't install/build submodules. + (delete 'build) + (add-after 'unpack 'remove-examples + (lambda* (#:key import-path #:allow-other-keys) + (delete-file-recursively + (string-append "src/" import-path "/example")))) + (add-before 'check 'remove-failing-tests + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + ;; tiff/reader_test.go:557:14: too many errors + (list "tiff/reader_test.go" + "tiff/writer_test.go"))))) + ;; XXX: Workaround for go-build-system's lack of Go modules support. + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (propagated-inputs + (list go-golang-org-x-text)) + (home-page "https://pkg.go.dev/golang.org/x/image") + (synopsis "Supplemental Go image libraries") + (description + "This package provides supplemental Go libraries for image processing.") + (license license:bsd-3))) (define-public go-golang-org-x-mod - (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1") - (revision "0")) - (package - (name "go-golang-org-x-mod") - (version (git-version "0.7.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/golang/mod") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "14r24fq3kn84k2y2jvvg8hwpy52a3q429pimrdwl5zwknbr2awmh")))) - (build-system go-build-system) - (arguments - '(#:import-path "golang.org/x/mod/" - #:tests? #f - #:phases (modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) - (home-page "https://golang.org/x/mod") - (synopsis "Tools to work directly with Go module mechanics") - (description - "This repository holds packages for writing tools that work directly + (package + (name "go-golang-org-x-mod") + (version "0.19.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/mod") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "02wilb8q2bp6qhqcrbjxq1pjy3y5k8p11pxlg481609zx4rjiszc")))) + (build-system go-build-system) + (arguments + (list + #:import-path "golang.org/x/mod" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-test-files + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + (list + ;; Break cycle: go-golang-org-x-mod -> + ;; go-golang-org-x-tools -> go-golang-org-x-mod. + "zip/zip_test.go" + ;; Trying to access + ;; <http://ct.googleapis.com/logs/argon2020/ct/v1/get-sth>. + "sumdb/tlog/ct_test.go"))))) + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (home-page "https://golang.org/x/mod") + (synopsis "Tools to work directly with Go module mechanics") + (description + "This repository holds packages for writing tools that work directly with Go module mechanics. That is, it is for direct manipulation of Go modules themselves. The specific case of loading packages should still be done by invoking the @command{go} command, which remains the single point of truth for package loading algorithms.") - (license license:bsd-3)))) + (license license:bsd-3))) (define-public go-golang-org-x-net - (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d") - (revision "0")) - (package - (name "go-golang-org-x-net") - (version (git-version "0.5.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/net") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1fidlcn3vcz42v2lc0rpmqh3bz08bcklj6jvnmz2vvgc481ci5hy")))) - (build-system go-build-system) - (arguments - (list - #:import-path "golang.org/x/net" - ;; Source-only package - #:tests? #f - #:phases - #~(modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) - (propagated-inputs - (list go-golang-org-x-sys go-golang-org-x-term go-golang-org-x-text)) - (home-page "https://go.googlesource.com/net") - (synopsis "Go supplemental networking libraries") - (description "This package provides supplemental Go networking libraries.") - (license license:bsd-3)))) - -;; XXX: Not in use by any other packages, consider to remove or merge with -;; go-golang-org-x-net. -(define-public go-golang-org-x-net-0.17 - (let ((commit "b225e7ca6dde1ef5a5ae5ce922861bda011cfabd") - (revision "0")) - (package - (inherit go-golang-org-x-net) - (name "go-golang-org-x-net") - (version (git-version "0.17.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/net") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "17zhim2m0r8nyy18g2lsawxm4rawix2qbjyn80x9vc6jc8fv05m9"))))))) + (package + (name "go-golang-org-x-net") + (version "0.27.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/net") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fc6d968yiv2l67z9jg7ssvas1hd1jniqh4m7mmlay0q5gk4vf8s")))) + (build-system go-build-system) + (arguments + (list + #:import-path "golang.org/x/net" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (propagated-inputs + (list go-golang-org-x-crypto + go-golang-org-x-sys + go-golang-org-x-term + go-golang-org-x-text)) + (home-page "https://go.googlesource.com/net") + (synopsis "Go supplemental networking libraries") + (description + "This package provides supplemental Go networking libraries.") + (license license:bsd-3))) (define-public go-golang-org-x-sync (package @@ -312,7 +455,7 @@ cancelation for groups of goroutines working on subtasks of a common task (define-public go-golang-org-x-sys (package (name "go-golang-org-x-sys") - (version "0.21.0") + (version "0.22.0") (source (origin (method git-fetch) @@ -321,7 +464,7 @@ cancelation for groups of goroutines working on subtasks of a common task (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "000fcyi863sbmamdn3cwfv3s3z9ls5l34xnjavcbgjs591ghki8y")))) + (base32 "0kpl5hk0zbh5bfschnq64yj1cs7v3l9v6bd1rw5crlfd4hg7xawa")))) (build-system go-build-system) (arguments (list @@ -345,7 +488,7 @@ support for low-level interaction with the operating system.") (define-public go-golang-org-x-term (package (name "go-golang-org-x-term") - (version "0.3.0") + (version "0.22.0") (source (origin (method git-fetch) @@ -354,7 +497,7 @@ support for low-level interaction with the operating system.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "16s3d62fgdhiqvcib61s5pwxp08hhrmzx8bdv5zk1w1krjizdarl")))) + (base32 "0iqh035y65gfm28xp52pnksh49q3nyaz0zrjjj032rs8hv5py75m")))) (build-system go-build-system) (arguments '(#:import-path "golang.org/x/term")) (propagated-inputs @@ -368,65 +511,92 @@ terminals, as commonly found on Unix systems.") (define-public go-golang-org-x-text (package (name "go-golang-org-x-text") - (version "0.3.2") + (version "0.16.0") (source (origin (method git-fetch) (uri (git-reference (url "https://go.googlesource.com/text") (commit (string-append "v" version)))) - (file-name (string-append "go.googlesource.com-text-" - version "-checkout")) + (file-name (git-file-name name version)) (sha256 - (base32 "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh")))) + (base32 "0pmn0i1xbpwvzl4cdgmjqcsk9vckhqrq6699fnr9mkglh4xj3p7a")))) (build-system go-build-system) (arguments - `(#:import-path "golang.org/x/text" - ;; Source-only package - #:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'build)))) + (list + #:import-path "golang.org/x/text" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" + "./cases/..." + ;; cmd - cycle with go-golang-org-x-tools + "./collate/..." + "./currency/..." + "./date/..." + "./encoding/..." + "./feature/..." + "./internal/..." + "./language/..." + ;; message - cycle with go-golang-org-x-tools + "./number/..." + "./runes/..." + "./search/..." + "./secure/..." + "./transform/..." + "./unicode/..." + "./width/...")))))))) (home-page "https://go.googlesource.com/text") (synopsis "Supplemental Go text processing libraries") - (description "This package provides supplemental Go libraries for text + (description + "This package provides supplemental Go libraries for text processing.") (license license:bsd-3))) (define-public go-golang-org-x-time - (let ((commit "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef") - (revision "2")) - (package - (name "go-golang-org-x-time") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/time") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/time" - ;; Source-only package - #:tests? #f - #:phases - (modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) - (home-page "https://godoc.org/golang.org/x/time/rate") - (synopsis "Supplemental Go time libraries") - (description "This package provides supplemental Go libraries related to + (package + (name "go-golang-org-x-time") + (version "0.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/time") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dahq0p6zn2pd408q6hsv1jl12nqrwd1gkl3r3dysk2q0z16192v")))) + (build-system go-build-system) + (arguments + (list + #:import-path "golang.org/x/time" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (home-page "https://godoc.org/golang.org/x/time/rate") + (synopsis "Supplemental Go time libraries") + (description + "This package provides supplemental Go libraries related to time.") - (license license:bsd-3)))) + (license license:bsd-3))) (define-public go-golang-org-x-tools (package (name "go-golang-org-x-tools") - (version "0.5.0") + (version "0.23.0") (source (origin (method git-fetch) @@ -435,7 +605,7 @@ time.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "08kx2nndq3sr6xai7403mbsqvz5shxmp2icylfr2fmwagr59cb2n")) + (base32 "0hr81fr5s39p97m9y3ipma7ryw4nm2246k8ds0flkybzf19mhzbi")) (modules '((guix build utils))) (snippet '(begin @@ -444,27 +614,68 @@ time.") (delete-file-recursively "gopls"))))) (build-system go-build-system) (arguments - `(#:import-path "golang.org/x/tools" - ;; Source-only package - #:tests? #f - #:phases - (modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) + (list + #:import-path "golang.org/x/tools" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" + ;; TODO: They contain final project executable builds, + ;; would be packed separately. + ;; - cmd + ;; - godoc + + ;; FIXME: Figure out why they are failing: + ;; "./internal/..." + ;; "./present/..." + ;; "./refactor/eg/..." + ;; "./go/ssa/..." + ;; "./go/packages/..." + ;; "./go/analysis/..." + + "./blog/..." ; + "./container/..." + "./copyright/..." + "./cover/..." + "./go/ast/..." + "./go/buildutil/..." + "./go/callgraph/..." + "./go/cfg/..." + "./go/expect/..." + "./go/gccgoexportdata/..." + "./go/gcexportdata/..." + "./go/internal/..." + "./go/loader/..." + "./go/types/..." + "./imports/..." + "./playground/..." + "./refactor/importgraph/..." + "./refactor/rename/..." + "./refactor/satisfy/..." + "./txtar/...")))))))) + (native-inputs + (list gccgo-14)) (propagated-inputs (list go-github-com-yuin-goldmark go-golang-org-x-mod go-golang-org-x-net - go-golang-org-x-sys)) + go-golang-org-x-sync)) (home-page "https://go.googlesource.com/tools/") (synopsis "Tools that support the Go programming language") - (description "This package provides miscellaneous tools that support the + (description + "This package provides miscellaneous tools that support the Go programming language.") (license license:bsd-3))) (define-public go-golang-org-x-xerrors - (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca") - (revision "0")) + (let ((commit "104605ab7028f4af38a8aff92ac848a51bd53c5d") + (revision "1")) (package (name "go-golang-org-x-xerrors") (version (git-version "0.0.0" revision commit)) @@ -476,7 +687,7 @@ Go programming language.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1dbzc3gmf2haazpv7cgmv97rq40g2xzwbglc17vas8dwhgwgwrzb")))) + (base32 "051xfwx95vq7yhmsy8p9rq0qw67bzvimhz1icjssahwrjndm7h92")))) (build-system go-build-system) (arguments '(#:import-path "golang.org/x/xerrors")) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index ddf2393406..0822338943 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -78,7 +78,6 @@ (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "atomicgo.dev/assert")) (home-page "https://atomicgo.dev/assert") (synopsis "Go package with tons of assertions") @@ -92,7 +91,7 @@ value and call @code{t.Fatal()} if the assertion fails.") (define-public go-github-com-alecthomas-assert-v2 (package (name "go-github-com-alecthomas-assert-v2") - (version "2.5.0") + (version "2.10.0") (source (origin (method git-fetch) @@ -101,11 +100,11 @@ value and call @code{t.Fatal()} if the assertion fails.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ai26ncfcwzg47rqaigs5v1fzfz6i8p11ki75ni5429xkjs77riz")))) + (base32 "05jak1v9s2wrwrn6ar0s4388f7qg15q0qfmhfcswgl88720196z3")))) (build-system go-build-system) (arguments - (list #:go go-1.18 - #:import-path "github.com/alecthomas/assert/v2")) + (list + #:import-path "github.com/alecthomas/assert/v2")) (propagated-inputs (list go-github-com-alecthomas-repr go-github-com-hexops-gotextdiff)) @@ -620,7 +619,6 @@ differently.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/MarvinJWendt/testza" #:phases #~(modify-phases %standard-phases @@ -696,7 +694,6 @@ Gomega matcher library.") (base32 "1w5dldjjcz2kpyxml4zd9yah7galfpmhcpc2l4zc5pr3skpwpibv")))) (arguments (list - #:go go-1.20 #:import-path "github.com/onsi/ginkgo/v2")) (propagated-inputs (list go-github-com-go-logr-logr @@ -726,7 +723,6 @@ Gomega matcher library.") ;; Unless we disable the tests, we have a circular dependency on ;; ginkgo/v2. #:tests? #f - #:go go-1.21 #:import-path "github.com/onsi/gomega")) (propagated-inputs (list go-github-com-golang-protobuf @@ -758,7 +754,6 @@ framework.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/otiai10/mint")) (home-page "https://github.com/otiai10/mint") (synopsis "Minimal assertion for Golang testing framework") @@ -1229,7 +1224,6 @@ custom assertions to be used alongside native Go testing.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/warpfork/go-testmark")) (home-page "https://github.com/warpfork/go-testmark") (synopsis "Parser for @code{testmark} format") @@ -1258,7 +1252,6 @@ testmark} format, which itself is a subset of Markdown format.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/warpfork/go-wish")) (home-page "https://github.com/warpfork/go-wish") (synopsis "Test assertions for Golang") @@ -1314,7 +1307,6 @@ the end of a test.") ;; XXX: The project contains subdirectory which complicate it's testing ;; and it does not produce any binary. #:tests? #f - #:go go-1.20 #:import-path "go.uber.org/mock" #:phases #~(modify-phases %standard-phases @@ -1331,7 +1323,7 @@ built-in @code{testing} package, but can be used in other contexts too.") (define-public go-honnef-co-go-tools (package (name "go-honnef-co-go-tools") - (version "0.4.6") + (version "0.4.7") (source (origin (method git-fetch) @@ -1341,17 +1333,23 @@ built-in @code{testing} package, but can be used in other contexts too.") (file-name (git-file-name name version)) (sha256 (base32 - "0qikkhanmc0vrpgvs0c44y853n88m8qqsk08zry6mvm8f41pgjhi")))) + "1n58skq2a0vhsgdfdkyqi00d3vv13kiw9b4mxx6xfyb6ysrdy7d1")))) (build-system go-build-system) (arguments - `(#:import-path "honnef.co/go/tools" - #:tests? #f - ;; Source-only package - #:phases (modify-phases %standard-phases - (delete 'build)))) + (list + #:import-path "honnef.co/go/tools" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) (propagated-inputs (list go-github-com-burntsushi-toml - go-golang-org-x-exp + go-golang-org-x-exp-typeparams go-golang-org-x-mod go-golang-org-x-tools)) (home-page "https://staticcheck.dev/") @@ -1410,7 +1408,6 @@ thoroughly (name "ginkgo") (arguments (list - #:go go-1.20 #:import-path "github.com/onsi/ginkgo/ginkgo" #:unpack-path "github.com/onsi/ginkgo" #:install-source? #f)) @@ -1424,8 +1421,7 @@ tool.")))) (inherit go-honnef-co-go-tools) (name "go-keyify") (arguments - `(#:go ,go-1.20 - #:import-path "honnef.co/go/tools/cmd/keyify" + `(#:import-path "honnef.co/go/tools/cmd/keyify" #:unpack-path "honnef.co/go/tools" #:install-source? #f)) (synopsis "Transform an unkeyed struct literal into a keyed one in Go") @@ -1439,7 +1435,6 @@ tool.")))) (arguments (list #:install-source? #f - #:go go-1.19 #:import-path "github.com/google/pprof")) (description (string-append (package-description go-github-com-google-pprof) @@ -1451,8 +1446,7 @@ tool.")))) (inherit go-honnef-co-go-tools) (name "go-staticcheck") (arguments - `(#:go ,go-1.20 - #:import-path "honnef.co/go/tools/cmd/staticcheck" + `(#:import-path "honnef.co/go/tools/cmd/staticcheck" #:unpack-path "honnef.co/go/tools" #:install-source? #f)) (synopsis "Staticcheck advanced Go linter") @@ -1466,8 +1460,7 @@ simplifications, and enforces style rules."))) (inherit go-honnef-co-go-tools) (name "go-structlayout") (arguments - `(#:go ,go-1.20 - #:import-path "honnef.co/go/tools/cmd/structlayout" + `(#:import-path "honnef.co/go/tools/cmd/structlayout" #:unpack-path "honnef.co/go/tools" #:install-source? #f)) (synopsis "Display the layout (field sizes and padding) of structs in Go") @@ -1481,8 +1474,7 @@ flag."))) (inherit go-honnef-co-go-tools) (name "go-structlayout-optimize") (arguments - `(#:go ,go-1.20 - #:import-path "honnef.co/go/tools/cmd/structlayout-optimize" + `(#:import-path "honnef.co/go/tools/cmd/structlayout-optimize" #:unpack-path "honnef.co/go/tools" #:install-source? #f)) (synopsis "Reorder struct fields to minimize the amount of padding in Go") @@ -1495,8 +1487,7 @@ into @code{go-structlayout-pretty}."))) (inherit go-honnef-co-go-tools) (name "go-structlayout-pretty") (arguments - `(#:go ,go-1.20 - #:import-path "honnef.co/go/tools/cmd/structlayout-pretty" + `(#:import-path "honnef.co/go/tools/cmd/structlayout-pretty" #:unpack-path "honnef.co/go/tools" #:install-source? #f)) (synopsis "Format the output of go-structlayout with ASCII art in Go") diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm index 67ae28abe5..a6c0410051 100644 --- a/gnu/packages/golang-compression.scm +++ b/gnu/packages/golang-compression.scm @@ -40,7 +40,7 @@ (define-public go-github-com-andybalholm-brotli (package (name "go-github-com-andybalholm-brotli") - (version "1.0.4") + (version "1.1.0") (source (origin (method git-fetch) @@ -49,7 +49,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1zvmj7gbnkq9xwv1bvcxk9acxl06y902148qwbd2kqwgs52wy2c0")))) + (base32 "1zdvcwfzxnkljyh4p7izy0bfxrwidwwmp1p5h1fydyrgbs4xacly")))) (build-system go-build-system) (arguments `(#:import-path "github.com/andybalholm/brotli")) diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index ddeb79badf..3fbeac703b 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -63,10 +63,63 @@ ;;; ;;; Code: +;;; +;;; Libraries: +;;; + +(define-public go-c2sp-org-cctv-age + (package + (name "go-c2sp-org-cctv-age") + (version "0.0.0-20240306222714-3ec4d716e805") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/C2SP/CCTV") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00bk05ca94lm3b029ycwj0krmg2gfjv1c3pc7dvq9gmwwzr564v5")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Sub folders containing different projects with their own + ;; licenses. + (for-each delete-file-recursively + (list "ML-KEM" "RFC6979" "ed25519" "jq255")))))) + (build-system go-build-system) + (arguments + (list + #:import-path "c2sp.org/CCTV/age" + #:unpack-path "c2sp.org/CCTV")) + (propagated-inputs + (list go-golang-org-x-crypto)) + (home-page "https://c2sp.org/CCTV/age") + (synopsis "Community Cryptography Test Vectors") + (description + "This package provides a large set of test vectors for the age file +encryption format, as well as a framework to easily generate them. + +The test suite can be applied to any age implementation, regardless of the +language it's implemented in, and the level of abstraction of its +interface. For the simplest, most universal integration, the implementation +can just attempt to decrypt the test files, check the operation only succeeds +if expect is success, and compare the decrypted payload. Test vectors +involving unimplemented features (such as passphrase encryption or armoring) +can be ignored.") + ;; age/internal/LICENSE: Redistribution and use in source and binary + ;; forms, with or without modification, are permitted provided that the + ;; following conditions are met + ;; + ;; age/README: The vectors in the testdata folder are available under the + ;; terms of the Zero-Clause BSD (reproduced below), CC0 1.0, or Unlicense + ;; license, to your choice. + (license license:cc0))) + (define-public go-filippo-io-age (package (name "go-filippo-io-age") - (version "1.1.1") + (version "1.2.0") (source (origin (method git-fetch) @@ -75,10 +128,41 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1k1dv1jkr72qpk5g363mhrg9hnf5c9qgv4l16l13m4yh08jp271d")))) + (base32 "1dms32lxqgjipmlisng7dmy1sdw0qscj43x9lmpadyzbzc64lhrv")))) (build-system go-build-system) - (arguments `(#:import-path "filippo.io/age")) - (inputs + (arguments + (list + #:import-path "filippo.io/age" + #:phases + #~(modify-phases %standard-phases + ;; FIXME: src/c2sp.org/CCTV/age/age.go:13:12: pattern testdata: + ;; cannot embed directory testdata: contains no embeddable files + ;; + ;; This happens due to Golang can't determine the valid directory of + ;; the module which is sourced during setup environment phase, but + ;; easy resolved after coping to expected directory "vendor" within + ;; the current package, see details in Golang source: + ;; + ;; - URL: <https://github.com/golang/go/blob/> + ;; - commit: 82c14346d89ec0eeca114f9ca0e88516b2cda454 + ;; - file: src/cmd/go/internal/load/pkg.go#L2059 + (add-before 'build 'copy-input-to-vendor-directory + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (mkdir "vendor") + (copy-recursively + (string-append + #$(this-package-native-input "go-c2sp-org-cctv-age") + "/src/c2sp.org") + "vendor/c2sp.org")))) + (add-before 'install 'remove-vendor-directory + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (delete-file-recursively "vendor"))))))) + (native-inputs + (list go-c2sp-org-cctv-age + go-github-com-rogpeppe-go-internal)) + (propagated-inputs (list go-golang-org-x-sys go-golang-org-x-term go-golang-org-x-crypto @@ -92,24 +176,6 @@ It features small explicit keys, no configuration options, and Unix-style composability.") (license license:bsd-3))) -(define-public age - (package - (inherit go-filippo-io-age) - (name "age") - (arguments - `(#:import-path "filippo.io/age/cmd/age" - #:unpack-path "filippo.io/age" - #:install-source? #f)))) - -(define-public age-keygen - (package - (inherit go-filippo-io-age) - (name "age-keygen") - (arguments - `(#:import-path "filippo.io/age/cmd/age-keygen" - #:unpack-path "filippo.io/age" - #:install-source? #f)))) - (define-public go-filippo-io-edwards25519 (package (name "go-filippo-io-edwards25519") @@ -575,9 +641,50 @@ RSA, RSA-PSS, and ECDSA, though hooks are present for adding your own.") (base32 "0px12zhdmzqjj5zlcr136rcsilpmi4chiz6arxv49q372j4nhmia")))) (arguments (list - #:go go-1.18 #:import-path "github.com/golang-jwt/jwt/v5")))) +(define-public go-github-com-google-go-tpm + (package + (name "go-github-com-google-go-tpm") + (version "0.9.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/go-tpm") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1c5j5cvwl45ka93nknmv454ivd7kp9n8yql19gr6z01z0s1ph7sg")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.22 + #:import-path "github.com/google/go-tpm" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Break cycle: + ;; github.com/google/go-tpm/tpm2/transport/simulator/simulator.go -> + ;; github.com/google/go-tpm-tools -> github.com/google/go-tpm. + ;; Consider to add required inputs on dependent package. + (delete 'build) + (delete 'check)))) + (home-page "https://github.com/google/go-tpm") + (synopsis "Go-TPM Legacy TPM 2.0 library") + (description + "This package provides a functionality to communicate directly with a +@acronym{Trusted Platform Module, TPM} device. The libraries don't implement +the entire spec for neither 1.2 nor 2.0. + +Included submodules: +@itemize +@item @code{tpm} - TPM 1.2 client library +@item @code{tpm2} - TPM 2.0 client library. +@item @code{direct} - the prototype \"TPMDirect\" TPM 2.0 API, which is +intended to (eventually) be 1:1 with the TPM 2.0 spec +@end itemize") + (license license:asl2.0))) + ;; It's not public for purpose, as it contains a lot of golang modules which ;; may be inherited from the single source, but the package itself does not ;; have to be installed directly or linked to other packages.. @@ -931,8 +1038,7 @@ Architecture Processors\" by J. Guilford et al.") (base32 "0ydh94083888xl2r4d1grzgqf3c818mkmdpj008jkh6h7m56wc4w")))) (build-system go-build-system) (arguments - (list #:go go-1.21 - #:import-path "github.com/multiformats/go-multihash" + (list #:import-path "github.com/multiformats/go-multihash" #:phases #~(modify-phases %standard-phases (add-after 'unpack 'copy-multibase-specs @@ -1052,7 +1158,7 @@ official package.") (define-public go-github-com-quic-go-qtls-go1-20 (package (name "go-github-com-quic-go-qtls-go1-20") - (version "0.3.4") + (version "0.4.1") (source (origin (method git-fetch) @@ -1061,12 +1167,13 @@ official package.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0fl3yv1w8cygag3lav45vvzb4k9i72p92x13wcq0xn13wxirzirn")))) + (base32 "069rknxpg7d0dmxc4akq2mw7wm5bi0420nshykf2iclvmbcg9ajh")))) (build-system go-build-system) (arguments (list - #:import-path "github.com/quic-go/qtls-go1-20" - #:go go-1.20)) + ;; XXX: panic: qtls.ClientSessionState doesn't match, with Golang 1.20+. + #:go go-1.20 + #:import-path "github.com/quic-go/qtls-go1-20")) (propagated-inputs (list go-golang-org-x-crypto go-golang-org-x-sys)) @@ -1092,7 +1199,6 @@ QUIC. For Go 1.20.") (build-system go-build-system) (arguments `(#:import-path "github.com/refraction-networking/utls" - #:go ,go-1.20 #:tests? #f)) ;requires internet access (propagated-inputs (list go-github-com-andybalholm-brotli @@ -1325,6 +1431,43 @@ performance for large inputs and outputs.") (description "GoPtLib is a library for writing Tor pluggable transports in Go.") (license license:cc0))) + +;;; +;;; Executables: +;;; + +(define-public age + (package + (inherit go-filippo-io-age) + (name "age") + (arguments + (list + #:install-source? #f + #:import-path "filippo.io/age/cmd/age" + #:unpack-path "filippo.io/age" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-failing-test-data-files + ;; FIXME: testdata/output_file.txt:49: unknown command "ttyin" + ;; age: error: input and output file are the same: "inputcopy" + ;; age: error: input and output file are the same: "./inputcopy" + ;; age: error: input and output file are the same: "keycopy" + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + (list "testdata/scrypt.txt" + "testdata/output_file.txt" + "testdata/encrypted_keys.txt" + "testdata/terminal.txt")))))))))) + +(define-public age-keygen + (package + (inherit go-filippo-io-age) + (name "age-keygen") + (arguments + `(#:import-path "filippo.io/age/cmd/age-keygen" + #:unpack-path "filippo.io/age" + #:install-source? #f)))) ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances diff --git a/gnu/packages/golang-maths.scm b/gnu/packages/golang-maths.scm index 2348255119..cf783226ea 100644 --- a/gnu/packages/golang-maths.scm +++ b/gnu/packages/golang-maths.scm @@ -1,4 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2024 Rodion Goritskov <rodion.goritskov@gmail.com> ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -88,6 +89,33 @@ Features: @end itemize") (license license:expat))) +(define-public go-github-com-x448-float16 + (package + (name "go-github-com-x448-float16") + (version "0.8.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/x448/float16") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qg6ya30fra20hpa2qzqqzs8l95lvw9yzd87fdzq195xqi6crb2l")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/x448/float16")) + (home-page "https://github.com/x448/float16") + (synopsis "Float16 (Binary16) in Golang") + (description + "This package provides a +@url{https://en.wikipedia.org/wiki/Half-precision_floating-point_format,IEEE +754 half-precision floating-point format (binary16)} with IEEE 754 default +rounding for conversions. IEEE 754-2008 refers to this 16-bit floating-point +format as binary16.") + (license license:expat))) + ;;; ;;; Executables: ;;; diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index e64f20801c..b204280317 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -206,7 +206,6 @@ the parse trees produced by the html package.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/AudriusButkevicius/pfilter" #:phases #~(modify-phases %standard-phases @@ -561,8 +560,8 @@ and RFC 5389).") (base32 "1pwr7fzxgngb073q98qrz1f90bkk3pljynif6jl5a6q6kcsn7xf1")))) (build-system go-build-system) (arguments - (list #:go go-1.21 - #:import-path "github.com/cenkalti/backoff/v4")) + (list + #:import-path "github.com/cenkalti/backoff/v4")) (home-page "https://github.com/cenkalti/backoff") (synopsis "The exponential backoff algorithm in Go") (description "This is a Go port of the exponential backoff algorithm from @@ -787,7 +786,7 @@ decompose request handling into many smaller layers.") (define-public go-github-com-go-jose-go-jose-v3 (package (name "go-github-com-go-jose-go-jose-v3") - (version "3.0.0") + (version "3.0.3") (source (origin (method git-fetch) @@ -796,7 +795,7 @@ decompose request handling into many smaller layers.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1fnw0p49wc9gmd2xcji2x9jf97dgg9igagd5m6bmq3nw9jjfqdc5")))) + (base32 "0kbkplhzqv9ai28r4smhdsxxwh20d96srr3am37pwwnh48ivwch8")))) (build-system go-build-system) (arguments '( #:import-path "github.com/go-jose/go-jose/v3")) @@ -813,6 +812,24 @@ Signing and Encryption set of standards. This includes support for JSON Web Encryption, JSON Web Signature, and JSON Web Token standards.") (license license:asl2.0))) +(define-public go-github-com-go-jose-go-jose-v4 + (package + (inherit go-github-com-go-jose-go-jose-v3) + (name "go-github-com-go-jose-go-jose-v4") + (version "4.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-jose/go-jose") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bf444687q5rdxjgk41bkryhzhx49f6600b7i51m572xdl0r28a9")))) + (arguments + (list + #:import-path "github.com/go-jose/go-jose/v4")))) + (define-public go-github-com-go-ldap-ldap (package (name "go-github-com-go-ldap-ldap") @@ -876,6 +893,114 @@ language.") "This package provides Golang bindings for the Telegram Bot API.") (license license:expat))) +(define-public go-github-com-go-webauthn-webauthn + (package + (name "go-github-com-go-webauthn-webauthn") + (version "0.10.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-webauthn/webauthn") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1jbx3cd8cr4aaqq9s1x4sd1rlcs3lmam5aavpl08s5rj18m7rivf")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.22 + #:import-path "github.com/go-webauthn/webauthn" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-failing-tests + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + (list + ;; It tryes to access outbound network: + ;; + ;; Get "https://mds.fidoalliance.org": dial tcp: + ;; lookup mds.fidoalliance.org on [::1]:53: read udp + ;; [::1]:52300->[::1]:53: read: connection refused + ;; + ;; Post "https://mds3.fido.tools/getEndpoints": dial + ;; tcp: lookup mds3.fido.tools on [::1]:53: read udp + ;; [::1]:46703->[::1]:53: read: connection refused + "metadata/metadata_test.go" + ;; Get "https://mds.fidoalliance.org": dial tcp: + ;; lookup mds.fidoalliance.org on [::1]:53: read udp + ;; [::1]:37459->[::1]:53: read: connection refused + "protocol/attestation_androidkey_test.go" + "protocol/attestation_apple_test.go" + "protocol/attestation_packed_test.go" + "protocol/attestation_safetynet_test.go" + "protocol/attestation_test.go" + "protocol/attestation_tpm_test.go" + "protocol/attestation_u2f_test.go"))))) + ;; XXX: Run all tests, workaround for go-build-system's lack of Go + ;; modules support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-github-com-fxamacker-cbor-v2 + go-github-com-go-webauthn-x + go-github-com-golang-jwt-jwt-v5 + go-github-com-google-go-tpm + go-github-com-google-uuid + go-github-com-mitchellh-mapstructure)) + (home-page "https://github.com/go-webauthn/webauthn") + (synopsis "Webauthn/FIDO2 library for Golang") + (description + "This library is meant to handle @url{https://www.w3.org/TR/webauthn,Web +Authentication} for Go apps that wish to implement a passwordless solution for +users. This library conforms as much as possible to the guidelines and +implementation procedures outlined by the document. It's a successor of not +maintained https://github.com/duo-labs/webauthn library.") + (license license:bsd-3))) + +(define-public go-github-com-go-webauthn-x + (package + (name "go-github-com-go-webauthn-x") + (version "0.1.12") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-webauthn/x") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1h2ylzzh5xismgkz0gar3k8lwdwqqc2np4z5gmi1b5chh6qwy1bs")))) + (build-system go-build-system) + (arguments + (list + #:tests? #f ; no tests + #:import-path "github.com/go-webauthn/x" + #:phases + #~(modify-phases %standard-phases + ;; Source only package. + (delete 'build)))) + (propagated-inputs + (list go-golang-org-x-crypto)) + (home-page "https://github.com/go-webauthn/x") + (synopsis "Low level packages for WebAuthn") + (description + "This package implements a low level functionality for +@url{https://github.com/go-webauthn/webauthn,WebAuthn} library. It was forked +from CloudFlare's github.com/cloudflare/cfssl/revoke.") + (license (list + ;; For the CloudFlare's part: revoke/LICENSE. + license:bsd-2 + ;; For the WebAuthn's fork: LICENSE. + license:bsd-3)))) + (define-public go-github-com-goccy-go-json (package (name "go-github-com-goccy-go-json") @@ -947,8 +1072,11 @@ processes.") `(#:tests? #f ;application/octet-stream instead of text/plain #:import-path "github.com/google/go-github/v26/github" #:unpack-path "github.com/google/go-github/v26")) - (native-inputs - (list go-github-com-google-go-querystring go-golang-org-x-crypto)) + (propagated-inputs + (list go-github-com-google-go-querystring + go-golang-org-x-crypto + go-golang-org-x-oauth2 + go-golang-org-x-sync)) (home-page "https://github.com/google/go-github/") (synopsis "Client library for accessing the GitHub API v3") (description "@code{go-github} is a Go client library for accessing the @@ -1295,7 +1423,6 @@ JSON data to the machine.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/jackpal/gateway")) (native-inputs (list go-github-com-stretchr-testify)) @@ -1650,14 +1777,13 @@ following: (base32 "1rn02yn7494r7ayn585bbsddprbn8wdccxs4n2k5dmll4dyd39mp")))) (arguments (list - #:go go-1.21 #:import-path "github.com/multiformats/go-multiaddr")) (native-inputs (list go-github-com-stretchr-testify)) (propagated-inputs (list go-github-com-ipfs-go-cid go-github-com-multiformats-go-multibase go-github-com-multiformats-go-varint go-github-com-multiformats-go-multihash - go-golang-org-x-exp-2023)))) + go-golang-org-x-exp)))) (define-public go-github-com-multiformats-go-multiaddr-dns (package @@ -1675,7 +1801,6 @@ following: (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/multiformats/go-multiaddr-dns" #:unpack-path "github.com/multiformats/go-multiaddr-dns")) (propagated-inputs @@ -1703,7 +1828,6 @@ following: (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/multiformats/go-multiaddr-fmt")) (propagated-inputs (list go-github-com-multiformats-go-multiaddr-0.12)) @@ -1767,7 +1891,6 @@ conversion to and from @command{net.Addr}.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "github.com/multiformats/go-multistream")) (propagated-inputs (list go-github-com-multiformats-go-varint)) @@ -1846,7 +1969,6 @@ which produce colorized output using github.com/fatih/color.") (arguments (list #:tests? #f ; Requires some unpackaged software and test data - #:go go-1.21 #:import-path "github.com/oschwald/geoip2-golang")) (propagated-inputs (list go-github-com-oschwald-maxminddb-golang)) @@ -1873,7 +1995,6 @@ databases in Go.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/oschwald/maxminddb-golang" #:phases #~(modify-phases %standard-phases @@ -1951,7 +2072,6 @@ in Golang.") (base32 "10nn9349f7snqkzncda5m013fgnzicrcxi6pb6ghc0vb6rhqkf30")))) (arguments (list - #:go go-1.21 #:import-path "github.com/pion/dtls/v2")) (native-inputs (list go-github-com-stretchr-testify)) @@ -2028,7 +2148,6 @@ part of @url{https://github.com/pion, Pion} WebRTC implementation.") (arguments (list #:tests? #f ;Tests require network access. - #:go go-1.21 #:import-path "github.com/pion/ice/v2")) (propagated-inputs (list go-github-com-google-uuid @@ -2058,7 +2177,6 @@ part of @url{https://github.com/pion, Pion} WebRTC implementation.") (arguments (list #:tests? #f ;Tests require network access. - #:go go-1.21 #:import-path "github.com/pion/ice/v3")) (propagated-inputs (list go-github-com-google-uuid @@ -2091,7 +2209,6 @@ part of @url{https://github.com/pion, Pion} WebRTC implementation.") ;; packaging, see ;; <https://github.com/pion/.goassets/blob/master/.github/workflows/test.reusable.yml>. #:tests? #f - #:go go-1.21 #:unpack-path "github.com/pion/mdns" #:import-path "github.com/pion/mdns")) (native-inputs @@ -2145,7 +2262,6 @@ part of @url{https://github.com/pion, Pion} WebRTC implementation.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/pion/rtp")) (propagated-inputs (list go-github-com-pion-randutil)) @@ -2172,7 +2288,6 @@ packetizer and depacketizer.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/pion/stun")) (native-inputs (list go-github-com-stretchr-testify)) @@ -2207,7 +2322,6 @@ packetizer and depacketizer.") (base32 "0zli55ls5izpr6cw0wj0gy44872xn9rk20i8ay9cfk7j2rb60y60")))) (arguments (list - #:go go-1.21 #:import-path "github.com/pion/stun/v2")) (propagated-inputs (list go-github-com-pion-dtls-v2 @@ -2401,7 +2515,6 @@ it like any library. The quickest way to get started is to look at the (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/pires/go-proxyproto")) (home-page "https://github.com/pires/go-proxyproto") (synopsis "Implementation of the PROXY protocol") @@ -2510,7 +2623,6 @@ to jQuery to the Go language.") (list ;; Tests require ginkgo v2. #:tests? #f - #:go go-1.20 #:import-path "github.com/quic-go/qpack")) (propagated-inputs (list go-github-com-onsi-ginkgo @@ -2542,7 +2654,6 @@ the Go standard library}.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/quic-go/quic-go" #:phases #~(modify-phases %standard-phases @@ -2602,7 +2713,6 @@ protocol.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/quic-go/webtransport-go")) (native-inputs (list go-go-uber-org-mock @@ -2649,7 +2759,7 @@ support.") (define-public go-github-com-sourcegraph-jsonrpc2 (package (name "go-github-com-sourcegraph-jsonrpc2") - (version "0.1.0") + (version "0.2.0") (home-page "https://github.com/sourcegraph/jsonrpc2") (source (origin @@ -2659,14 +2769,12 @@ support.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dk0w32k96vxrwnmm24wqx337dn8ylch65qwrbc3wh7whw2xx71q")))) + (base32 "1id35b4mhif9gy1b70mv0x7xkmpm2p8xydix8six10yjyhvm1wjh")))) (build-system go-build-system) (arguments '(#:import-path "github.com/sourcegraph/jsonrpc2")) (propagated-inputs - (list go-github-com-daviddengcn-go-colortext - go-github-com-gorilla-websocket - go-github-com-motemen-go-colorine)) + (list go-github-com-gorilla-websocket)) (synopsis "Provides a client and server implementation of JSON-RPC 2.0") (description "Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.") @@ -2848,6 +2956,68 @@ encoding library for the MessagePack, CBOR, JSON and the Binc formats.") replacement for native @code{net/http} module.") (license license:expat))) +(define-public go-github-com-whyrusleeping-cbor + (package + (name "go-github-com-whyrusleeping-cbor") + (version "0.0.0-20171005072247-63513f603b11") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/cbor") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0v3kgzk8grz17my2vhv12qi9dgpx3z86hy9ff1c4qw83mg8hm67s")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/whyrusleeping/cbor" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Replace when go-build-system supports nested path. + (delete 'build) + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + ;; No test vectors were provided with git checkout: + ;; var errpath string = "../test-vectors/appendix_a.json" + (substitute* "go/cbor_test.go" + (("TestDecodeVectors") "offTestDecodeVectors")) + (invoke "go" "test" "-v" "./...")))))))) + (home-page "https://github.com/whyrusleeping/cbor") + (synopsis "Concise Binary Object Representation in Golang") + (description + "@acronym{Concise Binary Object Representation,CBOR} is a superset of +JSON's schema that's faster and more compact.") + (license license:asl2.0))) + +(define-public go-github-com-whyrusleeping-chunker + (package + (name "go-github-com-whyrusleeping-chunker") + (version "0.0.0-20181014151217-fe64bd25879f") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/chunker") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13q4flp9iwwyi0izqar786h42713rf3m22qlvg0masbmdi69qjr2")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/whyrusleeping/chunker")) + (home-page "https://github.com/whyrusleeping/chunker") + (synopsis "Implementation of Content Defined Chunking in Golang") + (description + "Package chunker implements @acronym{Content Defined Chunking,CDC} based +on a rolling Rabin Checksum. This package provides a modified fork of +https://github.com/restic/restic project.") + (license license:bsd-2))) + (define-public go-github-com-whyrusleeping-json-filter (let ((commit "ff25329a9528f01c5175414f16cc0a6a162a5b8b") (revision "0")) @@ -2873,6 +3043,33 @@ replacement for native @code{net/http} module.") @command{map[string]interface{}}.") (license license:expat)))) +(define-public go-github-com-whyrusleeping-multiaddr-filter + (package + (name "go-github-com-whyrusleeping-multiaddr-filter") + (version "0.0.0-20160516205228-e903e4adabd7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/multiaddr-filter") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ksd8vnp207dvphmhrazwldj8if900fnyc1pqa9pfvj04qp92640")))) + (build-system go-build-system) + (arguments + (list + ;; (*testing.common).Fatalf format %s has arg val of wrong type bool + #:tests? #f + #:import-path "github.com/whyrusleeping/multiaddr-filter")) + (home-page "https://github.com/whyrusleeping/multiaddr-filter") + (synopsis "Parsing ip filters and masks in the multiaddr format") + (description + "This module creates very simple +@url{https://github.com/jbenet/go-multiaddr,multiaddr} formatted cidr +netmasks.") + (license license:expat))) + (define-public go-github-com-xeipuuv-gojsonpointer (let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6") (revision "0")) @@ -2967,6 +3164,8 @@ programming language.") programming language, which supports draft-04, draft-06 and draft-07.") (license license:asl2.0)))) +;; XXX: This repository has been archived by the owner on Feb 27, 2023. It is +;; now read-only and it is DEPRECATED. (define-public go-gopkg-in-square-go-jose-v2 (package (name "go-gopkg-in-square-go-jose-v2") @@ -2982,7 +3181,12 @@ programming language, which supports draft-04, draft-06 and draft-07.") (base32 "1b1nhqxfmhzwrfk7pkvp2w3z3d0pf5ir00vizmy2d4xdbnldn70r")))) (build-system go-build-system) (arguments - (list #:import-path "gopkg.in/square/go-jose.v2")) + (list + ;; XXX: We strongly encourage users of square/go-jose to migrate to v3 + ;; of go-jose/go-jose. No support, security fixes or updates will be + ;; delivered to the v1/v2 branches in the Square repository. + #:tests? #f + #:import-path "gopkg.in/square/go-jose.v2")) (propagated-inputs (list go-golang-org-x-crypto)) (native-inputs diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 54b9c45ed6..9931911e32 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -159,7 +159,6 @@ simulate (mock) keypresses for CI testing.") (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "atomicgo.dev/schedule")) (home-page "https://atomicgo.dev/schedule") (synopsis "Easily schedule non-blocking tasks in Golang") @@ -186,7 +185,6 @@ given time, in a given duration, or repeatedly at a given interval.") (list ;; Tests require root access to mount file system. #:tests? #f - #:go go-1.19 #:import-path "bazil.org/fuse")) (propagated-inputs (list go-github-com-tv42-httpunix go-golang-org-x-sys)) @@ -217,7 +215,6 @@ use the C library from the project called FUSE.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "code.cloudfoundry.org/bytefmt")) (native-inputs (list go-github-com-onsi-gomega @@ -274,7 +271,6 @@ a human-readable byte format.") ;; they may be sourced from sqlite package. (arguments (list - #:go go-1.21 #:import-path "git.sr.ht/~emersion/go-sqlite3-fts5" #:phases #~(modify-phases %standard-phases @@ -373,6 +369,31 @@ Golang.") substitution.") (license license:expat))) +(define-public go-github-com-abadojack-whatlanggo + (package + (name "go-github-com-abadojack-whatlanggo") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abadojack/whatlanggo") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pidd5dqvcnqjjka12h0clj3mmq0j3bpanf9153schsx85xz7mzx")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/abadojack/whatlanggo")) + (home-page "https://github.com/abadojack/whatlanggo") + (synopsis "Natural language detection library for Golang") + (description + "This package provides functionality for detecting natural languages and +scripts (writing systems). Languages are represented by a defined list of +constants, while scripts are represented by RangeTable.") + (license license:expat))) + (define-public go-github-com-adrg-strutil (package (name "go-github-com-adrg-strutil") @@ -473,7 +494,7 @@ syntax highlighted HTML, ANSI-coloured text, etc.") (package (inherit go-github-com-alecthomas-chroma) (name "go-github-com-alecthomas-chroma-v2") - (version "2.12.0") + (version "2.14.0") (source (origin (method git-fetch) @@ -482,16 +503,59 @@ syntax highlighted HTML, ANSI-coloured text, etc.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1j9zz77ppi4r4ncnanzj84h7bsg0qdqrhgd5kkjiv09afm31jx83")))) + (base32 "1qgr4gywjks869sc85wb8nby612b8wvsa1dwpsbanjsljq7wq7mp")))) (arguments - (list #:go go-1.19 - #:import-path "github.com/alecthomas/chroma/v2")) + (list + #:import-path "github.com/alecthomas/chroma/v2" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-failing-testdata-and-cmd-files + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file-recursively + (list "lexers/testdata/python2/test_complex_file1.actual" + ;; Executible is packed as separate package. + "cmd"))))) + ;; XXX: Replace when go-build-system supports nested path. + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) (propagated-inputs (list go-github-com-dlclark-regexp2)) (native-inputs (list go-github-com-alecthomas-assert-v2 go-github-com-alecthomas-repr)))) +(define-public go-github-com-alecthomas-colour + (package + (name "go-github-com-alecthomas-colour") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alecthomas/colour") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "10zbm12j40ppia4b5ql2blmsps5jhh5d7ffphxx843qk7wlbqnjb")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/alecthomas/colour")) + (native-inputs + (list go-github-com-mattn-go-isatty)) + (home-page "https://github.com/alecthomas/colour/") + (synopsis "Colour terminal text for Go") + (description + "Package colour provides Quake-style colour formatting for Unix +terminals. The package level functions can be used to write to stdout (or +strings or other files). If stdout is not a terminal, colour formatting will +be stripped.") + (license license:expat))) + (define-public go-github-com-alecthomas-kingpin (package (name "go-github-com-alecthomas-kingpin") @@ -543,6 +607,36 @@ syntax highlighted HTML, ANSI-coloured text, etc.") (native-inputs (list go-github-com-stretchr-testify)))) +(define-public go-github-com-alecthomas-kong + (package + (name "go-github-com-alecthomas-kong") + (version "0.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alecthomas/kong") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0a9arf30h84ll8k612jh50c3vjmvdfj6i7dbvfnw3dalm6dn2aan")))) + (build-system go-build-system) + (arguments + (list + ;; One test failed when set to go-1.18 o lower, see + ;; <https://github.com/alecthomas/kong/issues/437> + #:import-path "github.com/alecthomas/kong")) + (native-inputs + (list go-github-com-alecthomas-assert-v2)) + (propagated-inputs + (list go-github-com-alecthomas-repr)) + (home-page "https://github.com/alecthomas/kong") + (synopsis "Command-line parser for Golang") + (description + "Package kong aims to support arbitrarily complex command-line structures +with as little developer effort as possible.") + (license license:expat))) + (define-public go-github-com-alecthomas-participle-v2 (package (name "go-github-com-alecthomas-participle-v2") @@ -558,8 +652,8 @@ syntax highlighted HTML, ANSI-coloured text, etc.") (base32 "0k2vsd58rgwyylyn5zja6z6k1sg4m39g2fhd88lvja60ca51bh98")))) (build-system go-build-system) (arguments - (list #:go go-1.18 - #:import-path "github.com/alecthomas/participle/v2")) + (list + #:import-path "github.com/alecthomas/participle/v2")) (native-inputs (list go-github-com-alecthomas-assert-v2)) (home-page "https://github.com/alecthomas/participle") @@ -571,6 +665,32 @@ structs. The approach is similar to how other marshallers work in Golang, \"unmarshalling\" an instance of a grammar into a struct.") (license license:expat))) +(define-public go-github-com-alecthomas-repr + (package + (name "go-github-com-alecthomas-repr") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alecthomas/repr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ikvl78dighkn87bxk6gki4wcz9f138n7kbqkagj5vbdb690yjkl")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/alecthomas/repr")) + (native-inputs + (list go-github-com-stretchr-testify)) + (home-page "https://github.com/alecthomas/repr/") + (synopsis "Represent Go values in an almost direct form") + (description + "This package attempts to represent Go values in a form that can be used +almost directly in Go source code.") + (license license:expat))) + (define-public go-github-com-alecthomas-template ;; No release, see <https://github.com/alecthomas/template/issues/7>. (let ((commit "a0175ee3bccc567396460bf5acd36800cb10c49c") @@ -590,6 +710,10 @@ structs. The approach is similar to how other marshallers work in Golang, (build-system go-build-system) (arguments (list + ;; XXX: Failing on a newer Golang version: FAIL: TestJSEscaping + ;; (0.00s) exec_test.go:757: JS escaping [unprintable ﷿] got + ;; [unprintable ﷿] want [unprintable \uFDFF] + #:go go-1.17 #:import-path "github.com/alecthomas/template")) (home-page "https://github.com/alecthomas/template") (synopsis "Fork of Go's text/template adding newline elision") @@ -700,6 +824,30 @@ for generating command line clients for your application configuration that is stored in a Go struct.") (license license:mpl2.0))) +(define-public go-github-com-aymanbagabas-go-osc52-v2 + (package + (name "go-github-com-aymanbagabas-go-osc52-v2") + (version "2.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aymanbagabas/go-osc52") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1y4y49zys7fi5wpicpdmjqnk0mb6569zg546km02yck2349jl538")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/aymanbagabas/go-osc52/v2")) + (home-page "https://github.com/aymanbagabas/go-osc52") + (synopsis "Terminal ANSI OSC52 wrapper") + (description + "OSC52 is a terminal escape sequence that allows copying text to the +clipboard.") + (license license:expat))) + (define-public go-github-com-benbjohnson-clock (package (name "go-github-com-benbjohnson-clock") @@ -715,8 +863,7 @@ stored in a Go struct.") (base32 "1p7n09pywqra21l981fbkma9vzsyf31pbvw6xg5r4hp8h8scf955")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/benbjohnson/clock" - #:go ,go-1.21)) + `(#:import-path "github.com/benbjohnson/clock")) (home-page "https://github.com/benbjohnson/clock") (synopsis "Small library for mocking time in Go") (description @@ -1179,7 +1326,6 @@ submodules: (arguments (list #:tests? #t ; Tests require network interface access - #:go go-1.18 #:import-path "github.com/cskr/pubsub")) (home-page "https://github.com/cskr/pubsub") (synopsis "Simple pubsub package for go") @@ -1326,7 +1472,6 @@ gist (https://gist.github.com/kballard/272720).") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "github.com/dave/jennifer")) (home-page "https://github.com/dave/jennifer") (synopsis "Code generator for Go") @@ -1549,8 +1694,7 @@ Implements string conversion functionality for unit prefixes. "s := strconv.QuoteRune(rune(c))")))))) (build-system go-build-system) (arguments - `(#:import-path "github.com/dustin/gojson" - #:go ,go-1.21)) + `(#:import-path "github.com/dustin/gojson")) (home-page "https://github.com/dustin/gojson") (synopsis "Extended Golang's @code{encoding/json} module with the public scanner API") (description @@ -1660,7 +1804,6 @@ more similar API to regexp.")))) (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/expr-lang/expr")) (home-page "https://expr-lang.org/") (synopsis "Expression language and expression evaluation for Go") @@ -1670,6 +1813,41 @@ designed to deliver dynamic configurations with unparalleled accuracy, safety, and speed.") (license license:expat))) +(define-public go-github-com-facebookgo-atomicfile + (package + (name "go-github-com-facebookgo-atomicfile") + (version "0.0.0-20151019160806-2de1f203e7d5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/facebookarchive/atomicfile") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vsx6r6y601jxvjqc8msbpr5v1037dfxxdd8h1q3s8wm6xhvj2v6")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/facebookgo/atomicfile")) + (home-page "https://github.com/facebookgo/atomicfile") + (synopsis "Atomically written/replaced file") + (description + "Package atomicfile provides the ability to write a file with an eventual +rename on Close (using @code{os.Rename}). This allows for a file to always be +in a consistent state and never represent an in-progress write.") + ;; patents + ;; + ;; Additional Grant of Patent Rights Version 2 + ;; <...> + ;; Facebook, Inc. ("Facebook") hereby grants to each recipient of the + ;; Software ("you") a perpetual, worldwide, royalty-free, non-exclusive, + ;; irrevocable (subject to the termination provision below) license under + ;; any Necessary Claims, to make, have made, use, sell, offer to sell, + ;; import, and otherwise transfer the Software. + ;; <...> + (license license:bsd-3))) + (define-public go-github-com-facette-natsort (package (name "go-github-com-facette-natsort") @@ -1750,6 +1928,36 @@ quoting, commenting, and escaping.") (home-page "https://github.com/flynn-archive/go-shlex") (license license:asl2.0)))) +(define-public go-github-com-fxamacker-cbor-v2 + (package + (name "go-github-com-fxamacker-cbor-v2") + (version "2.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fxamacker/cbor") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "039lk7n5155gy2sh55i1darcvxhv9fim2xmnvmx0xi9ihnrnczln")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/fxamacker/cbor/v2")) + (propagated-inputs + (list go-github-com-x448-float16)) + (home-page "https://github.com/fxamacker/cbor") + (synopsis "CBOR Codec in Golang") + (description + "This package implements functionality for encoding and decoding +@acronym{Concise Binary Object +Representation,CBOR} (@url{https://www.rfc-editor.org/rfc/rfc8949.html,RFC +8949}) and CBOR Sequences, with CBOR tags, Golang struct tags (@code{toarray}, +@code{keyasint}, @code{omitempty}), @code{float64/32/16}, and +@code{big.Intp}.") + (license license:expat))) + (define-public go-github-com-gabriel-vasile-mimetype (package (name "go-github-com-gabriel-vasile-mimetype") @@ -1766,7 +1974,6 @@ quoting, commenting, and escaping.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "github.com/gabriel-vasile/mimetype" #:phases #~(modify-phases %standard-phases (add-before 'check 'add-supported-mimes-md @@ -1817,7 +2024,6 @@ Differentiation between text and binary files}. (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/go-logr/logr" #:phases #~(modify-phases %standard-phases @@ -1916,6 +2122,56 @@ the library more lightweight.") "This package provides a Go implementation of globs.") (license license:expat))) +(define-public go-github-com-goccy-go-yaml + (package + (name "go-github-com-goccy-go-yaml") + (version "1.11.3") + (home-page "https://github.com/goccy/go-yaml") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rm2rfnlvv704zkb1mnjqv5xx32vfkzv7r2kc8if6gr9ryb7hmbf")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/goccy/go-yaml" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-benchmarks + (lambda* (#:key import-path #:allow-other-keys) + (delete-file-recursively + (string-append "src/" import-path "/benchmarks")))) + ;; XXX: Replace when go-build-system supports nested path. + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (native-inputs + (list go-github-com-go-playground-validator-v10 + go-github-com-google-go-cmp-cmp)) + (propagated-inputs + (list go-github-com-fatih-color + go-golang-org-x-xerrors)) + (synopsis "YAML support for the Go language") + (description + "This package provides features beyond the +@uref{https://github.com/go-yaml/yaml, defacto YAML library} including: + +@itemize +@item Pretty format for error notifications +@item Support Scanner or Lexer or Parser as public API +@item Support Anchor and Alias to Marshaler +@item Allow referencing elements declared in another file via anchors +@item Extract value or AST by YAMLPath (YAMLPath is like a JSONPath) +@end itemize") + (license license:expat))) + (define-public go-github-com-gookit-color (package (name "go-github-com-gookit-color") @@ -1932,7 +2188,6 @@ the library more lightweight.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/gookit/color" #:phases #~(modify-phases %standard-phases @@ -2181,7 +2436,6 @@ Groupcache.") (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/hashicorp/golang-lru/v2")))) (define-public go-github-com-hashicorp-hcl @@ -2402,7 +2656,6 @@ and stop units of work, which may receive @code{Close} signals from many clients ;; segment_test.go:145: Actual: 2, Expected: 1 ;; segment_test.go:146: === #:tests? #f - #:go go-1.21 #:import-path "github.com/jdkato/twine" #:phases #~(modify-phases %standard-phases @@ -2801,7 +3054,6 @@ Printf/Sprintf etc.") (build-system go-build-system) (arguments (list - #:go go-1.19 #:import-path "github.com/logrusorgru/aurora/v3")) (native-inputs (list go-github-com-stretchr-testify)))) @@ -2857,7 +3109,6 @@ implementing features like: (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/Masterminds/semver/v3")) (native-inputs (list go-github-com-stretchr-testify-next)) @@ -3100,7 +3351,6 @@ the @code{cpan} module @code{Parse::CommandLine}.") (build-system go-build-system) (arguments (list - #:go go-1.19 #:import-path "github.com/mattn/go-sqlite3")) (home-page "https://github.com/mattn/go-sqlite3") (synopsis "Sqlite3 driver for Go") @@ -3369,7 +3619,6 @@ command line flags, config files, and default struct values.") (list ;; To run the full suite, the tests must be run as the root user. #:tests? #f - #:go go-1.20 #:import-path "github.com/msteinert/pam")) (propagated-inputs (list go-golang-org-x-term @@ -3467,7 +3716,6 @@ Authentication Modules, PAM} application API.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/multiformats/go-multibase" #:phases #~(modify-phases %standard-phases @@ -3507,7 +3755,6 @@ multibase} (self identifying base encodings) in Go.") (build-system go-build-system) (arguments (list - #:go go-1.19 #:import-path "github.com/multiformats/go-multicodec" #:phases #~(modify-phases %standard-phases @@ -3566,7 +3813,6 @@ varints.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "github.com/nats-io/nats.go")) (propagated-inputs (list go-golang-org-x-text go-github-com-nats-io-nuid @@ -3649,7 +3895,6 @@ registry.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/neurosnap/sentences")) (home-page "https://github.com/neurosnap/sentences") (synopsis "Multilingual command line sentence tokenizer in Golang") @@ -3799,7 +4044,6 @@ included in this package.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/otiai10/copy" #:phases #~(modify-phases %standard-phases @@ -3971,7 +4215,6 @@ Pion}.") ;; Cycle: go-github-com-pterm-pterm -> go-github-com-marvinjwendt-testza ;; -> go-github-com-pterm-pterm #:tests? #f - #:go go-1.21 #:import-path "github.com/pterm/pterm")) (propagated-inputs (list go-atomicgo-dev-cursor @@ -4138,7 +4381,6 @@ synchronizing plain text: (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/shirou/gopsutil" #:phases #~(modify-phases %standard-phases (add-after 'unpack 'remove-v3 @@ -4182,7 +4424,6 @@ sensors).") (base32 "1xlfcx6giqaxdah2m02q2i8ynwlzar953wr8wqx1j3004xdgaivd")))) (arguments (list - #:go go-1.18 #:import-path "github.com/shirou/gopsutil" #:phases #~(modify-phases %standard-phases @@ -4258,10 +4499,9 @@ Use waterutil with it to work with TUN/TAP packets/frames.") ;; Package's tests appear to be hardcoded to the author's gitconfig ;; and require network access. #:tests? #f - #:go go-1.21 #:import-path "github.com/Songmu/gitconfig")) (propagated-inputs - (list go-github-com-goccy-yaml)) + (list go-github-com-goccy-go-yaml)) (home-page "https://github.com/songmu/gitconfig") (synopsis "Go library to get configuration values from gitconfig") (description @@ -4317,9 +4557,9 @@ well as a program to generate applications and command files.") (home-page "https://github.com/stathat/go") (license license:expat)))) -(define-public go-github-com-syndtr-goleveldb-leveldb +(define-public go-github-com-syndtr-goleveldb (package - (name "go-github-com-syndtr-goleveldb-leveldb") + (name "go-github-com-syndtr-goleveldb") (version "1.0.0") (source (origin @@ -4333,9 +4573,16 @@ well as a program to generate applications and command files.") (build-system go-build-system) (arguments (list - #:go go-1.21 - #:import-path "github.com/syndtr/goleveldb/leveldb" - #:unpack-path "github.com/syndtr/goleveldb")) + #:import-path "github.com/syndtr/goleveldb" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Replace when go-build-system supports nested path. + (delete 'build) + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) (propagated-inputs (list go-github-com-onsi-gomega go-github-com-onsi-ginkgo @@ -4510,7 +4757,6 @@ document.") (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/tklauser/go-sysconf" #:phases #~(modify-phases %standard-phases (add-before 'check 'remove-failing-tests @@ -4547,7 +4793,6 @@ document.") (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/tklauser/numcpus" #:phases #~(modify-phases %standard-phases (add-before 'check 'remove-failing-tests @@ -4650,6 +4895,57 @@ encoded values to create the picture in a code with no inherent errors.") weighted moving averages}.") (license license:expat))) +(define-public go-github-com-whyrusleeping-base32 + (package + (name "go-github-com-whyrusleeping-base32") + (version "0.0.0-20170828182744-c30ac30633cc") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/base32") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "060jj8j9rnm3m47vv7jfz9ddybch3ryvn1p9vhc63bqn73knalhf")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/whyrusleeping/base32")) + (home-page "https://github.com/whyrusleeping/base32") + (synopsis "BASE32 encoding package from go with NoPadding option") + (description + "This package provides a base32 encoding package from go with NoPadding +option.") + ;; No license provided, see + ;; <https://github.com/whyrusleeping/base32/issues/5> + (license license:public-domain))) + +(define-public go-github-com-whyrusleeping-go-keyspace + (package + (name "go-github-com-whyrusleeping-go-keyspace") + (version "0.0.0-20160322163242-5b898ac5add1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/go-keyspace") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fkk7i7qxwbz1g621mm6a6inb69lr57cyc9ayyfiwhnjwfz78rbb")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/whyrusleeping/go-keyspace")) + (home-page "https://github.com/whyrusleeping/go-keyspace") + (synopsis "Comparing key metrics within a given keyspace") + (description + "This is a package extracted from @code{go-ipfs}. Its purpose to be used +to compare a set of keys based on a given metric. The primary metric used is +XOR, as in kademlia.") + (license license:expat))) + (define-public go-github-com-whyrusleeping-go-sysinfo (package (name "go-github-com-whyrusleeping-go-sysinfo") @@ -4798,7 +5094,6 @@ CPU quota.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "go.uber.org/dig")) (native-inputs (list go-github-com-stretchr-testify-next)) @@ -4825,7 +5120,6 @@ object dependencies graph during the process startup.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "go.uber.org/fx")) (native-inputs (list go-github-com-stretchr-testify-next)) @@ -4884,7 +5178,6 @@ applications out of reusable, composable modules.") (build-system go-build-system) (arguments (list - #:go go-1.19 #:import-path "go.uber.org/zap" #:phases #~(modify-phases %standard-phases @@ -4999,6 +5292,39 @@ values.") ;;; Executables: ;;; +(define-public go-chroma + (package + (name "go-chroma") + (version "2.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alecthomas/chroma") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qgr4gywjks869sc85wb8nby612b8wvsa1dwpsbanjsljq7wq7mp")))) + (build-system go-build-system) + (arguments + (list + #:install-source? #f + #:import-path "github.com/alecthomas/chroma/cmd/chroma")) + (native-inputs + (list go-github-com-alecthomas-assert-v2 + go-github-com-alecthomas-chroma-v2 + go-github-com-alecthomas-kong + go-github-com-mattn-go-colorable + go-github-com-mattn-go-isatty)) + (home-page "https://github.com/alecthomas/chroma") + (synopsis "General purpose syntax highlighter in pure Golang") + (description + (string-append (package-description go-github-com-alecthomas-chroma-v2) + " This package provides an command line interface (CLI) +tool.")) + (license license:asl2.0))) + (define-public go-hclogvet (package (inherit go-github-com-hashicorp-go-hclog) @@ -5021,7 +5347,6 @@ correctly."))) (name "go-numcpus") (arguments (list - #:go go-1.18 #:import-path "github.com/tklauser/numcpus/cmd/numcpus" #:unpack-path "github.com/tklauser/numcpus" #:install-source? #f)) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d9145e9ac4..3ea153978f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -985,7 +985,10 @@ in the style of communicating sequential processes (@dfn{CSP}).") (list go-1.21) (package-native-inputs go-1.21))))) -(define-public go go-1.17) +;; +;; Default Golang version used in guix/build-system/go.scm to build packages. +;; +(define-public go go-1.21) (define make-go-std (mlambdaq (go) @@ -1734,32 +1737,32 @@ retry strategies, such as fixed delay, backoff delay, and random delay.") (description "Set is the set collection for the Go language.") (license license:expat))) -(define-public go-github-com-dhowett-go-plist - (let ((commit "1454fab16a0642638feb0ae98c41f79eccb2a20a") - (revision "1")) - (package - (name "go-github-com-dhowett-go-plist") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/DHowett/go-plist") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "01c9wmhny2rxywcjipq1xa0xw4qm7yd001239grwxcja3b4n45v8")))) - (build-system go-build-system) - (arguments `(#:import-path "howett.net/plist")) - (inputs - (list go-github-com-jessevdk-go-flags go-github-com-kr-pretty - go-gopkg-in-check-v1 go-gopkg-in-yaml-v2)) - (home-page "https://github.com/DHowett/go-plist") - (synopsis "Apple property list transcoder") - (description "This list transcoder supports encoding/decoding property -lists (Apple XML, Apple Binary, OpenStep, and GNUStep) from/to arbitrary Go -types.") - (license license:giftware)))) +(define-public go-howett-net-plist + (package + (name "go-howett-net-plist") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/DHowett/go-plist") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gcrxkmdj87xq01458asgxvvijrkih74ydbzfmir1p16xr9z0x39")))) + (build-system go-build-system) + (arguments + (list + #:import-path "howett.net/plist")) + (propagated-inputs + (list go-github-com-jessevdk-go-flags + go-gopkg-in-check-v1)) + (home-page "https://github.com/DHowett/go-plist") + (synopsis "Apple property list transcoder") + (description + "This list transcoder supports encoding/decoding property lists (Apple +XML, Apple Binary, OpenStep, and GNUStep) from/to arbitrary Go types.") + (license license:giftware))) (define-public go-github-com-blanu-dust (package @@ -2227,7 +2230,6 @@ Go.") (arguments `(#:unpack-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird" #:import-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird/cmd/lyrebird" - #:go ,go-1.20 #:phases (modify-phases %standard-phases (add-after 'unpack 'substitutions @@ -2602,7 +2604,8 @@ mouse, and terminal resizing events.") (base32 "07d5kxz0f8ss3v46y0c8jg02sagi0wlaaijhjzzp0r462jyzqii7")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/golangplus/fmt")) + '(#:tests? #f ; failing with new Golang compiler. + #:import-path "github.com/golangplus/fmt")) (synopsis "Additions to Go's standard @code{fmt} package") (description "This package provides additions to Go's stdlib @code{fmt}.") (license license:bsd-3))) @@ -2880,7 +2883,6 @@ web framework "0zff0qpqfzwa4xazppiq7jvpncnmx52m23qi4ih754b7rzhbk0iz")))) (arguments (list - #:go go-1.21 #:import-path "github.com/go-playground/validator/v10")) (propagated-inputs (modify-inputs (package-propagated-inputs @@ -3152,49 +3154,45 @@ command-line parsers.") (home-page "https://github.com/tj/docopt") (license license:expat))) -(define-public govulncheck +(define-public go-golang-org-x-vuln (package - (name "govulncheck") - (version "0.0.0-20221229164908-ebf31f7dc3ef") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/vuln") - (commit (go-version->git-ref version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1w055g90k7anrrcvfrsqklxzl9pl0vqdiwpayj9f0brwys9xhj7d")))) + (name "go-golang-org-x-vuln") + ;; XXX: Newer version of govulncheck requires golang.org/x/telemetry, + ;; which needs to be discussed if it may be included in Guix. + (version "0.0.0-20230110180137-6ad3e3d07815") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/vuln") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fhz27ni8bs872rgvqq700qacak9v45zy0fh2hilq21sk6dks72r")))) (build-system go-build-system) (arguments - `(#:import-path "golang.org/x/vuln" - #:go ,go-1.19 - #:install-source? #f - #:phases ,#~(modify-phases %standard-phases - (add-after 'unpack 'remove-go-mod-tidy - (lambda _ - (substitute* "src/golang.org/x/vuln/checks.bash" - (("go mod tidy") - #$(file-append coreutils-minimal "/bin/true"))))) - (replace 'build - (lambda arguments - (apply (assoc-ref %standard-phases - 'build) - `(,@arguments #:import-path - "golang.org/x/vuln/cmd/govulncheck"))))))) - (native-inputs (list coreutils-minimal)) - (inputs (list go-golang-org-x-sys - go-github-com-google-renameio - go-github-com-burntsushi-toml - go-mvdan-cc-unparam - go-honnef-co-go-tools - go-golang-org-x-tools - go-golang-org-x-sync - go-golang-org-x-mod - go-golang-org-x-exp - go-github-com-google-go-cmp-cmp - go-github-com-google-go-cmdtest - go-github-com-client9-misspell)) + (list + #:tests? #f ; it tires to download modules from the network + #:import-path "golang.org/x/vuln" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" + "./doc/..." + "./internal/..." + "./scan/...")))))))) + (propagated-inputs + (list go-github-com-google-go-cmdtest + go-github-com-google-go-cmp-cmp + go-golang-org-x-exp + go-golang-org-x-mod + go-golang-org-x-sync + go-golang-org-x-tools)) (home-page "https://golang.org/x/vuln") (synopsis "Go Vulnerability Management") (description @@ -3202,58 +3200,60 @@ command-line parsers.") the @url{https://vuln.go.dev,Go Vulnerability Database}.") (license license:bsd-3))) -(define-public go-golang-org-x-vuln +(define-public govulncheck (package - (inherit govulncheck) - (name "go-golang-org-x-vuln") + (inherit go-golang-org-x-vuln) + (name "govulncheck") (arguments - `(#:import-path "golang.org/x/vuln" - #:tests? #f - #:install-source? #t - #:phases (modify-phases %standard-phases - (delete 'build)))) - (propagated-inputs (package-inputs govulncheck)) - (native-inputs '()) - (inputs '()))) + (list + #:tests? #f + #:install-source? #f + #:import-path "golang.org/x/vuln/cmd/govulncheck" + #:unpack-path "golang.org/x/vuln")) + (native-inputs + (list coreutils-minimal)))) (define-public gopls (package (name "gopls") - (version "0.12.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/tools") - (commit (string-append "gopls/v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "04bq7rh6d6mgxm0lsi8y9v1x7cgx4nvjlsyvxl89r6rcqh3n1lfb")))) + ;; XXX: Starting from 0.14.0 gppls needs golang.org/x/telemetry, which + ;; needs to be discussed if it may be included in Guix. + (version "0.13.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/tools") + (commit (string-append "gopls/v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qym2c0xvv6vcgwh0kz8sw094r88lzrl08xpvmg08lrqi00ma6kx")))) (build-system go-build-system) (arguments - `(#:import-path "golang.org/x/tools/gopls" - #:unpack-path "golang.org/x/tools" - #:install-source? #f - #:phases (modify-phases %standard-phases - (add-before 'unpack 'override-tools - (lambda _ - (delete-file-recursively "src/golang.org/x/tools")))))) - (propagated-inputs (list go-github-com-google-go-cmp-cmp - go-github-com-jba-printsrc - go-github-com-jba-templatecheck - go-github-com-sergi-go-diff - go-golang-org-x-mod - go-golang-org-x-sync - go-golang-org-x-sys - go-golang-org-x-text - go-gopkg-in-yaml-v3 - go-honnef-co-go-tools - go-github-com-burntsushi-toml - go-github-com-google-safehtml - go-golang-org-x-exp - go-mvdan-cc-gofumpt - go-golang-org-x-vuln - go-mvdan-cc-xurls)) + (list + #:install-source? #f + #:import-path "golang.org/x/tools/gopls" + #:unpack-path "golang.org/x/tools" + #:phases + #~(modify-phases %standard-phases + (add-before 'unpack 'override-tools + (lambda _ + (delete-file-recursively "src/golang.org/x/tools")))))) + (native-inputs + (list go-github-com-google-go-cmp-cmp + go-github-com-jba-printsrc + go-github-com-jba-templatecheck + go-github-com-sergi-go-diff + go-golang-org-x-mod + go-golang-org-x-sync + go-golang-org-x-sys + go-golang-org-x-text + go-golang-org-x-tools + go-golang-org-x-vuln + go-gopkg-in-yaml-v3 + go-honnef-co-go-tools + go-mvdan-cc-gofumpt + go-mvdan-cc-xurls)) (home-page "https://golang.org/x/tools/gopls") (synopsis "Official language server for the Go language") (description @@ -5276,7 +5276,7 @@ representation suitable for computing diffs.") (define-public go-github-com-go-sql-driver-mysql (package (name "go-github-com-go-sql-driver-mysql") - (version "1.5.0") + (version "1.8.1") (source (origin (method git-fetch) @@ -5286,11 +5286,13 @@ representation suitable for computing diffs.") (file-name (git-file-name name version)) (sha256 (base32 - "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v")))) + "0ihdqg411gkv454fwx8w5nbndgkm5dz5phfliksxgmhggyxxm7sn")))) (build-system go-build-system) (arguments '(#:tests? #f ;; tests require a network connection #:import-path "github.com/go-sql-driver/mysql")) + (propagated-inputs + (list go-filippo-io-edwards25519)) (home-page "https://github.com/go-sql-driver/mysql") (synopsis "MySQL driver for golang") (description @@ -5323,9 +5325,6 @@ It stores colors in RGB and provides methods for converting these to various color spaces.") (license license:expat))) -(define-public go-golang-org-colorful - (deprecated-package "go-golang-org-colorful" go-github-com-lucasb-eyer-go-colorful)) - (define-public go-github-com-gdamore-encoding (package (name "go-github-com-gdamore-encoding") @@ -5627,6 +5626,8 @@ designed to clean up raw terminal output by stripping escape sequences, optionally preserving color.") (license license:expat))) +;; XXX: This repository has been archived by the owner on Dec 1, 2021. It is +;; now read-only. (define-public go-github-com-pkg-errors (package (name "go-github-com-pkg-errors") @@ -5643,15 +5644,11 @@ optionally preserving color.") (build-system go-build-system) (arguments (list - #:import-path "github.com/pkg/errors" - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs #:allow-other-keys #:rest args) - (unless - ;; The tests fail when run with gccgo. - (false-if-exception (search-input-file inputs "/bin/gccgo")) - (apply (assoc-ref %standard-phases 'check) args))))))) + ;; Tests fail with a newer version of Golang (1.21) due to some API + ;; changes in how the module path is calculated which is not reflected + ;; in tests. + #:tests? #f + #:import-path "github.com/pkg/errors")) (synopsis "Go error handling primitives") (description "This package provides @code{error}, which offers simple error handling primitives in Go.") @@ -6277,8 +6274,7 @@ data serialization format.") "1xf18kzz96hgfy1vlbnydrizzpxkqj2iamfdbj3dx5a1zz5mi8n0")))) (build-system go-build-system) (arguments - (list #:go go-1.21 - #:import-path "google.golang.org/protobuf" + (list #:import-path "google.golang.org/protobuf" #:phases #~(modify-phases %standard-phases ;; XXX: Workaround for go-build-system's lack of Go modules @@ -6349,9 +6345,6 @@ efficient space usage.") (home-page "https://github.com/bits-and-blooms/bitset") (license license:bsd-3))) -(define-public go-github-com-willf-bitset - (deprecated-package "go-github-com-willf-bitset" go-github-com-bits-and-blooms-bitset)) - (define-public go-github-com-bits-and-blooms-bloom (package (name "go-github-com-bits-and-blooms-bloom") @@ -6386,9 +6379,6 @@ based on murmurhash.") (home-page "https://github.com/bits-and-blooms/bitset") (license license:bsd-2))) -(define-public go-github-com-willf-bloom - (deprecated-package "go-github-com-willf-bloom" go-github-com-bits-and-blooms-bloom)) - (define-public go-golang-org-rainycape-unidecode (let ((commit "cb7f23ec59bec0d61b19c56cd88cee3d0cc1870c") (revision "1")) @@ -6706,120 +6696,46 @@ matching and globbing with support for \"doublestar\" patterns.") (list #:import-path "github.com/bmatcuk/doublestar/v4")))) -(define-public go-github-com-alecthomas-colour +(define-public go-github-com-muesli-reflow (package - (name "go-github-com-alecthomas-colour") - (version "0.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/alecthomas/colour") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "10zbm12j40ppia4b5ql2blmsps5jhh5d7ffphxx843qk7wlbqnjb")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/alecthomas/colour")) - (native-inputs - (list go-github-com-mattn-go-isatty)) - (home-page "https://github.com/alecthomas/colour/") - (synopsis "Colour terminal text for Go") - (description "Package colour provides Quake-style colour formatting for -Unix terminals. - -The package level functions can be used to write to stdout (or strings or -other files). If stdout is not a terminal, colour formatting will be -stripped.") - (license license:expat))) - -(define-public go-github-com-alecthomas-repr - (package - (name "go-github-com-alecthomas-repr") - (version "0.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/alecthomas/repr") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1zq30b36vvg4kzxkff64gjwvcjaw0d13dqzfjfai66hkh3ijdzwl")))) - (build-system go-build-system) - (arguments - `(#:go ,go-1.18 - #:import-path "github.com/alecthomas/repr")) - (native-inputs - (list go-github-com-stretchr-testify)) - (home-page "https://github.com/alecthomas/repr/") - (synopsis "Represent Go values in an almost direct form") - (description "This package attempts to represent Go values in a form that -can be used almost directly in Go source code.") - (license license:expat))) - -(define-public go-github-com-muesli-reflow-wordwrap - (package - (name "go-github-com-muesli-reflow-wordwrap") + (name "go-github-com-muesli-reflow") (version "0.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/muesli/reflow") - (commit (string-append "v" version)))) - (file-name (git-file-name "go-github-com-muesli-reflow" version)) - (sha256 - (base32 - "09zcz2cqdwgj1ilya5pqwndryk6lansn87x63fcm8j1xn74vd2ry")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/muesli/reflow") + (commit (string-append "v" version)))) + (file-name (git-file-name "go-github-com-muesli-reflow" version)) + (sha256 + (base32 "09zcz2cqdwgj1ilya5pqwndryk6lansn87x63fcm8j1xn74vd2ry")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/muesli/reflow/wordwrap" - #:unpack-path "github.com/muesli/reflow")) - (native-inputs + (list + #:import-path "github.com/muesli/reflow" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (propagated-inputs (list go-github-com-mattn-go-runewidth)) (home-page "https://github.com/muesli/reflow/") (synopsis "Collection of methods helping to transform blocks of text") - (description "This package provides a collection of ANSI-aware methods and -io.Writers helping you to transform blocks of text.") + (description + "This package provides a collection of ANSI-aware methods and io.Writers +helping you to transform blocks of text.") (license license:expat))) -(define-public go-github-com-muesli-reflow-ansi - (package - (inherit go-github-com-muesli-reflow-wordwrap) - (name "go-github-com-muesli-reflow-ansi") - (arguments - `(#:import-path "github.com/muesli/reflow/ansi" - #:unpack-path "github.com/muesli/reflow")))) - -(define-public go-github-com-muesli-reflow-indent - (package - (inherit go-github-com-muesli-reflow-wordwrap) - (name "go-github-com-muesli-reflow-indent") - (arguments - `(#:import-path "github.com/muesli/reflow/indent" - #:unpack-path "github.com/muesli/reflow")))) - -(define-public go-github-com-muesli-reflow-padding - (package - (inherit go-github-com-muesli-reflow-wordwrap) - (name "go-github-com-muesli-reflow-padding") - (arguments - `(#:import-path "github.com/muesli/reflow/padding" - #:unpack-path "github.com/muesli/reflow")))) - -(define-public go-github-com-muesli-reflow-truncate - (package - (inherit go-github-com-muesli-reflow-wordwrap) - (name "go-github-com-muesli-reflow-truncate") - (arguments - `(#:import-path "github.com/muesli/reflow/truncate" - #:unpack-path "github.com/muesli/reflow")))) - (define-public go-github-com-muesli-termenv (package (name "go-github-com-muesli-termenv") - (version "0.8.1") + (version "0.15.2") (source (origin (method git-fetch) (uri (git-reference @@ -6828,15 +6744,16 @@ io.Writers helping you to transform blocks of text.") (file-name (git-file-name name version)) (sha256 (base32 - "0m24ljq1nq7z933fcvg99fw0fhxj9rb5ll4rlay7z2f2p59mrbdp")))) + "19yhli6k79aqpra4djp0cl4q76mqxbc1f7in20y0dzhnjb7yz42p")))) (build-system go-build-system) (arguments `(#:import-path "github.com/muesli/termenv")) - (native-inputs - (list go-github-com-google-goterm + (propagated-inputs + (list go-github-com-aymanbagabas-go-osc52-v2 go-github-com-lucasb-eyer-go-colorful go-github-com-mattn-go-isatty - go-github-com-mattn-go-runewidth)) + go-github-com-mattn-go-runewidth + go-golang-org-x-sys)) (home-page "https://github.com/muesli/termenv/") (synopsis "Advanced styling options on the terminal") (description "termenv lets you safely use advanced styling options on the @@ -6914,7 +6831,7 @@ size of the terminal.") (define-public go-github-com-charmbracelet-glamour (package (name "go-github-com-charmbracelet-glamour") - (version "0.2.0") + (version "0.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -6923,43 +6840,56 @@ size of the terminal.") (file-name (git-file-name name version)) (sha256 (base32 - "1idq8d13rp1hx2a1xak31fwl9fmi09p2x4ymvzl7aj850saw5w0z")))) + "073kyx94r9f0hpjv5c3x9pfdd3dbpyqcy7jhx4yxz0ps25j1a41p")))) (build-system go-build-system) (arguments - (list #:import-path "github.com/charmbracelet/glamour" - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-tests - (lambda _ - ;; Some tests fail due to different number of '^[0m' symbols at - ;; the beginning and the end of paragraphs. To fix that we - ;; re-generate 'readme.test' so the test output will match the - ;; 'readme.test' contents. - (chmod "src/github.com/charmbracelet/glamour/testdata/readme.test" - #o644) - (substitute* "src/github.com/charmbracelet/glamour/glamour_test.go" - ((" generate = false") - " generate = true"))))))) - (native-inputs - (list go-github-com-alecthomas-chroma - go-github-com-danwakefield-fnmatch - go-github-com-dlclark-regexp2 + (list + #:import-path "github.com/charmbracelet/glamour" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda _ + ;; Some tests fail due to different number of '^[0m' symbols at + ;; the beginning and the end of paragraphs. To fix that we + ;; re-generate 'readme.test' so the test output will match the + ;; 'readme.test' contents. + (chmod "src/github.com/charmbracelet/glamour/testdata/readme.test" + #o644) + (substitute* "src/github.com/charmbracelet/glamour/glamour_test.go" + ((" generate = false") + " generate = true")))) + ;; FIXME: Pattern embedded: cannot embed directory embedded: + ;; contains no embeddable files. + ;; + ;; This happens due to Golang can't determine the valid directory of + ;; the module which is sourced during setup environment phase, but + ;; easy resolved after coping to expected directory "vendor" within + ;; the current package, see details in Golang source: + ;; + ;; - URL: <https://github.com/golang/go/blob/> + ;; - commit: 82c14346d89ec0eeca114f9ca0e88516b2cda454 + ;; - file: src/cmd/go/internal/load/pkg.go#L2059 + (add-before 'build 'copy-input-to-vendor-directory + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (mkdir "vendor") + (copy-recursively + (string-append + #$(this-package-input "go-github-com-alecthomas-chroma-v2") + "/src/github.com") + "vendor/github.com")))) + (add-before 'install 'remove-vendor-directory + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (delete-file-recursively "vendor"))))))) + (propagated-inputs + (list go-github-com-alecthomas-chroma-v2 go-github-com-microcosm-cc-bluemonday - go-github-com-chris-ramon-douceur - go-github-com-aymerick-douceur - go-github-com-gorilla-css - go-github-com-muesli-reflow-ansi - go-github-com-muesli-reflow-wordwrap - go-github-com-muesli-reflow-indent - go-github-com-muesli-reflow-padding - go-github-com-mattn-go-runewidth + go-github-com-muesli-reflow go-github-com-muesli-termenv - go-github-com-google-goterm - go-github-com-lucasb-eyer-go-colorful - go-github-com-mattn-go-isatty go-github-com-olekukonko-tablewriter go-github-com-yuin-goldmark - go-golang-org-x-net)) + go-github-com-yuin-goldmark-emoji)) (home-page "https://github.com/charmbracelet/glamour/") (synopsis "Write handsome command-line tools with glamour") (description "@code{glamour} lets you render markdown documents and @@ -7405,9 +7335,9 @@ and @code{ioutil} packages that is easy to test.") @code{go-github-com-twpayne-go-vfs} and @code{go-github-com-spf13-afero}.") (license license:expat))) -(define-public go-github-com-twpayne-go-xdg +(define-public go-github-com-twpayne-go-xdg-v3 (package - (name "go-github-com-twpayne-go-xdg") + (name "go-github-com-twpayne-go-xdg-v3") (version "3.1.0") (source (origin (method git-fetch) @@ -7683,7 +7613,7 @@ server tools for Prometheus metrics.") (arguments `(#:tests? #f ;XXX: Fix dbus tests #:import-path "github.com/zalando/go-keyring")) - (native-inputs + (propagated-inputs (list go-github-com-godbus-dbus dbus)) (home-page "https://github.com/zalando/go-keyring/") (synopsis "Library for working with system keyring") @@ -7869,7 +7799,10 @@ additions.") "09a4gsh75a8bj71wr042afrma9frriqp60cm0cx6c9a8lv5yzzi0")))) (build-system go-build-system) (arguments - '(#:import-path "golang.zx2c4.com/wireguard")) + '(;; XXX: Failed on newer version of Golang, the recent release requires + ;; gvisor.dev/gvisor, which is huge to pack. + #:tests? #f + #:import-path "golang.zx2c4.com/wireguard")) (propagated-inputs (list go-golang-org-x-crypto go-golang-org-x-net go-golang-org-x-sys go-golang-org-x-text)) @@ -7904,49 +7837,6 @@ systems can import this package to enable running programs as services without modifying them.") (license license:zlib))) -(define-public go-github-com-goccy-yaml - (package - (name "go-github-com-goccy-yaml") - (version "1.11.3") - (home-page "https://github.com/goccy/go-yaml") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1rm2rfnlvv704zkb1mnjqv5xx32vfkzv7r2kc8if6gr9ryb7hmbf")))) - (build-system go-build-system) - (arguments - (list - #:go go-1.18 - #:import-path "github.com/goccy/go-yaml" - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'remove-benchmarks - (lambda* (#:key import-path #:allow-other-keys) - (delete-file-recursively - (string-append "src/" import-path "/benchmarks"))))))) - (propagated-inputs - (list go-github-com-fatih-color go-golang-org-x-xerrors)) - (native-inputs - (list go-github-com-go-playground-validator-v10 - go-github-com-google-go-cmp-cmp)) - (synopsis "YAML support for the Go language") - (description - "This package provides features beyond the -@uref{https://github.com/go-yaml/yaml, defacto YAML library} including: - -@itemize -@item Pretty format for error notifications -@item Support Scanner or Lexer or Parser as public API -@item Support Anchor and Alias to Marshaler -@item Allow referencing elements declared in another file via anchors -@item Extract value or AST by YAMLPath (YAMLPath is like a JSONPath) -@end itemize") - (license license:expat))) - (define-public go-github-com-tekwizely-go-parsing (let ((commit "1548cfb17df54d365ce9febed0677c06a40a8ceb") (revision "0")) @@ -8139,8 +8029,7 @@ Gemini clients and servers.") fixed-version)))))) (build-system go-build-system) (arguments - `(#:import-path "mvdan.cc/gofumpt" - #:go ,go-1.19)) + `(#:import-path "mvdan.cc/gofumpt")) (native-inputs (list go-gopkg-in-errgo-fmt-errors)) (propagated-inputs (list go-github-com-pkg-diff go-github-com-kr-text @@ -8177,7 +8066,7 @@ That is, @code{gofumpt} is happy with a subset of the formats that (define-public unparam (package (name "unparam") - (version "0.0.0-20221223090309-7455f1af531d") + (version "0.0.0-20240528143540-8a5130ca722f") (source (origin (method git-fetch) (uri (git-reference @@ -8186,13 +8075,16 @@ That is, @code{gofumpt} is happy with a subset of the formats that (file-name (git-file-name name version)) (sha256 (base32 - "0wynf0b32azxljncw5fh9bwkxpdflvf9q1z16wyj432566yjh12c")))) + "0qrwszcmb5slbzkq3acw57b896z22zwkv6cf6ldxwlc6p179g009")))) (build-system go-build-system) (arguments - `(#:import-path "mvdan.cc/unparam" - #:go ,go-1.19)) - (inputs (list go-golang-org-x-sys go-golang-org-x-mod - go-github-com-pkg-diff go-golang-org-x-tools + `(;; FIXME: <...>-go-1.21.5/lib/go/src/runtime/cgo/cgo.go:33:8: could not + ;; import C (no metadata for C) + ;; <...>-go-1.21.5/lib/go/src/net/cgo_linux.go:12:8: could not import C + ;; (no metadata for C) + #:tests? #f + #:import-path "mvdan.cc/unparam")) + (inputs (list go-github-com-pkg-diff go-golang-org-x-tools go-github-com-rogpeppe-go-internal)) (home-page "https://mvdan.cc/unparam/") (synopsis "Find unused parameters in Go") @@ -8515,11 +8407,9 @@ parser.") `(("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty) ("github.com/muesli/termenv" ,go-github-com-muesli-termenv) ("github.com/mattn/go-runewidth" ,go-github-com-mattn-go-runewidth) - ("go-github-com-muesli-reflow-indent" ,go-github-com-muesli-reflow-indent) - ("go-github-com-muesli-reflow-ansi" ,go-github-com-muesli-reflow-ansi) + ("go-github-com-muesli-reflow" ,go-github-com-muesli-reflow) ("go-github-com-lucasb-eyer-go-colorful" ,go-github-com-lucasb-eyer-go-colorful) ("github.com/containerd/console" ,go-github-com-containerd-console) - ("go-github-com-muesli-reflow-truncate" ,go-github-com-muesli-reflow-truncate) ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) ("go-golang-org-x-sys" ,go-golang-org-x-sys) ("go-golang-org-x-term" ,go-golang-org-x-term) @@ -8575,7 +8465,6 @@ dependencies and a simple API.") (build-system go-build-system) (arguments (list #:import-path "github.com/Arceliar/ironwood" - #:go go-1.21 #:tests? #f #:phases #~(modify-phases %standard-phases @@ -8618,9 +8507,6 @@ be useful for other network applications.") (home-page "https://github.com/mtibben/percent") (license license:expat))) -(define-public go-github-com-percent - (deprecated-package "go-github-com-percent" go-github-com-mtibben-percent)) - (define-public aws-vault (package (name "aws-vault") @@ -8727,9 +8613,6 @@ aware of your profiles and configuration in ~/.aws/config.") (home-page "https://github.com/gsterjov/go-libsecret") (license license:expat)))) -(define-public go-github-com-go-libsecret - (deprecated-package "go-github-com-go-libsecret" go-github-com-gsterjov-go-libsecret)) - (define-public go-github-com-mtibben-androiddnsfix (let ((commit "ff02804463540c36e3a148dcf4b009d003cf2a31") (revision "0")) @@ -8984,8 +8867,7 @@ ordered, mutable data structure.") (base32 "0pdy8f7bkm65gx4vknwcvfa619hknflqxkdlvmf427k2mzm91gmh")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/peterbourgon/diskv" - #:go ,go-1.18)) + `(#:import-path "github.com/peterbourgon/diskv")) (propagated-inputs (list go-github-com-google-btree)) (home-page "https://github.com/peterbourgon/diskv") (synopsis "Disk-backed key-value store") @@ -9129,7 +9011,7 @@ text-only mail clients to display them.") (define-public go-github-com-jhillyerd-enmime (package (name "go-github-com-jhillyerd-enmime") - (version "0.9.4") + (version "1.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -9138,22 +9020,19 @@ text-only mail clients to display them.") (file-name (git-file-name name version)) (sha256 (base32 - "124dqm598phbmalyx2gmxk201z9kq4ckvvdq8rc0akjlp24nxqbb")))) + "03pir9wq9ha2i2ifj819yv5i0lvrgdn904ksbzgc3k8bqc497ydn")))) (build-system go-build-system) (arguments (list #:import-path "github.com/jhillyerd/enmime")) - (propagated-inputs (list go-golang-org-x-text - go-golang-org-x-net - go-github-com-stretchr-testify - go-github-com-ssor-bom - go-github-com-rivo-uniseg - go-github-com-pkg-errors - go-github-com-olekukonko-tablewriter - go-github-com-mattn-go-runewidth - go-github-com-gogs-chardet - go-github-com-jaytaylor-html2text - go-github-com-go-test-deep - go-github-com-cention-sany-utf7)) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs (list + go-github-com-cention-sany-utf7 + go-github-com-go-test-deep + go-github-com-gogs-chardet + go-github-com-jaytaylor-html2text + go-github-com-pkg-errors + go-golang-org-x-text)) (home-page "https://github.com/jhillyerd/enmime") (synopsis "MIME encoder and decoder for Go") (description diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 09a419d7e9..ce7e4bfbe3 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -203,7 +203,7 @@ coordinates as well as partial support for adjustments in global coordinate syst (string-append "PREFIX=" (assoc-ref outputs "out")))))))) (inputs - (list qtbase-5 qtlocation qtsvg-5)) + (list qtbase-5 qtlocation-5 qtsvg-5)) (native-inputs (list qttools-5)) (home-page "https://www.gpxsee.org") diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index f609118c01..8eae1ed89d 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -496,14 +496,14 @@ typically encountered in feature film production.") (define-public blender (package (name "blender") - (version "3.6.10") ;3.6.x is the current LTS version + (version "3.6.13") ;3.6.x is the current LTS version (source (origin (method url-fetch) (uri (string-append "https://download.blender.org/source/" "blender-" version ".tar.xz")) (sha256 (base32 - "1srwr365y40hhpjmfsg52rphdybvin0ay2r23pknm7b9pkpw0wqs")))) + "1sx2yz1y37h8g2p6k8cjf2935p3nlvn9nvjc9yfzp79bg4ypfpbz")))) (build-system cmake-build-system) (arguments (list @@ -715,7 +715,7 @@ baking tools to produce normal maps.") (define-public openshadinglanguage (package (name "openshadinglanguage") - (version "1.13.8.0") + (version "1.13.10.0") (source (origin (method git-fetch) @@ -724,7 +724,7 @@ baking tools to produce normal maps.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ji4bw8z4ylsh0jvir3d40p6xyhr63g588gh3bag7bzsr3flsb02")))) + (base32 "1x97w4infifw33r4ii53q3v1ia0p21lbacd7z01vsz4vq7sy0dxn")))) (build-system cmake-build-system) (arguments (list #:configure-flags @@ -1325,16 +1325,17 @@ with strong support for multi-part, multi-channel use cases.") (define-public openimageio (package (name "openimageio") - (version "2.5.10.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/OpenImageIO/oiio") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "06x3lqj9qjh5m0zbr5g2g9ii6jk340pgzrhr4fb353y1y2pkx5sw")))) + (version "2.5.13.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AcademySoftwareFoundation/OpenImageIO") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0bqalfcfjjk31a7zv2hyx0jz8jpdhpsmc3sqwmfl4zf431g45hpb")))) (build-system cmake-build-system) (arguments (list #:tests? #f ; half the tests require online data or use redirection @@ -1344,14 +1345,22 @@ with strong support for multi-part, multi-channel use cases.") (list pkg-config)) (inputs (list boost + dcmtk fmt + freetype giflib imath + libglvnd libheif libjpeg-turbo libpng + libraw libtiff + libwebp + opencolorio openexr + openjpeg + ;; openvdb ; OpenVDB needs OIIO to be built with C++17 or higher pugixml pybind11 python-wrapper @@ -1363,7 +1372,7 @@ with strong support for multi-part, multi-channel use cases.") related classes, utilities, and applications. There is a particular emphasis on formats and functionality used in professional, large-scale animation and visual effects work for film.") - (home-page "https://www.openimageio.org") + (home-page "https://github.com/AcademySoftwareFoundation/OpenImageIO") (license license:bsd-3))) (define-public openscenegraph @@ -2351,8 +2360,8 @@ Automated palette selection is supported.") (list extra-cmake-modules pkg-config)) (inputs (list giflib - karchive - kdnssd + karchive-5 + kdnssd-5 libmicrohttpd libsodium libvpx diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 56763cd835..fb10351849 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2970,7 +2970,7 @@ Unix desktop environment under X11 as well as Wayland.") (define-public webp-pixbuf-loader (package (name "webp-pixbuf-loader") - (version "0.0.4") + (version "0.2.4") (source (origin (method git-fetch) @@ -2979,7 +2979,7 @@ Unix desktop environment under X11 as well as Wayland.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1kshsz91mirjmnmv796nba1r8jg8a613anhgd38dhh2zmnladcwn")))) + (base32 "0dsdkw0i8fg3051653zmz68s068a2w23d708av64afzvav1xvhv0")))) (build-system meson-build-system) (arguments (list diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 5ef51e27a9..3ce4f6a8d6 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2718,8 +2718,7 @@ many readers as needed).") (guix build utils)) #:imported-modules ((guix build guile-build-system) ,@%gnu-build-system-modules) - #:configure-flags (list "--with-ncursesw" ; Unicode support - "--with-gnu-filesystem-hierarchy") + #:configure-flags (list "--with-gnu-filesystem-hierarchy") #:phases (modify-phases %standard-phases (add-before 'build 'fix-libguile-ncurses-file-name diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm index c629385310..89d3e22c7e 100644 --- a/gnu/packages/high-availability.scm +++ b/gnu/packages/high-availability.scm @@ -226,7 +226,6 @@ applications.") go-golang-org-x-time)) (arguments (list - #:go go-1.20 #:import-path "github.com/nats-io/nats-server" #:install-source? #f)) (home-page "https://github.com/nats-io/nats-server") diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 65fe793f2d..65bf701f09 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -813,14 +813,14 @@ due to its architecture which automatically parallelises the image workflows.") (define-public gmic (package (name "gmic") - (version "3.3.5") + (version "3.4.0") (source (origin (method url-fetch) (uri (string-append "https://gmic.eu/files/source/gmic_" version ".tar.gz")) (sha256 - (base32 "06vcwn8c8zhr1j0jy79an1f6vvjh47ipm19a20g3qsnxv7h5c905")))) + (base32 "0akrrpkwkc8d7f2r3nqr36cjd926zk221yppi1bmv4yvydx0hvyz")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;there are no tests diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 5f73a6c3f6..a709822e5b 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -35,7 +35,7 @@ ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com> ;;; Copyright © 2022 ( <paren@disroot.org> ;;; Copyright © 2022-2023 Bruno Victal <mirai@makinata.eu> -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2024 chris <chris@bumblehead.com> @@ -1268,7 +1268,8 @@ supplies a generic doubly-linked list and some string functions.") (search-patches "freeimage-unbundle.patch" "freeimage-libtiff-compat.patch" "freeimage-CVE-2020-21428.patch" - "freeimage-CVE-2020-22524.patch") + "freeimage-CVE-2020-22524.patch" + "freeimage-libraw-0.21-compat.patch") ;; Take one patch from Arch Linux that adds LibRaw 0.20 compatibility. (list (origin (method url-fetch) @@ -2457,7 +2458,7 @@ This package can be used to create @code{favicon.ico} files for web sites.") (define-public libavif (package (name "libavif") - (version "0.11.1") + (version "1.0.4") (source (origin (method git-fetch) (uri (git-reference @@ -2466,7 +2467,7 @@ This package can be used to create @code{favicon.ico} files for web sites.") (file-name (git-file-name name version)) (sha256 (base32 - "02zmb62g0yx6rfz4w1isyzfrckv5i7dzyz26rp2mspbx9w6v8j4r")))) + "0k72q7yvfdn92wkslyifw14319nm981a8r3kd84i4ylxmrkgi0zm")))) (build-system cmake-build-system) (arguments (list diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm index 9879359be7..d1145a5d58 100644 --- a/gnu/packages/installers.scm +++ b/gnu/packages/installers.scm @@ -34,14 +34,14 @@ (xgcc (cross-gcc triplet #:libc xlibc))) (package (name (string-append "nsis-" machine)) - (version "3.09") + (version "3.10") (source (origin (method url-fetch) (uri (string-append "http://prdownloads.sourceforge.net/nsis/nsis-" version "-src.tar.bz2")) (sha256 (base32 - "1qjnvhnj89a40ac10k2mbln0yqscdmawmgw71816i465x734dn0c")) + "15xj1izz3cmaw0mazsvfm8jpr132dyphlw5j0pszwimb0xilmd8i")) (patches (search-patches "nsis-env-passthru.patch")))) (build-system scons-build-system) (native-inputs `(("xgcc" ,xgcc) diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index d75a99c4e1..82d8914250 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -29,6 +29,7 @@ #:use-module (guix git-download) #:use-module (guix download) #:use-module (guix build-system go) + #:use-module (gnu packages gcc) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) @@ -56,7 +57,6 @@ (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-block-format")) (propagated-inputs (list go-github-com-multiformats-go-multihash @@ -88,7 +88,6 @@ corresponding to the block.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-cid")) (propagated-inputs (list go-github-com-multiformats-go-multihash @@ -117,7 +116,6 @@ used in @code{go-ipfs} and related packages to refer to a typed hunk of data.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-cidutil")) (propagated-inputs (list go-github-com-ipfs-go-cid @@ -150,7 +148,9 @@ with @url{https://github.com/ipld/cid, CIDs}.") "0qk6fshgdmhp8dip2ksm13j6nywi41m9mn0czkvmw6b697z85l2r")))) (build-system go-build-system) (arguments - `(#:go ,go-1.16 + `(#:go ,@(if (supported-package? go-1.16) + `(,go-1.16) + `(,gccgo-11)) #:unpack-path "github.com/ipfs/go-ipfs-cmdkit" #:import-path "github.com/ipfs/go-ipfs-cmdkit/files")) (home-page "https://github.com/ipfs/go-ipfs-cmdkit") @@ -237,7 +237,6 @@ throughout its lifetime.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-detect-race")) (home-page "https://github.com/ipfs/go-detect-race") (synopsis "Detect if compiled with race") @@ -262,7 +261,6 @@ throughout its lifetime.") go-github-com-multiformats-go-multihash)) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-ipfs-util")) (home-page "https://github.com/ipfs/go-ipfs-util") (synopsis "Common utilities used by @code{go-ipfs} and related packages") @@ -270,6 +268,79 @@ throughout its lifetime.") "Common utilities used by @code{go-ipfs} and other related Go packages.") (license license:expat))) +(define-public go-github-com-ipfs-go-ipld-cbor + (package + (name "go-github-com-ipfs-go-ipld-cbor") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipfs/go-ipld-cbor") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yxk4sbf1fk9aaizzpz3h30049wqvaz0s3jnbdd5akhj7wg89h21")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/ipfs/go-ipld-cbor")) + (propagated-inputs + (list go-github-com-ipfs-go-block-format + go-github-com-ipfs-go-cid + go-github-com-ipfs-go-ipfs-util + go-github-com-ipfs-go-ipld-format + go-github-com-multiformats-go-multihash + go-github-com-polydawn-refmt + go-github-com-whyrusleeping-cbor-gen)) + (home-page "https://github.com/ipfs/go-ipld-cbor") + (synopsis "A cbor implementation of the @code{go-ipld-format}") + (description + "An implementation of a @url{https://cbor.io/, CBOR} encoded merkledag object.") + (license license:expat))) + +(define-public go-github-com-ipfs-go-ipld-git + (package + (name "go-github-com-ipfs-go-ipld-git") + (version "0.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipfs/go-ipld-git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1v52qzgmx7qym0qzkzkry2kfj58f9hh7c8qycg74sqbd9zb1ynjj")))) + (build-system go-build-system) + (arguments + (list + ;; XXX: It requires .git/objects, check if it's applicable to generate + ;; git repo during check phase with make-test-repo.sh. + #:tests? #f + #:import-path "github.com/ipfs/go-ipld-git" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-test-data-files + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + (list "testdata.tar.gz" + "codecov.yml" + "make-test-repo.sh")))))))) + (propagated-inputs + (list go-github-com-multiformats-go-multihash + go-github-com-ipld-go-ipld-prime + go-github-com-ipfs-go-cid + go-github-com-ipfs-go-block-format)) + (home-page "https://github.com/ipfs/go-ipld-git") + (synopsis "IPLD handlers for git objects") + (description + "This is an IPLD codec which handles git objects. Objects are transformed into +IPLD graph as detailed below. Objects are demonstrated here using both +@url{https://ipld.io/docs/schemas/,IPLD Schemas} and example JSON forms.") + (license license:expat))) + (define-public go-github-com-ipfs-go-ipld-format (package (name "go-github-com-ipfs-go-ipld-format") @@ -286,7 +357,6 @@ throughout its lifetime.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-ipld-format")) (propagated-inputs (list go-github-com-multiformats-go-multihash @@ -299,6 +369,64 @@ throughout its lifetime.") order to be a part of the @acronym{IPLD, InterPlanetary Linked Data} merkle-forest.") (license license:expat))) +(define-public go-github-com-ipfs-go-ipld-legacy + (package + (name "go-github-com-ipfs-go-ipld-legacy") + (version "0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipfs/go-ipld-legacy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sc2zc3lyxy30fzynwdpfrl8jhh1ynwixn1crrv8hzn93yix6550")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/ipfs/go-ipld-legacy")) + (native-inputs (list go-github-com-stretchr-testify)) + (propagated-inputs (list go-github-com-ipfs-go-block-format + go-github-com-ipfs-go-cid + go-github-com-ipfs-go-ipld-format + go-github-com-ipld-go-ipld-prime)) + (home-page "https://github.com/ipfs/go-ipld-legacy") + (synopsis "Translation layer for IPLD legacy code") + (description + "@code{go-ipld-format} is a translation layer between @code{go-ipld-prime} nodes +and @code{go-ipld-format} legacy interface.") + (license (list license:expat license:asl2.0)))) + +(define-public go-github-com-ipld-go-codec-dagpb + (package + (name "go-github-com-ipld-go-codec-dagpb") + (version "1.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipld/go-codec-dagpb") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1jbrwbgr222wsi95gdflbj350csja6k8vphdq7c9bm50ipr8bvkq")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/ipld/go-codec-dagpb")) + (propagated-inputs (list go-github-com-ipfs-go-cid + go-github-com-ipld-go-ipld-prime + go-google-golang-org-protobuf)) + (home-page "https://github.com/ipld/go-codec-dagpb/") + (synopsis "Implementation of the DAG-PB spec for Go") + (description + "An implementation of the @url{https://ipld.io/, IPLD DAG-PB} spec for +@code{go-ipld-prime}.") + (license (list license:expat license:asl2.0)))) + (define-public go-github-com-ipld-go-ipld-prime (package (name "go-github-com-ipld-go-ipld-prime") @@ -315,7 +443,6 @@ order to be a part of the @acronym{IPLD, InterPlanetary Linked Data} merkle-fore (build-system go-build-system) (arguments (list - #:go go-1.21 #:unpack-path "github.com/ipld/go-ipld-prime/" #:import-path "github.com/ipld/go-ipld-prime/" #:phases @@ -415,7 +542,6 @@ basic operations on IPLD objects (traversals, etc).") go-go-uber-org-zap)) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-log/v2")) (home-page "https://github.com/ipfs/go-log") (synopsis "Logging library used by @code{go-ipfs}") @@ -446,9 +572,68 @@ their levels to be controlled individually.") go-go-uber-org-zap)) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-log")))) +(define-public go-github-com-libp2p-go-socket-activation + (package + (name "go-github-com-libp2p-go-socket-activation") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libp2p/go-socket-activation") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cqxzmjfg7838xifs07kigys9icardwlj1wl426mzgzmbwn6pg5s")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/libp2p/go-socket-activation")) + (propagated-inputs + (list go-github-com-coreos-go-systemd-v22 + go-github-com-ipfs-go-log + go-github-com-multiformats-go-multiaddr-0.12)) + (home-page "https://github.com/libp2p/go-socket-activation") + (synopsis "Multiaddr backed systemd socket activation") + (description + "This package provides access to sockets registered by the system's init +daemon as described in +@url{http://0pointer.de/blog/projects/socket-activation}.") + (license license:expat))) + +(define-public go-github-com-whyrusleeping-cbor-gen + (package + (name "go-github-com-whyrusleeping-cbor-gen") + (version "v0.0.0-20230818171029-f91ae536ca25") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/cbor-gen") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08by7pqh4fcwf2va01iif75yqkfssi6d48334404mmv9jmhzim60")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/whyrusleeping/cbor-gen")) + (propagated-inputs + (list go-github-com-ipfs-go-cid + go-github-com-google-go-cmp-cmp + go-golang-org-x-xerrors)) + (home-page "https://github.com/whyrusleeping/cbor-gen") + (synopsis "Codegen for CBOR codecs on the specified types") + (description + "Basic utilities to generate fast path @url{https://cbor.io/, CBOR} codecs for +types.") + (license license:expat))) + +;; XXX: No updates for 4 years, and depends on dated Golang modules which +;; require go-1.16 to compile, see +;; <https://github.com/whyrusleeping/gx/issues/247>. (define-public gx (package (name "gx") @@ -507,6 +692,9 @@ powerful and simple.") '(#:unpack-path "github.com/whyrusleeping/gx" #:import-path "github.com/whyrusleeping/gx/gxutil")))) +;; XXX: No updates for 4 years, and depends on dated Golang modules which +;; require go-1.16 to compile, see +;; <https://github.com/whyrusleeping/gx-go/issues/65>. (define-public gx-go (package (name "gx-go") @@ -586,6 +774,7 @@ written in Go.") "vendor/github.com/docker" "vendor/github.com/dustin" "vendor/github.com/elgris" + "vendor/github.com/facebookgo" "vendor/github.com/felixge" "vendor/github.com/flynn" "vendor/github.com/francoispqt" @@ -609,13 +798,18 @@ written in Go.") "vendor/github.com/ipfs/go-detect-race" "vendor/github.com/ipfs/go-ipfs-delay" "vendor/github.com/ipfs/go-ipfs-util" + "vendor/github.com/ipfs/go-ipld-cbor" "vendor/github.com/ipfs/go-ipld-format" + "vendor/github.com/ipfs/go-ipld-git" + "vendor/github.com/ipfs/go-ipld-legacy" "vendor/github.com/ipfs/go-log" + "vendor/github.com/ipld/go-codec-dagpb" "vendor/github.com/ipld/go-ipld-prime" "vendor/github.com/jackpal" "vendor/github.com/jbenet" "vendor/github.com/julienschmidt" "vendor/github.com/klauspost" + "vendor/github.com/libp2p/go-socket-activation" "vendor/github.com/mattn" "vendor/github.com/mgutz" "vendor/github.com/miekg" @@ -638,7 +832,7 @@ written in Go.") "vendor/github.com/stretchr" "vendor/github.com/syndtr" "vendor/github.com/tidwall" - "vendor/github.com/whyrusleeping/go-sysinfo" + "vendor/github.com/whyrusleeping" "vendor/go.uber.org" "vendor/golang.org" "vendor/gopkg.in" @@ -648,7 +842,6 @@ written in Go.") (list #:unpack-path "github.com/ipfs/kubo" #:import-path "github.com/ipfs/kubo/cmd/ipfs" - #:go go-1.21 #:phases #~(modify-phases %standard-phases ;; https://github.com/ipfs/kubo/blob/master/docs/command-completion.md @@ -679,7 +872,7 @@ written in Go.") go-github-com-coreos-go-systemd-v22 go-github-com-dustin-go-humanize go-github-com-elgris-jsondiff - ;;go-github-com-facebookgo-atomicfile + go-github-com-facebookgo-atomicfile go-github-com-fsnotify-fsnotify go-github-com-google-uuid go-github-com-hashicorp-go-multierror @@ -688,16 +881,17 @@ written in Go.") go-github-com-ipfs-go-cid go-github-com-ipfs-go-cidutil go-github-com-ipfs-go-datastore + go-github-com-ipfs-go-detect-race ;;go-github-com-ipfs-go-ds-badger ;;go-github-com-ipfs-go-ds-flatfs ;;go-github-com-ipfs-go-ds-leveldb ;;go-github-com-ipfs-go-ds-measure ;;go-github-com-ipfs-go-fs-lock ;;go-github-com-ipfs-go-ipfs-cmds - ;;go-github-com-ipfs-go-ipld-cbor + go-github-com-ipfs-go-ipld-cbor go-github-com-ipfs-go-ipld-format - ;;go-github-com-ipfs-go-ipld-git - ;;go-github-com-ipfs-go-ipld-legacy + go-github-com-ipfs-go-ipld-git + go-github-com-ipfs-go-ipld-legacy go-github-com-ipfs-go-log go-github-com-ipfs-go-log-v2 ;;go-github-com-ipfs-go-metrics-interface @@ -707,7 +901,7 @@ written in Go.") ;;go-github-com-ipfs-shipyard-nopfs-ipfs ;;go-github-com-ipld-go-car ;;go-github-com-ipld-go-car-v2 - ;;go-github-com-ipld-go-codec-dagpb + go-github-com-ipld-go-codec-dagpb go-github-com-ipld-go-ipld-prime go-github-com-jbenet-go-random go-github-com-jbenet-go-temp-err-catcher @@ -723,8 +917,7 @@ written in Go.") ;;go-github-com-libp2p-go-libp2p-record ;;go-github-com-libp2p-go-libp2p-routing-helpers ;;go-github-com-libp2p-go-libp2p-testing - ;;go-github-com-libp2p-go-socket-activation - go-github-com-ipfs-go-ipfs-util + go-github-com-libp2p-go-socket-activation go-github-com-mitchellh-go-homedir go-github-com-multiformats-go-multiaddr-0.12 go-github-com-multiformats-go-multiaddr-dns @@ -733,13 +926,13 @@ written in Go.") go-github-com-multiformats-go-multihash go-github-com-opentracing-opentracing-go go-github-com-pbnjay-memory - go-github-com-pkg-errors go-github-com-prometheus-client-golang go-github-com-stretchr-testify - go-github-com-syndtr-goleveldb-leveldb + go-github-com-syndtr-goleveldb + go-github-com-tidwall-gjson go-github-com-tidwall-sjson go-github-com-whyrusleeping-go-sysinfo - ;;go-github-com-whyrusleeping-multiaddr-filter + go-github-com-whyrusleeping-multiaddr-filter ;;go-go-opencensus-io ;;go-go-opentelemetry-io-contrib-instrumentation-net-http-otelhttp ;;go-go-opentelemetry-io-contrib-propagators-autoprop @@ -751,12 +944,11 @@ written in Go.") go-go-uber-org-multierr go-go-uber-org-zap go-golang-org-x-crypto - go-golang-org-x-exp-2023 + go-golang-org-x-exp go-golang-org-x-mod go-golang-org-x-sync go-golang-org-x-sys go-google-golang-org-protobuf - go-gopkg-in-yaml-v3 ;; ;; A list of indirect dependencies required for the vendored @@ -781,6 +973,10 @@ written in Go.") go-github-com-multiformats-go-multiaddr-fmt ; github.com/libp2p/go-libp2p go-github-com-multiformats-go-multistream ; github.com/libp2p/go-libp2p go-github-com-quic-go-quic-go ; github.com/libp2p/go-libp2p + go-github-com-whyrusleeping-base32 ; github.com/ipfs/boxo + go-github-com-whyrusleeping-cbor ; github.com/ipld/go-car + go-github-com-whyrusleeping-chunker ; github.com/ipfs/boxo + go-github-com-whyrusleeping-go-keyspace ; github.com/libp2p/go-libp2p-kad-dht go-golang-org-x-oauth2 ; github.com/ipfs/boxo go-golang-org-x-term ; github.com/ipfs/go-ipfs-cmds go-golang-org-x-xerrors ; github.com/whyrusleeping/cbor-gen diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 7cfea42938..aa4c9b8b53 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -366,14 +366,14 @@ Conferencing} and @acronym{ICB, Internet Citizen's Band}.") (define-public weechat (package (name "weechat") - (version "4.3.3") + (version "4.3.5") (source (origin (method url-fetch) (uri (string-append "https://weechat.org/files/src/weechat-" version ".tar.xz")) (sha256 (base32 - "1n2y20mv7nj4n71qmzvnr87qxh4zkv8acihw23d5p29kx9ndp1sm")))) + "1qsbdg3c0787xs0vwbxsyylf5fvz4cazrzlnwj2mnp6s6b4c9nz6")))) (build-system cmake-build-system) (outputs '("out" "doc")) (native-inputs @@ -1108,7 +1108,6 @@ what.") (build-system go-build-system) (arguments (list - #:go go-1.19 #:install-source? #f #:import-path "git.sr.ht/~emersion/soju" #:phases diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 08329820fa..002461282f 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -87,6 +87,7 @@ #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages python-web) #:use-module (gnu packages qt) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) @@ -103,7 +104,7 @@ (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "6.0.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -112,7 +113,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "030dyw4krnq8hcp0dsqb15zxb7x7r8c33lbdgmmia5xpkpqjp693")))) + "067qb9w8dj5z094yklc9b1jx5k29my5zf1gzkr05liswm7xzhs0k")))) (build-system cmake-build-system) (native-inputs ;; Add test dependency, except on armhf where building it is too @@ -160,12 +161,12 @@ "set(ECM_MKSPECS_INSTALL_DIR lib/qt${QT_MAJOR_VERSION}/mkspecs/modules")))) ;; Work around for the failed test KDEFetchTranslations. ;; It complains that the cmake project name is not - ;; "frameworks/extra-cmake-modules". + ;; ".*/extra-cmake-modules". ;; TODO: Fix it upstream. (add-after 'unpack 'fix-test (lambda _ (substitute* "tests/KDEFetchTranslations/CMakeLists.txt" - (("frameworks/extra-cmake-modules") "extra-cmake-modules")))) + (("\\.\\*/extra-cmake-modules") "extra-cmake-modules")))) ;; install and check phase are swapped to prevent install from failing ;; after testsuire has run (add-after 'install 'check-post-install @@ -189,7 +190,7 @@ common build settings used in software produced by the KDE community.") (define-public kquickcharts (package (name "kquickcharts") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" @@ -197,7 +198,32 @@ common build settings used in software produced by the KDE community.") "/" name "-" version ".tar.xz")) (sha256 (base32 - "1f91x92qdzxp31z7ixx9jn41hq9f3w9hjia94pab9vsnaz8prbd1")))) + "1iwgxlzplpb1ngc2q3jv5v5a2dq3l9wc6kizfvrb6j5zvwm543i5")))) + (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) + (native-inputs (list extra-cmake-modules glslang pkg-config)) + (inputs (list qtdeclarative qtshadertools)) + (home-page "https://api.kde.org/frameworks/kquickcharts/html/index.html") + (synopsis "QtQuick plugin providing high-performance charts") + (description + "The Quick Charts module provides a set of charts that can be +used from QtQuick applications for both simple display of data as well as +continuous display of high-volume data.") + (license (list license:lgpl2.1 license:lgpl3)))) + +(define-public kquickcharts-5 + (package + (inherit kquickcharts) + (name "kquickcharts") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/frameworks/" + (version-major+minor version) + "/" name "-" version ".tar.xz")) + (sha256 + (base32 + "1bd20kpypji6053fwn5a1b41rjf7r1b3wk85swb0xlmm2kji236j")))) (build-system cmake-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -209,15 +235,7 @@ common build settings used in software produced by the KDE community.") (setenv "QT_QPA_PLATFORM" "offscreen") (invoke "ctest"))))))) (inputs (list qtbase-5 qtdeclarative-5 qtquickcontrols2-5 - xorg-server-for-tests)) - (native-inputs (list extra-cmake-modules glslang pkg-config)) - (home-page "https://api.kde.org/frameworks/kquickcharts/html/index.html") - (synopsis "QtQuick plugin providing high-performance charts") - (description - "The Quick Charts module provides a set of charts that can be -used from QtQuick applications for both simple display of data as well as -continuous display of high-volume data.") - (license (list license:lgpl2.1 license:lgpl3)))) + xorg-server-for-tests)))) (define-public phonon (package @@ -234,22 +252,11 @@ continuous display of high-volume data.") "16pk8g5rx00x45gnxrqg160b1l02fds1b7iz6shllbfczghgz1rj")))) (build-system cmake-build-system) (native-inputs - ;; TODO: Add building the super experimental QML support - (list appstream extra-cmake-modules pkg-config qttools-5)) - (inputs (list glib qtbase-5 pulseaudio)) + (list appstream extra-cmake-modules pkg-config qttools)) + (inputs (list qtbase qt5compat glib qtbase-5 pulseaudio)) (arguments (list #:configure-flags - #~'("-DCMAKE_CXX_FLAGS=-fPIC" - "-DPHONON_BUILD_QT6=OFF") ;KDE is still using Qt 5 - #:phases - #~(modify-phases %standard-phases - (add-before 'install 'patch-installdir - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((regex (string-append "(INSTALL DESTINATION \")" - #$(this-package-input "qtbase")))) - (substitute* "cmake_install.cmake" - ((regex all dest) - (string-append dest #$output))))))))) + #~(list "-DCMAKE_CXX_FLAGS=-fPIC"))) (home-page "https://community.kde.org/Phonon") (synopsis "KDE's multimedia library") (description "KDE's multimedia library.") @@ -324,7 +331,7 @@ Phonon-VLC is a backend based on the VLC multimedia library.") (define-public attica (package (name "attica") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -333,8 +340,11 @@ Phonon-VLC is a backend based on the VLC multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "0gkdsm1vyyyxxyl4rni9s2bdz5w6zphzjl58fddjl899da06hqfq")))) + "1varrhc08799avraaln5sa844mwcz4h519x36n25sb80788kmbxb")))) (build-system cmake-build-system) + (native-inputs + (list extra-cmake-modules)) + (inputs (list qtbase)) (arguments (list #:phases @@ -344,10 +354,6 @@ Phonon-VLC is a backend based on the VLC multimedia library.") ;; These tests require network access. (substitute* "autotests/CMakeLists.txt" ((".*providertest.cpp") ""))))))) - (native-inputs - (list extra-cmake-modules)) - (inputs - (list qtbase-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Open Collaboration Service client library") (description "Attica is a Qt library that implements the Open @@ -362,10 +368,26 @@ The REST API is defined here: http://freedesktop.org/wiki/Specifications/open-collaboration-services/") (license (list license:lgpl2.1+ license:lgpl3+)))) +(define-public attica-5 + (package + (inherit attica) + (name "attica") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1shzs985fimd15w2d9cxpcbq7by33v05hb00rp79k6cqvp20f4b8")))) + (inputs (list qtbase-5)))) + (define-public bluez-qt (package (name "bluez-qt") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -374,24 +396,24 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") name "-" version ".tar.xz")) (sha256 (base32 - "1ni50jwnb5ww8mkql0p3q8660c0srj8p0ik27lvxakwdq4wf6l9s")))) + "1p52sk0rpf75dhmwcxbiwnpprm8giy80qav92d1dhchhmqzvhs1v")))) (build-system cmake-build-system) (native-inputs (list dbus extra-cmake-modules)) (inputs - (list qtdeclarative-5 - qtbase-5)) + (list qtdeclarative + qtbase)) (arguments (list #:configure-flags #~(list (string-append "-DUDEV_RULES_INSTALL_DIR=" #$output "/lib/udev/rules.d")) - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "ctest" "-E" "bluezqt-qmltests"))))))) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "ctest" "-E" "bluezqt-qmltests"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "QML wrapper for BlueZ") (description "bluez-qt is a Qt-style library for accessing the bluez @@ -401,7 +423,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") (define-public breeze-icons (package (name "breeze-icons") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" @@ -409,7 +431,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") "/" name "-" version ".tar.xz")) (sha256 (base32 - "0z5cpv10jyjdwjfkm7nj6hyp4vj29apm476hvbpb4gan27jyb91y")))) + "09p6fjja5yqf1zvfjdik997clnhbyd1xx4gnqhyz3nypy9w669k7")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules @@ -417,7 +439,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") `(,gtk+ "bin") python python-lxml)) ;for 24x24 icon generation - (inputs (list qtbase-5)) + (inputs (list qtbase)) (arguments (list #:phases #~(modify-phases %standard-phases (add-after 'install 'update-cache @@ -429,9 +451,9 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") (string-append #$output "/share/icons/breeze-dark"))))))) (home-page "https://community.kde.org/Frameworks") - (synopsis "Default KDE Plasma 5 icon theme") + (synopsis "Default KDE Plasma icon theme") (description "Breeze provides a freedesktop.org compatible icon theme. -It is the default icon theme for the KDE Plasma 5 desktop.") +It is the default icon theme for the KDE Plasma desktop.") ;; The license file mentions lgpl3+. The license files in the source ;; directories are lgpl3, while the top directory contains the lgpl2.1. ;; text. @@ -440,7 +462,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") (define-public kapidox (package (name "kapidox") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -449,7 +471,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "0xxw3lvipyax8r1af3ypwjj6waarbp2z9n11fjb4kvyigsypglmb")))) + "0knp680462dr9ib2b4dgz18659i1a33d6gmvnqh3k4mm659rrlr1")))) (build-system python-build-system) (arguments (list #:tests? #f ; test need network @@ -460,9 +482,9 @@ It is the default icon theme for the KDE Plasma 5 desktop.") ;; TODO: check if doxygen has to be installed, the readme does not ;; mention it. The openSuse .rpm lists doxygen, graphviz, graphviz-gd, ;; and python-xml. - (list python python-jinja2 python-pyyaml)) + (list python python-jinja2 python-pyyaml python-requests)) (inputs - (list qtbase-5)) + (list qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Doxygen Tools") (description "This framework contains scripts and data for building API @@ -480,7 +502,7 @@ documentation.") (define-public karchive (package (name "karchive") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" @@ -488,7 +510,7 @@ documentation.") "/" name "-" version ".tar.xz")) (sha256 (base32 - "015gc1zarny8r478p7g9m6r67l5dk3r0vcp28ilmfmznxy0k0hda")))) + "0aafcxizxzh239sz9ffsgxbq6c4a368bm3l93jj9m3v60xbpz017")))) (build-system cmake-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -497,27 +519,45 @@ documentation.") (when tests? (invoke "ctest" "-E" "karchivetest"))))))) (native-inputs - (list extra-cmake-modules pkg-config qttools-5)) - (inputs - (list bzip2 qtbase-5 xz zlib `(,zstd "lib"))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Qt 5 addon providing access to numerous types of archives") + (list extra-cmake-modules pkg-config qttools)) + (inputs (list bzip2 qtbase xz zlib `(,zstd "lib"))) + (synopsis "Qt 6 addon providing access to numerous types of archives") (description "KArchive provides classes for easy reading, creation and manipulation of @code{archive} formats like ZIP and TAR. It also provides transparent compression and decompression of data, like the GZip format, via a subclass of QIODevice.") + (home-page "https://community.kde.org/Frameworks") ;; The included licenses is are gpl2 and lgpl2.1, but the sources are ;; under a variety of licenses. ;; This list is taken from http://packaging.neon.kde.org/cgit/ (license (list license:lgpl2.1 license:lgpl2.1+ license:lgpl3+ license:bsd-2)))) +(define-public karchive-5 + (package + (inherit karchive) + (name "karchive") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/frameworks/" + (version-major+minor version) + "/" name "-" version ".tar.xz")) + (sha256 + (base32 + "02m3vvw58qsgmaps184xwy97bg4pgjl4i1gjwzn66h5qf34y6qqn")))) + (native-inputs + (list extra-cmake-modules pkg-config qttools-5)) + (inputs + (list bzip2 qtbase-5 xz zlib `(,zstd "lib"))) + (synopsis "Qt 5 addon providing access to numerous types of archives"))) + (define-public kcalendarcore (package (name "kcalendarcore") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -526,24 +566,17 @@ GZip format, via a subclass of QIODevice.") name "-" version ".tar.xz")) (sha256 (base32 - "0aimda01zqw4fz5ldvz4vh767bi10r00kvm62n89nxhsq46wlk7p")))) + "1yqk2s52h6z9jlh2lg96agk273msrah6rxw10wr2cpnb0jv7dpyd")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules perl tzdata-for-tests)) - (inputs - (list libical qtbase-5)) + (inputs (list libical qtbase)) (arguments (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'disable-failing-test - (lambda _ - ;; Reported as https://bugs.kde.org/show_bug.cgi?id=484306 - (substitute* "autotests/CMakeLists.txt" - (("testdateserialization") - "")))) (add-before 'check 'check-setup - (lambda* (#:key inputs #:allow-other-keys) ;;; XXX: failing test + (lambda* (#:key inputs #:allow-other-keys) (setenv "QT_QPA_PLATFORM" "offscreen") (setenv "TZ" "Europe/Prague") (setenv "TZDIR" @@ -564,7 +597,7 @@ and the older vCalendar.") (define-public kcodecs (package (name "kcodecs") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -573,10 +606,10 @@ and the older vCalendar.") name "-" version ".tar.xz")) (sha256 (base32 - "080zvcqd8iq05p5x3qaf3rryx75lg2l2j1dr18sp50ir50zfwh2w")))) + "1v665sr76020yix4f2kkwrjz46lh0jyc4wdrzr1xairxzhd560k9")))) (build-system cmake-build-system) - (native-inputs (list extra-cmake-modules gperf qttools-5)) - (inputs (list qtbase-5)) + (native-inputs (list extra-cmake-modules gperf qttools)) + (inputs (list qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "String encoding and manipulating library") (description "KCodecs provide a collection of methods to manipulate @@ -593,6 +626,23 @@ Internet).") license:lgpl2.1 license:lgpl2.1+ license:expat license:lgpl3+ license:mpl1.1)))) +(define-public kcodecs-5 + (package + (inherit kcodecs) + (name "kcodecs") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "03k8scmswxhx7bng5fh3niq84gqzksb19sf6ah4bdz6aj4pd52d4")))) + (native-inputs (list extra-cmake-modules gperf qttools-5)) + (inputs (list qtbase-5)))) + (define-public kcolorpicker (package (name "kcolorpicker") @@ -608,9 +658,10 @@ Internet).") (base32 "1px40rasvz0r5db9av125q9mlyjz4xdnckg2767i3fndj3ic0vql")))) (build-system qt-build-system) - (propagated-inputs (list qtbase-5)) (arguments - (list #:configure-flags #~'("-DBUILD_TESTS=ON"))) + (list #:qtbase qtbase + #:configure-flags #~(list "-DBUILD_TESTS=ON" + "-DBUILD_WITH_QT6=ON"))) (home-page "https://github.com/ksnip/kColorPicker") (synopsis "Color Picker with popup menu") (description @@ -619,10 +670,40 @@ menu which lets you select a color. The popup features a color dialog button which can be used to add custom colors to the popup menu.") (license license:lgpl3+))) +(define-public kcolorscheme + (package + (name "kcolorscheme") + (version "6.3.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + + (sha256 + (base32 + "0dch0iv6kkbzc7cl5fbcls1ll2h4jdd16kv9g5d9y041ryyk05ri")))) + (build-system qt-build-system) + (native-inputs (list extra-cmake-modules)) + (inputs (list kguiaddons ki18n + qtdeclarative)) + (propagated-inputs (list kconfig)) + (arguments (list #:qtbase qtbase)) + (synopsis "Classes to read and interact with KColorScheme") + (description "This package provide a Classes to read and interact with +KColorScheme.") + (home-page "https://community.kde.org/Frameworks") + (license (list license:cc0 + license:lgpl2.0+ + license:lgpl2.1 + license:bsd-2 + license:lgpl3)))) + (define-public kconfig (package (name "kconfig") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -631,23 +712,31 @@ which can be used to add custom colors to the popup menu.") name "-" version ".tar.xz")) (sha256 (base32 - "0hghdh4p6cq9ckp4g5jdgd8w47pdsxxvzimrdfjrs71lmy8ydiy2")))) - (build-system cmake-build-system) + "0ybr5l0b9wvzkh3546s3dnv2di0vf3rcf0f6jzbyqlaigfprm04d")))) + (build-system qt-build-system) (native-inputs - (list dbus extra-cmake-modules inetutils qttools-5 - xorg-server-for-tests)) - (inputs - (list qtbase-5 qtdeclarative-5)) + (list dbus extra-cmake-modules inetutils qttools)) + (propagated-inputs (list qtdeclarative)) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? ;; kconfigcore-kconfigtest fails inconsistently!! - (setenv "HOME" (getcwd)) - (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "ctest" "-E" "(kconfigcore-kconfigtest|\ -kconfiggui-kstandardshortcutwatchertest)"))))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-output-to-file "autotests/BLACKLIST" + (lambda _ + (for-each + (lambda (name) + (display (string-append "[" name "]\n*\n"))) + (list "testNotifyIllegalObjectPath" + "testLocalDeletion" + "testNotify" + "testSignal" + "testDataUpdated")))) + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Kconfiguration settings framework for Qt") (description "KConfig provides an advanced configuration system. @@ -679,10 +768,11 @@ propagate their changes to their respective configuration files.") license:lgpl3+ license:gpl1 ; licende:mit-olif license:bsd-2 license:bsd-3)))) -(define-public kcoreaddons +(define-public kconfig-5 (package - (name "kcoreaddons") - (version "5.114.0") + (inherit kconfig) + (name "kconfig") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append @@ -691,15 +781,43 @@ propagate their changes to their respective configuration files.") name "-" version ".tar.xz")) (sha256 (base32 - "1wv3s3xsiii96k17nzs2fb0ih2lyg52krf58v44nlk9wfi4wmnqx")))) - (build-system cmake-build-system) + "03j7cw0c05rpxrnblrc5ziq7vy1v193l5gj9bix1dakkj9hf6p9c")))) (native-inputs - (list extra-cmake-modules qttools-5 shared-mime-info)) - ;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam + (list dbus extra-cmake-modules inetutils qttools-5 + xorg-server-for-tests)) (inputs - (list qtbase-5)) + (list qtdeclarative-5)) + (propagated-inputs '()) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? ;; kconfigcore-kconfigtest fails inconsistently!! + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + (invoke "ctest" "-E" "(kconfigcore-kconfigtest|\ +kconfiggui-kstandardshortcutwatchertest)"))))))))) + +(define-public kcoreaddons + (package + (name "kcoreaddons") + (version "6.3.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0mn7qmfcics12w979q7gis3yn1w79fhzrxl30pv5y5x1qax97fxq")))) + (build-system qt-build-system) + (native-inputs (list extra-cmake-modules qttools shared-mime-info)) + (inputs (list qtdeclarative)) (arguments (list + #:qtbase qtbase #:phases #~(modify-phases %standard-phases (add-before 'check 'blacklist-failing-test @@ -725,10 +843,82 @@ manipulations such as macro replacement, accessing user information and many more.") (license (list license:lgpl2.0+ license:lgpl2.1+)))) +(define-public kcoreaddons-5 + (package + (inherit kcoreaddons) + (name "kcoreaddons") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0x1inzglgpz2z2w25bp46hzjv74gp3vyd3i911xczz7wd30b9yyy")))) + (build-system cmake-build-system) + (native-inputs + (list extra-cmake-modules qttools-5 shared-mime-info)) + (inputs + (list qtbase-5)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'blacklist-failing-test + (lambda _ + ;; Blacklist failing tests. + (with-output-to-file "autotests/BLACKLIST" + (lambda _ + ;; FIXME: Make it pass. Test failure caused by stout/stderr + ;; being interleaved. + (display "[test_channels]\n*\n") + ;; FIXME + (display "[test_inheritance]\n*\n"))))) + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd)) + (setenv "TMPDIR" (getcwd))))))))) + (define-public kdbusaddons (package (name "kdbusaddons") - (version "5.114.0") + (version "6.3.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "00i08baairndj5w6x3rhfxcws0xjd59wn2h08am3ll89xycqjbby")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules dbus qttools)) + (inputs (list libxkbcommon)) + (arguments + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dbus-launch" "ctest"))))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Convenience classes for DBus") + (description "KDBusAddons provides convenience classes on top of QtDBus, +as well as an API to create KDED modules.") + ;; Some source files mention lgpl2.0+, but the included license is + ;; the lgpl2.1. Some source files are under non-copyleft licenses. + (license license:lgpl2.1+))) + +(define-public kdbusaddons-5 + (package + (inherit kdbusaddons) + (name "kdbusaddons") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append @@ -737,7 +927,7 @@ many more.") name "-" version ".tar.xz")) (sha256 (base32 - "0pzzznyxhi48z5hhdsdxz3vaaihrdshpx65ha2v2nn2gh3ww7ikm")))) + "0mlfphk8knbvpyns3ixd8da9zjvsms29mv5z2xgif9y20i5kmdq3")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules dbus qttools-5)) @@ -761,19 +951,25 @@ many more.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "ctest"))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Convenience classes for DBus") - (description "KDBusAddons provides convenience classes on top of QtDBus, -as well as an API to create KDED modules.") - ;; Some source files mention lgpl2.0+, but the included license is - ;; the lgpl2.1. Some source files are under non-copyleft licenses. - (license license:lgpl2.1+))) + (invoke "dbus-launch" "ctest"))))))))) + +(define kdbusaddons-5-bootstrap + (package + (inherit kdbusaddons-5) + (source (origin + (inherit (package-source kdbusaddons-5)) + (patches '()))) + (inputs (modify-inputs (package-inputs kdbusaddons-5) (delete "kinit"))) + (arguments + (substitute-keyword-arguments (package-arguments kdbusaddons-5) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'patch-source))))))) (define-public kdnssd (package (name "kdnssd") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -782,13 +978,13 @@ as well as an API to create KDED modules.") name "-" version ".tar.xz")) (sha256 (base32 - "1zw5rkprr54j05ic8zljk57zahp2v6333slr253r3n1679zqlv64")))) + "0akip5sb8jva760lprxd3qbzlx9ql3vgdxdl1rblp5qsvv94h7b7")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs (list avahi ; alternativly dnssd could be used - qtbase-5)) + qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Network service discovery using Zeroconf") (description "KDNSSD is a library for handling the DNS-based Service @@ -797,10 +993,29 @@ such as printers, to be discovered without any user intervention or centralized infrastructure.") (license license:lgpl2.1+))) +(define-public kdnssd-5 + (package + (inherit kdnssd) + (name "kdnssd") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1z2xyir6xvyyq3j48wmra3zka6hlpjr2rnfc4gbijl0aazv6srrm")))) + (native-inputs + (list extra-cmake-modules qttools-5)) + (inputs + (list avahi qtbase-5)))) + (define-public kgraphviewer (package (name "kgraphviewer") - (version "2.4.3") + (version "2.5.0") (source (origin (method url-fetch) (uri (string-append @@ -808,15 +1023,17 @@ infrastructure.") version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l")))) + "0s9b3q7wvrbz52d500mcaflkrfjwhbzh5bsf5gxzgxjdzdiywaw7")))) (build-system cmake-build-system) (inputs - (list qtbase-5 + (list qtbase boost graphviz + ki18n kiconthemes kparts - qtsvg-5)) + qtsvg + qt5compat)) (native-inputs (list pkg-config extra-cmake-modules kdoctools)) (home-page "https://apps.kde.org/kgraphviewer/") @@ -828,7 +1045,7 @@ replace the other outdated Graphviz tools.") (define-public kguiaddons (package (name "kguiaddons") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -837,39 +1054,56 @@ replace the other outdated Graphviz tools.") name "-" version ".tar.xz")) (sha256 (base32 - "0riya9plcz9c1ndhdbsradssndshbm12705swn7vf7am17n7f947")))) + "009jvkakgb44ykz3920pj87kxh9jgbp9mdi654f77hqyq0grnlg1")))) (build-system qt-build-system) ;; TODO: Build packages for the Python bindings. Ideally this will be ;; done for all versions of python guix supports. Requires python, ;; python-sip, clang-python, libclang. Requires python-2 in all cases for ;; clang-python. - (native-inputs - (list extra-cmake-modules pkg-config)) + (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list qtbase-5 qtwayland-5 qtx11extras plasma-wayland-protocols wayland)) + (list libxkbcommon qtwayland plasma-wayland-protocols wayland)) + (arguments (list #:qtbase qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Utilities for graphical user interfaces") (description "The KDE GUI addons provide utilities for graphical user interfaces in the areas of colors, fonts, text, images, keyboard input.") (license (list license:gpl2+ license:lgpl2.1+)))) +(define-public kguiaddons-5 + (package + (inherit kguiaddons) + (name "kguiaddons") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1rpw6glgchf7qs4rh7jxy9sas73708yllba1q880gdicn1nda42w")))) + (native-inputs (list extra-cmake-modules pkg-config)) + (arguments '()) + (inputs + (list qtwayland-5 qtx11extras plasma-wayland-protocols wayland)))) + (define-public kholidays (package (name "kholidays") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" (version-major+minor version) "/" name "-" version ".tar.xz")) - (sha256 - (base32 "19r8dxglz5ll6iyvigsccil3ikvcsnyy5nwcpjvjr1c0brigcjmy")))) + (sha256 + (base32 "0pmcrzkq1s3aisihicazxgammmqmc63ywf6b0lwdb89xqwcf36cz")))) (build-system cmake-build-system) - (native-inputs - (list extra-cmake-modules qttools-5)) - (inputs - (list qtbase-5 qtdeclarative-5)) + (native-inputs (list extra-cmake-modules qttools)) + (inputs (list qtbase qtdeclarative)) (home-page "https://invent.kde.org/frameworks/kholidays") (synopsis "Library for regional holiday information") (description "This library provides a C++ API that determines holiday and @@ -879,7 +1113,7 @@ other special events for a geographical region.") (define-public ki18n (package (name "ki18n") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -888,23 +1122,25 @@ other special events for a geographical region.") name "-" version ".tar.xz")) (sha256 (base32 - "1yg03awcx5ay6lgbgwv91i0ankrm94z9m0wky4v03gnwnvw8pa0v")))) + "10kjjl6af3kbp0zs4pny6wrl5a7ld05fp5hkj31zww10p8g395ad")))) (build-system cmake-build-system) (propagated-inputs - (list gettext-minimal python)) + (list gettext-minimal)) (native-inputs - (list extra-cmake-modules)) + (list extra-cmake-modules python-minimal tzdata-for-tests)) (inputs - (list qtbase-5 qtdeclarative-5 qtscript iso-codes)) + (list qtbase qtdeclarative iso-codes)) (arguments - (list #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" - (getcwd)) - (invoke "ctest" "-E" - "(kcountrytest|kcountrysubdivisiontest)"))))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" + (getcwd)) + (invoke "ctest" "-E" + "(kcountrytest|kcountrysubdivisiontest)"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Gettext-based UI text internationalization") (description "KI18n provides functionality for internationalizing user @@ -918,10 +1154,11 @@ translated text. This includes argument capturing, customizable markup, and translation scripting.") (license license:lgpl2.1+))) -(define-public kidletime +(define-public ki18n-5 (package - (name "kidletime") - (version "5.114.0") + (inherit ki18n) + (name "ki18n") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append @@ -930,13 +1167,38 @@ translation scripting.") name "-" version ".tar.xz")) (sha256 (base32 - "06sc9w54g4n7s5gjkqz08rgcz6v3pr0bdgx3gbjgzass6l4m8w7p")))) + "1kbb3rq85hbw1h5bd1w9cmdgz8bdg47w9b133ha41qlhh1i50clk")))) + (propagated-inputs + (list gettext-minimal python)) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list qtbase-5 qtdeclarative-5 qtscript iso-codes)))) + +(define-public kidletime + (package + (name "kidletime") + (version "6.3.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0ba74qa3p8qfmv2k1mq9wh00yih331y0wzc1i0mk8f37rry6g3yd")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules pkg-config)) + (list extra-cmake-modules pkg-config + ;; for wayland-scanner + wayland)) (inputs - (list libxscrnsaver ; X-Screensaver based poller, fallback mode - qtbase-5 qtx11extras)) + (list qtbase + qtwayland + wayland + plasma-wayland-protocols + wayland-protocols + libxkbcommon)) (home-page "https://community.kde.org/Frameworks") (synopsis "Reporting of idle time of user and system") (description "KIdleTime is a singleton reporting information on idle time. @@ -945,36 +1207,49 @@ but also for getting notified upon idle time events, such as custom timeouts, or user activity.") (license (list license:gpl2+ license:lgpl2.1+)))) +(define-public kidletime-5 + (package + (inherit kidletime) + (name "kidletime") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "15s9nxpkqy3i182xk82bpl92iaqcilsckja7301854fw6ppl8vvh")))) + (native-inputs + (list extra-cmake-modules pkg-config)) + (inputs + (list libxscrnsaver ; X-Screensaver based poller, fallback mode + qtbase-5 qtx11extras)))) + (define-public kirigami - ;; Kirigami is listed as tier 1 framework, but optionally includes - ;; plasma-framework which is tier 3. (package (name "kirigami") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" (version-major+minor version) "/" - "kirigami2-" version ".tar.xz")) + "kirigami-" version ".tar.xz")) (sha256 (base32 - "1bd232gs4394fa3aq31mjqrn8f3vjsghx7817szi7ryvnn6fnqkw")))) - (properties `((upstream-name . "kirigami2"))) + "0nrrnbf7hmis6sbqilmqf6wgjyvg5zwzlkcgzq0kbh1pbfhgmjyv")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs (list kwindowsystem - ;; TODO: Find a way to activate this optional include without - ;; introducing a recursive dependency. - ;;("plasma-frameworks" ,plasma-framework) ;; Tier 3! - qtbase-5 - qtdeclarative-5 - qtquickcontrols2-5 - qtsvg-5 - ;; Run-time dependency - qtgraphicaleffects)) + qtshadertools + qtbase + qtdeclarative + qtsvg + libxkbcommon)) (home-page "https://community.kde.org/Frameworks") (synopsis "QtQuick components for mobile user interfaces") (description "Kirigami is a set of high level QtQuick components looking @@ -982,10 +1257,36 @@ and feeling well on both mobile and desktop devices. They ease the creation of applications that follow the Kirigami Human Interface Guidelines.") (license license:lgpl2.1+))) +(define-public kirigami-5 + (package + (inherit kirigami) + (name "kirigami") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + "kirigami2-" version ".tar.xz")) + (sha256 + (base32 + "1q69b1qd2qs9hpwgw0y0ig93ag41l50dghribsnqhi0c9aklsn4b")))) + (native-inputs + (list extra-cmake-modules qttools-5)) + (inputs + (list kwindowsystem-5 + qtbase-5 + qtdeclarative-5 + qtquickcontrols2-5 + qtsvg-5 + ;; Run-time dependency + qtgraphicaleffects)) + (properties `((upstream-name . "kirigami2"))))) + (define-public kitemmodels (package (name "kitemmodels") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -994,12 +1295,12 @@ of applications that follow the Kirigami Human Interface Guidelines.") name "-" version ".tar.xz")) (sha256 (base32 - "1bfmcrbcbrvp2rcaf32vzvarqwp41gn6s4xpf56hnxbwf9kgk1fl")))) + "1fmcas5n3ylgzjlmwhcnqpsm46p50zia4xzvnf5iz74icbxq9adk")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) - (inputs - (list qtbase-5 qtdeclarative-5)) + (inputs (list qtdeclarative)) + (arguments (list #:qtbase qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Set of item models extending the Qt model-view framework") (description "KItemModels provides the following models: @@ -1032,10 +1333,30 @@ model to observers @end enumerate") (license license:lgpl2.1+))) +(define-public kitemmodels-5 + (package + (inherit kitemmodels) + (name "kitemmodels") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1wcznkj24553spkl202zwifk6hgrvdd60j3y47jp2m6zpadywz2k")))) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list qtdeclarative-5)) + (arguments '()))) + (define-public kitemviews (package (name "kitemviews") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1044,12 +1365,11 @@ model to observers name "-" version ".tar.xz")) (sha256 (base32 - "00vl2ck0pq0sqcxvhlr2pimgr27hd9v7y9dz6w4arb5smi5q1ixg")))) + "0byllbqxk2q4svxh1pim8jm6n2qimh5gp9h0m0s1hqqiaqapsrfq")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) - (inputs - (list qtbase-5)) + (list extra-cmake-modules qttools)) + (arguments (list #:qtbase qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Set of item views extending the Qt model-view framework") (description "KItemViews includes a set of views, which can be used with @@ -1057,10 +1377,28 @@ item models. It includes views for categorizing lists and to add search filters to flat and hierarchical lists.") (license (list license:gpl2+ license:lgpl2.1+)))) +(define-public kitemviews-5 + (package + (inherit kitemviews) + (name "kitemviews") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1sq1kvqb9g0gzlyfyix9xsjq6wl2i1s3mfqkpdc0rdns13sgn3kc")))) + (native-inputs + (list extra-cmake-modules qttools-5)) + (arguments '()))) + (define-public kplotting (package (name "kplotting") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1069,12 +1407,11 @@ to flat and hierarchical lists.") name "-" version ".tar.xz")) (sha256 (base32 - "17x58pplln0plqiyhjpzdiqxngylxq5gkc5gk7b91xzm783x2k0n")))) + "08cmp86h7pwjsds2kdcnnab8nincnmp72irk9y9ansqfglsgmrzq")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) - (inputs - (list qtbase-5)) + (list extra-cmake-modules qttools)) + (arguments (list #:qtbase qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Data plotting library") (description "KPlotWidget is a QWidget-derived class that provides a virtual @@ -1084,10 +1421,48 @@ data being plotted. KPlotWidget automatically converts everything to screen pixel units.") (license license:lgpl2.1+))) +(define-public ksvg + (package + (name "ksvg") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "15n7schzmwq4z0yiw0l1js45mml5wq3syb5vc7j9hs88j1jdcp6q")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules qttools)) + (inputs + (list + qtdeclarative + qtsvg + karchive + kconfig + kcolorscheme + kcoreaddons + kguiaddons + kirigami)) + (arguments + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd))))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Components for handling SVGs") + (description "A library for rendering SVG-based themes with stylesheet +re-coloring and on-disk caching.") + (license license:lgpl2.1+))) + (define-public ksyntaxhighlighting (package (name "ksyntaxhighlighting") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1096,27 +1471,25 @@ pixel units.") "syntax-highlighting-" version ".tar.xz")) (sha256 (base32 - "1skblg2m0sar63qrgkjsg0w9scixggm5qj7lp4gzjn4hwq6m3n63")))) + "117r5nsggqnlkd8mg9l2aa00q2ns891xadxl6vxgbgk9r4shlc1q")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules perl qttools-5 - ;; Optional, for compile-time validation of syntax definition files: - qtxmlpatterns)) + (list extra-cmake-modules perl qttools)) (inputs - (list qtbase-5)) + (list qtbase qtdeclarative)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'patch-source-shebangs 'unpatch-source-shebang - (lambda _ - ;; revert the patch-shebang phase on scripts which are - ;; in fact test data - (substitute* '("autotests/input/highlight.sh" - "autotests/folding/highlight.sh.fold") - (((which "sh")) " /bin/sh")) ;; space in front! - (substitute* '("autotests/input/highlight.pl" - "autotests/folding/highlight.pl.fold") - (((which "perl")) "/usr/bin/perl"))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'patch-source-shebangs 'unpatch-source-shebang + (lambda _ + ;; revert the patch-shebang phase on scripts which are + ;; in fact test data + (substitute* '("autotests/input/highlight.sh" + "autotests/folding/highlight.sh.fold") + (((which "sh")) " /bin/sh")) ;; space in front! + (substitute* '("autotests/input/highlight.pl" + "autotests/folding/highlight.pl.fold") + (((which "perl")) "/usr/bin/perl"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Syntax highlighting engine for Kate syntax definitions") (description "This is a stand-alone implementation of the Kate syntax @@ -1127,17 +1500,38 @@ integration with a custom editor as well as a ready-to-use (properties `((upstream-name . "syntax-highlighting"))) (license license:lgpl2.1+))) +(define-public ksyntaxhighlighting-5 + (package + (inherit ksyntaxhighlighting) + (name "ksyntaxhighlighting") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + "syntax-highlighting-" version ".tar.xz")) + (sha256 + (base32 + "19zs3n6cn83rjs0bpyrn6f5r75qcflavf8rb1c2wxj8dpp7cm33g")))) + (native-inputs + (list extra-cmake-modules perl qttools-5 + ;; Optional, for compile-time validation of syntax definition files: + qtxmlpatterns)) + (inputs + (list qtbase-5)))) + (define-public plasma-wayland-protocols (package (name "plasma-wayland-protocols") - (version "1.12.0") + (version "1.13.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "17jg1nvpq0718wv3nc54kd7pcn4riz2p2pcvay1kr4fbg79bz0ql")))) + "0znm2nhpmfq2vakyapmq454mmgqr5frc91k2d2nfdxjz5wspwiyx")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (arguments '(#:tests? #f)) ;no tests @@ -1154,7 +1548,43 @@ protocols used in KDE Plasma.") (define-public kwayland (package (name "kwayland") - (version "5.114.0") + (version "6.1.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" + version "/kwayland" "-" + version ".tar.xz")) + (sha256 + (base32 + "15dmbcqhajqc100k95y6nh0w2br8xwql4mlq8grh4r6cdgn378n6")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules pkg-config + ;; for wayland-scanner + wayland)) + (inputs + (list libxkbcommon + plasma-wayland-protocols + qtwayland + wayland + wayland-protocols)) + (arguments + (list #:qtbase qtbase)) + (home-page "https://invent.kde.org/plasma/kwayland") + (synopsis "Qt-style API to interact with the wayland client and server") + (description "As the names suggest they implement a Client respectively a +Server API for the Wayland protocol. The API is Qt-styled removing the needs to +interact with a for a Qt developer uncomfortable low-level C-API. For example +the callback mechanism from the Wayland API is replaced by signals, data types +are adjusted to be what a Qt developer expects - two arguments of int are +represented by a QPoint or a QSize.") + (license license:lgpl2.1+))) + +(define-public kwayland-5 + (package + (inherit kwayland) + (name "kwayland") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append @@ -1163,14 +1593,12 @@ protocols used in KDE Plasma.") name "-" version ".tar.xz")) (sha256 (base32 - "1lzmlbv5vl656cigjj07hbc0gj6g1i2xqanvnhxj360109kzilf1")))) - (build-system qt-build-system) + "1n5fq0gppx6rzgzkkskd077jygzj7cindb7zwr35yvbg5l69gdc8")))) (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list libxkbcommon plasma-wayland-protocols - qtbase-5 qtwayland-5 wayland wayland-protocols)) @@ -1197,21 +1625,12 @@ protocols used in KDE Plasma.") ;; The 'kwayland-testXdgForeign' may fail on ;; powerpc64le with a 'Subprocess aborted' error. "kwayland-testXdgForeign") "|") - ")")))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Qt-style API to interact with the wayland client and server") - (description "As the names suggest they implement a Client respectively a -Server API for the Wayland protocol. The API is Qt-styled removing the needs to -interact with a for a Qt developer uncomfortable low-level C-API. For example -the callback mechanism from the Wayland API is replaced by signals, data types -are adjusted to be what a Qt developer expects - two arguments of int are -represented by a QPoint or a QSize.") - (license license:lgpl2.1+))) + ")")))))))))) (define-public kwidgetsaddons (package (name "kwidgetsaddons") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1220,23 +1639,25 @@ represented by a QPoint or a QSize.") name "-" version ".tar.xz")) (sha256 (base32 - "1cc8lsk9v0cp2wiy1q26mlkf8np0yj01sq8a7w13ga5s6hv4sh2n")))) + "0k44s7j80qapnwsjr1y7igpzxddy065gw3xm7i1av9m0p46rygqf")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5 xorg-server-for-tests)) - (inputs - (list qtbase-5)) + (list extra-cmake-modules qttools)) (arguments (list + #:qtbase qtbase #:phases #~(modify-phases %standard-phases (replace 'check - (lambda* (#:key tests? #:allow-other-keys) + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) (when tests? - (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache") + ;; hideLaterShouldHideAfterDelay function time: 300000ms, total time: 300009ms (invoke "ctest" "-E" - "(ksqueezedtextlabelautotest|\ -kwidgetsaddons-kcolumnresizertest)"))))))) + "(ktooltipwidgettest)" + "-j" + (if parallel-tests? + (number->string (parallel-job-count)) + "1")))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Large set of desktop widgets") (description "Provided are action classes that can be added to toolbars or @@ -1245,10 +1666,38 @@ dates and times, or MIME types, as well as platform-aware dialogs for configuration pages, message boxes, and password requests.") (license (list license:gpl2+ license:lgpl2.1+)))) +(define-public kwidgetsaddons-5 + (package + (inherit kwidgetsaddons) + (name "kwidgetsaddons") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0rcm27wra9s7kzlk67y0f57l0rnh5vb9c2w39h6yjq37y5af1qd8")))) + (native-inputs + (list extra-cmake-modules qttools-5 xorg-server-for-tests)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache") + (invoke "ctest" "-E" + "(ksqueezedtextlabelautotest|\ +kwidgetsaddons-kcolumnresizertest)"))))))))) + (define-public kwindowsystem (package (name "kwindowsystem") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1257,19 +1706,24 @@ configuration pages, message boxes, and password requests.") name "-" version ".tar.xz")) (sha256 (base32 - "03xbsf1pmswd2kpn3pdszp4vndclsh7j02fp22npxaxllmfr4va9")))) + "1fdax3c2q3fm56pvr99z0rwf1nwz7jmksblj9d42gg1l55ckrqs0")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config + wayland; for wayland-scanner dbus ; for the tests - openbox ; for the tests - qttools-5 + openbox ; for the test + qttools xorg-server-for-tests)) ; for the tests (inputs - (list libxrender - qtbase-5 - qtx11extras + (list qtbase + qtdeclarative + qtwayland + wayland-protocols + plasma-wayland-protocols + libxkbcommon + wayland xcb-util-keysyms xcb-util-wm)) (arguments @@ -1280,7 +1734,7 @@ configuration pages, message boxes, and password requests.") (lambda* (#:key tests? #:allow-other-keys) ;; The test suite requires a running window anager (when tests? - (setenv "XDG_RUNTIME_DIR" "/tmp") + (setenv "XDG_RUNTIME_DIR" (getcwd)) (system "Xvfb :1 -ac -screen 0 640x480x24 &") (setenv "DISPLAY" ":1") (sleep 5) ;; Give Xvfb a few moments to get on it's feet @@ -1302,10 +1756,38 @@ lower level classes for interaction with the X Windowing System.") ;; the lgpl2.1. Some source files are under non-copyleft licenses. (license license:lgpl2.1+))) +(define-public kwindowsystem-5 + (package + (inherit kwindowsystem) + (name "kwindowsystem") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0d2kxcpcvpzv07ldd1kb5gjclhmn6gcn5ms0bd8f5g9gflrpdjby")))) + (native-inputs + (list extra-cmake-modules + pkg-config + dbus ; for the tests + openbox ; for the tests + qttools-5 + xorg-server-for-tests)) ; for the tests + (inputs + (list libxrender + qtbase-5 + qtx11extras + xcb-util-keysyms + xcb-util-wm)))) + (define-public modemmanager-qt (package (name "modemmanager-qt") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1314,7 +1796,7 @@ lower level classes for interaction with the X Windowing System.") name "-" version ".tar.xz")) (sha256 (base32 - "16jqhmcpsffl9a7c0bb4hwjy3bw5rakdsnc5n6y8djc6237jl9pi")))) + "1ky77v27nbil5vcig07yyk3jahv673qr7pn41dsb7f588sbh5www")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules dbus pkg-config)) @@ -1322,7 +1804,7 @@ lower level classes for interaction with the X Windowing System.") ;; Headers contain #include <ModemManager/ModemManager.h> (list modem-manager)) (inputs - (list qtbase-5)) + (list qtbase)) (arguments (list #:phases #~(modify-phases %standard-phases (replace 'check @@ -1341,7 +1823,7 @@ messages.") (define-public networkmanager-qt (package (name "networkmanager-qt") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1350,16 +1832,16 @@ messages.") name "-" version ".tar.xz")) (sha256 (base32 - "10anjsnrzawrfjlznjvvl2sbxrajl2ddnq2kgl314b5dk7z3yk4n")))) + "1q1r3s136bpg2gnrwhakww9yzd42ccymvisrpqv3l0wgywxnma8c")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules dbus pkg-config)) + (inputs (list qtbase)) (propagated-inputs ;; Headers contain #include <NetworkManager.h> and ;; #include <libnm/NetworkManager.h> - (list network-manager)) - (inputs - (list qtbase-5)) + (list network-manager + qtdeclarative)) (arguments (list #:phases #~(modify-phases %standard-phases (replace 'check @@ -1375,34 +1857,57 @@ your network devices and also provides a library for parsing connection settings which are used in DBus communication.") (license license:lgpl2.1+))) -(define-public oxygen-icons +(define-public networkmanager-qt5 (package - (name "oxygen-icons") - (version "5.112.0") + (inherit networkmanager-qt) + (name "networkmanager-qt5") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "5" "-" version ".tar.xz")) + (version-major+minor version) + "/networkmanager-qt-" version ".tar.xz")) (sha256 (base32 - "0yw2mixy5p8pw9866rfr0wcjhvilznakd0h6934svv0dk3lv054a")))) - (build-system cmake-build-system) + "0s8vc3qqx76f70vql77hb3nxkn6b3hvzdm6bgcpnnxqhw6j80khb")))) (native-inputs - (list extra-cmake-modules fdupes)) + (list extra-cmake-modules dbus pkg-config)) + (propagated-inputs + ;; Headers contain #include <NetworkManager.h> and + ;; #include <libnm/NetworkManager.h> + (list network-manager)) (inputs (list qtbase-5)) + (properties `((upstream-name . "networkmanager-qt"))))) + +(define-public oxygen-icons + (package + (name "oxygen-icons") + (version "6.0.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/oxygen-icons/" + "/oxygen-icons" "-" version ".tar.xz")) + (sha256 + (base32 + "0x2piq03gj72p5qlhi8zdx3r58va088ysp7lg295vhfwfll1iv18")))) + (build-system cmake-build-system) + (native-inputs + (list extra-cmake-modules + ;; for test + fdupes)) + (inputs (list qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Oxygen provides the standard icon theme for the KDE desktop") (description "Oxygen icon theme for the KDE desktop") - (license license:lgpl3+) - (properties '((upstream-name . "oxygen-icons5"))))) + (license license:lgpl3+))) (define-public prison (package (name "prison") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) @@ -1410,12 +1915,12 @@ which are used in DBus communication.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1wbr1lryxmrx65ilq1bhqsdhhikrih977nhpb02fq0cqnvv7v9i7")))) + (base32 "0imwniw2lpsjipzyx9vmwwdy370sg5zynh9gk9g1w1c7axr0g63n")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list libdmtx qrencode qtbase-5)) ;; TODO: rethink: nix propagates this + (list libdmtx zxing-cpp qrencode qtbase qtdeclarative qtmultimedia)) (home-page "https://api.kde.org/frameworks/prison/html/index.html") (synopsis "Barcode generation abstraction layer") (description "Prison is a Qt-based barcode abstraction layer/library and @@ -1425,19 +1930,20 @@ provides uniform access to generation of barcodes with data.") (define-public pulseaudio-qt (package (name "pulseaudio-qt") - (version "1.4.0") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/pulseaudio-qt" "/pulseaudio-qt-" version ".tar.xz")) (sha256 (base32 - "0rfh1qawf2bxh26p5xr03z2zizpnfw8k9ycwhmmqac11rx765jnq")))) + "0845d910jyd6w02yc157m4myfwzbmj1l0y6mj3yx0wq0f34533yd")))) (build-system cmake-build-system) + (arguments (list #:configure-flags #~(list "-DBUILD_WITH_QT6=ON"))) (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list glib pulseaudio qtdeclarative-5 qtbase-5)) + (list glib pulseaudio qtdeclarative qtbase)) (home-page "https://invent.kde.org/libraries/pulseaudio-qt/") (synopsis "Qt bindings for PulseAudio") (description @@ -1452,7 +1958,7 @@ libpulse.") (define-public qqc2-desktop-style (package (name "qqc2-desktop-style") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1461,20 +1967,26 @@ libpulse.") name "-" version ".tar.xz")) (sha256 (base32 - "1y5g91vybjvhwmzpfwrc70q5j7jxf5b972f9fh2vzb930jir6c8g")))) - (build-system cmake-build-system) + "1c5wy4a8x2lslc3dkqpn7k479jfpam63c93sqgyd4iingyxnjzly")))) + (build-system qt-build-system) + (arguments + (list + #:qtbase qtbase + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dbus-launch" "ctest" + "--rerun-failed" "--output-on-failure"))))))) (native-inputs - (list extra-cmake-modules pkg-config)) + (list extra-cmake-modules dbus pkg-config qttools)) (inputs (list kauth - kconfigwidgets ; optional + kconfig ; optional kcoreaddons kiconthemes ; optional kirigami - qtbase-5 - qtdeclarative-5 - qtquickcontrols2-5 - qtx11extras ; optional + qtdeclarative sonnet)) ; optional (home-page "https://community.kde.org/Frameworks") (synopsis "QtQuickControls2 style that integrates with the desktop") @@ -1487,7 +1999,7 @@ feel.") (define-public solid (package (name "solid") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1496,8 +2008,37 @@ feel.") name "-" version ".tar.xz")) (sha256 (base32 - "1slxlj5jhp8g745l328932934633nl81sq3n8fd73h655hymsk4s")))) + "1nckgnr2834ppjjm3nq5xcasw7f3rvr95g8d37yh3vmwk6arj8dq")))) (build-system cmake-build-system) + (native-inputs + (list bison dbus extra-cmake-modules flex qttools)) + ;; TODO: Add runtime-only dependency MediaPlayerInfo + (inputs + (list `(,util-linux "lib") ;; Optional, for libmount + libxkbcommon + vulkan-headers + qtbase qtdeclarative eudev)) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Desktop hardware abstraction") + (description "Solid is a device integration framework. It provides a way of +querying and interacting with hardware independently of the underlying operating +system.") + (license license:lgpl2.1+))) + +(define-public solid-5 + (package + (inherit solid) + (name "solid") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "04359x7rhhl68xcrspxywxywb900dvlkna5fb442npwiqaxdxhy6")))) (arguments (list #:phases #~(modify-phases %standard-phases (replace 'check @@ -1508,19 +2049,12 @@ feel.") (native-inputs (list bison dbus extra-cmake-modules flex qttools-5)) (inputs - (list qtbase-5 qtdeclarative-5 eudev)) - ;; TODO: Add runtime-only dependency MediaPlayerInfo - (home-page "https://community.kde.org/Frameworks") - (synopsis "Desktop hardware abstraction") - (description "Solid is a device integration framework. It provides a way of -querying and interacting with hardware independently of the underlying operating -system.") - (license license:lgpl2.1+))) + (list qtbase-5 qtdeclarative-5 eudev)))) (define-public sonnet (package (name "sonnet") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1529,16 +2063,15 @@ system.") name "-" version ".tar.xz")) (sha256 (base32 - "0zxi96i3gfpx759qc1nyz7jqlswg5ivgr1w9gbbsm1x5fi9ikadx")))) + "0zjcjy2b697wizgrr210g24cvkli6yi2ry05kzfc6xxarq0dsi3b")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs - (list extra-cmake-modules pkg-config qttools-5)) + (list extra-cmake-modules pkg-config qttools)) (inputs - (list aspell - hunspell + (list aspell hunspell ;; TODO: hspell (for Hebrew), Voikko (for Finish) - qtdeclarative-5 - qtbase-5)) + qtdeclarative)) (home-page "https://community.kde.org/Frameworks") (synopsis "Multi-language spell checker") (description "Sonnet is a plugin-based spell checking library for Qt-based @@ -1546,10 +2079,32 @@ applications. It supports several different plugins, including HSpell, Enchant, ASpell and HUNSPELL.") (license license:lgpl2.1+))) +(define-public sonnet-5 + (package + (inherit sonnet) + (name "sonnet") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0jja3wxk4h62ik5pkf0i5v9012d0qjaljyaab2a9g0j2wy070hcq")))) + (arguments '()) + (native-inputs + (list extra-cmake-modules pkg-config qttools-5)) + (inputs + (list aspell + hunspell + qtdeclarative-5)))) + (define-public threadweaver (package (name "threadweaver") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1558,40 +2113,70 @@ ASpell and HUNSPELL.") name "-" version ".tar.xz")) (sha256 (base32 - "1y07g58w6z3i11y3djg3aaxanhp9hzaciq61l4dn1gqwghn09xgh")))) + "04yrywhjhlyf1ha3w6rmaszyb28j91lc9j55frxrdmhqk67iy841")))) (build-system cmake-build-system) - (native-inputs - (list extra-cmake-modules)) - (inputs - (list qtbase-5)) + (native-inputs (list extra-cmake-modules)) + (inputs (list qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Helper for multithreaded programming") (description "ThreadWeaver is a helper for multithreaded programming. It uses a job-based interface to queue tasks and execute them in an efficient way.") (license license:lgpl2.1+))) +(define-public threadweaver-5 + (package + (inherit threadweaver) + (name "threadweaver") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1q7ax3dhsayz35j0l9pdmarkwfyyy1dsy2crdf5xz8pr5mjxq8wp")))) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list qtbase-5)))) + (define-public libkdcraw (package (name "libkdcraw") - (version "23.08.4") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 - (base32 "1mm3gsp7lfqxb9irk59hrzaxdqjv28iwaa1xmpazw4q62nmlj7mi")))) + (base32 "0a4aifi3jwkizdn2qsa441f28j9ykymw4bn922d5pz6c9riw3ssr")))) (build-system cmake-build-system) (native-inputs (list pkg-config extra-cmake-modules)) (inputs - (list libraw qtbase-5)) + (list libraw qtbase)) + (arguments (list #:configure-flags + #~(list #$(string-append + "-DQT_MAJOR_VERSION=" + (version-major + (package-version + (this-package-input "qtbase"))))))) (home-page "https://invent.kde.org/graphics/libkdcraw") (synopsis "C++ interface used to decode RAW picture files") (description "Libkdcraw is a C++ interface around LibRaw library used to decode RAW picture files.") (license (list license:gpl2+ license:bsd-3)))) +(define-public libkdcraw-qt5 + (package + (inherit libkdcraw) + (name "libkdcraw-qt5") + (inputs (modify-inputs (package-inputs libkdcraw) + (replace "qtbase" qtbase-5))))) + ;; Tier 2 ;; ;; Tier 2 frameworks additionally depend on tier 1 frameworks, but still have @@ -1600,7 +2185,7 @@ decode RAW picture files.") (define-public kactivities (package (name "kactivities") - (version "5.114.0") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append @@ -1609,29 +2194,28 @@ decode RAW picture files.") name "-" version ".tar.xz")) (sha256 (base32 - "10pyynqz8c22la9aqms080iqlisj3irbi1kwnn3s0vg5dsjxr1p3")))) + "0zbjs4sysfaf6zsdnfmkbpxsc2bg5ncnhkzfn1dyhrsqk68lwz3s")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list boost - kauth - kbookmarks - kcodecs - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kio - kitemviews - kjobwidgets - kservice - kwidgetsaddons - kwindowsystem - kxmlgui - qtbase-5 + kauth-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kio-5 + kitemviews-5 + kjobwidgets-5 + kservice-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 qtdeclarative-5 - solid)) + solid-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Core components for the KDE Activity concept") (description "KActivities provides the infrastructure needed to manage a @@ -1645,7 +2229,7 @@ with other frameworks.") (define-public kauth (package (name "kauth") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1654,12 +2238,13 @@ with other frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "1rkf9mc9718wn8pzd3d3wcg3lsn0vkr9a2cqnz86rbg3cf2qdbir")))) + "1d9kmxbb3rx4nx1yq0crywirmnnp8qvhs2pdng7s49pqdy0kdkzb")))) (build-system cmake-build-system) (native-inputs - (list dbus extra-cmake-modules qttools-5)) + (list dbus extra-cmake-modules qttools)) + (propagated-inputs (list kcoreaddons)) (inputs - (list kcoreaddons polkit-qt qtbase-5)) + (list kwindowsystem polkit-qt6 qtbase)) (arguments (list #:phases @@ -1668,7 +2253,9 @@ with other frameworks.") (lambda _ ;; Make packages using kauth put their policy files and helpers ;; into their own prefix. - (substitute* "KF5AuthConfig.cmake.in" + (substitute* #$(string-append "KF" (version-major + (package-version this-package)) + "AuthConfig.cmake.in") (("@KAUTH_POLICY_FILES_INSTALL_DIR@") "${KDE_INSTALL_DATADIR}/polkit-1/actions") (("@KAUTH_HELPER_INSTALL_DIR@") @@ -1687,10 +2274,31 @@ actions that need to be performed as a privileged user to small set of helper utilities.") (license license:lgpl2.1+))) +(define-public kauth-5 + (package + (inherit kauth) + (name "kauth") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1x0zd6lqv855jkihxpzhxs732qiva31kzjah9hf2j6xaq0dfxqdc")))) + (build-system cmake-build-system) + (native-inputs + (list dbus extra-cmake-modules qttools-5)) + (inputs + (list kcoreaddons-5 polkit-qt qtbase-5)) + (propagated-inputs '()))) + (define-public kcompletion (package (name "kcompletion") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1699,12 +2307,13 @@ utilities.") name "-" version ".tar.xz")) (sha256 (base32 - "0qvdxqlh1dklkbmqfjg5gc3dkdicgzn6q5lgvyf8cv46dinj6mwc")))) + "0bkixs49w56d6s2yi5nkk6q2rg86wc81phrqa0508p98pp37l0iz")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs - (list kconfig kwidgetsaddons qtbase-5)) + (list kcodecs kconfig kwidgetsaddons)) + (arguments (list #:qtbase qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Powerful autocompletion framework and widgets") (description "This framework helps implement autocompletion in Qt-based @@ -1712,10 +2321,30 @@ applications. It provides a set of completion-ready widgets, or can be integrated it into your application's other widgets.") (license license:lgpl2.1+))) +(define-public kcompletion-5 + (package + (inherit kcompletion) + (name "kcompletion") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1sh9gpbi65mbs8bszrxh7a9ifgcr7z5jrhsac3670905a6mdmfjj")))) + (native-inputs + (list extra-cmake-modules qttools-5)) + (inputs + (list kconfig-5 kwidgetsaddons-5)) + (arguments '()))) + (define-public kcontacts (package (name "kcontacts") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1726,24 +2355,22 @@ integrated it into your application's other widgets.") (search-patches "kcontacts-incorrect-country-name.patch")) (sha256 (base32 - "0lyqvbs216p5zpssaf4pyccph7nbwkbvhpmhbi32y2rm23cmxlwf")))) - (build-system cmake-build-system) - (native-inputs - (list extra-cmake-modules xorg-server-for-tests)) ; for the tests - (inputs - (list qtbase-5)) + "01xi60ykp7lhmwr7890byij893pfxn35qwbz4bmzmiydjwbmp6r2")))) + (build-system qt-build-system) + (native-inputs (list extra-cmake-modules + ;; for test + iso-codes)) + (inputs (list qtdeclarative)) (propagated-inputs - (list ;; As required by KF5ContactsConfig.cmake. - iso-codes kcodecs kconfig kcoreaddons qtdeclarative-5 ki18n)) + (list ;; As required by KF6ContactsConfig.cmake. + kcodecs kconfig kcoreaddons ki18n)) (arguments (list + #:qtbase qtbase #:phases #~(modify-phases %standard-phases (add-before 'check 'check-setup - (lambda _ - (setenv "HOME" (getcwd)) - (system "Xvfb +extension GLX :1 -screen 0 640x480x24 &") - (setenv "DISPLAY" ":1")))))) + (lambda _ (setenv "HOME" (getcwd))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "API for contacts/address book data following the vCard standard") (description "This library provides a vCard data model, vCard @@ -1755,7 +2382,7 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca. (define-public kcrash (package (name "kcrash") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1764,22 +2391,41 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca. name "-" version ".tar.xz")) (sha256 (base32 - "1avi4yd3kpjqxrvci1nicxbh9mjafj1w2vgfmqanq66b76s4kxj1")))) + "0hcgljz5wm9v4qphc4cmn81gdrs8lcb4x978xz82gnmqx47pmik5")))) (build-system qt-build-system) - (native-inputs - (list extra-cmake-modules)) - (inputs - (list kcoreaddons kwindowsystem qtbase-5 qtx11extras)) + (native-inputs (list extra-cmake-modules)) + (inputs (list kcoreaddons kwindowsystem)) + (arguments (list #:qtbase qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Graceful handling of application crashes") (description "KCrash provides support for intercepting and handling application crashes.") (license license:lgpl2.1+))) +(define-public kcrash-5 + (package + (inherit kcrash) + (name "kcrash") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0rg8g50y44gq3hjl5fc36siyyq3czd2zrf4c70fspk33svwldlw1")))) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list kcoreaddons-5 kwindowsystem-5 qtx11extras)) + (arguments '()))) + (define-public kdoctools (package (name "kdoctools") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1788,19 +2434,68 @@ application crashes.") name "-" version ".tar.xz")) (sha256 (base32 - "15s58r2zvdckw30x9q9ir8h1i8q2ncfgjn9h4jnmylwm79z3z27v")))) + "0jl5qxjscjdpf0jpl35ymdqhks3ynk8jxlwv6xdqml6vp4aysl2b")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list docbook-xml-4.5 docbook-xsl + gettext-minimal karchive ki18n libxml2 libxslt perl perl-uri + qtbase)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'cmake-find-docbook + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "cmake" "\\.cmake$") + (("CMAKE_SYSTEM_PREFIX_PATH") "CMAKE_PREFIX_PATH")) + (substitute* "cmake/FindDocBookXML4.cmake" + (("^.*xml/docbook/schema/dtd.*$") + "xml/dtd/docbook\n")) + (substitute* "cmake/FindDocBookXSL.cmake" + (("^.*xml/docbook/stylesheet.*$") + (string-append "xml/xsl/docbook-xsl-" + #$(package-version (this-package-input "docbook-xsl")) + "\n")))))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Create documentation from DocBook") + (description "Provides tools to generate documentation in various format +from DocBook files.") + (license license:lgpl2.1+))) + +(define-public kdoctools-5 + (package + (inherit kdoctools) + (name "kdoctools") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1cvb39ggc79fpfa84rshm6vl10h0avn2rf6qxaxb41r9887ad81n")))) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list docbook-xml-4.5 + docbook-xsl + karchive-5 + ki18n-5 + libxml2 + libxslt + perl + perl-uri qtbase-5)) (arguments (list @@ -1826,17 +2521,12 @@ application crashes.") (let ((xsl (string-append (assoc-ref outputs "out") "/share/kf5/kdoctools/customization/xsl/"))) (symlink (string-append xsl "pt_br.xml") - (string-append xsl "pt-BR.xml")))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Create documentation from DocBook") - (description "Provides tools to generate documentation in various format -from DocBook files.") - (license license:lgpl2.1+))) + (string-append xsl "pt-BR.xml")))))))))) (define-public kfilemetadata (package (name "kfilemetadata") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1845,7 +2535,7 @@ from DocBook files.") name "-" version ".tar.xz")) (sha256 (base32 - "15va29chlsrxii02w1ax718hp1b14ym59lcfyzh7w30zlf681560")))) + "1230gl5jf4wizvxhfl0l4393vzgfzj0im139kjlss0qshrwf725x")))) (build-system cmake-build-system) (arguments (list @@ -1854,28 +2544,26 @@ from DocBook files.") (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - ;; FIXME: Test can't find audio/x-speex mimeinfo - ;; (but it can find audio/x-speex+ogg). - (invoke "ctest" "-E" - "(usermetadatawritertest|embeddedimagedatatest|\ -taglibextractortest)"))))))) + (invoke "ctest" "-E" "(exiv2extractortest|usermetadatawritertest)"))))))) (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list attr ebook-tools + kcodecs + libplasma karchive kconfig kcoreaddons kdegraphics-mobipocket ki18n - qtmultimedia-5 - qtbase-5 + qtmultimedia + qtbase ;; Required run-time packages catdoc ;; Optional run-time packages exiv2 ffmpeg - poppler-qt5 + poppler-qt6 taglib)) (home-page "https://community.kde.org/Frameworks") (synopsis "Extract metadata from different fileformats") @@ -1885,6 +2573,47 @@ used by file indexers to retrieve the metadata. This library can also be used by applications to write metadata.") (license (list license:lgpl2.0 license:lgpl2.1 license:lgpl3)))) +(define-public kfilemetadata-5 + (package + (inherit kfilemetadata) + (name "kfilemetadata") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "13yfcy02rmhrhf8lxv7smk1n9rg1ywsh60hwzm94b8hq9a62qp0r")))) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest" "-E" + "(usermetadatawritertest|taglibextractortest)"))))))) + (native-inputs (list extra-cmake-modules pkg-config)) + (inputs + (list attr + ebook-tools + karchive-5 + kconfig-5 + kcoreaddons-5 + ki18n-5 + qtmultimedia-5 + qtbase-5 + ;; Required run-time packages + catdoc + ;; Optional run-time packages + exiv2 + ffmpeg + poppler-qt5 + taglib)))) + (define-public kimageannotator (package (name "kimageannotator") @@ -1901,8 +2630,10 @@ by applications to write metadata.") "1f1y4r5rb971v2g34fgjbr14g0mdms5h66yl5k0p1zf50kr2wnic")))) (build-system qt-build-system) (arguments - (list #:configure-flags #~'("-DBUILD_SHARED_LIBS=ON" - "-DBUILD_TESTS=ON") + (list #:qtbase qtbase + #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_TESTS=ON" + "-DBUILD_WITH_QT6=ON") #:phases #~(modify-phases %standard-phases (replace 'check @@ -1913,9 +2644,9 @@ by applications to write metadata.") (setenv "DISPLAY" ":1") (invoke "ctest" "--test-dir" "tests")))))) (native-inputs - (list qttools-5 xorg-server-for-tests)) + (list qttools xorg-server-for-tests)) (inputs - (list googletest qtsvg-5 kcolorpicker)) + (list googletest qtsvg kcolorpicker)) (home-page "https://github.com/ksnip/kImageAnnotator") (synopsis "Image annotating library") (description "This library provides tools to annotate images.") @@ -1924,7 +2655,7 @@ by applications to write metadata.") (define-public kimageformats (package (name "kimageformats") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1933,14 +2664,22 @@ by applications to write metadata.") name "-" version ".tar.xz")) (sha256 (base32 - "1nfzpgnrbwncx9zp9cwa169jlfv7i85p00a07d4jc5hrdyvvkn0w")))) + "040j1jr7v4bc0zh4lf7bn9sj4a7g3c8icljagjpm7v9mpmqhgm0f")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list karchive ; for Krita and OpenRaster images - openexr-2 ; for OpenEXR high dynamic-range images - qtbase-5)) + openexr ; for OpenEXR high dynamic-range images + qtbase + libjxl + libraw + libavif + ;; see https://bugs.kde.org/show_bug.cgi?id=468288, + ;; kimageformats-read-psd test need QTiffPlugin + qtimageformats + ;; FIXME: make openexr propagate two package + imath zlib)) (arguments (list #:phases @@ -1948,25 +2687,7 @@ by applications to write metadata.") (add-before 'check 'check-setup (lambda _ ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - (setenv "QT_PLUGIN_PATH" - (string-append (getcwd) "/bin:" - (getenv "QT_PLUGIN_PATH"))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" - (getcwd)) - ;; FIXME: I guess kde's qt no this fail. - ;; see https://invent.kde.org/frameworks/kimageformats/-/jobs/1046283 - (invoke "ctest" "-E" "kimageformats-read-psd"))))) - ;; FIXME: The header files of ilmbase (propagated by openexr) are not - ;; found when included by the header files of openexr, and an explicit - ;; flag needs to be set. - #:configure-flags #~(list (string-append "-DCMAKE_CXX_FLAGS=-I" - (assoc-ref %build-inputs - "ilmbase") - "/include/OpenEXR")))) + (setenv "QT_QPA_PLATFORM" "offscreen")))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Plugins to allow QImage to support extra file formats") (description "This framework provides additional image format plugins for @@ -1975,10 +2696,44 @@ but may be a runtime requirement for Qt-based software to support certain image formats.") (license license:lgpl2.1+))) +(define-public kimageformats-5 + (package + (inherit kimageformats) + (name "kimageformats") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "174g32s3m7irzv2h3lk7bmp3yfc7zrmp7lmp02n3m5ppbv6rn4bw")))) + (native-inputs + (list extra-cmake-modules pkg-config)) + (inputs + (list karchive-5 ; for Krita and OpenRaster images + openexr-2 ; for OpenEXR high dynamic-range images + qtbase-5 + qtimageformats-5)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen")))) + #:configure-flags #~(list (string-append "-DCMAKE_CXX_FLAGS=-I" + (assoc-ref %build-inputs + "ilmbase") + "/include/OpenEXR")))))) + (define-public kjobwidgets (package (name "kjobwidgets") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1987,22 +2742,41 @@ formats.") name "-" version ".tar.xz")) (sha256 (base32 - "1ymlqi5cqcs79nj1vff8pqwgvy0dxj5vv7l529w3a3n315hkrny8")))) + "1n08y5kv3n2179hgqiq3y7illjs6n6i3w33r492cgykrji5jvvjz")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs - (list kcoreaddons kwidgetsaddons qtbase-5 qtx11extras)) + (list libxkbcommon kcoreaddons knotifications kwidgetsaddons qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Widgets for showing progress of asynchronous jobs") (description "KJobWIdgets provides widgets for showing progress of asynchronous jobs.") (license license:lgpl2.1+))) +(define-public kjobwidgets-5 + (package + (inherit kjobwidgets) + (name "kjobwidgets") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "11xy7n2sz340wili21ia92ihfq76irh8c7db8x1qsgqq09ypzhza")))) + (native-inputs + (list extra-cmake-modules qttools-5)) + (inputs + (list kcoreaddons-5 kwidgetsaddons-5 qtbase-5 qtx11extras)))) + (define-public knotifications (package (name "knotifications") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2011,15 +2785,43 @@ asynchronous jobs.") name "-" version ".tar.xz")) (sha256 (base32 - "0cjd5ml9hyzprjgmrc132cmp7g9hnl0h5swlxw2ifqnxxyfkg72b")))) + "0xvqri0ykx9qb6q2gjpxri71jvghzwy6p332vj8drzlm6wd3rvfc")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules dbus pkg-config qttools-5)) + (list extra-cmake-modules pkg-config qttools)) + (propagated-inputs (list qtdeclarative)) (inputs - (list kcodecs - kconfig + (list kconfig kcoreaddons - kwindowsystem + libcanberra + qtbase)) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Desktop notifications") + (description "KNotification is used to notify the user of an event. It +covers feedback and persistent events.") + (license license:lgpl2.1+))) + +(define-public knotifications-5 + (package + (inherit knotifications) + (name "knotifications") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0jxld7f82psa48r0n9qv1cks6w1vd6krjnyb4mw68vgm38030na8")))) + (native-inputs + (list extra-cmake-modules dbus pkg-config qttools-5)) + (inputs + (list kcodecs-5 + kconfig-5 + kcoreaddons-5 + kwindowsystem-5 libcanberra libdbusmenu-qt phonon @@ -2027,6 +2829,7 @@ asynchronous jobs.") qtbase-5 qtspeech-5 qtx11extras)) + (propagated-inputs '()) (arguments (list #:phases #~(modify-phases %standard-phases (replace 'check @@ -2035,17 +2838,12 @@ asynchronous jobs.") (setenv "HOME" (getcwd)) (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "ctest"))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Desktop notifications") - (description "KNotification is used to notify the user of an event. It -covers feedback and persistent events.") - (license license:lgpl2.1+))) + (invoke "dbus-launch" "ctest"))))))))) (define-public kpackage (package (name "kpackage") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2054,17 +2852,74 @@ covers feedback and persistent events.") name "-" version ".tar.xz")) (sha256 (base32 - "0v165az3k5lfszxy0kl2464573y0dcq92fyfiklwnkkcjsvba69d")))) + "0k8ba4s5g7i57nlz3y1qs1gaagxjdv4arzna0ymfmhciw04nh7c1")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) + (propagated-inputs (list kcoreaddons)) (inputs (list karchive kconfig - kcoreaddons kdoctools ki18n + qtbase)) + (arguments + (list + ;; The `plasma-querytest' test is known to fail when tests are run in parallel: + ;; <https://sources.debian.org/src/kpackage/5.115.0-2/debian/changelog/#L109> + #:parallel-tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "src/kpackage/package.cpp" + (("bool externalPaths = false;") + "bool externalPaths = true;")) + (substitute* '("src/kpackage/packageloader.cpp") + (("QDirIterator::Subdirectories") + "QDirIterator::Subdirectories | QDirIterator::FollowSymlinks")))) + (add-before 'check 'check-setup + (lambda _ (setenv "HOME" (getcwd)))) + (replace 'check + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") + ;; sometime plasmoidpackagetest will fail. + (invoke "ctest" "--rerun-failed" "--output-on-failure" + "-j" (if parallel-tests? + (number->string (parallel-job-count)) + "1") + "-E" "plasmoidpackagetest")))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Installation and loading of additional content as packages") + (description "The Package framework lets the user install and load packages +of non binary content such as scripted extensions or graphic assets, as if they +were traditional plugins.") + (license (list license:gpl2+ license:lgpl2.1+)))) + +(define-public kpackage-5 + (package + (inherit kpackage) + (name "kpackage") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1gpixfkyaflmzk8lkxnknydm4x6w5339yrgs2n9g229bqy2v21ap")))) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list karchive-5 + kconfig-5 + kcoreaddons-5 + kdoctools-5 + ki18n-5 qtbase-5)) + (propagated-inputs '()) (arguments (list #:phases @@ -2102,18 +2957,12 @@ covers feedback and persistent events.") "")))) (add-before 'check 'check-setup (lambda _ - (setenv "HOME" (getcwd))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Installation and loading of additional content as packages") - (description "The Package framework lets the user install and load packages -of non binary content such as scripted extensions or graphic assets, as if they -were traditional plugins.") - (license (list license:gpl2+ license:lgpl2.1+)))) + (setenv "HOME" (getcwd))))))))) (define-public kpty (package (name "kpty") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2122,21 +2971,20 @@ were traditional plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "0fm7bfp89kvg1a64q8piiyal71p6vjnqcm13zak6r9fbfwcm0gs9")))) + "19m01phaca84n736sdh1d002vbfbhf7lzb8cf1wqrhaak0wrp933")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list kcoreaddons ki18n - ;; TODO: utempter, for managing UTMP entries - qtbase-5)) + ;; TODO: utempter, for managing UTMP entries + (list kcoreaddons ki18n qtbase)) (arguments (list #:tests? #f ; FIXME: 1/1 tests fail. #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-tests (lambda _ (substitute* "autotests/kptyprocesstest.cpp" - (("/bin/bash") + (("/bin/sh") (which "bash")))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Interfacing with pseudo terminal devices") @@ -2148,7 +2996,7 @@ and communicating with them using a pty.") (define-public kunitconversion (package (name "kunitconversion") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2157,13 +3005,13 @@ and communicating with them using a pty.") name "-" version ".tar.xz")) (sha256 (base32 - "1qyqvl8fy105zwma5nrkz9zg5932w2f33daw0azhj322iffrm39n")))) + "16q7jl86bc6y17xd6hyi6b506cpjx21jirlffkmz8ggzs0nz9cvx")))) (build-system cmake-build-system) - (arguments `(#:tests? #f)) ;; Requires network. (native-inputs (list extra-cmake-modules)) (inputs - (list ki18n qtbase-5)) + (list ki18n qtbase)) + (arguments `(#:tests? #f)) ;; Requires network. (home-page "https://community.kde.org/Frameworks") (synopsis "Converting physical units") (description "KUnitConversion provides functions to convert values in @@ -2175,7 +3023,7 @@ gallons).") (define-public syndication (package (name "syndication") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2184,12 +3032,12 @@ gallons).") name "-" version ".tar.xz")) (sha256 (base32 - "13rjb1zm9yd8vbm9h7avqih5v0rr2srqwglm29l7mcnankqlh4n7")))) + "1m68g7cm1cqkysb1yxnqnq9fcvjjp1kjl1s0j203jpp3kg05gw6d")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list kcodecs qtbase-5)) + (list kcodecs qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "RSS/Atom parser library") (description "@code{syndication} supports RSS (0.9/1.0, 0.91..2.0) and @@ -2207,7 +3055,7 @@ between feed formats.") (define-public baloo (package (name "baloo") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2216,7 +3064,7 @@ between feed formats.") name "-" version ".tar.xz")) (sha256 (base32 - "19sib1y0m5h2gnnpr9rfk810p6pdfm4zzxlm0a44r7910llp8i50")))) + "0r50alvnzkqmyhk9bfp1k1b6w6v3clb80z4bcag4f0wkipjrdbw7")))) (build-system cmake-build-system) (propagated-inputs (list kcoreaddons kfilemetadata)) @@ -2237,18 +3085,21 @@ between feed formats.") kwidgetsaddons kxmlgui lmdb - qtbase-5 - qtdeclarative-5 + qtbase + qtdeclarative solid)) (arguments - (list #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "DBUS_FATAL_WARNINGS" "0") - (setenv "HOME" - (getcwd)) - (invoke "dbus-launch" "ctest"))))))) + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "DBUS_FATAL_WARNINGS" "0") + (setenv "HOME" + (getcwd)) + (invoke "dbus-launch" "ctest" "-E" + ;; this require udisks2. + "filewatchtest"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "File searching and indexing") (description "Baloo provides file searching and indexing. It does so by @@ -2256,25 +3107,57 @@ maintaining an index of the contents of your files.") ;; dual licensed (license (list license:gpl2+ license:lgpl2.1+)))) -(define-public kactivities-stats +(define-public plasma-activities (package - (name "kactivities-stats") - (version "5.114.0") + (name "plasma-activities") + (version "6.1.2") (source (origin (method url-fetch) - (uri (string-append - "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) + (uri (string-append "mirror://kde/stable/plasma/" + version "/plasma-activities-" + version ".tar.xz")) + (sha256 + (base32 + "1nx6363l85f0c4f3l189cjfz4rbap2cq292v2136agdppl4gq0iy")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list boost + kconfig + kcoreaddons + kwindowsystem + qtdeclarative + solid)) + (arguments (list #:qtbase qtbase)) + (home-page "https://invent.kde.org/plasma/plasma-activities") + (synopsis "Core components for the KDE Activity System") + (description "KActivities provides the infrastructure needed to manage a +user's activities, allowing them to switch between tasks, and for applications +to update their state to match the user's current activity. This includes a +daemon, a library for interacting with that daemon, and plugins for integration +with other frameworks.") + ;; triple licensed + (license (list license:gpl2+ license:lgpl2.0+ license:lgpl2.1+)))) + +(define-public plasma-activities-stats + (package + (name "plasma-activities-stats") + (version "6.1.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" + version "/plasma-activities-stats-" + version ".tar.xz")) (sha256 (base32 - "1zhrs2p3c831rwx7ww87i82k5i236vfywdxv7zhz93k3vffyqby7")))) + "0yca3yb85hvl33ny09xvm67c3wih4nafrbfdgpf7fsrxy1jc75iq")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list boost kactivities kconfig qtbase-5 qtdeclarative-5)) - (home-page "https://community.kde.org/Frameworks") + (list boost plasma-activities kconfig qtbase qtdeclarative)) + (home-page "https://invent.kde.org/plasma/plasma-activities-stats") (synopsis "Access usage statistics collected by the activity manager") (description "The KActivitiesStats library provides a querying mechanism for the data that the activity manager collects---which documents have been opened @@ -2285,7 +3168,7 @@ by which applications, and what documents have been linked to which activity.") (define-public kbookmarks (package (name "kbookmarks") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2294,12 +3177,12 @@ by which applications, and what documents have been linked to which activity.") name "-" version ".tar.xz")) (sha256 (base32 - "06lnsyjhh80mdcqjww40glinmrjydbmkhv27a267vf34r7kam9rc")))) + "18gydjkjl9iwz5579xqw940d5w8by8ki7qli392w5c46mfm9sy7h")))) (build-system cmake-build-system) (propagated-inputs (list kwidgetsaddons)) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs (list kauth kcodecs @@ -2307,26 +3190,57 @@ by which applications, and what documents have been linked to which activity.") kconfigwidgets kcoreaddons kiconthemes + kcolorscheme kxmlgui - qtbase-5)) + qtdeclarative + qtbase)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - (setenv "HOME" (getcwd)) - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd)) + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen")))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Bookmarks management library") (description "KBookmarks lets you access and manipulate bookmarks stored using the XBEL format.") (license license:lgpl2.1+))) +(define-public kbookmarks-5 + (package + (inherit kbookmarks) + (name "kbookmarks") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "01cg6qsfjr59ncrxwmiid36cpzynjwxgfydgk23j29bk9gjml2jl")))) + (propagated-inputs + (list kwidgetsaddons-5)) + (native-inputs + (list extra-cmake-modules qttools-5)) + (inputs + (list kauth-5 + kcodecs-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kiconthemes-5 + kxmlgui-5 + qtbase-5)))) + (define-public kcmutils (package (name "kcmutils") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2335,10 +3249,58 @@ using the XBEL format.") name "-" version ".tar.xz")) (sha256 (base32 - "1pblf3c60m0gn3vhdprw28f8y54kij02jwz91r2vnmng8d1xkrp9")))) + "0h4fjav5r2hc8520yh5hwvxw982rad3sf9n1vjffbj93wj6b164r")))) (build-system cmake-build-system) (propagated-inputs - (list kconfigwidgets kservice)) + (list kconfigwidgets + kcoreaddons + qtdeclarative)) + (native-inputs + (list extra-cmake-modules + gettext-minimal + qttools + ;; required by kcmloadtest test + kirigami)) + (inputs + (list kio + kcompletion + kguiaddons + kiconthemes + kitemviews + ki18n + kcolorscheme + kwidgetsaddons + kxmlgui + qtbase)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Utilities for KDE System Settings modules") + (description "KCMUtils provides various classes to work with KCModules. +KCModules can be created with the KConfigWidgets framework.") + (license license:lgpl2.1+))) + +(define-public kcmutils-5 + (package + (inherit kcmutils) + (name "kcmutils") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "06aw308wv3fyl1g60n1i2hxx74f0isdsfwwzidsjk79danyqsa4i")))) + (propagated-inputs + (list kconfigwidgets-5 kservice-5)) (native-inputs (list extra-cmake-modules)) (arguments @@ -2364,30 +3326,25 @@ using the XBEL format.") (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen")))))) (inputs - (list kauth - kcodecs - kconfig - kcoreaddons - kdeclarative - kguiaddons - kiconthemes - kitemviews - ki18n - kpackage - kwidgetsaddons - kxmlgui + (list kauth-5 + kcodecs-5 + kconfig-5 + kcoreaddons-5 + kdeclarative-5 + kguiaddons-5 + kiconthemes-5 + kitemviews-5 + ki18n-5 + kpackage-5 + kwidgetsaddons-5 + kxmlgui-5 qtbase-5 - qtdeclarative-5)) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Utilities for KDE System Settings modules") - (description "KCMUtils provides various classes to work with KCModules. -KCModules can be created with the KConfigWidgets framework.") - (license license:lgpl2.1+))) + qtdeclarative-5)))) (define-public kconfigwidgets (package (name "kconfigwidgets") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2396,21 +3353,22 @@ KCModules can be created with the KConfigWidgets framework.") name "-" version ".tar.xz")) (sha256 (base32 - "16layydkcwfbvzxqjzprkq8bbxifn0z0wm7mc9bzwrfxy761rjnj")))) + "14104r6j38kjqmvx3d66xm4amdbdxl1450257l6zlf9wp1lndj5s")))) (build-system qt-build-system) (propagated-inputs - (list kauth kcodecs kconfig kwidgetsaddons)) + (list kcodecs kconfig kcolorscheme kwidgetsaddons)) (native-inputs - (list extra-cmake-modules kdoctools qttools-5)) + (list extra-cmake-modules kdoctools qttools)) (inputs (list kcoreaddons kguiaddons ki18n ;; todo: PythonModuleGeneration - qtbase-5 - qttools-5)) + qtdeclarative + libxkbcommon)) (arguments (list + #:qtbase qtbase #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch @@ -2424,7 +3382,8 @@ KCModules can be created with the KConfigWidgets framework.") (when tests? (setenv "HOME" (getcwd)) - (invoke "ctest" "-E" "kstandardactiontest"))))))) + (invoke "ctest" "-E" "(kstandardactiontest|\ +klanguagenametest)"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Widgets for configuration dialogs") (description "KConfigWidgets provides easy-to-use classes to create @@ -2433,10 +3392,50 @@ their settings.") ;; dual licensed (license (list license:gpl2+ license:lgpl2.1+)))) +(define-public kconfigwidgets-5 + (package + (inherit kconfigwidgets) + (name "kconfigwidgets") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1f65ayyyadiajf7xgf7369rly2yzigh6gqlb0nkgg8cp2bq9fmp4")))) + (propagated-inputs + (list kauth-5 kcodecs-5 kconfig-5 kwidgetsaddons-5)) + (native-inputs + (list extra-cmake-modules kdoctools-5 qttools-5)) + (inputs + (list kcoreaddons-5 + kguiaddons-5 + ;; todo: PythonModuleGeneration + ki18n-5)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "src/khelpclient.cpp" + ;; make QDirIterator follow symlinks + (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) + (string-append a " | QDirIterator::FollowSymlinks" b))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" + (getcwd)) + (invoke "ctest" "-E" "kstandardactiontest"))))))))) + (define-public kdeclarative (package (name "kdeclarative") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2445,29 +3444,63 @@ their settings.") name "-" version ".tar.xz")) (sha256 (base32 - "0w98pj8acxb4m9645963rzq5vja1fbih5czz24mf9zdqlg2dkz8g")))) + "1kkdlkavd3v60sihxvlqxw2fmv1szf04llffhm0db7kmhz286zc0")))) (build-system cmake-build-system) (propagated-inputs - (list kconfig kpackage qtdeclarative-5)) + (list kconfig qtdeclarative)) (native-inputs - (list dbus extra-cmake-modules pkg-config xorg-server-for-tests)) + (list extra-cmake-modules)) (inputs - (list kauth - kcoreaddons - kglobalaccel + (list kglobalaccel kguiaddons - kiconthemes - kio ki18n - kjobwidgets - knotifications - kservice kwidgetsaddons - kwindowsystem + qtshadertools + qtbase)) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Integration of QML and KDE work spaces") + (description "KDeclarative provides integration of QML and KDE work spaces. +It's comprises two parts: a library used by the C++ part of your application to +intergrate QML with KDE Frameworks specific features, and a series of QML imports +that offer bindings to some of the Frameworks.") + ;; dual licensed + (license (list license:gpl2+ license:lgpl2.1+)))) + +(define-public kdeclarative-5 + (package + (inherit kdeclarative) + (name "kdeclarative") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0py5x9ia8p7ngk1q3nqwqi1b9zv6jdxc23qam8xyqbfjqcm9qzwy")))) + (propagated-inputs + (list kconfig-5 kpackage-5 qtdeclarative-5)) + (native-inputs + (list dbus extra-cmake-modules pkg-config xorg-server-for-tests)) + (inputs + (list kauth-5 + kcoreaddons-5 + kglobalaccel-5 + kguiaddons-5 + kiconthemes-5 + kio-5 + ki18n-5 + kjobwidgets-5 + knotifications-5 + kservice-5 + kwidgetsaddons-5 + kwindowsystem-5 libepoxy qtbase-5 qtdeclarative-5 - solid)) + solid-5)) (arguments (list #:phases #~(modify-phases %standard-phases @@ -2486,20 +3519,12 @@ their settings.") (getcwd)) (setenv "QT_QPA_PLATFORM" "offscreen") (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "ctest"))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Integration of QML and KDE work spaces") - (description "KDeclarative provides integration of QML and KDE work spaces. -It's comprises two parts: a library used by the C++ part of your application to -intergrate QML with KDE Frameworks specific features, and a series of QML imports -that offer bindings to some of the Frameworks.") - ;; dual licensed - (license (list license:gpl2+ license:lgpl2.1+)))) + (invoke "dbus-launch" "ctest"))))))))) (define-public kded (package (name "kded") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2508,7 +3533,7 @@ that offer bindings to some of the Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "00n4isc4ahii0ldrg761lkmnq27kmrfqs9zkmpvmgbg57259mvc3")))) + "0j2y4gk7vaqwia8kpk2glfch84rpwrcbjfksvw9bmdhip9ffbcyl")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -2519,7 +3544,7 @@ that offer bindings to some of the Frameworks.") kdbusaddons kdoctools kservice - qtbase-5)) + qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Central daemon of KDE work spaces") (description "KDED stands for KDE Daemon. KDED runs in the background and @@ -2528,6 +3553,31 @@ started on demand.") ;; dual licensed (license (list license:lgpl2.0+ license:lgpl2.1+)))) +(define-public kded-5 + (package + (inherit kded) + (name "kded") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0gd0dy748zw12xksk7xmv1xkra2g9s3av4d0i1d7dbb6z1ap5djw")))) + (native-inputs + (list extra-cmake-modules kdoctools-5)) + (inputs + (list kconfig-5 + kcoreaddons-5 + kcrash-5 + kdbusaddons-5 + kdoctools-5 + kservice-5 + qtbase-5)))) + (define-public kdesignerplugin (package (name "kdesignerplugin") @@ -2560,7 +3610,7 @@ ini-style description files.") (define-public kdesu (package (name "kdesu") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2569,14 +3619,16 @@ ini-style description files.") name "-" version ".tar.xz")) (sha256 (base32 - "14dcf32izn4lxr8vx372rfznflc1rcxwanx06phkd8mx9zyg4jxr")))) + "1pp7m4k42wv1m9wy83ysnv1j0nji7py668320xwpfirkh6hhb6d3")))) (build-system cmake-build-system) (propagated-inputs (list kpty)) (native-inputs (list extra-cmake-modules)) (inputs - (list kconfig kcoreaddons ki18n kservice qtbase-5)) + (list kconfig kcoreaddons ki18n kservice qtbase)) + ;; FIXME: kdesutest test fail. + (arguments (list #:tests? #f)) (home-page "https://community.kde.org/Frameworks") (synopsis "User interface for running shell commands with root privileges") (description "KDESU provides functionality for building GUI front ends for @@ -2587,7 +3639,7 @@ with su and ssh respectively.") (define-public kemoticons (package (name "kemoticons") - (version "5.114.0") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append @@ -2596,14 +3648,14 @@ with su and ssh respectively.") name "-" version ".tar.xz")) (sha256 (base32 - "0w87prkhdmba7y8ylbycdpwdzd2djmp7hvv5ljb9s4aqqhnn3vw4")))) + "0lv8cb7h7v4fbf8vyrsf9kygnhjxznf5sj92nv5is5gy0wdk8qxc")))) (build-system cmake-build-system) (propagated-inputs - (list kservice)) + (list kservice-5)) (native-inputs (list extra-cmake-modules)) (inputs - (list karchive kconfig kcoreaddons qtbase-5)) + (list karchive-5 kconfig-5 kcoreaddons-5 qtbase-5)) (arguments (list #:phases #~(modify-phases %standard-phases (add-before 'check 'check-setup @@ -2623,7 +3675,7 @@ emoticons coming from different providers.") (define-public kglobalaccel (package (name "kglobalaccel") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2632,20 +3684,18 @@ emoticons coming from different providers.") name "-" version ".tar.xz")) (sha256 (base32 - "19mmav055fnzyl760fyhf0pdvaidd5i1h04l2hcnpin4p1jnpfap")))) + "1wcx0b3vi5xm5hhyylkdrcq8i46m49lw1j53m2i2f4nv7750d0n0")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules pkg-config qttools-5)) + (list extra-cmake-modules pkg-config qttools)) (inputs (list kconfig kcrash kcoreaddons kdbusaddons kwindowsystem - qtbase-5 - qtx11extras - qtdeclarative-5 - xcb-util-keysyms)) + qtdeclarative)) + (arguments (list #:qtbase qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Global desktop keyboard shortcuts") (description "KGlobalAccel allows you to have global accelerators that are @@ -2653,10 +3703,37 @@ independent of the focused window. Unlike regular shortcuts, the application's window does not need focus for them to be activated.") (license license:lgpl2.1+))) +(define-public kglobalaccel-5 + (package + (inherit kglobalaccel) + (name "kglobalaccel") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0rlqclaq4szzqa2kz7c9ad81rm0b2byr806l5v0xz968h8jampzn")))) + (native-inputs + (list extra-cmake-modules pkg-config qttools-5)) + (inputs + (list kconfig-5 + kcrash-5 + kcoreaddons-5 + kdbusaddons-5 + kwindowsystem-5 + qtx11extras + qtdeclarative-5 + xcb-util-keysyms)) + (arguments '()))) + (define-public kiconthemes (package (name "kiconthemes") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2665,20 +3742,67 @@ window does not need focus for them to be activated.") name "-" version ".tar.xz")) (sha256 (base32 - "0ndiqmcs1ybj4acc6k3p9jwq09slqc4nj12ifqvlxrfj3ak6sb28")))) + "00y3gjrplxk29l0f11yf7d9cszzf7ggady87pwj7j87qr6pr8lwl")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools-5 shared-mime-info)) + (list extra-cmake-modules qttools shared-mime-info)) (inputs - (list karchive + (list libxkbcommon + karchive kauth kcodecs + kcolorscheme kcoreaddons kconfig kconfigwidgets ki18n kitemviews kwidgetsaddons + qtbase + qtdeclarative + qtsvg + breeze-icons)) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda* (#:key inputs #:allow-other-keys) + (setenv "HOME" (getcwd)) + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Icon GUI utilities") + (description "This library contains classes to improve the handling of icons +in applications using the KDE Frameworks.") + (license license:lgpl2.1+))) + +(define-public kiconthemes-5 + (package + (inherit kiconthemes) + (name "kiconthemes") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0q859zbjys7lajwpgl78ji4dif7cxdxirqb8b6f7k7bk53ignvly")))) + (build-system cmake-build-system) + (native-inputs + (list extra-cmake-modules qttools-5 shared-mime-info)) + (inputs + (list karchive-5 + kauth-5 + kcodecs-5 + kcoreaddons-5 + kconfig-5 + kconfigwidgets-5 + ki18n-5 + kitemviews-5 + kwidgetsaddons-5 qtbase-5 qtdeclarative-5 qtsvg-5)) @@ -2693,17 +3817,12 @@ window does not need focus for them to be activated.") "/share")) (setenv "HOME" (getcwd)) ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen")))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Icon GUI utilities") - (description "This library contains classes to improve the handling of icons -in applications using the KDE Frameworks.") - (license license:lgpl2.1+))) + (setenv "QT_QPA_PLATFORM" "offscreen")))))))) (define-public kinit (package (name "kinit") - (version "5.114.0") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append @@ -2712,7 +3831,7 @@ in applications using the KDE Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "0b6z9gq05vz20hm5y9ai3sbqq3gxwm3a3z88dkvi7dywk7vbqcph")) + "0b5w7pk7wbyzix2jvn3yk89f9r620wrx55v3cgvj4p83c73ar974")) ;; Use the store paths for other packages and dynamically loaded ;; libs (patches (search-patches "kinit-kdeinit-extra_libs.patch")))) @@ -2736,29 +3855,29 @@ in applications using the KDE Frameworks.") (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list kauth - kbookmarks - kcodecs - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kcrash - kdbusaddons - kdoctools - kio - kitemviews - ki18n - kjobwidgets - kparts - kservice - kwidgetsaddons - kwindowsystem - kxmlgui + (list kauth-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kcrash-5 + kdbusaddons-5 + kdoctools-5 + kio-5 + kitemviews-5 + ki18n-5 + kjobwidgets-5 + kparts-5 + kservice-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 libcap ; to install start_kdeinit with CAP_SYS_RESOURCE plasma-framework qtbase-5 - solid)) + solid-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Library to speed up start of applications on KDE workspaces") (description "Kdeinit is a process launcher similar to init used for booting @@ -2769,10 +3888,13 @@ consumption.") ;; dual licensed (license (list license:lgpl2.0+ license:lgpl2.1+)))) +(define kinit-bootstrap + ((package-input-rewriting `((,kdbusaddons-5 . ,kdbusaddons-5-bootstrap))) kinit)) + (define-public kio (package (name "kio") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2781,7 +3903,7 @@ consumption.") name "-" version ".tar.xz")) (sha256 (base32 - "0nwmxbfhvfw69q07vxvflri7rkdczyc89xv4ll3nrzrhgf15kb2z")) + "0j04kbbmjlbv2qhra5src6zxx1m8imix9hb0kih0b5h64jrszq9r")) (patches (search-patches "kio-search-smbd-on-PATH.patch")))) (build-system cmake-build-system) (propagated-inputs @@ -2794,12 +3916,10 @@ consumption.") kjobwidgets kservice kwindowsystem - kxmlgui solid)) (native-inputs - (list extra-cmake-modules dbus kdoctools qttools-5)) - (inputs (list mit-krb5 - karchive + (list extra-cmake-modules dbus kdoctools qttools)) + (inputs (list karchive kauth kcodecs kconfigwidgets @@ -2809,17 +3929,130 @@ consumption.") kguiaddons kiconthemes ki18n - knotifications - ktextwidgets kwallet kwidgetsaddons libxml2 libxslt + qt5compat + qtbase + qtdeclarative + libxkbcommon + sonnet + `(,util-linux "lib") ; libmount + zlib)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + ;; Better error message (taken from NixOS) + (substitute* "src/kiod/kiod_main.cpp" + (("(^\\s*qCWarning(KIOD_CATEGORY) << \ +\"Error loading plugin:\")( << loader.errorString();)" _ a b) + (string-append a "<< name" b))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (setenv "XDG_RUNTIME_DIR" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "ctest" + "--rerun-failed" "--output-on-failure" + "-E" + + (string-append + "(kiogui-favicontest" + "|kiocore-filefiltertest" + "|kpasswdservertest" + "|kiowidgets-kfileitemactionstest" + "|kiofilewidgets-kfileplacesmodeltest" + ;; The following tests fail or are flaky (see: + ;; https://bugs.kde.org/show_bug.cgi?id=440721). + "|kiocore-jobtest" + "|kiocore-kmountpointtest" + "|kiowidgets-kdirlistertest" + "|kiocore-kfileitemtest" + "|kiocore-ktcpsockettest" + "|kiocore-mimetypefinderjobtest" + "|kiocore-krecentdocumenttest" + "|kiocore-http_jobtest" + "|kiogui-openurljobtest" + "|kioslave-httpheaderdispositiontest" + "|applicationlauncherjob_forkingtest" + "|applicationlauncherjob_scopetest" + "|applicationlauncherjob_servicetest" + "|commandlauncherjob_forkingtest" + "|commandlauncherjob_scopetest" + "|commandlauncherjob_servicetest" + "|kiowidgets-kdirmodeltest" + "|kiowidgets-kurifiltertest-colon-separator" + "|kiofilewidgets-kfilewidgettest" + "|kiowidgets-kurifiltertest-space-separator" + "|kioworker-httpheaderdispositiontest)")))))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Network transparent access to files and data") + (description "This framework implements a lot of file management functions. +It supports accessing files locally as well as via HTTP and FTP out of the box +and can be extended by plugins to support other protocols as well. There is a +variety of plugins available, e.g. to support access via SSH. The framework can +also be used to bridge a native protocol to a file-based interface. This makes +the data accessible in all applications using the KDE file dialog or any other +KIO enabled infrastructure.") + (license license:lgpl2.1+))) + +(define-public kio-5 + (package + (inherit kio) + (name "kio") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0nhins85cqlr3xz4xi0g54rshagphin3pjjx2qxs0fcwcpb1kdzg")) + (patches (search-patches "kio-search-smbd-on-PATH.patch")))) + (propagated-inputs + (list acl + kbookmarks-5 + kconfig-5 + kcompletion-5 + kcoreaddons-5 + kitemviews-5 + kjobwidgets-5 + kservice-5 + kwindowsystem-5 + kxmlgui-5 + solid-5)) + (native-inputs + (list extra-cmake-modules dbus kdoctools-5 qttools-5)) + (inputs (list mit-krb5 + karchive-5 + kauth-5 + kcodecs-5 + kconfigwidgets-5 + kcrash-5 + kdbusaddons-5 + kded-5 + kguiaddons-5 + kiconthemes-5 + ki18n-5 + knotifications-5 + ktextwidgets-5 + kwallet-5 + kwidgetsaddons-5 + libxml2 + libxslt qtbase-5 qtdeclarative-5 qtscript qtx11extras - sonnet + sonnet-5 `(,util-linux "lib") ; libmount zlib)) (arguments @@ -2867,28 +4100,15 @@ consumption.") "|kiowidgets-kurifiltertest-space-separator" "|kioworker-httpheaderdispositiontest)"))))) (add-after 'install 'add-symlinks - ;; Some package(s) (e.g. bluedevil) refer to these service types by - ;; the wrong name. I would prefer to patch those packages, but I - ;; cannot find the files! (lambda* (#:key outputs #:allow-other-keys) (let ((kst5 (string-append #$output "/share/kservicetypes5/"))) (symlink (string-append kst5 "kfileitemactionplugin.desktop") - (string-append kst5 "kfileitemaction-plugin.desktop")))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Network transparent access to files and data") - (description "This framework implements a lot of file management functions. -It supports accessing files locally as well as via HTTP and FTP out of the box -and can be extended by plugins to support other protocols as well. There is a -variety of plugins available, e.g. to support access via SSH. The framework can -also be used to bridge a native protocol to a file-based interface. This makes -the data accessible in all applications using the KDE file dialog or any other -KIO enabled infrastructure.") - (license license:lgpl2.1+))) + (string-append kst5 "kfileitemaction-plugin.desktop")))))))))) (define-public knewstuff (package (name "knewstuff") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2897,41 +4117,31 @@ KIO enabled infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "15xmx7rnnrsz2cj044aviyr4hi9h8r0nnva9qzcjcq2hkkgj7wjj")))) + "1mv7v4r902q2mgr377mg5c2y6aapg32p385ildcm3jwl5sr1cvd1")))) (build-system cmake-build-system) (propagated-inputs - (list attica kservice kxmlgui)) + (list attica + kcoreaddons)) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs (list karchive - kauth - kbookmarks - kcodecs - kcompletion kconfig - kconfigwidgets - kcoreaddons - kio - kitemviews + kirigami ki18n - kiconthemes - kjobwidgets kpackage - ktextwidgets kwidgetsaddons - qtbase-5 - qtdeclarative-5 - solid - sonnet)) + qtbase + qtdeclarative + syndication)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ ; XDG_DATA_DIRS isn't set - (setenv "HOME" (getcwd)) - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (list #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ ; XDG_DATA_DIRS isn't set + (setenv "HOME" (getcwd)) + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen")))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Framework for downloading and sharing additional application data") (description "The KNewStuff library implements collaborative data sharing @@ -2939,10 +4149,50 @@ for applications. It uses libattica to support the Open Collaboration Services specification.") (license license:lgpl2.1+))) +(define-public knewstuff-5 + (package + (inherit knewstuff) + (name "knewstuff") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "02n7429ldkyyzbk9rbr9h4ss80zhc3vnir29q2yksyhcyqkkjc42")))) + (propagated-inputs + (list attica-5 kservice-5 kxmlgui-5)) + (native-inputs + (list extra-cmake-modules qttools-5)) + (inputs + (list karchive-5 + kauth-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kio-5 + kitemviews-5 + ki18n-5 + kiconthemes-5 + kjobwidgets-5 + kpackage-5 + ktextwidgets-5 + kwidgetsaddons-5 + qtbase-5 + qtdeclarative-5 + solid-5 + sonnet-5)))) + (define-public knotifyconfig (package (name "knotifyconfig") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2951,7 +4201,7 @@ specification.") name "-" version ".tar.xz")) (sha256 (base32 - "049n64qlr69zv1dc1dhgbsca37179hp06xfsxnhg97lblz3p3gds")))) + "0paj00lsqlk40xwkhm0z7hims22mknp8m1cs5sqssgp5a5g6zwpb")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -2972,7 +4222,7 @@ specification.") kwidgetsaddons kxmlgui phonon - qtbase-5 + qtbase solid)) (home-page "https://community.kde.org/Frameworks") (synopsis "Configuration dialog for desktop notifications") @@ -2981,10 +4231,46 @@ notifications which can be embedded in your application.") ;; dual licensed (license (list license:lgpl2.0+ license:lgpl2.1+)))) +(define-public knotifyconfig-5 + (package + (inherit knotifyconfig) + (name "knotifyconfig") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0zwrcdl565nlzf6q2zljq6xn8929frrhqr8jlmb6kcv5i93yals0")))) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list kauth-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kio-5 + kitemviews-5 + ki18n-5 + kjobwidgets-5 + knotifications-5 + kservice-5 + kwidgetsaddons-5 + kxmlgui-5 + phonon + qtbase-5 + solid-5)))) + (define-public kparts (package (name "kparts") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2993,48 +4279,78 @@ notifications which can be embedded in your application.") name "-" version ".tar.xz")) (sha256 (base32 - "1rrf765p554r7l8j23gx5zxdq6wimh0v91qdkwz7ilm2qr16vd5v")))) + "0004ln6fby8jgx6j27qlhmlagxy7c70akn0kayfqi6glfdk2gz22")))) (build-system qt-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-partloader-test - (lambda _ - (substitute* "autotests/CMakeLists.txt" - ;; XXX: PartLoaderTest wants to create a .desktop file - ;; in the common locations and test that MIME types work. - ;; The setup required for this is extensive, skip for now. - (("partloadertest\\.cpp") ""))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-partloader-test + (lambda _ + (substitute* "autotests/CMakeLists.txt" + ;; XXX: PartLoaderTest wants to create a .desktop file + ;; in the common locations and test that MIME types work. + ;; The setup required for this is extensive, skip for now. + (("partloadertest\\.cpp") ""))))))) (propagated-inputs - (list kio ktextwidgets kxmlgui)) + (list kio kservice kxmlgui)) (native-inputs (list extra-cmake-modules shared-mime-info)) (inputs - (list kauth - kbookmarks - kcodecs - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kiconthemes - kitemviews - ki18n - kjobwidgets - kservice - kwidgetsaddons - qtbase-5 - solid - sonnet)) + (list + kcompletion + kconfig + kcoreaddons + kitemviews + ki18n + kjobwidgets + kwidgetsaddons + qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Plugin framework for user interface components") (description "This library implements the framework for KDE parts, which are widgets with a user-interface defined in terms of actions.") (license license:lgpl2.1+))) +(define-public kparts-5 + (package + (inherit kparts) + (name "kparts") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0czrlqh5cxnj1mlbz839c7hifhnpzl476d92lv4hxji50wnjlfqr")))) + (propagated-inputs + (list kio-5 ktextwidgets-5 kxmlgui-5)) + (native-inputs + (list extra-cmake-modules shared-mime-info)) + (inputs + (list kauth-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kiconthemes-5 + kitemviews-5 + ki18n-5 + kjobwidgets-5 + kservice-5 + kwidgetsaddons-5 + qtbase-5 + solid-5 + sonnet-5)))) + (define-public kpeople (package (name "kpeople") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3043,7 +4359,7 @@ widgets with a user-interface defined in terms of actions.") name "-" version ".tar.xz")) (sha256 (base32 - "04v0s3amn6lbb16qvp1r6figckva6xk8z7djk8jda8fbnx8dx2r1")))) + "0gihf93jjy3qc02h9qjnxjp67jb38rahx5f1k1hm9pxcasg9fzwn")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -3053,11 +4369,12 @@ widgets with a user-interface defined in terms of actions.") kitemviews ki18n kservice + kcontacts kwidgetsaddons - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (arguments - `(#:tests? #f)) ; FIXME: 1/3 tests fail. + (list #:qtbase qtbase + #:tests? #f)) ; FIXME: 1/3 tests fail. (home-page "https://community.kde.org/Frameworks") (synopsis "Provides access to all contacts and aggregates them by person") (description "KPeople offers unified access to our contacts from different @@ -3070,7 +4387,7 @@ to easily extend the contacts collection.") (define-public krunner (package (name "krunner") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3079,9 +4396,52 @@ to easily extend the contacts collection.") name "-" version ".tar.xz")) (sha256 (base32 - "1rjs9b87bi4f6pdm9fwnha2sj2mrq260l80iz2jq1zah83p546sw")))) + "09g464v1v7c14m39ic3qpny10l4dnazr7fax76irs3dwr54zx9kc")))) (build-system qt-build-system) (propagated-inputs + (list kcoreaddons)) + (native-inputs + (list extra-cmake-modules + ;; For tests. + dbus)) + (inputs + (list kconfig + kitemmodels + ki18n + qtdeclarative)) + (arguments + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (invoke "dbus-launch" "ctest"))))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Framework for Plasma runners") + (description "The Plasma workspace provides an application called KRunner +which, among other things, allows one to type into a text area which causes +various actions and information that match the text appear as the text is being +typed.") + (license license:lgpl2.1+))) + +(define-public krunner-5 + (package + (inherit krunner) + (name "krunner") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0h889a4bj7vqhvy9hkqxd9v437zly73phyav10gv5b2l8fgb4zxq")))) + (propagated-inputs (list plasma-framework)) (native-inputs (list extra-cmake-modules @@ -3089,25 +4449,25 @@ to easily extend the contacts collection.") dbus)) (inputs (list kactivities - kauth - kbookmarks - kcodecs - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kio - kitemviews - ki18n - kjobwidgets - kpackage - kservice - kwidgetsaddons - kwindowsystem - kxmlgui + kauth-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kio-5 + kitemviews-5 + ki18n-5 + kjobwidgets-5 + kpackage-5 + kservice-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 qtdeclarative-5 - solid - threadweaver)) + solid-5 + threadweaver-5)) (arguments (list #:phases @@ -3126,19 +4486,12 @@ to easily extend the contacts collection.") (when tests? (setenv "HOME" (getcwd)) (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "dbus-launch" "ctest"))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Framework for Plasma runners") - (description "The Plasma workspace provides an application called KRunner -which, among other things, allows one to type into a text area which causes -various actions and information that match the text appear as the text is being -typed.") - (license license:lgpl2.1+))) + (invoke "dbus-launch" "ctest"))))))))) (define-public kservice (package (name "kservice") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3147,37 +4500,43 @@ typed.") name "-" version ".tar.xz")) (sha256 (base32 - "0jdvlplnsb9w628wh3ip6awxvhgyc097zh7ls9614ymkbnpc9xca")))) + "0m7ym2hzsw1aylrinqmq88912mi89j0wyffb1lxjkwp0q5i4smm0")))) (build-system cmake-build-system) (propagated-inputs (list kconfig kcoreaddons kdoctools)) (native-inputs (list bison extra-cmake-modules flex shared-mime-info)) (inputs - (list kcrash kdbusaddons kdoctools ki18n qtbase-5)) + (list kcrash kdbusaddons kdoctools ki18n qtbase qtdeclarative)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch - ;; Adopted from NixOS' patches "qdiriterator-follow-symlinks" and - ;; "no-canonicalize-path". - (lambda _ - (substitute* "src/sycoca/kbuildsycoca.cpp" - ;; make QDirIterator follow symlinks - (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) - (string-append a " | QDirIterator::FollowSymlinks" b))) - (substitute* "src/sycoca/vfolder_menu.cpp" - ;; Normalize path, but don't resolve symlinks (taken from - ;; NixOS) - (("^\\s*QString resolved = QDir\\(dir\\)\\.canonicalPath\\(\\);") - "QString resolved = QDir::cleanPath(dir);")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" (getcwd)) - (setenv "QT_QPA_PLATFORM" "offscreen") - ;; Disable failing tests. - (invoke "ctest" "-E" "(kautostarttest|ksycocatest|kapplicationtradertest)"))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + ;; Adopted from NixOS' patches "qdiriterator-follow-symlinks" and + ;; "no-canonicalize-path". + (lambda _ + (substitute* "src/sycoca/kbuildsycoca.cpp" + ;; make QDirIterator follow symlinks + (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) + (string-append a " | QDirIterator::FollowSymlinks" b))) + (substitute* "src/sycoca/vfolder_menu.cpp" + ;; Normalize path, but don't resolve symlinks (taken from + ;; NixOS) + (("^\\s*QString resolved = QDir\\(dir\\)\\.canonicalPath\\(\\);") + "QString resolved = QDir::cleanPath(dir);")))) + (add-before 'check 'check-setup + (lambda _ + (with-output-to-file "autotests/BLACKLIST" + (lambda _ + (for-each + (lambda (name) (display (string-append "[" name "]\n*\n"))) + (list "extraFileInFutureShouldRebuildSycocaOnce" + "testNonReadableSycoca")))) + (setenv "XDG_RUNTIME_DIR" (getcwd)) + (setenv "HOME" (getcwd)) + ;; Make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen")))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Plugin framework for desktop services") (description "KService provides a plugin framework for handling desktop @@ -3186,10 +4545,77 @@ types or handled by application specific code.") ;; triple licensed (license (list license:gpl2+ license:gpl3+ license:lgpl2.1+)))) +(define-public kservice-5 + (package + (inherit kservice) + (name "kservice") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0sd8yj9a1ja97c515g9shjqyzdz0jd7rn3r06g5659nh2z1w5dsj")))) + (propagated-inputs + (list kconfig-5 kcoreaddons-5 kdoctools-5)) + (native-inputs + (list bison extra-cmake-modules flex shared-mime-info)) + (inputs + (list kcrash-5 kdbusaddons-5 kdoctools-5 ki18n-5 qtbase-5)) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + ;; Adopted from NixOS' patches "qdiriterator-follow-symlinks" and + ;; "no-canonicalize-path". + (lambda _ + (substitute* "src/sycoca/kbuildsycoca.cpp" + ;; make QDirIterator follow symlinks + (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) + (string-append a " | QDirIterator::FollowSymlinks" b))) + (substitute* "src/sycoca/vfolder_menu.cpp" + ;; Normalize path, but don't resolve symlinks (taken from + ;; NixOS) + (("^\\s*QString resolved = QDir\\(dir\\)\\.canonicalPath\\(\\);") + "QString resolved = QDir::cleanPath(dir);")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + ;; Disable failing tests. + (invoke "ctest" "-E" "(kautostarttest|ksycocatest|kapplicationtradertest)"))))))))) + +(define-public kstatusnotifieritem + (package + (name "kstatusnotifieritem") + (version "6.3.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1n4c761xgr9xbcwkw5q3l3v38wmanyvpf284y141ms6vs0rjw7yf")))) + (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) + (native-inputs (list extra-cmake-modules qttools)) + (inputs (list kwindowsystem libxkbcommon)) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Implementation of Status Notifier Items") + (description "This package provides a Implementation of Status Notifier +Items.") + (license (list license:cc0 license:lgpl2.0+)))) + (define-public ktexteditor (package (name "ktexteditor") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3198,7 +4624,7 @@ types or handled by application specific code.") "ktexteditor-" version ".tar.xz")) (sha256 (base32 - "06amzk6290imi2gj3v1k3f56zdlad7zbz4wwlf34v4iibj9mfgw8")))) + "0xip50g976s9h6196nlgpzc1wvmyl051iyjyfjri610axgxbz7cp")))) (build-system cmake-build-system) (propagated-inputs (list kparts @@ -3209,52 +4635,27 @@ types or handled by application specific code.") (list editorconfig-core-c karchive kauth - kbookmarks - kcodecs kcompletion - kconfig kconfigwidgets - kcoreaddons + kcolorscheme kguiaddons - kiconthemes - kio kitemviews ki18n - kjobwidgets - kparts - kservice ktextwidgets kwidgetsaddons kxmlgui - libgit2 - perl - qtbase-5 - qtdeclarative-5 - qtscript - qtxmlpatterns - solid + qtbase + qtdeclarative + qtspeech sonnet)) (arguments (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'setup - (lambda* (#:key inputs #:allow-other-keys) - (setenv "XDG_DATA_DIRS" ; FIXME build phase doesn't find parts.desktop - (string-append #$(this-package-input "kparts") "/share")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? ;; Maybe locale issues with tests? - (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "ctest" "-E" "(kateview_test|movingrange_test)")))) - (add-after 'install 'add-symlinks - ;; Some package(s) (e.g. plasma-sdk) refer to these service types - ;; by the wrong name. I would prefer to patch those packages, but - ;; I cannot find the files! - (lambda* (#:key outputs #:allow-other-keys) - (let ((kst5 (string-append #$output - "/share/kservicetypes5/"))) - (symlink (string-append kst5 "ktexteditorplugin.desktop") - (string-append kst5 "ktexteditor-plugin.desktop")))))))) + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? ;; Maybe locale issues with tests? + (setenv "QT_QPA_PLATFORM" "offscreen") + (invoke "ctest" "-E" "(kateview_test|movingrange_test)"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Full text editor component") (description "KTextEditor provides a powerful text editor component that you @@ -3263,10 +4664,80 @@ library.") ;; triple licensed (license (list license:gpl2+ license:lgpl2.0+ license:lgpl2.1+)))) +(define-public ktexteditor-5 + (package + (inherit ktexteditor) + (name "ktexteditor") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + "ktexteditor-" version ".tar.xz")) + (sha256 + (base32 + "0rph5nwp7d02xicjxrqpbz3kjb9kqqa40pp1w81fnq8jgln3hhh5")))) + (propagated-inputs + (list kparts-5 + ksyntaxhighlighting-5)) + (native-inputs + (list extra-cmake-modules pkg-config)) + (inputs + (list editorconfig-core-c + karchive-5 + kauth-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kguiaddons-5 + kiconthemes-5 + kio-5 + kitemviews-5 + ki18n-5 + kjobwidgets-5 + kparts-5 + kservice-5 + ktextwidgets-5 + kwidgetsaddons-5 + kxmlgui-5 + libgit2 + perl + qtbase-5 + qtdeclarative-5 + qtscript + qtxmlpatterns + solid-5 + sonnet-5)) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'setup + (lambda* (#:key inputs #:allow-other-keys) + (setenv "XDG_DATA_DIRS" ; FIXME build phase doesn't find parts.desktop + (string-append #$(this-package-input "kparts") "/share")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? ;; Maybe locale issues with tests? + (setenv "QT_QPA_PLATFORM" "offscreen") + (invoke "ctest" "-E" "(kateview_test|movingrange_test)")))) + (add-after 'install 'add-symlinks + ;; Some package(s) (e.g. plasma-sdk) refer to these service types + ;; by the wrong name. I would prefer to patch those packages, but + ;; I cannot find the files! + (lambda* (#:key outputs #:allow-other-keys) + (let ((kst5 (string-append #$output + "/share/kservicetypes5/"))) + (symlink (string-append kst5 "ktexteditorplugin.desktop") + (string-append kst5 "ktexteditor-plugin.desktop")))))))))) + (define-public ktextwidgets (package (name "ktextwidgets") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3275,12 +4746,12 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "0w1wwyd3fy351rmkhf3i55is5031j2zxvswm0b1sb3pd159v888v")))) + "0piqskblzi79wmza9z9qh0hc9vsihp5jdxsv7kspymdswspbb7wy")))) (build-system qt-build-system) (propagated-inputs (list ki18n sonnet)) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs (list kauth kcodecs @@ -3292,8 +4763,8 @@ library.") kservice kwidgetsaddons kwindowsystem - qtbase-5 - qtspeech-5)) + qtspeech)) + (arguments (list #:qtbase qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Text editing widgets") (description "KTextWidgets provides widgets for displaying and editing text. @@ -3301,10 +4772,66 @@ It supports rich text as well as plain text.") ;; dual licensed (license (list license:lgpl2.0+ license:lgpl2.1+)))) +(define-public ktextwidgets-5 + (package + (inherit ktextwidgets) + (name "ktextwidgets") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0lkm27g1dc6vmyjz7jaiqh2z1cfgvzlnk58wcs2bkny05i87x01l")))) + (propagated-inputs + (list ki18n-5 sonnet-5)) + (native-inputs + (list extra-cmake-modules qttools-5)) + (inputs + (list kauth-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kiconthemes-5 + kservice-5 + kwidgetsaddons-5 + kwindowsystem-5 + qtbase-5 + qtspeech-5)))) + +(define-public ktexttemplate + (package + (name "ktexttemplate") + (version "6.3.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/ktexttemplate-" + version ".tar.xz")) + (sha256 + (base32 + "17df96rmmyni2adv97p77y349vyvirs0svzs6dzzmclzb2f8hlck")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules)) + (inputs (list qtdeclarative)) + (arguments (list #:qtbase qtbase)) + (home-page "https://community.kde.org/Frameworks") + (synopsis "KDE's Text Template") + (description "KTextTemplate is to make it easier for application developers +to separate the structure of documents from the data they contain.") + (license (list license:lgpl2.1+)))) + (define-public kwallet (package (name "kwallet") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3313,16 +4840,16 @@ It supports rich text as well as plain text.") name "-" version ".tar.xz")) (sha256 (base32 - "1cji8bvy5m77zljyrrgipsw8pxcds1sgikxlq3sdfxymcsw2wr36")))) + "1p9a5lwn4lpalxs6nj8fbcmmngcbgaj6s9n9vz56j26rlfzypdpd")))) (build-system cmake-build-system) (arguments (list #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? ;; Seems to require network. - (invoke "ctest" "-E" - "(fdo_secrets_test)"))))))) + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? ;; Seems to require network. + (invoke "ctest" "-E" + "(fdo_secrets_test)"))))))) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -3343,8 +4870,8 @@ It supports rich text as well as plain text.") libgcrypt phonon qgpgme - qca - qtbase-5)) + qca-qt6 + qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Safe desktop-wide storage for passwords") (description "This framework contains an interface to KWallet, a safe @@ -3352,10 +4879,47 @@ desktop-wide storage for passwords and the kwalletd daemon used to safely store the passwords on KDE work spaces.") (license license:lgpl2.1+))) +(define-public kwallet-5 + (package + (inherit kwallet) + (name "kwallet") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "12s4rnybadpcjmw3dvdn68vm369h1yk7yp7mv736mj1brdg8pkhy")))) + (native-inputs + (list extra-cmake-modules kdoctools-5)) + (inputs + (list gpgme + kauth-5 + kcodecs-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kdbusaddons-5 + kdoctools-5 + kiconthemes-5 + ki18n-5 + knotifications-5 + kservice-5 + kwidgetsaddons-5 + kwindowsystem-5 + libgcrypt + phonon + qgpgme + qca + qtbase-5)))) + (define-public kxmlgui (package (name "kxmlgui") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3364,16 +4928,17 @@ the passwords on KDE work spaces.") name "-" version ".tar.xz")) (sha256 (base32 - "0gvjf32ssc0r0bdpb1912ldsr5rjls8vrscwy5gm9g5gw504hmmr")))) + "0plrww25q417vldf59ybiwkg3clygm7wrjy4a28wry1jxfrgswr2")))) (build-system cmake-build-system) (propagated-inputs (list kconfig kconfigwidgets)) (native-inputs - (list extra-cmake-modules qttools-5 xorg-server-for-tests)) + (list extra-cmake-modules qttools)) (inputs (list attica kauth kcodecs + kcolorscheme kcoreaddons kglobalaccel kguiaddons @@ -3383,17 +4948,24 @@ the passwords on KDE work spaces.") ktextwidgets kwidgetsaddons kwindowsystem - qtbase-5 + qtbase + qtdeclarative sonnet)) (arguments (list #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" (getcwd)) - (setenv "QT_QPA_PLATFORM" "offscreen") ;; These tests fail - (invoke "ctest" "-E" "(ktoolbar_unittest|kxmlgui_unittest)"))))))) + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda* (#:key tests? #:allow-other-keys) + (with-output-to-file "autotests/BLACKLIST" + (lambda _ + (for-each + (lambda (name) + (display (string-append "[" name "]\n*\n"))) + (list "testSpecificApplicationLanguageQLocale" + "testToolButtonStyleNoXmlGui" + "testToolButtonStyleXmlGui")))) + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen")))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Framework for managing menu and toolbar actions") (description "KXMLGUI provides a framework for managing menu and toolbar @@ -3403,53 +4975,116 @@ descriptions for integrating actions from plugins.") ;; dual licensed (license (list license:gpl2+ license:lgpl2.1+)))) -(define-public kxmlrpcclient +(define-public kxmlgui-5 (package - (name "kxmlrpcclient") - (version "5.114.0") + (inherit kxmlgui) + (name "kxmlgui") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/portingAids/" + (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 - "1fgjai3vj3yk67ynhd7blilyrdhdn5nvma3v3j1sbdg98pr7qzar")))) - (build-system cmake-build-system) + "0h3s3jcmn4pzcfxs4hywrgk92dd5hfx9hzyy14f03c0dafi6crb3")))) (propagated-inputs - (list kio)) + (list kconfig-5 kconfigwidgets-5)) (native-inputs - (list extra-cmake-modules)) + (list extra-cmake-modules qttools-5 xorg-server-for-tests)) (inputs - (list kauth - kbookmarks - kcodecs - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kitemviews - ki18n - kjobwidgets - kservice - kwidgetsaddons - kxmlgui + (list attica-5 + kauth-5 + kcodecs-5 + kcoreaddons-5 + kglobalaccel-5 + kguiaddons-5 + kiconthemes-5 + kitemviews-5 + ki18n-5 + ktextwidgets-5 + kwidgetsaddons-5 + kwindowsystem-5 qtbase-5 - solid)) - (home-page "https://community.kde.org/Frameworks") - (synopsis "XML-RPC client") - (description "This library contains simple XML-RPC Client support. It is a -complete client and is easy to use. Only one interface is exposed, -kxmlrpcclient/client.h and from that interface, you only need to use 3 methods: -setUrl, setUserAgent and call.") + sonnet-5)) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") ;; These tests fail + (invoke "ctest" "-E" "(ktoolbar_unittest|kxmlgui_unittest)"))))))))) + +(define-public libplasma + (package + (name "libplasma") + (version "6.1.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" + version "/" name "-" + version ".tar.xz")) + (sha256 + (base32 + "0ji1cd8nc744lqg6m8qnbn923x57ljy5fcaxbq0fzh7qwij42qc0")))) + (build-system qt-build-system) + (propagated-inputs + (list kpackage kwindowsystem)) + (native-inputs + (list extra-cmake-modules kdoctools pkg-config + gettext-minimal + ;; for wayland-scanner + wayland)) + (inputs (list + karchive + kconfigwidgets + kglobalaccel + kguiaddons + kiconthemes + kirigami + kio + ki18n + kcmutils + ksvg + kglobalaccel + knotifications + plasma-wayland-protocols + plasma-activities + qtdeclarative + qtsvg + qtwayland + wayland + libxkbcommon)) + (arguments + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (invoke "ctest" "-E" + (string-append "(plasma-dialogstatetest" + "|plasma-iconitemtest" + "|plasma-dialogqmltest" + "|plasma-themetest" + "|iconitemhidpitest" + "|bug485688test" + "|dialognativetest)")))))))) + (home-page "https://invent.kde.org/plasma/libplasma") + (synopsis "Libraries, components and tools of Plasma workspaces") + (description "The plasma framework provides QML components, libplasma and +script engines.") ;; dual licensed - (license (list license:bsd-2 license:lgpl2.1+)))) + (license (list license:gpl2+ license:lgpl2.1+)))) (define-public plasma-framework (package (name "plasma-framework") - (version "5.114.0") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append @@ -3458,36 +5093,36 @@ setUrl, setUserAgent and call.") name "-" version ".tar.xz")) (sha256 (base32 - "058hl76q35bw3rzmv348azk1lmhkpgmfrxr3jd9s1hphijr8sgcx")))) + "0kwza2n9vbzf9p9dq7j448ynlfgg65918fvxw1n209zmlm6jr4vy")))) (build-system cmake-build-system) (propagated-inputs - (list kpackage kservice)) + (list kpackage-5 kservice-5)) (native-inputs - (list extra-cmake-modules kdoctools pkg-config)) + (list extra-cmake-modules kdoctools-5 pkg-config)) (inputs (list kactivities - karchive - kauth - kbookmarks - kcodecs - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kdeclarative - kglobalaccel - kguiaddons - kiconthemes - kirigami - kitemviews - kio - ki18n - kjobwidgets - knotifications - kwayland - kwidgetsaddons - kwindowsystem - kxmlgui + karchive-5 + kauth-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kdbusaddons-5 + kdeclarative-5 + kglobalaccel-5 + kguiaddons-5 + kiconthemes-5 + kirigami-5 + kitemviews-5 + kio-5 + ki18n-5 + kjobwidgets-5 + knotifications-5 + kwayland-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 ;; XXX: "undefined reference to `glGetString'" errors occur without libglvnd, libglvnd phonon @@ -3496,7 +5131,7 @@ setUrl, setUserAgent and call.") qtquickcontrols2-5 qtsvg-5 qtx11extras - solid)) + solid-5)) (arguments (list #:phases #~(modify-phases %standard-phases @@ -3522,7 +5157,7 @@ script engines.") (define-public purpose (package (name "purpose") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3531,20 +5166,26 @@ script engines.") name "-" version ".tar.xz")) (sha256 (base32 - "1lj67f0x4gvbh9by3c3crbbwwnx7b9ifjna9ggziya4m6zj0m4z1")))) + "05zcwrg65z7vm1jvgfajama2mrz70gn08kdsxd5fzkxx8rk6yadz")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules)) + (list extra-cmake-modules gettext-minimal)) (inputs - (list ;;TODO: ("kaccounts" ,kaccounts) - kconfig - kcoreaddons - knotifications - ki18n - kio - kirigami - qtbase-5 - qtdeclarative-5)) + (list + ;;TODO: kaccounts + kconfig + kcoreaddons + knotifications + ki18n + kio + kirigami + kwidgetsaddons + kitemviews + kcompletion + kservice + qtbase + qtdeclarative + prison)) (arguments (list #:tests? #f ;; seem to require network; don't find QTQuick components #:configure-flags #~'("-DBUILD_TESTING=OFF"))) ; not run anyway @@ -3558,29 +5199,41 @@ components so that all the plugins can receive all the information they need.") (license license:lgpl2.1+))) -;; This version of kdbusaddons does not use kinit as an input, and is used to -;; build kinit-bootstrap, as well as bootstrap versions of all kinit -;; dependencies which also rely on kdbusaddons. -(define kdbusaddons-bootstrap +(define-public purpose-5 (package - (inherit kdbusaddons) + (inherit purpose) + (name "purpose") + (version "5.116.0") (source (origin - (inherit (package-source kdbusaddons)) - (patches '()))) - (inputs (modify-inputs (package-inputs kdbusaddons) (delete "kinit"))) + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1g0xip1khclinx3vb835krdsj66jllgbx1fka8d9f55n68d6rmk2")))) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list + kconfig-5 + kcoreaddons-5 + knotifications-5 + ki18n-5 + kio-5 + kirigami-5 + qtbase-5 + qtdeclarative-5)) (arguments - (substitute-keyword-arguments (package-arguments kdbusaddons) - ((#:phases phases) - #~(modify-phases #$phases - (delete 'patch-source))))))) - -(define kinit-bootstrap - ((package-input-rewriting `((,kdbusaddons . ,kdbusaddons-bootstrap))) kinit)) + (list #:tests? #f ;; seem to require network; don't find QTQuick components + ;; not run anyway + #:configure-flags #~'("-DBUILD_TESTING=OFF"))))) (define-public ktextaddons (package (name "ktextaddons") - (version "1.5.3") + (version "1.5.4") (source (origin (method url-fetch) @@ -3588,10 +5241,12 @@ need.") "mirror://kde/stable/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "1p0p17dnh96zmzfb91wri7bryr90pvwb07r95n6xdad8py5dnlla")))) + "083v4x5f46h609g8zar6x22mp1ps85ikzbr08qbfj9abx010df34")))) (build-system qt-build-system) (arguments - (list #:phases + (list #:qtbase qtbase + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6") + #:phases #~(modify-phases %standard-phases (replace 'check (lambda _ @@ -3603,7 +5258,7 @@ need.") "(grammalecteresultwidgettest|grammalecteconfigwidgettest||grammalecteresultjobtest|languagetoolconfigwidgettest|translator-translatorwidgettest|translator-translatorengineloadertest)")))))) (native-inputs (list extra-cmake-modules - qttools-5)) + qttools)) (inputs (list karchive kconfigwidgets @@ -3612,8 +5267,7 @@ need.") kio ksyntaxhighlighting kxmlgui - qtbase-5 - qtkeychain + qtkeychain-qt6 sonnet)) (home-page "https://community.kde.org/Frameworks") (synopsis "Various text handling addons") @@ -3634,7 +5288,7 @@ applications.") (define-public kde-frameworkintegration (package (name "kde-frameworkintegration") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3643,12 +5297,13 @@ applications.") "frameworkintegration-" version ".tar.xz")) (sha256 (base32 - "1dqgzhhh8gnvl8jsvh2i6pjn935d61avh63b4z9kpllhvp9a2lnd")))) + "0zscmn1hvv0y7j5r22r6cdmqznkv7h0s6v7a4wmpjgrpnd8haw4l")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config)) - ;; TODO: Optional packages not yet in Guix: packagekitqt5, AppStreamQt - (inputs (list kconfig + (inputs (list packagekit-qt6 + appstream-qt6 + kconfig kconfigwidgets kcoreaddons ki18n @@ -3658,18 +5313,17 @@ applications.") knotifications kpackage kwidgetsaddons - qtbase-5 - qtx11extras)) + qtbase)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - (setenv "HOME" (getcwd)) - ;; Make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (list #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd)) + ;; Make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen")))))) (home-page "https://community.kde.org/Frameworks") - (synopsis "KDE Frameworks 5 workspace and cross-framework integration plugins") + (synopsis "KDE Frameworks 6 workspace and cross-framework integration plugins") (description "Framework Integration is a set of plugins responsible for better integration of Qt applications when running on a KDE Plasma workspace.") @@ -3813,7 +5467,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (define-public khtml (package (name "khtml") - (version "5.114.0") + (version "5.116.0") (source (origin (method url-fetch) @@ -3822,34 +5476,34 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "1mf84zs9hjvmi74f8rgqzrfkqjq597f9k64dn1bqcj13v0w10vry")))) + (base32 "13nc5dcj536xyd87prla30mpbzsyjnylb34a979qn7qvpr0zn8c9")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules perl)) (inputs (list giflib gperf - karchive - kcodecs - kglobalaccel - ki18n - kiconthemes - kio + karchive-5 + kcodecs-5 + kglobalaccel-5 + ki18n-5 + kiconthemes-5 + kio-5 kjs - knotifications - kparts - ktextwidgets - kwallet - kwidgetsaddons - kwindowsystem - kxmlgui + knotifications-5 + kparts-5 + ktextwidgets-5 + kwallet-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 libjpeg-turbo libpng openssl phonon qtbase-5 qtx11extras - sonnet)) + sonnet-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Frameworks 5 HTML widget and component") (description "KHTML is a web rendering engine, based on the KParts @@ -3863,7 +5517,7 @@ technology and using KJS for JavaScript support.") (define-public kjs (package (name "kjs") - (version "5.114.0") + (version "5.116.0") (source (origin (method url-fetch) @@ -3872,7 +5526,7 @@ technology and using KJS for JavaScript support.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "08nh6yr6bqifpb5s9a4wbjwmwnm7zp5k8hcdmyb6mlcbam9qp6j7")))) + (base32 "1dz1v5gizjywp452q98r4ka6iafa3b3c24ck8jv1xcym64zg7d4z")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules kdoctools perl pkg-config)) @@ -3889,112 +5543,10 @@ support.") license:bsd-2 license:bsd-3 (license:non-copyleft "file://src/kjs/dtoa.cpp"))))) -(define-public kjsembed - (package - (name "kjsembed") - (version "5.114.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://kde/stable/frameworks/" - (version-major+minor version) "/portingAids/" - name "-" version ".tar.xz")) - (sha256 - (base32 "1xglisxv7nfsbj9lgpvc4c5ql4f6m7n71vf7vih5ff3aqybrkgxa")))) - (build-system cmake-build-system) - (native-inputs - (list extra-cmake-modules kdoctools qttools-5)) - (inputs - (list ki18n kjs qtbase-5 qtsvg-5)) - (home-page "https://community.kde.org/Frameworks") - (synopsis "KDE Frameworks 5 embedded Javascript engine for Qt") - (description "KJSEmbed provides a method of binding Javascript objects to -QObjects, so you can script your applications.") - (license license:lgpl2.1+))) - -(define-public kmediaplayer - (package - (name "kmediaplayer") - (version "5.114.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://kde/stable/frameworks/" - (version-major+minor version) "/portingAids/" - name "-" version ".tar.xz")) - (sha256 - (base32 "092yvzvrkvr8xxncw7h5ghfd2bggzxsqfj67c2vhymhfw4i0c54x")))) - (build-system qt-build-system) - (native-inputs - (list extra-cmake-modules kdoctools qttools-5)) - (inputs - (list kcompletion - kcoreaddons - ki18n - kiconthemes - kio - kparts - kwidgetsaddons - kxmlgui - qtbase-5)) - (home-page "https://community.kde.org/Frameworks") - (synopsis "KDE Frameworks 5 plugin interface for media player features") - (description "KMediaPlayer builds on the KParts framework to provide a -common interface for KParts that can play media files. - -This framework is a porting aid. It is not recommended for new projects, and -existing projects that use it are advised to port away from it, and use plain -KParts instead.") - (license license:expat))) - -(define-public kross - (package - (name "kross") - (version "5.114.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://kde/stable/frameworks/" - (version-major+minor version) "/portingAids/" - name "-" version ".tar.xz")) - (sha256 - (base32 "0bbpi63lxbb4ylx2jd172a2bqyxkd606n7w8zrvcjy466lkv3sz4")))) - (build-system cmake-build-system) - (native-inputs - (list extra-cmake-modules kdoctools qttools-5)) - (inputs - (list kcompletion - kcoreaddons - ki18n - kiconthemes - kparts - kwidgetsaddons - kxmlgui - qtbase-5 - qtscript)) - (home-page "https://community.kde.org/Frameworks") - (synopsis "KDE Frameworks 5 solution for application scripting") - (description "Kross is a scripting bridge for the KDE Development Platform -used to embed scripting functionality into an application. It supports -QtScript as a scripting interpreter backend. - -Kross provides an abstract API to provide scripting functionality in a -interpreter-independent way. The application that uses Kross should not need -to know anything about the scripting language being used. The core of Kross -provides the framework to deal transparently with interpreter-backends and -offers abstract functionality to deal with scripts.") - ;; Most files are distributed under LGPL2+, but the package includes code - ;; under a variety of licenses. - (license (list license:lgpl2.0+ license:lgpl2.1+ - license:lgpl2.0 license:gpl3+)))) - (define-public kdav (package (name "kdav") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) @@ -4002,20 +5554,23 @@ offers abstract functionality to deal with scripts.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "11959fxz24snk2l31kw8w96wah0s2fjimimrxh6xhppiy5qp2fp2")))) + (base32 "1f99nw6jsrka5hpp4ad13mgwprmzivv2h46vg2arjlr5x0csk4mh")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) + (propagated-inputs (list kcoreaddons)) (inputs - (list kcoreaddons ki18n kio qtbase-5 qtxmlpatterns)) + (list ki18n kio)) (arguments - (list #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; Seems to require network. - (invoke "ctest" "-E" - "(kdav-davcollectionsmultifetchjobtest|\ + (list + #:qtbase qtbase + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Seems to require network. + (invoke "ctest" "-E" + "(kdav-davcollectionsmultifetchjobtest|\ kdav-davitemfetchjob)"))))))) (home-page "https://invent.kde.org/frameworks/kdav") (synopsis "DAV protocol implementation with KJobs") diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm index e40fb3bef8..10c26e1d8e 100644 --- a/gnu/packages/kde-games.scm +++ b/gnu/packages/kde-games.scm @@ -45,15 +45,16 @@ (define-public ktuberling (package (name "ktuberling") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/ktuberling-" version ".tar.xz")) - (sha256 - (base32 "0zk7wijp425657s2j7xq7mhybgyddpam88ih8i0sbpcs0sliyz7k")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/ktuberling-" version ".tar.xz")) + (sha256 + (base32 "15fizh4f1y6j475c91myw87fg8h5d0wi79niby19wgwwbhphzb2r")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools perl)) (inputs @@ -67,11 +68,10 @@ kwidgetsaddons kxmlgui libkdegames - python-wrapper - qtbase-5 - qtmultimedia-5 - qtdeclarative-5 - qtsvg-5)) + ;python-wrapper + qtmultimedia + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/ktuberling/") (synopsis "Stamp drawing toy") (description "KTuberling is a drawing toy intended for small children and @@ -94,15 +94,16 @@ This package is part of the KDE games module.") (define-public picmi (package (name "picmi") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/picmi-" version ".tar.xz")) - (sha256 - (base32 "1x1iv6a840jwldfpx44wvh1vki1jz1hixzvzhdfx2mhw05v91fjx")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/picmi-" version ".tar.xz")) + (sha256 + (base32 "0xx3bwib7p1g0xzykpsln07606rms8awrh1myr46lx65r1xffw05")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -115,9 +116,8 @@ This package is part of the KDE games module.") knewstuff kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/picmi/") (synopsis "Number logic game") (description "Picmi is a number logic game in which cells in a grid have @@ -130,15 +130,16 @@ This package is part of the KDE games module.") (define-public kolf (package (name "kolf") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kolf-" version ".tar.xz")) (sha256 - (base32 "0wbdpclc6nimjzs2pqbzaxnqn516hci1yk1dgig0jgdy1jv2nyhv")))) + (base32 "0i0rh3dw90j8p46dhfmmcl6nah080ilmhy9d1m9jwlb6xd03zg66")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -153,8 +154,7 @@ This package is part of the KDE games module.") kxmlgui ktextwidgets libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/kolf/") (synopsis "Miniature golf game") (description "Kolf is a miniature golf game for one to ten players. The @@ -177,17 +177,18 @@ This package is part of the KDE games module.") (define-public libkmahjongg (package (name "libkmahjongg") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/libkmahjongg-" version ".tar.xz")) - (sha256 - (base32 "1a0c0q34h5yxwx76y6934ibn6hm1ip1hc2xvl11q1kaazq0alca3")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/libkmahjongg-" version ".tar.xz")) + (sha256 + (base32 "1bjsrnkwkv4w94q5q4nhfy11jfrvxsl2v2kjv6dcm47z0k9y9v63")))) (build-system qt-build-system) (arguments (list + #:qtbase qtbase #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-tileset-dir @@ -195,13 +196,13 @@ This package is part of the KDE games module.") ;; Add "$out/share" to XDG_DATA_DIRS so that the default tileset ;; is always available. (substitute* "src/kmahjonggtileset.cpp" - (("_inited = true;") + (("d->buildElementIdTable\\(\\);") (format #f "QByteArray x = qgetenv(\"XDG_DATA_DIRS\"); if (!x.isEmpty()) { QString datadirs = QString::fromLocal8Bit(x) + QLatin1String(\":~a\"); qputenv(\"XDG_DATA_DIRS\", datadirs.toLocal8Bit()); } -_inited = true;" +d->buildElementIdTable();" (string-append (assoc-ref outputs "out") "/share"))))))))) (native-inputs @@ -209,14 +210,12 @@ _inited = true;" (inputs (list kauth kcompletion - ;("kconfig" ,kconfig) kcodecs kconfigwidgets kcoreaddons ki18n kwidgetsaddons - qtbase-5 - qtsvg-5)) + qtsvg)) (home-page "https://games.kde.org/") (synopsis "Shared library for kmahjongg and kshisen") (description "Shared library and common files for kmahjongg, kshisen and @@ -226,14 +225,14 @@ other Mah Jongg like games.") (define-public kmahjongg (package (name "kmahjongg") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/kmahjongg-" version ".tar.xz")) - (sha256 - (base32 "1q2aq8y3c4a84rjvqk4gz6mlyflfnzw6im68p96wmcn98s5gsc22")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/kmahjongg-" version ".tar.xz")) + (sha256 + (base32 "07x3rxxhg3z538bbwqi75mv1z546gvzssav43xzgyga3zg7179b6")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -247,9 +246,9 @@ other Mah Jongg like games.") kxmlgui libkdegames libkmahjongg - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kmahjongg/") (synopsis "Tile laying patience") (description "In KMahjongg the tiles are scrambled and staked on top of @@ -265,19 +264,17 @@ This package is part of the KDE games module.") (define-public kshisen (package (name "kshisen") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/kshisen-" version ".tar.xz")) - (sha256 - (base32 "0bfk6nbwl35sfqxhf7cdv3n61ybi5962i2lvg7m1vlpp21q0diz8")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/kshisen-" version ".tar.xz")) + (sha256 + (base32 "1bx28jlvmwfh5rrvwd2kiq1c5r83s9lr49kl3x1rm5w7w5hlxyf1")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules - ;("perl" ,perl) - ;("pkg-config" ,pkg-config) kdoctools)) (inputs (list kauth @@ -290,8 +287,8 @@ This package is part of the KDE games module.") kxmlgui libkdegames libkmahjongg - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kshisen/") (synopsis "Shisen-Sho solitaire game") (description "KShisen is a solitaire-like game played using the standard @@ -304,44 +301,45 @@ This package is part of the KDE games module.") (define-public kajongg (package (name "kajongg") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/kajongg-" version ".tar.xz")) - (sha256 - (base32 "16v87x0qikfk9jpp8dfxnb7mnjzzi0qlkp5lbn2xypkfhqaz99fi")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/kajongg-" version ".tar.xz")) + (sha256 + (base32 "0xwnin738zj6kh607asmwdq7n6jva9wk240c9rc53ja98nw4crpv")))) (build-system qt-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/mjresource.py" - (("'share', 'kmahjongglib'" all) - (string-append "'" (assoc-ref inputs "libkmahjongg") - "/share', 'kmahjongglib'"))) - (substitute* "src/sound.py" - (("oggBinary = 'ogg123'") - (format #f "oggBinary = '~a'" - (search-input-file inputs "bin/ogg123")))) - (substitute* "src/common.py" - (("interpreterName = 'python3'") - (format #f "interpreterName = '~a'" - (search-input-file inputs "bin/python3")))))) - (add-after 'qt-wrap 'wrap - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each (lambda (program) - (wrap-program program - `("GUIX_PYTHONPATH" ":" prefix - (,(getenv "GUIX_PYTHONPATH"))))) - (list (string-append out "/bin/kajongg") - (string-append out "/bin/kajonggserver"))))))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/mjresource.py" + (("'share', 'kmahjongglib'" all) + (string-append "'" (assoc-ref inputs "libkmahjongg") + "/share', 'kmahjongglib'"))) + (substitute* "src/sound.py" + (("oggBinary = 'ogg123'") + (format #f "oggBinary = '~a'" + (search-input-file inputs "bin/ogg123")))) + (substitute* "src/common.py" + (("interpreterName = 'python3'") + (format #f "interpreterName = '~a'" + (search-input-file inputs "bin/python3")))))) + (add-after 'qt-wrap 'wrap + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (program) + (wrap-program program + `("GUIX_PYTHONPATH" ":" prefix + (,(getenv "GUIX_PYTHONPATH"))))) + (list (string-append out "/bin/kajongg") + (string-append out "/bin/kajonggserver"))))))))) (native-inputs (list extra-cmake-modules - ;("perl" ,perl) kdoctools)) (inputs (list bash-minimal @@ -355,8 +353,7 @@ This package is part of the KDE games module.") python-twisted python-qtpy python-zope-interface - qtbase-5 - qtsvg-5 + qtsvg vorbis-tools)) (home-page "https://apps.kde.org/kajongg/") (synopsis "Classical Mah Jongg game for 4 players") @@ -376,15 +373,16 @@ This package is part of the KDE games module.") (define-public kbreakout (package (name "kbreakout") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kbreakout-" version ".tar.xz")) - (sha256 - (base32 "08fq0s1c71ag6jzyxz6spc5ylmzpbqpyqi9lqjk0x7y7brkfk9fq")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kbreakout-" version ".tar.xz")) + (sha256 + (base32 "0qnsvmhil1ybs94g533r26sqrfkqb06jh6gk4siqdd32dyyn7x3q")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -398,8 +396,7 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/kbreakout/") (synopsis "Breakout like game") (description "KBreakout is similar to the classics breakout and xboing, @@ -413,15 +410,16 @@ This package is part of the KDE games module.") (define-public kmines (package (name "kmines") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kmines-" version ".tar.xz")) - (sha256 - (base32 "0x301dsppn0sav31ds5hpbfkbbisjg640ri13103s1jn0y2b90b9")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kmines-" version ".tar.xz")) + (sha256 + (base32 "1ng0bda7q2ha7kmr83rlf9z24pkf14id5w6jzzgjw2yc21mbnwhm")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -436,8 +434,7 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/kmines/") (synopsis "Classical mine sweeper game") (description "KMines is a classic Minesweeper game. The idea is to @@ -450,15 +447,16 @@ This package is part of the KDE games module.") (define-public konquest (package (name "konquest") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/konquest-" version ".tar.xz")) - (sha256 - (base32 "0svzaibs8v1xd36ysj3wk7sxma26fl5pz6yp774jg0g9zi9rlkff")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/konquest-" version ".tar.xz")) + (sha256 + (base32 "0bykh3ihigvzaxkzhk801hfr28frxq4hkwixicapzdfamhc22w95")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -472,9 +470,9 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtscxml + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/konquest/") (synopsis "Simple turn-based strategy game") (description "Konquest is the KDE version of Gnu-Lactic Konquest. Players @@ -489,15 +487,16 @@ This package is part of the KDE games module.") (define-public kbounce (package (name "kbounce") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/kbounce-" version ".tar.xz")) - (sha256 - (base32 "06b0q4f4yn8m8gy7wgax54ldwnkgykr8yfr2h0ih8mfg3w8xsx7s")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/kbounce-" version ".tar.xz")) + (sha256 + (base32 "0s9009qi40fdi24lwp789cydgy1rm0n9f0fsb8pbldi9rmdk9x60")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -511,9 +510,8 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/kbounce/") (synopsis "Jezzball arcade game") (description "KBounce is a single player arcade game with the elements of @@ -527,15 +525,16 @@ This package is part of the KDE games module.") (define-public kblocks (package (name "kblocks") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/kblocks-" version ".tar.xz")) - (sha256 - (base32 "1z5f2zpnmfh05vlmjw85jj2d0sfxl5w1kg30ky6gmgmmfzj2sjzx")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/kblocks-" version ".tar.xz")) + (sha256 + (base32 "05l2g21rzpln7kzywgraplqymgfdk1wvr1jfm3ffk0nzdyi0fy08")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -549,9 +548,8 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/kblocks/") (synopsis "Single player falling blocks puzzle game") (description "KBlocks is the classic Tetris-like falling blocks game. @@ -567,15 +565,16 @@ This package is part of the KDE games module.") (define-public ksudoku (package (name "ksudoku") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/ksudoku-" version ".tar.xz")) - (sha256 - (base32 "03hrwyvwzhxdbq7pp03c7lkz0dhv9yi6lcwvz3s63mn01wyq6iv3")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/ksudoku-" version ".tar.xz")) + (sha256 + (base32 "1hygl0m26ylj0gm9i8mm7cr2aclq27z8ammydhw824d1nwjw98b0")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -584,6 +583,7 @@ This package is part of the KDE games module.") kconfigwidgets kcoreaddons kcrash + kdbusaddons kguiaddons ki18n kiconthemes @@ -592,9 +592,8 @@ This package is part of the KDE games module.") kxmlgui libkdegames glu - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/ksudoku/") (synopsis "Sudoku puzzle game and solver") (description "KSudoku is a Sudoku game and solver, supporting a range of @@ -627,15 +626,16 @@ This package is part of the KDE games module.") (define-public klines (package (name "klines") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/klines-" version ".tar.xz")) - (sha256 - (base32 "1dny7wsj90c3vbgbrpxvxfy44j9ip3vdylc7889ckzbliivipxk4")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/klines-" version ".tar.xz")) + (sha256 + (base32 "1c6y071h2w1v3bn7cc5qy1l5m3s1s0vah72196y8gdh7bfx7kaxx")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -648,8 +648,7 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/klines/") (synopsis "Place 5 equal pieces together, but wait, there are 3 new ones") (description "KLines is a simple but highly addictive one player game. @@ -670,15 +669,16 @@ This package is part of the KDE games module.") (define-public kgoldrunner (package (name "kgoldrunner") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kgoldrunner-" version ".tar.xz")) - (sha256 - (base32 "0acavby9lwbqbx577a3az9lcahchngcs15571va2ndnq1r16paxf")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kgoldrunner-" version ".tar.xz")) + (sha256 + (base32 "10v280785ds03h6ra384hhck422dwy8zz57x4wpcq87azzf0mi4c")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -691,8 +691,8 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtbase + qtdeclarative)) (home-page "https://apps.kde.org/kgoldrunner/") (synopsis "Action and puzzle solving game") (description "KGoldrunner is an action game where the hero runs through a @@ -710,15 +710,16 @@ This package is part of the KDE games module.") (define-public kdiamond (package (name "kdiamond") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kdiamond-" version ".tar.xz")) - (sha256 - (base32 "038lpp387m45zcy49rgmisiz5ajrvxwxnf424wllrjkihxy1siyn")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kdiamond-" version ".tar.xz")) + (sha256 + (base32 "1ql8psh6lyahrdiqj0qji1dsyz8jl260msp76k804jk0477gjw8h")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -734,8 +735,7 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/kdiamond/") (synopsis "Three-in-a-row game") (description "KDiamond is a three-in-a-row game like Bejeweled. It @@ -748,15 +748,16 @@ This package is part of the KDE games module.") (define-public kfourinline (package (name "kfourinline") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kfourinline-" version ".tar.xz")) - (sha256 - (base32 "0chfjp0k4ps5f6vy8nxqc2xlj4xql08llxnzsz6c2x611n69aszm")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kfourinline-" version ".tar.xz")) + (sha256 + (base32 "15l1bvz3c7h3pv0inaq73haqhwh2v5gdqnxsrhi5ra6dw5nm0d8l")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -765,13 +766,13 @@ This package is part of the KDE games module.") kconfigwidgets kcoreaddons kcrash + kdbusaddons kdnssd ki18n kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/kfourinline/") (synopsis "Place 4 pieces in a row") (description "KFourInLine is a board game for two players based on the @@ -786,15 +787,16 @@ This package is part of the KDE games module.") (define-public kblackbox (package (name "kblackbox") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kblackbox-" version ".tar.xz")) - (sha256 - (base32 "0h7byd7g52yvmz3gxrzp2frs4iifm0r6lq8fjz2nxbl1rkw9ljbp")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kblackbox-" version ".tar.xz")) + (sha256 + (base32 "0andcfwrq8nhb75diif3pm2a1y6lrmkdncaszjhyan1v9mycdi8r")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -808,9 +810,8 @@ This package is part of the KDE games module.") ktextwidgets kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/kblackbox/") (synopsis "Find atoms in a grid by shooting electrons") (description "KBlackbox is a game of hide and seek played on a grid of @@ -826,15 +827,16 @@ This package is part of the KDE games module.") (define-public knetwalk (package (name "knetwalk") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/knetwalk-" version ".tar.xz")) - (sha256 - (base32 "1xqqwsbm3f8bmid7afbnacxlg1hih644f0nw0i87pr746m1sskgz")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/knetwalk-" version ".tar.xz")) + (sha256 + (base32 "1p6d27l2j6h5kqyjpws4s0ilvzhrhbd3lwd7776z1lmidqixvwfq")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -849,8 +851,7 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/knetwalk/") (synopsis "Turn the board pieces to get all computers connected") (description "KNetWalk is a small game where you have to build up a @@ -867,14 +868,14 @@ This package is part of the KDE games module.") (define-public bomber (package (name "bomber") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/bomber-" version ".tar.xz")) (sha256 - (base32 "0qgixhmlkcjni5i9391hjg3sfc3ps24lmk9v8199lmnplrybklqj")))) + (base32 "1sw3a2nvwciq7m8d30k0ipzx5gsa48jwflxkih8ha354wl5mk1cs")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -887,8 +888,8 @@ This package is part of the KDE games module.") ki18n kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/bomber/") (synopsis "Arcade bombing game") (description "Bomber is a single player arcade game. @@ -908,14 +909,14 @@ This package is part of the KDE games module.") (define-public granatier (package (name "granatier") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/granatier-" version ".tar.xz")) - (sha256 - (base32 "1zyadmgnpgsx728gzd55qyijsm13pb9cxs1y4l4c4m9lnz4y183v")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/granatier-" version ".tar.xz")) + (sha256 + (base32 "0g38sfx4x61isvi3h6b8xmdbbqrvq8z8rrxb0xdbz3fkwxyigy75")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -931,9 +932,9 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/granatier/") (synopsis "Bomberman clone") (description "Granatier is a clone of the classic Bomberman game, @@ -945,19 +946,20 @@ This package is part of the KDE games module.") (define-public ksirk (package (name "ksirk") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version - "/src/ksirk-" version ".tar.xz")) + "/src/ksirk-" version ".tar.xz")) (sha256 - (base32 "1sp5mhnf8r3fvifz0kw74436j5kwsmiw66myygb4rsggb8amh5x4")))) + (base32 "0ki9z8p4flrs7msihya8ykxs3p4w10v3ivmgf43ldygjjndyhql9")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) (inputs (list kcrash + kdbusaddons ki18n kiconthemes kio @@ -966,11 +968,13 @@ This package is part of the KDE games module.") kxmlgui libkdegames phonon - qca - qtbase-5 - qtdeclarative-5 - qtsvg-5 + qca-qt6 + qt5compat + qtdeclarative + qtmultimedia + qtsvg zlib)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/ksirk/") (synopsis "Computerized version of the well known strategy board game 'Risk'") @@ -1000,14 +1004,14 @@ This package is part of the KDE games module.") (define-public palapeli (package (name "palapeli") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/palapeli-" version ".tar.xz")) (sha256 - (base32 "19xh03rhb48m4bbdmpga4aqij6agqg047ghl92p98z1phg5lxzrv")))) + (base32 "1436rbfrppjb73k8p9amzwa6hhjns3hjli279r8fqscjimil0vv4")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1018,8 +1022,7 @@ This package is part of the KDE games module.") kconfigwidgets kcoreaddons kcrash - kcrash - ki18n + kdbusaddons ki18n kio kitemviews @@ -1028,10 +1031,10 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5 + qtdeclarative + qtsvg shared-mime-info)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/palapeli/") (synopsis "Jigsaw puzzle game") (description "Palapeli is a jigsaw puzzle game. Unlike other games in @@ -1047,14 +1050,14 @@ This package is part of the KDE games module.") (define-public kiriki (package (name "kiriki") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kiriki-" version ".tar.xz")) (sha256 - (base32 "13lzpbhkp48r9m0bcrzfqacz9xvc89xavf3yn3ql50g3jjlkq41v")))) + (base32 "0gysvh9afr1zhjv5d5kan6m6b8b45jd1p3f2kssiql84m5xv7jsy")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1069,8 +1072,8 @@ This package is part of the KDE games module.") kiconthemes kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kiriki/") (synopsis "Yahtzee dice game") (description "Kiriki is an addictive and fun dice game, designed to be @@ -1085,14 +1088,14 @@ This package is part of the KDE games module.") (define-public kigo (package (name "kigo") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kigo-" version ".tar.xz")) (sha256 - (base32 "0qx9plrs588210rdgvb2bkm5yjw4pna9q7v38cb166nfgkh6gv63")))) + (base32 "18jdv0dwxysf3i3c8d663x95h1pbkbvlw860lqgapdx9cnybqz1a")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1108,9 +1111,9 @@ This package is part of the KDE games module.") ktextwidgets kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kigo/") (synopsis "Go board game") (description "Kigo is an open-source implementation of the popular Go @@ -1131,14 +1134,14 @@ This package is part of the KDE games module.") (define-public kubrick (package (name "kubrick") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kubrick-" version ".tar.xz")) (sha256 - (base32 "0nank1ga4c4xfsw0m1cqhjhyz2wpbsxplyyb9x3l2vpg92gj5dbs")))) + (base32 "05mcrjbf6gm7dldww3iqhhrknzf59xj8fw4rzbb6l79rrvp1vrvz")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1148,14 +1151,16 @@ This package is part of the KDE games module.") kconfigwidgets kcoreaddons kcrash + kdbusaddons ki18n kio kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtbase + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kubrick/") (synopsis "Game based on Rubik's Cube") (description "Kubrick is a game based on the Rubik's Cube puzzle. @@ -1172,14 +1177,14 @@ This package is part of the KDE games module.") (define-public lskat (package (name "lskat") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/lskat-" version ".tar.xz")) (sha256 - (base32 "1qphzc1r26qwc8sl5rjkw16ia3lsj7c2lg9fxnhk08k8mxncymxg")))) + (base32 "1p5gq8zkjr3cl7scq9irhiaf96az02k1fk3c0myqh0l9nyxakpsw")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1188,14 +1193,15 @@ This package is part of the KDE games module.") kconfig kcoreaddons kcrash + kdbusaddons kguiaddons ki18n kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/lskat/") (synopsis "Lieutnant Skat card game") (description "Lieutnant Skat (from German \"Offiziersskat\") is a fun and @@ -1210,14 +1216,14 @@ This package is part of the KDE games module.") (define-public kapman (package (name "kapman") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kapman-" version ".tar.xz")) - (sha256 - (base32 "0ildsd7pig3lm9n616kw5mpl8hbwidsnbzdfifx8nnffslrr4bv7")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kapman-" version ".tar.xz")) + (sha256 + (base32 "1lwxrd8ky9bkrxjg42spyyywxv17lp5idm5xr4xybq3sqi2gahhx")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1231,9 +1237,9 @@ This package is part of the KDE games module.") ki18n kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kapman/") (synopsis "Pac-Man clone") (description "Kapman is a clone of the well known game Pac-Man. @@ -1249,14 +1255,14 @@ This package is part of the KDE games module.") (define-public kspaceduel (package (name "kspaceduel") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kspaceduel-" version ".tar.xz")) (sha256 - (base32 "1mpry73vvi332wxyw2wymh3lsrj2amblg50dym9ni1lj2af657ia")))) + (base32 "04sjx32b4jgz9hwjmfyjcxlrd6jwg355sr6knr8vdxhjg18k2wa0")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1270,9 +1276,9 @@ This package is part of the KDE games module.") ki18n kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kspaceduel/") (synopsis "Two player game with shooting spaceships flying around a sun") (description "KSpaceduel is a space battle game for one or two players, @@ -1284,14 +1290,14 @@ This package is part of the KDE games module.") (define-public bovo (package (name "bovo") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/bovo-" version ".tar.xz")) (sha256 - (base32 "1zds6d4rmcf4sa2sfhyp1i5n7s7cgslikvbra4pz2kpi0hmvihi1")))) + (base32 "0rcnc3v4p0xgkybk4csjwkd7mfiffhqfwx3c5yfwnnrh7rdrmh5j")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1303,9 +1309,9 @@ This package is part of the KDE games module.") ki18n kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/bovo/") (synopsis "Classic pen and paper game: five in a line") (description "Bovo is a Gomoku (from Japanese 五目並べ - lit. \"five @@ -1320,15 +1326,16 @@ This package is part of the KDE games module.") (define-public killbots (package (name "killbots") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/killbots-" version ".tar.xz")) (sha256 - (base32 "0ygg2cmp7wqzw9nsn768vzgjs8i44k3skwcn2abg1jj5k64wp9cb")))) + (base32 "1vs4prhflmy6z9p3ab6r3qgzqn2vqv4abc0mhq04zbnh7sqcy0k7")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1342,8 +1349,7 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/killbots/") (synopsis "Port of the classic BSD console game robots") (description "Killbots is a simple game of evading killer robots. @@ -1361,15 +1367,16 @@ This package is part of the KDE games module.") (define-public ksnakeduel (package (name "ksnakeduel") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/ksnakeduel-" version ".tar.xz")) - (sha256 - (base32 "182z9664p0shyx4rbr1cn32mzlfzl80x96nwakvv1ss7sf7dp1x3")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/ksnakeduel-" version ".tar.xz")) + (sha256 + (base32 "11v8zrbwb8dhdmaa76rhv5qa084raxldl8sjp9299hd8wk34297b")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1383,9 +1390,8 @@ This package is part of the KDE games module.") ki18n kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/ksnakeduel/") (synopsis "Snake race played against the computer") (description "KSnakeDuel is a fast action game where you steer a snake @@ -1399,15 +1405,16 @@ This package is part of the KDE games module.") (define-public kollision (package (name "kollision") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kollision-" version ".tar.xz")) - (sha256 - (base32 "0g9nz3df8nibcwlrjlyw306dnrx58nlga2lljn7a9acpmvbp6qgi")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kollision-" version ".tar.xz")) + (sha256 + (base32 "1fvhbvb72w5xgz6hyp795j07ngc78isbk4i9g0yfznl1z59hygs7")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1420,8 +1427,7 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/kollision/") (synopsis "Simple ball dodging game") (description "In Kollision you use mouse to control a small blue ball in a @@ -1436,15 +1442,16 @@ This package is part of the KDE games module.") (define-public knavalbattle (package (name "knavalbattle") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/knavalbattle-" version ".tar.xz")) - (sha256 - (base32 "1brj2dvymgpf74vbsrs2m81lxxfxsly9pafd13g8rkzdx3hn1n0q")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/knavalbattle-" version ".tar.xz")) + (sha256 + (base32 "0smr35f76hhy7gzla6q2ly9ip01ly3v33xhqq9dqpp144bs4vkab")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1460,8 +1467,7 @@ This package is part of the KDE games module.") ktextwidgets kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/knavalbattle/") (synopsis "Battleship board game with built-in game server") (description "KBattleship is a Battle Ship game for KDE. @@ -1476,15 +1482,16 @@ This package is part of the KDE games module.") (define-public kreversi (package (name "kreversi") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kreversi-" version ".tar.xz")) - (sha256 - (base32 "1mb1xrywk5p7ipjml1g2mjqfs7rlpa41if3yc7p9zcrkcasnbffv")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kreversi-" version ".tar.xz")) + (sha256 + (base32 "1vrh1kl2qh03826m5n3nvj5fn0jrakqvkrlc3jxr9hm26c2k26ah")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1499,9 +1506,8 @@ This package is part of the KDE games module.") kio kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/kreversi/") (synopsis "Old reversi board game, also known as othello") (description "KReversi is a simple one player strategy game played @@ -1518,15 +1524,16 @@ This package is part of the KDE games module.") (define-public ksquares (package (name "ksquares") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/ksquares-" version ".tar.xz")) - (sha256 - (base32 "0b3r99hfhm5r4jxkwiji0lww703r7dj60x2m55ginvdy7ixm46rm")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/ksquares-" version ".tar.xz")) + (sha256 + (base32 "1nmlnqirgp53h03kyj0cwg0nny0dckb6c7vs16jkqr11rmb39g1v")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1540,8 +1547,7 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/ksquares/") (synopsis "Dots and Boxes game") (description "KSquares is an implementation of the popular paper based @@ -1554,15 +1560,16 @@ This package is part of the KDE games module.") (define-public kjumpingcube (package (name "kjumpingcube") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kjumpingcube-" version ".tar.xz")) - (sha256 - (base32 "09bh57vzjnn56dnhpp4szx72wyskc5g714vlyp6c27vr27xry8fi")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kjumpingcube-" version ".tar.xz")) + (sha256 + (base32 "1ihll2x7inc76752xwj3dfs2653i9c5prfllh2p8vfc1ss0raa34")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1576,9 +1583,8 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/kjumpingcube/") (synopsis "Simple tactical game for number-crunchers") (description "KJumpingcube is a simple tactical game for one or two @@ -1591,7 +1597,7 @@ This package is part of the KDE games module.") (define-public kde-games (package (name "kde-games") - (version "23.04.3") + (version "24.05.2") (source #f) (build-system trivial-build-system) (arguments diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index b9d3502b09..86e30750c9 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -69,32 +70,32 @@ (base32 "0zm4nkpmvd181xlkis7ydzx54p3vn0zgpdzgh54f1hsjy6ahsq16")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools pkg-config)) + (list extra-cmake-modules kdoctools-5 pkg-config)) (inputs - (list attica - kcmutils - kconfigwidgets - kcoreaddons + (list attica-5 + kcmutils-5 + kconfigwidgets-5 + kcoreaddons-5 kemoticons - kglobalaccel - kguiaddons - ki18n - kio - knotifications - knotifyconfig - kparts - ktextwidgets - kwallet - kwidgetsaddons - kxmlgui + kglobalaccel-5 + kguiaddons-5 + ki18n-5 + kio-5 + knotifications-5 + knotifyconfig-5 + kparts-5 + ktextwidgets-5 + kwallet-5 + kwidgetsaddons-5 + kxmlgui-5 ;; TODO: telepathy breeze-icons ; default icon set - purpose + purpose-5 qca qoauth qtbase-5 qtnetworkauth-5 - sonnet)) + sonnet-5)) (home-page "https://kde.org/applications/internet/org.kde.choqok") (synopsis "Micro-Blogging Client") (description "Choqok is a fast, efficient and simple to use micro-blogging @@ -118,7 +119,7 @@ Other notable features include: (define-public falkon (package (name "falkon") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) @@ -126,18 +127,23 @@ Other notable features include: "/src/falkon-" version ".tar.xz")) (sha256 (base32 - "11r1iwimdzabfah68gsvw6xi67cj539anqa6s1rg33agsi5y56d3")))) + "0j930i2nvg71p05z881inbk59c54gx8dzhyjb8iaqkw8i5s5r983")))) (build-system qt-build-system) (arguments (list #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "ctest" "-E" - "(locationbartest|qmltabsapitest)"))))))) + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((qtwebengineprocess + (search-input-file inputs + "lib/qt6/libexec/QtWebEngineProcess"))) + ;; The program fails to find the QtWebEngineProcess program, so + ;; we set QTWEBENGINEPROCESS_PATH to help it. + (wrap-program (string-append #$output "/bin/falkon") + `("QTWEBENGINEPROCESS_PATH" = + (,qtwebengineprocess))))))))) (native-inputs - (list extra-cmake-modules pkg-config qttools-5)) + (list extra-cmake-modules pkg-config qttools)) (inputs (list karchive kcoreaddons @@ -147,11 +153,10 @@ Other notable features include: kwallet openssl purpose - qtquickcontrols-5 - qtsvg-5 - qtwebengine-5 - qtx11extras - qtwayland-5 + qt5compat + qtsvg + qtwebengine + qtwayland xcb-util)) (home-page "https://www.falkon.org/") (synopsis "Qt-based web browser for KDE") @@ -162,21 +167,23 @@ Other notable features include: (define-public kget (package (name "kget") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kget-" version ".tar.xz")) (sha256 - (base32 "1n9wnm1si4g4rv8zaqpr8m3c2aav0mj8i7z96m78dk1apippx77r")))) + (base32 "0xm3a3bxk4gb1yxpq3icg1wh5sqpmxqlr9n8j1gffszzd6c9x8mn")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools pkg-config)) (inputs (list boost gmp - gpgme + ;; TODO: enable when we qgpgme support qt6. + ;; gpgme + ;; qgpgme kcmutils kcompletion kconfig @@ -184,7 +191,6 @@ Other notable features include: kcoreaddons kcrash kdbusaddons - kdelibs4support ;; KLocale ki18n kiconthemes kio @@ -193,6 +199,7 @@ Other notable features include: knotifyconfig kparts kservice + kstatusnotifieritem ktextwidgets kwallet kwidgetsaddons @@ -200,20 +207,11 @@ Other notable features include: kxmlgui libgcrypt libktorrent - ;; TODO: libmms - ;; TODO: LibKWorkspace - plasma-workspace? + libmms breeze-icons ; default icon set - qca - qgpgme - qtbase-5)) + qca-qt6)) (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))))) + (list #:qtbase qtbase)) (home-page "https://www.kde.org/") (synopsis "Versatile and user-friendly download manager") (description "KGet is an advanced download manager with support for @@ -228,17 +226,17 @@ This package is part of the KDE networking module.") (define-public konversation (package (name "konversation") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/konversation-" version ".tar.xz")) (sha256 - (base32 "1ip0jlz71fad5l0ppbc6w914hqk7h626s12ssbb9p1c2yvlr1j1v")))) + (base32 "1migcrl2d3i4iadijhpap0mm2cd7irp3g2962flll41mv5nhzwsl")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools qttools)) (inputs (list karchive kbookmarks @@ -247,7 +245,6 @@ This package is part of the KDE networking module.") kcoreaddons kcrash kdbusaddons - kemoticons kglobalaccel ki18n kiconthemes @@ -258,16 +255,19 @@ This package is part of the KDE networking module.") knotifications knotifyconfig kparts + kstatusnotifieritem + ktextwidgets kwallet kwidgetsaddons kwindowsystem breeze-icons ; default icon set phonon - qtbase-5 - qca - qtmultimedia-5 + qca-qt6 + qtmultimedia + qt5compat solid sonnet)) + (arguments (list #:qtbase qtbase)) (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) @@ -377,38 +377,46 @@ This package is part of the KDE networking module.") (define-public krdc (package (name "krdc") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/krdc-" version ".tar.xz")) (sha256 - (base32 "0jva74n11fpm4ix4sbi0y1xnbly97lnap7dfj0bliw5s2d0sdjr0")))) + (base32 "0xw9ks43llm4lnnswv1h81gmr8mr6191bblmd21c1a5a6vvr935h")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules pkg-config kdoctools)) (inputs - (list kbookmarks + (list breeze-icons ; default icon set + kbookmarks freerdp kcmutils kcompletion kconfig kdnssd ki18n + kio kiconthemes knotifications knotifyconfig + kstatusnotifieritem kwallet kwidgetsaddons kwindowsystem kxmlgui + plasma-activities libssh libvnc - breeze-icons ; default icon set - qtbase-5)) - (arguments ;; FIXEME: libvnc can't be found for some reason. - (list #:configure-flags #~(list "-DWITH_VNC=NO"))) + ;; XXX: libvnc's Libs.private, remove when we use pkgconf + lzo + libjpeg-turbo + libgcrypt + gnutls)) + (arguments + (list #:configure-flags #~(list "-DQT_MAJOR_VERSION=6") + #:qtbase qtbase)) (home-page "https://apps.kde.org/krdc/") (synopsis "Remote desktop client") (description "KRDC is a client application that allows you to view or even @@ -422,15 +430,16 @@ This package is part of the KDE networking module.") (define-public ktorrent (package (name "ktorrent") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/ktorrent-" version ".tar.xz")) (sha256 - (base32 "17q6ivnbh4zxqnbm1bdzz3hri1434sq2rs9y57lvn4bb2xdwn1z5")))) + (base32 "1m96ch4rfrjnrw9rd7ad3ipc0hvhxl2awb7aqfnk4dd1g8hhjkq0")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -444,6 +453,7 @@ This package is part of the KDE networking module.") kcrash kdbusaddons kdnssd + kglobalaccel ki18n kiconthemes kio @@ -451,18 +461,16 @@ This package is part of the KDE networking module.") knotifyconfig kparts kplotting - kross + kstatusnotifieritem kwidgetsaddons kwindowsystem kxmlgui libgcrypt libktorrent - ;; TODO: LibKWorkspace -> plasma-workspace? breeze-icons ; default icon set phonon - qtbase-5 - qtscript - qtwebengine-5 + qt5compat + qtwebengine solid syndication taglib)) @@ -477,30 +485,30 @@ a full-featured client for BitTorrent.") (define-public libktorrent (package (name "libktorrent") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 - (base32 "1m6gyk1bids7qr9wfh6gcfq73ac9j5b2bljvfvfsw9f1ky1cmwab")))) + (base32 "1gr31v09jz5kdvhrpln9abncnnih7db35j3af73m3vlg6izw9z98")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules)) (inputs (list boost gmp - karchive kcrash ki18n kio libgcrypt - qca - qtbase-5 + qca-qt6 solid)) + (propagated-inputs (list karchive qt5compat)) (home-page "https://invent.kde.org/network/libktorrent") - (synopsis "BitTorrent protocol library for C++ / Qt 5 / KDE Frameworks") + (synopsis "BitTorrent protocol library for C++ / Qt 6 / KDE Frameworks") (description "The KTorrent library supports connectivity to HTTP and UDP trackers, mainline DHT and the new generation Micro Transport Protocol (uTP). In addition, it provides many powerful BitTorrent network diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index b7e7929810..520981550b 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -32,6 +32,7 @@ #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages audio) + #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages cdrom) @@ -41,6 +42,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) #:use-module (gnu packages gstreamer) + #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) @@ -59,14 +61,14 @@ (define-public audiocd-kio (package (name "audiocd-kio") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/audiocd-kio-" version ".tar.xz")) (sha256 - (base32 "0kl0j5qy54q88cbclwqj0rn8hj3gzjhzk7bimjgw5w0xy3cw6kql")))) + (base32 "1ldw51wly4shk4c9a0lc6j8ax176bb9f1l5r5x6rcgwz1vncd3g4")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -80,8 +82,8 @@ libkcddb libkcompactdisc libvorbis - phonon - qtbase-5)) + phonon)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kio_audiocd/") (synopsis "Transparent audio CD integration for applications using the KDE Platform") @@ -98,14 +100,14 @@ This package is part of the KDE multimedia module.") (define-public dragon (package (name "dragon") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/dragon-" version ".tar.xz")) (sha256 - (base32 "0mliddp0nyxz91wzy8md0p0i45mlhffip4zqjl4db55x4p6wh4y8")))) + (base32 "1waq80b5lxmk6q31yzs24mrz3nwm1y2rvz21bfhsgh2xw4fqmfsy")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -127,8 +129,8 @@ This package is part of the KDE multimedia module.") breeze-icons ; default icon set phonon phonon-backend-vlc - qtbase-5 solid)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/dragonplayer/") (synopsis "Simple video player") (description "Dragon Player is a multimedia player where the focus is on @@ -144,18 +146,18 @@ This package is part of the KDE multimedia module.") (define-public elisa (package (name "elisa") - (version "23.08.5") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/elisa-" version ".tar.xz")) (sha256 - (base32 "1hml0bmp1cfqc9x9q2a1lz2f6ab7ygblf6xz0qlwjxripvqw8b47")))) + (base32 "03hvkn4l4k0jbww5q72spk9nbgfxi8k7zk5z2mlc63c0j7q7w5y0")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config dbus kdoctools - xorg-server-for-tests)) + xorg-server-for-tests python-minimal)) (inputs (list kconfig baloo @@ -170,25 +172,22 @@ This package is part of the KDE multimedia module.") kiconthemes kio kirigami - kmediaplayer + kirigami-addons + qqc2-desktop-style kparts kpackage kwidgetsaddons kxmlgui breeze-icons ; default icon set phonon - qtbase-5 - qtdeclarative-5 - qtgraphicaleffects ; not listed as dependency - qtmultimedia-5 - qtquickcontrols-5 - qtquickcontrols2-5 - qtsvg-5 - qtx11extras + qtsvg + qtdeclarative + qtmultimedia ;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt vlc)) (arguments - `(#:tests? #f ;; many tests fail + `(#:qtbase ,qtbase + #:tests? #f ;; many tests fail #:phases (modify-phases %standard-phases (add-before 'check 'start-xorg-server @@ -215,19 +214,21 @@ its own database. You can build and play your own playlist.") (define-public ffmpegthumbs (package (name "ffmpegthumbs") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/ffmpegthumbs-" version ".tar.xz")) (sha256 - (base32 "02wvhjqqird55xcs4kkj0s7nam4vqh3khjz5f1mjqfnk62sj1plx")))) + (base32 "1b7jajn7mr5g6k9j3b0b8qng175748w9qd2bxj3v0sksi7ayn4bw")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list ffmpeg kconfig ki18n kio taglib qtbase-5)) + (list ffmpeg kconfig ki18n kio taglib)) + (arguments (list #:qtbase qtbase + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) (home-page "https://apps.kde.org/ffmpegthumbs/") (synopsis "Video thumbnail generator for KDE using ffmpeg") (description " @@ -241,14 +242,14 @@ This package is part of the KDE multimedia module.") (define-public juk (package (name "juk") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/juk-" version ".tar.xz")) (sha256 - (base32 "1q0r0iv4nn6jd0g8db54r7xdw7kdw1ja0z1ggxl1sy0k60m9c4q3")))) + (base32 "1yk6c0lagj47m5i7s73rsrk61fs1cjbf0dhhvbyasy4avlxsfgxa")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -265,6 +266,7 @@ This package is part of the KDE multimedia module.") kio knotifications ktextwidgets + kstatusnotifieritem kwallet kwidgetsaddons kwindowsystem @@ -272,9 +274,10 @@ This package is part of the KDE multimedia module.") breeze-icons ; default icon set phonon phonon-backend-vlc - qtbase-5 - qtsvg-5 + qtbase + qtsvg taglib)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/juk/") (synopsis "Music jukebox / music player") (description "JuK is a powerful music player capable of managing a large @@ -295,7 +298,7 @@ This package is part of the KDE multimedia module.") (define-public kid3 (package (name "kid3") - (version "3.9.4") + (version "3.9.5") (source (origin (method git-fetch) @@ -304,29 +307,32 @@ This package is part of the KDE multimedia module.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0j454nzwx0v7iwcixyjcx71shzh3ag4ydggs8d68alrfj9f4ajap")))) + (base32 "09pva85ffamjdr6m446jcvxjw8qyy7anmj1gz0fvn9ns3d1jgg46")))) (build-system qt-build-system) (arguments (list #:configure-flags - #~(list (string-append "-DDOCBOOK_XSL_DIR=" - #$(this-package-native-input "docbook-xsl"))) + #~(list + "-DBUILD_WITH_QT6=ON" + (string-append "-DDOCBOOK_XSL_DIR=" + #$(this-package-native-input "docbook-xsl"))) + #:qtbase qtbase #:phases - `(modify-phases %standard-phases - ;; FIXME: Documentation build scripts use unix pipes, which will fail - ;; in the build environment. - (add-after 'unpack 'skip-docs - (lambda _ - (substitute* "CMakeLists.txt" - (("add_subdirectory\\(doc\\)") ""))))))) + #~(modify-phases %standard-phases + ;; FIXME: Documentation build scripts use unix pipes, which will fail + ;; in the build environment. + (add-after 'unpack 'skip-docs + (lambda _ + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(doc\\)") ""))))))) (native-inputs (list docbook-xsl extra-cmake-modules ffmpeg-4 kdoctools libxslt - python-wrapper - qttools-5)) + python-minimal-wrapper + qttools)) (inputs (list chromaprint flac @@ -338,9 +344,8 @@ This package is part of the KDE multimedia module.") kwidgetsaddons kxmlgui libvorbis - qtbase-5 - qtdeclarative-5 - qtmultimedia-5 + qtdeclarative + qtmultimedia readline taglib zlib)) @@ -353,52 +358,51 @@ variety of formats.") (define-public k3b (package (name "k3b") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/k3b-" version ".tar.xz")) (sha256 - (base32 "1kr1hw4pws87zzwyrwrg2ysdn11qf0qhwi1vc9b0k8jkjmmdplmb")))) + (base32 "11r6nda3djj9p918sx9bpipc1byg5mvgib4vyf0kpdpnh9bnhvcj")))) (build-system qt-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-absolute-library-paths - (lambda* (#:key inputs #:allow-other-keys) - ;; Set absolute paths for dlopened libraries. We can’t use k3b’s - ;; runpath as they are loaded by the Qt library. - (let ((libcdio-paranoia (assoc-ref inputs "libcdio-paranoia")) - (libdvdcss (assoc-ref inputs "libdvdcss"))) - (substitute* "libk3b/tools/k3bcdparanoialib.cpp" - (("\"(cdio_cdda|cdio_paranoia)\"" _ library) - (string-append "\"" libcdio-paranoia "/lib/" library "\""))) - (substitute* "libk3b/tools/k3blibdvdcss.cpp" - (("\"(dvdcss)\"" _ library) - (string-append "\"" libdvdcss "/lib/" library "\"")))) - #t)) - (add-before 'configure 'fix-cmake-taglib - (lambda _ - ;; Use the CMake variables provided by FindTaglib from - ;; extra-cmake-modules, instead of bundled FindTaglib.cmake: - (substitute* - '("plugins/decoder/mp3/CMakeLists.txt" - "plugins/decoder/flac/CMakeLists.txt" - "plugins/project/audiometainforenamer/CMakeLists.txt") - (("TAGLIB_INCLUDES") "Taglib_INCLUDE_DIRS") - (("TAGLIB_LIBRARIES") "Taglib_LIBRARIES")))) - (add-after 'qt-wrap 'wrap-path - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Set paths to backend programs. - (wrap-program (string-append (assoc-ref outputs "out") "/bin/k3b") - `("PATH" ":" prefix - ,(map (lambda (input) - (string-append (assoc-ref inputs input) "/bin")) - '("cdrdao" "cdrtools" "dvd+rw-tools" "libburn" "sox")))) - #t))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-absolute-library-paths + (lambda* (#:key inputs #:allow-other-keys) + ;; Set absolute paths for dlopened libraries. We can’t use k3b’s + ;; runpath as they are loaded by the Qt library. + (let ((libcdio-paranoia (assoc-ref inputs "libcdio-paranoia")) + (libdvdcss (assoc-ref inputs "libdvdcss"))) + (substitute* "libk3b/tools/k3bcdparanoialib.cpp" + (("\"(cdio_cdda|cdio_paranoia)\"" _ library) + (string-append "\"" libcdio-paranoia "/lib/" library "\""))) + (substitute* "libk3b/tools/k3blibdvdcss.cpp" + (("\"(dvdcss)\"" _ library) + (string-append "\"" libdvdcss "/lib/" library "\"")))))) + (add-before 'configure 'fix-cmake-taglib + (lambda _ + ;; Use the CMake variables provided by FindTaglib from + ;; extra-cmake-modules, instead of bundled FindTaglib.cmake: + (substitute* + '("plugins/decoder/mp3/CMakeLists.txt" + "plugins/decoder/flac/CMakeLists.txt" + "plugins/project/audiometainforenamer/CMakeLists.txt") + (("TAGLIB_INCLUDES") "Taglib_INCLUDE_DIRS") + (("TAGLIB_LIBRARIES") "Taglib_LIBRARIES")))) + (add-after 'qt-wrap 'wrap-path + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Set paths to backend programs. + (wrap-program (string-append (assoc-ref outputs "out") "/bin/k3b") + `("PATH" ":" prefix + ,(map (lambda (input) + (string-append (assoc-ref inputs input) "/bin")) + '("cdrdao" "cdrtools" "dvd+rw-tools" "libburn" "sox"))))))))) (native-inputs - (list extra-cmake-modules pkg-config kdoctools)) + (list extra-cmake-modules pkg-config kdoctools-5)) (inputs (list bash-minimal cdrdao @@ -406,28 +410,28 @@ variety of formats.") dvd+rw-tools ffmpeg flac - karchive - kcmutils - kconfig - kcoreaddons - kfilemetadata - ki18n - kiconthemes - kio - kjobwidgets - knewstuff - knotifications - knotifyconfig - kservice - kwidgetsaddons - kxmlgui + karchive-5 + kcmutils-5 + kconfig-5 + kcoreaddons-5 + kfilemetadata-5 + ki18n-5 + kiconthemes-5 + kio-5 + kjobwidgets-5 + knewstuff-5 + knotifications-5 + knotifyconfig-5 + kservice-5 + kwidgetsaddons-5 + kxmlgui-5 lame libburn libcdio-paranoia libdvdcss libdvdread ;; TODO: LibFuzzer - libkcddb + libkcddb-qt5 libmad libmpcdec ;;("libmusicbrainz" ,libmusicbrainz) ; wants old version 2 @@ -435,9 +439,8 @@ variety of formats.") libsndfile libvorbis breeze-icons ; default icon set - qtbase-5 shared-mime-info - solid + solid-5 sox taglib zlib)) @@ -466,32 +469,31 @@ the available CD drives.") (base32 "10dnhr9v2jlki44i3gmjagky66ybixmv6f29z5imk9clgddrlyfr")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules pkg-config kdoctools)) + (list extra-cmake-modules pkg-config kdoctools-5)) (inputs (list eudev - kcoreaddons - kdbusaddons - ki18n - kio - kwidgetsaddons - kwindowsystem - kxmlgui + kcoreaddons-5 + kdbusaddons-5 + ki18n-5 + kio-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 libxscrnsaver breeze-icons ; default icon set qtbase-5 qtx11extras - solid + solid-5 v4l-utils ; libdvbv5 vlc)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-code - (lambda _ - (substitute* "src/dvb/dvbdevice_linux.cpp" - (("\\s*qPrintable\\(transponder\\.getTransmissionType\\(\\)\\)\\);") - "transponder.getTransmissionType());")) - #t))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-code + (lambda _ + (substitute* "src/dvb/dvbdevice_linux.cpp" + (("\\s*qPrintable\\(transponder\\.getTransmissionType\\(\\)\\)\\);") + "transponder.getTransmissionType());"))))))) (home-page "https://apps.kde.org/kaffeine/") (synopsis "Versatile media player for KDE") (description "Kaffeine is a media player for KDE. While it supports @@ -507,31 +509,32 @@ autoloading of subtitle files for use while playing video.") (define-public kamoso (package (name "kamoso") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kamoso-" version ".tar.xz")) (sha256 - (base32 "1f06331qigf5wi6lgir5ij8h1fsdn54v32fyw2mgf0hg05xndrcl")))) + (base32 "1i2w2cmlfr9q4p405kycy2xqp8q5d6f1j3pwr5sbdhis3rm7vm4l")))) (build-system qt-build-system) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules) - ("glib:bin" ,glib "bin") - ("kdoctools" ,kdoctools) - ("pkg-config" ,pkg-config))) + (list + extra-cmake-modules + `(,glib "bin") + kdoctools-5 + pkg-config)) (inputs (list gstreamer gst-plugins-base - kconfig - ki18n - kio - kirigami - knotifications - kparts + kconfig-5 + ki18n-5 + kio-5 + kirigami-5 + knotifications-5 + kparts-5 breeze-icons ; default icon set - purpose + purpose-5 qtbase-5 qtdeclarative-5 qtgraphicaleffects @@ -550,39 +553,39 @@ camera. Use it to take pictures and make videos to share.") (define-public kmix (package (name "kmix") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kmix-" version ".tar.xz")) - (sha256 - (base32 "09pfsa6y1phm6z24da60s47gc18w4cvv7r8sxh5qfww7b0dnhixj")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kmix-" version ".tar.xz")) + (sha256 + (base32 "1ha0sil2vbpvgys7jkhav7j5g7drg57ypr8c9i3c8ndqwpsyxk3g")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools pkg-config)) + (list extra-cmake-modules kdoctools-5 pkg-config)) (inputs (list alsa-lib glib - kconfigwidgets - kcompletion - kconfig - kconfigwidgets - kcrash - kdbusaddons - kglobalaccel - ki18n - kiconthemes - knotifications - kwidgetsaddons - kwindowsystem - kxmlgui + kconfigwidgets-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcrash-5 + kdbusaddons-5 + kglobalaccel-5 + ki18n-5 + kiconthemes-5 + knotifications-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 libcanberra breeze-icons ; default icon set plasma-framework pulseaudio qtbase-5 - solid)) + solid-5)) (home-page "https://apps.kde.org/kmix/") (synopsis "Volume control and mixer") (description "KMix is an audio device mixer, used to adjust volume, select @@ -592,109 +595,40 @@ This package is part of the KDE multimedia module.") (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) -(define-public kmplayer - ;; 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. - -Some features: -@itemize -@item play DVD/VCD movies (from file or url and from a video device) -@item embed inside konqueror (movie is played inside konqueror) -@item embed inside khtml (movie playback inside a html page) -@item Movie recording using mencoder (part of the mplayer package) -@item No video during recording, but you can always open a new window and play it -@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+))))) - (define-public kwave (package (name "kwave") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kwave-" version ".tar.xz")) + "/src/kwave-" version ".tar.xz")) (sha256 - (base32 "0s9w8jgwblljwfji2a19bqs3nx6sr2qzz35kwbi0ahwncy69k4jx")))) + (base32 "1g3gaxmchsf9c7zvx608wl41qs001vr1zm0cgnaim753446vb08f")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules (librsvg-for-system) pkg-config kdoctools)) + (list extra-cmake-modules (librsvg-for-system) pkg-config kdoctools-5 + tzdata-for-tests)) (inputs (list alsa-lib audiofile flac id3lib - karchive - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kcrash - kdbusaddons - ki18n - kiconthemes - kio - kservice - ktextwidgets - kwidgetsaddons - kxmlgui + karchive-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kcrash-5 + kdbusaddons-5 + ki18n-5 + kiconthemes-5 + kio-5 + kservice-5 + ktextwidgets-5 + kwidgetsaddons-5 + kxmlgui-5 libmad libsamplerate libvorbis @@ -704,6 +638,15 @@ Some features: qtbase-5 qtmultimedia-5 zlib)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-TZDATA + (lambda* (#:key inputs tests? #:allow-other-keys) + (setenv "TZDIR" + (search-input-directory inputs + "share/zoneinfo"))))))) (home-page "https://apps.kde.org/kwave/") (synopsis "Sound editor for KDE") (description "Kwave is a sound editor designed for the KDE Desktop @@ -739,14 +682,14 @@ Its features include: (define-public libkcddb (package (name "libkcddb") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkcddb-" version ".tar.xz")) (sha256 - (base32 "1s10g6m6c3h14gzxvp2s0v51jxzsrh23xfn7gl51a0r50srbbz52")))) + (base32 "0b2khcfm3jnc4iar0ljsq0z3dr3ak6jyaqnbgwj3yk2j05j0yc9n")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -757,27 +700,50 @@ Its features include: kio kcmutils kwidgetsaddons - libmusicbrainz - qtbase-5)) + libmusicbrainz)) (arguments - `(#:tests? #f)) ; Most tests require network + (list + #:qtbase qtbase + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6") + #:tests? #f)) ; Most tests require network (home-page "https://invent.kde.org/multimedia/libkcddb") (synopsis "CDDB library for KDE Platform (runtime)") (description "A library for retrieving and sending cddb information.") (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) +(define-public libkcddb-qt5 + (package + (inherit libkcddb) + (name "libkcddb-qt5") + (native-inputs + (list extra-cmake-modules kdoctools-5)) + (inputs + (list kcodecs-5 + kconfig-5 + ki18n-5 + kio-5 + kcmutils-5 + kwidgetsaddons-5 + libmusicbrainz)) + (arguments + (list + #:qtbase qtbase-5 + #:configure-flags #~(list "-DQT_MAJOR_VERSION=5") + ;; Most tests require network + #:tests? #f)))) + (define-public libkcompactdisc (package (name "libkcompactdisc") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkcompactdisc-" version ".tar.xz")) (sha256 - (base32 "0gl21mhfz3vj89x0r8y79yiijcag1xfdnyfrjqzkx9i8yd2k45b1")))) + (base32 "1lh6vn5aqwlvnb7q29nwxqzb4i4ymd1gs0y1k0vf5czhywrr9gqm")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -786,8 +752,10 @@ Its features include: kcoreaddons ki18n phonon - qtbase-5 solid)) + (arguments (list + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6") + #:qtbase qtbase)) (home-page "https://invent.kde.org/multimedia/libkcompactdisc") (synopsis "KDE library for playing & ripping CDs") (description "The KDE Compact Disc library provides an API for diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 5780b9dbca..c95cf653c2 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -45,23 +45,25 @@ #:use-module (gnu packages openldap) #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages qt) #:use-module (gnu packages search) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml)) (define-public akonadi (package (name "akonadi") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-" version ".tar.xz")) (sha256 (base32 - "0jpp91d5rlblq6r981wxizmsv512kc43lfk8y29bdky6j4idflrb")) + "0ygxj2hhslg5frarwhmdqqhvd37kzcgm60krs979f378dkj6cyc8")) (patches (search-patches "akonadi-paths.patch" "akonadi-timestamps.patch" "akonadi-not-relocatable.patch")))) @@ -69,12 +71,12 @@ (native-inputs (list dbus extra-cmake-modules - qttools-5 + qttools shared-mime-info pkg-config)) (inputs (list boost - libaccounts-qt + libaccounts-qt6 kconfig kconfigwidgets kcoreaddons @@ -92,11 +94,11 @@ ;; 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 - qtbase-5)) + signond)) (propagated-inputs (list sqlite kaccounts-integration)) (arguments - (list #:tests? #f + (list #:qtbase qtbase + #:tests? #f #:configure-flags #~'("-DDATABASE_BACKEND=SQLITE") ;lightweight #:modules `((ice-9 textual-ports) ,@%qt-build-system-modules) @@ -136,44 +138,46 @@ programs.") (define-public akonadi-calendar (package (name "akonadi-calendar") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-calendar-" version ".tar.xz")) (sha256 - (base32 "166xm57jcy7d2dv2pfy4lllzic4giin31szxz7xq3a7ixsd6g7cs")))) + (base32 "0nwl3jn7qqhs19ydxidjzh7vdll5s17pw4xaazmd3g7fg6mngnzh")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list akonadi - akonadi-contacts + (list akonadi-contacts akonadi-mime boost - grantlee grantleetheme - kcalendarcore kcalutils kcodecs kcontacts kdbusaddons - ki18n kiconthemes - kidentitymanagement kio kitemmodels kmailtransport kmime + kmessagelib knotifications kpimtextedit ksmtp ktextwidgets - kwallet - qtbase-5)) + kxmlgui + kwallet)) + (propagated-inputs (list akonadi + kcalendarcore + ki18n + kwidgetsaddons + kidentitymanagement)) (arguments - `(#:tests? #f)) ;; TODO: 1/1 test fails + (list #:qtbase qtbase + #:tests? #f)) ;; TODO: 1/1 test fails (home-page "https://api.kde.org/kdepim/akonadi/html/index.html") (synopsis "Library providing calendar helpers for Akonadi items") (description "This library manages calendar specific actions for @@ -183,21 +187,20 @@ collection and item views.") (define-public akonadi-contacts (package (name "akonadi-contacts") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-contacts-" version ".tar.xz")) (sha256 - (base32 "10vlzj56ps1pysf7g6i14v8wp2wkxh53055r2v4iq4cpq3mzayc6")))) + (base32 "1207dgilr5y4b3g3fk2ywyvb6mryq2xrpkhi6cyhgn8k84q201fn")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list akonadi boost - grantlee grantleetheme kauth kcmutils @@ -215,14 +218,17 @@ collection and item views.") kmime kservice ktextwidgets + ktexttemplate + ktextaddons + ktexteditor kwidgetsaddons kxmlgui - libkleo prison kio - qtbase-5 solid sonnet)) + (arguments + (list #:qtbase qtbase)) (home-page "https://api.kde.org/kdepim/akonadi/html/index.html") (synopsis "Akonadi contacts access library") (description "Akonadi Contacts is a library that effectively bridges the @@ -238,14 +244,14 @@ to list and filter contacts.") (define-public akonadi-mime (package (name "akonadi-mime") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-mime-" version ".tar.xz")) (sha256 - (base32 "1r33v2q49s7l90id4jqg0lar9p1j5k0cbnzsaqdksavzpzkcklh5")))) + (base32 "1y6h53jfy77g7198cp5rfv0zabvfjg6fsw95wp4khcjvmm0qhzqm")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules libxslt ;; xslt for generating interface descriptions @@ -262,21 +268,22 @@ to list and filter contacts.") kitemmodels kmime kwidgetsaddons - kxmlgui - qtbase-5)) + kxmlgui)) (home-page "https://api.kde.org/kdepim/akonadi/html/index.html") (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'copy-desktop-file-early - (lambda _ - (let ((plugins-dir "/tmp/.local/share/akonadi/plugins/serializer")) - (mkdir-p plugins-dir) - (copy-file "serializers/akonadi_serializer_mail.desktop" - (string-append plugins-dir "/akonadi_serializer_mail.desktop"))))) - (add-before 'check 'check-setup - (lambda _ - (setenv "HOME" "/tmp")))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-desktop-file-early + (lambda _ + (let ((plugins-dir "/tmp/.local/share/akonadi/plugins/serializer")) + (mkdir-p plugins-dir) + (copy-file "serializers/akonadi_serializer_mail.desktop" + (string-append plugins-dir "/akonadi_serializer_mail.desktop"))))) + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" "/tmp")))))) (synopsis "Akonadi MIME handling library") (description "Akonadi Mime is a library that effectively bridges the type-agnostic API of the Akonadi client libraries and the domain-specific @@ -288,19 +295,20 @@ with emails through Akonadi easier.") (define-public akonadi-notes (package (name "akonadi-notes") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-notes-" version ".tar.xz")) (sha256 - (base32 "0s5a414cdcz37srys2w3c2z5c63ha9ivsqj0srnfwwv0pxix266v")))) + (base32 "0cb1nbjlsx3lhz27ggrhmgrbgljhwrh7pssmx4jkljhahi57vwxa")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list akonadi kcodecs ki18n kmime qtbase-5)) + (list akonadi kcodecs ki18n kmime)) + (arguments (list #:qtbase qtbase)) (home-page "https://api.kde.org/kdepim/akonadi/html/index.html") (synopsis "Akonadi notes access library") (description "Akonadi Notes is a library that effectively bridges the @@ -313,14 +321,14 @@ wrapping notes into KMime::Message objects.") (define-public akonadi-search (package (name "akonadi-search") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-search-" version ".tar.xz")) (sha256 - (base32 "1hpclfcb7almvajscm2az36bw9rrhkp3ywb9h0j9h8ims2gm60m7")))) + (base32 "11lasaim65d37n0q8pyxnn0sqqq2liz6va951qc3bav8njigsny1")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules @@ -335,29 +343,33 @@ wrapping notes into KMime::Message objects.") kcontacts kcrash kdbusaddons + ktextaddons ki18n kio kitemmodels kmime + kxmlgui krunner kwindowsystem - qtbase-5 xapian)) (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-failing-test - (lambda _ - ;; FIXME: This test fails because it fails to establish - ;; a socket connection, seemingly due to failure during - ;; DBus communication. See also 'korganizer'. - (substitute* "agent/autotests/CMakeLists.txt" - ((".*schedulertest\\.cpp.*") - "")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "dbus-launch" "ctest" "-E" - "akonadi-sqlite-collectionindexingjobtest"))))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-test + (lambda _ + ;; FIXME: This test fails because it fails to establish + ;; a socket connection, seemingly due to failure during + ;; DBus communication. See also 'korganizer'. + (substitute* "agent/autotests/CMakeLists.txt" + ((".*schedulertest\\.cpp.*") + "")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dbus-launch" "ctest" "-E" + "akonadi-sqlite-collectionindexingjobtest"))))))) (home-page "https://api.kde.org/kdepim/akonadi/html/index.html") (synopsis "Akonadi search library") (description "This package provides a library used to search in the @@ -368,18 +380,29 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.") (define-public itinerary (package (name "itinerary") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 (base32 - "132x68wc4pallxgkvridfsimfq5m2g47fj9lcgz1kq4gdsidzf6i")))) + "1p05v9r1ipi465nmka8n2gs7npc6wdgfxzj7523plnja9kfa8bmb")))) (build-system qt-build-system) + (arguments - `(#:tests? #f)) ;Fails 20/27 - (native-inputs (list extra-cmake-modules)) + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'stop-require-qmlmodule + (lambda _ + ;; HACK: ecm_find_qmlmodule cann't find qmlmodule on other + ;; prefix, so we remove it require. + (substitute* "CMakeLists.txt" + (("24.02 REQUIRED") + "24.02"))))) + #:tests? #f)) ;Fails 20/27 + (native-inputs (list extra-cmake-modules python-minimal)) (inputs (list karchive kdbusaddons ki18n @@ -402,11 +425,10 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.") kunitconversion kwindowsystem prison - qtdeclarative-5 - qtgraphicaleffects + qtdeclarative + qtpositioning qtlocation - qtmultimedia-5 - qtquickcontrols2-5 + qtmultimedia qqc2-desktop-style shared-mime-info solid @@ -418,19 +440,19 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.") "This package provides a tool for managing itinerary and boarding pass information.") (license ;GPL for programs, LGPL for libraries - (list license:gpl2+ license:lgpl2.0+)))) + (list license:gpl2+ license:lgpl2.0+)))) (define-public kincidenceeditor (package (name "kincidenceeditor") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/incidenceeditor-" version ".tar.xz")) (sha256 - (base32 "1pqfl7gqz7ibpns2gpwqpvzhsba7xj4ilhi4ax1vn3m086iyh3a0")))) + (base32 "1kwqr6h2b5jlxkd52g4kdnk78v3xpzqy3d2rl582j7fkhnnsfk40")))) (properties `((upstream-name . "incidenceeditor"))) (build-system qt-build-system) (native-inputs @@ -441,13 +463,13 @@ information.") akonadi-contacts akonadi-mime boost - grantlee grantleetheme kcalendarcore kcalendarsupport kcalutils kcodecs kcontacts + kconfigwidgets kdbusaddons kdiagram keventviews @@ -464,18 +486,20 @@ information.") kpimtextedit ktextaddons ktextwidgets + kxmlgui kwallet - libkdepim - qtbase-5)) + libkdepim)) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "dbus-launch" "ctest" ;; FIXME: tests fails. - "-E" - "(akonadi-sqlite-incidencedatetimetest|ktimezonecomboboxtest|testindividualmaildialog)"))))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dbus-launch" "ctest" ;; FIXME: tests fails. + "-E" + "(akonadi-sqlite-incidencedatetimetest|ktimezonecomboboxtest|testindividualmaildialog)"))))))) (home-page "https://invent.kde.org/pim/incidenceeditor") (synopsis "KDE PIM library for editing incidences") (description "This library provides an incidence editor for KDE PIM.") @@ -485,14 +509,14 @@ information.") (define-public kaddressbook (package (name "kaddressbook") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kaddressbook-" version ".tar.xz")) (sha256 - (base32 "0zjbri91dh9vnwi6jqkbmyq667yzn8g4kw5v47qn8id2629zj6jq")))) + (base32 "1g5qkg3m7djqrq28ypv998yp45kzldd3jss37ygdnbqwr5i4wjb8")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -502,8 +526,7 @@ information.") akonadi-mime akonadi-search boost - gpgme - grantlee + gpgme-1.23 grantleetheme kcalendarcore kcmutils @@ -528,8 +551,8 @@ information.") libkleo breeze-icons ; default icon set, required for tests prison - qgpgme - qtbase-5)) + qgpgme-qt6-1.23)) + (arguments (list #:qtbase qtbase)) (home-page "https://kontact.kde.org/components/kaddressbook/") (synopsis "Address Book application to manage your contacts") (description "KAddressBook stores all the personal details of your family, @@ -538,51 +561,17 @@ NextCloud, Kolab, Google Contacts, Microsoft Exchange (EWS) or any standard CalDAV server.") (license (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) -(define-public kblog - (package - (name "kblog") - (version "20.04.3") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kblog-" version ".tar.xz")) - (sha256 - (base32 "1d5r9ivc1xmhkrz780xga87p84h7dnxjl981qap16gy37sxahcjr")))) - (build-system qt-build-system) - (native-inputs - (list extra-cmake-modules)) - (inputs - (list kcalendarcore - kcoreaddons - ki18n - kio - kxmlrpcclient - qtbase-5 - syndication)) - ;; Note: Some tests take up to 90 sec. - (home-page "https://invent.kde.org/pim/kblog") - (synopsis "Client-side support library for web application remote blogging -APIs") - (description "KBlog is a library for calling functions on Blogger 1.0, -MetaWeblog, MovableType and GData compatible blogs. It calls the APIs using -KXmlRpcClient and Syndication. It supports asynchronous sending and fetching -of posts and, if supported on the server, multimedia files. Almost every -modern blogging web application that provides an XML data interface supports -one of the APIs mentioned above.") - (license license:lgpl2.0+))) - (define-public kaccounts-integration (package (name "kaccounts-integration") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 (base32 - "1mn64xw5r2magy5y0qmg5r907jz1y8jar0qqkc6s1zjjr3s3knac")))) + "0dbv1yv6qq0rgjlczmky7fmwa3rspyssd6grdbgzyy3k0v35m1fi")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kcmutils @@ -592,9 +581,10 @@ one of the APIs mentioned above.") kdeclarative kwallet kio - libaccounts-qt - qcoro-qt5 - signond)) + libaccounts-qt6 + qcoro-qt6 + signond-qt6)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/network/kaccounts-integration") (synopsis "Online account management system") (description "The Kaccounts Integration library provides online account @@ -604,129 +594,49 @@ management system and its Plasma integration components.") (define-public kaccounts-providers (package (name "kaccounts-providers") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 (base32 - "1lrmj6r09ypnpl2s586i4rd3fk3760qlxyrhh91k43wkb8i6m8f0")))) + "1mfidlhy8jh3ar9rpn39a52q6sfhc5f4yn30p2ihv9l7xi5r9vk0")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules intltool)) (inputs (list kaccounts-integration kcoreaddons kdeclarative + kpackage ki18n kio - libaccounts-qt - qtwebengine-5 - signond)) + libaccounts-qt6 + qtwebengine + signond-qt6)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/network/kaccounts-providers") (synopsis "Online account providers for the KAccounts system") (description "This package provides online account providers for the KAccounts system.") (license license:lgpl2.0+))) -(define-public kalendar - (package - (name "kalendar") - (version "23.04.3") - (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/" name "-" version - ".tar.xz")) - (sha256 - (base32 - "1w56glv8m1rlk86v78h69d21ydxb6i61g1dk6mcizjr5rvi4liy0")))) - (build-system qt-build-system) - (arguments - (list #:tests? #f ;All 2 tests fail - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'wrap-script - (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program (string-append #$output - "/bin/kalendar") - `("PATH" ":" prefix - (,(string-append #$(this-package-input "akonadi") - "/bin")))))) - (delete 'check) - (add-after 'wrap-script 'check-again - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "dbus-launch" "ctest"))))))) - (native-inputs (list dbus extra-cmake-modules)) - (inputs (list akonadi - akonadi-contacts - breeze-icons - gpgme - grantlee - grantleetheme - kio - kirigami - kirigami-addons - kdbusaddons - ki18n - kimap - kcalendarcore - kcalendarsupport - kconfigwidgets - kwindowsystem - kcoreaddons - kcontacts - kitemmodels - kmailcommon - kmessagelib - kmime - kidentitymanagement - kpimcommon - kpimtextedit - ktextaddons - ktextwidgets - akonadi-calendar - akonadi-mime - keventviews - kcalutils - kxmlgui - kiconthemes - libkdepim - libkleo - qtbase-5 - qtdeclarative-5 - qtquickcontrols2-5 - qtsvg-5 - qtquickcontrols-5 - qtgraphicaleffects - qtlocation - qqc2-desktop-style - qtwebengine-5)) - (home-page "https://apps.kde.org/kalendar/") - (synopsis "Calendar application") - (description - "Kalendar is a calendar application using Akonadi to sync with -external services.") - (license license:gpl3+))) - (define-public kcalendarsupport (package (name "kcalendarsupport") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/calendarsupport-" version ".tar.xz")) (sha256 - (base32 "1zk6kv5nhcd7a5llzh31890xpqdg522ahjdgbwsm7pcp62y0nbsj")))) + (base32 "0qih5p810h1860diqb9yszrv0arf63bd32x7rfizw6mhpkh20ryq")))) (properties `((upstream-name . "calendarsupport"))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs (list akonadi - akonadi-calendar akonadi-mime akonadi-notes boost @@ -738,15 +648,14 @@ external services.") kholidays ki18n kiconthemes - kidentitymanagement kio kitemmodels - kmime kpimcommon kpimtextedit ktextwidgets - kxmlgui - qtbase-5)) + kxmlgui)) + (propagated-inputs (list akonadi-calendar kidentitymanagement kmime)) + (arguments (list #:qtbase qtbase)) (home-page "https://api.kde.org/kdepim/calendarsupport/html/index.html") (synopsis "Calendar Support library for KDE PIM") (description "The Calendar Support library provides helper utilities for @@ -757,19 +666,19 @@ calendaring applications.") (define-public kcalutils (package (name "kcalutils") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kcalutils-" version ".tar.xz")) (sha256 - (base32 "1j7f5ai25zcxggw3dvky624asxim5bkd6a35rcdzkjhj1qwk3vll")))) + (base32 "1hiygvhw9nmqsz7pca6za9as06m8l0wsv78ski6gcjwzpi7qh0vq")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules libxml2)) ;; xmllint required for tests (inputs - (list grantlee + (list breeze-icons ; default icon set, required for tests kcalendarcore kcodecs kconfig @@ -780,11 +689,11 @@ calendaring applications.") kidentitymanagement kpimtextedit ktextwidgets - kwidgetsaddons - breeze-icons ; default icon set, required for tests - qtbase-5)) + ktexttemplate + kwidgetsaddons)) (arguments - `(#:tests? #f)) ;; TODO: seem to pull in some wrong theme + (list #:qtbase qtbase + #:tests? #f)) ;; TODO: seem to pull in some wrong theme (home-page "https://api.kde.org/kdepim/kcalutils/html/index.html") (synopsis "Library with utility functions for the handling of calendar data") @@ -795,14 +704,14 @@ functions for accessing calendar data using the kcalcore API.") (define-public kdepim-runtime (package (name "kdepim-runtime") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kdepim-runtime-" version ".tar.xz")) (sha256 - (base32 "1wvwibq6zzjlhh8yqrlqras0m8i01ynlwj9z6l3f0g0hyyz5nkw4")))) + (base32 "1jymvmiqbyl8qcff835sp6kw8w4lg4clm7p5cscfmcx6b9bg4w7l")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules dbus kdoctools libxslt shared-mime-info)) @@ -814,7 +723,6 @@ functions for accessing calendar data using the kcalcore API.") akonadi-notes boost cyrus-sasl - grantlee grantleetheme kcalendarcore kcalutils @@ -833,44 +741,43 @@ functions for accessing calendar data using the kcalcore API.") kldap kmbox kmime + kxmlgui knotifications knotifyconfig kpimcommon kpimtextedit - kross ktextwidgets kwallet kwindowsystem libkdepim libkgapi ;; TODO: libkolab - qca - qtbase-5 - qtdeclarative-5 - qtkeychain - qtnetworkauth-5 - qtspeech-5 - qtwebchannel-5 - qtwebengine-5 - qtxmlpatterns)) + qca-qt6 + qtdeclarative + qtkeychain-qt6 + qtnetworkauth + qtspeech + qtwebchannel + qtwebengine)) (arguments - ;; TODO: 5/45 tests fail for quite different reasons, even with - ;; "offscreen" and dbus - `(#:phases (modify-phases %standard-phases - (add-after 'set-paths 'extend-CPLUS_INCLUDE_PATH - (lambda* (#:key inputs #:allow-other-keys) - ;; FIXME: <Akonadi/KMime/SpecialMailCollections> is not - ;; found during one of the compilation steps without - ;; this hack. - (setenv "CPLUS_INCLUDE_PATH" - (string-append - (assoc-ref inputs "akonadi-mime") "/include/KF5:" - (or (getenv "CPLUS_INCLUDE_PATH") ""))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; FIXME: Atleast some appear to require network. - (invoke "dbus-launch" "ctest" "-E" "\ + ;; TODO: 5/45 tests fail for quite different reasons, even with + ;; "offscreen" and dbus + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases + (add-after 'set-paths 'extend-CPLUS_INCLUDE_PATH + (lambda* (#:key inputs #:allow-other-keys) + ;; FIXME: <Akonadi/KMime/SpecialMailCollections> is not + ;; found during one of the compilation steps without + ;; this hack. + (setenv "CPLUS_INCLUDE_PATH" + (string-append + (assoc-ref inputs "akonadi-mime") "/include/KF6:" + (or (getenv "CPLUS_INCLUDE_PATH") ""))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; FIXME: Atleast some appear to require network. + (invoke "dbus-launch" "ctest" "-E" "\ (akonadi-sqlite-synctest|akonadi-sqlite-pop3test|storecompacttest\ |akonadi-sqlite-ewstest|ewsmoveitemrequest_ut|ewsdeleteitemrequest_ut\ |ewsgetitemrequest_ut|ewsunsubscriberequest_ut|ewssettings_ut\ @@ -890,24 +797,21 @@ package.") (define-public keventviews (package (name "keventviews") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/eventviews-" version ".tar.xz")) (sha256 - (base32 "1nh8a7jy0sjsyi41pxhxwjkq6fr4yy9rqgcjjbj01dnx1ykz3d7l")))) + (base32 "0kqkd8dqh8plmxngajr8266nad2sm7qf711h2jpiav753p0xas5z")))) (properties `((upstream-name . "eventviews"))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs - (list akonadi - akonadi-calendar - akonadi-contacts + (list akonadi-contacts boost - kcalendarcore kcalendarsupport kcalutils kcodecs @@ -928,8 +832,12 @@ package.") kservice ktextwidgets kxmlgui - libkdepim - qtbase-5)) + libkdepim)) + (propagated-inputs (list akonadi + akonadi-calendar + kcalendarcore + kcalendarsupport)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/pim/eventviews") (synopsis "KDE PIM library for creating events") (description "This library provides an event creator for KDE PIM.") @@ -939,17 +847,18 @@ package.") (define-public kgpg (package (name "kgpg") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kgpg-" version ".tar.xz")) (sha256 - (base32 "1ihxw1s4sq7cp5pm6rddcmvqk0v5gfg4v38b6yg8hyjg655x63jz")))) + (base32 "10zhxkhjsbn2pfhq40ym8qp39adfqhdvcg1rm9hvf8k1c91lzpxk")))) (build-system qt-build-system) (arguments - (list #:phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) @@ -969,8 +878,8 @@ package.") (list akonadi akonadi-contacts boost - gpgme - grantlee + breeze-icons ;; default icon set + gpgme-1.23 grantleetheme karchive kcodecs @@ -985,12 +894,11 @@ package.") kjobwidgets knotifications kservice + kstatusnotifieritem ktextwidgets kwidgetsaddons kwindowsystem - kxmlgui - breeze-icons ;; default icon set - qtbase-5)) + kxmlgui)) (home-page "https://apps.kde.org/kgpg/") (synopsis "Graphical front end for GNU Privacy Guard") (description "Kgpg manages cryptographic keys for the GNU Privacy Guard, @@ -1002,31 +910,33 @@ cryptography to the contents of the clipboard.") (define-public khealthcertificate (package (name "khealthcertificate") - (version "23.01.0") + (version "24.05.2") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/plasma-mobile/" version - "/khealthcertificate-" version ".tar.xz")) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/khealthcertificate-" version ".tar.xz")) (sha256 (base32 - "193agd3jg029vcq1h5hdg3gw6zgqcmszl6ffcrid0ajbbiic4pbm")))) + "0600rz72dd3x7wwj82cyixnch3v0m4gva5kgf3y6rzjzlqjdpx57")))) (build-system qt-build-system) (arguments - (list #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs tests? #:allow-other-keys) - (when tests? - (setenv "TZDIR" - (search-input-directory inputs "share/zoneinfo")) - (invoke "ctest" "-E" - "(icaovdsparsertest|eudgcparsertest)"))))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs tests? #:allow-other-keys) + (when tests? + (setenv "TZDIR" + (search-input-directory inputs "share/zoneinfo")) + (invoke "ctest" "-E" + "(icaovdsparsertest|eudgcparsertest)"))))))) (native-inputs (list extra-cmake-modules pkg-config tzdata-for-tests)) (inputs (list karchive kcodecs ki18n openssl - qtdeclarative-5 + qtdeclarative zlib)) (home-page "https://api.kde.org/khealthcertificate/html/index.html") (synopsis "Digital vaccination and recovery certificate library") @@ -1038,14 +948,14 @@ test and recovery certificates.") (define-public kidentitymanagement (package (name "kidentitymanagement") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kidentitymanagement-" version ".tar.xz")) (sha256 - (base32 "03bfz0x35wiynla39iysxa5g3rckmy9nj2z1f439v9sblcqbvz3p")))) + (base32 "026i17j6spl0937klzf9ch26cmj7rrp617yrdq7917cwp9i7ah04")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -1054,19 +964,20 @@ test and recovery certificates.") kcompletion kconfig kcoreaddons - kemoticons kiconthemes kio kpimtextedit ktextwidgets + ktextaddons kxmlgui - qtbase-5)) + kirigami-addons)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'set-home - (lambda _ - (setenv "HOME" "/tmp/dummy-home")))))) ;; FIXME: what is this? + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" "/tmp/dummy-home")))))) ;; FIXME: what is this? (home-page "https://kontact.kde.org/") (synopsis "Library for shared identities between mail applications") (description "This library provides an API for managing user identities.") @@ -1076,24 +987,25 @@ test and recovery certificates.") (define-public kimap (package (name "kimap") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kimap-" version ".tar.xz")) (sha256 - (base32 "08s2891f2cnf5f7q034lmqv3vnh3v61l7bsyssdx711jfbswg9ik")))) + (base32 "1q4nxd31sjml31qicgpinf81rd8id71wm3kgx0v9byv7d0kysyqn")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list cyrus-sasl kcoreaddons + kcodecs ki18n kio - kmime - qtbase-5)) + kmime)) + (arguments (list #:qtbase qtbase)) (home-page "https://api.kde.org/kdepim/kimap/html/index.html") (synopsis "Library for handling IMAP") (description "This library provides a job-based API for interacting with @@ -1107,23 +1019,26 @@ easier to do so.") (define-public kitinerary (package (name "kitinerary") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kitinerary-" version ".tar.xz")) (sha256 (base32 - "0fcqix7hgmv7qcfxzmqy61kg7dqi5zas5vqfs7pfycgcxma0g869")))) + "1c7dd85n1amyi9hdzfjlchcj156kfy64rw915bymcbvdy6y3m6ji")))) (build-system qt-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (replace 'check - (lambda* (#:key tests? #:allow-other-keys) + (lambda* (#:key inputs tests? #:allow-other-keys) (when tests? + (setenv "TZDIR" + (search-input-directory inputs "share/zoneinfo")) (invoke "dbus-launch" "ctest" "-E" - "(jsonlddocumenttest|mergeutiltest|locationutiltest|knowledgedbtest|airportdbtest|extractorscriptenginetest|pkpassextractortest|postprocessortest|calendarhandlertest|extractortest)"))))))) - (native-inputs (list dbus extra-cmake-modules)) + "(jsonlddocumenttest|mergeutiltest|locationutiltest|knowledgedbtest|airportdbtest|extractorscriptenginetest|pkpassextractortest|postprocessortest|calendarhandlertest|extractortest)"))))))) + (native-inputs (list dbus extra-cmake-modules tzdata-for-tests)) (inputs (list kpkpass kcalendarcore karchive @@ -1135,10 +1050,7 @@ easier to do so.") shared-mime-info openssl poppler - qtbase-5 - qtdeclarative-5 - qtlocation - qtquickcontrols2-5 + qtdeclarative libxml2 zlib zxing-cpp)) @@ -1152,21 +1064,22 @@ model and itinerary extraction code.") (define-public kldap (package (name "kldap") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kldap-" version ".tar.xz")) (sha256 - (base32 "0hp5j02kwh91xf0n6zqzgam7g50r54hzbkli5i7c0rxdb1g28ihm")))) + (base32 "1nhr18h7f4qm196jjg5aqyky7v7w8n7iy07kzdk638381sarcmyz")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) (inputs - (list ki18n kio kwidgetsaddons qtbase-5 qtkeychain)) + (list ki18n kio kwidgetsaddons qtkeychain-qt6)) (propagated-inputs (list cyrus-sasl openldap)) + (arguments (list #:qtbase qtbase)) (home-page "https://api.kde.org/kdepim/kldap/html/index.html") (synopsis "Library for accessing LDAP") (description "This is a library for accessing LDAP with a convenient Qt @@ -1177,21 +1090,21 @@ protocol for querying and modifying directory services running over TCP/IP.") (define-public kleopatra (package (name "kleopatra") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kleopatra-" version ".tar.xz")) (sha256 - (base32 "0lcl20yihsa8dq0s24akp5z0290vh9nxjjjdwqk88nz8vmsr29i0")))) + (base32 "1jm0x73g2mfk6fc2m3smray8c9wddkk785aizxvq0yi4v52wydxb")))) (build-system qt-build-system) (native-inputs (list dbus extra-cmake-modules gnupg ;; TODO: Remove after gpgme uses fixed path kdoctools)) (inputs (list boost - gpgme + gpgme-1.23 kcmutils kcodecs kconfig @@ -1200,26 +1113,29 @@ protocol for querying and modifying directory services running over TCP/IP.") kcrash kdbusaddons ki18n + kio kiconthemes kitemmodels kmime knotifications ktextwidgets + kstatusnotifieritem kwidgetsaddons kwindowsystem kxmlgui libassuan libkleo + mimetreeparser breeze-icons ;; default icon set - qgpgme - qtbase-5)) + qgpgme-qt6-1.23)) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "dbus-launch" "ctest"))))))) + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dbus-launch" "ctest"))))))) (home-page "https://apps.kde.org/kleopatra/") (synopsis "Certificate Manager and Unified Crypto GUI") (description "Kleopatra is a certificate manager and a universal crypto @@ -1231,14 +1147,14 @@ and retrieving certificates from LDAP servers.") (define-public kmail (package (name "kmail") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmail-" version ".tar.xz")) (sha256 - (base32 "16gz0i7na1pkyly9jnvavyffkawxf5irr92rd50w68p01b82dhc6")))) + (base32 "0g30a36pd86brxq3ln709jnq9xdyqm8jiwwbv8kh70mcdbpjcpk2")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules dbus kdoctools)) @@ -1248,9 +1164,9 @@ and retrieving certificates from LDAP servers.") akonadi-mime akonadi-search boost - gpgme - grantlee + gpgme-1.23 grantleetheme + kaddressbook kbookmarks kcalendarcore kcalutils @@ -1271,6 +1187,7 @@ and retrieving certificates from LDAP servers.") kitemviews kjobwidgets kldap + kmail-account-wizard kmailcommon kmailtransport kmessagelib @@ -1282,6 +1199,7 @@ and retrieving certificates from LDAP servers.") kpimcommon kpimtextedit kservice + kstatusnotifieritem ksyntaxhighlighting ktextaddons ktextwidgets @@ -1296,21 +1214,36 @@ and retrieving certificates from LDAP servers.") libkleo libksieve breeze-icons ; default icon set, required for tests - qgpgme - qtbase-5 - qtdeclarative-5 - qtkeychain - qtwebchannel-5 - qtwebengine-5 + qgpgme-qt6-1.23 + qtdeclarative + qtkeychain-qt6 + qtwebchannel + qtwebengine sonnet)) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "dbus-launch" "ctest" "-E" ;; FIXME: Many failing tests. - "(akonadi-sqlite-kmcomposerwintest|\ + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs #:allow-other-keys) + (define (find-program-directory name) + (dirname (search-input-file + inputs (string-append "/bin/" name)))) + (wrap-program (string-append #$output "/bin/kmail") + `("XDG_DATA_DIRS" ":" prefix + (,(getenv "XDG_DATA_DIRS"))) + `("PATH" ":" prefix + ,(map find-program-directory + (list "kaddressbook" + "akonadictl" + "accountwizard")))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dbus-launch" "ctest" "-E" ;; FIXME: Many failing tests. + "(akonadi-sqlite-kmcomposerwintest|\ +akonadi-sqlite-archivemailwidgettest|\ akonadi-sqlite-tagselectdialogtest|\ akonadi-sqlite-kmcommandstest|\ sendlateragent-sendlaterutiltest|\ @@ -1329,37 +1262,82 @@ manager from KDE.") (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) +(define-public kmail-account-wizard + (package + (name "kmail-account-wizard") + (version "24.05.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kmail-account-wizard-" version ".tar.xz")) + (sha256 + (base32 "0izjdajipca59zbsdir136qfyh61aynpb2h1bady6qs927l5ds1f")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules shared-mime-info)) + (inputs + (list akonadi + akonadi-mime + kcrash + kcmutils + kdbusaddons + ki18n + kiconthemes + kidentitymanagement + kimap + kitemmodels + kldap + kmailtransport + kmime + knewstuff + knotifications + knotifyconfig + kpimcommon + kpimtextedit + ktextaddons + ktexteditor + kwallet + libkdepim + libkleo + qtkeychain-qt6)) + (arguments (list #:qtbase qtbase + ;; TODO: pass test. + #:tests? #f)) + (home-page "https://invent.kde.org/pim/kmail-account-wizard") + (synopsis "Assistant for the configuration of accounts in KMail") + (description + "This package provides an assistant for the configuration of accounts in +KMail.") + (license ;;GPL for programs, LGPL for libraries, FDL for documentation + (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) + (define-public kmailcommon (package (name "kmailcommon") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/mailcommon-" version ".tar.xz")) (sha256 - (base32 "165a0qf6i2862dpsw4wvgnxi4wv7hnc9s63fsf9jp6kbwwfw9nqv")))) + (base32 "0s23g08q5nx11vdpwxkqgzcs9xb6nycwsndfl6vpcnlbx10zsbfr")))) (properties `((upstream-name . "mailcommon"))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules dbus gnupg qttools-5)) + (list extra-cmake-modules dbus gnupg qttools)) (inputs - (list akonadi - akonadi-contacts - akonadi-mime + (list akonadi-contacts boost gpgme - grantlee grantleetheme karchive kcodecs - kcompletion kconfig kconfigwidgets kcontacts kdbusaddons - kdesignerplugin kguiaddons ki18n kiconthemes @@ -1371,9 +1349,7 @@ manager from KDE.") kldap kmailimporter kmailtransport - kmessagelib kmime - kpimcommon kpimtextedit ksyntaxhighlighting ktextaddons @@ -1382,16 +1358,22 @@ manager from KDE.") kwidgetsaddons kwindowsystem kxmlgui - libkdepim libkleo libxslt phonon qgpgme - qtwebchannel-5 - qtwebengine-5 - qtbase-5)) + qtwebchannel + qtwebengine)) + (propagated-inputs (list akonadi + akonadi-mime + kcompletion + kmessagelib + kpimcommon + libkdepim)) (arguments - `(#:tests? #f)) ;; TODO: 12/62 tests fail + (list + #:qtbase qtbase + #:tests? #f)) ;; TODO: 12/62 tests fail (home-page "https://invent.kde.org/pim/mailcommon") (synopsis "KDE email utility library") (description "The mail common library provides utility functions for @@ -1402,14 +1384,14 @@ dealing with email.") (define-public kmailimporter (package (name "kmailimporter") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/mailimporter-" version ".tar.xz")) (sha256 - (base32 "18shpxz7rg64g2mxdhdjhxhn893m0930v76cdnij339ycbcq5ypc")))) + (base32 "0hjwz70ys2bi6l8c2anzc7mhcapcqsximrxh813sp36hqwsix52g")))) (properties `((upstream-name . "mailimporter"))) (build-system qt-build-system) (native-inputs @@ -1418,10 +1400,8 @@ dealing with email.") (list akonadi akonadi-contacts akonadi-mime - grantlee grantleetheme boost - karchive kcompletion kconfig kconfigwidgets @@ -1438,8 +1418,9 @@ dealing with email.") ktextaddons ktextwidgets kxmlgui - libkdepim - qtbase-5)) + libkdepim)) + (propagated-inputs (list karchive)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/pim/mailimporter") (synopsis "KDE mail importer library") (description "This package provides libraries for importing mails other @@ -1450,14 +1431,14 @@ e-mail client programs into KMail and KDE PIM.") (define-public kmailtransport (package (name "kmailtransport") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmailtransport-" version ".tar.xz")) (sha256 - (base32 "14vmm9vla8i477jq40z73lc4klx6mm03y2xnljvx1v4inm3cpw2c")))) + (base32 "0ck6mr1zapk0ac96ffnps7pw5pzvb3d5v8lyjvv8acy3435j684z")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1479,10 +1460,11 @@ e-mail client programs into KMail and KDE PIM.") ktextwidgets kwallet libkgapi - qtbase-5 - qtkeychain)) + qtkeychain-qt6)) (arguments - `(#:tests? #f)) ;; TODO - 3/3 tests fail, require drkonqi + (list + #:qtbase qtbase + #:tests? #f)) ;; 1/2 tests fail, require network. (home-page "https://api.kde.org/kdepim/kmailtransport/html/index.html") (synopsis "Mail transport service library") (description "This library provides an API and support code for managing @@ -1492,19 +1474,20 @@ mail transport.") (define-public kmbox (package (name "kmbox") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmbox-" version ".tar.xz")) (sha256 - (base32 "05hdfjwp6ay2j16rxp55k3fywwf7kxiig4dv9fh51iysglmzzn76")))) + (base32 "0g2pg80n37miinfv69mz6hpvdhhbprdvgbkvzafspaj9bram9xrr")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list kcodecs kmime qtbase-5)) + (list kcodecs kmime)) + (arguments (list #:qtbase qtbase)) (home-page "https://api.kde.org/kdepim/kmbox/html/index.html") (synopsis "Library for handling mbox mailboxes") (description "This is a library for handling mailboxes in mbox format, @@ -1514,27 +1497,24 @@ using a Qt/KMime C++ API.") (define-public kmessagelib (package (name "kmessagelib") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/messagelib-" version ".tar.xz")) (sha256 - (base32 "0aqac0p46cwnr3qxjk0ivalfwjcgwy52s088wnk6ckp77m7r65is")))) + (base32 "1m7mah1zqfn9r3jw1lg303kg023lgl77r6if5g4ifv3lsih52pgl")))) (properties `((upstream-name . "messagelib"))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules gnupg libxml2)) (inputs - (list akonadi - akonadi-contacts - akonadi-mime + (list akonadi-contacts akonadi-notes akonadi-search boost - gpgme - grantlee + gpgme-1.23 grantleetheme karchive kcalendarcore @@ -1547,7 +1527,6 @@ using a Qt/KMime C++ API.") kguiaddons ki18n kiconthemes - kidentitymanagement kimap kio kitemmodels @@ -1556,40 +1535,43 @@ using a Qt/KMime C++ API.") kldap kmailtransport kmbox - kmime knewstuff knotifications - kpimcommon - kpimtextedit kservice ksyntaxhighlighting - ktextaddons ktextwidgets + ktexttemplate kwallet kwidgetsaddons kwindowsystem kxmlgui libgravatar - libkdepim - libkleo - qca - qgpgme - qtbase-5 - qtdeclarative-5 - qtwebchannel-5 - qtwebengine-5 + qca-qt6 + qgpgme-qt6-1.23 + qtdeclarative + qtwebchannel + qtwebengine sonnet)) + (propagated-inputs + (list akonadi + akonadi-mime + kidentitymanagement + kmime + kpimcommon + kpimtextedit + ktextaddons + libkdepim + libkleo)) (arguments - `(#:tests? #f ;TODO many test fail for quite different reasons - #:phases (modify-phases %standard-phases - (add-after 'set-paths 'extend-CPLUS_INCLUDE_PATH - (lambda* (#:key inputs #:allow-other-keys) - ;; FIXME: One of the compilation steps fail to find - ;; <QPrinter> without this hack. - (setenv "CPLUS_INCLUDE_PATH" - (string-append (assoc-ref inputs "qtbase") - "/include/qt5/QtPrintSupport:" - (or (getenv "CPLUS_INCLUDE_PATH") "")))))))) + (list #:qtbase qtbase + #:tests? #f ;TODO many test fail for quite different reasons + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'add-miss-PrintSupport + (lambda _ + (substitute* "webengineviewer/src/CMakeLists.txt" + (("KF6::ConfigCore") + "KF6::ConfigCore\n Qt::PrintSupport"))))))) (home-page "https://invent.kde.org/pim/messagelib") (synopsis "KDE PIM messaging libraries") (description "This package provides several libraries for messages, @@ -1601,29 +1583,28 @@ kwebengineviewer.") (define-public kmime (package (name "kmime") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmime-" version ".tar.xz")) (sha256 - (base32 "1i38g0s98d24882kxyjay965nz3d3fjhb3mv1p4sllm2lnffrq2d")))) + (base32 "19dnp955vii3vi1jaxgbsyabbb35iaqvhz9nnz392r3wz7f3hbyq")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules)) + (list extra-cmake-modules tzdata-for-tests)) (inputs - (list kcodecs ki18n qtbase-5)) + (list kcodecs ki18n)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-test-case - (lambda _ - ;; This is curious: autotests/CMakeLists.txt sets LC_TIME=C, but - ;; the Qt locale returns different. See kmime commit 3a9651d26a. - (substitute* "autotests/dateformattertest.cpp" - (("(Today|Yesterday) 12:34:56" line day) - (string-append day " 12:34 PM")))))))) + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-test-case + (lambda* (#:key inputs tests? #:allow-other-keys) + (when tests? + (setenv "TZDIR" (search-input-directory + inputs "share/zoneinfo")))))))) (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") (synopsis "Library for handling MIME data") (description "This library provides an API for handling MIME @@ -1636,14 +1617,14 @@ information in non-ASCII character sets.") (define-public knotes (package (name "knotes") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/knotes-" version ".tar.xz")) (sha256 - (base32 "0f2a9xy2w909y792hwwnmsqvxx91azn6f0j0xl2mlmav00a4w6za")))) + (base32 "14nm2s86hqvvg0wyg8q5dd273dpppqw692h3mzya5mfg3j7acvaf")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools libxslt)) @@ -1654,7 +1635,7 @@ information in non-ASCII character sets.") akonadi-notes akonadi-search boost - grantlee + breeze-icons ; default icon set, required for tests grantleetheme kcalendarcore kcalutils @@ -1679,16 +1660,16 @@ information in non-ASCII character sets.") kparts kpimcommon kpimtextedit + kstatusnotifieritem ktextaddons ktextwidgets + ktexttemplate kwidgetsaddons kwindowsystem kxmlgui kxmlgui - libkdepim - breeze-icons ; default icon set, required for tests - qtbase-5 - qtx11extras)) + libkdepim)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/knotes/") (synopsis "Note-taking utility") (description "KNotes lets you write the computer equivalent of sticky @@ -1707,14 +1688,14 @@ Features: (define-public kontactinterface (package (name "kontactinterface") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kontactinterface-" version ".tar.xz")) (sha256 - (base32 "16fg24hz9vx912cffc94x5zx4jv3k72mbxgp5ck50lydypx6rfns")))) + (base32 "05g9mw29pi5z536pmxhavdispq5whgkx56iqqsdz8dy9rgjlm1bc")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -1725,8 +1706,8 @@ Features: kparts kwindowsystem kxmlgui - qtbase-5 - qtx11extras)) + libxkbcommon)) + (arguments (list #:qtbase qtbase)) (home-page "https://api.kde.org/kdepim/kontactinterface/html/index.html") (synopsis "Kontact interface library") (description "This library provides the glue necessary for @@ -1736,17 +1717,17 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).") (define-public korganizer (package (name "korganizer") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/korganizer-" version ".tar.xz")) (sha256 - (base32 "1vp1jsmna059vvfj7xaj9fhhhq0lz9k0pphczkfbwm3gy6nzcavz")))) + (base32 "10walf46h1cnyfcpkppybgzlfcn93rygwppb4jfi2rg24rka3i84")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules dbus qttools-5 kdoctools tzdata-for-tests)) + (list extra-cmake-modules dbus qttools kdoctools tzdata-for-tests)) (inputs (list akonadi akonadi-calendar @@ -1755,7 +1736,6 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).") akonadi-notes akonadi-search boost - grantlee grantleetheme kcalendarcore kcalendarsupport @@ -1795,17 +1775,18 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).") kxmlgui libkdepim breeze-icons ; default icon set, required for tests - phonon - qtbase-5)) + phonon)) (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs tests? #:allow-other-keys) - (when tests? - (setenv "TZDIR" (search-input-directory - inputs "share/zoneinfo")) - (invoke "dbus-launch" "ctest"))))))) + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs tests? #:allow-other-keys) + (when tests? + (setenv "TZDIR" (search-input-directory + inputs "share/zoneinfo")) + (invoke "dbus-launch" "ctest" + "-E" "akonadi-sqlite-koeventpopupmenutest"))))))) (home-page "https://apps.kde.org/korganizer/") (synopsis "Organizational assistant, providing calendars and other similar functionality") @@ -1852,17 +1833,18 @@ Virtual Contact File}) files to the KPeople contact management library.") (define-public kpkpass (package (name "kpkpass") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kpkpass-" version ".tar.xz")) + "/src/kpkpass-" version ".tar.xz")) (sha256 (base32 - "1l3k33yzfjzarc2rpf576ib86ifzrfmsvpcdmv060dy0k8lbm1k9")))) + "1cqpmag3n58nzcbyb1rkkvwx9lzff1l8nawbqz2g1gqk2diny0wx")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) - (inputs (list karchive qtbase-5 shared-mime-info)) + (inputs (list karchive shared-mime-info)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/pim/kpkpass") (synopsis "Apple Wallet Pass reader") (description "This package provides library to deal with Apple Wallet @@ -1872,18 +1854,18 @@ pass files.") (define-public kpimcommon (package (name "kpimcommon") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/pimcommon-" version ".tar.xz")) (sha256 - (base32 "1v2nv83h9p1ajbcwfdk8b7lrr84r8c855lysknzvzkpm5z012z3l")))) + (base32 "0k7zakx1dd39997a9a3d6qmlzdc5alw5gny0xh7bncv0fpilvgyh")))) (properties `((upstream-name . "pimcommon"))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs (list karchive akonadi @@ -1891,9 +1873,8 @@ pass files.") akonadi-mime akonadi-search boost - grantlee grantleetheme - ;; TODO: ("kaccounts" ,kaccounts) + kaccounts-integration kcalendarcore kcmutils kcodecs @@ -1901,10 +1882,8 @@ pass files.") kconfigwidgets kcontacts kcoreaddons - kdesignerplugin ki18n kiconthemes - kimap kio kirigami ;; run-time dependency kitemmodels @@ -1914,19 +1893,18 @@ pass files.") kmime knewstuff kpimtextedit - ktextaddons ktextwidgets + ktexttemplate kwallet kwidgetsaddons kwindowsystem kxmlgui - libkdepim libxslt purpose - qtbase-5 - qtwebengine-5)) + qtwebengine)) + (propagated-inputs (list kimap ktextaddons libkdepim)) (arguments - `(#:tests? #f)) ;; TODO tests hang + (list #:qtbase qtbase)) (home-page "https://invent.kde.org/pim/pimcommon") (synopsis "Common libraries for KDE PIM") (description "This package provides common libraries for KDE PIM.") @@ -1936,27 +1914,29 @@ pass files.") (define-public libgravatar (package (name "libgravatar") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libgravatar-" version ".tar.xz")) (sha256 - (base32 "03zhnpb114y6a6vhiv9c1fiqsinjmk52j1k9w2r04ibxp35m3xj7")))) + (base32 "0xk6i1rndhh58p20hx6473hc29njg03qcy7ymdvflr5lgr7qavwy")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kconfig ki18n kio + kconfigwidgets kpimcommon kpimtextedit ktextaddons ktextwidgets kwidgetsaddons - qtbase-5)) + qtbase)) (arguments - `(#:tests? #f)) ;; 2/7 tests fail (due to network issues?) + (list #:qtbase qtbase + #:tests? #f)) ;; 2/7 tests fail (due to network issues?) (home-page "https://invent.kde.org/pim/libgravatar") (synopsis "Online avatar lookup library") (description "This library retrieves avatar images based on a @@ -1968,24 +1948,22 @@ unnecessary network operations.") (define-public kpimtextedit (package (name "kpimtextedit") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kpimtextedit-" version ".tar.xz")) (sha256 - (base32 "1rrs19bwl8qvasridysbbgsgdy9hyjlpi26hw77hli5ixkflj85b")))) + (base32 "1m91hnjiksji60ybvmvlcgayqrcplxfdj7qxknxwayiijvqiq22a")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs - (list grantlee - kcodecs + (list kcodecs kconfigwidgets kcoreaddons - kdesignerplugin - kemoticons + ktextaddons ki18n kiconthemes kio @@ -1993,11 +1971,11 @@ unnecessary network operations.") ktextwidgets kwidgetsaddons kxmlgui - qtbase-5 - qtspeech-5 + qtspeech sonnet)) (arguments - `(#:tests? #f)) ;; TODO - test suite hangs + (list #:qtbase qtbase + #:tests? #f)) ;; TODO - test suite hangs (home-page "https://api.kde.org/kdepim/kpimtextedit/html/index.html") (synopsis "Library providing a textedit with PIM-specific features") (description "This package provides a textedit with PIM-specific features. @@ -2009,14 +1987,14 @@ text in the text edit to all kinds of markup, like HTML or BBCODE.") (define-public ksmtp (package (name "ksmtp") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/ksmtp-" version ".tar.xz")) (sha256 - (base32 "0pz17vmn38n2xl35d9di1b9138dh54wgyal9hx412nh123w13h12")))) + (base32 "1v7kami1f75gin7293kk07imkdnmvf9bfn49fc6lzbb52im4nh4b")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -2026,18 +2004,18 @@ text in the text edit to all kinds of markup, like HTML or BBCODE.") kconfig kcoreaddons ki18n - kio - qtbase-5)) + kio)) (arguments - `(#:tests? #f ;; TODO: does not find sasl mechs - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing - (lambda _ - (substitute* "src/CMakeLists.txt" - (("^(install\\(.* )\\$\\{KF5_INSTALL_TARGETS_DEFAULT_ARGS\\}\\)" - _ prefix) - (string-append prefix "${KDE_INSTALL_TARGETS_DEFAULT_ARGS})")))))))) + (list #:qtbase qtbase + #:tests? #f ;; TODO: does not find sasl mechs + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing + (lambda _ + (substitute* "src/CMakeLists.txt" + (("^(install\\(.* )\\$\\{KF5_INSTALL_TARGETS_DEFAULT_ARGS\\}\\)" + _ prefix) + (string-append prefix "${KDE_INSTALL_TARGETS_DEFAULT_ARGS})")))))))) (home-page "https://invent.kde.org/pim/ksmtp") (synopsis "Library for sending email through an SMTP server") (description "This library provides an API for handling SMTP @@ -2048,14 +2026,14 @@ standard protocols for e-mail transmission.") (define-public ktnef (package (name "ktnef") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/ktnef-" version ".tar.xz")) (sha256 - (base32 "00dkcmywjxzq5v2kp4klw50c3w74lmh16kbcwn8qd97kky3pd5ik")))) + (base32 "1v113fihnsn6iilk01rm8g68pm1gf1gdsvar2fiwhqsg48all588")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -2066,8 +2044,8 @@ standard protocols for e-mail transmission.") kconfig kcontacts kcoreaddons - ki18n - qtbase-5)) + ki18n)) + (arguments (list #:qtbase qtbase)) (home-page "https://api.kde.org/kdepim/ktnef/html/index.html") (synopsis "Library for handling mail attachments using TNEF format") (description "Ktnef is a library for handling data in the TNEF @@ -2080,17 +2058,17 @@ and allows one to view/extract message formatted text in Rich Text Format.") (define-public libkdepim (package (name "libkdepim") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkdepim-" version ".tar.xz")) (sha256 - (base32 "1i5c4qqd4ghlfjvxniy8sbfqh0fsrz4sadvh0n2d207s9rsl274v")))) + (base32 "1k22qjxfm8msj8ipyz2p5qq0hx9q6p3qw42cp3bnbhiaamanmlq3")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs (list akonadi akonadi-contacts @@ -2106,7 +2084,6 @@ and allows one to view/extract message formatted text in Rich Text Format.") kcontacts kcoreaddons kdbusaddons - kdesignerplugin ki18n kiconthemes kio @@ -2116,8 +2093,8 @@ and allows one to view/extract message formatted text in Rich Text Format.") kldap kmime kwallet - kwidgetsaddons - qtbase-5)) + kwidgetsaddons)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/pim/libkdepim") (synopsis "Libraries for common KDE PIM apps") (description "This package provided libraries for common KDE PIM apps.") @@ -2127,17 +2104,17 @@ and allows one to view/extract message formatted text in Rich Text Format.") (define-public libkgapi (package (name "libkgapi") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkgapi-" version ".tar.xz")) (sha256 - (base32 "18jcrp7qi35zxzb4b7mn6519bjw47s7kwfahd6a50p40j17k09bs")))) + (base32 "0j0rbzwcjq4wjrrk0vhkifa8ahmmrpfy039fpf3gy237k5ncj5y3")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs (list cyrus-sasl ki18n @@ -2146,12 +2123,12 @@ and allows one to view/extract message formatted text in Rich Text Format.") kio kwallet kwindowsystem - qtbase-5 - qtdeclarative-5 - qtwebchannel-5 - qtwebengine-5)) + qtdeclarative + qtwebchannel + qtwebengine)) (arguments - `(#:tests? #f)) ;; TODO 6/48 tests fail + (list #:qtbase qtbase + #:tests? #f)) ;; TODO 6/48 tests fail (home-page "https://invent.kde.org/pim/libkgapi") (synopsis "Library for accessing various Google services via their public API") @@ -2162,20 +2139,20 @@ various Google services.") (define-public libkleo (package (name "libkleo") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkleo-" version ".tar.xz")) (sha256 - (base32 "0l77n4dlbv9hclzvh69kdzji907if7yayxiasxnnjkzsvcm1af25")))) + (base32 "102yszx6smyf2vd068p6j0921fql5jlmsra3n62xam81smqlpgj0")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools qttools-5)) + (list extra-cmake-modules kdoctools qttools)) (inputs (list boost - gpgme + gpgme-1.23 kcodecs kcompletion kconfig @@ -2187,19 +2164,20 @@ various Google services.") kwidgetsaddons kwindowsystem kpimtextedit - qgpgme - qtbase-5)) + qgpgme-qt6-1.23)) (propagated-inputs - `(("gpgme" ,gpgme) - ("qgpgme" ,qgpgme))) + (list gpgme-1.23 qgpgme-qt6-1.23)) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? ;; FIXME: These tests fail. - (invoke "ctest" "-E" - "(keyresolvercoretest|newkeyapprovaldialogtest)"))))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? ;; FIXME: These tests fail. + (invoke "ctest" "-E" + "(expirycheckertest|keyresolvercoretest|\ +newkeyapprovaldialogtest)"))))))) (home-page "https://invent.kde.org/pim/libkleo") (synopsis "KDE PIM cryptographic library") (description "@code{libkleo} is a library for Kleopatra and other parts of @@ -2210,7 +2188,7 @@ KDE using certificate-based crypto.") (define-public libksieve (package (name "libksieve") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) @@ -2218,7 +2196,7 @@ KDE using certificate-based crypto.") "/src/libksieve-" version ".tar.xz")) (sha256 (base32 - "066z33v30h568bmdcsl4v478p3xhiwsmq7pr7kziilrhy3a2m7p6")))) + "1zsc84ylrylby28ypdg47kmf911dmi5hi6745wvjsrxcwnpqag37")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -2226,6 +2204,7 @@ KDE using certificate-based crypto.") (list akonadi cyrus-sasl grantleetheme + kconfigwidgets karchive ki18n kiconthemes @@ -2243,24 +2222,125 @@ KDE using certificate-based crypto.") kwallet kwindowsystem libkdepim - qtbase-5 - qtdeclarative-5 - qtwebchannel-5 - qtwebengine-5)) + qtdeclarative + qtwebchannel + qtwebengine)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'substitute - (lambda _ - ;; Disable a failing test - ;; sieveeditorhelphtmlwidgettest fails with `sigtrap` - (substitute* - "src/ksieveui/editor/webengine/autotests/CMakeLists.txt" - (("^\\s*(add_test|ecm_mark_as_test|set_tests_properties)\\W" line) - (string-append "# " line)))))))) + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'substitute + (lambda _ + ;; Disable a failing test + ;; sieveeditorhelphtmlwidgettest fails with `sigtrap` + (substitute* + "src/ksieveui/editor/webengine/autotests/CMakeLists.txt" + (("^\\s*(add_test|ecm_mark_as_test|set_tests_properties)\\W" line) + (string-append "# " line)))))))) (home-page "https://invent.kde.org/pim/libksieve") (synopsis "KDE Sieve library") (description "Sieve is a language that can be used filter emails. KSieve is a Sieve parser and interpreter library for KDE.") (license ;; GPL for programs, LGPL for libraries (list license:gpl2+ license:lgpl2.0+)))) + +(define-public merkuro + (package + (name "merkuro") + (version "24.05.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/" name "-" version + ".tar.xz")) + (sha256 + (base32 + "0n6na806g4xlx66ay0vk3iw9xs1h48ya7l0zpa3nqikr1by79lfh")))) + (build-system qt-build-system) + (arguments + (list #:qtbase qtbase + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dbus-launch" "ctest"))))))) + (native-inputs (list dbus extra-cmake-modules)) + (inputs (list akonadi + akonadi-contacts + akonadi-mime + breeze-icons + gpgme + grantleetheme + kio + kirigami + kirigami-addons + kdbusaddons + ki18n + kimap + kcalendarcore + kcalendarsupport + kconfigwidgets + kwindowsystem + kcoreaddons + kcontacts + kitemmodels + kmailcommon + kmailtransport + kmessagelib + kmime + kidentitymanagement + kpimcommon + kpimtextedit + ktextaddons + ktextwidgets + akonadi-calendar + akonadi-mime + keventviews + kcalutils + kxmlgui + kiconthemes + libkdepim + libkleo + mimetreeparser + qtdeclarative + qtsvg + qqc2-desktop-style + qtwebengine)) + (home-page "https://apps.kde.org/kalendar/") + (synopsis "Calendar application") + (description + "Merkuro is a calendar application using Akonadi to sync with +external services. + +NOTE: plsase add akonadi and kdepim-runtime to system package.") + (license license:gpl3+))) + +(define-public mimetreeparser + (package + (name "mimetreeparser") + (version "24.05.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/mimetreeparser-" version ".tar.xz")) + (sha256 + (base32 "132slwaqlaxnbvkpqb9w4ak4mpkrvw6ln81nbka91c3ngcamfac9")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list kcalendarcore kcodecs libkleo kwidgetsaddons qtdeclarative)) + (propagated-inputs (list ki18n kmime kmbox)) + (arguments + (list #:tests? #f ;; FIXME: 7/9 tests fail. + #:qtbase qtbase)) + (home-page "https://kontact.kde.org") + (synopsis "Parser for MIME trees") + (description "This package provides a parser for a MIME tree and is based +on KMime. The goal is given a MIME tree to extract a list of parts and a list +of attachments, check the validity of the signatures and decrypt any encrypted +part.") + (license license:lgpl2.0+))) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index a1c17d3346..5c7bbee717 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -39,16 +39,22 @@ #:use-module (gnu packages authentication) #:use-module (gnu packages bash) #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) + #:use-module (gnu packages cups) #:use-module (gnu packages display-managers) + #:use-module (gnu packages file-systems) #:use-module (gnu packages firmware) + #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gdb) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gnupg) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages hardware) #:use-module (gnu packages ibus) #:use-module (gnu packages icu4c) #:use-module (gnu packages iso-codes) @@ -69,46 +75,56 @@ #:use-module (gnu packages polkit) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages package-management) ; flatpak + #:use-module (gnu packages rdesktop) #:use-module (gnu packages unicode) #:use-module (gnu packages video) #:use-module (gnu packages vpn) #:use-module (gnu packages vulkan) + #:use-module (gnu packages wm) #:use-module (gnu packages textutils) #:use-module (gnu packages qt) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages base) #:use-module (gnu packages gps) #:use-module (gnu packages web) + #:use-module (gnu packages tls) + #:use-module (gnu packages xml) #:use-module (gnu packages opencl)) (define-public bluedevil (package (name "bluedevil") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0ddzcarn06rvhbmvm9x737ba9ycxcvg030892nh6izgfrjlaxhfb")))) + "1ss1xdrpq9yjcic9xmr6x3j5slj5l4mjw381fsgdb5sf7s0ypy9b")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules pkg-config qttools-5)) + (arguments (list #:qtbase qtbase)) + (native-inputs (list extra-cmake-modules pkg-config qttools)) (inputs (list kcoreaddons kcmutils + kirigami kwidgetsaddons kdbusaddons + kjobwidgets + ksvg knotifications kwindowsystem - plasma-framework + libplasma ki18n kio kdeclarative bluez-qt shared-mime-info - qtdeclarative-5)) + qtdeclarative)) (synopsis "Manage the Bluetooth settings from Plasma") (description "This package provides Bluetooth manager for Plasma Shell.") @@ -118,26 +134,16 @@ (define-public breeze (package (name "breeze") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1wfclkg4d3wraz19kwpm87vwp9327s5y8n1a42qgrdh980qwzzdz")))) + "1kvx8ynb5m66m1zdrfk5bzpjs879sl8m1ap914199i21v58dqmnl")))) (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: - ;; Package type "Plasma/LookAndFeel" not found - ;; TODO: Check whether is makes sence splitting into several outputs, like - ;; Debian does: - ;; - breeze-cursor-theme - ;; - "out", "devel" - ;; - kde-style-breeze - Widget style - ;; - kde-style-breeze-qt4 - propably not useful - ;; - kwin-style-breeze - ;; - qml-module-qtquick-controls-styles-breeze - QtQuick style + ;; TODO: Check whether is makes sence splitting into several outputs. (native-inputs (list extra-cmake-modules pkg-config)) (inputs @@ -149,23 +155,38 @@ kguiaddons ki18n kirigami - kiconthemes ; for optional kde-frameworkintegration + kiconthemes kpackage - kwayland ; optional kwindowsystem - qtbase-5 - qtdeclarative-5 ; optional - qtx11extras)) + kcolorscheme)) + (arguments (list #:qtbase qtbase + #:configure-flags #~(list "-DBUILD_QT5=OFF"))) (home-page "https://invent.kde.org/plasma/breeze") (synopsis "Default KDE Plasma theme") (description "Artwork, styles and assets for the Breeze visual style for the Plasma Desktop. Breeze is the default theme for the KDE Plasma desktop.") (license license:gpl2+))) +(define-public breeze-qt5 + (package + (inherit breeze) + (name "breeze-qt5") + (inputs + (list kcmutils-5 ; optional + kconfigwidgets-5 + kcoreaddons-5 + kguiaddons-5 + ki18n-5 + kirigami-5 + kiconthemes-5 + kpackage-5 + kwindowsystem-5)) + (arguments (list #:configure-flags #~(list "-DBUILD_QT6=OFF"))))) + (define-public breeze-gtk (package (name "breeze-gtk") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -173,10 +194,12 @@ the Plasma Desktop. Breeze is the default theme for the KDE Plasma desktop.") "-" version ".tar.xz")) (sha256 (base32 - "1s2qv51qa867b0bf29b7j90yzqmn3s2dwblczsb79h2i1gnr8ci9")))) + "04gcrbf5b53sqk3ybwwqzbqah04ag03wcplahqw997kgxdqd37sv")))) (build-system qt-build-system) (arguments - '(#:tests? #f)) ;no 'test' target + (list + #:qtbase qtbase + #:tests? #f)) ;no 'test' target (native-inputs (list breeze extra-cmake-modules sassc python python-pycairo)) (home-page "https://invent.kde.org/plasma/breeze") @@ -189,16 +212,16 @@ Breeze is the default theme for the KDE Plasma desktop.") (define-public calindori (package (name "calindori") - (version "23.01.0") + (version "24.05.2") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/plasma-mobile/" version - "/calindori-" version ".tar.xz")) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/calindori-" version ".tar.xz")) (sha256 (base32 - "0jhrxsh6gd20qpq68n2lspfkgq3bam46j6m10jnm3zckb190pfhl")))) + "1x3890naijhiyh6ppf3bs5hc3hgcljf0va4kd2gj0s3fdddrqh7i")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules)) + (native-inputs (list extra-cmake-modules python-minimal)) (inputs (list kconfig kcoreaddons kdbusaddons @@ -207,11 +230,9 @@ Breeze is the default theme for the KDE Plasma desktop.") kcalendarcore knotifications kpeople - qtbase-5 - qtdeclarative-5 - qtquickcontrols2-5 - qtsvg-5 - qtgraphicaleffects)) + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/plasma-mobile/calindori") (synopsis "Calendar for Plasma Mobile") (description @@ -221,7 +242,7 @@ Breeze is the default theme for the KDE Plasma desktop.") (define-public discover (package (name "discover") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -233,10 +254,11 @@ Breeze is the default theme for the KDE Plasma desktop.") ".tar.xz")) (sha256 (base32 - "0025g1whq8z1s5915jhq83xsiz4klzqpayfzqkar8c6gni5s3v59")))) + "16awva2q379z3rpiqlj7dby03k19d9c3d45y0vz5yd8lpavb9a3f")))) (build-system qt-build-system) (arguments - (list #:phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (add-before 'configure 'set-LDFLAGS (lambda _ @@ -247,10 +269,13 @@ Breeze is the default theme for the KDE Plasma desktop.") (when tests? (invoke "ctest" "-E" "knsbackendtest"))))))) (native-inputs (list extra-cmake-modules pkg-config)) - (inputs (list appstream-qt + (inputs (list appstream-qt6 attica fwupd ; optional flatpak ; optional + kauth + kiconthemes + kstatusnotifieritem kcoreaddons kconfig kcrash @@ -259,6 +284,7 @@ Breeze is the default theme for the KDE Plasma desktop.") karchive kxmlgui kirigami + kirigami-addons kuserfeedback knewstuff knotifications @@ -266,11 +292,10 @@ Breeze is the default theme for the KDE Plasma desktop.") kdeclarative kcmutils kidletime - packagekit-qt5 + packagekit-qt6 purpose - qtdeclarative-5 - qtgraphicaleffects - qtquickcontrols2-5)) + qtdeclarative + qcoro-qt6)) ;; -- The following features have been disabled: ;; * Ostree, Library to manage ostree repository. Required to build the rpm-ostree backend ;; * RpmOstree, rpm-ostree binary to manage the system. Required to build the rpm-ostree backend @@ -288,7 +313,7 @@ games, and tools.") (define-public drkonqi (package (name "drkonqi") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -296,21 +321,43 @@ games, and tools.") version ".tar.xz")) (sha256 (base32 - "1li1j85yvg2nj392rl1jmdqx3mzmrdj0lf72j37xd8r2bi0ic9z8")))) + "19965cim06lfmkaansmrx814axfz7fxsmgfl52x2q3ar5vrmn05a")))) (build-system qt-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "ctest" "-E" "connectiontest"))))))) - (native-inputs (list extra-cmake-modules)) + (list #:qtbase qtbase + #:configure-flags + #~(list "-DCMAKE_DISABLE_FIND_PACKAGE_Systemd=TRUE" + "-DWITH_GDB12=TRUE" + "-DWITH_PYTHON_VENDORING=FALSE") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-gdb-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((gdb (search-input-file inputs "/bin/gdb"))) + (substitute* "src/data/debuggers/internal/gdbrc" + (("TryExec=gdb") + (string-append "TryExec=" gdb "\n" + "CodeName=gdb")) + (("(Exec|ExecWithSymbolResolution)=gdb" _ letters) + (string-append letters "=" gdb)))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest" "-E" "(connectiontest|preambletest)")))) + (add-after 'install 'wrap-program + (lambda _ + (wrap-program (string-append #$output + "/libexec/drkonqi") + `("GUIX_PYTHONPATH" ":" prefix + (,(getenv "GUIX_PYTHONPATH"))))))))) + (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list ki18n kcoreaddons kconfig kservice kdeclarative kjobwidgets + kstatusnotifieritem kio kcrash kcompletion @@ -319,9 +366,20 @@ games, and tools.") knotifications kidletime kwindowsystem + qtdeclarative + kuserfeedback + + python-minimal + python-pygdbmi + python-chai + python-psutil + python-sentry-sdk + gdb + ;; qml module runtime dependency ksyntaxhighlighting - qtdeclarative-5 - kuserfeedback)) + kcmutils + kitemmodels + kirigami)) (synopsis "Crash handler for KDE software") (description "This package provides an automatic handler for crashed apps.") (home-page "https://invent.kde.org/plasma/drkonqi") @@ -330,7 +388,7 @@ games, and tools.") (define-public kactivitymanagerd (package (name "kactivitymanagerd") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -338,13 +396,12 @@ games, and tools.") version ".tar.xz")) (sha256 (base32 - "1d7vz8gwqa7nhfn62dsqircm0qbp9ryass82k2891mqj0qrlbwid")))) + "1zfaqaw50qr0s2shm2vxfbzvys2jp2s7hqgq8n928cily37wz8h8")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules)) (inputs (list boost - kconfig - kcoreaddons - kwindowsystem + kcompletion kglobalaccel kio kxmlgui @@ -357,28 +414,81 @@ concept.") (home-page "https://invent.kde.org/plasma/kactivitymanagerd") (license (list license:gpl2 license:gpl3)))) +(define-public krdp + (package + (name "krdp") + (version "6.1.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" + version "/" name "-" + version ".tar.xz")) + (sha256 + (base32 + "0xp1zi51fpw9zcyry6g8qrm7k94pbi6kw3d8dakdnq5qrkcsvc8g")))) + (build-system qt-build-system) + (arguments (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'hardcode-openssl + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/kcm/kcmkrdpserver.cpp" + (("\"openssl\"") + (string-append + "\"" + (search-input-file + inputs "/bin/openssl") + "\"")))))))) + (native-inputs (list extra-cmake-modules + pkg-config + ;; for wayland-scanner + wayland)) + (inputs (list + kconfig + kdbusaddons + kcmutils + ki18n + kcoreaddons + kstatusnotifieritem + kpipewire + openssl + plasma-wayland-protocols + freerdp + qtwayland + qtdeclarative + qtkeychain-qt6 + wayland-protocols + wayland)) + (synopsis "Library and examples for creating an RDP server") + (description "This package provides a library and examples for creating an +RDP server.") + (home-page "https://invent.kde.org/plasma/krdp") + (license license:lgpl2.0+))) + (define-public kde-gtk-config (package (name "kde-gtk-config") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kde-gtk-config-" version ".tar.xz")) (sha256 (base32 - "13qwj3gdfvs0l6k01n8hf25kzrsksi3qi0b1rzpshcj1ix31wamf")))) + "099n4dyyqirjm8ixgl3ifiral3jb2ivg74gzfv2xmfgj0cjwszza")))) (build-system qt-build-system) (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-gsettings-schemas-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "cmake/modules/FindGSettingSchemas.cmake" - (("\\$\\{PC_GLIB2_PREFIX\\}") - (assoc-ref inputs "gsettings-desktop-schemas")))))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-gsettings-schemas-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "cmake/modules/FindGSettingSchemas.cmake" + (("\\$\\{PC_GLIB2_PREFIX\\}") + (assoc-ref inputs "gsettings-desktop-schemas")))))))) (native-inputs - (list extra-cmake-modules pkg-config qtsvg-5 sassc)) + (list extra-cmake-modules pkg-config qtsvg sassc)) (inputs (list gsettings-desktop-schemas gtk+ @@ -399,19 +509,20 @@ applications.") (define-public kdecoration (package (name "kdecoration") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kdecoration-" version ".tar.xz")) (sha256 (base32 - "153j3w00zwj6gx9ndq46vkfwx3ayig80j0jsqbkajk8zsncs89pg")))) + "1gmyxp3gk47rci4xdlgsdbp9wa2zx2790pqv1z4y7zmwg395vs41")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules)) (inputs - (list kcoreaddons ki18n qtbase-5)) + (list kcoreaddons ki18n)) (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. @@ -422,7 +533,7 @@ manager which re-parents a Client window to a window decoration frame.") (define-public kde-cli-tools (package (name "kde-cli-tools") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -430,10 +541,11 @@ manager which re-parents a Client window to a window decoration frame.") (patches (search-patches "kde-cli-tools-delay-mime-db.patch")) (sha256 (base32 - "1br1i8ba4n7d2yl618ph4glsaasn3rxy4kjp48f12l9l2pk29nxa")))) + "06vms60wrddj9b8bagk5xhwjff4pi81vxs0zja8mk5fscv0750bi")))) (build-system qt-build-system) (arguments - (list #:tests? #f ;TODO: Failing 1 test + (list #:qtbase qtbase + #:tests? #f ;TODO: Failing 1 test #:phases #~(modify-phases %standard-phases (add-after 'unpack 'set-writable-location @@ -444,13 +556,7 @@ GenericDataLocation.") (string-append "\"" (getcwd) "/\""))))) (add-before 'check 'setup-env (lambda* _ - (setenv "HOME" (getcwd)))) - (add-after 'install 'symlink-kdesu - (lambda _ - ;; XXX: nixpkgs say kdesu need kdeinit5 in PATH, but i can't - ;; found in source, need check - (symlink (string-append #$output "/libexec/kf5/kdesu") - (string-append #$output "/bin/kdesu"))))))) + (setenv "HOME" (getcwd))))))) (native-inputs (list extra-cmake-modules pkg-config shared-mime-info)) (inputs (list kconfig kdesu @@ -461,11 +567,11 @@ GenericDataLocation.") kio kservice kwindowsystem - kactivities + plasma-activities kparts plasma-workspace - qtx11extras - qtsvg-5)) + qtsvg + libxkbcommon)) (synopsis "CLI tools for interacting with KDE") (description "This package provides command-line tools based on KDE Frameworks 5 to better interact with the system.") @@ -475,17 +581,18 @@ KDE Frameworks 5 to better interact with the system.") (define-public kdeplasma-addons (package (name "kdeplasma-addons") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0l7g4lx6y10xfabfcgvh7zb7h08clj0g9yx8ajyg7rzwfa43visi")))) + "1q8jhj9b9sj7bdkr0bvk4grjjrylq86svwvr96knnpicxbjf633c")))) (build-system qt-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? inputs #:allow-other-keys) @@ -497,23 +604,29 @@ KDE Frameworks 5 to better interact with the system.") "(converterrunnertest)"))))))) (native-inputs (list extra-cmake-modules tzdata-for-tests)) (inputs (list karchive + kauth kconfig kcoreaddons kdeclarative + kdbusaddons kholidays ki18n kio kcmutils + kglobalaccel + kxmlgui knotifications krunner kservice kunitconversion knewstuff - plasma-framework + libplasma + plasma5support purpose sonnet - ;; qtwebengine-5 ; Optional for online dictionary - qtdeclarative-5)) + qt5compat + ;; qtwebengine ; Optional for online dictionary + qtdeclarative)) (synopsis "Add-ons to improve your Plasma experience") (description "This package provides multiple addons for the Plasma Desktop.") @@ -523,119 +636,136 @@ KDE Frameworks 5 to better interact with the system.") (define-public kgamma (package (name "kgamma") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" - version "/" name "5-" + version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0v5fynydjha9wx9j59ysw8vxx2h2gm55q27gnnhgyv0wxva8hpnl")))) + "0qr6crka2a71izg54vz0y7ahsfxr7xh1j3bb53c7pfhs3dq8wgfb")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules)) + (arguments (list #:qtbase qtbase)) + (native-inputs (list extra-cmake-modules kdoctools)) (inputs (list kauth kcoreaddons kconfig kconfigwidgets - kdoctools + kcmutils ki18n)) (synopsis "Adjust monitor gamma settings") (description "This package provides a tool to adjust your monitor gamma settings.") (home-page "https://invent.kde.org/plasma/kgamma5") - (properties '((upstream-name . "kgamma5"))) (license license:gpl2+))) -(define-public khotkeys +(define-public kglobalacceld (package - (name "khotkeys") - (version "5.27.7") + (name "kglobalacceld") + (version "6.1.2") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/plasma/" version "/" - name "-" version ".tar.xz")) + (uri (string-append "mirror://kde/stable/plasma/" + version "/" name "-" + version ".tar.xz")) (sha256 (base32 - "1ipg71jz356jrngw7kqbjs7jplpnr8q3yz694rkhqklsqlfh91bd")))) + "1p38lqiw9r1w6grp5847pm9lh27d765in62fnc2vlrkb99krxcr7")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules)) - (inputs (list kdbusaddons - kdoctools + (arguments (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'setenv + (lambda _ + (setenv "HOME" (getcwd)))) + (replace 'check + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) + (invoke "dbus-launch" "ctest" "-j" + (if parallel-tests? + (number->string (parallel-job-count)) + "1"))))))) + (native-inputs (list extra-cmake-modules dbus)) + (inputs (list kconfig + kcoreaddons + kcrash + kdbusaddons + kwindowsystem kglobalaccel - ki18n - kcmutils + kservice kio - ktextwidgets - kxmlgui - kdelibs4support - plasma-workspace - qtx11extras)) - (synopsis "Trigger actions with the keyboard") + kjobwidgets + xcb-util-keysyms + libxkbcommon)) + (synopsis "Daemon providing Global Keyboard Shortcut (Accelerator) +functionality") (description - "This package provides a way to trigger actions when certain keys -are pressed.") - (home-page "https://invent.kde.org/plasma/khotkeys") - (license license:lgpl2.0))) + "This package provides a Daemon providing Global Keyboard Shortcut +(Accelerator) functionality.") + (home-page "https://invent.kde.org/plasma/kglobalacceld") + (license license:gpl2+))) (define-public kinfocenter (package (name "kinfocenter") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "15hm828ifrrzsbkvknqwf0l3qxr45pdi49z823cw421z45r8ivkj")))) + "0g5hvsgj7v1zc5kavq6kr44rnf2gzk719wsaypdj8cqy8nijph31")))) (build-system cmake-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'fix-systemsettings-symlink - (lambda* (#:key inputs #:allow-other-keys) - (let ((replace (lambda (file cmd) - (substitute* file - (((string-append - "\"" - cmd - "\"")) - (string-append - "\"" - (search-input-file - inputs - (string-append "/bin/" cmd)) - "\"")))))) - (substitute* "CMakeLists.txt" - (("\\$\\{KDE_INSTALL_FULL_BINDIR\\}/systemsettings5") - (search-input-file inputs - "/bin/.systemsettings5-real"))) - (substitute* "Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in" - (("@QtBinariesDir@/qdbus") - (search-input-file inputs "/bin/qdbus"))) - (substitute* "Modules/kwinsupportinfo/main.cpp" - (("QLibraryInfo::location\\(QLibraryInfo::BinariesPath\\) \\+ QStringLiteral\\(\"/qdbus\"\\)") - (string-append "QStringLiteral(\"" (search-input-file inputs "/bin/qdbus") "\")"))) - - (replace '("Modules/cpu/kcm_cpu.json" - "Modules/cpu/main.cpp") "lscpu") - (replace '("Modules/opencl/kcm_opencl.json" - "Modules/opencl/main.cpp") "clinfo") - (replace '("Modules/vulkan/kcm_vulkan.json" - "Modules/vulkan/main.cpp") "vulkaninfo") - (replace '("Modules/glx/kcm_glx.json" - "Modules/glx/main.cpp") "glxinfo") - (replace '("Modules/wayland/kcm_wayland.json" - "Modules/wayland/main.cpp") "wayland-info") - (replace '("Modules/egl/kcm_egl.json" - "Modules/egl/main.cpp") "eglinfo") - (replace '("Modules/xserver/kcm_xserver.json" - "Modules/xserver/main.cpp") "xdpyinfo"))))))) - (native-inputs (list aha extra-cmake-modules kdoctools pkg-config)) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((replace (lambda (file cmd) + (substitute* file + (((string-append + "\"" + cmd + "\"")) + (string-append + "\"" + (search-input-file + inputs + (string-append "/bin/" cmd)) + "\"")))))) + (substitute* "CMakeLists.txt" + (("\\$\\{KDE_INSTALL_FULL_BINDIR\\}/systemsettings") + (search-input-file inputs + "/bin/.systemsettings-real"))) + (substitute* "kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in" + (("@QtBinariesDir@/qdbus") + (search-input-file inputs "/bin/qdbus"))) + (substitute* "kcms/kwinsupportinfo/main.cpp" + (("QLibraryInfo::path\\(QLibraryInfo::BinariesPath\\) \\+ QStringLiteral\\(\"/qdbus\"\\)") + (string-append "QStringLiteral(\"" (search-input-file inputs "/bin/qdbus") "\")"))) + + (replace '("kcms/cpu/kcm_cpu.json" + "kcms/cpu/main.cpp") "lscpu") + (replace '("kcms/opencl/kcm_opencl.json" + "kcms/opencl/main.cpp") "clinfo") + (replace '("kcms/vulkan/kcm_vulkan.json" + "kcms/vulkan/main.cpp") "vulkaninfo") + (replace '("kcms/glx/kcm_glx.json" + "kcms/glx/main.cpp") "glxinfo") + (replace '("kcms/wayland/kcm_wayland.json" + "kcms/wayland/main.cpp") "wayland-info") + (replace '("kcms/egl/kcm_egl.json" + "kcms/egl/main.cpp") "eglinfo") + (replace '("kcms/xserver/kcm_xserver.json" + "kcms/xserver/main.cpp") "xdpyinfo"))))))) + (native-inputs (list aha extra-cmake-modules kdoctools pkg-config qttools)) ;; * vulkaninfo ;; Wayland KCM (inputs (list dmidecode ;; fwupdmgr ;; Packaged on master branch already + kauth kconfig kconfigwidgets kcoreaddons @@ -651,14 +781,14 @@ are pressed.") kwayland mesa-utils pciutils - plasma-framework - qtbase-5 + libplasma + qttools + qtbase solid util-linux vulkan-tools wayland-utils xdpyinfo - qttools-5 clinfo)) (propagated-inputs (list system-settings)) (home-page "https://invent.kde.org/plasma/kinfocenter") @@ -670,7 +800,7 @@ computer's hardware.") (define-public kmenuedit (package (name "kmenuedit") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -678,8 +808,9 @@ computer's hardware.") ".tar.xz")) (sha256 (base32 - "0n60z44wbsjinrcrhs5cfnjs9szpsv2wzva2fiwwgh36j6zz5av7")))) + "0wypmw265n8ni6i0hgb60fmaa5m5v759kwwh9pybc3hw81wb8m4l")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs (list ki18n kxmlgui @@ -736,25 +867,33 @@ the schedule and venue information.") (define-public kpipewire (package (name "kpipewire") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "10j7sa8vv530c388z5rzafkdr4sx3agjqczlnkh7412whyw77lha")))) + "0wfmf28w2fmv1fx02azv6k2k5xkqz3j8jpxgnpgizdrzf9fm03r5")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config)) - (propagated-inputs (list libepoxy pipewire qtbase-5 qtdeclarative-5)) - (inputs (list ffmpeg + (propagated-inputs (list qtbase qtdeclarative + ;; include/KPipeWire/dmabufhandler.h include it. + libepoxy)) + (inputs (list libxkbcommon + libva + pipewire + ffmpeg kcoreaddons ki18n kwayland plasma-wayland-protocols - qtwayland-5 + qtwayland wayland wayland-protocols)) + (arguments + ;; The only test require run pipewire. + (list #:tests? #f)) (home-page "https://invent.kde.org/plasma/kpipewire") (synopsis "Components relating to pipewire use in Plasma") (description "This package offers a set of convenient classes to use @@ -765,7 +904,7 @@ PipeWire in Qt projects.") (define-public kscreen (package (name "kscreen") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -773,12 +912,12 @@ PipeWire in Qt projects.") ".tar.xz")) (sha256 (base32 - "03qa2qrwdjgb6va7akhwpdvzky608sq2lnwj3b1f310mn3hmbmrq")))) + "0p5x7413xs7i0lahvpqn3w69n6vyhcccxisn8hff0nmcd9llm1bz")))) (build-system cmake-build-system) (arguments ;; TODO: All tests fail (list #:tests? #f)) - (native-inputs (list extra-cmake-modules qttools-5 pkg-config)) + (native-inputs (list extra-cmake-modules qttools pkg-config)) (inputs (list kconfig kdbusaddons kdeclarative @@ -792,12 +931,13 @@ PipeWire in Qt projects.") layer-shell-qt libkscreen libxi + libxkbcommon + ksvg plasma-wayland-protocols - qtsensors-5 - qtbase-5 - qtx11extras - xcb-util)) - (propagated-inputs (list plasma-framework)) + qtsensors + qtbase + xcb-util + libplasma)) (home-page "https://invent.kde.org/plasma/kscreen") (synopsis "Screen management software") (description "This package provides the screen management software for @@ -807,19 +947,20 @@ KDE Plasma Workspaces.") (define-public ksshaskpass (package (name "ksshaskpass") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/ksshaskpass-" version ".tar.xz")) (sha256 (base32 - "0vmydvj4c9c93y9wyyjs2hr9m0hygssk1asl4idbj7mcy6n7acg1")))) + "13kfvai8gcv8gbkw2ydixlbik1a113h4ais9wlna3jlnb1y0rya9")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs - (list kcoreaddons ki18n kwallet kwidgetsaddons qtbase-5)) + (list kcoreaddons ki18n kwallet kwidgetsaddons)) (home-page "https://invent.kde.org/plasma/ksshaskpass") (synopsis "Front-end for ssh-add using kwallet") (description "Ksshaskpass is a front-end for @code{ssh-add} which stores the @@ -831,7 +972,7 @@ call it if it is not associated to a terminal.") (define-public ksystemstats (package (name "ksystemstats") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -839,10 +980,11 @@ call it if it is not associated to a terminal.") version ".tar.xz")) (sha256 (base32 - "1fx5b566xx32q7gxi8qnnx6vny7ip5r65zi2znnx3azmwsc8jgvw")))) + "0fv96n03j6q2ainhw922abwwq1qrc8djqwk2cg6cjlnlkvvx9m1i")))) (build-system qt-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -913,22 +1055,22 @@ an elegant and intuitive experience for your tasks and plasmoids.") (define-public layer-shell-qt (package (name "layer-shell-qt") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/layer-shell-qt-" version ".tar.xz")) (sha256 (base32 - "08glqqh7jmqrli4n7j04lz3w3c6192w8p7ki51ksmwivnxylxi17")))) + "02gmfvvzjdhgsqwqr9ga43bjkbz0hnv1sz08zq19m5l3qy66ds0p")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list libxkbcommon - qtbase-5 - qtdeclarative-5 - qtwayland-5 + qtdeclarative + qtwayland wayland wayland-protocols)) (home-page "https://invent.kde.org/plasma/layer-shell-qt") @@ -939,17 +1081,18 @@ an elegant and intuitive experience for your tasks and plasmoids.") (define-public kscreenlocker (package (name "kscreenlocker") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kscreenlocker-" version ".tar.xz")) (sha256 (base32 - "11y3ksd29p8hdn8chaf8vscnc7fbh8xkjdsbakrb056p1r8kn0f2")))) + "1nk23jbi4n22hhffriqxx2845b4kfn676y910dv85c2b1mkipcxs")))) (build-system qt-build-system) (arguments (list #:tests? #f ;TODO: make tests pass + #:qtbase qtbase #:phases #~(modify-phases %standard-phases (add-before 'check 'check-setup (lambda* (#:key inputs outputs #:allow-other-keys) @@ -964,31 +1107,30 @@ an elegant and intuitive experience for your tasks and plasmoids.") (setenv "CTEST_OUTPUT_ON_FAILURE" "1") (invoke "dbus-launch" "ctest")))))))) (native-inputs (list extra-cmake-modules pkg-config + ;; for WaylandScanner + wayland ;; For tests. dbus xorg-server-for-tests)) (inputs (list kcmutils kconfig kcrash - kdeclarative kglobalaccel ki18n kio kidletime knotifications - ktextwidgets kwayland kwindowsystem kxmlgui + ksvg layer-shell-qt libkscreen - libseccomp ;for sandboxing the look'n'feel package - libxcursor ;missing in CMakeList.txt + libplasma libxi ;XInput, required for grabbing XInput2 devices linux-pam + libxkbcommon elogind ;optional loginctl support - qtbase-5 - qtdeclarative-5 - qtx11extras + qtdeclarative solid wayland xcb-util-keysyms)) @@ -998,45 +1140,58 @@ an elegant and intuitive experience for your tasks and plasmoids.") "@code{kscreenlocker} is a library for creating secure lock screens.") (license license:gpl2+))) -(define-public ksysguard +(define-public libkscreen (package - (name "ksysguard") - (version "5.22.0") + (name "libkscreen") + (version "6.1.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/ksysguard/" version - "/ksysguard-" version ".tar.xz")) - (sha256 - (base32 "0bb2aj46v7ig0wn3ir68igryl2gblz2n75cddn8fwamvbx76570g")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" version "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1f4pb09b9n6fbwlcs5fva3wpfamg9maz2k4rf0dyr2ihyjwh3p1n")))) (build-system qt-build-system) - ;; TODO: No tests found + (arguments + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-env-setup + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (with-output-to-file "autotests/BLACKLIST" + (lambda _ + (for-each + (lambda (name) + (display (string-append "[" name "]\n*\n"))) + (list + "verifyOutputs" + ;; also fail on upstream + "testEdidParser" + "testEnv")))))))))) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules + pkg-config + qttools + ;; For testing. + dbus)) (inputs - (list kconfig - kcoreaddons - kdbusaddons - ki18n - kiconthemes - kinit - kio - kitemviews - knewstuff - knotifications - kwindowsystem - libksysguard - `(,lm-sensors "lib") - qtbase-5)) - (home-page "https://www.kde.org/applications/system/ksysguard/") - (synopsis "Plasma process and performance monitor") - (description "KSysGuard is a program to monitor various elements of your -system, or any other remote system with the KSysGuard daemon (ksysgardd) -installed.") + (list kwayland libxrandr plasma-wayland-protocols qtwayland + wayland + libxkbcommon)) + (home-page "https://community.kde.org/Solid/Projects/ScreenManagement") + (synopsis "KDE's screen management software") + (description "KScreen is the new screen management software for KDE Plasma +Workspaces which tries to be as magic and automatic as possible for users with +basic needs and easy to configure for those who want special setups.") (license license:gpl2+))) -(define-public libkscreen +;; use by lxqt-config +(define-public libkscreen-5 (package + (inherit libkscreen) (name "libkscreen") (version "5.27.7") (source @@ -1048,20 +1203,20 @@ installed.") (base32 "1ary7qavz8vkzbvjx2mxv09h61hxa7i4f7rfgbykldbc83ripdc6")))) (build-system qt-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" (getcwd)) - (setenv "QT_QPA_PLATFORM" "offscreen") - (setenv "WAYLAND_DISPLAY" "libkscreen-test-wayland-backend-0") - (invoke "ctest" "-E" - (string-append "(kscreen-testedid" - "|kscreen-testqscreenbackend" - "|kscreen-testkwaylandbackend" - "|kscreen-testkwaylandconfig" - "|kscreen-testkwaylanddpms)")))))))) + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "WAYLAND_DISPLAY" "libkscreen-test-wayland-backend-0") + (invoke "ctest" "-E" + (string-append "(kscreen-testedid" + "|kscreen-testqscreenbackend" + "|kscreen-testkwaylandbackend" + "|kscreen-testkwaylandconfig" + "|kscreen-testkwaylanddpms)")))))))) (native-inputs (list extra-cmake-modules pkg-config @@ -1069,29 +1224,22 @@ installed.") ;; For testing. dbus)) (inputs - (list kconfig kwayland libxrandr plasma-wayland-protocols - qtbase-5 qtwayland-5 wayland qtx11extras)) - (home-page "https://community.kde.org/Solid/Projects/ScreenManagement") - (synopsis "KDE's screen management software") - (description "KScreen is the new screen management software for KDE Plasma -Workspaces which tries to be as magic and automatic as possible for users with -basic needs and easy to configure for those who want special setups.") - (license license:gpl2+))) + (list kconfig-5 kwayland-5 libxrandr plasma-wayland-protocols + qtbase-5 qtwayland-5 wayland qtx11extras)))) (define-public libksysguard (package (name "libksysguard") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/libksysguard-" version ".tar.xz")) - (patches (search-patches "libksysguard-qdiriterator-follow-symlinks.patch")) (sha256 - (base32 "066bjar4105bfyry6ni7nnikz66bqzy5nvssz6vm4np3aa996ak8")))) + (base32 "1l1fy5i9yxh7fnxfyfsk0hnyd1vfzac336kcfwklkqa7l796hpc0")))) (native-inputs - (list bash-minimal extra-cmake-modules pkg-config qttools-5)) + (list bash-minimal extra-cmake-modules pkg-config qttools)) (inputs (list kauth kcompletion @@ -1111,22 +1259,21 @@ basic needs and easy to configure for those who want special setups.") libcap libpcap `(,lm-sensors "lib") - plasma-framework - qtbase-5 - qtdeclarative-5 - qtscript - qtwebchannel-5 - qtwebengine-5 - qtx11extras + libplasma + qtdeclarative + qtwebchannel + qtwebengine zlib)) (build-system qt-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'fix-test - (lambda* _ - (substitute* "autotests/processtest.cpp" - (("/bin/sh") - (which "bash")))))))) + (list + #:qtbase qtbase + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'fix-test + (lambda* _ + (substitute* "autotests/processtest.cpp" + (("/bin/sh") + (which "bash")))))))) (home-page "https://userbase.kde.org/KSysGuard") (synopsis "Network enabled task and system monitoring") (description "KSysGuard can obtain information on system load and @@ -1137,7 +1284,7 @@ with a ksysguardd daemon, which may also run on a remote system.") (define-public kwallet-pam (package (name "kwallet-pam") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1145,10 +1292,12 @@ with a ksysguardd daemon, which may also run on a remote system.") ".tar.xz")) (sha256 (base32 - "1ac0hqpzqivg40jq7pfr2s1zydl600a3nyzfv97wc20i9myzafrb")))) + "1d7b192rislaljz7j8wpjzw529a9hy94pzr063nnlz982251nm77")))) (build-system qt-build-system) (arguments - (list #:tests? #f)) ;no tests + (list + #:qtbase qtbase + #:tests? #f)) ;no tests (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list linux-pam kwallet libgcrypt socat)) (synopsis "PAM Integration with KWallet") @@ -1160,7 +1309,7 @@ you login.") (define-public kwayland-integration (package (name "kwayland-integration") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1168,7 +1317,7 @@ you login.") version ".tar.xz")) (sha256 (base32 - "1fvf64vx5m3h5v8h697ixkcifhva6a14wlz75kv6759ji9l9fy8y")))) + "16wlnsavxbm54am6am29667scilvdksgbaskwqdkaazqqjxn298a")))) (build-system qt-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -1188,12 +1337,13 @@ you login.") "/lib/qt5/plugins:" (getenv "QT_PLUGIN_PATH")))))))) (native-inputs (list extra-cmake-modules wayland-protocols pkg-config)) - (inputs (list kguiaddons - kidletime - kwindowsystem - kwayland + (inputs (list kguiaddons-5 + kidletime-5 + kwindowsystem-5 + kwayland-5 libxkbcommon wayland + plasma-wayland-protocols qtbase-5 qtwayland-5)) (synopsis "KWayland runtime integration plugins") @@ -1205,18 +1355,24 @@ KDE Frameworks components.") (define-public kwin (package (name "kwin") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/plasma/" version "/" + (uri (string-append "mirror://kde/stable/plasma/" + version "/" name "-" version ".tar.xz")) (patches (search-patches "kwin-unwrap-executable-name-for-dot-desktop-search.patch")) (sha256 (base32 - "0bssp76lzqqlan5pfg6wjf4z9c6pl6p66ri8p82vqqw406x5bzyb")))) + "03y0als06vryf1cwiladnn9a3vnsp32gp9bcvp42mm017g485ic2")))) (build-system qt-build-system) (arguments (list + #:qtbase qtbase + #:configure-flags + #~(list (string-append "-DQtWaylandScanner_EXECUTABLE=" + #$(this-package-native-input "qtwayland") + "/lib/qt6/libexec/qtwaylandscanner")) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch @@ -1234,8 +1390,8 @@ KDE Frameworks components.") (string-append "setProgram(QByteArrayLiteral(\"" (which "glxgears") "\")"))) (substitute* - '("src/wayland/tests/renderingservertest.cpp" - "src/wayland/tests/waylandservertest.cpp") + '("tests/renderingservertest.cpp" + "tests/waylandservertest.cpp") (("QByteArrayLiteral\\(\"Xwayland\"\\)") (string-append "QByteArrayLiteral(\"" (which "Xwayland") "\")"))) @@ -1252,14 +1408,6 @@ KDE Frameworks components.") (substitute* '("cmake/modules/Findhwdata.cmake") (("/usr/share") (string-append #$(this-package-input "hwdata") "/share"))))) - (add-after 'install 'add-symlinks - (lambda* (#:key outputs #:allow-other-keys) - (let ((kst5 (string-append #$output - "/share/kservicetypes5/"))) - (symlink (string-append kst5 "kwineffect.desktop") - (string-append kst5 "kwin-effect.desktop")) - (symlink (string-append kst5 "kwinscript.desktop") - (string-append kst5 "kwin-script.desktop"))))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -1270,7 +1418,7 @@ KDE Frameworks components.") (getenv "XDG_DATA_DIRS"))) (setenv "QT_PLUGIN_PATH" (string-append #$output - "/lib/qt5/plugins:" + "/lib/qt6/plugins:" (getenv "QT_PLUGIN_PATH"))) (setenv "DISPLAY" ":1") (system "Xvfb :1 &") @@ -1279,31 +1427,40 @@ KDE Frameworks components.") "ctest" "-E" (string-join - (list "kwin-testXkb" - "kwin-testPointerInput" - "kwin-testXdgShellWindow" - "kwin-testXdgShellWindow-waylandonly" - "kwin-testSceneOpenGLES" - "kwin-testSceneOpenGLES-waylandonly" - "kwin-testNightColor" - "kwin-testNightColor-waylandonly" - "kwin-testScriptedEffects" - "kwayland-testWaylandSurface") + (list + "kwin-testDrm" ;; require Drm + "kwin-testInputMethod" + "kwin-testPlasmaWindow" ;; require plasma-workspace qml module. + "kwin-testButtonRebind" + "kwin-testDecorationInput" + "kwin-testPointerInput" + "kwin-testXdgShellWindow" + "kwin-testXdgShellWindow-waylandonly" + "kwin-testSceneOpenGLES" + "kwin-testSceneOpenGLES-waylandonly" + "kwin-testNightColor" + "kwin-testNightColor-waylandonly" + "kwin-testScriptedEffects" + "kwayland-testServerSideDecoration" + "kwayland-testWaylandSurface") "|")))))))) (native-inputs (list extra-cmake-modules dbus kdoctools mesa-utils pkg-config - qttools-5 - wayland-protocols - xorg-server-for-tests)) + qttools + wayland-protocols-next + xorg-server-for-tests + python-minimal + ;; for QtWaylandScanner + qtwayland)) (inputs (list breeze eudev fontconfig freetype `(,hwdata "pnp") - kactivities + plasma-activities kcmutils kcompletion kconfig @@ -1314,6 +1471,7 @@ KDE Frameworks components.") kdeclarative kdecoration kglobalaccel + kglobalacceld ki18n kiconthemes kidletime @@ -1328,6 +1486,9 @@ KDE Frameworks components.") kwayland kwindowsystem kxmlgui + ksvg + kauth + kguiaddons libqaccessibilityclient lcms libcap @@ -1336,13 +1497,13 @@ KDE Frameworks components.") libinput libxkbcommon pipewire - plasma-framework + libplasma plasma-wayland-protocols - qtbase-5 - qtdeclarative-5 - qtmultimedia-5 - qtwayland-5 - qtx11extras + qt5compat + qtdeclarative + qtmultimedia + qtwayland + qtsensors wayland xcb-util ;fails at build time without this xcb-util-cursor @@ -1351,6 +1512,7 @@ KDE Frameworks components.") xcmsdb xinput ;XXX: Says disabled in configure phase xorg-server-xwayland + libdisplay-info zlib)) ;; Runtime-only dependency needed for mapping monitor hardware vendor IDs to full names ;; * QtQuick.Controls-QMLModule, QML module 'QtQuick.Controls' is a runtime dependency. @@ -1367,7 +1529,7 @@ conjunction with the KDE Plasma Desktop.") (define-public kwrited (package (name "kwrited") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1375,10 +1537,11 @@ conjunction with the KDE Plasma Desktop.") version ".tar.xz")) (sha256 (base32 - "1a4g05ynblbz0j0lqclxf6628x6wcd3b52l0smic3rdvbis43v0n")))) + "1h8njjh277jk66r4bm913m953irgdy3126gsamnjzjkrd13qlr45")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kcoreaddons ki18n kpty knotifications)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/plasma/kwrited") (synopsis "System notification daemon") (description @@ -1418,7 +1581,7 @@ and minimalistic.") (define-public milou (package (name "milou") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1426,7 +1589,7 @@ and minimalistic.") version ".tar.xz")) (sha256 (base32 - "0lq8m72nwink8x46m8qd5zdkadym1kc70ipnkb04b16mr7zhnsc1")))) + "15vr74s66aj617vh0szf6r3s5iffbg8mwchf1kkvhbw5fnw912lm")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kcoreaddons @@ -1434,20 +1597,47 @@ and minimalistic.") kdeclarative kitemmodels kservice - plasma-framework + libplasma kwindowsystem krunner - qtdeclarative-5)) + ksvg + qtdeclarative)) + (arguments (list #:qtbase qtbase)) (synopsis "Dedicated search application built on top of Baloo") (description "This package provides a dedicated search application built on top of Baloo.") (home-page "https://invent.kde.org/plasma/milou") (license (list license:gpl2+)))) +(define-public qqc2-breeze-style + (package + (name "qqc2-breeze-style") + (version "6.1.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" + version "/" name "-" + version ".tar.xz")) + (sha256 + (base32 + "1n8yqiyvn5cyvxl7mp33x2jbkxzzqfzd1wvgdzybqx1hw3m3lh1j")))) + (build-system qt-build-system) + (arguments + (list #:qtbase qtbase)) + (native-inputs + (list extra-cmake-modules)) + (inputs (list qtdeclarative + kiconthemes kguiaddons kconfig kirigami kcoreaddons + kcolorscheme kquickcharts)) + (home-page "https://invent.kde.org/plasma/qqc2-breeze-style") + (synopsis "Breeze inspired Qt Quick Controls Style") + (description "This package provides Breeze inspired Qt Quick Controls Style.") + (license (list license:lgpl2.0+ license:gpl2+)))) + (define-public oxygen-sounds (package (name "oxygen-sounds") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1455,7 +1645,7 @@ on top of Baloo.") version ".tar.xz")) (sha256 (base32 - "132jaabfpj8k6xk6f1732a0qgjz1mzyyk74b1mm7q7pyhpypr2gq")))) + "02yz7mlnbylhv2d66hl1dvp6ylnp9lj5f07ivdjcwpq556agxljf")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (home-page "https://community.kde.org/Frameworks") @@ -1463,10 +1653,30 @@ on top of Baloo.") (description "This package provides Oxygen sounds for the KDE desktop.") (license license:lgpl3+))) +(define-public ocean-sound-theme + (package + (name "ocean-sound-theme") + (version "6.1.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" + version "/ocean-sound-theme" "-" + version ".tar.xz")) + (sha256 + (base32 + "0ysgx7bg5njgfv3rxdz5bzqh0iki1qb0pwqk4dmnwc3hx3c89ynb")))) + (build-system cmake-build-system) + (native-inputs (list extra-cmake-modules)) + (inputs (list qtbase)) + (home-page "https://invent.kde.org/plasma/ocean-sound-theme") + (synopsis "Ocean Sound Theme for Plasma") + (description "This package provides Ocean Sound Theme for Plasma.") + (license license:lgpl3+))) + (define-public plasma (package (name "plasma") - (version "5.27.7") + (version "6.1.2") (source #f) (build-system trivial-build-system) (arguments @@ -1474,36 +1684,39 @@ on top of Baloo.") (mkdir #$output)))) ;; TODO: cleanup, check what is no need (propagated-inputs (list kdeclarative ;; require by sddm breeze theme + plasma5support ;; require by sddm breeze theme + qt5compat ;; require by sddm breeze theme + kiconthemes ;; require by sddm breeze theme + ksvg ;; require by sddm breeze theme qqc2-desktop-style ; qtquickcontrols2 theme + ocean-sound-theme + qtdeclarative + qtsvg ;; for svg support + qtbase ;; why? baloo breeze-icons ; default mouse icon breeze breeze-gtk + layer-shell-qt drkonqi kactivitymanagerd ; require this run dbus kde-cli-tools kdecoration kdeplasma-addons - kgamma - khotkeys ktexteditor - kscreen libkscreen - + krdp ksystemstats + kwallet kwallet-pam kwin - kinit - + plasma-workspace-wallpapers libksysguard milou - ;; oxygen oxygen-sounds - + qqc2-breeze-style kde-gtk-config - kdesu - krunner kinfocenter kscreenlocker ksshaskpass @@ -1529,16 +1742,14 @@ on top of Baloo.") (resolve-interface '(gnu packages kde-systemtools)) 'spectacle) - - kwayland-integration plasma-firewall plasma-integration plasma-nm plasma-pa plasma-systemmonitor ;; plasma-thunderbolt ;; waiting for bolt - kglobalaccel + kglobalacceld plasma-vault plasma-workspace powerdevil)) @@ -1548,76 +1759,102 @@ on top of Baloo.") "KDE Plasma is an advanced graphical desktop system.") (license license:gpl2+))) -(define-public plasma-bigscreen +(define-public plasma5support (package - (name "plasma-bigscreen") - (version "5.27.7") + (name "plasma5support") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0b2w0d5w1s2jm7al1nqdc1qh9fmrj8fw93wjbb2bsa9fabz2i81b")))) - (build-system cmake-build-system) - (arguments - (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'fix-startplasma - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "bin/plasma-bigscreen-wayland.in" - (("^startplasma-wayland") - (search-input-file inputs - "/bin/startplasma-wayland"))) - (substitute* "bin/plasma-bigscreen-x11" - (("startplasma-x11") - (search-input-file inputs - "/bin/startplasma-x11")))))))) + "17cwd0iyrzggb56xc37mvw7n7r0ddiasmxgfhzgh67sdxwpp7kzj")))) + (build-system qt-build-system) + (arguments (list #:qtbase qtbase + + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) + (invoke "ctest" + "-E" + ;; also fail in upstream. + "(pluginloadertest)" + "-j" + (if parallel-tests? + (number->string (parallel-job-count)) + "1"))))))) (native-inputs (list extra-cmake-modules)) - (inputs (list kactivities - kactivities-stats - plasma-framework - ki18n - kirigami - kdeclarative - kcmutils - knotifications - kio - kwayland - kwindowsystem - plasma-workspace - qtbase-5 - qtmultimedia-5)) - (home-page "https://invent.kde.org/plasma/plasma-bigscreen") - (synopsis "Plasma shell for TVs") - (description - "This package provides a big launcher designed for large screens. It -is controllable via voice or TV remote.") - (license license:gpl2+))) + (propagated-inputs (list kcoreaddons)) + (inputs (list + kconfig + ki18n + qtdeclarative + kguiaddons + knotifications + solid + libksysguard)) + (home-page "https://invent.kde.org/plasma/plasma5support") + (synopsis "Support components for porting from KF5/Qt5 to KF6/Qt6") + (description "This package provids support components for porting from +KF5/Qt5 to KF6/Qt6") + (license (list license:lgpl2.0+)))) + +(define-public mpvqt + (package + (name "mpvqt") + (version "1.0.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/mpvqt/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1fafyn3a8hgg1g3nfka6hyynlmqdygaxz0fhp4ckxwz54nlx4cci")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules pkg-config)) + (inputs + (list qtdeclarative)) + (propagated-inputs + (list mpv)) + (arguments + (list #:qtbase qtbase)) + (home-page "https://invent.kde.org/libraries/mpvqt") + (synopsis "A libmpv wrapper for QtQuick2 and QML") + (description "This package provides a libmpv wrapper for QtQuick2 and QML.") + (license license:lgpl2.1+))) (define-public plasmatube (package (name "plasmatube") - (version "23.01.0") + (version "24.05.2") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/plasma-mobile/" - version "/" name "-" version ".tar.xz")) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/plasmatube-" version ".tar.xz")) (sha256 (base32 - "06hwa1m6gaacjmcyssa63vw43cgx096x9aj87rv1z9k9qsv2qgfj")))) - (build-system cmake-build-system) - (native-inputs (list extra-cmake-modules pkg-config)) + "0dkn1ysgvhwrfdffpwbgzblc0jbb94h5r4cp23gnnk38iy4fsrim")))) + (build-system qt-build-system) + (native-inputs (list extra-cmake-modules pkg-config python-minimal)) (inputs (list kconfig + kcoreaddons + kdbusaddons kirigami + kirigami-addons ki18n - qtbase-5 - qtdeclarative-5 - qtmultimedia-5 - qtquickcontrols2-5 - qtsvg-5 - mpv - youtube-dl)) + kwindowsystem + qtdeclarative + qtmultimedia + qtsvg + qtkeychain-qt6 + mpvqt + yt-dlp)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/plasmatube/") (synopsis "Kirigami YouTube video player") (description "This package provides YouTube video player based @@ -1656,14 +1893,14 @@ active window on Plasma Desktop.") (define-public plasma-browser-integration (package (name "plasma-browser-integration") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0c30pdlhl452bjpdc7mwxl01hqabahyc0j1cc54liy0hla9vir9y")))) + "07wsbq3p55k9jha341zpxgk6v4iaj3j4agp45h32m2881fjrwb80")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config)) ;; TODO: Figure out how to integrate this package into web browsers @@ -1678,45 +1915,49 @@ active window on Plasma Desktop.") knotifications kitemmodels krunner - kactivities + plasma-activities purpose kfilemetadata kjobwidgets - qtdeclarative-5)) + kstatusnotifieritem + qtdeclarative)) (propagated-inputs (list plasma-workspace)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/plasma/plasma-browser-integration") (synopsis "Integrate browsers into the Plasma Desktop") (description "This package aims to provide better integration of web browsers with -the KDE Plasma 5 desktop.") +the KDE Plasma 6 desktop.") (license license:gpl3+))) (define-public plasma-desktop (package (name "plasma-desktop") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1njkjf3fhxfmwyviypxqzrn23klxiih82bazvd8y61cshqwai6i2")))) + "1n72hynnvgyy0ja0f20p322c2y5yvb5ra1i4jrlxwji795y09r19")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules dbus kdoctools intltool pkg-config - qtsvg-5 - qttools-5 + qtsvg + qttools + libxml2 ;; require QtWaylandScanner - qtwayland-5)) - (inputs (list packagekit-qt5 + qtwayland)) + (inputs (list packagekit-qt6 signon-plugin-oauth2 - signond + signond-qt6 + icu4c attica - appstream-qt + appstream-qt6 baloo breeze breeze-icons @@ -1725,8 +1966,8 @@ the KDE Plasma 5 desktop.") glib ibus kaccounts-integration - kactivities - kactivities-stats + plasma-activities + plasma-activities-stats kauth karchive kcmutils @@ -1737,14 +1978,12 @@ the KDE Plasma 5 desktop.") kdeclarative kded kdesu - kdelibs4support kglobalaccel kguiaddons kholidays ki18n kiconthemes kidletime - kinit kio kitemmodels knewstuff @@ -1761,8 +2000,10 @@ the KDE Plasma 5 desktop.") kwallet kwayland kwin + ksvg + plasma5support layer-shell-qt - libaccounts-qt + libaccounts-qt6 libcanberra libkscreen libksysguard @@ -1778,17 +2019,14 @@ the KDE Plasma 5 desktop.") networkmanager-qt phonon pipewire - plasma-framework + libplasma plasma-wayland-protocols pulseaudio prison qqc2-desktop-style - qtbase-5 - qtdeclarative-5 - qtquickcontrols-5 - qtquickcontrols2-5 - qtwayland-5 - qtx11extras + qt5compat + qtdeclarative + qtwayland wayland wayland-protocols xcb-util @@ -1805,10 +2043,18 @@ the KDE Plasma 5 desktop.") libxkbfile libxcursor libxkbcommon)) - (propagated-inputs (list iso-codes kirigami plasma-workspace)) + (propagated-inputs (list iso-codes kirigami kcmutils plasma-workspace)) (arguments - (list #:phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-wallpaper + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "sddm-theme/theme.conf.cmake" + (("background=..KDE_INSTALL_FULL_WALLPAPERDIR.") + (string-append "background=" + #$(this-package-input "breeze") + "/share/wallpapers"))))) (add-after 'unpack 'fix-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "kcms/keyboard/iso_codes.h" @@ -1823,7 +2069,7 @@ the KDE Plasma 5 desktop.") (setenv "XDG_RUNTIME_DIR" (getcwd)) (setenv "XDG_CACHE_HOME" (getcwd)) (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "ctest" "-E" "foldermodeltest"))))))) + (invoke "ctest" "-E" "(kcm-keyboard-keyboard_memory_persister_test|foldermodeltest)"))))))) (home-page "https://kde.org/plasma-desktop/") (synopsis "Plasma for the Desktop") (description @@ -1838,7 +2084,7 @@ activities effectively, without being distracting.") (define-public plasma-disks (package (name "plasma-disks") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1846,13 +2092,27 @@ activities effectively, without being distracting.") version ".tar.xz")) (sha256 (base32 - "0jwjv20ra1mhwl2cm7x2jz8pasmkc58fd57qxhzzf84l4sgbda9v")))) + "1rk8356fpy2vgfi79kz2xlkz032jb3cd9y6rsp9f875bik5j25hz")))) (build-system qt-build-system) + (arguments (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-smartctl-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/helper.cpp" + (("\"smartctl\"") + (string-append + "\"" + (search-input-file + inputs "/sbin/smartctl") + "\"")))))))) (native-inputs (list extra-cmake-modules)) (inputs (list kcoreaddons kdbusaddons knotifications ki18n + kcmutils solid kservice kio @@ -1867,7 +2127,7 @@ activities effectively, without being distracting.") (define-public plasma-firewall (package (name "plasma-firewall") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1875,16 +2135,18 @@ activities effectively, without being distracting.") version ".tar.xz")) (sha256 (base32 - "1n5ljkydhcx6qapwrshslq835zaf02gssp2zvzi3vwfy4asc7ind")))) + "0k2rf8w5iwsxnq0amrss8p0ncl3q4sxl06531p3d2ga6glh0kspn")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules)) (inputs (list iproute + kauth kcoreaddons kcmutils ki18n kdeclarative python - qtdeclarative-5)) + qtdeclarative)) (synopsis "Control Panel for system firewall") (description "This package provides interface to system firewall.") (home-page "https://invent.kde.org/plasma/plasma-firewall") @@ -1893,7 +2155,7 @@ activities effectively, without being distracting.") (define-public plasma-integration (package (name "plasma-integration") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1901,10 +2163,12 @@ activities effectively, without being distracting.") version ".tar.xz")) (sha256 (base32 - "1ahzckvc69wk2rx73sl40h0in1y7ny0vm0i7lbrrcggv1v36dwp3")))) + "0108pzfjwd84ysysq705k8ccy4hi9mmx412ll3d751dc50lj6np1")))) (build-system qt-build-system) (arguments - (list #:tests? #f ;TODO: Failing tests + (list #:qtbase qtbase + #:configure-flags #~(list "-DBUILD_QT5=OFF") + #:tests? #f ;TODO: Failing tests #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) @@ -1918,20 +2182,27 @@ activities effectively, without being distracting.") (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list breeze kconfig - kio - ki18n - kwidgetsaddons kconfigwidgets + kguiaddons + ki18n kiconthemes + kio knotifications + kstatusnotifieritem + kwayland + kwidgetsaddons + kxmlgui libxcb libxcursor + libxkbcommon plasma-wayland-protocols - qtdeclarative-5 - qtquickcontrols2-5 - qtwayland-5 - qtx11extras - wayland)) + qtdeclarative + qtwayland + wayland + xdg-desktop-portal-kde + font-google-noto-sans-cjk + font-google-noto-emoji + font-hack)) (home-page "https://invent.kde.org/plasma/plasma-integration") (synopsis "Qt Platform Theme integration plugins for the Plasma workspaces") @@ -1943,19 +2214,22 @@ integration of Qt applications when running on a KDE Plasma workspace.") (define-public plasma-nano (package (name "plasma-nano") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/plasma-nano-" version ".tar.xz")) (sha256 (base32 - "14wc76bxnwd0z51gz4zb88p5h9n2711ifr1wpx9lrj9r7y1llank")))) + "1dyap53ad32s27sxx7rzszp3q0avfiqwfc05a2f5sbqqrwf4bpk3")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config qttools)) - (inputs (list qtbase-5 - qtdeclarative-5 - plasma-framework + (inputs (list qtbase + qtdeclarative + qtsvg + libplasma + kservice + kitemmodels kwindowsystem kwayland ki18n)) @@ -1968,7 +2242,7 @@ integration of Qt applications when running on a KDE Plasma workspace.") (define-public plasma-nm (package (name "plasma-nm") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1976,10 +2250,11 @@ integration of Qt applications when running on a KDE Plasma workspace.") ".tar.xz")) (sha256 (base32 - "1w9zclih2mh8gqwahsmbbm0nrg1b6gcr5w2w02szlw30iq8k92j8")))) + "02148q5707cck0qix2c3k7npp9kblnq5h79xvb99rq45sbwc51pr")))) (build-system qt-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -1997,18 +2272,20 @@ integration of Qt applications when running on a KDE Plasma workspace.") networkmanager-qt knotifications kirigami - plasma-framework + libplasma modemmanager-qt network-manager - qca + qca-qt6 kservice solid prison kwallet kwidgetsaddons kwindowsystem + ksvg + qcoro-qt6 openconnect - qtdeclarative-5)) + qtdeclarative)) (synopsis "Plasma applet for managing network connections") (description "This package provides Plasma applet for managing network connections.") @@ -2104,7 +2381,7 @@ customizable platform for mobile devices.") (define-public plasma-pa (package (name "plasma-pa") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -2112,20 +2389,29 @@ customizable platform for mobile devices.") version ".tar.xz")) (sha256 (base32 - "1vg28v5n648y94m6amcwmr0n7dw4a2kfx16kny7jb9bkmxrgnwsc")))) + "0rj4dffgzinxj5b1wgjz2mmc73c51bx845g9vvx17k7xdcry117x")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase + ;; test require selenium-webdriver-at-spi-run + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools pkg-config)) (inputs (list glib kcoreaddons + kconfig kcmutils kdeclarative kglobalaccel + kstatusnotifieritem knotifications kwindowsystem kirigami + ksvg + kdbusaddons + pulseaudio-qt ki18n - qtdeclarative-5)) - (propagated-inputs (list libcanberra pulseaudio plasma-framework)) + qtdeclarative)) + (propagated-inputs (list libcanberra pulseaudio + libplasma)) (home-page "https://invent.kde.org/plasma/plasma-pa") (synopsis "Plasma applet for audio volume management using PulseAudio") (description @@ -2136,19 +2422,24 @@ PulseAudio.") (define-public plasma-pass (package (name "plasma-pass") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "0x1yj9wsz2hb5333g645wjasxd83gd2phpwg80h24vfpqdhz62qj")))) + "1klpqcc2wsf3myvzhy9l0sv2iws458iad2mwg3z0cy2d11an8wia")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) - (inputs (list ki18n kitemmodels kwindowsystem oath-toolkit - qgpgme qtdeclarative-5)) - (propagated-inputs (list plasma-framework)) + (inputs (list ki18n kitemmodels kwindowsystem kio + libplasma + oath-toolkit + plasma5support + qgpgme-qt6-1.23 + qtdeclarative)) + (arguments (list #:qtbase qtbase + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) (home-page "https://invent.kde.org/plasma/plasma-pass") (synopsis "Plasma applet for the Pass password manager") (description @@ -2259,27 +2550,59 @@ Desktop.") (define-public plasma-vault (package (name "plasma-vault") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1p5m5rlamb50cbd1qlx81m003sv8vdijkpy5airmy1pf6xmvl6hq")))) + "1y8f2n6g018gy1dxxhgsq6d341asxhjxingd9vizf89y85h6vacn")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list kio ki18n kconfigwidgets kconfig - kactivities + plasma-activities kdbusaddons kiconthemes - networkmanager-qt + kitemmodels libksysguard - plasma-framework - qtdeclarative-5)) + networkmanager-qt + libplasma + qtdeclarative + + cryfs + fuse-2 + gocryptfs + encfs)) + (arguments + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key inputs #:allow-other-keys) + (let ((fusermount (search-input-file inputs "/bin/fusermount")) + (gocryptfs (search-input-file inputs "/bin/gocryptfs")) + (cryfs (search-input-file inputs "/bin/cryfs")) + (encfs (search-input-file inputs "/bin/encfs")) + (encfsctl (search-input-file inputs "/bin/encfsctl"))) + (substitute* "kded/engine/fusebackend_p.cpp" + (("\"fusermount\"") + (string-append "\"" fusermount "\""))) + (substitute* "kded/engine/backends/gocryptfs/gocryptfsbackend.cpp" + (("\"gocryptfs\"") + (string-append "\"" gocryptfs "\""))) + (substitute* "kded/engine/backends/cryfs/cryfsbackend.cpp" + (("\"cryfs\"") + (string-append "\"" cryfs "\""))) + (substitute* "kded/engine/backends/encfs/encfsbackend.cpp" + (("\"encfs\"") + (string-append "\"" encfs "\"")) + (("\"encfsctl\"") + (string-append "\"" encfsctl "\""))))))))) (home-page "https://invent.kde.org/plasma/plasma-vault") (synopsis "Plasma applet and services for creating encrypted vaults") (description "Provides Plasma applet and services for creating encrypted @@ -2289,32 +2612,35 @@ vaults.") (define-public plasma-systemmonitor (package (name "plasma-systemmonitor") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1qr8krc7d1hzxv0gx0ii0rxk9bm62rgh157mr8x785qqbd11nq8l")))) + "1v329hfr0jjqbkbidkbb52i235c4g4ix2x3mngyfvjf3ykvxd1xs")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list ki18n kconfig + kcrash kdeclarative kservice kiconthemes kglobalaccel kio kdbusaddons + kpackage kirigami + kirigami-addons knewstuff ksystemstats kitemmodels libksysguard qqc2-desktop-style - qtdeclarative-5 - qtquickcontrols2-5)) + qtdeclarative)) + (arguments (list #:qtbase qtbase)) (synopsis "System sensors, process information and other system resources monitor") (description "This package provides an interface for monitoring system @@ -2325,7 +2651,7 @@ sensors, process information and other system resources.") (define-public plasma-welcome (package (name "plasma-welcome") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -2334,7 +2660,7 @@ sensors, process information and other system resources.") version ".tar.xz")) (sha256 (base32 - "0nz1hxz5nvgl3sbm6k3a76s0l3fy3j38i4plly2zhp5xqdk0ks1x")))) + "19d0p1nsg9jjpv9d8948hnpb75gnrjj4xv6r0i4dzbg4mz25vb32")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config)) @@ -2344,21 +2670,24 @@ sensors, process information and other system resources.") kdeclarative ki18n kio + kconfigwidgets + kcmutils + ksvg kirigami + kirigami-addons knotifications kservice knewstuff kaccounts-integration - signond + signond-qt6 kuserfeedback - libaccounts-qt + libaccounts-qt6 kwindowsystem networkmanager-qt - plasma-framework - qtdeclarative-5 - qtgraphicaleffects - qtsvg-5 - qtquickcontrols2-5)) + libplasma + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (synopsis "Plasma welcome screen") (description "This package provides a wizard for Plasma to configure settings.") @@ -2368,20 +2697,21 @@ sensors, process information and other system resources.") (define-public plasma-workspace (package (name "plasma-workspace") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0pyf5vc466mfgicxpp76igdz58lpa0n7x2cl2hhaq4zmrlfr8hh6")))) + "16k55b08q42nc89slp49ivqssx6rs21zlzshwmjqx1na5nwikw27")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules kdoctools pkg-config qtsvg-5 - qttools-5 - xorg-server-for-tests)) + (native-inputs (list extra-cmake-modules kdoctools pkg-config qtsvg + qttools + xorg-server-for-tests + python-minimal)) (inputs (list appmenu-gtk-module - appstream-qt + appstream-qt6 baloo breeze breeze-icons @@ -2389,9 +2719,12 @@ sensors, process information and other system resources.") fontconfig icu4c iso-codes - kactivities - kactivities-stats + plasma-activities + plasma-activities-stats karchive + kauth + ksvg + kstatusnotifieritem kcmutils kcoreaddons kcrash @@ -2400,17 +2733,21 @@ sensors, process information and other system resources.") kded kdesu kglobalaccel + kglobalacceld kguiaddons kholidays ki18n kiconthemes kidletime - kinit kio + xdotool + qqc2-desktop-style + qcoro-qt6 + kirigami-addons kio-extras - kio-fuse kitemmodels kirigami + kirigami-addons knewstuff knotifications knotifyconfig @@ -2434,6 +2771,7 @@ sensors, process information and other system resources.") libqalculate gmp mpfr + eudev libsm libxft libxkbcommon @@ -2442,17 +2780,17 @@ sensors, process information and other system resources.") networkmanager-qt phonon pipewire - plasma-framework + libplasma + plasma5support plasma-workspace-wallpapers plasma-wayland-protocols prison - qtbase-5 - qtdeclarative-5 - qtquickcontrols2-5 - qttools-5 - qtwayland-5 - qtgraphicaleffects - qtx11extras + qt5compat + qtsvg + qtshadertools + qtdeclarative + qttools + qtwayland wayland wayland-protocols xcb-util @@ -2461,7 +2799,7 @@ sensors, process information and other system resources.") xrdb xmessage xsetroot - polkit-qt + polkit-qt6 ucd libxcursor @@ -2470,43 +2808,35 @@ sensors, process information and other system resources.") zlib ;; qml dependency - qtquickcontrols-5 plasma-nm plasma-pa kscreen)) (arguments - (list #:phases + (list #:qtbase qtbase + #:configure-flags + #~(list + ;; libkmpris/autotests/CMakeLists.txt find it from + ;; KDE_INSTALL_FULL_LIBEXECDIR, But we are install to itself prefix. + ;; so we set it. + (string-append "-Dkglobalacceld_PATH=" + #$(this-package-input "kglobalacceld") + "/libexec/kglobalacceld")) + #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'patch-wallpaper - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "lookandfeel/sddm-theme/theme.conf.cmake" - (("background=..KDE_INSTALL_FULL_WALLPAPERDIR.") - (string-append "background=" - #$(this-package-input "breeze") - "/share/wallpapers"))))) (add-after 'unpack 'patch-workspace-bins (lambda* (#:key inputs #:allow-other-keys) (let ((xmessage (search-input-file inputs "/bin/xmessage")) (xsetroot (search-input-file inputs "/bin/xsetroot")) (xrdb (search-input-file inputs "/bin/xrdb")) - (kinit #$(this-package-input "kinit")) (qttools #$(this-package-input "qttools"))) (substitute* "startkde/startplasma.cpp" - (("xmessage") xmessage) + (("xmessage") xmessage)) + (substitute* "kcms/krdb/krdb.cpp" (("xsetroot") xsetroot)) (substitute* (list "kcms/fonts/fontinit.cpp" "kcms/fonts/fonts.cpp" "kcms/krdb/krdb.cpp") (("xrdb") xrdb)) - (substitute* "startkde/plasma-session/startup.cpp" - (("CMAKE_INSTALL_FULL_LIBEXECDIR_KF5..") - (string-append "\"" kinit - "/libexec/kf5"))) - (substitute* (list - "startkde/startplasma-wayland.cpp" - "startkde/startplasma-x11.cpp") - (("kdeinit5_shutdown") - (string-append kinit "/bin/kdeinit5_shutdown"))) ;; QT_INSTALL_BINS refers to qtbase, but qdbus is in ;; qttools. (substitute* "CMakeLists.txt" @@ -2525,19 +2855,30 @@ sensors, process information and other system resources.") (setenv "QT_QPA_PLATFORM" "offscreen") (setenv "QT_PLUGIN_PATH" (string-append #$output - "/lib/qt5/plugins:" + "/lib/qt6/plugins:" (getenv "QT_PLUGIN_PATH"))) - (setenv "QML2_IMPORT_PATH" + (setenv "QML_IMPORT_PATH" (string-append #$output - "/lib/qt5/qml:" - (getenv "QML2_IMPORT_PATH"))) + "/lib/qt6/qml:" + (getenv "QML_IMPORT_PATH"))) (invoke "dbus-launch" "ctest" "--output-on-failure" "--rerun-failed" "-E" - "(appstreamtest|tasksmodeltest|shelltest|\ -testimagefinder|systemtraymodeltest|testimagelistmodel|\ -testpackageimagelistmodel|testimageproxymodel|testslidemodel|testdesktop)"))))))) + "(appstreamtest|tasktoolstest|tasksmodeltest|\ +fetchinitialplayertest|mprisdeclarativetest|mediakeystest|shelltest|\ +locationsrunnertest|testimagefinder|testimagelistmodel|\ +testpackageimagelistmodel|testimageproxymodel|testslidemodel|testimagefrontend|\ +dbusservicewatchertest|klippertest|keystatetest|lockedtest|tst_triangleFilter|\ +testimagebackend)")))) + ;; share/dbus-1/system-services have same name file + ;; when dbus-root-service-type merge it, wail report + ;; "file exists". + (add-after 'install 'remove-dbus-service + (lambda _ + (delete-file + (string-append + #$output "/share/dbus-1/services/org.kde.fontinst.service"))))))) (home-page "https://invent.kde.org/plasma/plasma-workspace") (synopsis "Plasma workspace components") (description @@ -2548,14 +2889,14 @@ hardware management, and a high degree of customizability.") (define-public plasma-workspace-wallpapers (package (name "plasma-workspace-wallpapers") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "181q0mmmp3dygzafgh4qq2pwi5w15vw6mwc21nkl98qf6z773ify")))) + "0vm2v7hdfqcbxdl5gy3kx8az4q1y06iisf2rh5v4zc40vjjgf6cn")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (home-page "https://community.kde.org/Frameworks") @@ -2564,18 +2905,56 @@ hardware management, and a high degree of customizability.") "This package provides wallpapers for the KDE desktop.") (license license:lgpl3+))) +(define-public print-manager + (package + (name "print-manager") + (version "6.1.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" version + "/print-manager-" version ".tar.xz")) + (sha256 + (base32 "19gmqd48wjg9q8h57xdsa1d4nhvbp3h169v519pgw06lrrhia5hl")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list cups + kcmutils + kconfig + kconfigwidgets + kcoreaddons + kdbusaddons + kiconthemes + kirigami + ki18n + kio + knotifications + kwidgetsaddons + kwindowsystem + libplasma + qtdeclarative)) + (arguments (list #:qtbase qtbase)) + (home-page "https://invent.kde.org/plasma/print-manager") + (synopsis "Manage print jobs and printers") + (description + "This package provides printing management for KDE.") + (license license:gpl2+))) + (define-public polkit-kde-agent (package (name "polkit-kde-agent") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-1-" version ".tar.xz")) (sha256 (base32 - "0p6gnv59mnb5y6riiifyg98sk8zycchv8bkf7x1332qa7zqhcjcc")))) + "1mr0fmmnvd92msrp0y1fib2hyjif4lycg74ycpiqylnxhvm6v4c8")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules)) (inputs (list ki18n kwindowsystem @@ -2584,7 +2963,8 @@ hardware management, and a high degree of customizability.") kcoreaddons kcrash kiconthemes - polkit-qt)) + polkit-qt6 + qtdeclarative)) (synopsis "Polkit authentication UI for Plasma") (description "This package contains a daemon providing a Polkit authentication @@ -2596,25 +2976,28 @@ UI for Plasma") (define-public powerdevil (package (name "powerdevil") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "151qhpf5j33jk3jhhxsr4zaf0z3f8xlnw8inmzf2a8lficiq9060")))) + "052hv22ps90sm44wrdf5f4x2iz633nypl75xjwv257pn6ravia6l")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules qttools-5 pkg-config)) + (native-inputs (list extra-cmake-modules qttools pkg-config)) (inputs (list bluez-qt glib kauth - kactivities + plasma-activities kcmutils kscreen kidletime kconfig kdbusaddons + kxmlgui + kitemmodels + layer-shell-qt solid ki18n kcrash @@ -2631,7 +3014,13 @@ UI for Plasma") network-manager plasma-workspace eudev - qtx11extras)) + ddcutil + libxkbcommon)) + (arguments (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases + (add-before 'check 'setenv + (lambda _ + (setenv "HOME" (getcwd))))))) (synopsis "Manage power consumption") (description "This package provides the power consumption settings of a Plasma shell.") @@ -2641,14 +3030,14 @@ of a Plasma shell.") (define-public system-settings (package (name "system-settings") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/systemsettings-" version ".tar.xz")) (sha256 (base32 - "0vkcmb4sch97sq5xd8rj8z42qdcxy5ys758q6dl69kbv9hadl7bw")))) + "1dj6ic2i2pm01xyc1nl4k7v5r3rq1lwb638sfkbjch5g1gndsylh")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kauth @@ -2666,27 +3055,15 @@ of a Plasma shell.") kdbusaddons kconfig kpackage - kactivities - kactivities-stats + plasma-activities + plasma-activities-stats kguiaddons kirigami knotifications krunner plasma-workspace - qtdeclarative-5 - ;; qml's indirect dependency - ;; XXX: make them propagated dependency runtime qml module - qtquickcontrols-5 - qtquickcontrols2-5 - kirigami-addons - qtgraphicaleffects - kdeclarative - kuserfeedback - knewstuff - plasma-pa - bluez-qt - kwin - bluedevil)) + qtdeclarative)) + (arguments (list #:qtbase qtbase)) (synopsis "Control center to configure Plasma Desktop") (description "This package provides configuration UI for Plasma Desktop.") (home-page "https://invent.kde.org/plasma/systemsettings") diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 888fae10cb..4923854a7c 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com> -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,28 +40,30 @@ #:use-module (gnu packages ruby) #:use-module (gnu packages search) #:use-module (gnu packages vnc) + #:use-module (gnu packages perl) #:use-module (gnu packages xml) #:use-module (gnu packages icu4c) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages xorg) + #:use-module (gnu packages xdisorg)) (define-public dolphin (package (name "dolphin") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/dolphin-" version ".tar.xz")) (sha256 - (base32 "0bys24i2a3a65ahq5p3q1zr2px8jqip1gjn5m7rngq4hcddb1ji8")))) + (base32 "0rrmbzrywv19z93b9291r863dm7panz65cf10lzgjqzlsx7hm1az")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools ruby ruby-test-unit)) (inputs (list baloo baloo-widgets - kactivities + plasma-activities kbookmarks kcmutils kcompletion @@ -71,7 +73,6 @@ kdbusaddons ki18n kiconthemes - kinit kio knewstuff knotifications @@ -81,11 +82,11 @@ kwindowsystem breeze-icons ;; default icon set phonon - qtbase-5 - qtx11extras - solid)) + solid + libxkbcommon)) (arguments - `(#:tests? #f)) ;; TODO: 4/15 tests fail even with offscreen + (list #:qtbase qtbase + #:tests? #f)) ;; TODO: 4/15 tests fail even with offscreen (home-page "https://apps.kde.org/dolphin/") (synopsis "File manager for KDE") (description "Dolphin is a file manager for KDE focusing on usability. @@ -105,14 +106,14 @@ The main features of Dolphin are: (define-public dolphin-plugins (package (name "dolphin-plugins") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/dolphin-plugins-" version ".tar.xz")) (sha256 - (base32 "0h1b559icj5g3xrx5697a9rncpdcmsjg774c6m36ild56bwc048v")))) + (base32 "08xyjjwkcr08ncc4xrj65c44iya4byvf1xhnwjg21i7zxls51zir")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -121,10 +122,12 @@ The main features of Dolphin are: ki18n kio ktexteditor + ktextwidgets ksyntaxhighlighting kxmlgui breeze-icons ;; default icon set - qtbase-5)) + qt5compat)) + (arguments (list #:qtbase qtbase)) (home-page "https://www.kde.org/") (synopsis "VCS-Plugins for Dolphin") (description "This package contains plugins that offer integration in @@ -134,49 +137,56 @@ Dolphin with the version control systems: Bzr, Git, Mercurial, Subversion.") (define-public khelpcenter (package (name "khelpcenter") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/khelpcenter-" version ".tar.xz")) (sha256 - (base32 "10rivj5c14v5hwk87z41gwk830sy35fz0jg1jpay43jzw0ss995y")))) + (base32 "0y6smxc64mxpv535rih1m50wy4lf4gzsp944snvxrb4gj8q9sgy1")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools perl)) (inputs - (list grantlee - karchive + (list karchive kbookmarks kcodecs kconfig kcoreaddons kdbusaddons - khtml ki18n - kinit kio - kjs kparts kservice + ktexttemplate kwindowsystem libxml2 breeze-icons ;; default icon set - qtbase-5 - xapian)) + qtbase + xapian + qtwebengine)) (arguments - (list #:tests? #f ;;1/1 test fails - #:phases #~(modify-phases %standard-phases - (add-after 'install 'wrap-executable - (lambda* (#:key inputs #:allow-other-keys) - ;; Since qt-wrap selectors do not wrap for /share/kf5 - ;; directories, we need this so khelpcenter can find html4.css. - (wrap-program (string-append #$output - "/bin/khelpcenter") - `("XDG_DATA_DIRS" suffix - (,(string-append (assoc-ref inputs "khtml") - "/share"))))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'add-miss-package + (lambda _ + ;; https://invent.kde.org/system/khelpcenter/-/merge_requests/50 + (substitute* "CMakeLists.txt" + ((" WebEngineWidgets") + " WebEngineWidgets + PrintSupport") + (("Qt6::WebEngineWidgets") + "Qt6::PrintSupport + Qt6::WebEngineWidgets")))) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs #:allow-other-keys) + (wrap-program (string-append #$output + "/bin/khelpcenter") + `("QTWEBENGINEPROCESS_PATH" = + (,(search-input-file + inputs + "lib/qt6/libexec/QtWebEngineProcess"))))))))) (home-page "https://apps.kde.org/khelpcenter/") (synopsis "KDE documentation viewer") (description "KHelpCenter uses meta data files which describe the @@ -193,20 +203,19 @@ document meta data file.") (define-public konsole (package (name "konsole") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/konsole-" version ".tar.xz")) (sha256 - (base32 "1k68y1i3g3bsz1dz81jhkx1q2fb13rbm5ywh632bcyln0c6l0vz0")))) + (base32 "1549a5cpg6g6djbln38nlngl1xcfn7p9bjsscbwl27jkz8dyy18x")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools zlib)) (inputs (list kbookmarks - kcompletion kconfig kconfigwidgets kcoreaddons @@ -215,7 +224,6 @@ document meta data file.") kguiaddons ki18n kiconthemes - kinit kio knewstuff kglobalaccel @@ -229,12 +237,12 @@ document meta data file.") kwindowsystem kxmlgui breeze-icons ;; default icon set - qtbase-5 - qtscript - qtmultimedia-5 + qt5compat + qtmultimedia icu4c)) (arguments - `(#:tests? #f)) ;; TODO: 2/15 tests fail even with HOME, offscreen, SHELL, debus + (list #:qtbase qtbase + #:tests? #f)) ;; TODO: 2/15 tests fail even with HOME, offscreen, SHELL, debus (home-page "https://www.kde.org/") (synopsis "Terminal emulator similar for KDE") (description "Konsole is a terminal emulator, similar to xterm, built on @@ -249,17 +257,22 @@ This package is part of the KDE base applications module.") (define-public krfb (package (name "krfb") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/krfb-" version ".tar.xz")) (sha256 - (base32 "0qbrvf2wa3af1z1dpq3pqkngfbrfdgqfz8xs1qpdpyb7jxnphry7")))) + (base32 "11mp4vkadcrf20wdlwncsmyqdk9cj2ys85jjz0iaik9dfivgqcci")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase + #:configure-flags + #~(list (string-append "-DQtWaylandScanner_EXECUTABLE=" + #$(this-package-native-input "qtwayland") + "/lib/qt6/libexec/qtwaylandscanner")))) (native-inputs - (list extra-cmake-modules pkg-config kdoctools)) + (list extra-cmake-modules pkg-config kdoctools qtwayland)) (inputs (list kcompletion kconfig @@ -270,6 +283,7 @@ This package is part of the KDE base applications module.") ki18n knotifications kpipewire + kstatusnotifieritem kwallet kwayland kwidgetsaddons @@ -281,11 +295,10 @@ This package is part of the KDE base applications module.") breeze-icons ;; default icon set pipewire plasma-wayland-protocols - qtbase-5 - qtwayland-5 - qtx11extras + qtwayland wayland xcb-util-image + libxkbcommon zlib)) (home-page "https://apps.kde.org/krfb/") (synopsis "Desktop Sharing utility") @@ -304,20 +317,22 @@ This package is part of the KDE networking module.") (define-public ksystemlog (package (name "ksystemlog") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/ksystemlog-" version ".tar.xz")) (sha256 - (base32 "15c1h1dlcgbx2adhjzry2zwia0alym7vc251zymyzhl2xjacvqlm")))) + (base32 "1zlzyq5sv8mn4g0ycyrppr4fkr67vym79va7rfa7kbvvjgpwh6gi")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs ;; Not including Journald since this is not used in guix - (list karchive + (list breeze-icons ;; default icon set + karchive kcompletion kconfig kcoreaddons @@ -327,9 +342,7 @@ This package is part of the KDE networking module.") kitemviews ktextwidgets kwidgetsaddons - kxmlgui - breeze-icons ;; default icon set - qtbase-5)) + kxmlgui)) (home-page "https://apps.kde.org/ksystemlog/") (synopsis "System log viewer") (description "This program is developed for being used by beginner users, @@ -343,14 +356,14 @@ This package is part of the KDE administration module.") (define-public kwalletmanager (package (name "kwalletmanager") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kwalletmanager-" version ".tar.xz")) (sha256 - (base32 "1g3yw32kv7yij2ymk52fpp0srncr2ijfckfvz5hc0nsn7xhyqdby")))) + (base32 "1z62bglwd8fk5ah11g6lyw3qr5qlvgyrwz1bgrnzrz18pjr9sm63")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -368,10 +381,12 @@ This package is part of the KDE administration module.") kjobwidgets knotifications kservice + kstatusnotifieritem ktextwidgets kwallet kwindowsystem kxmlgui)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kwalletmanager5/") (synopsis "Tool to manage passwords on KWallet") (description @@ -381,17 +396,18 @@ This package is part of the KDE administration module.") (define-public spectacle (package (name "spectacle") - (version "23.04.3") + (version "24.02.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/spectacle-" version ".tar.xz")) (sha256 - (base32 "1fyklcvz0zndxabflkka75rham6768rp01as7m5dv0ic4lipkf9m")))) + (base32 "0li1fhhvqk5y1j0jpazhjw1qh5mnwzn4dkl85bmlsn5hbqszf621")))) (build-system qt-build-system) (arguments - (list #:phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) @@ -414,18 +430,18 @@ This package is part of the KDE administration module.") kwidgetsaddons kwindowsystem kxmlgui - libxcb purpose - qtdeclarative-5 - qtquickcontrols2-5 - qtwayland-5 - qtx11extras + layer-shell-qt + qtdeclarative + qtmultimedia + qtwayland wayland wayland-protocols plasma-wayland-protocols xcb-util xcb-util-cursor - xcb-util-image)) + xcb-util-image + libxkbcommon)) (home-page "https://apps.kde.org/spectacle/") (synopsis "Screenshot capture utility for KDE") (description "Spectacle is a screenshot taking utility for the KDE.") @@ -434,14 +450,14 @@ This package is part of the KDE administration module.") (define-public yakuake (package (name "yakuake") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/yakuake-" version ".tar.xz")) (sha256 (base32 - "17ylm5z5lzjq5g4d48s0clpl3hg4rym9sc1p5hr0wfs9jx7197jy")))) + "0bgpnvq1dpijrz3vj7yjw5dkss98l22iirqrvih3wgm0n6ccaix2")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -461,12 +477,13 @@ This package is part of the KDE administration module.") knotifyconfig konsole kparts + kstatusnotifieritem kwayland kwidgetsaddons kwindowsystem - qtbase-5 - qtsvg-5 - qtx11extras)) + libxkbcommon + qtsvg)) + (arguments (list #:qtbase qtbase)) (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 diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 6001607ad6..807f6fe14d 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -45,6 +45,7 @@ #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-plasma) + #:use-module (gnu packages python) #:use-module (gnu packages qt) #:use-module (gnu packages samba) #:use-module (gnu packages xdisorg) @@ -53,42 +54,44 @@ (define-public ark (package (name "ark") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/ark-" version ".tar.xz")) (sha256 (base32 - "081swq9f87yxg4dxdl5i4hszhr0q4ph402in397zfa5vpyspzy41")) + "1q0fyx65gp0d1vj4jxiaswdfzi15hbfi537f3i8y277b621qp3rs")) ;; The libarchive package in Guix does not support ;; xar; disable related tests. (patches (search-patches "ark-skip-xar-test.patch")))) (build-system qt-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'start-xserver - ;; adddialogtest requires DISPLAY. - (lambda* (#:key inputs #:allow-other-keys) - (let ((xorg-server (assoc-ref inputs "xorg-server"))) - (setenv "HOME" (getcwd)) - (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) - (setenv "DISPLAY" ":1")))) - (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lrzip (assoc-ref inputs "lrzip")) - (lzop (assoc-ref inputs "lzop")) - (p7zip (assoc-ref inputs "p7zip")) - (unzip (assoc-ref inputs "unzip")) - (zip (assoc-ref inputs "zip")) - (zstd (assoc-ref inputs "zstd"))) - (wrap-program (string-append out "/bin/ark") - `("PATH" suffix - ,(map (lambda (p) - (string-append p "/bin")) - (list lrzip lzop p7zip unzip zip zstd)))))))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'start-xserver + ;; adddialogtest requires DISPLAY. + (lambda* (#:key inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref inputs "xorg-server"))) + (setenv "HOME" (getcwd)) + (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) + (setenv "DISPLAY" ":1")))) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lrzip (assoc-ref inputs "lrzip")) + (lzop (assoc-ref inputs "lzop")) + (p7zip (assoc-ref inputs "p7zip")) + (unzip (assoc-ref inputs "unzip")) + (zip (assoc-ref inputs "zip")) + (zstd (assoc-ref inputs "zstd"))) + (wrap-program (string-append out "/bin/ark") + `("PATH" suffix + ,(map (lambda (p) + (string-append p "/bin")) + (list lrzip lzop p7zip unzip zip zstd)))))))))) (native-inputs (list extra-cmake-modules pkg-config kdoctools xorg-server)) (inputs @@ -98,7 +101,6 @@ kconfig kcrash kdbusaddons - khtml ki18n kiconthemes kio @@ -107,9 +109,9 @@ kpty kservice kwidgetsaddons + kfilemetadata libarchive libzip - qtbase-5 zlib ;; Command line tools used by Ark. lrzip @@ -142,10 +144,10 @@ well as CD-ROM images.") "00jccpwvksyp2vr3fjxajs8d9d30rspg4zj6rnj8dai96alp303k")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config)) - (inputs (list ki18n - kxmlgui - kconfigwidgets - ktexteditor + (inputs (list ki18n-5 + kxmlgui-5 + kconfigwidgets-5 + ktexteditor-5 libatcore qt3d-5 qtbase-5 @@ -211,9 +213,9 @@ well as CD-ROM images.") (license license:gpl2+)))) (define-public fielding - (let ((commit "6b3c5d67b308e9e7e2043dc6072bfd265ec9f3e1") + (let ((commit "4ee9aea59718851125edcac71e2e4fdc5a592ed9") ;; no releases yet - (revision "1")) + (revision "2")) (package (name "fielding") (version (git-version "0.1-pre" revision commit)) @@ -225,18 +227,19 @@ well as CD-ROM images.") (file-name (git-file-name name version)) (sha256 (base32 - "1l16am7il7kprmy8irpzj04rb8wbfr84y49wp4i74hspp9xkfick")))) + "04gzp4bch4k2cvjk0mjcrmjpi986j5bqz3l4xcqykfwbgd08kas2")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kirigami + kirigami-addons kcoreaddons kconfig ki18n kdbusaddons ksyntaxhighlighting - qtdeclarative-5 - qtquickcontrols2-5 - qtsvg-5)) + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/utilities/fielding") (synopsis "REST API testing tool") (description @@ -246,26 +249,26 @@ well as CD-ROM images.") (define-public filelight (package (name "filelight") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/filelight-" version ".tar.xz")) (sha256 (base32 - "1mwl1dkknvqw9hd5jsh4cdx1zd8f6rxca0vyq01wrx44q9p6dn1n")))) + "0mibgqhab7cbis0vw89f5y73185jq1dgmcsqdd8g4clkglgvdlrk")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kirigami + kirigami-addons kquickcharts kxmlgui kio ki18n kdeclarative qqc2-desktop-style - qtgraphicaleffects - qtquickcontrols2-5 - qtsvg-5)) + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/filelight/") (synopsis "Visualize the disk usage") (description "Filelight is an application to visualize the disk usage on @@ -273,41 +276,39 @@ your computer.") (license license:lgpl2.1+))) (define-public francis - (let ((commit "d2c762ad94170430a667ee57f81ec9dbe498642c") ; no release yet - (revision "1")) - (package - (name "francis") - (version (git-version "0.1-pre" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://invent.kde.org/utilities/francis") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15bk5iq127mp34n9fzq4d5r3qss3ihk93lqy86z2q3lgwid26s0h")))) - (build-system qt-build-system) - (native-inputs (list extra-cmake-modules)) - (inputs (list kirigami - kcoreaddons - kconfig - ki18n - kdbusaddons - knotifications - qtdeclarative-5 - qtgraphicaleffects - qtquickcontrols2-5 - qtsvg-5)) - (home-page "https://invent.kde.org/utilities/francis") - (synopsis "Track your time") - (description "This package provides time tracking.") - (license license:lgpl2.1+)))) + (package + (name "francis") + (version "24.05.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://invent.kde.org/utilities/francis") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lm0gh035qc9ip9hs00gxl3y9d9a8846ggypzgzngkqazic9i82k")))) + (build-system qt-build-system) + (native-inputs (list extra-cmake-modules)) + (inputs (list kirigami + kirigami-addons + kcoreaddons + kconfig + ki18n + kdbusaddons + knotifications + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) + (home-page "https://invent.kde.org/utilities/francis") + (synopsis "Track your time") + (description "This package provides time tracking.") + (license license:lgpl2.1+))) (define-public isoimagewriter (package (name "isoimagewriter") - (version "1.0.0") + (version "24.05.2") (source (origin (method git-fetch) (uri (git-reference @@ -316,7 +317,7 @@ your computer.") (file-name (git-file-name name version)) (sha256 (base32 - "1iphp2krgadc175570iiyaxbnjgpc1xilc71gkcbn5n0yd7qmkbv")))) + "1v8ggdgij503m3bm1w24840al5by7y62p8yrmhlk4g0hjacmkys7")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kauth @@ -327,6 +328,7 @@ your computer.") kcrash solid kwidgetsaddons)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/utilities/isoimagewriter") (synopsis "Write hybrid ISO files onto USB disks") (description @@ -336,19 +338,20 @@ your computer.") (define-public kate (package (name "kate") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kate-" version ".tar.xz")) (sha256 - (base32 "0yyhh21pvzsaz7swmghdchzsfk089axhqkjwjv1m8j4q3q3rhv86")))) + (base32 "085hbl6xzzihnhy8pjwdjdsrww6l1h70m4sf2s1b5c1xsnvhhkvp")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) (inputs - (list kactivities + (list breeze-icons ;; default icon set + plasma-activities kconfig kcrash kdbusaddons @@ -362,30 +365,29 @@ your computer.") kjobwidgets kparts ktexteditor + ktextwidgets ksyntaxhighlighting kwallet - plasma-framework kwindowsystem kxmlgui - breeze-icons ;; default icon set - qtbase-5 - qtscript - qtx11extras)) + libplasma + libxkbcommon)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-tests - (lambda* (#:key inputs #:allow-other-keys) - ;; This test requires a 'bin' diretory under '/usr'. - (substitute* "addons/externaltools/autotests/externaltooltest.cpp" - (("QStringLiteral[(]\"/usr\"[)]") - (format #f "QStringLiteral(\"~a\")" - (dirname (dirname (which "ls")))))))) - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - (setenv "HOME" (getcwd))))))) + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda* (#:key inputs #:allow-other-keys) + ;; This test requires a 'bin' diretory under '/usr'. + (substitute* "addons/externaltools/autotests/externaltooltest.cpp" + (("QStringLiteral[(]\"/usr\"[)]") + (format #f "QStringLiteral(\"~a\")" + (dirname (dirname (which "ls")))))))) + (add-before 'check 'check-setup + (lambda _ + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "HOME" (getcwd))))))) (home-page "https://kate-editor.org/") (synopsis "Multi-document, multi-view text editor") (description "Kate is a powerful text editor that can open multiple files @@ -409,7 +411,7 @@ Kate's features include: (define-public kdebugsettings (package (name "kdebugsettings") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" @@ -417,7 +419,7 @@ Kate's features include: ".tar.xz")) (sha256 (base32 - "02igg8ry1cxa83pdj6pgwzw7hpjwfrfk57d9ybgfvy2x08d5kvqz")))) + "1il9jcwya1hgqrs5yrlahk9h0hrrs5h1ay304sbixgiiafx1dcv7")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kcoreaddons @@ -428,6 +430,7 @@ Kate's features include: kitemviews kcompletion kxmlgui)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/utilities/kdebugsettings") (synopsis "Choose which QLoggingCategory are displayed") (description @@ -437,14 +440,14 @@ Kate's features include: (define-public kbackup (package (name "kbackup") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kbackup-" version ".tar.xz")) (sha256 (base32 - "121w54ivmq8qnxc97g47i8vq4nkivypp84pqs9rs5bid4cpfvh9p")))) + "0s75il0hxs95sdmj3jll8rdl1n8y86qgwww15idda18yww8d0bwm")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kguiaddons @@ -455,8 +458,11 @@ Kate's features include: kiconthemes karchive kwidgetsaddons + kstatusnotifieritem libarchive - shared-mime-info)) + shared-mime-info + qt5compat)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kbackup/") (synopsis "Backup program with an easy-to-use interface") (description @@ -473,15 +479,16 @@ drive, USB stick, etc (define-public kcalc (package (name "kcalc") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kcalc-" version ".tar.xz")) (sha256 (base32 - "04mqicwqn6h99jgh1zl0wsgk1rdkswzxaq8b8yz5hq654dsyq6y1")))) + "0p1m3yv52dc2mzalk19l3zpdwpwi5jg0fib5lgb1ln71kwb07y8n")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs (list gmp kcoreaddons @@ -502,7 +509,7 @@ drive, USB stick, etc (define-public kcharselect (package (name "kcharselect") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" @@ -510,8 +517,9 @@ drive, USB stick, etc ".tar.xz")) (sha256 (base32 - "05z80j8bwrj1zfpy376gsx30bv7bxsa3lyvrqsz197w1g8vp5gix")))) + "0yzw3jqcxkqi3ricsxcj1g8lhwxqjx0vwa91h4jb7ig1gsp6h3hi")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules)) (inputs (list kbookmarks kcoreaddons kcrash ki18n kwidgetsaddons kxmlgui)) (home-page "https://apps.kde.org/kcharselect/") @@ -526,15 +534,16 @@ characters.") (define-public kdialog (package (name "kdialog") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kdialog-" version ".tar.xz")) (sha256 (base32 - "042az7d9ngar6xp7gv3xcmlns9hpbvs39dkymanqgc0riwa1mvsx")))) + "06h42dlchikn0xva93yj2y46gmcqb78lm0qim30q25fnz5hbfv5f")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs (list ktextwidgets knotifications @@ -550,8 +559,8 @@ shell scripts.") (license license:gpl2+))) (define-public keurocalc - (let ((commit "a760d8a7e58b36eb72d15e847f96599c93785194") ; just one release - (revision "1")) + (let ((commit "c6e83859624de10210ad6b839c473dd8ea7a0e83") ; just one release + (revision "2")) (package (name "keurocalc") (version (git-version "1.3.0" revision commit)) @@ -563,7 +572,7 @@ shell scripts.") (file-name (git-file-name name version)) (sha256 (base32 - "0gh5vwl38hwf1405c980j1fj06g5c52am140lf4mxhrjvnmry7kd")))) + "040x28lnirwply5ph5xz3jcmx7c10qifmwcjgvqymlgqhcfkda0r")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) (inputs (list kconfig @@ -573,6 +582,7 @@ shell scripts.") kio kwidgetsaddons kxmlgui)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/utilities/keurocalc") (synopsis "Currency conversion tool") (description "This package provides a utility to handle currency @@ -582,25 +592,25 @@ conversions between European currencies.") (define-public keysmith (package (name "keysmith") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/keysmith-" version ".tar.xz")) (sha256 (base32 - "1rfp516adliyc57nx4ha1rp8v2z340ygsvblh5sqmsdsg2ivjklj")))) + "1n34sda27hpl53gayglrjyz8la8g25z8mrvaymwhcp8fzpids911")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules pkg-config)) + (native-inputs (list extra-cmake-modules pkg-config python-minimal)) (inputs (list kdbusaddons kirigami ki18n kwindowsystem libsodium - qtdeclarative-5 - qtgraphicaleffects - qtquickcontrols2-5 - qtsvg-5)) + qqc2-desktop-style + qtsvg + qtdeclarative)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/utilities/keysmith") (synopsis "OTP client for Plasma Mobile and Desktop") (description @@ -611,22 +621,25 @@ with support for QR scanning.") (define-public kfind (package (name "kfind") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kfind-" version ".tar.xz")) (sha256 (base32 - "03g9cn0wp3f2n9zwzbc5sbcria4hcp2ls77fbxyj3wkady3m50if")))) + "18r0fkv5dnl1l23c94igf09g71z3pk571hh1ff4df9ixajyvw43b")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs (list karchive kcoreaddons kfilemetadata + kxmlgui ki18n kio - kwidgetsaddons)) + kwidgetsaddons + qt5compat)) (home-page "https://apps.kde.org/kfind/") (synopsis "File search utility") (description @@ -657,17 +670,17 @@ with support for QR scanning.") (("gstreamer-video-1.0") ""))))))) (native-inputs (list extra-cmake-modules pkg-config)) - (inputs (list kconfigwidgets - kcoreaddons - ki18n - kirigami - kcrash - kdnssd + (inputs (list kconfigwidgets-5 + kcoreaddons-5 + ki18n-5 + kirigami-5 + kcrash-5 + kdnssd-5 qtquickcontrols2-5 qtgraphicaleffects qtdeclarative-5 qtgamepad - qtlocation)) + qtlocation-5)) (propagated-inputs (list gstreamer)) (home-page "https://apps.kde.org/kirogi/") (synopsis "Ground control application for drones") @@ -683,28 +696,29 @@ with support for QR scanning.") @item Support for Parrot (Anafi, Bebop 2) and Ryze Tello drones @end itemize") (license ;GPL for programs, LGPL for libraries - (list license:gpl2+ license:lgpl2.0))))) + (list license:gpl2+ license:lgpl2.0))))) (define-public kontrast (package (name "kontrast") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kontrast-" version ".tar.xz")) (sha256 (base32 - "08qwvc2b5bj3012lvwxainbw7d34mkbwwznj3661ydsnfjyxxs92")))) + "0rn7nw686d773hx6dg1zvld89r0l9gg4fps3ipyhlwi8gwcm1dwl")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules kdoctools)) + (arguments (list #:qtbase qtbase)) + (native-inputs (list extra-cmake-modules kdoctools python-minimal)) (inputs (list kirigami ki18n kcoreaddons - qtdeclarative-5 - qtgraphicaleffects - qtquickcontrols2-5 - qtsvg-5)) + qtdeclarative + futuresql + qcoro-qt6 + qtsvg)) (home-page "https://apps.kde.org/kontrast/") (synopsis "Color contrast checker") (description @@ -759,17 +773,17 @@ the computer and 3D Printers.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke "dbus-launch" "ctest" "-E" - "(Test.KDED.DBusTabletService|Test.KDED.TabletHandler|Test.KDED.XInputAdaptor|Test.KDED.XsetWacomAdaptor)"))))))) - (native-inputs (list dbus extra-cmake-modules kdoctools pkg-config)) - (inputs (list kcoreaddons - ki18n - kglobalaccel - kconfig - kxmlgui - kwidgetsaddons - kwindowsystem - knotifications - kdbusaddons + "(Test.KDED.DBusTabletService|Test.KDED.TabletHandler|Test.KDED.XInputAdaptor|Test.KDED.XsetWacomAdaptor)"))))))) + (native-inputs (list dbus extra-cmake-modules kdoctools-5 pkg-config)) + (inputs (list kcoreaddons-5 + ki18n-5 + kglobalaccel-5 + kconfig-5 + kxmlgui-5 + kwidgetsaddons-5 + kwindowsystem-5 + knotifications-5 + kdbusaddons-5 qtx11extras qtdeclarative-5 libwacom @@ -784,15 +798,16 @@ the computer and 3D Printers.") (define-public kmag (package (name "kmag") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kmag-" version ".tar.xz")) - (sha256 - (base32 "13ar37yv3gk5451cdqrgbm91jm50qw4559sx25fv95g2i9wa7z74")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kmag-" version ".tar.xz")) + (sha256 + (base32 "0sbm9jr0spywgvm136swgbdqrw23dsf2msbj8x9sv4j004nx7sww")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -800,8 +815,7 @@ the computer and 3D Printers.") kio kxmlgui breeze-icons ;; default icon set - ;; TODO: QAccessibilityClient - libqaccessibilityclien - qtbase-5)) + libqaccessibilityclient)) (home-page "https://apps.kde.org/kmag/") (synopsis "Screen magnifier tool") (description "You can use KMagnifier to magnify a part of the screen just @@ -814,19 +828,20 @@ artists to web-designers to people with low vision.") (define-public kmousetool (package (name "kmousetool") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmousetool-" version ".tar.xz")) (sha256 - (base32 "1prh9xdzwx0mx93g9cbjy55hxwcci90hvrv2ckj4dqdnv5fv4h21")))) + (base32 "1vhabwsi1iiliakyqdaxjlzx9n7ln08szrr1l6hyi7abvzaarp8p")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) (inputs - (list kauth + (list breeze-icons ;; default icon set + kauth kcoreaddons kconfigwidgets kdbusaddons @@ -835,11 +850,12 @@ artists to web-designers to people with low vision.") knotifications kxmlgui kwindowsystem + kstatusnotifieritem libxtst libxt phonon - breeze-icons ;; default icon set - qtbase-5)) + qtmultimedia)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kmousetool/") (synopsis "Automatic mouse click and mouse manipulation tool for the disabled") @@ -852,14 +868,14 @@ whom pressing buttons hurts.") (define-public kmouth (package (name "kmouth") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmouth-" version ".tar.xz")) (sha256 - (base32 "0qyzq4cvcsacb7hr6n79i3rzyjr0m3c8lrf8fwbzdivswpk8wss3")))) + (base32 "1gd51vwa9xdxxi6idzgzfb9dapirp5xc9alf3d9xnliwxqfxiv3x")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -874,8 +890,8 @@ whom pressing buttons hurts.") kwidgetsaddons kxmlgui breeze-icons ;; default icon set - qtbase-5 - qtspeech-5)) + qtspeech)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kmouth/") (synopsis "Type-and-say frontend for speech synthesizers") (description "KMouth is a program which enables persons that cannot speak @@ -901,16 +917,16 @@ sentences to be re-spoken.") (base32 "0xn4z9y2yl57a5skwp4cjsn1456kiwnwvhrddc0qsihgdyif3fbm")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools-5)) (inputs - (list kauth - kconfig - kconfigwidgets - kcoreaddons - kcrash - ki18n - kwidgetsaddons - kxmlgui + (list kauth-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kcrash-5 + ki18n-5 + kwidgetsaddons-5 + kxmlgui-5 breeze-icons ;; default icon set qtbase-5)) (home-page "https://apps.kde.org/kronometer/") @@ -924,14 +940,14 @@ to save the times and resume them later.") (define-public krusader (package (name "krusader") - (version "2.8.0") + (version "2.8.1") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/krusader/" version "/krusader-" version ".tar.xz")) (sha256 - (base32 "16n2y861ka8jhackf7hd9b0b0argifc1p0a114dvrc0qjddg0k4f")))) + (base32 "10w2y66kapd0ii8lr37jjwgg2a623ds05bv416j1payh352j1grp")))) (build-system qt-build-system) (arguments (list #:phases @@ -943,29 +959,29 @@ to save the times and resume them later.") (("# include <kcompletion_version\\.h>") "") (("# include <karchive_version\\.h>") ""))))))) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools-5)) (inputs - (list karchive - kbookmarks - kcodecs - kcompletion - kconfig - kcoreaddons - kguiaddons - ki18n - kiconthemes - kio - kitemviews - knotifications - kparts - ktextwidgets - kwallet - kwidgetsaddons - kwindowsystem - kxmlgui + (list karchive-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kcoreaddons-5 + kguiaddons-5 + ki18n-5 + kiconthemes-5 + kio-5 + kitemviews-5 + knotifications-5 + kparts-5 + ktextwidgets-5 + kwallet-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 breeze-icons ;; default icon set qtbase-5 - solid + solid-5 zlib)) (home-page "https://krusader.org/") (synopsis "Twin-panel (commander-style) file manager") @@ -997,9 +1013,9 @@ great on your desktop.") (base32 "1q6blvcqz6hxdfrkdi0fplmz7rmk3im56kpp68r0yrivhx3hn8sc")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools pkg-config)) + (list extra-cmake-modules kdoctools-5 pkg-config)) (inputs - (list ktexteditor imagemagick qtbase-5 qtx11extras)) + (list ktexteditor-5 imagemagick qtbase-5 qtx11extras)) (home-page "https://apps.kde.org/kxstitch/") (synopsis "Create and print cross stitch patterns") (description @@ -1010,33 +1026,33 @@ either be created or generated from a image.") (define-public okteta (package (name "okteta") - (version "0.26.12") + (version "0.26.15") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/okteta/" version "/src/okteta-" version ".tar.xz")) (sha256 - (base32 "18bj8gd9kvdk85ypykl668safiyqn5qskgrsb214wxxaprl6phj9")))) + (base32 "0qvwryk8m2ixxn9f6xgjiy3nv0vffapkgx8qw9315306yw750cq5")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools qttools-5 shared-mime-info)) + (list extra-cmake-modules kdoctools-5 qttools-5 shared-mime-info)) (inputs - (list kbookmarks - kcmutils - kcodecs - kcrash - kcompletion - kconfigwidgets - kdbusaddons - ki18n - kiconthemes - kio - knewstuff - kparts - kservice - kwidgetsaddons - kxmlgui + (list kbookmarks-5 + kcmutils-5 + kcodecs-5 + kcrash-5 + kcompletion-5 + kconfigwidgets-5 + kdbusaddons-5 + ki18n-5 + kiconthemes-5 + kio-5 + knewstuff-5 + kparts-5 + kservice-5 + kwidgetsaddons-5 + kxmlgui-5 breeze-icons ;; default icon set qca qtbase-5 @@ -1066,70 +1082,35 @@ redone.") (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) -(define-public print-manager - (package - (name "print-manager") - (version "23.04.3") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/print-manager-" version ".tar.xz")) - (sha256 - (base32 "1fnbkx2xk3pr3cwcji1xbswcf5b7h8r4kag8i3lv28cnjw3ahs52")))) - (build-system qt-build-system) - (native-inputs - (list extra-cmake-modules)) - (inputs - (list cups - kcmutils - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kiconthemes - ki18n - kio - knotifications - kwidgetsaddons - kwindowsystem - plasma-framework - qtdeclarative-5)) - (home-page "https://invent.kde.org/utilities/print-manager") - (synopsis "Manage print jobs and printers") - (description - "This package provides printing management for KDE.") - (license license:gpl2+))) - (define-public rsibreak (package (name "rsibreak") - (version "0.12.14") + (version "0.12.15") (source (origin (method url-fetch) (uri (string-append "mirror://kde//stable/rsibreak/0.12/" "rsibreak-" version ".tar.xz")) (sha256 - (base32 "0yjv5awngi2hk6xzlwzmj92i6qppnfc0inqdp16rd8gzfpw7xqqw")))) + (base32 "0kfbbhyzilvar3vns68pd8vkd17f07g8q9g83xxwl06zl3k6672j")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools-5)) (inputs - (list kauth - kconfig - kconfigwidgets - kcoreaddons - kcrash - kdbusaddons - ki18n - kiconthemes - kidletime - knotifications - knotifyconfig - ktextwidgets - kwindowsystem - kxmlgui + (list kauth-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kcrash-5 + kdbusaddons-5 + ki18n-5 + kiconthemes-5 + kidletime-5 + knotifications-5 + knotifyconfig-5 + ktextwidgets-5 + kwindowsystem-5 + kxmlgui-5 breeze-icons ;; default icon set qtbase-5)) (home-page "https://apps.kde.org/rsibreak/") @@ -1144,43 +1125,43 @@ remind you to take a break now and then.") (define-public smb4k (package (name "smb4k") - (version "3.1.3") + (version "3.2.5") (source (origin (method url-fetch) (uri (string-append "https://sourceforge.net/projects/smb4k/files/" version "/smb4k-" version ".tar.xz")) (sha256 - (base32 "0prw0aq16nz9ns4d50mc6fbaw9pbcyh8p698izylhd4i0nr1dd9d")))) + (base32 "1d53yl02wrfl6wl2h4a30qiirs44qmfkfsr1kjv69fqhbqp2cszs")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools-5)) (inputs - (list kauth - kconfig - kconfigwidgets - kcompletion - kcoreaddons - kcrash - kdbusaddons - kdnssd - ki18n - kiconthemes - kio - kjobwidgets - knotifications - knotifyconfig - ktextwidgets - kwallet - kwidgetsaddons - kwindowsystem - kxmlgui + (list kauth-5 + kconfig-5 + kconfigwidgets-5 + kcompletion-5 + kcoreaddons-5 + kcrash-5 + kdbusaddons-5 + kdnssd-5 + ki18n-5 + kiconthemes-5 + kio-5 + kjobwidgets-5 + knotifications-5 + knotifyconfig-5 + ktextwidgets-5 + kwallet-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 samba breeze-icons ;; default icon set plasma-framework qtbase-5 qtdeclarative-5 - solid)) + solid-5)) (home-page "https://apps.kde.org/smb4k/") (synopsis "Samba (SMB) share advanced browser") (description "Smb4K is an network neighborhood browser for the KDE @@ -1216,19 +1197,21 @@ Features: (define-public sweeper (package (name "sweeper") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/sweeper-" version ".tar.xz")) (sha256 - (base32 "19b382cgdcd4qh4ppdmbhsacvcc9nlbs7spcg8ii02bdpx6qw9b7")))) + (base32 "0s1cj86p8wa9ngdqxff6mf4fx4b388b6il02g442g8q1kcqcnla5")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs - (list kactivities-stats + (list breeze-icons ;; default icon set + plasma-activities-stats kbookmarks kcrash kconfig @@ -1237,9 +1220,7 @@ Features: ki18n kio ktextwidgets - kxmlgui - breeze-icons ;; default icon set - qtbase-5)) + kxmlgui)) (home-page "https://apps.kde.org/sweeper/") (synopsis "Temporary file and history cleaner") (description " diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 6d02547c4e..44b3b10606 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Prafulla Giri <pratheblackdiamond@gmail.com> -;;; Copyright © 2020, 2021, 2022, 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2020, 2021, 2022, 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2021 la snesne <lasnesne@lagunposprasihopre.org> ;;; Copyright © 2021, 2022, 2023, 2024 Vinicius Monego <monego@posteo.net> @@ -42,6 +42,7 @@ #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) #:use-module (guix packages) #:use-module (gnu packages) #:use-module (gnu packages algebra) @@ -112,49 +113,75 @@ (define-public baloo-widgets (package (name "baloo-widgets") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/baloo-widgets-" version ".tar.xz")) (sha256 - (base32 "01k8kmzr2vgd567v4js080cnyl2i43zh6zz25ml76z77lywlfzz6")))) + (base32 "06238jvb44118bapgkk1yg6mn1kgmn8xx3ayfxy36bx0pl7nii5p")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list baloo kconfig ki18n kio qtbase-5)) + (list baloo kconfig ki18n kio)) (arguments - `(#:tests? #f)) ;; tests fail + (list #:configure-flags #~(list "-DBUILD_WITH_QT6=ON") + #:qtbase qtbase)) (home-page "https://community.kde.org/Baloo") (synopsis "Wigets for use with Baloo") (description "Baloo is a framework for searching and managing metadata. This package contains GUI widgets for baloo.") (license license:lgpl2.0+))) +(define-public futuresql + (package + (name "futuresql") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/futuresql/futuresql-" + version ".tar.xz")) + (sha256 + (base32 "0hxxpv672jw3d14gk6dilphfcwkmbyffv0r9pakkr2v1m7axhkp4")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules)) + (inputs (list qcoro-qt6)) + (arguments + (list #:qtbase qtbase + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) + (home-page "https://api.kde.org/futuresql/html/index.html") + (synopsis "Non-blocking Qt database framework") + (description "This package provides a non-blocking Qt database framework.") + (license license:lgpl2.1+))) + (define-public grantleetheme (package (name "grantleetheme") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/grantleetheme-" version ".tar.xz")) (sha256 - (base32 "01kkj3y6xhc792jaxnkglkwvlqx9ckn5yhlfrpqff5hlf5x9vn4w")))) + (base32 "0fsp9698wh2h53qglfg6576m309yb91s5ix4sdzckyilh31y1j2y")))) (build-system qt-build-system) - (arguments `(#:tests? #f)) ; unexpected error in the test suite. + (arguments (list + #:qtbase qtbase + #:tests? #f)) ; unexpected error in the test suite. (native-inputs (list extra-cmake-modules libxml2)) ;; xmllint required for tests (inputs - (list grantlee - kguiaddons + (list kguiaddons ki18n kiconthemes knewstuff - qtbase-5)) + kxmlgui)) + (propagated-inputs (list ktexttemplate)) (home-page "https://invent.kde.org/pim/grantleetheme") (synopsis "Library providing Grantlee theme support") (description "This library provides Grantlee theme support.") @@ -164,27 +191,28 @@ This package contains GUI widgets for baloo.") (define-public akregator (package (name "akregator") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akregator-" version ".tar.xz")) (sha256 - (base32 "0g916453zip8i5g61pf8ib68fiqfbmr1i1lhbnwmsv1cryx035w9")))) + (base32 "07flc3617px9w1c729p0lsixf1g0h297hkbip259ykkbwxizn71q")))) (build-system qt-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-qt-process-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/akregator")) - (qt-process-path - (search-input-file - inputs "/lib/qt5/libexec/QtWebEngineProcess"))) - (wrap-program bin - `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-qt-process-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/akregator")) + (qt-process-path + (search-input-file + inputs "/lib/qt6/libexec/QtWebEngineProcess"))) + (wrap-program bin + `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -193,8 +221,7 @@ This package contains GUI widgets for baloo.") akonadi-mime boost breeze-icons - gpgme - grantlee + gpgme-1.23 grantleetheme kcmutils kcontacts @@ -209,16 +236,17 @@ This package contains GUI widgets for baloo.") kpimcommon kpimtextedit kquickcharts + kstatusnotifieritem ktextaddons ktexteditor + ktextwidgets kuserfeedback libkdepim libkleo - qgpgme - qtbase-5 - qtdeclarative-5 - qtwebchannel-5 - qtwebengine-5 + qgpgme-qt6-1.23 + qtdeclarative + qtwebchannel + qtwebengine syndication)) (home-page "https://apps.kde.org/en/akregator") (synopsis "KDE Feed Reader") @@ -234,18 +262,18 @@ browser for easy news reading.") (define-public gwenview (package (name "gwenview") - (version "23.08.5") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/gwenview-" version ".tar.xz")) (sha256 - (base32 "0f4h2vf8nkz1jcrxw98n52divvdmxh434659m1pd4l5pag0d3z54")) - (patches (search-patches "gwenview-kimageannotator.patch")))) + (base32 "0ybsra2c5dhagd8w81sccz3d9rfsj2mdnwrc4jcnkffjjk4ys09g")))) (build-system qt-build-system) (arguments - (list #:phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) @@ -267,9 +295,10 @@ browser for easy news reading.") (list baloo cfitsio exiv2 - kactivities + plasma-activities kcolorpicker kguiaddons + ki18n kiconthemes kimageannotator kio @@ -281,12 +310,12 @@ browser for easy news reading.") libkdcraw libpng libtiff + libxkbcommon phonon purpose - qtimageformats-5 - qtsvg-5 - qtwayland-5 - qtx11extras + qtimageformats + qtsvg + qtwayland wayland wayland-protocols zlib)) @@ -300,7 +329,7 @@ annotating features.") (define-public kdenlive (package (name "kdenlive") - (version "24.02.2") + (version "24.05.2") (source (origin (method git-fetch) @@ -309,13 +338,14 @@ annotating features.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0chwdsk00lmhdkzac972cslfp772j2sp9ipg21jdixd1016bh8rm")))) + (base32 "1kir2drhx194jyb9zbdnk4cixdw022rl26jn1xgxr31pyklqh9in")))) (build-system qt-build-system) (arguments ;; XXX: there is a single test that spawns other tests and ;; 1/3 tests failed and 1/327 assertions failed. It seems ;; that individual tests can't be skipped. (list + #:qtbase qtbase #:configure-flags #~(list "-DBUILD_TESTING=off") #:tests? #f #:phases @@ -334,11 +364,11 @@ annotating features.") `("LADSPA_PATH" ":" = (,(string-append ladspa "/lib/ladspa"))) `("QT_QPA_PLATFORM_PLUGIN_PATH" ":" = - (,(string-append qtbase "/lib/qt5/plugins/platforms"))) + (,(string-append qtbase "/lib/qt6/plugins/platforms"))) `("MLT_PREFIX" ":" = (,#$(this-package-input "mlt")))))))))) (native-inputs - (list extra-cmake-modules kdoctools pkg-config qttools-5)) + (list extra-cmake-modules kdoctools pkg-config qttools)) (inputs (list bash-minimal breeze ; make dark them available easily @@ -359,18 +389,15 @@ annotating features.") knotifyconfig kparts kplotting + ktextwidgets ladspa mlt purpose - qtbase-5 - qtdeclarative-5 - qtgraphicaleffects - qtmultimedia-5 - qtnetworkauth-5 - qtquickcontrols-5 - qtquickcontrols2-5 - qtscript - qtsvg-5 + qtbase + qtdeclarative + qtmultimedia + qtnetworkauth + qtsvg shared-mime-info)) (home-page "https://kdenlive.org") (synopsis "Non-linear video editor") @@ -385,40 +412,40 @@ projects.") (define-public kdevelop (package (name "kdevelop") - (version "23.04.3") + (version "24.05.2") (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kdevelop-" version ".tar.xz")) - (sha256 - (base32 "0m1q5nhx7wd4b8850ikw7dk6zka57gapf78wawjv2h1hijxcyf4v")))) + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kdevelop-" version ".tar.xz")) + (sha256 + (base32 "10z53ri4g3b199cv9394pflgdlcnr9y2gh7xr4isl2kpn26jiwh0")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config shared-mime-info qttools-5)) (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 + karchive-5 + kcmutils-5 + kcrash-5 + kdeclarative-5 + kdoctools-5 + kguiaddons-5 + ki18n-5 + kiconthemes-5 + kio-5 ;; not checked as requirement + kitemmodels-5 + kitemviews-5 + kjobwidgets-5 + knotifications-5 + knotifyconfig-5 + kparts-5 + kservice-5 + ksyntaxhighlighting-5 + ktexteditor-5 + kwindowsystem-5 + kxmlgui-5 libkomparediff2 breeze-icons qtbase-5 @@ -426,30 +453,29 @@ projects.") qtquickcontrols-5 ;; not checked as requirement qtquickcontrols2-5 ;; not checked as requirement qtwebengine-5 - threadweaver + threadweaver-5 ;; recommendes astyle kdevelop-pg-qt - libksysguard ;; optional apr ; required for subversion support apr-util ; required for subversion support - attica - kconfigwidgets - knewstuff - krunner + attica-5 + kconfigwidgets-5 + knewstuff-5 + krunner-5 ;; TODO: OktetaGui, OktetaKastenControllers plasma-framework ;; TODO: purpose - sonnet + sonnet-5 subversion)) - ;; run-time packages - TODO - ;; ClazyStandalone - ;; Cppcheck - ;; heaptrack - ;; heaptrack_gui - ;; meson + ;; run-time packages - TODO + ;; ClazyStandalone + ;; Cppcheck + ;; heaptrack + ;; heaptrack_gui + ;; meson (arguments (list #:tests? #f ;; there are some issues with the test suite #:phases @@ -497,21 +523,22 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).") (define-public kdiagram (package (name "kdiagram") - (version "2.8.0") + (version "3.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/kdiagram/" version "/kdiagram-" version ".tar.xz")) (sha256 - (base32 "07s3kwv0mqvb64x8nz4w1yb3hbk28yzkw4qg1jibai7as4xsv7ap")) + (base32 "0vcw339v6nl1haznp58spimanfhw143cindbym1q3ccxrp1b0na6")) (patches (search-patches "kdiagram-Fix-missing-link-libraries.patch")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs - (list qtbase-5 qtsvg-5)) + (list qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/graphics/kdiagram") (synopsis "Libraries for creating business diagrams") (description "This package provides libraries for integrating business @@ -523,10 +550,36 @@ a module for implementing ODF Gantt charts, which are bar charts that illustrate project schedules.") (license license:gpl2+))) +(define-public kdsoap-ws-discovery-client + (package + (name "kdsoap-ws-discovery-client") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/kdsoap-ws-discovery-client/" + "/kdsoap-ws-discovery-client-" version ".tar.xz")) + (sha256 + (base32 "0yj2ngw4li5r6zhmkh2lb8fdf8ixz6pp5hxsb4342pz72g04glic")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules)) + (inputs (list kdsoap-qt6)) + (arguments (list + ;; test require network. + #:tests? #f + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6") + #:qtbase qtbase)) + (home-page "https://caspermeijn.gitlab.io/kdsoap-ws-discovery-client/") + (synopsis "WS-Discovery client library based on KDSoap") + (description "This package provides a ws-Discovery client library based on +KDSoap.") + (license license:gpl3+))) + (define-public kio-extras (package (name "kio-extras") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" @@ -534,7 +587,7 @@ illustrate project schedules.") version ".tar.xz")) (sha256 (base32 - "1ygxfq62idpgf1dlic1245y5gf0fnkrpbqxd230xmxi7a35za8qd")))) + "0h720wcgsdx9h5vlr4flxrd3djmhwvlwkrf0yzwsf4amcb9wds8r")))) (build-system cmake-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -544,21 +597,24 @@ illustrate project schedules.") (setenv "HOME" (getcwd)) (setenv "TMPDIR" (getcwd)) (invoke "ctest" "-E" "(thumbnailtest|testkioarchive)"))))))) - (native-inputs (list extra-cmake-modules dbus kdoctools pkg-config qttools-5)) - ;; TODO: libappimage, kdsoap-ws-discovery-client + (native-inputs (list extra-cmake-modules dbus kdoctools pkg-config qttools)) + ;; TODO: libappimage (inputs (list gperf imath - kactivities - kactivities-stats + plasma-activities + plasma-activities-stats karchive kbookmarks + kcmutils kconfig kconfigwidgets kcoreaddons kdnssd kdbusaddons - kdsoap + kdsoap-qt6 + kdsoap-ws-discovery-client kguiaddons + ktextwidgets ki18n kio ksyntaxhighlighting @@ -570,8 +626,10 @@ illustrate project schedules.") libtirpc openexr phonon - qtbase-5 - qtsvg-5 + qtbase + qt5compat + qcoro-qt6 + qtsvg samba shared-mime-info solid @@ -587,27 +645,29 @@ the functionality of the KDE resource and network access abstractions.") (define-public kio-fuse (package (name "kio-fuse") - (version "5.0.1") + (version "5.1.0") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/" name "/" version "/" - name "-" version ".tar.xz")) + (uri (string-append "mirror://kde/stable/kio-fuse/kio-fuse-" + version ".tar.xz")) (sha256 (base32 - "1pb62h45c06dq3rml91xbf8j5y2c1l8z8j8lycchxrlgys5rlrv6")))) + "0jz9952dd20sw0c25pyn2l86nmc1s5l42gxk4js1jnkx4a0la43x")))) (build-system cmake-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" (getcwd)) - (setenv "XDG_RUNTIME_DIR" (getcwd)) - (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "dbus-launch" "ctest" "-E" - "(fileopstest-cache|fileopstest-filejob)"))))))) + (list + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6") + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (setenv "XDG_RUNTIME_DIR" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + (invoke "dbus-launch" "ctest" "-E" + "(fileopstest-cache|fileopstest-filejob)"))))))) (native-inputs (list dbus extra-cmake-modules pkg-config)) - (inputs (list fuse kio kcoreaddons qtbase-5)) + (inputs (list fuse kio kcoreaddons qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "FUSE Interface for KIO") (description "This package provides FUSE Interface for KIO.") @@ -616,7 +676,7 @@ the functionality of the KDE resource and network access abstractions.") (define-public kirigami-addons (package (name "kirigami-addons") - (version "0.10.0") + (version "1.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -625,12 +685,14 @@ the functionality of the KDE resource and network access abstractions.") (file-name (git-file-name name version)) (sha256 (base32 - "154yzhy6nva4d39lnsh7i40vvrj146263j07kfkd1g1w4qy381y3")))) + "1nsp4vihjhv985nlr6h86jvk43v3x9njla7l03jpcz6g95jdrnmp")))) (build-system qt-build-system) (arguments - (list #:tests? #f)) ; failing test + (list + #:qtbase qtbase + #:tests? #f)) ; failing test (native-inputs (list extra-cmake-modules)) - (inputs (list kirigami ki18n qtdeclarative-5 qtquickcontrols2-5)) + (inputs (list kirigami ki18n kconfig qtdeclarative)) (home-page "https://invent.kde.org/libraries/kirigami-addons") (synopsis "Add-ons for the Kirigami framework") (description @@ -667,7 +729,7 @@ expression library, that is used in Krita.") (define-public kcolorchooser (package (name "kcolorchooser") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) @@ -675,7 +737,7 @@ expression library, that is used in Krita.") "/src/kcolorchooser-" version ".tar.xz")) (sha256 (base32 - "1ripvn2li74rwngicay9c78j0slia1rpsi1f43rbb36p9af02lwq")))) + "1qfp2kf98kf5qps11q7mi6y8z6bfd4bxwvx6ijv4p1jw0cmylj11")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -683,6 +745,7 @@ expression library, that is used in Krita.") (list kcoreaddons ki18n kxmlgui)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/de/kcolorchooser/") (synopsis "Color selector utility") (description "KColorChooser is a utility to select a color.") @@ -691,14 +754,14 @@ expression library, that is used in Krita.") (define-public kolourpaint (package (name "kolourpaint") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kolourpaint-" version ".tar.xz")) (sha256 - (base32 "1ab9v6ksb185f6jfhhk578qazhmy8hx6s8vjr9xyh7k3jilayj9v")))) + (base32 "1fi1y74s2lnrxdnr9ym4b1ilj9qi019gaavfv0sq1xg8ppbpgcbr")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -710,6 +773,7 @@ expression library, that is used in Krita.") ktextwidgets kwidgetsaddons kxmlgui)) + (arguments (list #:qtbase qtbase)) (home-page "http://kolourpaint.org/") (synopsis "Paint program for KDE") (description "KolourPaint is a paint program for KDE. It is useful for @@ -719,7 +783,7 @@ painting, image manipulating and icon editing.") (define-public krita (package (name "krita") - (version "5.2.1") + (version "5.2.3") (source (origin (method url-fetch) @@ -727,7 +791,7 @@ painting, image manipulating and icon editing.") "mirror://kde/stable/krita/" version "/krita-" version ".tar.gz")) (sha256 - (base32 "1kzmn89b1vrasba7z8hp8izyrrskgc7ggnz82zqyyy1v5d8mnri7")) + (base32 "1h2whbccgr2xhln4zx708hksg4284dhgjz10cnnkfgiwp7nlcsj6")) (patches (search-patches "krita-bump-sip-abi-version-to-12.8.patch")))) (build-system qt-build-system) (arguments @@ -749,7 +813,13 @@ painting, image manipulating and icon editing.") (("set\\(CMAKE_AUTOMOC OFF\\)") "set(CMAKE_AUTOMOC OFF) set(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -fPIC\" ) -set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\" ) "))))))) +set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\" ) ")))) + (add-after 'install 'wrap-bin + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (python-path (getenv "GUIX_PYTHONPATH"))) + (wrap-program (string-append out "/bin/krita") + `("GUIX_PYTHONPATH" ":" prefix (,python-path))))))))) (native-inputs (list curl eigen @@ -775,26 +845,26 @@ set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\" ) "))))))) harfbuzz imath immer - karchive - kcompletion - kconfig - kcoreaddons - kcrash - kguiaddons - ki18n - kiconthemes - kio - kitemviews + karchive-5 + kcompletion-5 + kconfig-5 + kcoreaddons-5 + kcrash-5 + kguiaddons-5 + ki18n-5 + kiconthemes-5 + kio-5 + kitemviews-5 kseexpr - kwidgetsaddons - kwindowsystem - kxmlgui + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 lager lcms libheif libjpeg-turbo libjxl - libkdcraw + libkdcraw-qt5 libmypaint libpng ;; libraqm @@ -837,7 +907,7 @@ features include brush stabilizers, brush engines and wrap-around mode.") (define-public massif-visualizer (package (name "massif-visualizer") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) @@ -845,8 +915,8 @@ features include brush stabilizers, brush engines and wrap-around mode.") "mirror://kde/stable/massif-visualizer/" version "/src/massif-visualizer-" version ".tar.xz")) (sha256 - (base32 "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q")))) - (build-system cmake-build-system) + (base32 "104ab36c4djdb7fndpg0gvak3wlr5i7cni5prz46pfwz1l73zbaz")))) + (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config shared-mime-info)) (inputs @@ -857,9 +927,9 @@ features include brush stabilizers, brush engines and wrap-around mode.") kgraphviewer kio ki18n - qtbase-5 - qtsvg-5 - qtxmlpatterns)) + qtsvg + qt5compat)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/massif-visualizer/") (synopsis "Visualize massif data generated by Valgrind") (description @@ -872,7 +942,7 @@ compressed massif files can also be opened transparently.") (define-public libqaccessibilityclient (package (name "libqaccessibilityclient") - (version "0.4.1") + (version "0.6.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/" name @@ -880,50 +950,61 @@ compressed massif files can also be opened transparently.") ".tar.xz")) (sha256 (base32 - "0a9lv2jb5gyqxvrkl5xl09gjnlp05b5yfzfb0wmaxz0l8d7qnxhw")))) + "0csxbwy4479196l32j4xnk672kiyggcaf3fi3q2cbj9dc94c8l2c")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;TODO: Failing tests - #:phases (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ; - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - ;; For missing '/etc/machine-id' - (setenv "DBUS_FATAL_WARNINGS" "0") - (setenv "HOME" - (getcwd)) - (invoke "dbus-launch" "ctest"))))))) + (list #:tests? #f ;TODO: Failing tests + #:configure-flags + #~(list (string-append + "-DQT_MAJOR_VERSION=" + #$(version-major + (package-version (this-package-input "qtbase"))))) + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen") + ;; For missing '/etc/machine-id' + (setenv "DBUS_FATAL_WARNINGS" "0") + (setenv "HOME" + (getcwd)) + (invoke "dbus-launch" "ctest"))))))) (native-inputs (list dbus extra-cmake-modules)) - (inputs (list qtbase-5)) + (inputs (list qtbase)) (home-page "https://invent.kde.org/libraries/libqaccessibilityclient") (synopsis "Helper library to make writing accessibility tools easier") (description "This package provides library that is used when writing accessibility clients such as screen readers.") (license license:lgpl2.1+))) +(define-public libqaccessibilityclient-qt5 + (package + (inherit libqaccessibilityclient) + (name "libqaccessibilityclient-qt5") + (inputs (modify-inputs (package-inputs libqaccessibilityclient) + (replace "qtbase" qtbase-5))))) + (define-public libkomparediff2 (package (name "libkomparediff2") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkomparediff2-" version ".tar.xz")) (sha256 - (base32 "1zkiyyrbfbr1i7zyhhayf53daaarzc8a2xz0iqjy9za7rawnmgbv")))) + (base32 "1g4zjsdd49n2kh5m8ijm9cm95wfn2rglgnmvvr0ap1iidy4843hy")))) (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list kcodecs - kconfig - kcoreaddons - ki18n - kio - kxmlgui + (list kcodecs-5 + kconfig-5 + kcoreaddons-5 + ki18n-5 + kio-5 + kxmlgui-5 qtbase-5)) (build-system cmake-build-system) (home-page "https://kde.org") @@ -938,14 +1019,14 @@ used in KDE development tools Kompare and KDevelop.") (define-public qca (package (name "qca") - (version "2.3.7") + (version "2.3.9") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/qca/" version "/qca-" version ".tar.xz")) (sha256 - (base32 "0hrzmzvzsgzn4nvplgg2wmxaql7fjvi3rcqgwgimnzb8ahxk9qpy")))) + (base32 "0kkf8wyc7slii86danfl4cx59yhcyc363ydiwapnnyyxihlxamf5")))) (build-system cmake-build-system) (native-inputs (list pkg-config)) @@ -959,10 +1040,18 @@ including SSL/TLS, X.509 certificates, SASL, OpenPGP, S/MIME CMS, and smart cards.") (license license:lgpl2.1+))) +(define-public qca-qt6 + (package + (inherit qca) + (name "qca-qt6") + (arguments (list #:configure-flags #~(list "-DBUILD_WITH_QT6=ON"))) + (inputs + (list openssl qtbase qt5compat)))) + (define-public kommit (package (name "kommit") - (version "1.0.2") + (version "1.6.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/" @@ -970,7 +1059,7 @@ cards.") version ".tar.xz")) (sha256 (base32 - "0vp9d1x01na28p6smbd6spx14bjnzilr2bjsd380h1d17b9cm3hy")))) + "09ahnizl5mqdrg583lxkwwnsq8ci95fk49wx9733ah4c39gync5c")))) (build-system qt-build-system) (arguments (list #:phases @@ -978,21 +1067,25 @@ cards.") (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? + ;; FIXME: many test is fail, but look likes it can works. (invoke "ctest" "-E" - "(difftest|clonedialogtest|overlaytest)"))))))) + "(difftest|clonedialogtest|tagtest|indextest|\ +branchestest|configtest|stashtest|filetest|overlaytest|remotetest|clonetest|\ +submoduletest)"))))))) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools-5 pkg-config)) (inputs - (list kconfigwidgets - kcoreaddons - kcrash - kdbusaddons - ki18n - kxmlgui - kio - ktextwidgets - ktexteditor - ksyntaxhighlighting)) + (list kconfigwidgets-5 + kcoreaddons-5 + kcrash-5 + kdbusaddons-5 + ki18n-5 + kxmlgui-5 + kio-5 + ktextwidgets-5 + ktexteditor-5 + ksyntaxhighlighting-5 + libgit2-1.8)) (home-page "https://apps.kde.org/kommit/") (synopsis "Git client for KDE") (description @@ -1002,27 +1095,27 @@ cards.") (define-public kompare (package (name "kompare") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kompare-" version ".tar.xz")) (sha256 (base32 - "058rr0n5r9czxqs6ixacx0bm8hglwjmhfpf5xf1zr0fjgcirlrwy")))) + "13kvxa3l5hp9fi6ijy8vyzzm4ackrf09k6rm0nicb5z1s3iyyvxh")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools-5)) (inputs (list libkomparediff2 - kcodecs - kconfig - kcoreaddons - kiconthemes - kjobwidgets - kparts - ktexteditor - kwidgetsaddons)) + kcodecs-5 + kconfig-5 + kcoreaddons-5 + kiconthemes-5 + kjobwidgets-5 + kparts-5 + ktexteditor-5 + kwidgetsaddons-5)) (home-page "https://apps.kde.org/kompare/") (synopsis "Graphical file differences tool") (description @@ -1046,30 +1139,32 @@ include: (define-public kopeninghours (package (name "kopeninghours") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 (base32 - "14m4wl79b4qad42l1capz59pslfcrm25jshyhmcqzhqb0wzwkav9")))) + "132ihgsv1l8nz24ycddfp146czhnfcgrjfnffjb91w5l4a5wv3k4")))) (build-system cmake-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "ctest" "-E" - "(evaluatetest|iterationtest)"))))))) + (list + #:configure-flags #~(list "-DBUILD_WITH_QT6=ON") + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "QT_QPA_PLATFORM" "offscreen") + (invoke "ctest" "-E" + "(evaluatetest|iterationtest)"))))))) (native-inputs (list bison extra-cmake-modules flex)) (inputs (list boost kholidays ki18n osmctools - qtbase-5 - qtdeclarative-5)) + qtbase + qtdeclarative)) (home-page "https://invent.kde.org/libraries/kopeninghours") (synopsis "Get opening hours from OpenStreetMap") (description @@ -1080,21 +1175,21 @@ opening hours expressions.") (define-public kosmindoormap (package (name "kosmindoormap") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 (base32 - "1winrgc3698wjpil0hblw7bgbgaxgjh6h3dsl1kwc77w14f6vql3")))) + "1inch8vnh96lbklrj9w6d7vyqnbaig8f0kgfr5k7i5983vqpsvlm")))) (build-system cmake-build-system) - (native-inputs (list bison extra-cmake-modules flex)) + (native-inputs (list bison extra-cmake-modules flex python-minimal)) (inputs (list ki18n kopeninghours kpublictransport - qtbase-5 - qtdeclarative-5 + qtbase + qtdeclarative zlib)) (home-page "https://invent.kde.org/libraries/kosmindoormap") (synopsis "Indoor map renderer") @@ -1106,7 +1201,7 @@ multi-floor indoor maps.") (define-public kpmcore (package (name "kpmcore") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append @@ -1114,7 +1209,7 @@ multi-floor indoor maps.") "/src/" name "-" version ".tar.xz")) (sha256 (base32 - "0cz0pz84sxa7lvkq8v25775z7x7g6pz9sq7c90pfv8h9qsz8q1l9")))) + "1nrmfxs8hbba8b3ml4g9qaf0klzcm8ar052npv5lm0whx6zld1lf")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config)) @@ -1123,9 +1218,9 @@ multi-floor indoor maps.") kcoreaddons ki18n kwidgetsaddons - polkit-qt - qtbase-5 - qca + polkit-qt6 + qtbase + qca-qt6 `(,util-linux "lib"))) (arguments (list @@ -1144,7 +1239,7 @@ multi-floor indoor maps.") (define-public kpublictransport (package (name "kpublictransport") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" @@ -1152,10 +1247,11 @@ multi-floor indoor maps.") ".tar.xz")) (sha256 (base32 - "04fa9ismgkhskpmjf6b8gvra2z0jpsigz79b93m1snxm4046xihb")))) + "1g78kmnqg9y4mvd7nmlb4nd02ch3p5gxhnbphcnisc3ym3w3q1jj")))) (build-system qt-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (add-before 'check 'check-setup (lambda* (#:key inputs #:allow-other-keys) (setenv "QT_QPA_PLATFORM" "offscreen") @@ -1169,7 +1265,7 @@ multi-floor indoor maps.") (inputs (list clipper osmctools protobuf - qtdeclarative-5 + qtdeclarative zlib networkmanager-qt ki18n)) @@ -1209,7 +1305,7 @@ different notification systems.") (define-public kdeconnect (package (name "kdeconnect") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) @@ -1218,13 +1314,18 @@ different notification systems.") version ".tar.xz")) (sha256 (base32 - "1gcmqqj752h3lmcpvc7cm6k6bpb158ha7i5ysp0kqvf8cmpi5ydz")))) + "0jh5rx6amg7mxgy0n0hv23wj3qqmb37212996ssm41bvxnmjgn03")))) (build-system qt-build-system) (arguments - (list #:configure-flags #~'("-DBUILD_TESTING=ON" - "-DKDE_INSTALL_LIBEXECDIR=libexec" - ;; So kdeconnect.so isn't installed to lib/plugins - "-DPLUGIN_INSTALL_DIR=lib/qt5/plugins") + (list #:qtbase qtbase + #:configure-flags + #~(list "-DBUILD_TESTING=ON" + (string-append "-DQtWaylandScanner_EXECUTABLE=" + #$(this-package-native-input "qtwayland") + "/lib/qt6/libexec/qtwaylandscanner") + "-DKDE_INSTALL_LIBEXECDIR=libexec" + ;; So kdeconnect.so isn't installed to lib/plugins + "-DPLUGIN_INSTALL_DIR=lib/qt6/plugins") #:tests? #f)) ; tests fail hard in our build environment (native-inputs (list extra-cmake-modules @@ -1232,9 +1333,11 @@ different notification systems.") libxtst pkg-config python-wrapper - wayland-protocols)) + wayland-protocols + qtwayland)) (inputs - (list kcmutils + (list dbus + kcmutils kconfigwidgets kdbusaddons kguiaddons @@ -1242,24 +1345,22 @@ different notification systems.") kiconthemes kio kirigami + kirigami-addons knotifications kpackage kpeople - kpeoplevcard + kstatusnotifieritem kwayland libfakekey + openssl plasma-wayland-protocols pulseaudio-qt - qca + qca-qt6 qqc2-desktop-style - qtbase-5 - qtdeclarative-5 - qtgraphicaleffects - qtmultimedia-5 - qtquickcontrols-5 - qtquickcontrols2-5 - qtx11extras - qtwayland-5 + qtbase + qtdeclarative + qtmultimedia + qtwayland wayland modemmanager-qt libxkbcommon)) @@ -1315,27 +1416,26 @@ communicate with each other. Here's a few things KDE Connect can do: python-wrapper qttools-5)) (inputs - (list breeze ;for dark themes + (list breeze-qt5 ;for dark themes breeze-icons ;for icons gsl - karchive - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kcrash - kdoctools - ki18n - kiconthemes - kio - knewstuff - kparts - kservice - ksyntaxhighlighting - ktextwidgets - kuserfeedback - kwidgetsaddons - kxmlgui + karchive-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kcrash-5 + kdoctools-5 + ki18n-5 + kiconthemes-5 + kio-5 + knewstuff-5 + kparts-5 + kservice-5 + ksyntaxhighlighting-5 + ktextwidgets-5 + kwidgetsaddons-5 + kxmlgui-5 qtbase-5 qtsvg-5 shared-mime-info @@ -1359,14 +1459,14 @@ to perform data analysis.") (define-public kdf (package (name "kdf") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kdf-" version ".tar.xz")) (sha256 (base32 - "11ndcbfkq5fhb1lfij0mmm43fw49sh0z3nw644sll0smcwic76aa")))) + "1gp0r0dj58zq5rflw7yb42znjwvbq3aa0xqz5dfbxf7m3widri6g")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1379,27 +1479,29 @@ to perform data analysis.") kio knotifications kwidgetsaddons + kstatusnotifieritem kxmlgui - qtbase-5)) + qt5compat)) + (arguments (list #:qtbase qtbase)) (home-page "https://kde.org/applications/system/kdk") (synopsis "View Disk Usage") (description "KDiskFree displays the available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their capacity, free space, type and mount point. It also allows you to mount and unmount drives and view them in a file manager.") -(license license:gpl2+))) + (license license:gpl2+))) (define-public ktimer (package (name "ktimer") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/ktimer-" version ".tar.xz")) (sha256 (base32 - "1n5az5cgb0q28lz5f7afqjlfga32q232g836nkl1sfq8n5whj5z5")))) + "1s3fwxxdpc4qsxby01sdp5c2sdzb1a9y37d172gvk41148swl5np")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules @@ -1408,7 +1510,11 @@ unmount drives and view them in a file manager.") (list kdbusaddons ki18n kio - knotifications)) + knotifications + kconfigwidgets + kstatusnotifieritem + qt5compat)) + (arguments (list #:qtbase qtbase)) (home-page "https://kde.org/applications/utilities/ktimer") (synopsis "Countdown Launcher") (description "KTimer is a little tool to execute programs after some time. @@ -1419,19 +1525,19 @@ timers for each task can be started, stopped, changed, or looped.") (define-public kcachegrind (package (name "kcachegrind") - (version "23.08.4") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kcachegrind-" version ".tar.xz")) (sha256 (base32 - "011bsb9yxrjmazqs1s6fvzvga4mlhjpdvkifbxblqavwp3ipmwbw")))) + "1j0i8sigf21b3w4r0cahrdm046pcinsldqhcms2bhv14v9lirc19")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules perl python qttools-5 kdoctools)) + (list extra-cmake-modules perl python qttools kdoctools)) (inputs - (list qtbase-5 karchive ki18n kio kdbusaddons)) + (list qtbase karchive ki18n kio kxmlgui kdbusaddons)) ;; Note: The 'hotshot2calltree' and 'pprof2calltree' scripts depend on ;; Python and PHP, respectively. These are optional and we ignore them ;; for now. @@ -1453,15 +1559,16 @@ Python, PHP, and Perl.") (define-public libkdegames (package (name "libkdegames") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/libkdegames-" version ".tar.xz")) - (sha256 - (base32 "1sicpfsrkxn5d0fdy71h7033rpkb94r5hjvv5ab7qbmzb1qa4awq")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/libkdegames-" version ".tar.xz")) + (sha256 + (base32 "1sqhlhanb5vfbxp6g01rkgaj5v9gi1cxfgsmw39s0cikjfvidwpa")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules)) (inputs @@ -1478,7 +1585,6 @@ Python, PHP, and Perl.") kguiaddons ki18n kiconthemes - ;("kio" ,kio) kitemviews kjobwidgets knewstuff @@ -1488,9 +1594,8 @@ Python, PHP, and Perl.") kxmlgui libsndfile openal - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/categories/games/") (synopsis "Runtime library for kdegames") (description "Runtime library for kdegames") @@ -1499,7 +1604,7 @@ Python, PHP, and Perl.") (define-public marble-qt (package (name "marble-qt") - (version "23.04.3") + (version "24.05.2") (source (origin (method git-fetch) @@ -1509,7 +1614,7 @@ Python, PHP, and Perl.") (file-name (git-file-name name version)) (sha256 (base32 - "02qv2mfga4jm5br9dr8g6kcqr93q2ssq06m383kh83lkvickxzc9")))) + "126zm2r637zd8xg0mrqh3g0phlph440ayyzrx8hfvb03drx6y70z")))) (build-system qt-build-system) (arguments ;; FIXME: libmarblewidget-qt5.so.28 not found. Also enable the @@ -1520,24 +1625,25 @@ Python, PHP, and Perl.") "-DBUILD_TOUCH=YES" "-DBUILD_MARBLE_TESTS=FALSE"))) (native-inputs - (list extra-cmake-modules kdoctools qttools-5)) + (list extra-cmake-modules kdoctools-5 qttools-5 + osmctools)) ;; One optional dependency missing: libwlocate. (inputs (list gpsd - kcoreaddons - kcrash - ki18n - kio - knewstuff - kparts - krunner - kwallet + kcoreaddons-5 + kcrash-5 + ki18n-5 + kio-5 + knewstuff-5 + kparts-5 + krunner-5 + kwallet-5 perl phonon protobuf qtbase-5 qtdeclarative-5 - qtlocation + qtlocation-5 qtserialport qtsvg-5 qtwebchannel-5 @@ -1556,17 +1662,18 @@ creating routes by drag and drop and more.") (define-public okular (package (name "okular") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 - (base32 "1vgcqkq6mzd270hzabmdqqv105iv6kr6ah2h18b15al2n9rmg0bi")))) + (base32 "0kh3a40887f7lajgvk3ndr3ns3mm1kld0biw0cqg9ys69f4d8677")))) (build-system qt-build-system) (arguments (list + #:qtbase qtbase #:phases #~(modify-phases %standard-phases (delete 'check) @@ -1578,7 +1685,8 @@ creating routes by drag and drop and more.") "--output-on-failure" "--rerun-failed" "-E" - "(mainshelltest|parttest|chmgeneratortest)")))) + "(annotationtoolbartest|mainshelltest|parttest|\ +chmgeneratortest)")))) (add-before 'check 'check-setup (lambda* (#:key outputs #:allow-other-keys) (let ((share (string-append (assoc-ref outputs "out") "/share"))) @@ -1597,40 +1705,39 @@ creating routes by drag and drop and more.") breeze-icons discount djvulibre - kactivities - khtml + plasma-activities chmlib kdegraphics-mobipocket karchive kbookmarks kcompletion kconfig - qtbase-5 libjpeg-turbo libtiff kirigami purpose freetype + ki18n kiconthemes kio kparts kpty - qtspeech-5 + ktextwidgets + qtspeech kwallet kwindowsystem libkexiv2 libspectre libzip + libxkbcommon phonon - poppler-qt5 + poppler-qt6 qca - qtdeclarative-5 - qtsvg-5 - qtwayland-5 + qtdeclarative + qtsvg + qtwayland threadweaver - kcrash - kjs - qtx11extras)) + kcrash)) (home-page "https://apps.kde.org/okular/") (synopsis "Document viewer") (description @@ -1641,7 +1748,7 @@ a variety of formats, including PDF, PostScript, DejaVu, and EPub.") (define-public poxml (package (name "poxml") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri @@ -1649,10 +1756,10 @@ a variety of formats, including PDF, PostScript, DejaVu, and EPub.") "/src/poxml-" version ".tar.xz")) (sha256 (base32 - "11rqd7hhsy6f8qi0529cmy381bhskji6wf4fij7yjksmrsdvfw6d")))) + "0998ss7jib255x9kyhsz79lgnf97m7hbm6dsyh6xj9rcwv8i9srk")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools-5)) (inputs (list gettext-minimal qtbase-5)) (home-page "https://apps.kde.org/development/") @@ -1666,19 +1773,20 @@ PO template files.") (define-public kdegraphics-mobipocket (package (name "kdegraphics-mobipocket") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 - (base32 "13hn6dh5d4vsblvg6wyyvbmcyl0yyqr8srilik86wilp58qbsrdv")))) + (base32 "1hcglnbw2ck864glgd4aag54826aycmncmizfqlpncfzwdayq204")))) (build-system cmake-build-system) + (arguments (list #:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) (native-inputs (list extra-cmake-modules)) (inputs - (list kio qtbase-5)) + (list kio qtbase qt5compat)) (home-page "https://apps.kde.org/en/kdegraphics_mobipocket") (synopsis "KDE thumbnailer for Mobipocket files") (description "This package provides a KDE plugin that shows thumbnails of @@ -1688,41 +1796,45 @@ Mobipocket e-books in Dolphin and other KDE apps.") (define-public libkexiv2 (package (name "libkexiv2") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 - (base32 "16cb7cab4pyarwwn2byyvanwlakcgq5h203hkysp44flszq515cl")))) + (base32 "04z36kvj9nwr9i8xs6hi0lqmxz7lqyhs9c1cngcb7p7lw9hmynch")))) (build-system cmake-build-system) + (arguments (list #:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) (native-inputs (list extra-cmake-modules)) (inputs - (list exiv2 qtbase-5)) + (list exiv2 qtbase)) (home-page "https://invent.kde.org/graphics/libkexiv2") (synopsis "Manipulate the metadata of images") (description "Libkexiv2 wraps the Exiv2 library, allowing to manipulate picture metadata as EXIF/IPTC and XMP.") (license license:gpl2+))) -(define-public zeroconf-ioslave +(define-public kio-zeroconf (package - (name "zeroconf-ioslave") - (version "22.04.3") + (name "kio-zeroconf") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version - "/src/zeroconf-ioslave-" version ".tar.xz")) + "/src/kio-zeroconf-" version ".tar.xz")) (sha256 - (base32 "0jbrdbphxn77dg2a4wzsm7q24455j4d1xhd4rj5iwhq4ywiig9i1")))) + (base32 "058w37n7s8lbc8mjqjpqarhg8b2796x2yssrxnppib12dld9x4wb")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list kdbusaddons kdnssd ki18n kio qtbase-5)) + (list kdbusaddons kdnssd ki18n kio)) + (arguments (list #:qtbase qtbase + #:configure-flags + #~(list "-DQT_MAJOR_VERSION=6"))) (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 @@ -1737,18 +1849,18 @@ or Bonjour by other projects).") ;; FIXME: Check https://www.reddit.com/r/kde/comments/f7ojg9 for insights (package (name "kuserfeedback") - (version "1.2.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/kuserfeedback/" "/kuserfeedback-" version ".tar.xz")) (sha256 - (base32 "0r7jcc88n5b4rc0asjzh7m7g33i35k3z99l08qkrn92kn4ickakn")))) + (base32 "04zx5wfzqyargbvkbd66iabi4mfsn34qh5mbhpm90inx4aw0h8r5")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules - qttools-5 + qttools ;; For optional component "Survey target expression parser" bison flex @@ -1757,9 +1869,12 @@ or Bonjour by other projects).") ;;("phpunit" ,phpunit) )) (inputs - (list qtbase-5 qtcharts qtdeclarative-5 qtsvg-5)) + (list qtdeclarative qtsvg)) (arguments - `(#:tests? #f)) ;; 4/17 fail + (list + #:qtbase qtbase + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6") + #:tests? #f)) ;; 4/17 fail (home-page "https://api.kde.org/frameworks/kuserfeedback/html/") (synopsis "Collect application feedback via telemetry and targeted surveys") diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index c84bcaf3ce..3e46477724 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2023 Tomas Volf <wolf@wolfsden.cz> ;;; Copyright © 2023 Ian Eure <ian@retrospec.tv> +;;; Copyright © 2024 Remco van 't Veer <remco@remworks.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -261,7 +262,10 @@ "--disable-crashreporter" "--allow-addon-sideload" "--with-unsigned-addon-scopes=app,system" - "--disable-eme" + + ;; switch only available on x86, whereas EME + ;; is not supported on other targets + ,@(if #$(target-x86?) '("--disable-eme") '()) ;; Build details "--disable-debug" diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1fde34b251..9ace92acbd 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -512,17 +512,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.9-version "6.9.7") +(define-public linux-libre-6.9-version "6.9.9") (define-public linux-libre-6.9-gnu-revision "gnu") (define deblob-scripts-6.9 (linux-libre-deblob-scripts linux-libre-6.9-version linux-libre-6.9-gnu-revision (base32 "1izfwmk0mxikx3bblcwiyrxdd4bg9v0jsph3i8gvrpjb7kw0lhna") - (base32 "0b8hsr0s4f3hps27bmd5qj1yknhd73q4zplr4v3lmq7sr57mgly6"))) + (base32 "18vfz1fx4vjssfh1w7aqfjf91y2g34a2qnzbl9pyawa7qnqxq33n"))) (define-public linux-libre-6.9-pristine-source (let ((version linux-libre-6.9-version) - (hash (base32 "1y01w26sas7pl24l09yczdr8mzzy2nadykz1wmhx9ygfj76qixg4"))) + (hash (base32 "1f8y88rif3z5lp1bq00g66fd0xs1227qlqkxd2zs6fdjgr45pq1b"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.9))) @@ -532,52 +532,52 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; Here are the support timelines: ;; <https://www.kernel.org/category/releases.html> -(define-public linux-libre-6.6-version "6.6.36") +(define-public linux-libre-6.6-version "6.6.40") (define-public linux-libre-6.6-gnu-revision "gnu") (define deblob-scripts-6.6 (linux-libre-deblob-scripts linux-libre-6.6-version linux-libre-6.6-gnu-revision (base32 "1a28pdl645bj4d8gac71dmwmll6a2kgd3k7gkpfvi94yqkzd9r2z") - (base32 "05ypqx1sz54yhb8jyxphvg5pwgb2cnzb4zqqaiyyywpqsrnya9kq"))) + (base32 "15xb4miirfmi1khlq4zhb8zmmh82f41jhsfbsfpv8v98yfka2nmb"))) (define-public linux-libre-6.6-pristine-source (let ((version linux-libre-6.6-version) - (hash (base32 "1mfdw2prjb54r19y22sm37q8spnk6lyk162ima7gps1pnwl6hrxr"))) + (hash (base32 "0f7mmw5pzd174376m7r928xbi9mdcla0vy6plq0xdf2mq01kqfjw"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.6))) -(define-public linux-libre-6.1-version "6.1.96") +(define-public linux-libre-6.1-version "6.1.99") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts linux-libre-6.1-version linux-libre-6.1-gnu-revision (base32 "1sf80f2i4vf888xjcn84ymn4w5ynn30ib9033zwmv7f09yvfhapy") - (base32 "0nq8b6rnn031wl0qz7ahyfs3hcb0qsr7hzdmxi2g33ycsm9955lk"))) + (base32 "11jbnj0d3262grf9vkn0668kvfxifxw98ccvn81wkaykll01k5nx"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "1ab290vm6h8vj1qi1qhxzh9kc6dbgpkwybcwzw1aprz5kl3cjxry"))) + (hash (base32 "1lsdwdx7i7xw1rzq88k3bz8sar77gb4rnmjx11pbmvmiwaffx1n0"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) -(define-public linux-libre-5.15-version "5.15.161") +(define-public linux-libre-5.15-version "5.15.162") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts linux-libre-5.15-version linux-libre-5.15-gnu-revision (base32 "18ac30kxg2mf2f6gk3p935hzhz2qs110jy4xwk21kblnnkskbxj8") - (base32 "121shkzgixmywa19xx5f2yxg1primarpg4bxin3jyw0214xbfh2n"))) + (base32 "0p6spfkf3smm4wlgfmqahzcfnlzij5nkhqh297h91r3xqxis0l1y"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "0k277hz6nq62v0xfc1n2hc69cyvmnxpl0qcbszinajywh23gfafn"))) + (hash (base32 "0z0s5gk8akcbpb99jp08px78fhr8r6kkb7dpl01b3rrc2pmc1gwi"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.220") +(define-public linux-libre-5.10-version "5.10.221") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -587,12 +587,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "12csh2zyjrqzgqcv799gv8h4xaw1irxh2zqddn4jqp5p7psx4j5k"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "16z1xqm7djm8pl15s5wvgc4pwq81gydcf00jpxfplw794kwszhvw"))) + (hash (base32 "09975sby114mwfb8x2rlpaps6vb60dvs8f20cmb7hkxcxdzx87fs"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.278") +(define-public linux-libre-5.4-version "5.4.279") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -602,12 +602,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0x0xg0fcykpd117x3q0gim8jilhx922ashhckjvafxv2gk2zzjhj"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1245zf7vk2fyprw9fspljqy9wlzma9bayri7xx2g8iam2430d875"))) + (hash (base32 "0pja69n66hsl1r5jbzqww1hwsmqdlxmq6qv9rqx5qnrr4rml765j"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.316") +(define-public linux-libre-4.19-version "4.19.317") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -617,7 +617,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fgkp3v7qgqpn7l1987xcwwlrmwsbscqnxfv06p8nkavrhymrv3c"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0lmyhwr4la7kvim7jqdi29scjkvqp9crpvdbhpb4j8d7mj5kgzz4"))) + (hash (base32 "109mk4zscm8611xs3bchnr94gasvw3vxsi6zhp3f2y132g670aq6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) @@ -7171,7 +7171,7 @@ not as a replacement for it.") (define-public hotspot (package (name "hotspot") - (version "1.5.0") + (version "1.5.1") (source (origin (method git-fetch) (uri (git-reference @@ -7183,7 +7183,7 @@ not as a replacement for it.") (file-name (git-file-name name version)) (sha256 (base32 - "17m96h0iahfjhbsa9flmsmbczvliy34vqvayzyh8bhldd8yh768l")))) + "04k2rvf2lgi8hp7dzqzn65fcd2lsiylwr04d44q75j0wvgbjjv1v")))) (build-system qt-build-system) (arguments (list @@ -7191,7 +7191,9 @@ not as a replacement for it.") ;; installed to a custom prefix and the build fails with "file cannot ;; create directory: /polkit-1/actions. Maybe need administrative" ;; (see: https://bugs.kde.org/show_bug.cgi?id=363678). - #:configure-flags #~(list "-DINSTALL_KAUTH_HELPER=OFF") + #:configure-flags #~(list "-DINSTALL_KAUTH_HELPER=OFF" + "-DQT6_BUILD=ON") + #:qtbase qtbase #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-perfparser @@ -7262,6 +7264,7 @@ not as a replacement for it.") kcoreaddons kddockwidgets kgraphviewer + ki18n kio kiconthemes kitemmodels @@ -7272,12 +7275,8 @@ not as a replacement for it.") kwindowsystem libxkbcommon perf - qcustomplot - qtbase-5 - qtdeclarative-5 - qtquickcontrols2-5 - qtsvg-5 - qtx11extras + qtdeclarative + qtsvg solid threadweaver `(,zstd "lib")) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 943fa6e5db..97f7dd357b 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -803,7 +803,7 @@ interface to the Tk widget system.") (define-public janet (package (name "janet") - (version "1.33.0") + (version "1.35.2") (source (origin (method git-fetch) @@ -812,7 +812,7 @@ interface to the Tk widget system.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "16wgljca7hp29fz5p2dnvy2cbscjx4imf85rhjwc1jkgdjswjxli")))) + (base32 "0kgya9zv8xq6mbrkpllm29zfxkr626ip83ivqkgqfcs5a33b39wa")))) (build-system gnu-build-system) (arguments (list #:make-flags diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 62415f58f0..1e583b59b3 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -1361,7 +1361,7 @@ enabled.") (define-public fennel (package (name "fennel") - (version "1.4.2") + (version "1.5.0") (source (origin (method git-fetch) (uri (git-reference @@ -1370,7 +1370,7 @@ enabled.") (file-name (git-file-name name version)) (sha256 (base32 - "1h1i87jx889n1wczw5jvqmkx0jmlrq83pjspyd9v27j360d9fcik")))) + "0d25v7swq3msxsdzv91wwxy89y3qgw4bvzq1px89qsjzbbd7ccg2")))) (build-system gnu-build-system) (arguments (list #:make-flags #~(list (string-append "PREFIX=" diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index f0ae01614e..9035e45be8 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2020 Fakhri Sajadi <f.sajadi@pantherx.org> ;;; Copyright © 2020 André Batista <nandre@riseup.net> ;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -227,7 +228,7 @@ applications.") "DESTINATION \"share/polkit-1/actions")) #t))))) (inputs - (list kwindowsystem + (list kwindowsystem-5 libqtxdg libxscrnsaver polkit-qt @@ -280,7 +281,7 @@ and memory usage or network traffic.") (base32 "08b922gyg4591b399pw0y9zl3gr2627dw20c33abqpl30iq1fmd9")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 liblxqt libqtxdg qtbase-5 @@ -315,7 +316,7 @@ LXQt and the system it's running on.") (base32 "1p9959rvj5kh1svv2p9dsfnf008xvrhllcccrsxnk4s8vzjhdqjp")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 liblxqt libqtxdg polkit-qt @@ -354,7 +355,7 @@ the operating system LXQt is running on.") (build-system cmake-build-system) (inputs (list eudev - kwindowsystem + kwindowsystem-5 liblxqt libqtxdg libxcursor @@ -362,7 +363,7 @@ the operating system LXQt is running on.") qtbase-5 qtsvg-5 qtx11extras - solid + solid-5 xf86-input-libinput xkeyboard-config zlib)) @@ -371,7 +372,7 @@ the operating system LXQt is running on.") ;; XXX: This is a workaround so libkscreen can find the backends as we ;; dont have a way specify them. We may want to patch like Nix does. (propagated-inputs - (list libkscreen)) + (list libkscreen-5)) (arguments '(#:tests? #f ; no tests #:phases @@ -404,7 +405,7 @@ configuration of both LXQt and the underlying operating system.") (base32 "17km7yl5fqwhjy35w700s4rjxf9ann3vv6mw6l4r1cf7pvzmxhy7")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 liblxqt libqtxdg qtbase-5 @@ -433,7 +434,7 @@ as a whole and are not limited to distinct applications.") (base32 "182mjvc17dvavk8vznhgnk6j1lv594bqv4796p2p1f4zdhq6fgm6")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 liblxqt libqtxdg qtbase-5 @@ -461,7 +462,7 @@ according to the Desktop Notifications Specification.") (base32 "014jpyw4sgr63kjqdmksi6fsaz7pm5gkzr17f5rkaadx640ij4m0")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 liblxqt libqtxdg qtbase-5 @@ -508,7 +509,7 @@ of other programs.") qtbase-5 qtsvg-5 qtx11extras - solid + solid-5 xcb-util xcb-util-image xkeyboard-config)) @@ -517,7 +518,7 @@ of other programs.") (propagated-inputs ;; Propagating KWINDOWSYSTEM so that the list of opened applications ;; shows up in lxqt-panel's taskbar plugin. - (list kwindowsystem lxmenu-data)) + (list kwindowsystem-5 lxmenu-data)) (arguments '(#:tests? #f ; no tests #:phases @@ -548,7 +549,7 @@ of other programs.") (base32 "051lb4kx29rx3ls3whlrbi83r9z9pdiqwyb1wbni56aqilv0svh0")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 liblxqt libqtxdg pcre @@ -578,15 +579,15 @@ LXQt.") (base32 "17d1wh50pjjzqyxv3w7b4qlc1ym1p16yvbhyah9bzl2825irz9ar")))) (build-system cmake-build-system) (inputs - (list kidletime - kwindowsystem + (list kidletime-5 + kwindowsystem-5 liblxqt libqtxdg lxqt-globalkeys qtbase-5 qtsvg-5 qtx11extras - solid)) + solid-5)) (native-inputs (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f)) ; no tests @@ -647,7 +648,7 @@ Qt with LXQt.") (base32 "1916cl12v09x4iqrgvp2dwchy50wa97a0y68q4rdigarpdrp3x7j")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 liblxqt libqtxdg lxqt-globalkeys @@ -679,7 +680,7 @@ allows for launching applications or shutting down the system.") (build-system cmake-build-system) (inputs (list eudev - kwindowsystem + kwindowsystem-5 liblxqt qtxdg-tools procps @@ -736,7 +737,7 @@ for the LXQt desktop environment.") (base32 "0pqz2pkzwq3af70s90p9x3a8rvlpl2jjb4mnjwgs1wz30cb7jrii")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 liblxqt libqtxdg qtbase-5 @@ -964,7 +965,7 @@ window manager OpenBox.") (base32 "126zkj9jvjwxrh2fcm9h0c2iq9m5rm5hbkh155swijn2i8airxgx")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 libxrender liblxqt libqtxdg @@ -1040,7 +1041,7 @@ QTermWidget.") (base32 "0xc004h7i2hnl3jj4p8v6wkqav2v07k1mzdvys3ya171z4ffmc9j")))) (build-system cmake-build-system) (inputs - (list kwindowsystem libqtxdg qtbase-5 qtsvg-5 qtx11extras)) + (list kwindowsystem-5 libqtxdg qtbase-5 qtsvg-5 qtx11extras)) (native-inputs (list pkg-config perl qttools-5)) (arguments @@ -1096,7 +1097,7 @@ like @command{tar} and @command{zip}.") (base32 "087641idpg7n8yhh5biis4wv52ayw3rddirwqb34bf5fwj664pw9")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 qtbase-5 qtsvg-5 liblxqt diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 6eaf74e087..02b3677764 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015-2024 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2016, 2020-2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2020-2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> @@ -549,8 +549,8 @@ Performance is achieved by using the LLVM JIT compiler.") (deprecated-package "guile-aiscm-next" guile-aiscm)) (define-public llama-cpp - (let ((commit "fed0108491a3a3cbec6c6480dc8667ffff9d7659") - (revision "2")) + (let ((commit "a5735e4426b19a3ebd0c653ad8ac01420458ee95") + (revision "3")) (package (name "llama-cpp") (version (git-version "0.0.0" revision commit)) @@ -562,19 +562,27 @@ Performance is achieved by using the LLVM JIT compiler.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "16rm9gy0chd6k07crm8rkl2j3hg7y7h0km7k6c8q7bmm2jrd64la")))) + (base32 "0nx55wchwf204ld6jygfn37cjrzc4lspwn5v0qk8i6p92499bv0h")))) (build-system cmake-build-system) (arguments (list - #:configure-flags #~'("-DLLAMA_BLAS=ON" - "-DLLAMA_BLAS_VENDOR=OpenBLAS" - - "-DLLAMA_NATIVE=OFF" ;no '-march=native' - "-DLLAMA_FMA=OFF" ;and no '-mfma', etc. - "-DLLAMA_AVX2=OFF" - "-DLLAMA_AVX512=OFF" - "-DLLAMA_AVX512_VBMI=OFF" - "-DLLAMA_AVX512_VNNI=OFF") + #:configure-flags + #~(list "-DBUILD_SHARED_LIBS=ON" + "-DLLAMA_BLAS=ON" + "-DLLAMA_BLAS_VENDOR=OpenBLAS" + (string-append "-DBLAS_INCLUDE_DIRS=" + #$(this-package-input "openblas") + "/include") + (string-append "-DBLAS_LIBRARIES=" + #$(this-package-input "openblas") + "/lib/libopenblas.so") + + "-DLLAMA_NATIVE=OFF" ;no '-march=native' + "-DLLAMA_FMA=OFF" ;and no '-mfma', etc. + "-DLLAMA_AVX2=OFF" + "-DLLAMA_AVX512=OFF" + "-DLLAMA_AVX512_VBMI=OFF" + "-DLLAMA_AVX512_VNNI=OFF") #:modules '((ice-9 textual-ports) (guix build utils) @@ -609,14 +617,14 @@ Performance is achieved by using the LLVM JIT compiler.") (mkdir-p bin) (make-script "convert-hf-to-gguf") (make-script "convert-llama-ggml-to-gguf") - (make-script "convert-lora-to-ggml") - (make-script "convert-persimmon-to-gguf") - (make-script "convert")))) + (make-script "convert-hf-to-gguf-update.py")))) (add-after 'install-python-scripts 'wrap-python-scripts (assoc-ref python:%standard-phases 'wrap)) (add-after 'install 'install-main (lambda _ - (copy-file "bin/main" (string-append #$output "/bin/llama"))))))) + (with-directory-excursion (string-append #$output "/bin") + (symlink "main" "llama")))) + ))) (inputs (list python)) (native-inputs (list pkg-config)) (propagated-inputs @@ -2169,13 +2177,13 @@ data by providing clean labels during training.") (define-public python-cma (package (name "python-cma") - (version "3.3.0") + (version "3.4.0") (source (origin (method url-fetch) (uri (pypi-uri "cma" version)) (sha256 (base32 - "1v31b2vnnr4v6ack7zfmw7zb47vbzjr9nyvx2lbfhyjf7zhbhj5p")))) + "0v0gs46n4ividm9viml09sllxw2cymxlp8nm2lvvwwcqp5lxksx1")))) (build-system python-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -2388,13 +2396,13 @@ discrete, and conditional dimensions.") (define-public python-deepxde (package (name "python-deepxde") - (version "1.11.0") + (version "1.11.1") (source (origin (method url-fetch) - (uri (pypi-uri "DeepXDE" version)) + (uri (pypi-uri "deepxde" version)) (sha256 (base32 - "0qx6iq8n2j8ab80bs2n85v8g6xi2bnq83vfiaj7a4nsmf62rhkzg")))) + "1dkhgka0ris2fkqkm3riwsqrq2q9rk7lk36gaf4av1mhz6c0sa64")))) (build-system pyproject-build-system) (arguments (list #:tests? #f ; there are no tests @@ -3856,7 +3864,7 @@ with image data, text data, and sequence data.") python-pyux python-sphinx python-requests)) - (home-page "https://github.com/keras-team/keras") + (home-page "https://keras.io/") (synopsis "High-level deep learning framework") (description "Keras is a high-level neural networks API, written in Python and capable of running on top of TensorFlow. It was developed with a focus on @@ -4090,7 +4098,7 @@ and Darknet.") inference. It contains the implementation of common neural network operators on quantized 8-bit tensors.") (supported-systems - '("armv7-linux" "aarch64-linux" "i686-linux" "x86_64-linux")) + '("armhf-linux" "aarch64-linux" "i686-linux" "x86_64-linux")) (license license:bsd-3)))) (define-public xnnpack @@ -4209,8 +4217,8 @@ instead it provides low-level performance primitives for accelerating high-level machine learning frameworks, such as TensorFlow Lite, TensorFlow.js, PyTorch, and MediaPipe.") (supported-systems - '("armv7-linux" "aarch64-linux" "riscv64-linux" - "i686-linux" "x86_64-linux" "i686-mingw" "x86_64-mingw")) + '("armhf-linux" "aarch64-linux" "riscv64-linux" + "i686-linux" "x86_64-linux")) (license license:bsd-3)))) ;; Warning: This package requires AVX2 or AVX-512 instructions. @@ -5319,74 +5327,70 @@ of Hidden Markov Models.") ;; Keep this in sync with the r-torch package. (define-public liblantern - ;; There has been no release or tagged commit for r-torch 0.12.0. The - ;; selected commit corresponds to the 0.12.0 release. - (let ((commit "4d83bd087be581f7db321c27f55897ff021d2537") - (revision "1")) - (package - (name "liblantern") - (version (git-version "0.11.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mlverse/torch") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1xxc6vr7sr2mg0va0hc2fs4f6v5b78mx43dp2shzzbcgw90mgpvk")))) - (build-system cmake-build-system) - (arguments - (list - #:tests? #false ;no test target - #:phases - (let ((python-version (version-major+minor (package-version python)))) - #~(modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ (chdir "src/lantern"))) - (add-after 'chdir 'do-not-download-binaries - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("find_package\\(Torch.*") "set(TORCH_CXX_FLAGS \"-ltorch\")\n") - (("retrieve_lib\\(.*") "")) - (let ((site-packages (string-append "/lib/python" - #$python-version - "/site-packages"))) - (setenv "LIBRARY_PATH" - (string-append - (search-input-directory - inputs (string-append site-packages "/torch/lib")) - ":" (or (getenv "LIBRARY_PATH") ""))) - (setenv "CPLUS_INCLUDE_PATH" - (string-append - (search-input-directory - inputs (string-append - site-packages "/torch/include/torch/csrc/api/include/")) - ":" - (search-input-directory - inputs (string-append site-packages "/torch/include/")) - ":" - (or (getenv "CPLUS_INCLUDE_PATH") ""))) - (setenv "C_INCLUDE_PATH" - (string-append - (search-input-directory - inputs (string-append site-packages "/torch/include/")) - ":" - (or (getenv "C_INCLUDE_PATH") "")))))) - (replace 'install - (lambda _ - (install-file - "../build/liblantern.so" - (string-append #$output "/lib")) - (copy-recursively - "../lantern/include" - (string-append #$output "/include")))))))) - (inputs (list python-pytorch-for-r-torch)) - (home-page "https://github.com/mlverse/torch/") - (synopsis "C API to libtorch") - (description - "Lantern provides a C API to the libtorch machine learning library.") - (license license:expat)))) + (package + (name "liblantern") + (version "0.13.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mlverse/torch") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1yy5xpn9mi5qm7k4w7040d6frpixm9ifs46v1cn9b6bpc1qs1a02")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #false ;no test target + #:phases + (let ((python-version (version-major+minor (package-version python)))) + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "src/lantern"))) + (add-after 'chdir 'do-not-download-binaries + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("find_package\\(Torch.*") "set(TORCH_CXX_FLAGS \"-ltorch\")\n") + (("retrieve_lib\\(.*") "")) + (let ((site-packages (string-append "/lib/python" + #$python-version + "/site-packages"))) + (setenv "LIBRARY_PATH" + (string-append + (search-input-directory + inputs (string-append site-packages "/torch/lib")) + ":" (or (getenv "LIBRARY_PATH") ""))) + (setenv "CPLUS_INCLUDE_PATH" + (string-append + (search-input-directory + inputs (string-append + site-packages "/torch/include/torch/csrc/api/include/")) + ":" + (search-input-directory + inputs (string-append site-packages "/torch/include/")) + ":" + (or (getenv "CPLUS_INCLUDE_PATH") ""))) + (setenv "C_INCLUDE_PATH" + (string-append + (search-input-directory + inputs (string-append site-packages "/torch/include/")) + ":" + (or (getenv "C_INCLUDE_PATH") "")))))) + (replace 'install + (lambda _ + (install-file + "../build/liblantern.so" + (string-append #$output "/lib")) + (copy-recursively + "../lantern/include" + (string-append #$output "/include")))))))) + (inputs (list python-pytorch-for-r-torch)) + (home-page "https://github.com/mlverse/torch/") + (synopsis "C API to libtorch") + (description + "Lantern provides a C API to the libtorch machine learning library.") + (license license:expat))) (define-public python-lap (package @@ -5579,22 +5583,22 @@ linear algebra routines needed for structured matrices (or operators).") (define-public python-gpytorch (package (name "python-gpytorch") - (version "1.11") + (version "1.12") (source (origin (method url-fetch) (uri (pypi-uri "gpytorch" version)) (sha256 (base32 - "0q17bml53vixk3cwj3p893809927hz81fprwsmxpxqv5i4mvgyvj")))) + "1pwsccll1hrgkifdmlxzcn6cvnwvyq2cimqzbfgihr13yw51cb6w")))) (build-system pyproject-build-system) (arguments (list #:test-flags - ;; The error message in test_t_matmul_matrix suggests the error may - ;; be due to a bug in gpytorch. test_deprecated_methods fails with - ;; an AssertionError. - #~(list "-k" (string-append "not test_deprecated_methods" - " and not test_t_matmul_matrix")))) - (propagated-inputs (list python-linear-operator python-scikit-learn)) + ;; test_deprecated_methods fails with an AssertionError. + #~(list "-k" (string-append "not test_deprecated_methods")))) + (propagated-inputs (list python-linear-operator + python-mpmath + python-scikit-learn + python-scipy)) (native-inputs (list python-coverage python-flake8 python-flake8-print diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 6aacdcb73c..9319077192 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1975,7 +1975,7 @@ delivery.") (define-public exim (package (name "exim") - (version "4.97.1") + (version "4.98") (source (origin (method url-fetch) @@ -1989,7 +1989,7 @@ delivery.") (string-append "https://ftp.exim.org/pub/exim/exim4/old/" file-name)))) (sha256 - (base32 "1afzxyffjqm2xm5v6b731hbfm1fi4q35ja45a29kaycsa1bj0y5x")))) + (base32 "1xsjb2hqasxsqsmrcv98c2dvfgcsiy0j0g229fx974lzfy511g0f")))) (build-system gnu-build-system) (arguments (list #:phases @@ -3316,6 +3316,10 @@ from the Cyrus IMAP project.") ;; Fix some incorrectly hard-coded external tool file names. (add-after 'unpack 'patch-FHS-file-names (lambda _ + ;; avoids warning smtpd: couldn't enqueue offline message + ;; smtpctl exited abnormally + (substitute* "usr.sbin/smtpd/smtpd.h" + (("/usr/bin/smtpctl") "/run/setuid-programs/smtpctl")) (substitute* "usr.sbin/smtpd/smtpctl.c" ;; ‘gzcat’ is auto-detected at compile time, but ‘cat’ isn't. (("/bin/cat") (which "cat"))) @@ -5097,7 +5101,7 @@ remote SMTP server.") go-github-com-creack-pty go-github-com-arran4-golang-ical go-github-com-protonmail-go-crypto - go-github-com-syndtr-goleveldb-leveldb + go-github-com-syndtr-goleveldb go-git-sr-ht-sircmpwn-getopt go-git-sr-ht-rockorager-tcell-term python diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d39292e825..391c11891e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1459,7 +1459,7 @@ C++ with a C API. It contains a LU and LLt solver, and a few other things.") (define-public primesieve (package (name "primesieve") - (version "11.1") + (version "12.3") (source (origin (method git-fetch) (uri (git-reference @@ -1468,7 +1468,7 @@ C++ with a C API. It contains a LU and LLt solver, and a few other things.") (file-name (git-file-name name version)) (sha256 (base32 - "0ja3kxvpya7bwrib40hnyahsiiiavf65ppk7i7afvc093b7gg9bg")))) + "1lxvs1jgch0zgpa5axx6zlvgab4rmm3lqpbah75072xpj8ndhhld")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DBUILD_STATIC_LIBS=off" @@ -1486,7 +1486,7 @@ C++ with a C API. It contains a LU and LLt solver, and a few other things.") (define-public cminpack (package (name "cminpack") - (version "1.3.8") + (version "1.3.9") (source (origin (method git-fetch) (uri (git-reference @@ -1495,7 +1495,7 @@ C++ with a C API. It contains a LU and LLt solver, and a few other things.") (file-name (git-file-name name version)) (sha256 (base32 - "1bg0954mwry22izsvikpai16pkfp8srz4z34n267bhkmrvvb0zgy")))) + "05cjb54in7kks70rrnmvczwkg4nsxhwyf23abxqdj143zwbz4yyr")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON"))) @@ -3529,7 +3529,8 @@ September 2004}") "--with-openblas=1" (string-append "--with-openblas-dir=" #$(this-package-input "openblas")) - "--with-superlu=1") + "--with-superlu=1" + "--with-debugging=0") #:make-flags ;; Honor (parallel-job-count) for build. Do not use --with-make-np, ;; whose value is dumped to $out/lib/petsc/conf/petscvariables. @@ -7066,7 +7067,7 @@ evaluates expressions using the standard order of operations.") (define-public xaos (package (name "xaos") - (version "4.2.1") + (version "4.3.2") (source (origin (method git-fetch) (uri (git-reference @@ -7075,53 +7076,53 @@ evaluates expressions using the standard order of operations.") (file-name (git-file-name name version)) (sha256 (base32 - "0maw5am6rrkyjrprfg113zjq37mqj0iaznkg4h2927ff7wrprc94")))) + "0a5n3g1xcsd8k65q5skm4xsdllr3mmkahh4vi59db1l0jv81v06q")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) - ("qtbase" ,qtbase-5) - ("qttools-5" ,qttools-5))) + ("qtbase" ,qtbase) + ("qttools" ,qttools))) (inputs (list libx11 zlib libpng gsl)) ;; The upstream project file ("XaoS.pro") and the Makefile it generates are ;; not enough for this package to install properly. These phases fix that. (arguments - `(#:tests? #f ;no "check" target - #:phases - (modify-phases %standard-phases - (add-before 'configure 'make-qt-deterministic - (lambda _ - ;; Make Qt deterministic. - (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") - #t)) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "XaoS.pro" - ;; The DESTDIR is originally set to install the xaos binary to - ;; the "bin" folder inside the build directory. Setting make - ;; flags doesn't seem to change this. - (("DESTDIR.*$") - (string-append "DESTDIR=" out "/bin")) - ;; Set the correct path to the lrelease binary. - (("lrelease-qt5") "lrelease")) - (substitute* "src/include/config.h" - (("/usr/share/XaoS") - (string-append out "/share/XaoS"))) - (invoke "qmake")))) - (add-after 'install 'install-data - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share"))) - (mkdir-p share) - (for-each - (lambda (folder) - (copy-recursively folder - (string-append share "/XaoS/" folder))) - '("catalogs" "examples" "tutorial")) - (install-file "xdg/xaos.png" - (string-append share "/pixmaps")) - (install-file "xdg/xaos.desktop" - (string-append share "/applications"))) - #t))))) + (list #:tests? #f ;no "check" target + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'make-qt-deterministic + (lambda _ + ;; Make Qt deterministic. + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1"))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "XaoS.pro" + ;; The DESTDIR is originally set to install the xaos binary to + ;; the "bin" folder inside the build directory. Setting make + ;; flags doesn't seem to change this. + (("DESTDIR.*$") + (string-append "DESTDIR=" out "/bin")) + (("/usr/local") + out) + ;; Set the correct path to the lrelease binary. + (("lrelease-qt6") "lrelease")) + (substitute* "src/include/config.h" + (("/usr/share/XaoS") + (string-append out "/share/XaoS"))) + (invoke "qmake")))) + (add-after 'install 'install-data + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share"))) + (mkdir-p share) + (for-each + (lambda (folder) + (copy-recursively folder + (string-append share "/XaoS/" folder))) + '("catalogs" "examples" "tutorial")) + (install-file "xdg/xaos.png" + (string-append share "/pixmaps")) + (install-file "xdg/io.github.xaos_project.XaoS.desktop" + (string-append share "/applications")))))))) (synopsis "Real-time fractal zoomer") (description "GNU XaoS is a graphical program that generates fractal patterns and allows you to zoom in and out of them infinitely in a fluid, diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index efe0b2a784..ffcfd13833 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -154,14 +154,14 @@ parsers to allow execution with Guile as extension languages."))) (define-public mes (package (name "mes") - (version "0.26.2") + (version "0.27") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mes/" "mes-" version ".tar.gz")) (sha256 (base32 - "120a7ljnyi9127inaarlqv6cl98cmk72s3gmyad7cjrwy6cvzf1g")))) + "1a5ag8i303yhf76sg05rpcans9vadvnpxcpa4sl09z4cv5bfcgh3")))) (supported-systems '("armhf-linux" "i686-linux" "x86_64-linux" "riscv64-linux")) (propagated-inputs (list mescc-tools nyacc-1.00.2)) @@ -257,7 +257,7 @@ get_machine.") (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux" "aarch64-linux" - "riscv32-linux" "riscv64-linux")) + "riscv64-linux")) (arguments `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) ,(string-append "CC=" (cc-for-target))) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 9ba83c0712..c097c16a97 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -117,6 +117,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) #:use-module (gnu packages nss) + #:use-module (gnu packages password-utils) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages photo) @@ -1091,14 +1092,14 @@ control of your private keys, no previous conversation is compromised.") (define-public znc (package (name "znc") - (version "1.8.2") + (version "1.9.1") (source (origin (method url-fetch) (uri (string-append "https://znc.in/releases/archive/znc-" version ".tar.gz")) (sha256 (base32 - "03fyi0j44zcanj1rsdx93hkdskwfvhbywjiwd17f9q1a7yp8l8zz")))) + "0g2gi7207lydmm7zdq52ivw0vhvbnmhsybi89q5m3bcsw60cz9z8")))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -1114,15 +1115,16 @@ control of your private keys, no previous conversation is compromised.") (let ((source (assoc-ref inputs "googletest-source")) (target "third_party/googletest")) (mkdir-p target) - (copy-recursively source target) - #t)))))) + (copy-recursively source target))))))) (native-inputs `(("boost" ,boost) ("gettext" ,gettext-minimal) ("googletest-source" ,(package-source googletest)) ("pkg-config" ,pkg-config))) (inputs - (list cyrus-sasl + ;; FIXME: Package cctz and remove the bundled copy from the source tarball. + (list argon2 + cyrus-sasl icu4c openssl perl @@ -1499,7 +1501,7 @@ default.") qtbase-5 qtdeclarative-5 qtgraphicaleffects - qtlocation + qtlocation-5 qtquickcontrols2-5 qtsvg-5 qtmultimedia-5 @@ -3304,7 +3306,6 @@ designed for experienced users.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/42wim/matterbridge")) (synopsis "Bridge together various messaging networks and protocols") (description diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index 0ac6f0e767..ea579d4043 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Carl Dong <contact@carldong.me> ;;; Copyright © 2021 Léo Le Bouter <lle-bout@zaclys.net> +;;; Copyright © 2024 Foundation Devices, Inc. <hello@foundation.xyz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,15 +25,17 @@ #:use-module (gnu packages) #:use-module (gnu packages cross-base) #:use-module (guix build-system gnu) + #:use-module (guix gexp) + #:use-module (guix memoization) #:use-module (guix packages) #:use-module (guix download) #:export (make-mingw-w64)) -(define* (make-mingw-w64 machine - #:key - xgcc - xbinutils - with-winpthreads?) +(define* (make-mingw-w64/implementation machine + #:key + xgcc + xbinutils + with-winpthreads?) "Return a mingw-w64 for targeting MACHINE. If XGCC or XBINUTILS is specified, use that gcc or binutils when cross-compiling. If WITH-WINPTHREADS? is specified, recurse and return a mingw-w64 with support for winpthreads." @@ -40,7 +43,7 @@ specified, recurse and return a mingw-w64 with support for winpthreads." (package (name (string-append "mingw-w64" "-" machine (if with-winpthreads? "-winpthreads" ""))) - (version "11.0.1") + (version "12.0.0") (source (origin (method url-fetch) @@ -48,11 +51,7 @@ specified, recurse and return a mingw-w64 with support for winpthreads." "mirror://sourceforge/mingw-w64/mingw-w64/" "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) (sha256 - (base32 "047f4m37kxf7g8qj23qplrzfd9cirfkkv8d175sfv2zfd7hbqriz")) - (patches - (search-patches "mingw-w64-6.0.0-gcc.patch" - "mingw-w64-dlltool-temp-prefix.patch" - "mingw-w64-reproducible-gendef.patch")))) + (base32 "0bzdprdrb8jy5dhkl2j2yhnr2nsiv6wk2wzxrzaqsvjbmj58jhfc")))) (native-inputs `(("xgcc-core" ,(if xgcc xgcc (cross-gcc triplet))) ("xbinutils" ,(if xbinutils xbinutils (cross-binutils triplet))) @@ -74,37 +73,48 @@ specified, recurse and return a mingw-w64 with support for winpthreads." ,(string-append triplet "/lib") ,(string-append triplet "/lib64")))))) (arguments - `(#:configure-flags '(,(string-append "--host=" triplet) - ,@(if with-winpthreads? - '("--with-libraries=winpthreads") - '())) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'setenv - (lambda* (#:key inputs #:allow-other-keys) - (let ((xgcc-core (assoc-ref inputs "xgcc-core")) - (mingw-headers (string-append - (getcwd) "/mingw-w64-headers"))) - (setenv "CPP" - (string-append - xgcc-core ,(string-append "/bin/" triplet "-cpp"))) - (setenv "CROSS_C_INCLUDE_PATH" - (string-append - mingw-headers - ":" mingw-headers "/include" - ":" mingw-headers "/crt" - ":" mingw-headers "/defaults/include" - ":" mingw-headers "/direct-x/include")) - (when ,with-winpthreads? - (let ((xlibc (assoc-ref inputs "xlibc"))) - (setenv "CROSS_LIBRARY_PATH" - (string-append - xlibc "/lib" ":" - xlibc "/" ,triplet "/lib")))))))) - #:make-flags (list "DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1") - #:parallel-build? #f ; parallel builds often fail with empty .a files - #:tests? #f ; compiles and includes glibc headers - #:strip-binaries? #f)) + (list #:parallel-build? #f ; parallel builds often fail with empty .a files + #:tests? #f ; compiles and includes glibc headers + #:strip-binaries? #f + #:configure-flags + #~(list #$(string-append "--host=" triplet) + #$@(if with-winpthreads? + #~("--with-libraries=winpthreads") + #~()) + ;; The default msvcrt changed on 12.0.0 to use UCRT as the + ;; default, this could cause problems with programs expecting + ;; MSVCRT as the default. + ;; + ;; XXX: A new target to use UCRT can be introduced as + ;; the MSYS2 project does, e.g: x86_64-w64-ucrt-mingw32. + "--with-default-msvcrt=msvcrt") + #:make-flags #~'("DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1") + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'setenv + (lambda _ + (let ((xgcc-core #+(this-package-native-input + "xgcc-core")) + (mingw-headers (string-append + (getcwd) "/mingw-w64-headers"))) + (setenv "CPP" + (string-append + xgcc-core "/bin/" #$triplet "-cpp")) + (setenv "CROSS_C_INCLUDE_PATH" + (string-append + mingw-headers + ":" mingw-headers "/include" + ":" mingw-headers "/crt" + ":" mingw-headers "/defaults/include" + ":" mingw-headers "/direct-x/include")) + #$@(if with-winpthreads? + #~((let ((xlibc #+(this-package-native-input + "xlibc"))) + (setenv "CROSS_LIBRARY_PATH" + (string-append + xlibc "/lib" ":" + xlibc "/" #$triplet "/lib")))) + #~()))))))) (home-page "https://mingw-w64.org") (synopsis "Minimalist GNU for Windows") (description @@ -119,6 +129,9 @@ Mingw-w64 is an advancement of the original mingw.org project and provides several new APIs such as DirectX and DDK, and 64-bit support.") (license license:fdl1.3+)))) +(define make-mingw-w64 + (memoize make-mingw-w64/implementation)) + (define-public mingw-w64-i686 (make-mingw-w64 "i686")) @@ -138,7 +151,7 @@ several new APIs such as DirectX and DDK, and 64-bit support.") (define-public mingw-w64-tools (package (name "mingw-w64-tools") - (version "11.0.1") + (version "12.0.0") (source (origin (method url-fetch) @@ -146,48 +159,44 @@ several new APIs such as DirectX and DDK, and 64-bit support.") "mirror://sourceforge/mingw-w64/mingw-w64/" "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) (sha256 - (base32 "047f4m37kxf7g8qj23qplrzfd9cirfkkv8d175sfv2zfd7hbqriz")))) + (base32 "0bzdprdrb8jy5dhkl2j2yhnr2nsiv6wk2wzxrzaqsvjbmj58jhfc")))) (build-system gnu-build-system) (arguments - `(#:modules ((guix build gnu-build-system) + (list + #:modules '((guix build gnu-build-system) (guix build utils) (srfi srfi-1)) - #:phases - (append - (modify-phases %standard-phases - (add-after 'unpack 'cd-gendef - (lambda _ - (chdir "mingw-w64-tools/gendef")))) - (modify-phases %standard-phases - (replace 'unpack - (lambda _ - (chdir "../genidl")))) - (modify-phases %standard-phases - (replace 'unpack - (lambda _ - (chdir "../genlib")))) - (modify-phases %standard-phases - (replace 'unpack - (lambda _ - (chdir "../genpeimg")))) - (append-map - (lambda (target) - (modify-phases %standard-phases - (replace 'unpack - (lambda _ - (chdir "../widl") - (false-if-exception - (delete-file-recursively "../build")) - #t)) - (replace 'configure - (lambda args - (apply (assoc-ref %standard-phases 'configure) - (append args (list #:out-of-source? #t - #:configure-flags - `("--target" ,target - "--program-prefix" - ,(string-append target "-"))))))))) - '("i686-w64-mingw32" "x86_64-w64-mingw32"))))) + #:phases + #~(append + (modify-phases %standard-phases + (add-after 'unpack 'cd-gendef + (lambda _ + (chdir "mingw-w64-tools/gendef")))) + (modify-phases %standard-phases + (replace 'unpack + (lambda _ + (chdir "../genidl")))) + (modify-phases %standard-phases + (replace 'unpack + (lambda _ + (chdir "../genpeimg")))) + (append-map + (lambda (target) + (modify-phases %standard-phases + (replace 'unpack + (lambda _ + (chdir "../widl") + (false-if-exception + (delete-file-recursively "../build")))) + (replace 'configure + (lambda args + (apply (assoc-ref %standard-phases 'configure) + (append args (list #:out-of-source? #t + #:configure-flags + `("--target" ,target + "--program-prefix" + ,(string-append target "-"))))))))) + '("i686-w64-mingw32" "x86_64-w64-mingw32"))))) (home-page "https://mingw-w64.org") (synopsis "Tools of Minimalist GNU for Windows") (description "This package provides the tools of Minimalist GNU for diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 6270108b16..4c18da30ef 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -35,6 +35,7 @@ #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages fabric-management) #:use-module (gnu packages gcc) @@ -143,7 +144,7 @@ bind processes, and much more.") (define-public hwloc-2 (package (inherit hwloc-1) - (version "2.10.0") + (version "2.11.1") (source (origin (method url-fetch) (uri (string-append "https://download.open-mpi.org/release/hwloc/v" @@ -151,11 +152,12 @@ bind processes, and much more.") "/hwloc-" version ".tar.bz2")) (sha256 (base32 - "14hkmq2hrs4j5f0sf32aazgbhgbdvj7lwapy35jvwbyyr5hds183")))) + "1ikhg35pll9zs628n2nii3ranz9j850hykqqcrgy2p12mpzzpk84")))) - ;; libnuma is no longer needed. + (native-inputs (modify-inputs (package-native-inputs hwloc-1) + (append bash))) ;for completion tests (inputs (modify-inputs (package-inputs hwloc-1) - (delete "numactl"))) + (delete "numactl"))) ;libnuma is no longer needed. (arguments (substitute-keyword-arguments (package-arguments hwloc-1) ((#:phases phases) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index cb29fa5816..100a41f87b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5389,7 +5389,7 @@ includes LV2 plugins and a JACK standalone client.") (define-public musescore (package (name "musescore") - (version "4.2.1") + (version "4.3.2") (source (origin (method git-fetch) @@ -5398,7 +5398,7 @@ includes LV2 plugins and a JACK standalone client.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0rc5ma1k0cjllfl86apbyj61sh0691lsmqnvqicyn0zi53z8w9v0")) + (base32 "1hx0l6d7avyfbh88hwn01h9q51mgd9zix91q2kgg1ax73pqxhfs2")) (modules '((guix build utils))) (snippet '(begin @@ -5534,7 +5534,7 @@ studio.") (define-public gsequencer (package (name "gsequencer") - (version "6.5.2") + (version "6.16.8") (source (origin (method git-fetch) @@ -5543,7 +5543,7 @@ studio.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "16rkwb60v7igixligkcm86l8l8vab1bhmwg8m7ihb051ryqixa3i")))) + (base32 "1qp78j6gicm4ixkx5ihn2lilw3a2863y05zvw8w5gigyc2zmbqpp")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases @@ -6127,8 +6127,8 @@ console music players.") (license license:gpl3+))) (define-public demlo - (let ((commit "fe9ec4c8ac2fa995ec18e6ac86d50d46df06ec01") - (revision "0")) + (let ((commit "985f81047a67c795e67f628b550064558476a7c3") + (revision "1")) (package (name "demlo") (version (git-version "3.8" revision commit)) @@ -6142,7 +6142,7 @@ console music players.") (file-name (git-file-name name version)) (sha256 (base32 - "1afkbqhzn6da7zaf5ab7dvyqj1izqhzprwfb4hw448fllda9bdvk")))) + "1wx7pwgvg1fiq55jdc22353frcdlz548g97dy4j353lqxy8vxfyj")))) (build-system go-build-system) (native-inputs (list lua @@ -6157,7 +6157,8 @@ console music players.") (inputs (list chromaprint ffmpeg)) (arguments - `(#:import-path "gitlab.com/ambrevar/demlo" + `(#:go ,go-1.17 + #:import-path "gitlab.com/ambrevar/demlo" #:phases (modify-phases %standard-phases (add-after 'install 'wrap-program diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index 7b93dab9f6..f68b682fbb 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2022, 2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2022-2024 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,14 +36,14 @@ ;; yet, so we'll keep both for just a little longer. (package (name "ncdu") - (version "1.19") + (version "1.20") (source (origin (method url-fetch) (uri (string-append "https://dev.yorhel.nl/download/ncdu-" version ".tar.gz")) (sha256 (base32 - "0zdidd4rhik5j0qdrdg1yh9094jlw496q07vqx90gphc30ck0dih")))) + "0wlmpq8gzcl1fim8jba3g0q0bbn4jcrbkns2n95kfwmy3a2bpqjz")))) (build-system gnu-build-system) (inputs (list ncurses)) (synopsis "Ncurses-based disk usage analyzer") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c94f772b74..a68d64ab8d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1002,7 +1002,7 @@ tasks.") (build-system qt-build-system) (arguments (list #:tests? #f)) ;There are no tests upstream - (inputs (list qtbase-5 networkmanager-qt)) + (inputs (list qtbase-5 networkmanager-qt5)) (native-inputs (list qttools-5 pkg-config)) (synopsis "NetworkManager front-end with information icon residing in system tray") @@ -4627,7 +4627,6 @@ QUIC protocol.") ;; TODO: figure out how tests are run #:tests? #f #:install-source? #f - #:go go-1.21 #:phases #~(modify-phases %standard-phases (replace 'build @@ -4722,7 +4721,6 @@ IPv6 Internet connectivity - it also works over IPv4.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "github.com/slackhq/nebula" #:install-source? #f #:phases @@ -4828,8 +4826,7 @@ on hub/switched networks. It is based on @acronym{ARP} packets, it will send "1kbcr6580a9pi0a3wssnfr3mnxqq2k9w1fg4khikn82lqaljab2f")))) (build-system go-build-system) (arguments - (list #:go go-1.21 - #:install-source? #f + (list #:install-source? #f #:import-path "github.com/macronut/phantomsocks" #:build-flags #~'("-tags" #$(if (target-linux?) "rawsocket" diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 40747686c4..1b5d5e8b3f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -178,8 +178,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.4.0") - (commit "1a34b9b725e731a6d5f602d104f09a1c68afa6a4") - (revision 22)) + (commit "843b85c42745d65c93d6af81cd3a9d835ff1f51c") + (revision 23)) (package (name "guix") @@ -195,7 +195,7 @@ (commit commit))) (sha256 (base32 - "0fz7n9pl0g3cw3zvx9m5c51ly5m9ga71v85mf4jqp7x8j5g21lhy")) + "080idxx8i0dkwsvbx3yw20fs16v0vfzc7vc30zbvc96nvw36ryqb")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 7bd2834e13..a16a0d8689 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2020 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2015-2018, 2020-2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015-2018, 2020-2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl> ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2016, 2020, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net> @@ -554,7 +554,7 @@ obtain information about the CPU being used: supported instruction set, processor name, cache information, and topology information.") ;; On aarch64-linux, there is a bug reported upstream: ;; https://github.com/pytorch/cpuinfo/issues/14 - (supported-systems '("armv7-linux" "i686-linux" "x86_64-linux")) + (supported-systems '("armhf-linux" "i686-linux" "x86_64-linux")) (license license:bsd-2)))) (define-public clog diff --git a/gnu/packages/patches/appstream-force-reload-stemmer.patch b/gnu/packages/patches/appstream-force-reload-stemmer.patch deleted file mode 100644 index a2cf84c8b1..0000000000 --- a/gnu/packages/patches/appstream-force-reload-stemmer.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 32182d7a7a67d0d204cd0a37bd211bfd0177bc27 Mon Sep 17 00:00:00 2001 -Message-ID: <32182d7a7a67d0d204cd0a37bd211bfd0177bc27.1700093066.git.vivien@planete-kraus.eu> -From: Matthias Klumpp <matthias@tenstral.net> -Date: Thu, 16 Nov 2023 00:59:15 +0100 -Subject: [PATCH] stemmer: Resolve potential issue where stemmer may never be - initialized - -If the initial locale was equal to the current stemming language, we may -never have initialized the stemmer (which could lead to crashes or -stemming being disabled). - -So we force the reload to always happen on initialization. -CC: #558 ---- - src/as-stemmer.c | 33 +++++++++++++++++++++------------ - 1 file changed, 21 insertions(+), 12 deletions(-) - -diff --git a/src/as-stemmer.c b/src/as-stemmer.c -index 63d45267..16ebd09b 100644 ---- a/src/as-stemmer.c -+++ b/src/as-stemmer.c -@@ -47,6 +47,8 @@ G_DEFINE_TYPE (AsStemmer, as_stemmer, G_TYPE_OBJECT) - - static gpointer as_stemmer_object = NULL; - -+static void as_stemmer_reload_internal (AsStemmer *stemmer, const gchar *locale, gboolean force); -+ - /** - * as_stemmer_finalize: - **/ -@@ -76,21 +78,14 @@ as_stemmer_init (AsStemmer *stemmer) - - /* we don't use the locale in XML, so it can be POSIX */ - locale = as_get_current_locale_posix (); -- stemmer->current_lang = as_utils_locale_to_language (locale); - -- as_stemmer_reload (stemmer, stemmer->current_lang); -+ /* force a reload for initialization */ -+ as_stemmer_reload_internal (stemmer, locale, TRUE); - #endif - } - --/** -- * as_stemmer_reload: -- * @stemmer: A #AsStemmer -- * @locale: The stemming language as POSIX locale. -- * -- * Allows realoading the #AsStemmer with a different language. -- */ --void --as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) -+static void -+as_stemmer_reload_internal (AsStemmer *stemmer, const gchar *locale, gboolean force) - { - #ifdef HAVE_STEMMING - g_autofree gchar *lang = NULL; -@@ -99,7 +94,7 @@ as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) - /* check if we need to reload */ - lang = as_utils_locale_to_language (locale); - locker = g_mutex_locker_new (&stemmer->mutex); -- if (as_str_equal0 (lang, stemmer->current_lang)) { -+ if (!force && as_str_equal0 (lang, stemmer->current_lang)) { - g_mutex_locker_free (locker); - return; - } -@@ -119,6 +114,20 @@ as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) - #endif - } - -+/** -+ * as_stemmer_reload: -+ * @stemmer: A #AsStemmer -+ * @locale: The stemming language as POSIX locale. -+ * -+ * Allows realoading the #AsStemmer with a different language. -+ * Does nothing if the stemmer is already using the selected language. -+ */ -+void -+as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) -+{ -+ as_stemmer_reload_internal (stemmer, locale, FALSE); -+} -+ - /** - * as_stemmer_stem: - * @stemmer: A #AsStemmer --- -2.41.0 - diff --git a/gnu/packages/patches/ark-skip-xar-test.patch b/gnu/packages/patches/ark-skip-xar-test.patch index 525201997b..be891ad139 100644 --- a/gnu/packages/patches/ark-skip-xar-test.patch +++ b/gnu/packages/patches/ark-skip-xar-test.patch @@ -1,44 +1,36 @@ Guix libarchive no support xar. ---- ark-20.04.1.orig/autotests/kerfuffle/loadtest.cpp 2020-12-23 08:46:15.780782601 +0800 -+++ ark-20.04.1/autotests/kerfuffle/loadtest.cpp 2020-12-23 11:13:17.101724042 +0800 -@@ -181,13 +181,6 @@ +--- ark-24.05.2.orig/autotests/kerfuffle/loadtest.cpp 2024-07-08 11:19:30.347366493 +0800 ++++ ark-24.05.2/autotests/kerfuffle/loadtest.cpp 2024-07-08 11:19:47.495641516 +0800 +@@ -125,8 +125,6 @@ qDebug() << "lz4 executable not found in path. Skipping lz4 test."; } -- QTest::newRow("xar archive") -- << QFINDTESTDATA("data/simplearchive.xar") -- << QStringLiteral("simplearchive") -- << true << false << false << false << false << 0 << Archive::Unencrypted -- << QStringLiteral("simplearchive") -- << QString(); -- - QTest::newRow("mimetype child of application/zip") - << QFINDTESTDATA("data/test.odt") - << QStringLiteral("test") ---- ark-20.04.1.orig/autotests/kerfuffle/extracttest.cpp 2020-12-23 08:46:15.780782601 +0800 -+++ ark-20.04.1/autotests/kerfuffle/extracttest.cpp 2020-12-23 11:14:02.801809620 +0800 -@@ -350,23 +350,6 @@ +- QTest::newRow("xar archive") << QFINDTESTDATA("data/simplearchive.xar") << QStringLiteral("simplearchive") << true << false << false << false << false << 0 +- << Archive::Unencrypted << 6 << QStringLiteral("simplearchive") << QString(); + + QTest::newRow("mimetype child of application/zip") << QFINDTESTDATA("data/test.odt") << QStringLiteral("test") << false << true << false << false << false + << 0 << Archive::Unencrypted << 17 << QStringLiteral("test") << QString(); + + +--- ark-24.05.2.orig/autotests/kerfuffle/extracttest.cpp 2024-07-08 11:21:25.849219202 +0800 ++++ ark-24.05.2/autotests/kerfuffle/extracttest.cpp 2024-07-08 11:22:01.413789814 +0800 +@@ -329,18 +329,5 @@ qDebug() << "lz4 executable not found in path. Skipping lz4 test."; } - archivePath = QFINDTESTDATA("data/simplearchive.xar"); -- QTest::newRow("extract selected entries from a xar archive without path") -- << archivePath -- << QVector<Archive::Entry*> { -- new Archive::Entry(this, QStringLiteral("dir1/file11.txt"), QString()), -- new Archive::Entry(this, QStringLiteral("file4.txt"), QString()) -- } -- << optionsNoPaths -- << 2; +- setupRow("extract selected entries from a xar archive without path", +- archivePath, +- QList<Archive::Entry *>{ +- new Archive::Entry(this, QStringLiteral("dir1/file11.txt"), QString()), +- new Archive::Entry(this, QStringLiteral("file4.txt"), QString()), +- }, +- optionsNoPaths, +- 2); - - archivePath = QFINDTESTDATA("data/simplearchive.xar"); -- QTest::newRow("extract all entries from a xar archive with path") -- << archivePath -- << QVector<Archive::Entry*>() -- << optionsPreservePaths -- << 6; +- setupRow("extract all entries from a xar archive with path", archivePath, QList<Archive::Entry *>(), optionsPreservePaths, 6); - archivePath = QFINDTESTDATA("data/hello-1.0-x86_64.AppImage"); - QTest::newRow("extract all entries from an AppImage with path") - << archivePath + setupRow("extract all entries from an AppImage with path", archivePath, QList<Archive::Entry *>(), optionsPreservePaths, 7); diff --git a/gnu/packages/patches/capstone-fix-python-constants.patch b/gnu/packages/patches/capstone-fix-python-constants.patch new file mode 100644 index 0000000000..75100c6652 --- /dev/null +++ b/gnu/packages/patches/capstone-fix-python-constants.patch @@ -0,0 +1,84 @@ +Backport upstream patch fixing various constants in the Python bindings. + +Taken from: https://github.com/capstone-engine/capstone/commit/f180e176de3efb060db62820ff981d0291ea8525 + +diff --git a/bindings/python/capstone/__init__.py b/bindings/python/capstone/__init__.py +index bda2fdb6..52353c28 100755 +--- a/bindings/python/capstone/__init__.py ++++ b/bindings/python/capstone/__init__.py +@@ -113,7 +113,6 @@ __all__ = [ + 'CS_OPT_SYNTAX_NOREGNAME', + 'CS_OPT_SYNTAX_MASM', + 'CS_OPT_SYNTAX_MOTOROLA', +- 'CS_OPT_SYNTAX_CS_REG_ALIAS', + + 'CS_OPT_DETAIL', + 'CS_OPT_MODE', +@@ -152,19 +151,6 @@ __all__ = [ + 'CS_OP_REG', + 'CS_OP_IMM', + 'CS_OP_FP', +- 'CS_OP_PRED', +- 'CS_OP_RESERVED_5', +- 'CS_OP_RESERVED_6', +- 'CS_OP_RESERVED_7', +- 'CS_OP_RESERVED_8', +- 'CS_OP_RESERVED_9', +- 'CS_OP_RESERVED_10', +- 'CS_OP_RESERVED_11', +- 'CS_OP_RESERVED_12', +- 'CS_OP_RESERVED_13', +- 'CS_OP_RESERVED_14', +- 'CS_OP_RESERVED_15', +- 'CS_OP_SPECIAL', + 'CS_OP_MEM', + + 'CS_GRP_INVALID', +@@ -298,26 +284,13 @@ CS_OPT_NO_BRANCH_OFFSET = 9 # ARM, prints branch immediates without offset. + + # Capstone option value + CS_OPT_OFF = 0 # Turn OFF an option - default option of CS_OPT_DETAIL +-CS_OPT_ON = 1 << 0 # Turn ON an option (CS_OPT_DETAIL) ++CS_OPT_ON = 3 # Turn ON an option (CS_OPT_DETAIL) + + # Common instruction operand types - to be consistent across all architectures. + CS_OP_INVALID = 0 # uninitialized/invalid operand. + CS_OP_REG = 1 # Register operand. + CS_OP_IMM = 2 # Immediate operand. + CS_OP_FP = 3 # Floating-Point operand. +-CS_OP_PRED = 4 # Predicate operand. +-CS_OP_RESERVED_5 = 5 +-CS_OP_RESERVED_6 = 6 +-CS_OP_RESERVED_7 = 7 +-CS_OP_RESERVED_8 = 8 +-CS_OP_RESERVED_9 = 9 +-CS_OP_RESERVED_10 = 10 +-CS_OP_RESERVED_11 = 11 +-CS_OP_RESERVED_12 = 12 +-CS_OP_RESERVED_13 = 13 +-CS_OP_RESERVED_14 = 14 +-CS_OP_RESERVED_15 = 15 +-CS_OP_SPECIAL = 0x10 # Special operands from archs + CS_OP_MEM = 0x80 # Memory operand. Can be ORed with another operand type. + + # Common instruction groups - to be consistent across all architectures. +@@ -336,13 +309,12 @@ CS_AC_READ = (1 << 0) # Operand that is read from. + CS_AC_WRITE = (1 << 1) # Operand that is written to. + + # Capstone syntax value +-CS_OPT_SYNTAX_DEFAULT = 1 << 1 # Default assembly syntax of all platforms (CS_OPT_SYNTAX) +-CS_OPT_SYNTAX_INTEL = 1 << 2 # Intel X86 asm syntax - default syntax on X86 (CS_OPT_SYNTAX, CS_ARCH_X86) +-CS_OPT_SYNTAX_ATT = 1 << 3 # ATT asm syntax (CS_OPT_SYNTAX, CS_ARCH_X86) +-CS_OPT_SYNTAX_NOREGNAME = 1 << 4 # Asm syntax prints register name with only number - (CS_OPT_SYNTAX, CS_ARCH_PPC, CS_ARCH_ARM) +-CS_OPT_SYNTAX_MASM = 1 << 5 # MASM syntax (CS_OPT_SYNTAX, CS_ARCH_X86) +-CS_OPT_SYNTAX_MOTOROLA = 1 << 6 # MOS65XX use $ as hex prefix +-CS_OPT_SYNTAX_CS_REG_ALIAS = 1 << 7 # Prints common register alias which are not defined in LLVM (ARM: r9 = sb etc.) ++CS_OPT_SYNTAX_DEFAULT = 0 # Default assembly syntax of all platforms (CS_OPT_SYNTAX) ++CS_OPT_SYNTAX_INTEL = 1 # Intel X86 asm syntax - default syntax on X86 (CS_OPT_SYNTAX, CS_ARCH_X86) ++CS_OPT_SYNTAX_ATT = 2 # ATT asm syntax (CS_OPT_SYNTAX, CS_ARCH_X86) ++CS_OPT_SYNTAX_NOREGNAME = 3 # Asm syntax prints register name with only number - (CS_OPT_SYNTAX, CS_ARCH_PPC, CS_ARCH_ARM) ++CS_OPT_SYNTAX_MASM = 4 # MASM syntax (CS_OPT_SYNTAX, CS_ARCH_X86) ++CS_OPT_SYNTAX_MOTOROLA = 5 # MOS65XX use $ as hex prefix + + # Capstone error type + CS_ERR_OK = 0 # No error: everything was fine diff --git a/gnu/packages/patches/chez-scheme-backport-signal.patch b/gnu/packages/patches/chez-scheme-backport-signal.patch new file mode 100644 index 0000000000..1fee32b167 --- /dev/null +++ b/gnu/packages/patches/chez-scheme-backport-signal.patch @@ -0,0 +1,87 @@ +From e416651d8b53fa2eca6edde764a9131d128cd166 Mon Sep 17 00:00:00 2001 +From: Matthew Flatt <mflatt@racket-lang.org> +Date: Sat, 2 Mar 2024 07:18:41 -0700 +Subject: [PATCH] constrain signal delivery to Scheme to the main thread (#813) + +The intent is to avoid crashes when a signal gets delimited to a +thread that might not even be a Scheme thread. Also, we don't try to +queue the event directly in the main thread's context, because then +we'd need more of a lock (while signal handling is otherwise an +implicit lock). + +(cherry picked from commit fc081fc447a786dd53286e5d7314b7217631cb68) +--- + +Notes: + This should fix intermittent test failures experienced by Guix: + see <https://github.com/cisco/ChezScheme/issues/809>. + + c/globals.h | 1 + + c/schsig.c | 10 ++++++++++ + c/thread.c | 1 + + csug/system.stex | 2 ++ + 4 files changed, 14 insertions(+) + +diff --git a/c/globals.h b/c/globals.h +index d2a08299..eb2965c5 100644 +--- a/c/globals.h ++++ b/c/globals.h +@@ -49,6 +49,7 @@ EXTERN int S_num_preserve_ownership_threads; + # ifdef IMPLICIT_ATOMIC_AS_EXPLICIT + EXTERN s_thread_mutex_t S_implicit_mutex; + # endif ++EXTERN s_thread_t S_main_thread_id; + #endif + + /* segment.c */ +diff --git a/c/schsig.c b/c/schsig.c +index a89ab62a..04677730 100644 +--- a/c/schsig.c ++++ b/c/schsig.c +@@ -666,6 +666,16 @@ ptr S_dequeue_scheme_signals(ptr tc) { + static void forward_signal_to_scheme(INT sig) { + ptr tc = get_thread_context(); + ++#ifdef PTHREADS ++ /* deliver signals to the main thread, only; depending ++ on the threads that are running, `tc` might even be NULL */ ++ if (tc != TO_PTR(&S_G.thread_context)) { ++ pthread_kill(S_main_thread_id, sig); ++ RESET_SIGNAL ++ return; ++ } ++#endif ++ + if (enqueue_scheme_signal(tc, sig)) { + SIGNALINTERRUPTPENDING(tc) = Strue; + SOMETHINGPENDING(tc) = Strue; +diff --git a/c/thread.c b/c/thread.c +index 9a341b22..f130f44d 100644 +--- a/c/thread.c ++++ b/c/thread.c +@@ -40,6 +40,7 @@ void S_thread_init(void) { + s_thread_cond_init(&S_terminated_cond); + S_alloc_mutex.owner = 0; + S_alloc_mutex.count = 0; ++ S_main_thread_id = s_thread_self(); + + # ifdef IMPLICIT_ATOMIC_AS_EXPLICIT + s_thread_mutex_init(&S_implicit_mutex); +diff --git a/csug/system.stex b/csug/system.stex +index d4f2bcbb..bb89f419 100644 +--- a/csug/system.stex ++++ b/csug/system.stex +@@ -547,6 +547,8 @@ After a signal handler for a given signal has been registered, receipt + of the specified signal results in a call to the handler. + The handler is passed the signal number, allowing the same handler to + be used for different signals while differentiating among them. ++In a threaded version of the system, signals are always delivered to ++the main thread. + + Signals handled in this fashion are treated like keyboard interrupts in + that the handler is not called immediately when the signal is delivered + +base-commit: 253230f7dfbb4fe777277d6bbf93f39f9567f086 +-- +2.41.0 + diff --git a/gnu/packages/patches/clasp-hide-event-ids.patch b/gnu/packages/patches/clasp-hide-event-ids.patch new file mode 100644 index 0000000000..9587f9ff3f --- /dev/null +++ b/gnu/packages/patches/clasp-hide-event-ids.patch @@ -0,0 +1,41 @@ +From a4c4e4f3c410834c3e56f644841f5bcbb084225c Mon Sep 17 00:00:00 2001 +From: Liliana Marie Prikler <liliana.prikler@ist.tugraz.at> +Date: Fri, 28 Jun 2024 11:15:16 +0200 +Subject: [PATCH] clasp: Hide Event_t<T>::id_s. + +This patch helps build clingo with non-local clasp while keeping the +event system working as intended. +--- + clasp/util/misc_types.h | 2 ++ + src/CMakeLists.txt | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/clasp/util/misc_types.h b/clasp/util/misc_types.h +index 3677873..09c2075 100644 +--- a/clasp/util/misc_types.h ++++ b/clasp/util/misc_types.h +@@ -432,7 +432,9 @@ struct Event_t : Event { + Event_t(Subsystem sys, Verbosity verb) : Event(sys, id_s, verb) {} + static const uint32 id_s; + }; ++#if _BUILDING_CLASP_ + template <class T> const uint32 Event_t<T>::id_s = Event::nextId(); ++#endif + + template <class ToType, class EvType> const ToType* event_cast(const EvType& ev) { return ev.id == ToType::id_s ? static_cast<const ToType*>(&ev) : 0; } + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 8439d12..4f55990 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -123,6 +123,7 @@ source_group("${ide_header}\\mt" FILES ${header_mt}) + endif() + + add_library(libclasp ${header} ${header_util} ${header_cli} ${header_mt} ${src}) ++target_compile_definitions(libclasp PRIVATE _BUILDING_CLASP_) + if (CLASP_BUILD_WITH_THREADS) + target_link_libraries(libclasp PUBLIC Threads::Threads) + target_compile_options(libclasp PRIVATE +-- +2.45.1 + diff --git a/gnu/packages/patches/freeimage-libraw-0.21-compat.patch b/gnu/packages/patches/freeimage-libraw-0.21-compat.patch new file mode 100644 index 0000000000..b7eb7a4035 --- /dev/null +++ b/gnu/packages/patches/freeimage-libraw-0.21-compat.patch @@ -0,0 +1,15 @@ +from https://gitlab.archlinux.org/archlinux/packaging/packages/freeimage/-/blob/69548d01896b32f30937a71220a9133055d84705/freeimage-libraw-0.21.patch + +diff -ru FreeImage.orig/Source/FreeImage/PluginRAW.cpp FreeImage/Source/FreeImage/PluginRAW.cpp +--- FreeImage.orig/Source/FreeImage/PluginRAW.cpp 2022-12-18 21:57:11.447801357 +0100 ++++ FreeImage/Source/FreeImage/PluginRAW.cpp 2022-12-18 21:58:05.103433138 +0100 +@@ -687,7 +687,7 @@ + // -------------------------------------------- + + // (-s [0..N-1]) Select one raw image from input file +- RawProcessor->imgdata.params.shot_select = 0; ++ RawProcessor->imgdata.rawparams.shot_select = 0; + // (-w) Use camera white balance, if possible (otherwise, fallback to auto_wb) + RawProcessor->imgdata.params.use_camera_wb = 1; + // (-M) Use any color matrix from the camera metadata. This option only affects Olympus, Leaf, and Phase One cameras. + diff --git a/gnu/packages/patches/gwenview-kimageannotator.patch b/gnu/packages/patches/gwenview-kimageannotator.patch deleted file mode 100644 index 92b994a0b5..0000000000 --- a/gnu/packages/patches/gwenview-kimageannotator.patch +++ /dev/null @@ -1,29 +0,0 @@ -Submitted By: Douglas R. Reno <renodr at linuxfromscratch dot org> -Date: 2024-02-26 -Initial Package Version: 23.08.5 -Upstream Status: Rejected (Qt6 port is primary now) -Origin: Self -Description: Fixes building Gwenview with recent kImageAnnotator - and kColorPicker versions by adjusting their paths - and FOUND variables so that the correct libraries are - selected. - ---- gwenview-23.08.5.orig/CMakeLists.txt 2024-02-26 15:02:29.702754535 -0600 -+++ gwenview-23.08.5/CMakeLists.txt 2024-02-26 15:09:48.012866877 -0600 -@@ -166,11 +166,11 @@ if(NOT WITHOUT_X11) - endif() - - if (QT_MAJOR_VERSION STREQUAL "5") -- find_package(kImageAnnotator) -- set_package_properties(kImageAnnotator PROPERTIES URL "https://github.com/ksnip/kImageAnnotator" DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE REQUIRED) -- if(kImageAnnotator_FOUND) -- set(KIMAGEANNOTATOR_FOUND 1) -- find_package(kColorPicker REQUIRED) -+ find_package(kImageAnnotator-Qt5) -+ set_package_properties(kImageAnnotator-Qt5 PROPERTIES URL "https://github.com/ksnip/kImageAnnotator" DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE REQUIRED) -+ if(kImageAnnotator-Qt5_FOUND) -+ set(kImageAnnotator_FOUND 1) -+ find_package(kColorPicker-Qt5 REQUIRED) - if(NOT kImageAnnotator_VERSION VERSION_LESS 0.5.0) - set(KIMAGEANNOTATOR_CAN_LOAD_TRANSLATIONS 1) - endif() diff --git a/gnu/packages/patches/kdiagram-Fix-missing-link-libraries.patch b/gnu/packages/patches/kdiagram-Fix-missing-link-libraries.patch index cdfb608d9b..11116fe51a 100644 --- a/gnu/packages/patches/kdiagram-Fix-missing-link-libraries.patch +++ b/gnu/packages/patches/kdiagram-Fix-missing-link-libraries.patch @@ -16,8 +16,8 @@ index be2a6fc..b13befb 100644 @@ -1,3 +1,3 @@ add_executable(BarsSimple main.cpp) --target_link_libraries(BarsSimple KChart Qt5::Widgets) -+target_link_libraries(BarsSimple KChart Qt5::Widgets Qt5::Svg) +-target_link_libraries(BarsSimple KChart6 Qt::Widgets) ++target_link_libraries(BarsSimple KChart6 Qt::Widgets Qt::Svg) -- 2.21.1 diff --git a/gnu/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch b/gnu/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch index 8f67553138..6256ff24e3 100644 --- a/gnu/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch +++ b/gnu/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch @@ -14,12 +14,11 @@ new file mode 100644 index 0000000..726065d --- /dev/null +++ b/src/guix_utils.h -@@ -0,0 +1,24 @@ +@@ -0,0 +1,23 @@ +#ifndef GUIX_UTILS_H +#define GUIX_UTILS_H + +// kwin -+#include <kwinglobals.h> + +namespace KWin +{ diff --git a/gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch b/gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch deleted file mode 100644 index ec4a34037d..0000000000 --- a/gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 46164a50de4102d02ae9d1d480acdd4b12303db8 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Wed, 14 Oct 2015 07:07:22 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - processui/scripting.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/processui/scripting.cpp b/processui/scripting.cpp -index efed8ff..841761a 100644 ---- a/processui/scripting.cpp -+++ b/processui/scripting.cpp -@@ -293,7 +293,7 @@ void Scripting::loadContextMenu() - const QStringList dirs = - QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("ksysguard/scripts/"), QStandardPaths::LocateDirectory); - for (const QString &dir : dirs) { -- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - scripts.append(it.next()); - } --- -2.5.2 diff --git a/gnu/packages/patches/mingw-w64-6.0.0-gcc.patch b/gnu/packages/patches/mingw-w64-6.0.0-gcc.patch deleted file mode 100644 index 036cf79f91..0000000000 --- a/gnu/packages/patches/mingw-w64-6.0.0-gcc.patch +++ /dev/null @@ -1,65 +0,0 @@ -This patch includes - - * mingw-w64-headers/include/winnt.h: compile fixes for1 gcc-4.9.3 - * mingw-w64-headers/crt/math.h: Likewise - * mingw-w64-headers/crt/float.h (FLT_EPSILON,DBL_EPSILON,LDBL_EPSILON): Add - symbols. - * mingw-w64-headers/crt/stat.h (S_ISLNK,S_ISSOCK,S_ISUID,S_ISGID,S_ISLINK): - Add symbols. - (lstat): Add function. - * mingw-w64-headers/crt/_mingw_stat64.h: Likewise - * mingw-w64-headers/crt/stdlib.h (realpath): Add function. - -Needed for building with gcc-4.9.3 and using with cross-libtool-2.4.6. - -Upstream status: not yet presented upstream. - -diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h -index 5874f4e..bdf4ead 100644 ---- a/mingw-w64-headers/crt/float.h -+++ b/mingw-w64-headers/crt/float.h -@@ -22,6 +22,15 @@ - #if (__GNUC__ < 4) - #error Corrupt install of gcc-s internal headers, or search order was changed. - #else -+ -+ /* From gcc-4.9.3 float.h. */ -+ #undef FLT_EPSILON -+ #undef DBL_EPSILON -+ #undef LDBL_EPSILON -+ #define FLT_EPSILON __FLT_EPSILON__ -+ #define DBL_EPSILON __DBL_EPSILON__ -+ #define LDBL_EPSILON __LDBL_EPSILON__ -+ - /* #include_next <float_ginclude.h> */ - - /* Number of decimal digits, q, such that any floating-point number with q -diff --git a/mingw-w64-headers/crt/math.h b/mingw-w64-headers/crt/math.h -index 1e970f4..99a332f 100644 ---- a/mingw-w64-headers/crt/math.h -+++ b/mingw-w64-headers/crt/math.h -@@ -216,6 +216,7 @@ extern "C" { - #endif - } - -+#if 0 - __CRT_INLINE long double __cdecl fabsl (long double x) - { - #ifdef __arm__ -@@ -226,6 +227,7 @@ extern "C" { - return res; - #endif - } -+#endif - - __CRT_INLINE double __cdecl fabs (double x) - { -@@ -905,7 +907,7 @@ __mingw_choose_expr ( \ - /* 7.12.7.3 */ - extern double __cdecl hypot (double, double) __MINGW_ATTRIB_DEPRECATED_MSVC2005; /* in libmoldname.a */ - extern float __cdecl hypotf (float x, float y); --#ifndef __CRT__NO_INLINE -+#if 0 //ndef __CRT__NO_INLINE - __CRT_INLINE float __cdecl hypotf (float x, float y) { return (float) hypot ((double)x, (double)y);} - #endif - extern long double __cdecl hypotl (long double, long double); diff --git a/gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch b/gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch deleted file mode 100644 index 432cafc162..0000000000 --- a/gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch +++ /dev/null @@ -1,26 +0,0 @@ -This following patch was originally found at the debian mingw-w64 team's -mingw-w64 repo located here: -https://salsa.debian.org/mingw-w64-team/mingw-w64.git - -Invoke the following in the aforementioned repo to see the original patch: - - $ git show 4974e2c:debian/patches/dlltool-temp-prefix.patch - -Description: Specify dlltool's temp prefix -Author: Stephen Kitt <steve@sk2.org> - -By default dlltool uses its pid for the object files it generates. -Enforcing its temp prefix allows the files it generates to be -reproducible. - ---- a/mingw-w64-crt/Makefile.am -+++ b/mingw-w64-crt/Makefile.am -@@ -36,7 +36,7 @@ - DTDEF32=$(GENLIB) $(DLLTOOLFLAGS32) $(AM_DLLTOOLFLAGS) - DTDEF64=$(GENLIB) $(DLLTOOLFLAGS64) $(AM_DLLTOOLFLAGS) - else -- AM_DLLTOOLFLAGS=-k --as=$(AS) --output-lib $@ -+ AM_DLLTOOLFLAGS=-k --as=$(AS) --output-lib $@ --temp-prefix $$(basename $@ .a) - DLLTOOLFLAGSARM32=-m arm - DLLTOOLFLAGSARM64=-m arm64 - DLLTOOLFLAGS32=--as-flags=--32 -m i386 diff --git a/gnu/packages/patches/mingw-w64-reproducible-gendef.patch b/gnu/packages/patches/mingw-w64-reproducible-gendef.patch deleted file mode 100644 index 8dbea54ce9..0000000000 --- a/gnu/packages/patches/mingw-w64-reproducible-gendef.patch +++ /dev/null @@ -1,33 +0,0 @@ -This following patch was originally found at the debian mingw-w64 team's -mingw-w64 repo located here: -https://salsa.debian.org/mingw-w64-team/mingw-w64.git - -Invoke the following in the aforementioned repo to see the original patch: - - $ git show 9a33f50:debian/patches/reproducible-build.patch - -Description: Drop __DATE__ from gendef and genlib -Author: Stephen Kitt <skitt@debian.org> - -This allows gendef and genlib to be built reproducibly. - ---- a/mingw-w64-tools/gendef/src/gendef.c -+++ b/mingw-w64-tools/gendef/src/gendef.c -@@ -196,7 +196,6 @@ - " By default, the output files are named after their DLL counterparts\n" - " gendef MYDLL.DLL Produces MYDLL.def\n" - " gendef - MYDLL.DLL Prints the exports to stdout\n"); -- fprintf (stderr, "\nBuilt on %s\n", __DATE__); - fprintf (stderr, "\nReport bugs to <mingw-w64-public@lists.sourceforge.net>\n"); - exit (0); - } ---- a/mingw-w64-tools/genlib/src/genlib.c -+++ b/mingw-w64-tools/genlib/src/genlib.c -@@ -123,7 +123,6 @@ - "Usage example:\n" - " By default, the output file is named after the DLL counterpart\n" - " genlib mydef.def Produces libmydll.a\n" --"\nBuilt on " __DATE__ "\n" - "\nReport bugs to <martellmalone@gmail.com>\n" - ; - diff --git a/gnu/packages/patches/python-angr-addition-type-error.patch b/gnu/packages/patches/python-angr-addition-type-error.patch new file mode 100644 index 0000000000..7301d8b505 --- /dev/null +++ b/gnu/packages/patches/python-angr-addition-type-error.patch @@ -0,0 +1,18 @@ +This fixes failures of the test_ln_gcc_O2 and other related tests +in the angr test suite. The patch has been proposed upstream. + +Taken form: https://github.com/angr/angr/pull/4443 + +diff --git a/angr/analyses/reassembler.py b/angr/analyses/reassembler.py +index 7a2399a60..b09b3a8cb 100644 +--- a/angr/analyses/reassembler.py ++++ b/angr/analyses/reassembler.py +@@ -730,7 +730,7 @@ class Instruction: + elif operand.type == capstone.CS_OP_MEM: + operand_offsets.append(capstone_instr.disp_offset) + else: +- operand_offsets.append(None) ++ operand_offsets.append(0) + + if self.addr is not None: + self._initialize(capstone_instr.operands, operand_offsets) diff --git a/gnu/packages/patches/python-angr-check-exec-deps.patch b/gnu/packages/patches/python-angr-check-exec-deps.patch new file mode 100644 index 0000000000..438f8ef183 --- /dev/null +++ b/gnu/packages/patches/python-angr-check-exec-deps.patch @@ -0,0 +1,93 @@ +The angr test suite performs analysis on several pre-compiled binaries +to ensure its binary analysis capabilities are working as intended. +Some of these binaries are also executed as part of the test suite to +test if the simulation engine provided by angr results in the same +output as native execution of the binary. + +For Guix, this files as the glibc shared objects cannot be found. +Additionally, we don't really want to execute pre-compiled binaries +on Guix, hence we disable those tests. + +diff --git a/tests/test_ctype_locale.py b/tests/test_ctype_locale.py +index 08cb89836..2b9233558 100644 +--- a/tests/test_ctype_locale.py ++++ b/tests/test_ctype_locale.py +@@ -14,7 +14,7 @@ test_location = os.path.dirname(os.path.abspath(__file__)) + + + class TestCtypeLocale(unittest.TestCase): +- @skip_if_not_linux ++ @unittest.skip("test executes pre-compiled binaries") + def test_ctype_b_loc(self): + """ + test_ctype_locale.test_ctype_b_loc +@@ -60,7 +60,7 @@ class TestCtypeLocale(unittest.TestCase): + output = subprocess.check_output(bin_path, shell=True) + assert result == output + +- @skip_if_not_linux ++ @unittest.skip("test executes pre-compiled binaries") + def test_ctype_tolower_loc(self): + """ + test_ctype_locale.test_ctype_tolower_loc +@@ -109,7 +109,7 @@ class TestCtypeLocale(unittest.TestCase): + output = subprocess.check_output(bin_path, shell=True) + assert result == output + +- @skip_if_not_linux ++ @unittest.skip("test executes pre-compiled binaries") + def test_ctype_toupper_loc(self): + """ + test_ctype_locale.test_ctype_toupper_loc +diff --git a/tests/test_signed_div.py b/tests/test_signed_div.py +index 59cb9b8d1..994ed9c65 100644 +--- a/tests/test_signed_div.py ++++ b/tests/test_signed_div.py +@@ -1,6 +1,7 @@ + import angr + import subprocess + import sys ++import pytest + + import logging + +@@ -13,7 +14,7 @@ import os + test_location = os.path.dirname(os.path.realpath(__file__)) + + +-@skipUnless(sys.platform.startswith("linux"), "linux only") ++@pytest.mark.skip(reason="test executes pre-compiled binaries") + def test_signed_div(): + test_bin = os.path.join(test_location, "..", "..", "binaries", "tests", "x86_64", "test_signed_div") + b = angr.Project(test_bin, auto_load_libs=False) +diff --git a/tests/test_sscanf.py b/tests/test_sscanf.py +index 29d2c8403..ea799b310 100644 +--- a/tests/test_sscanf.py ++++ b/tests/test_sscanf.py +@@ -1,3 +1,4 @@ ++import pytest + import angr + import subprocess + import sys +@@ -14,7 +15,7 @@ test_location = os.path.dirname(os.path.realpath(__file__)) + + + class TestSscanf(unittest.TestCase): +- @unittest.skipUnless(sys.platform.startswith("linux"), "linux only") ++ @unittest.skip("test executes pre-compiled binaries") + def test_sscanf(self): + test_bin = os.path.join(test_location, "..", "..", "binaries", "tests", "x86_64", "sscanf_test") + b = angr.Project(test_bin, auto_load_libs=False) +diff --git a/tests/test_strtol.py b/tests/test_strtol.py +index 6c29cab22..f36181407 100644 +--- a/tests/test_strtol.py ++++ b/tests/test_strtol.py +@@ -11,7 +11,7 @@ class TestStrtol(unittest.TestCase): + # pylint: disable=no-self-use + + @slow_test +- @unittest.skipUnless(sys.platform.startswith("linux"), "linux-only") ++ @unittest.skip("test executes pre-compiled binaries") + def test_strtol(self, threads=None): + test_bin = os.path.join(bin_location, "tests", "x86_64", "strtol_test") + # disabling auto_load_libs increases the execution time of the test case. diff --git a/gnu/packages/patches/python-pysmt-fix-pow-return-type.patch b/gnu/packages/patches/python-pysmt-fix-pow-return-type.patch new file mode 100644 index 0000000000..0ec2d41b3c --- /dev/null +++ b/gnu/packages/patches/python-pysmt-fix-pow-return-type.patch @@ -0,0 +1,258 @@ +Backport of an upstream patch which fixes a test failure with our +packaged version of the Z3 SMT solver. + +Taken from: https://github.com/pysmt/pysmt/commit/f522e8cd8f3e75ff85f5eae29b427e18a6701859 + +diff --git a/pysmt/formula.py b/pysmt/formula.py +index ea4b46c..6cb9cbf 100644 +--- a/pysmt/formula.py ++++ b/pysmt/formula.py +@@ -252,11 +252,7 @@ class FormulaManager(object): + + if base.is_constant(): + val = base.constant_value() ** exponent.constant_value() +- if base.is_constant(types.REAL): +- return self.Real(val) +- else: +- assert base.is_constant(types.INT) +- return self.Int(val) ++ return self.Real(val) + return self.create_node(node_type=op.POW, args=(base, exponent)) + + def Div(self, left, right): +diff --git a/pysmt/logics.py b/pysmt/logics.py +index ef88dd6..9dc45b1 100644 +--- a/pysmt/logics.py ++++ b/pysmt/logics.py +@@ -495,6 +495,12 @@ QF_NRA = Logic(name="QF_NRA", + real_arithmetic=True, + linear=False) + ++QF_NIRA = Logic(name="QF_NIRA", ++ description="""Quantifier-free integer and real arithmetic.""", ++ quantifier_free=True, ++ integer_arithmetic=True, ++ real_arithmetic=True, ++ linear=False) + + QF_RDL = Logic(name="QF_RDL", + description=\ +@@ -619,41 +625,41 @@ QF_AUFBVLIRA = Logic(name="QF_AUFBVLIRA", + AUTO = Logic(name="Auto", + description="Special logic used to indicate that the logic to be used depends on the formula.") + +-SMTLIB2_LOGICS = frozenset([ AUFLIA, +- AUFLIRA, +- AUFNIRA, +- ALIA, +- LRA, +- LIA, +- NIA, +- NRA, +- UFLRA, +- UFNIA, +- UFLIRA, +- QF_ABV, +- QF_AUFBV, +- QF_AUFLIA, +- QF_ALIA, +- QF_AX, +- QF_BV, +- QF_IDL, +- QF_LIA, +- QF_LRA, +- QF_NIA, +- QF_NRA, +- QF_RDL, +- QF_UF, +- QF_UFBV , +- QF_UFIDL, +- QF_UFLIA, +- QF_UFLRA, +- QF_UFNRA, +- QF_UFNIA, +- QF_UFLIRA, +- QF_SLIA +- ]) +- +-LOGICS = SMTLIB2_LOGICS | frozenset([ QF_BOOL, BOOL, QF_AUFBVLIRA]) ++SMTLIB2_LOGICS = frozenset([AUFLIA, ++ AUFLIRA, ++ AUFNIRA, ++ ALIA, ++ LRA, ++ LIA, ++ NIA, ++ NRA, ++ UFLRA, ++ UFNIA, ++ UFLIRA, ++ QF_ABV, ++ QF_AUFBV, ++ QF_AUFLIA, ++ QF_ALIA, ++ QF_AX, ++ QF_BV, ++ QF_IDL, ++ QF_LIA, ++ QF_LRA, ++ QF_NIA, ++ QF_NRA, ++ QF_RDL, ++ QF_UF, ++ QF_UFBV, ++ QF_UFIDL, ++ QF_UFLIA, ++ QF_UFLRA, ++ QF_UFNRA, ++ QF_UFNIA, ++ QF_UFLIRA, ++ QF_SLIA ++ ]) ++ ++LOGICS = SMTLIB2_LOGICS | frozenset([QF_BOOL, BOOL, QF_AUFBVLIRA, QF_NIRA]) + + QF_LOGICS = frozenset(_l for _l in LOGICS if _l.quantifier_free) + +@@ -668,8 +674,8 @@ PYSMT_LOGICS = frozenset([QF_BOOL, QF_IDL, QF_LIA, QF_LRA, QF_RDL, QF_UF, QF_UFI + QF_BV, QF_UFBV, + QF_ABV, QF_AUFBV, QF_AUFLIA, QF_ALIA, QF_AX, + QF_AUFBVLIRA, +- QF_NRA, QF_NIA, UFBV, BV, +- ]) ++ QF_NRA, QF_NIA, QF_NIRA, UFBV, BV, ++ ]) + + # PySMT Logics includes additional features: + # - constant arrays: QF_AUFBV becomes QF_AUFBV* +@@ -697,7 +703,6 @@ for l in PYSMT_LOGICS: + ext_logics.add(nl) + + +- + LOGICS = LOGICS | frozenset(ext_logics) + PYSMT_LOGICS = PYSMT_LOGICS | frozenset(ext_logics) + +diff --git a/pysmt/solvers/z3.py b/pysmt/solvers/z3.py +index 3fb42b9..210b771 100644 +--- a/pysmt/solvers/z3.py ++++ b/pysmt/solvers/z3.py +@@ -595,6 +595,8 @@ class Z3Converter(Converter, DagWalker): + None, None, + 0, None, + expr.ast) ++ print("Z3: SMTLIB") ++ print(s) + stream_in = StringIO(s) + r = parser.get_script(stream_in).get_last_formula(self.mgr) + key = (askey(expr), None) +diff --git a/pysmt/test/examples.py b/pysmt/test/examples.py +index 73455ee..b653185 100644 +--- a/pysmt/test/examples.py ++++ b/pysmt/test/examples.py +@@ -898,12 +898,12 @@ def get_full_example_formulae(environment=None): + logic=pysmt.logics.QF_NRA + ), + +- Example(hr="((p ^ 2) = 0)", +- expr=Equals(Pow(p, Int(2)), Int(0)), ++ Example(hr="((p ^ 2) = 0.0)", ++ expr=Equals(Pow(p, Int(2)), Real(0)), + is_valid=False, + is_sat=True, +- logic=pysmt.logics.QF_NIA +- ), ++ logic=pysmt.logics.QF_NIRA ++ ), + + Example(hr="((r ^ 2.0) = 0.0)", + expr=Equals(Pow(r, Real(2)), Real(0)), +diff --git a/pysmt/test/test_back.py b/pysmt/test/test_back.py +index bceb45b..7a0ad63 100644 +--- a/pysmt/test/test_back.py ++++ b/pysmt/test/test_back.py +@@ -55,10 +55,10 @@ class TestBasic(TestCase): + res = msat.converter.back(term) + self.assertFalse(f == res) + +- def do_back(self, solver_name, z3_string_buffer=False): ++ def do_back(self, solver_name, via_smtlib=False): + for formula, _, _, logic in get_example_formulae(): + if logic.quantifier_free: +- if logic.theory.custom_type and z3_string_buffer: ++ if logic.theory.custom_type and via_smtlib: + # Printing of declare-sort from Z3 is not conformant + # with the SMT-LIB. We might consider extending our + # parser. +@@ -67,7 +67,7 @@ class TestBasic(TestCase): + s = Solver(name=solver_name, logic=logic) + term = s.converter.convert(formula) + if solver_name == "z3": +- if z3_string_buffer: ++ if via_smtlib: + res = s.converter.back_via_smtlib(term) + else: + res = s.converter.back(term) +@@ -84,8 +84,8 @@ class TestBasic(TestCase): + + @skipIfSolverNotAvailable("z3") + def test_z3_back_formulae(self): +- self.do_back("z3", z3_string_buffer=False) +- self.do_back("z3", z3_string_buffer=True) ++ self.do_back("z3", via_smtlib=True) ++ self.do_back("z3", via_smtlib=False) + + + if __name__ == '__main__': +diff --git a/pysmt/type_checker.py b/pysmt/type_checker.py +index b700fcf..7ce05aa 100644 +--- a/pysmt/type_checker.py ++++ b/pysmt/type_checker.py +@@ -33,6 +33,8 @@ class SimpleTypeChecker(walkers.DagWalker): + + def __init__(self, env=None): + walkers.DagWalker.__init__(self, env=env) ++ # Return None if the type cannot be computed rather than ++ # raising an exception. + self.be_nice = False + + def _get_key(self, formula, **kwargs): +@@ -42,7 +44,7 @@ class SimpleTypeChecker(walkers.DagWalker): + """ Returns the pysmt.types type of the formula """ + res = self.walk(formula) + if not self.be_nice and res is None: +- raise PysmtTypeError("The formula '%s' is not well-formed" \ ++ raise PysmtTypeError("The formula '%s' is not well-formed" + % str(formula)) + return res + +@@ -114,7 +116,7 @@ class SimpleTypeChecker(walkers.DagWalker): + + def walk_bv_comp(self, formula, args, **kwargs): + # We check that all children are BV and the same size +- a,b = args ++ a, b = args + if a != b or (not a.is_bv_type()): + return None + return BVType(1) +@@ -187,7 +189,7 @@ class SimpleTypeChecker(walkers.DagWalker): + if args[0].is_bool_type(): + raise PysmtTypeError("The formula '%s' is not well-formed." + "Equality operator is not supported for Boolean" +- " terms. Use Iff instead." \ ++ " terms. Use Iff instead." + % str(formula)) + elif args[0].is_bv_type(): + return self.walk_bv_to_bool(formula, args) +@@ -324,10 +326,7 @@ class SimpleTypeChecker(walkers.DagWalker): + def walk_pow(self, formula, args, **kwargs): + if args[0] != args[1]: + return None +- # Exponent must be positive for INT +- if args[0].is_int_type() and formula.arg(1).constant_value() < 0 : +- return None +- return args[0] ++ return REAL + + # EOC SimpleTypeChecker + diff --git a/gnu/packages/patches/python-pysmt-fix-smtlib-serialization-test.patch b/gnu/packages/patches/python-pysmt-fix-smtlib-serialization-test.patch new file mode 100644 index 0000000000..eee555f807 --- /dev/null +++ b/gnu/packages/patches/python-pysmt-fix-smtlib-serialization-test.patch @@ -0,0 +1,86 @@ +Backport of an upstream patch fixing a test suite failure. + +Taken from: https://github.com/pysmt/pysmt/commit/a246669a487aff69f5da34570ef867841d18508a + +diff --git a/pysmt/test/smtlib/test_parser_examples.py b/pysmt/test/smtlib/test_parser_examples.py +index cca4194..c0852be 100644 +--- a/pysmt/test/smtlib/test_parser_examples.py ++++ b/pysmt/test/smtlib/test_parser_examples.py +@@ -29,6 +29,7 @@ from pysmt.shortcuts import Iff + from pysmt.shortcuts import read_smtlib, write_smtlib, get_env + from pysmt.exceptions import PysmtSyntaxError + ++ + class TestSMTParseExamples(TestCase): + + def test_parse_examples(self): +@@ -41,7 +42,6 @@ class TestSMTParseExamples(TestCase): + buf = StringIO() + script_out = smtlibscript_from_formula(f_out) + script_out.serialize(outstream=buf) +- #print(buf) + + buf.seek(0) + parser = SmtLibParser() +@@ -49,7 +49,6 @@ class TestSMTParseExamples(TestCase): + f_in = script_in.get_last_formula() + self.assertEqual(f_in.simplify(), f_out.simplify()) + +- + @skipIfNoSolverForLogic(logics.QF_BV) + def test_parse_examples_bv(self): + """For BV we represent a superset of the operators defined in SMT-LIB. +@@ -108,7 +107,18 @@ class TestSMTParseExamples(TestCase): + self.assertValid(Iff(f_in, f_out), f_in.serialize()) + + def test_dumped_logic(self): +- # Dumped logic matches the logic in the example ++ # Dumped logic matches the logic in the example. ++ # ++ # There are a few cases where we use a logic ++ # that does not exist in SMT-LIB, and the SMT-LIB ++ # serialization logic will find a logic that ++ # is more expressive. We need to adjust the test ++ # for those cases (see rewrite dict below). ++ rewrite = { ++ logics.QF_BOOL: logics.QF_UF, ++ logics.BOOL: logics.LRA, ++ logics.QF_NIRA: logics.AUFNIRA, ++ } + fs = get_example_formulae() + + for (f_out, _, _, logic) in fs: +@@ -121,14 +131,9 @@ class TestSMTParseExamples(TestCase): + for cmd in script_in: + if cmd.name == "set-logic": + logic_in = cmd.args[0] +- if logic == logics.QF_BOOL: +- self.assertEqual(logic_in, logics.QF_UF) +- elif logic == logics.BOOL: +- self.assertEqual(logic_in, logics.LRA) +- else: +- self.assertEqual(logic_in, logic, script_in) ++ self.assertEqual(logic_in, rewrite.get(logic, logic)) + break +- else: # Loops exited normally ++ else: # Loops exited normally + print("-"*40) + print(script_in) + +@@ -136,7 +141,7 @@ class TestSMTParseExamples(TestCase): + fs = get_example_formulae() + + fdi, tmp_fname = mkstemp() +- os.close(fdi) # Close initial file descriptor ++ os.close(fdi) # Close initial file descriptor + for (f_out, _, _, _) in fs: + write_smtlib(f_out, tmp_fname) + # with open(tmp_fname) as fin: +@@ -197,7 +202,6 @@ class TestSMTParseExamples(TestCase): + f_in = script.get_last_formula() + self.assertSat(f_in) + +- + def test_int_promotion_define_fun(self): + script = """ + (define-fun x () Int 8) diff --git a/gnu/packages/patches/python-pyvex-remove-angr-dependency.patch b/gnu/packages/patches/python-pyvex-remove-angr-dependency.patch new file mode 100644 index 0000000000..dccf22bbc6 --- /dev/null +++ b/gnu/packages/patches/python-pyvex-remove-angr-dependency.patch @@ -0,0 +1,80 @@ +This patch removes the angr dependency from the pyvex these, thus +resolving a circular dependency (as angr depends on pyvex). This +patch has been taken from upstream. + +This patch is a squashed version of the following upstream patches: + +* https://github.com/angr/pyvex/commit/61fb26f223a8d8a276b702d2448a12e02c5c9c6b +* https://github.com/angr/pyvex/commit/a1fb2a4d0826b0e43bd8bbdd00b6db032643ec95 + +diff --git a/tests/test_spotter.py b/tests/test_spotter.py +index 9271ccd..bed7dd4 100644 +--- a/tests/test_spotter.py ++++ b/tests/test_spotter.py +@@ -1,6 +1,5 @@ + import os + +-import angr + import archinfo + + import pyvex +@@ -98,53 +97,28 @@ class CortexSpotter(GymratLifter): + register(CortexSpotter, "ARMEL") + + +-def test_full_binary(): +- p = angr.Project( +- os.path.join(test_location, "armel", "RTOSDemo.axf.issue_685"), +- arch="ARMEL", +- auto_load_libs=False, +- ) +- st = p.factory.call_state(0x000013CE + 1) +- b = st.block().vex +- simgr = p.factory.simulation_manager(st) +- simgr.step() +- assert b.jumpkind == "Ijk_Sys_syscall" +- assert simgr.active[0].regs.ip_at_syscall.args[0] == 0x13FB +- +- + def test_tmrs(): +- test_location = str(os.path.join(os.path.dirname(os.path.realpath(__file__)), "../../binaries/tests")) +- p = angr.Project( +- os.path.join(test_location, "armel", "helloworld"), +- arch="ARMEL", +- auto_load_libs=False, +- ) ++ arch = archinfo.arch_from_id("ARMEL") + ins = b"\xef\xf3\x08\x82" +- b = pyvex.block.IRSB(ins, 1, p.arch) ++ b = pyvex.block.IRSB(ins, 1, arch) + assert b.jumpkind == "Ijk_Boring" + assert type(b.statements[1].data) == pyvex.expr.Get +- assert p.arch.register_names.get(b.statements[1].data.offset, "") == "sp" ++ assert arch.register_names.get(b.statements[1].data.offset, "") == "sp" + assert type(b.statements[2]) == pyvex.stmt.Put + + + def test_tmsr(): +- test_location = str(os.path.join(os.path.dirname(os.path.realpath(__file__)), "../../binaries/tests")) +- p = angr.Project( +- os.path.join(test_location, "armel", "helloworld"), +- arch="ARMEL", +- auto_load_libs=False, +- ) ++ arch = archinfo.arch_from_id("ARMEL") + inss = b"\x82\xf3\x08\x88" +- b = pyvex.block.IRSB(inss, 1, p.arch, opt_level=3) ++ b = pyvex.block.IRSB(inss, 1, arch, opt_level=3) + assert b.jumpkind == "Ijk_Boring" + assert type(b.statements[1].data) == pyvex.expr.Get +- assert p.arch.register_names.get(b.statements[1].data.offset, "") == "r2" ++ assert arch.register_names.get(b.statements[1].data.offset, "") == "r2" + assert type(b.statements[2]) == pyvex.stmt.Put + + + if __name__ == "__main__": + test_basic() + test_embedded() +- test_full_binary() + test_tmrs() + test_tmsr() diff --git a/gnu/packages/patches/python-scikit-optimize-1148.patch b/gnu/packages/patches/python-scikit-optimize-1148.patch deleted file mode 100644 index 6ad854ab1e..0000000000 --- a/gnu/packages/patches/python-scikit-optimize-1148.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3a5d5eb90ec9d8d4905c05387748486157cadbbb Mon Sep 17 00:00:00 2001 -From: valtron <valtron2000@gmail.com> -Date: Tue, 14 Feb 2023 09:56:10 -0700 -Subject: [PATCH] `np.int` -> `int` - -`np.int is int` and it was deprecated in numpy 1.20: https://numpy.org/doc/1.20/release/1.20.0-notes.html#deprecations ---- - skopt/space/transformers.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/skopt/space/transformers.py b/skopt/space/transformers.py -index 68892952..f2dfb164 100644 ---- a/skopt/space/transformers.py -+++ b/skopt/space/transformers.py -@@ -259,7 +259,7 @@ def transform(self, X): - if (self.high - self.low) == 0.: - return X * 0. - if self.is_int: -- return (np.round(X).astype(np.int) - self.low) /\ -+ return (np.round(X).astype(int) - self.low) /\ - (self.high - self.low) - else: - return (X - self.low) / (self.high - self.low) -@@ -272,7 +272,7 @@ def inverse_transform(self, X): - raise ValueError("All values should be greater than 0.0") - X_orig = X * (self.high - self.low) + self.low - if self.is_int: -- return np.round(X_orig).astype(np.int) -+ return np.round(X_orig).astype(int) - return X_orig - - diff --git a/gnu/packages/patches/python-scikit-optimize-1150.patch b/gnu/packages/patches/python-scikit-optimize-1150.patch deleted file mode 100644 index 0cdf361a80..0000000000 --- a/gnu/packages/patches/python-scikit-optimize-1150.patch +++ /dev/null @@ -1,275 +0,0 @@ -From cd74e00d0e4f435d548444e1a5edc20155e371d7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com> -Date: Wed, 15 Feb 2023 18:47:52 +0100 -Subject: [PATCH 1/5] Update RandomForesetRegressor criterion to be inline with - scikit-learn change from mse to squared error this has the same funcitonality - ---- - requirements.txt | 6 +++--- - setup.py | 6 +++--- - skopt/learning/forest.py | 30 +++++++++++++++--------------- - 3 files changed, 21 insertions(+), 21 deletions(-) - -diff --git a/requirements.txt b/requirements.txt -index 1eaa3083a..23ab3d856 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,6 +1,6 @@ --numpy>=1.13.3 --scipy>=0.19.1 --scikit-learn>=0.20 -+numpy>=1.23.2 -+scipy>=1.10.0 -+scikit-learn>=1.2.1 - matplotlib>=2.0.0 - pytest - pyaml>=16.9 -diff --git a/setup.py b/setup.py -index 8879da880..e7f921765 100644 ---- a/setup.py -+++ b/setup.py -@@ -42,9 +42,9 @@ - classifiers=CLASSIFIERS, - packages=['skopt', 'skopt.learning', 'skopt.optimizer', 'skopt.space', - 'skopt.learning.gaussian_process', 'skopt.sampler'], -- install_requires=['joblib>=0.11', 'pyaml>=16.9', 'numpy>=1.13.3', -- 'scipy>=0.19.1', -- 'scikit-learn>=0.20.0'], -+ install_requires=['joblib>=0.11', 'pyaml>=16.9', 'numpy>=1.23.2', -+ 'scipy>=1.10.0', -+ 'scikit-learn>=1.2.1'], - extras_require={ - 'plots': ["matplotlib>=2.0.0"] - } -diff --git a/skopt/learning/forest.py b/skopt/learning/forest.py -index 096770c1d..ebde568f5 100644 ---- a/skopt/learning/forest.py -+++ b/skopt/learning/forest.py -@@ -27,7 +27,7 @@ def _return_std(X, trees, predictions, min_variance): - ------- - std : array-like, shape=(n_samples,) - Standard deviation of `y` at `X`. If criterion -- is set to "mse", then `std[i] ~= std(y | X[i])`. -+ is set to "squared_error", then `std[i] ~= std(y | X[i])`. - - """ - # This derives std(y | x) as described in 4.3.2 of arXiv:1211.0906 -@@ -61,9 +61,9 @@ class RandomForestRegressor(_sk_RandomForestRegressor): - n_estimators : integer, optional (default=10) - The number of trees in the forest. - -- criterion : string, optional (default="mse") -+ criterion : string, optional (default="squared_error") - The function to measure the quality of a split. Supported criteria -- are "mse" for the mean squared error, which is equal to variance -+ are "squared_error" for the mean squared error, which is equal to variance - reduction as feature selection criterion, and "mae" for the mean - absolute error. - -@@ -194,7 +194,7 @@ class RandomForestRegressor(_sk_RandomForestRegressor): - .. [1] L. Breiman, "Random Forests", Machine Learning, 45(1), 5-32, 2001. - - """ -- def __init__(self, n_estimators=10, criterion='mse', max_depth=None, -+ def __init__(self, n_estimators=10, criterion='squared_error', max_depth=None, - min_samples_split=2, min_samples_leaf=1, - min_weight_fraction_leaf=0.0, max_features='auto', - max_leaf_nodes=None, min_impurity_decrease=0., -@@ -228,20 +228,20 @@ def predict(self, X, return_std=False): - Returns - ------- - predictions : array-like of shape = (n_samples,) -- Predicted values for X. If criterion is set to "mse", -+ Predicted values for X. If criterion is set to "squared_error", - then `predictions[i] ~= mean(y | X[i])`. - - std : array-like of shape=(n_samples,) - Standard deviation of `y` at `X`. If criterion -- is set to "mse", then `std[i] ~= std(y | X[i])`. -+ is set to "squared_error", then `std[i] ~= std(y | X[i])`. - - """ - mean = super(RandomForestRegressor, self).predict(X) - - if return_std: -- if self.criterion != "mse": -+ if self.criterion != "squared_error": - raise ValueError( -- "Expected impurity to be 'mse', got %s instead" -+ "Expected impurity to be 'squared_error', got %s instead" - % self.criterion) - std = _return_std(X, self.estimators_, mean, self.min_variance) - return mean, std -@@ -257,9 +257,9 @@ class ExtraTreesRegressor(_sk_ExtraTreesRegressor): - n_estimators : integer, optional (default=10) - The number of trees in the forest. - -- criterion : string, optional (default="mse") -+ criterion : string, optional (default="squared_error") - The function to measure the quality of a split. Supported criteria -- are "mse" for the mean squared error, which is equal to variance -+ are "squared_error" for the mean squared error, which is equal to variance - reduction as feature selection criterion, and "mae" for the mean - absolute error. - -@@ -390,7 +390,7 @@ class ExtraTreesRegressor(_sk_ExtraTreesRegressor): - .. [1] L. Breiman, "Random Forests", Machine Learning, 45(1), 5-32, 2001. - - """ -- def __init__(self, n_estimators=10, criterion='mse', max_depth=None, -+ def __init__(self, n_estimators=10, criterion='squared_error', max_depth=None, - min_samples_split=2, min_samples_leaf=1, - min_weight_fraction_leaf=0.0, max_features='auto', - max_leaf_nodes=None, min_impurity_decrease=0., -@@ -425,19 +425,19 @@ def predict(self, X, return_std=False): - Returns - ------- - predictions : array-like of shape=(n_samples,) -- Predicted values for X. If criterion is set to "mse", -+ Predicted values for X. If criterion is set to "squared_error", - then `predictions[i] ~= mean(y | X[i])`. - - std : array-like of shape=(n_samples,) - Standard deviation of `y` at `X`. If criterion -- is set to "mse", then `std[i] ~= std(y | X[i])`. -+ is set to "squared_error", then `std[i] ~= std(y | X[i])`. - """ - mean = super(ExtraTreesRegressor, self).predict(X) - - if return_std: -- if self.criterion != "mse": -+ if self.criterion != "squared_error": - raise ValueError( -- "Expected impurity to be 'mse', got %s instead" -+ "Expected impurity to be 'squared_error', got %s instead" - % self.criterion) - std = _return_std(X, self.estimators_, mean, self.min_variance) - return mean, std - -From 6eb2d4ddaa299ae47d9a69ffb31ebc4ed366d1c1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com> -Date: Thu, 16 Feb 2023 11:34:58 +0100 -Subject: [PATCH 2/5] Change test to be consistent with code changes. - ---- - skopt/learning/tests/test_forest.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/skopt/learning/tests/test_forest.py b/skopt/learning/tests/test_forest.py -index 0711cde9d..c6ed610f3 100644 ---- a/skopt/learning/tests/test_forest.py -+++ b/skopt/learning/tests/test_forest.py -@@ -35,7 +35,7 @@ def test_random_forest(): - assert_array_equal(clf.predict(T), true_result) - assert 10 == len(clf) - -- clf = RandomForestRegressor(n_estimators=10, criterion="mse", -+ clf = RandomForestRegressor(n_estimators=10, criterion="squared_error", - max_depth=None, min_samples_split=2, - min_samples_leaf=1, - min_weight_fraction_leaf=0., -@@ -80,7 +80,7 @@ def test_extra_forest(): - assert_array_equal(clf.predict(T), true_result) - assert 10 == len(clf) - -- clf = ExtraTreesRegressor(n_estimators=10, criterion="mse", -+ clf = ExtraTreesRegressor(n_estimators=10, criterion="squared_error", - max_depth=None, min_samples_split=2, - min_samples_leaf=1, min_weight_fraction_leaf=0., - max_features="auto", max_leaf_nodes=None, - -From 52c620add07d845debbaff2ce2b1c5faf3eae79b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com> -Date: Wed, 22 Feb 2023 16:59:03 +0100 -Subject: [PATCH 3/5] Update skopt/learning/forest.py -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix max line width - -Co-authored-by: Roland Laurès <roland@laures-valdivia.net> ---- - skopt/learning/forest.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/skopt/learning/forest.py b/skopt/learning/forest.py -index ebde568f5..07dc42664 100644 ---- a/skopt/learning/forest.py -+++ b/skopt/learning/forest.py -@@ -194,8 +194,8 @@ class RandomForestRegressor(_sk_RandomForestRegressor): - .. [1] L. Breiman, "Random Forests", Machine Learning, 45(1), 5-32, 2001. - - """ -- def __init__(self, n_estimators=10, criterion='squared_error', max_depth=None, -- min_samples_split=2, min_samples_leaf=1, -+ def __init__(self, n_estimators=10, criterion='squared_error', -+ max_depth=None, min_samples_split=2, min_samples_leaf=1, - min_weight_fraction_leaf=0.0, max_features='auto', - max_leaf_nodes=None, min_impurity_decrease=0., - bootstrap=True, oob_score=False, - -From 52a7db95cb567186fb4e9003139fea4592bdbf05 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com> -Date: Wed, 22 Feb 2023 17:03:25 +0100 -Subject: [PATCH 4/5] Fix line widht issues - ---- - skopt/learning/forest.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/skopt/learning/forest.py b/skopt/learning/forest.py -index 07dc42664..d4c24456b 100644 ---- a/skopt/learning/forest.py -+++ b/skopt/learning/forest.py -@@ -390,8 +390,8 @@ class ExtraTreesRegressor(_sk_ExtraTreesRegressor): - .. [1] L. Breiman, "Random Forests", Machine Learning, 45(1), 5-32, 2001. - - """ -- def __init__(self, n_estimators=10, criterion='squared_error', max_depth=None, -- min_samples_split=2, min_samples_leaf=1, -+ def __init__(self, n_estimators=10, criterion='squared_error', -+ max_depth=None, min_samples_split=2, min_samples_leaf=1, - min_weight_fraction_leaf=0.0, max_features='auto', - max_leaf_nodes=None, min_impurity_decrease=0., - bootstrap=False, oob_score=False, - -From 6b185e489fb4a56625e8505292a20c80434f0633 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com> -Date: Wed, 22 Feb 2023 18:37:11 +0100 -Subject: [PATCH 5/5] Fix lin width issues for comments. - ---- - skopt/learning/forest.py | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/skopt/learning/forest.py b/skopt/learning/forest.py -index d4c24456b..eb3bd6648 100644 ---- a/skopt/learning/forest.py -+++ b/skopt/learning/forest.py -@@ -63,9 +63,9 @@ class RandomForestRegressor(_sk_RandomForestRegressor): - - criterion : string, optional (default="squared_error") - The function to measure the quality of a split. Supported criteria -- are "squared_error" for the mean squared error, which is equal to variance -- reduction as feature selection criterion, and "mae" for the mean -- absolute error. -+ are "squared_error" for the mean squared error, which is equal to -+ variance reduction as feature selection criterion, and "mae" for the -+ mean absolute error. - - max_features : int, float, string or None, optional (default="auto") - The number of features to consider when looking for the best split: -@@ -259,9 +259,9 @@ class ExtraTreesRegressor(_sk_ExtraTreesRegressor): - - criterion : string, optional (default="squared_error") - The function to measure the quality of a split. Supported criteria -- are "squared_error" for the mean squared error, which is equal to variance -- reduction as feature selection criterion, and "mae" for the mean -- absolute error. -+ are "squared_error" for the mean squared error, which is equal to -+ variance reduction as feature selection criterion, and "mae" for the -+ mean absolute error. - - max_features : int, float, string or None, optional (default="auto") - The number of features to consider when looking for the best split: diff --git a/gnu/packages/patches/python-xmp-toolkit-add-missing-error-codes.patch b/gnu/packages/patches/python-xmp-toolkit-add-missing-error-codes.patch new file mode 100644 index 0000000000..17bdae188f --- /dev/null +++ b/gnu/packages/patches/python-xmp-toolkit-add-missing-error-codes.patch @@ -0,0 +1,51 @@ +From fd9e887a1853d9b4bc3fce20d414d648fb5abbfc Mon Sep 17 00:00:00 2001 +From: Asher Glick <asher.glick@gmail.com> +Date: Mon, 1 Mar 2021 14:35:46 -0600 +Subject: [PATCH] Add missing error codes and graceful handling of possible + future missing codes. + +--- + libxmp/exempi.py | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/libxmp/exempi.py b/libxmp/exempi.py +index 683e240..f58003c 100644 +--- a/libxmp/exempi.py ++++ b/libxmp/exempi.py +@@ -85,6 +85,7 @@ ERROR_MESSAGE = { 0: "unknown error", + -13: "std exception", + -14: "unknown exception", + -15: "no memory", ++ -16: "progress abort", + -101: "bad schema", + -102: "bad XPath", + -103: "bad options", +@@ -95,6 +96,14 @@ ERROR_MESSAGE = { 0: "unknown error", + -108: "bad file format", + -109: "no file handler", + -110: "too large for JPEG", ++ -111: "no file", ++ -112: "file permission error", ++ -113: "disk space", ++ -114: "read error", ++ -115: "write error", ++ -116: "bad block format", ++ -117: "file path not a file", ++ -118: "rejected file extension", + -201: "bad XML", + -202: "bad RDF", + -203: "bad XMP", +@@ -1697,6 +1706,9 @@ def check_error(success): + # so we supplement it by explicitly checking the error code. + ecode = EXEMPI.xmp_get_error() + if not success or ecode != 0: +- error_msg = ERROR_MESSAGE[ecode] ++ if ecode in ERROR_MESSAGE: ++ error_msg = ERROR_MESSAGE[ecode] ++ else: ++ error_msg = "Unexpected error code " + str(ecode) + msg = 'Exempi function failure ("{0}").'.format(error_msg) + raise XMPError(msg) +-- +2.30.2 + diff --git a/gnu/packages/patches/racket-backport-8.12-chez-configure.patch b/gnu/packages/patches/racket-backport-8.12-chez-configure.patch deleted file mode 100644 index 483948fec9..0000000000 --- a/gnu/packages/patches/racket-backport-8.12-chez-configure.patch +++ /dev/null @@ -1,423 +0,0 @@ -From 82157f5b3fb9f71ad7fc978c428d423d06a4a0df Mon Sep 17 00:00:00 2001 -From: Philip McGrath <philip@philipmcgrath.com> -Date: Wed, 28 Feb 2024 19:41:22 -0500 -Subject: [PATCH 1/2] Chez Scheme: Repairs and improvements for building with - external dependencies - -* configure: support `ZUO=<zuo>` - -Supplying `ZUO=<zuo>` skips the submodule check in `configure` -and configures the generated makefile not to build or remove Zuo. - -* configure: support `STEXLIB=<stex>` - -For compatibility with older scripts, when not explicitly configured, -continue to honor the `STEXLIB` environment variable at build time. - -(cherry picked from commit 694fbd47a125c7fde10a328c6fda199dac19f802) ---- - racket/src/ChezScheme/BUILDING | 5 ++-- - racket/src/ChezScheme/build.zuo | 13 +++++++--- - racket/src/ChezScheme/configure | 27 ++++++++++++++++++++- - racket/src/ChezScheme/makefiles/Makefile.in | 6 ++--- - 4 files changed, 40 insertions(+), 11 deletions(-) - -diff --git a/racket/src/ChezScheme/BUILDING b/racket/src/ChezScheme/BUILDING -index 50fde27771..2df29b5bd8 100644 ---- a/racket/src/ChezScheme/BUILDING -+++ b/racket/src/ChezScheme/BUILDING -@@ -155,7 +155,8 @@ information on the supported options. - The generated makefile mostly just ensures that a `zuo` executable is - built in a `bin` directory, and then it defers the actual build work - to `zuo`, which uses the "main.zuo" file. If you have `zuo` installed, --you can use `zuo` directly instead of `make`. In general, instead of -+you can use `zuo` directly instead of `make`: in that case, you may -+wish to use `./configure ZUO=<zuo>`. In general, instead of - the command `make X` to build target `X` as described below, you can - use `zuo . X` (or `bin/zuo . X` after `bin/zuo` is built). - -@@ -339,7 +340,7 @@ The makefile supports several targets: - * `make clean` - - Removes all built elements from the workarea, and then removes -- `bin/zuo`. -+ `bin/zuo` (unless configured with `ZUO=<zuo>`). - - - WINDOWS VIA COMMAND PROMPT -diff --git a/racket/src/ChezScheme/build.zuo b/racket/src/ChezScheme/build.zuo -index a211632a89..432cc6e5a1 100644 ---- a/racket/src/ChezScheme/build.zuo -+++ b/racket/src/ChezScheme/build.zuo -@@ -218,10 +218,15 @@ - token)) - - (define stexlib -- (let ((found (assoc "STEXLIB" (hash-ref (runtime-env) 'env)))) -- (if found -- (cdr found) -- (at-source "stex")))) -+ (let ([configured (hash-ref config 'STEXLIB "")] -+ [env (assoc "STEXLIB" (hash-ref (runtime-env) 'env))]) -+ (cond -+ [(not (equal? "" configured)) -+ configured] -+ [env -+ (cdr env)] -+ [else -+ (at-source "stex")]))) - (define stex-sources - (source-tree stexlib)) - -diff --git a/racket/src/ChezScheme/configure b/racket/src/ChezScheme/configure -index 721d1d1335..f88c6f7625 100755 ---- a/racket/src/ChezScheme/configure -+++ b/racket/src/ChezScheme/configure -@@ -93,6 +93,7 @@ default_warning_flags="-Wpointer-arith -Wall -Wextra -Wno-implicit-fallthrough" - CFLAGS_ADD= - zlibLib= - LZ4Lib= -+STEXLIB= - Kernel=KernelLib - buildKernelOnly=no - enableFrompb=yes -@@ -102,6 +103,7 @@ empetite=no - moreBootFiles= - preloadBootFiles= - alwaysUseBootFile= -+zuoExternal= - - CONFIG_UNAME=`uname` - -@@ -442,6 +444,12 @@ while [ $# != 0 ] ; do - LZ4=*) - LZ4Lib=`echo $1 | sed -e 's/^LZ4=//'` - ;; -+ STEXLIB=*) -+ STEXLIB=`echo $1 | sed -e 's/^STEXLIB=//'` -+ ;; -+ ZUO=*) -+ zuoExternal=`echo $1 | sed -e 's/^ZUO=//'` -+ ;; - *) - echo "option '$1' unrecognized or missing an argument; try $0 --help" - exit 1 -@@ -667,6 +675,8 @@ if [ "$help" = "yes" ]; then - echo " STRIP=<strip> executable stripper" - echo " ZLIB=<lib> link to <lib> instead of own zlib" - echo " LZ4=<lib> link to <lib> instead of own LZ4" -+ echo " STEXLIB=<stex> build docs with <stex> instead of own stex" -+ echo " ZUO=<zuo> build with <zuo> instead of own Zuo" - echo "" - echo "Available machine types: $machs" - echo "" -@@ -869,6 +879,16 @@ if [ "$addflags" = "yes" ] ; then - fi - fi - -+if [ "${zuoExternal}" = "" ] ; then -+ ZUO="bin/zuo" -+ RM_ZUO="rm -f bin/zuo" -+ ZUO_TARGET="bin/zuo" -+else -+ ZUO="${zuoExternal}" -+ RM_ZUO="@echo 'Not cleaning external ${zuoExternal}'" -+ ZUO_TARGET="DoNotBuildZuo" -+fi -+ - # more compile and link flags for c/Mf-unix and mats/Mf-unix - mdinclude= - mdcppflags= -@@ -1039,7 +1059,7 @@ cp "$srcdir"/makefiles/buildmain.zuo main.zuo - # Some idea, but in the workarea, so it refers to "workarea.zuo" here: - cp "$srcdir"/makefiles/workmain.zuo $w/main.zuo - --# The content of "$w/Makefile" records configuration decisions, -+# The content of "$w/Mf-config" records configuration decisions, - # and the Zuo build script takes it from there - cat > $w/Mf-config << END - srcdir=$srcdir -@@ -1075,6 +1095,7 @@ cursesLib=$cursesLib - ncursesLib=$ncursesLib - zlibLib=$zlibLib - LZ4Lib=$LZ4Lib -+STEXLIB=$STEXLIB - warningFlags=$warningFlags - Kernel=$Kernel - installscriptname=$installscriptname -@@ -1086,6 +1107,10 @@ preloadBootFiles=$preloadBootFiles - alwaysUseBootFile=$alwaysUseBootFile - relativeBootFiles=$relativeBootFiles - -+ZUO=$ZUO -+RM_ZUO=$RM_ZUO -+ZUO_TARGET=$ZUO_TARGET -+ - InstallBin=$installbin - InstallLib=$installlib - InstallMan=$installman/man1 -diff --git a/racket/src/ChezScheme/makefiles/Makefile.in b/racket/src/ChezScheme/makefiles/Makefile.in -index cfdd0230a3..4865bf2e2f 100644 ---- a/racket/src/ChezScheme/makefiles/Makefile.in -+++ b/racket/src/ChezScheme/makefiles/Makefile.in -@@ -3,8 +3,6 @@ workarea=$(w) - - include $(workarea)/Mf-config - --ZUO=bin/zuo -- - .PHONY: build - build: $(ZUO) - + $(ZUO) $(workarea) MAKE="$(MAKE)" -@@ -140,9 +138,9 @@ pkg: $(ZUO) - .PHONY: clean - clean: $(ZUO) - + $(ZUO) $(workarea) clean MAKE="$(MAKE)" -- rm -f bin/zuo -+ $(RM_ZUO) - - # Using `+` here means that $(ZUO) gets built even if `-n`/`--dry-run` is provided to `make` --$(ZUO): $(srcdir)/../zuo/zuo.c -+$(ZUO_TARGET): $(srcdir)/../zuo/zuo.c - + mkdir -p bin - + $(CC_FOR_BUILD) -DZUO_LIB_PATH='"'"$(upsrcdir)/../zuo/lib"'"' -o $(ZUO) $(srcdir)/../zuo/zuo.c - -base-commit: 78fef00d4d16a79fdf6ab31924b3a80cadf4b368 --- -2.41.0 - - -From e2bc69c5ce7437dd9a1b30ac1b12b3a56872c491 Mon Sep 17 00:00:00 2001 -From: Matthew Flatt <mflatt@racket-lang.org> -Date: Sun, 10 Mar 2024 09:13:40 -0600 -Subject: [PATCH 2/2] Chez Scheme: adjust `configure ZUO=<command>` support - -Continuing from 694fbd47a1, adjust the generated makefile so the -supplied `<command>` is not a makefile dependency. That way, `ZUO=zuo` -works if `zuo` is installed and the current build directory is not the -source directory. (The `zuo` executable is a dependency in a real and -relevant sense, but not in the sense of dependencies that we normally -track in makefiles.) - -Also adapt the makefile for the case that `ZUO=...` is not supplied -and the build directory is not the source directory, in which case -`ZUO_LIB_PATH` needs to be relative to the source directory. - -Using `make ZUO=zuo` can also work, but in that case, `bin/zuo` is -still built as a dependency. It's possible that some portable makefile -magic could overcome that limitation, but it doesn't seem important. - -(cherry picked from commit 28157ba88d48fe645563f46f6c00d6626b3428fa) ---- - racket/src/ChezScheme/configure | 3 + - racket/src/ChezScheme/makefiles/Makefile.in | 70 +++++++++++---------- - 2 files changed, 40 insertions(+), 33 deletions(-) - -diff --git a/racket/src/ChezScheme/configure b/racket/src/ChezScheme/configure -index f88c6f7625..201dbe580f 100755 ---- a/racket/src/ChezScheme/configure -+++ b/racket/src/ChezScheme/configure -@@ -881,10 +881,12 @@ fi - - if [ "${zuoExternal}" = "" ] ; then - ZUO="bin/zuo" -+ ZUO_DEP="${ZUO}" - RM_ZUO="rm -f bin/zuo" - ZUO_TARGET="bin/zuo" - else - ZUO="${zuoExternal}" -+ ZUO_DEP="" - RM_ZUO="@echo 'Not cleaning external ${zuoExternal}'" - ZUO_TARGET="DoNotBuildZuo" - fi -@@ -1108,6 +1110,7 @@ alwaysUseBootFile=$alwaysUseBootFile - relativeBootFiles=$relativeBootFiles - - ZUO=$ZUO -+ZUO_DEP=$ZUO_DEP - RM_ZUO=$RM_ZUO - ZUO_TARGET=$ZUO_TARGET - -diff --git a/racket/src/ChezScheme/makefiles/Makefile.in b/racket/src/ChezScheme/makefiles/Makefile.in -index 4865bf2e2f..5ce237178e 100644 ---- a/racket/src/ChezScheme/makefiles/Makefile.in -+++ b/racket/src/ChezScheme/makefiles/Makefile.in -@@ -4,51 +4,55 @@ workarea=$(w) - include $(workarea)/Mf-config - - .PHONY: build --build: $(ZUO) -+build: $(ZUO_DEP) - + $(ZUO) $(workarea) MAKE="$(MAKE)" - - .PHONY: run --run: $(ZUO) -+run: $(ZUO_DEP) - + $(ZUO) $(workarea) run - - .PHONY: kernel --kernel: $(ZUO) -+kernel: $(ZUO_DEP) - + $(ZUO) $(workarea) kernel MAKE="$(MAKE)" - - .PHONY: install --install: $(ZUO) -+install: $(ZUO_DEP) - $(ZUO) $(workarea) install MAKE="$(MAKE)" - - .PHONY: uninstall --uninstall: $(ZUO) -+uninstall: $(ZUO_DEP) - + $(ZUO) $(workarea) uninstall MAKE="$(MAKE)" - --.PHONY: test --test: $(ZUO) -- + $(ZUO) $(workarea) test MAKE="$(MAKE)" -+.PHONY: test-one -+test-one: $(ZUO_DEP) -+ + $(ZUO) $(workarea) test-one MAKE="$(MAKE)" - - .PHONY: test-some-fast --test-some-fast: $(ZUO) -+test-some-fast: $(ZUO_DEP) - + $(ZUO) $(workarea) test-some-fast MAKE="$(MAKE)" - - .PHONY: test-some --test-some: $(ZUO) -+test-some: $(ZUO_DEP) - + $(ZUO) $(workarea) test-some MAKE="$(MAKE)" - -+.PHONY: test -+test: $(ZUO_DEP) -+ + $(ZUO) $(workarea) test MAKE="$(MAKE)" -+ - .PHONY: test-more --test-more: $(ZUO) -+test-more: $(ZUO_DEP) - + $(ZUO) $(workarea) test-more MAKE="$(MAKE)" - - .PHONY: coverage --coverage: $(ZUO) -+coverage: $(ZUO_DEP) - + $(ZUO) $(workarea) coverage MAKE="$(MAKE)" - - .PHONY: bootfiles --bootfiles: $(ZUO) -+bootfiles: $(ZUO_DEP) - + $(ZUO) $(workarea) bootfiles MAKE="$(MAKE)" - - .PHONY: reset --reset: $(ZUO) -+reset: $(ZUO_DEP) - + $(ZUO) $(workarea) reset MAKE="$(MAKE)" - - # Supply XM=<machine> to build boot files for <machine> -@@ -57,86 +61,86 @@ boot: - + $(ZUO) $(workarea) boot "$(XM)" MAKE="$(MAKE)" - - # `<machine>.boot` as alias for `boot XM=<machine>` --%.boot: $(ZUO) -+%.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) boot $* MAKE="$(MAKE)" - - .PHONY: auto.boot --auto.boot: $(ZUO) -+auto.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) boot MAKE="$(MAKE)" - - SCHEME=scheme - - .PHONY: cross.boot --cross.boot: $(ZUO) -+cross.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) boot SCHEME="$(SCHEME)" MAKE="$(MAKE)" - - .PHONY: re.boot --re.boot: $(ZUO) -+re.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) reboot SCHEME="$(SCHEME)" - - # Supply XM=<machine> to build boot files for <machine> - # with o=3 d=0 for the cross compiler, and only after - # building the kernel for the configured machine - .PHONY: bootquick --bootquick: $(ZUO) -+bootquick: $(ZUO_DEP) - + $(ZUO) $(workarea) bootquick "$(XM)" MAKE="$(MAKE)" - - # `<machine>.bootquick` as alias for `boot XM=<machine>` --%.bootquick: $(ZUO) -+%.bootquick: $(ZUO_DEP) - + $(ZUO) $(workarea) bootquick $* MAKE="$(MAKE)" - --auto.bootquick: $(ZUO) -+auto.bootquick: $(ZUO_DEP) - + $(ZUO) $(workarea) bootquick MAKE="$(MAKE)" - - # Supply XM=<machine>-<tag>.bootpbchunk to repackage boot files for - # <machine> with pbchunk sources, including additional - # boot files - .PHONY: bootpbchunk --bootpbchunk: $(ZUO) -+bootpbchunk: $(ZUO_DEP) - + $(ZUO) $(workarea) bootpbchunk "$(XM)" $(ARGS) MAKE="$(MAKE)" - - # `<machine>.bootpbchunk` as alias for `pbchunk XM=<machine>` --%.bootpbchunk: $(ZUO) -+%.bootpbchunk: $(ZUO_DEP) - + $(ZUO) $(workarea) bootpbchunk $* $(ARGS) MAKE="$(MAKE)" - - .PHONY: docs --docs: build $(ZUO) -+docs: build $(ZUO_DEP) - + $(ZUO) $(workarea) docs MAKE="$(MAKE)" - - .PHONY: csug --csug: build $(ZUO) -+csug: build $(ZUO_DEP) - + $(ZUO) $(workarea) csug MAKE="$(MAKE)" - - .PHONY: release_notes --release_notes: build $(ZUO) -+release_notes: build $(ZUO_DEP) - + $(ZUO) $(workarea) release_notes MAKE="$(MAKE)" - - .PHONY: install-docs --install-docs: build $(ZUO) -+install-docs: build $(ZUO_DEP) - + $(ZUO) $(workarea) install-docs MAKE="$(MAKE)" - - .PHONY: install-csug --install-csug: build $(ZUO) -+install-csug: build $(ZUO_DEP) - + $(ZUO) $(workarea) install-csug MAKE="$(MAKE)" - - .PHONY: install-release_notes --install-release_notes: build $(ZUO) -+install-release_notes: build $(ZUO_DEP) - + $(ZUO) $(workarea) install-release_notes MAKE="$(MAKE)" - - .PHONY: bintar --bintar: $(ZUO) -+bintar: $(ZUO_DEP) - + $(ZUO) $(workarea) bintar MAKE="$(MAKE)" - - .PHONY: rpm --rpm: $(ZUO) -+rpm: $(ZUO_DEP) - + $(ZUO) $(workarea) rpm MAKE="$(MAKE)" - - .PHONY: pkg --pkg: $(ZUO) -+pkg: $(ZUO_DEP) - + $(ZUO) $(workarea) pkg MAKE="$(MAKE)" - - .PHONY: clean --clean: $(ZUO) -+clean: $(ZUO_DEP) - + $(ZUO) $(workarea) clean MAKE="$(MAKE)" - $(RM_ZUO) - --- -2.41.0 - diff --git a/gnu/packages/patches/virt-manager-fix-gtk-cursor-theme-backtace.patch b/gnu/packages/patches/virt-manager-fix-gtk-cursor-theme-backtace.patch new file mode 100644 index 0000000000..3f7a5e6873 --- /dev/null +++ b/gnu/packages/patches/virt-manager-fix-gtk-cursor-theme-backtace.patch @@ -0,0 +1,40 @@ +This patch fixes an issue in virt-manager 4.1.0 where it errors and returns a +stack trace. Namely, Gdk.Cursor.new_from_name yields a "constructor returned +NULL" error, which causes a "'NoneType' object has no attribute 'conn'" error +later. + +See the upstream bug report for more information: + +https://github.com/virt-manager/virt-manager/issues/479 + +Patch copied from upstream source repository: + +https://github.com/virt-manager/virt-manager/commit/cc4a39ea94f42bc92765eb3bb56e2b7f9198be67 + +From cc4a39ea94f42bc92765eb3bb56e2b7f9198be67 Mon Sep 17 00:00:00 2001 +From: Cole Robinson <crobinso@redhat.com> +Date: Thu, 19 Jan 2023 11:13:56 -0500 +Subject: [PATCH] asyncjob: Fix backtrace when no cursor theme installed + +Fixes: https://github.com/virt-manager/virt-manager/issues/479 + +Signed-off-by: Cole Robinson <crobinso@redhat.com> +--- + virtManager/asyncjob.py | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/virtManager/asyncjob.py b/virtManager/asyncjob.py +index 32d9c0a16..46692acea 100644 +--- a/virtManager/asyncjob.py ++++ b/virtManager/asyncjob.py +@@ -265,9 +265,7 @@ def run(self): + self.topwin.present() + + if not self.cancel_cb and self.show_progress: +- gdk_window = self.topwin.get_window() +- gdk_window.set_cursor( +- Gdk.Cursor.new_from_name(gdk_window.get_display(), "progress")) ++ self._set_cursor("progress") + self._bg_thread.start() + + diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 4e260d614d..458300529c 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -431,6 +431,13 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.") ,@(package-inputs poppler))) (synopsis "Qt5 frontend for the Poppler PDF rendering library"))) +(define-public poppler-qt6 + (package/inherit poppler + (name "poppler-qt6") + (inputs (modify-inputs (package-inputs poppler) + (append qtbase))) + (synopsis "Qt6 frontend for the Poppler PDF rendering library"))) + (define-public python-poppler-qt5 (package (name "python-poppler-qt5") diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 4d29535054..47511fb0e4 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2022, 2023 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -186,14 +187,14 @@ cards and generate meaningful file and folder names.") (define-public libraw (package (name "libraw") - (version "0.20.0") + (version "0.21.2") (source (origin (method url-fetch) (uri (string-append "https://www.libraw.org/data/LibRaw-" version ".tar.gz")) (sha256 (base32 - "18wlsvj6c1rv036ph3695kknpgzc3lk2ikgshy8417yfl8ykh2hz")))) + "00sbscniqrwj341gyvzkgcidfkmscgxx05s4dsplp186680qhwpy")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index e5e766f576..6f7e2c3fd9 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -62,7 +62,7 @@ (define-public php (package (name "php") - (version "8.3.8") + (version "8.3.9") (home-page "https://www.php.net/") (source (origin (method url-fetch) @@ -70,7 +70,7 @@ "php-" version ".tar.xz")) (sha256 (base32 - "1mxqbfp1jlrqc72wym798wyi6nckbc0cjl6kpg147yc6c6smi8xf")) + "0xvcmm2i9kkl2m0grw0nxhqa4hgrss5jg1c4z1j60d8als77nkdz")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 337d9b9a73..58a8a236f7 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -171,30 +171,29 @@ for unprivileged applications.") (define-public polkit-qt (package (name "polkit-qt") - (version "1-0.114.0") + (version "0.200.0") (source (origin - (method url-fetch) - (uri (string-append - "mirror://kde/stable/polkit-qt-1/" - "polkit-qt-" version ".tar.xz")) - (sha256 - (base32 - "0zlhwgkqn8g0rkjc7c5n7fbhyyl4jcv0rg5zlbzrb0l88ljg5c1f")))) + (method url-fetch) + (uri (string-append + "mirror://kde/stable/polkit-qt-1/" + name "-1-" version ".tar.xz")) + (sha256 + (base32 + "1yvp2s72fgpn5kf1a2ldy0givlmz0z4i1fsh6ylpcard0qf62fsx")))) (build-system cmake-build-system) (inputs - (list polkit)) - (propagated-inputs - (list qtbase-5)) + (list qtbase-5 polkit)) (native-inputs (list pkg-config)) (arguments - `(#:configure-flags (list (string-append "-DCMAKE_INSTALL_RPATH=" - (assoc-ref %outputs "out") - "/lib:" - (assoc-ref %outputs "out") - "/lib64")) - #:tests? #f)) ; there is a test subdirectory, but no test target + (list #:configure-flags + #~(list (string-append + "-DQT_MAJOR_VERSION=" + #$(version-major + (package-version (this-package-input "qtbase"))))) + #:tests? #f)) ; there is a test subdirectory, but no test target (home-page "https://api.kde.org/kdesupport-api/polkit-qt-1-apidocs/") + (properties `((upstream-name . "polkit-qt-1"))) (synopsis "Qt frontend to the polkit library") (description "Polkit-qt is a library that lets developers use the PolicyKit API through a Qt-styled API. It is mainly a wrapper around @@ -202,6 +201,13 @@ QAction and QAbstractButton that lets you integrate those two component easily with PolicyKit.") (license lgpl2.0+))) +(define-public polkit-qt6 + (package + (inherit polkit-qt) + (name "polkit-qt6") + (inputs (modify-inputs (package-inputs polkit-qt) + (replace "qtbase" qtbase))))) + (define-public polkit-gnome (package (name "polkit-gnome") diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm index b7cfca2eec..5432fc10c3 100644 --- a/gnu/packages/potassco.scm +++ b/gnu/packages/potassco.scm @@ -112,6 +112,7 @@ between aspif and smodels format or to a human-readable text format.") (url "https://github.com/potassco/clasp") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (patches (search-patches "clasp-hide-event-ids.patch")) (sha256 (base32 "0qap7rar8a5mkqz28n2hnvr4cfv5x0rh4zs3wdp919dw4d034chr")))) @@ -200,22 +201,7 @@ satisfiability checking (SAT).") (substitute* "cmake/ClingoConfig.cmake.in" (("find_package\\(Clasp") "find_package(clasp")) (rename-file "cmake/ClingoConfig.cmake.in" - "cmake/clingo-config.cmake.in"))) - (add-after 'unpack 'skip-failing-tests - (lambda _ - (with-directory-excursion "libclingo/tests" - (substitute* "CMakeLists.txt" - (("COMMAND test_clingo" all) - (string-append all - " -f " - "\"${CMAKE_CURRENT_SOURCE_DIR}/good.txt\""))) - (call-with-output-file "good.txt" - (lambda (port) - (for-each (lambda (test) (format port "~s~%" test)) - '("parse-ast-v2" "add-ast-v2" "build-ast-v2" - "unpool-ast-v2" "parse_term" - "propagator" "propgator-sequence-mining" - "symbol" "visitor")))))))))) + "cmake/clingo-config.cmake.in")))))) (inputs (list catch2-3 clasp libpotassco)) (native-inputs (list bison re2c mpark-variant @@ -465,10 +451,7 @@ directly from the python command line."))) (lambda _ ;; noclingo tests rely on this being set (setenv "CLORM_NOCLINGO" "1") - (delete-file "tests/test_mypy_query.py") - (substitute* "tests/test_clingo.py" - (("self\\.assertTrue\\(os_called\\)" all) - (string-append "# " all)))))))) + (delete-file "tests/test_mypy_query.py")))))) (propagated-inputs (list python-clingo)) (native-inputs (list python-typing-extensions)) (home-page "https://potassco.org") @@ -627,14 +610,6 @@ which allows user interfaces to be specified entirely as a logic program.") (base32 "0xzbby9ram55h87ykm652kgm45b8rlhbjc8gjkz308h1jnjllmmy")))) (build-system pyproject-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'delete-failing-tests - (lambda _ - ;; XXX: Clingo statistics are broken in dependencies already. - (for-each delete-file '("tests/test_solver.py" - "tests/test_test.py"))))))) (inputs (list python-clingo)) (native-inputs (list python-pytest)) (home-page "https://potassco.org/clintest/") diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index a5e68964f9..9f1e7c3e53 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -180,7 +180,7 @@ it.") (define-public trealla (package (name "trealla") - (version "2.53.10") + (version "2.54.5") (source (origin (method git-fetch) @@ -189,7 +189,7 @@ it.") (url "https://github.com/trealla-prolog/trealla") (commit (string-append "v" version)))) (sha256 - (base32 "15lbzbqsam4832jnynsj7ksn17xrwqwdhs66ajpi4jf8hy4bqh15")) + (base32 "1iwgss8jz16cddb286dv772f5hpassmxf4xv4rnrm1g6xf1ngi0h")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index d79427f28a..cb46af3490 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1225,22 +1225,17 @@ simpler.") (uri (pypi-uri "pytest-trio" version)) (sha256 (base32 "0c8cqf9by2884riksrqymqfp2g1d2d798a2zalcw9hmf34c786y0")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? inputs outputs #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-W" "error" "-ra" "-v" "--pyargs" - "pytest_trio" "--verbose" "--cov" "-k" - (string-append - ;; Needs network - "not test_async_yield_fixture_with_nursery" - " and not test_try" - ;; No keyboard interrupt in our build environment. - " and not test_actual_test")))))))) + (list + #:test-flags '(list "-W" "error" "-ra" "-v" "--pyargs" + "pytest_trio" "--verbose" "--cov" "-k" + (string-append + ;; Needs network + "not test_async_yield_fixture_with_nursery" + " and not test_try" + ;; No keyboard interrupt in our build environment. + " and not test_actual_test")))) (native-inputs (list python-hypothesis python-pytest python-pytest-cov)) (propagated-inputs diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 57b852c2bd..8ba3432637 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -567,29 +567,16 @@ swarm algorithm.") (define-public python-scikit-optimize (package (name "python-scikit-optimize") - (version "0.9.0") + (version "0.10.2") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/scikit-optimize/scikit-optimize") + (url "https://github.com/holgern/scikit-optimize") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0hsq6pmryimxc275yrcy4bv217bx7ma6rz0q6m4138bv4zgq18d1")) - (patches - ;; These are for compatibility with more recent versions of - ;; numpy and scikit-learn. - (search-patches "python-scikit-optimize-1148.patch" - "python-scikit-optimize-1150.patch")) - (modules '((guix build utils))) - (snippet - ;; Since scikit-learn 1.3 max_features no longer supports - ;; 'auto', which is identical to 'sqrt' - '(substitute* '("skopt/learning/forest.py" - "skopt/learning/tests/test_forest.py") - (("max_features=['\"]auto['\"]") - "max_features='sqrt'"))))) + "0pc6avzxz8l32km5jvv3maih0a5x2akxybvxl2hdg04qz2l0kz8b")))) (build-system pyproject-build-system) (propagated-inputs (list python-joblib diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index eef63351ef..30da9c8c3c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3606,13 +3606,13 @@ than Python’s urllib2 library.") (define-public python-requests-next (package (name "python-requests") - (version "2.31.0") + (version "2.32.3") (source (origin (method url-fetch) (uri (pypi-uri "requests" version)) (sha256 (base32 - "1qfidaynsrci4wymrw3srz8v1zy7xxpcna8sxpm91mwqixsmlb4l")))) + "0q5742pnibwy74169kacin3dmqg9jzmzk7qab5aq5caffcbm8djm")))) (build-system python-build-system) (propagated-inputs (list python-certifi @@ -6114,7 +6114,7 @@ event loop. It is implemented in Cython and uses libuv under the hood.") (base32 "1s7670qw36x90bgmazmgib170i5gnpyb2ypxzlla7y0mpasniag0")))) (outputs '("out" "doc")) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -6164,6 +6164,7 @@ event loop. It is implemented in Cython and uses libuv under the hood.") ,(map (lambda (output) (string-append output sitedir)) (list python out)))))))))) + (inputs (list bash-minimal)) (native-inputs (list binutils ;; for ctypes.util.find_library() python-aiohttp @@ -6181,6 +6182,21 @@ various web frameworks, simply implemented, light on server resources, and fairly speedy.") (license license:expat))) +(define-public gunicorn-next + (package + (inherit gunicorn) + (name "gunicorn") + (version "22.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "gunicorn" version)) + (sha256 + (base32 + "0qzc3ghayc137hlwrqqwkkhaf8f5h9ja21qwy4rznxpz75i462sa")))) + ;; CVE-2024-1135 is fixed in version 22.0.0. + (properties `((lint-hidden-cve . ("CVE-2024-1135")))))) + ;; break cyclic dependency for python-aiohttp, which depends on gunicorn for ;; its tests (define-public gunicorn-bootstrap @@ -6981,15 +6997,24 @@ changed the process is restarted.") (define-public python-pyowm (package (name "python-pyowm") - (version "3.2.0") + (version "3.3.0") (source (origin - (method url-fetch) - (uri (pypi-uri "pyowm" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/csparpa/pyowm") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1pm8w6phr4m3xayndfndid366vhf1fpvdgjsp2zicxarmgc0pm53")))) - (build-system python-build-system) - (propagated-inputs (list python-geojson python-pysocks python-requests)) + (base32 + "1ha4pp96y3jk33qnyir5851cnj4dc06q6wqn1b0w54l3fsds28vi")))) + (build-system pyproject-build-system) + (arguments (list #:test-flags #~(list "tests/unit"))) + (native-inputs (list python-pytest)) + (propagated-inputs + (list python-geojson-for-pyowm + python-pysocks + python-requests)) (home-page "https://github.com/csparpa/pyowm") (synopsis "Python wrapper around OpenWeatherMap web APIs") (description @@ -7399,7 +7424,7 @@ Encoding for HTTP.") (define-public python-cloud-init (package (name "python-cloud-init") - (version "23.4.3") + (version "24.2") (source (origin (method git-fetch) @@ -7408,7 +7433,7 @@ Encoding for HTTP.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0przjj2j1ws6b7sbgqxnffsarbbwl00lhq3bn7yiksp8kg8np1m1")))) + (base32 "18872z2y9wkh558y1bx5r0rksb4i584jbc8z4g8marwawhwxq506")))) (build-system pyproject-build-system) (arguments (list @@ -7422,6 +7447,7 @@ Encoding for HTTP.") (string-append ;; This test messes with PATH, so it cannot find mkdir "not test_path_env_gets_set_from_main" + " and not test_apt_configure_sources_list_" ;; These all fail because /bin/sh doesn't exist. We cannot patch ;; this because the generated scripts must use /bin/sh as they are ;; supposed to be run on minimal systems. @@ -7430,11 +7456,19 @@ Encoding for HTTP.") " and not test_subp_combined_stderr_stdout" " and not test_handle_part")) #:phases - '(modify-phases %standard-phases - (add-after 'unpack 'patch-references - (lambda _ - (substitute* "tests/unittests/cmd/test_clean.py" - (("#!/bin/sh") (string-append "#!" (which "sh"))))))))) + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-references + (lambda _ + (substitute* "tests/unittests/cmd/test_clean.py" + (("#!/bin/sh") (string-append "#!" (which "sh")))))) + (add-after 'install 'move-files + (lambda* (#:key inputs outputs #:allow-other-keys) + (for-each (lambda (dir) + (let ((source (string-append (site-packages inputs outputs) "/" dir)) + (target (string-append #$output "/" (basename dir)))) + (copy-recursively source target) + (delete-file-recursively source))) + (list "etc" "lib" "usr/lib" "usr/share"))))))) (propagated-inputs (list python-configobj python-jinja2 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 36f75b4b40..fcf01f3d04 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -91,7 +91,7 @@ ;;; Copyright © 2020 Diego N. Barbato <dnbarbato@posteo.de> ;;; Copyright © 2020 Liliana Marie Prikler <liliana.prikler@gmail.com> ;;; Copyright © 2019 Kristian Trandem <kristian@devup.no> -;;; Copyright © 2020, 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2020, 2021, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2020 EuAndreh <eu@euandre.org> ;;; Copyright © 2021, 2022 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; Copyright © 2021-2024 Sharlatan Hellseher <sharlatanus@gmail.com> @@ -99,7 +99,7 @@ ;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name> -;;; Copyright © 2021, 2023 jgart <jgart@dismail.de> +;;; Copyright © 2021, 2023-2024 jgart <jgart@dismail.de> ;;; Copyright © 2021 Danial Behzadi <dani.behzi@ubuntu.com> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr> @@ -153,6 +153,7 @@ ;;; Copyright © 2024 Navid Afkhami <navid.afkhami@mdc-berlin.de> ;;; Copyright © 2024 TakeV <takev@disroot.org> ;;; Copyright © 2024 David Elsing <david.elsing@posteo.net> +;;; Copyright © 2024 Rick Huijzer <ikbenrickhuyzer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -199,6 +200,7 @@ #:use-module (gnu packages docker) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) + #:use-module (gnu packages emulators) #:use-module (gnu packages enchant) #:use-module (gnu packages file) #:use-module (gnu packages fonts) @@ -2070,7 +2072,7 @@ task of adding retry behavior to just about anything.") (define-public python-pytelegrambotapi (package (name "python-pytelegrambotapi") - (version "3.7.4") + (version "4.21.0") (source (origin (method git-fetch) @@ -2079,21 +2081,21 @@ task of adding retry behavior to just about anything.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0r7g5zs0fk3g2dxvbpl0pi730x7r2kalrhn30fs0pvc15a59fmxz")))) - (build-system python-build-system) + (base32 "14df0mll9q8x4fka4lihmz4vdlgrvc4i13bspxnig2qz1b3k4ivv")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (with-directory-excursion "tests" - (invoke "py.test"))) - #t))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "py.test")))))))) (propagated-inputs (list python-requests)) (native-inputs - (list python-pytest)) + (list python-hatchling python-pytest)) (home-page "https://github.com/eternnoir/pyTelegramBotAPI") (synopsis "Python Telegram bot api") (description "This package provides a simple, but extensible Python @@ -2112,13 +2114,14 @@ implementation for the Telegram Bot API.") (base32 "1s7x0v872h8aks8xp01wmv6hzisxqjrh1svbbcycir0980h76krl")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (invoke "python" "-m" "pytest"))))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "python" "-m" "pytest"))))))) (native-inputs (list python-pytest)) (home-page "https://github.com/borntyping/python-colorlog") @@ -2161,7 +2164,7 @@ of a loop structure or other iterative computation.") (arguments (list #:tests? #false)) ;there are none (propagated-inputs (list python-beautifulsoup4 - python-emoji + python-emoji-for-gh-md-to-html python-pillow python-requests python-shellescape @@ -7016,6 +7019,23 @@ format.") text styles of documentation.") (license license:asl2.0))) +(define-public python-pygdbmi + (package + (name "python-pygdbmi") + (version "0.11.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pygdbmi" version)) + (sha256 + (base32 "1c0z4snkjiyl1iq4m1k6liwg0b4pdv2as4bfyvcm0mpjzki6na3s")))) + (build-system pyproject-build-system) + (home-page "https://github.com/cs01/pygdbmi") + (synopsis "Parse gdb machine interface output with Python") + (description "This package provides a parse gdb machine interface output +with Python.") + (license license:expat))) + (define-public python-pygments (package (name "python-pygments") @@ -8919,59 +8939,6 @@ debugger, with which it shares the same interface.") @code{fsspec} for IPFS.") (license license:expat))) -(define-public python-pdbpp - ;; The latest release lacks support for Python 3.10; use the latest commit - ;; of the master branch (see: https://github.com/pdbpp/pdbpp/issues/503). - (let ((commit "e1c2e347cc55a6dd89e058e56a1366ada68884bc") - (revision "0")) - (package - (name "python-pdbpp") - (version (git-version "0.10.3" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pdbpp/pdbpp") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1hql1ldwa9czml7zrnv6qdzgpywwav3a282dbvqypf108zvjsdiw")))) - (build-system python-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-before 'build 'pretend-version - (lambda _ - (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" - #$(package-version this-package)))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" - "-k" - (string-append - ;; These tests seem to require a real TTY. - "not interaction_restores_previous_sigint_handler " - "and not python_m_pdb_uses_pdbpp")))))))) - (propagated-inputs - (list python-fancycompleter python-pygments python-wmctrl)) - (native-inputs - (list python-pytest python-setuptools-scm)) - (home-page "https://github.com/pdbpp/pdbpp") - (synopsis "Drop-in replacement for pdb") - (description "Pdb++ is a drop-in replacement for @code{pdb}. It -includes the following improvements compared to @code{pdb}: -@itemize -@item auto-completion -@item syntax highlighting of code listings -@item sticky mode -@item new commands to be used from the interactive (Pdb++) prompt -@item smart command parsing -@item additional convenience functions in the @code{pdb} module. -@end itemize") - (license license:bsd-3)))) - (define-public python-pdftotext (package (name "python-pdftotext") @@ -10061,6 +10028,28 @@ Storage or Compound Document, Microsoft Office). It is an improved version of the OleFileIO module from PIL, the Python Image Library.") (license license:bsd-3))) +(define-public python-property-cached + (package + (name "python-property-cached") + (version "1.6.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "property-cached" version ".zip")) + (sha256 + (base32 "0wxv5sdx1p7ils36j6j6hfscz8v2vzbq212i8y8r0lrnxpqlx71y")))) + (build-system pyproject-build-system) + (arguments + (list + ;; AssertionError. + #:test-flags #~(list "-k" "not test_threads_ttl_expiry"))) + (native-inputs (list python-freezegun python-pytest unzip)) + (home-page "https://github.com/althonos/property-cached/") + (synopsis "Decorator for caching properties in classes") + (description "This package provides a decorator for caching properties in +classes. It is forked from @code{cached-property}.") + (license license:bsd-3))) + (define-public python-pypdf3 (package (name "python-pypdf3") @@ -14150,30 +14139,40 @@ replacement for dictionaries where immutability is desired.") (define-public python-emoji (package (name "python-emoji") - (version "1.6.1") + (version "2.12.1") (source (origin (method url-fetch) (uri (pypi-uri "emoji" version)) (sha256 - (base32 "0923mpixwq6hdpkgvi4r46alfvf608iq975rb8lnqpq29j71mmjk")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "python" "-m" "pytest"))))))) - (native-inputs - (list python-pytest)) + (base32 "1svk94pad8gcvjwd329zmfrw09wakwh6qjvnhf6sa6k92y44i82a")))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest python-typing-extensions)) (home-page "https://github.com/carpedm20/emoji/") (synopsis "Emoji terminal output for Python") - (description "This package provides Emoji terminal output for Python. The + (description + "This package provides Emoji terminal output for Python. The entire set of Emoji codes as defined by the Unicode Consortium is supported in addition to a bunch of aliases.") (license license:bsd-3))) +;; TODO: Remove this package when upgrading python-gh-md-to-html to the +;; latest version. The latest gh-md-to-html does not build successfully from +;; the PyPI distribution. Let's resolve #72102 while keeping gh-md-to-html at +;; version 1.21.2 from failing. +;; https://issues.guix.gnu.org/72102 +;; https://github.com/phseiff/github-flavored-markdown-to-html/issues/73 +(define-public python-emoji-for-gh-md-to-html + (package + (inherit python-emoji) + (version "1.6.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "emoji" version)) + (sha256 + (base32 "0923mpixwq6hdpkgvi4r46alfvf608iq975rb8lnqpq29j71mmjk")))))) + (define-public python-sarge (package (name "python-sarge") @@ -16041,17 +16040,14 @@ Python code formatter \"black\".") (define-public python-geojson (package (name "python-geojson") - (version "2.5.0") + (version "3.1.0") (source (origin (method url-fetch) (uri (pypi-uri "geojson" version)) (sha256 - (base32 "12k5bzqskvq3gqzkryarhdjl0df47y5k9cf8r3clasi2wjnbfjvf")))) - (build-system python-build-system) - (arguments - ;; https://github.com/jazzband/geojson/issues/175 - `(#:tests? #f)) + (base32 "1b5df7skx3906046j12yjv8gdbcy17q9y3lbqbpmi83yf90gm9sq")))) + (build-system pyproject-build-system) (home-page "https://github.com/jazzband/geojson") (synopsis "Python bindings and utilities for GeoJSON") (description @@ -16060,6 +16056,21 @@ Python code formatter \"black\".") structures.") (license license:bsd-3))) +;; pyowm only accepts a version less than version 3. +(define-public python-geojson-for-pyowm + (package + (inherit python-geojson) + (version "2.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "geojson" version)) + (sha256 + (base32 "12k5bzqskvq3gqzkryarhdjl0df47y5k9cf8r3clasi2wjnbfjvf")))) + (arguments + ;; https://github.com/jazzband/geojson/issues/175 + (list #:tests? #f)))) + (define-public wfetch (let ((commit "e1cfa37814aebc9eb56ce994ebe877b6a6f9a715") (revision "1")) @@ -18454,45 +18465,24 @@ with a new public API, and RPython support.") (define-public python-hy (package (name "python-hy") - (version "0.28.0") + (version "0.29.0") (source (origin - (method git-fetch) ; no tests in PyPI release + (method git-fetch) ;no tests in PyPI release (uri (git-reference (url "https://github.com/hylang/hy") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0fs9ydqlbhmp4l3lf8ap8bksbpmlscm6gz7zf9bv2kmcldkjlzsw")))) - (build-system python-build-system) + (base32 "0fp5x94hyckjfap2pb1rj551a3q70vrljxark7hj9kdhr7prbggi")))) + (build-system pyproject-build-system) (arguments (list - #:phases - #~(modify-phases %standard-phases - ;; Hy includes a script that writes a version.py file that Hy uses to - ;; report its version. That script uses information from the git - ;; repository or the HY_VERSION environment variable. Therefore, - ;; these phases set HY_VERSION and then remove the support scripts - ;; which get installed in the root of the output. - (add-after 'unpack 'set-version - (lambda _ - (setenv "HY_VERSION" #$version))) - (add-after 'install 'remove-installed-build-scripts - (lambda _ - (delete-file-recursively (string-append #$output "/get_version")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "python" "-m" "pytest" "-k" - (string-append ; skip some failed tests - "not test_sys_executable" - " and not test_circular_macro_require" - " and not test_macro_require" - " and not test_requires_pollutes_core")))))))) - (native-inputs - (list python-pytest-next python-wheel)) - (propagated-inputs - (list python-funcparserlib)) + ;; This test expects the hy executable to be called 'hy', but in Guix + ;; it's .hy-real. + #:test-flags #~(list "-k" "not test_sys_executable"))) + (native-inputs (list python-pytest-next python-wheel)) + (propagated-inputs (list python-funcparserlib)) (home-page "https://docs.hylang.org/en/stable/") (synopsis "Lisp frontend to Python") (description @@ -20017,7 +20007,7 @@ encoding algorithms to do fuzzy string matching.") (define-public python-pdfminer-six (package (name "python-pdfminer-six") - (version "20201018") + (version "20231228") ;; There are no tests in the PyPI tarball. (source (origin @@ -20027,23 +20017,19 @@ encoding algorithms to do fuzzy string matching.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1a2fxxnnjqbx344znpvx7cnv1881dk6585ibw01inhfq3w6yj2lr")))) - (build-system python-build-system) + (base32 "1anyr0gm7amwls8qifflql1viz5rq6q95lfwcg43v3180h4w8wrd")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - ;; Tests write to the source tree. - (add-after 'unpack 'make-git-checkout-writable - (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) - (replace 'check - (lambda _ - (invoke "make" "test")))))) + (list #:phases + #~(modify-phases %standard-phases + ;; Tests write to the source tree. + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files "."))))))) (propagated-inputs - (list python-chardet python-cryptography python-sortedcontainers)) + (list python-charset-normalizer python-cryptography)) (native-inputs - (list python-nose python-tox)) + (list python-pytest)) (home-page "https://github.com/pdfminer/pdfminer.six") (synopsis "PDF parser and analyzer") (description "@code{pdfminer.six} is a community maintained fork of @@ -23331,23 +23317,32 @@ efficient as possible on all supported Python versions.") Mustache templating language renderer.") (license license:expat))) +;; XXX: Try to inherit from duckdb and build from source with all extentions. (define-public python-duckdb (package (name "python-duckdb") - (version "0.8.1") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "duckdb" version)) (sha256 (base32 - "1sgfmii5xlkbx3hzyjxg80gl2ni1rxpabahl4gww9by2mgs3fkd5")))) + "0lyl6di1c7j31i2mk384j711kzyyf9rjd3nqx5mbgmf7gfvmk852")))) (build-system pyproject-build-system) (arguments (list #:test-flags - '(list "--ignore=tests/slow/test_h2oai_arrow.py" - ;; Don't install anything, thank you. - "-k" "not test_install_non_existent_extension") + #~(list "--ignore=tests/slow/test_h2oai_arrow.py" + ;; Do not relay on mypy. + "--ignore=tests/stubs/test_stubs.py" + "-k" (string-append + ;; Don't install anything, thank you. + "not test_install_non_existent_extension" + ;; See <https://github.com/duckdb/duckdb/issues/11961>. + " and not test_fetchmany" + ;; See <https://github.com/duckdb/duckdb/issues/10702>. + " and not test_connection_interrupt" + " and not test_query_interruption")) #:phases #~(modify-phases %standard-phases ;; Tests need this @@ -23366,11 +23361,12 @@ Mustache templating language renderer.") "pyfilesystem.hpp" "pybind11/conversions/pyconnection_default.hpp") (("const_name") "_")))))))) + (propagated-inputs + (list python-adbc-driver-manager)) (native-inputs (list pybind11 python-fsspec python-google-cloud-storage - python-mypy python-numpy python-pandas python-psutil @@ -24736,6 +24732,35 @@ manipulation, or @code{stdout}.") and integration into other projects.") (license license:asl2.0)))) +(define-public python-sacn + (package + (name "python-sacn") + (version "1.10.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sacn" version)) + (sha256 + (base32 "02pqfwwx83lgb8nj9p0s6vyi1s7wjgbx9k0bzlyz8qapszzdsr37")))) + (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) + (native-inputs (list python-pytest)) + (home-page "https://github.com/Hundemeier/sacn") + (synopsis + "Python library for sending and receiving sACN data") + (description + "This package provides a Python library for sending and receiving + sACN (Streaming Architecture for Control Networks) data, a standard + protocol used for controlling lighting and other devices over + a network.") + (license license:expat))) + (define-public python-bagit (package (name "python-bagit") @@ -26316,6 +26341,7 @@ source bytes using the UTF-8 encoding and then rewrites Python 3.6 style @code{f} strings.") (license license:expat))) +;; TODO: https://github.com/python/typed_ast/issues/179 (define-public python-typed-ast (package (name "python-typed-ast") @@ -26331,11 +26357,12 @@ source bytes using the UTF-8 encoding and then rewrites Python 3.6 style (file-name (git-file-name name version)))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "pytest")))))) + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) (native-inputs (list python-pytest)) (home-page "https://github.com/python/typed_ast") (synopsis "Fork of Python @code{ast} modules with type comment support") @@ -33804,6 +33831,382 @@ instructions up to AVX-512 and SHA (including 3dnow!+, XOP, FMA3, FMA4, TBM and BMI2).") (license license:bsd-2)))) +(define-public python-ailment + (package + (name "python-ailment") + ;; Must be the same version as python-angr. + (version "9.2.46") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ailment" version)) + (sha256 + (base32 "073fcssbjis1ckwv2w0dcz2dfl6715bj4d4qdhspajj911mvng2f")))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + ;; Many tests are skipped due to cyclic dependencies. + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest")))))))) + (home-page "https://github.com/angr/ailment") + (synopsis "The angr intermediate language") + (description + "This Python module implements an @acronym{IL, Intermediate Language}, +also known as @acronym{IR, Intermediate Representation}, used by the angr +binary analysis platform.") + (license license:bsd-2))) + +(define-public python-cle + (package + (name "python-cle") + ;; Must be the same version as python-angr. + (version "9.2.46") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cle" version)) + (sha256 + (base32 "0mswv9gd2p2ws7zfsshqv5ybbj27wkdwakdcknq4vsrx9ry9k4yc")))) + (build-system pyproject-build-system) + (arguments + (list + #:tests? #f)) + (propagated-inputs (list python-pefile python-pyelftools python-pyvex + python-sortedcontainers)) + (native-inputs (list python-cffi)) + (home-page "https://github.com/angr/cle") + (synopsis "Python loader for binaries and their associated libraries") + (description + "CLE loads binaries and their associated libraries, resolves +imports and provides an abstraction of process memory the same way as if +it was loader by the operating system's loader.") + (license license:bsd-2))) + +(define-public python-pyvex + (package + (name "python-pyvex") + ;; Must be the same version as python-angr. + (version "9.2.46") + (source + (origin + (method url-fetch) + (patches (search-patches "python-pyvex-remove-angr-dependency.patch")) + (uri (pypi-uri "pyvex" version)) + (sha256 + (base32 "1v64rn7gxy6fg065bgsy38z6r494k5ri5r6sn4g08hjj32ihx1ka")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest"))))) + + (add-before 'build 'set-cc + (lambda _ + (setenv "CC" #$(cc-for-target)) + (setenv "CC_NATIVE" "gcc")))))) + (propagated-inputs (list python-archinfo python-bitstring python-cffi)) + (home-page "https://github.com/angr/pyvex") + (synopsis "Python interface to libVEX and VEX IR") + (description + "This package provides a Python interface the libVEX and VEX IR. +VEX is the intermediate representation (also known as intermediate +language) used by the Valgrind analysis tool. As such, VEX is designed +to enable all kinds of binary analysis tasks.") + (license license:bsd-2))) + +(define-public python-claripy + (package + (name "python-claripy") + ;; Must be the same version as python-angr. + (version "9.2.46") + (source + (origin + ;; Fetching from Git as pypi release doesn't include all test files. + (method git-fetch) + (uri (git-reference + (url "https://github.com/angr/claripy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0nmawpi1596d9plafrp2db36cjsidy2fagkzkja51jwlx2m1ngai")) + (modules '((guix build utils))) + (snippet '(begin + (substitute* "setup.cfg" + ;; Relax the z3 version constraint. + ;; See https://github.com/angr/claripy/commit/d1fe2df + (("z3-solver==4.10.2.0") + "")))))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest")))))))) + (propagated-inputs (list python-cachetools python-decorator python-pysmt + z3)) + (home-page "https://github.com/angr/claripy") + (synopsis "Abstraction layer for constraint solvers") + (description + "This Python module provides an abstraction layer for interacting +with constraint solvers. Specifically, it is intended to be used with +SMT solvers and is built on top of the Z3 solver.") + (license license:bsd-2))) + +(define-public python-pysmt + (package + (name "python-pysmt") + (version "0.9.5") + (source + (origin + ;; Fetching from Git as pypi release doesn't include all test files. + (method git-fetch) + (patches (search-patches "python-pysmt-fix-pow-return-type.patch" + "python-pysmt-fix-smtlib-serialization-test.patch")) + (uri (git-reference + (url "https://github.com/pysmt/pysmt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0hrxv23y5ip4ijfx5pvbwc2fq4zg9jz42wc9zqgqm0g0mjc9ckvh")))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'check 'set-pysmt-solver + (lambda _ + (setenv "PYSMT_SOLVER" "z3")))))) + (native-inputs (list python-pytest)) + (propagated-inputs (list z3)) + (home-page "https://github.com/pysmt/pysmt") + (synopsis + "Solver-agnostic library for SMT formula manipulation and solving") + (description + "This Python module provides a solver-agnostic abstraction for +working with @acronym{SMT, Satisfiability Modulo Theory} formulas. For example, +it allows manipulation and solving such formulas.") + (license license:asl2.0))) + +(define-public python-rpyc + (package + (name "python-rpyc") + (version "5.3.1") + (source + (origin + ;; Fetching from Git as pypi release doesn't include all test files. + (method git-fetch) + (uri (git-reference + (url "https://github.com/tomerfiliba-org/rpyc") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15mnp9qkyw3mmxmr5y4kf3xkvxyp00n892vqaqwznr7al35apgnr")) + (snippet '(begin + ;; Disable deploy tests, these rely on OpenSSH and require + ;; configuring the SSH client manually to accept the host key. + (delete-file "tests/test_deploy.py") + ;; Disable tests requiring network access. These tests + ;; presently fail with the error "Network is unreachable". + (delete-file "tests/test_registry.py"))))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest")))))))) + (propagated-inputs (list python-hatchling python-plumbum)) + (home-page "https://github.com/tomerfiliba-org/rpyc") + (synopsis + "Remote Python Call (RPyC) is a symmetric distributed computing library") + (description + "This Python module enables remote procedure calls, clustering, and +distributed-computing. For this purpose, it makes use of object-proxying, a technique +that employs python's dynamic nature, to overcome the physical boundaries between +processes and computers, so that remote objects can be manipulated as if they +were local.") + (license license:expat))) + +(define-public python-nampa + (package + (name "python-nampa") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "nampa" version)) + (sha256 + (base32 "0k6cq2gflpkm40qhgqbbcjmq5lq589c15bmk567qyh3d08062hvd")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-future)) + (home-page "https://github.com/thebabush/nampa") + (synopsis "Python implementation of IDA Pro's FLIRT technology") + (description + "This Python module implements the @acronym{FLIRT, Fast Library Identification +and Recognition Technology}. This technology is useful for identifying +common library subroutines in disassembled binaries.") + (license license:lgpl3))) + +(define-public python-mulpyplexer + (package + (name "python-mulpyplexer") + (version "0.09") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mulpyplexer" version)) + (sha256 + (base32 "0c5xzci1djy1yi9hxxh8g67l6ms8r7ad7ja20pv8hfbdysdrwkhl")))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "mulpyplexer.py"))))))) + (home-page "https://github.com/zardus/mulpyplexer/") + (synopsis "Multiplexes interactions with lists of Python objects") + (description "This module provides utilities for multiplexing +interactions with lists of Python objects.") + (license license:bsd-2))) + +(define-public python-itanium-demangler + (package + (name "python-itanium-demangler") + (version "1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + ;; PyPI only provides wheels and no source code. + (url "https://github.com/whitequark/python-itanium_demangler") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1q47aqm5z3db6pasdzw05d6236vnb8hnapfy88fcmn9dr5ym98r3")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest")))))))) + (home-page "https://github.com/whitequark/python-itanium_demangler/") + (synopsis "Pure Python Itanium C++ ABI demangler") + (description +"This Python module provides an implementation of the Itanium C++ ABI symbol +mangling language. The demangler generates an abstract syntax tree from +mangled symbols, which can be used for directly extracting type information.") + (license license:bsd-0))) + +(define-public python-angr + (package + (name "python-angr") + (version "9.2.46") + (source + (origin + ;; Fetching from Git as pypi release doesn't include all test files. + (method git-fetch) + (patches (search-patches "python-angr-addition-type-error.patch" + "python-angr-check-exec-deps.patch")) + (uri (git-reference + (url "https://github.com/angr/angr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "18y9wyf7va7gvp9zd6lhw82j9a2x2ajsvbawh96xnxzml0jwlwjm")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((coreutils (assoc-ref inputs "coreutils"))) + (substitute* "tests/test_vault.py" + (("/bin/false") + (which "false"))) + (substitute* "tests/common.py" + (("\\[\"cc\"\\]") + "[\"gcc\"]"))))) + (replace 'check + (lambda* (#:key inputs tests? #:allow-other-keys) + (when tests? + (copy-recursively #$(this-package-native-input "binaries") + "../binaries") + (with-directory-excursion "tests" + ;; test_mips32_missing_offset_in_instructions fails + ;; with capstone 5 and passes with capstone 4. Might + ;; be a capstone regressions, needs investigation. + ;; + ;; test_concrete_memset is a non-deterministic benchmark. + (invoke "pytest" "-vv" "-x" "--dist" "loadfile" + "-k" "not test_mips32_missing_offset_in_instructions and not test_concrete_memset" + "-n" (number->string (parallel-job-count))))))) + (add-before 'build 'set-cc + (lambda _ + (setenv "CC" "gcc")))))) + (propagated-inputs (list python-ailment + python-archinfo + python-cachetools + python-cffi + python-claripy + python-cle + python-colorama + python-cppheaderparser + python-dpkt + python-gitpython + python-mulpyplexer + python-nampa + python-networkx + python-protobuf + python-psutil + python-itanium-demangler + python-pycparser + python-pyvex + python-progressbar2 + python-rpyc + python-sortedcontainers + python-sqlalchemy + python-sympy + unicorn)) + (native-inputs `(("python-pytest" ,python-pytest) + ("python-pytest-xdist" ,python-pytest-xdist) + ("binaries" + ;; This repository ships several binaries used only for testing + ;; purpose. The binaries are not executed and not part of the + ;; angr distribution, they are only used to test angr's binary + ;; analysis capabilities. In the context of the GNU FSDG, these + ;; files should be considered non-functional data. + ,(origin + (method git-fetch) + (uri (git-reference (url + "https://github.com/angr/binaries") + (commit (string-append "v" + version)))) + (file-name (git-file-name "angr-binaries" version)) + (sha256 (base32 + "1f286b2239zavxzwg1184hj1zs380cr9qr549mvy3vywvm8bsmgr")))))) + (home-page "https://github.com/angr/angr") + (synopsis "Multi-architecture binary analysis toolkit") + (description + "This package provides a versatile binary analysis platform with the +ability to perform dynamic symbolic execution as well as various +static analyses directly on binaries. As such, it can be used for all +kinds of reverse engineering, vulnerability discovery, exploit +generation, and software testing purposes.") + (license license:bsd-2))) + (define-public python-peachpy ;; There is no tag in this repo. (let ((commit "913d74c35a6b1d330e90bfc055208ce5b06b35a0") @@ -37099,6 +37502,48 @@ write text fast, and for various text generation, statistics, and modeling tasks (base32 "0mikjfvq26kh8asnn9v55z41pap4c5ypymqnwwi4xkavc3mzyda2")))))) +(define-public python-xmp-toolkit + (package + (name "python-xmp-toolkit") + (version "2.0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-xmp-toolkit" version)) + (sha256 + (base32 "12x6lyaxjpbl8ll3cj97039kwvsha2nkx2v8v8irfbi2p0dl721s")) + (patches (search-patches + "python-xmp-toolkit-add-missing-error-codes.patch")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list "-k" (string-append "not test_can_put_xmp and " + "not test_exempi_bad_combinations and " + "not test_formats and " + "not test_get_xmp and " + "not test_open_file_with_options")) + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'configure-environment + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((exempi #$(this-package-input "exempi"))) + (setenv "LD_LIBRARY_PATH" + (string-append exempi "/lib")))))))) + (inputs (list exempi)) + (propagated-inputs (list python-pytz)) + (native-inputs (list python-pytest)) + (home-page "https://github.com/python-xmp-toolkit/python-xmp-toolkit") + (synopsis "Python XMP Toolkit for working with metadata.") + (description "Python XMP Toolkit is a library for working with XMP +metadata, as well as reading/writing XMP metadata stored in many different +file formats. + +Python XMP Toolkit is wrapping Exempi (using ctypes), a C/C++ XMP library +based on Adobe XMP Toolkit, ensuring that future updates to the XMP standard +are easily incorporated into the library with a minimum amount of work.") + (license license:bsd-3))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 1074c29063..0138fd3dbf 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -140,7 +140,7 @@ (define-public qcoro-qt5 (package (name "qcoro-qt5") - (version "0.9.0") + (version "0.10.0") (source (origin (method git-fetch) @@ -149,11 +149,14 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0pk5ybk6zv7m0wnkl6m3m8sjybmfk6wcn22mmgj942hrc3yrdzci")))) + (base32 "0inhjc9zknc64q6gajkljfpm2287arg1j0848ia3rhqcbc53k28b")))) (build-system qt-build-system) (arguments (list #:configure-flags - #~(list "-DUSE_QT_VERSION=5"))) + #~(list (string-append "-DUSE_QT_VERSION=" + #$(version-major + (package-version + (this-package-input "qtbase"))))))) (native-inputs (list dbus)) ;for tests (inputs (list qtbase-5 qtdeclarative-5 qtwebsockets-5)) (home-page "https://qcoro.dvratil.cz/") @@ -162,6 +165,16 @@ of C++20 coroutines in connection with certain asynchronous Qt actions.") (license license:expat))) +(define-public qcoro-qt6 + (package + (inherit qcoro-qt5) + (name "qcoro-qt6") + (inputs (modify-inputs (package-inputs qcoro-qt5) + (replace "qtbase" qtbase) + (replace "qtdeclarative" qtdeclarative) + (replace "qtwebsockets" qtwebsockets) + (append libxkbcommon))))) + (define-public qmdnsengine ;; Used as submodule in https://github.com/moonlight-stream/moonlight-qt (let ((commit "b7a5a9f225d5e14b39f9fd1f905c4f505cf2ee99") @@ -256,7 +269,7 @@ window managers, that don't provide Qt integration by themselves.") (define-public kddockwidgets (package (name "kddockwidgets") - (version "2.0.0") + (version "2.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -265,17 +278,18 @@ window managers, that don't provide Qt integration by themselves.") (file-name (git-file-name name version)) (sha256 (base32 - "1fcmfz9my3219r0kh2y8yfvq372pd65z4s6hm0js7j8qb47lr02p")))) + "0s4s0y8kvkyf15d5kzcd5wik7n1jj9mxrmc60irlacfy93hmdaw0")))) (build-system cmake-build-system) - (arguments (list #:configure-flags #~(list "-DKDDockWidgets_TESTS=ON"))) + (arguments (list #:configure-flags #~(list + "-DKDDockWidgets_QT6=ON" + "-DKDDockWidgets_TESTS=ON"))) (inputs (list fmt nlohmann-json - qtbase-5 - qtdeclarative-5 - qtquickcontrols2-5 - qtx11extras - spdlog)) + qtbase + qtdeclarative + spdlog + libxkbcommon)) (home-page "https://github.com/KDAB/KDDockWidgets") (synopsis "KDAB's Dock Widget Framework for Qt") (description "KDDockWidgets is a Qt dock widget library suitable for @@ -2261,7 +2275,7 @@ native APIs where it makes sense."))) Server Protocol (LSP) for Qt.") (license (package-license qtbase)))) -(define-public qtlocation +(define-public qtlocation-5 (package (inherit qtsvg-5) (name "qtlocation") @@ -2286,6 +2300,32 @@ Server Protocol (LSP) for Qt.") (description "The Qt Location module provides an interface for location, positioning and geolocation plugins."))) +(define-public qtlocation + (package + (inherit qtsvg) + (name "qtlocation") + (version "6.6.3") + (source (origin + (method url-fetch) + (uri (qt-url name version)) + (sha256 + (base32 + "1l81z3zq1zg015l6qxx4yzssdspw689m9bpzxp23yshaych2kd6p")))) + (arguments + (substitute-keyword-arguments (package-arguments qtsvg) + ((#: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)) + (inputs (list icu4c openssl qtbase zlib qtdeclarative qtpositioning + libxkbcommon)) + (synopsis "Qt Location and Positioning modules") + (description "The Qt Location module provides an interface for location, +positioning and geolocation plugins."))) + (define-public qtlottie (package (name "qtlottie") @@ -2605,8 +2645,18 @@ also contains functionality to support data models and executable content.") (add-after 'install 'delete-installed-tests (lambda _ (delete-file-recursively - (string-append #$output "/tests"))))))) - (inputs (list perl qtbase)) + (string-append #$output "/tests")))) + (delete 'check) ;move after the install phase + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-before 'check 'check-setup + (lambda _ + (setenv "QML_IMPORT_PATH" + (string-append #$output "/lib/qt6/qml:" + (getenv "QML_IMPORT_PATH"))) + ;; Make Qt render "offscreen", required for tests. + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (inputs (list perl qtbase qtdeclarative qtserialport libxkbcommon)) (home-page (package-home-page qtbase)) (synopsis "QML and C++ positioning information API") (description "The Qt Positioning API provides positioning information via @@ -3938,7 +3988,7 @@ module provides support functions to the automatically generated code.") ("qtbase" ,qtbase-5) ("qtconnectivity" ,qtconnectivity) ("qtdeclarative-5" ,qtdeclarative-5) - ("qtlocation" ,qtlocation) + ("qtlocation" ,qtlocation-5) ("qtmultimedia-5" ,qtmultimedia-5) ("qtsensors" ,qtsensors-5) ("qtserialport" ,qtserialport-5) @@ -4318,17 +4368,17 @@ This package provides the Python bindings."))) (define-public qtkeychain (package (name "qtkeychain") - (version "0.13.2") + (version "0.14.3") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/frankosterfeld/qtkeychain/") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1zk6r2vc1q48qs7mw2h47bpgrfbb9r7lf9cwq4sb1a4nls87zznk")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/frankosterfeld/qtkeychain/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1li40ka0g8v2f1q01gpabpx264wmk5zrv2961sg3byj70kf9fmgv")))) (build-system cmake-build-system) (native-inputs (list pkg-config qttools-5)) @@ -4341,15 +4391,38 @@ This package provides the Python bindings."))) (add-before 'configure 'set-qt-trans-dir (lambda _ (substitute* "CMakeLists.txt" - (("\\$\\{qt_translations_dir\\}") - "${CMAKE_INSTALL_PREFIX}/share/qt5/translations"))))))) + (("\\$\\{qt_translations_dir\\}") + "${CMAKE_INSTALL_PREFIX}/share/qt5/translations"))))))) (home-page "https://github.com/frankosterfeld/qtkeychain") (synopsis "Qt API to store passwords") (description - "QtKeychain is a Qt library to store passwords and other secret data + "QtKeychain is a Qt library to store passwords and other secret data securely. It will not store any data unencrypted unless explicitly requested.") (license license:bsd-3))) +(define-public qtkeychain-qt6 + (package + (inherit qtkeychain) + (name "qtkeychain-qt6") + (native-inputs + (modify-inputs (package-native-inputs qtkeychain) + (replace "qttools" qttools))) + (inputs + (modify-inputs (package-inputs qtkeychain) + (replace "qtbase" qtbase))) + (arguments + (substitute-keyword-arguments (package-arguments qtkeychain) + ((#:configure-flags flags #~(list)) + #~(cons "-DBUILD_WITH_QT6=ON" #$flags)) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (replace 'set-qt-trans-dir + (lambda _ + (lambda _ + (substitute* "CMakeLists.txt" + (("\\$\\{qt_translations_dir\\}") + "${CMAKE_INSTALL_PREFIX}/share/qt6/translations"))))))))))) + (define-public qtsolutions (let ((commit "9568abd142d581b67b86a5f63d823a34b0612702") (revision "53")) @@ -4775,7 +4848,7 @@ color-related widgets.") (list qtbase-5 qtdatavis3d qtdeclarative-5 - qtlocation + qtlocation-5 qtmultimedia-5 qtquickcontrols-5 qtquickcontrols2-5 @@ -5144,7 +5217,7 @@ and import their menus over DBus.") (define-public kdsoap (package (name "kdsoap") - (version "2.0.0") + (version "2.2.0") (source (origin (method url-fetch) @@ -5152,18 +5225,18 @@ and import their menus over DBus.") "kdsoap-" version "/kdsoap-" version ".tar.gz")) (sha256 (base32 - "1vh4rzb09kks1ilay1y60q7gf64gwzdwsca60hmx1xx69w8672fi")))) + "0mpkg9iyvzb6mxvhbi6zc052ids2r2nzpmjbljgpq6a2hja13vyr")))) (build-system qt-build-system) - (inputs `(("qtbase" ,qtbase-5))) + (inputs (list qtbase-5)) (arguments - '(#:configure-flags '("-DKDSoap_TESTS=true") - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "ctest" "-E" ;; These tests try connect to the internet. - "(kdsoap-webcalls|kdsoap-webcalls_wsdl|kdsoap-test_calc)"))))))) + (list #:configure-flags #~(list "-DKDSoap_TESTS=true") + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest" "-E" ;; These tests try connect to the internet. + "(kdsoap-test_webcalls|kdsoap-test_webcalls_wsdl|kdsoap-test_calc)"))))))) (home-page "https://www.kdab.com/development-resources/qt-tools/kd-soap/") (synopsis "Qt SOAP component") (description "KD SOAP is a tool for creating client applications for web @@ -5171,10 +5244,20 @@ services using the XML based SOAP protocol and without the need for a dedicated web server.") (license (list license:gpl2 license:gpl3)))) +(define-public kdsoap-qt6 + (package + (inherit kdsoap) + (name "kdsoap-qt6") + (arguments (substitute-keyword-arguments (package-arguments kdsoap) + ((#:configure-flags flags #~(list)) + #~(cons "-DKDSoap_QT6=true" #$flags)))) + (inputs (modify-inputs (package-inputs kdsoap) + (replace "qtbase" qtbase))))) + (define-public libaccounts-qt (package (name "libaccounts-qt") - (version "1.16") + (version "1.17") (source (origin (method git-fetch) (uri (git-reference @@ -5183,7 +5266,7 @@ web server.") (file-name (git-file-name name version)) (sha256 (base32 - "1vmpjvysm0ld8dqnx8msa15hlhrkny02cqycsh4k2azrnijg0xjz")))) + "0859nsksgfrj6ynj74awj1fr6slwcjavs989xc7mbgpvi87n1xlq")))) (build-system gnu-build-system) (arguments (list #:tests? #f ;TODO @@ -5212,6 +5295,15 @@ handles the authentication process of an account and securely stores the credentials and service-specific settings.") (license license:lgpl2.1+))) +(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"))) + (define-public libsignon-glib (package (name "libsignon-glib") @@ -5261,16 +5353,16 @@ GLib applications.") (define-public packagekit-qt5 (package (name "packagekit-qt5") - (version "1.0.2") + (version "1.1.1") (source (origin (method git-fetch) - (uri (git-reference - (url "https://github.com/hughsie/PackageKit-Qt") - (commit (string-append "v" version)))) + (uri (git-reference + (url "https://github.com/hughsie/PackageKit-Qt") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1d20r503msw1vix3nb6a8bmdqld7fj8k9jk33bkqsc610a2zsms6")))) + "0bajp6lxc9gdn7sy7rs7hwkhx854k5kqr3w9v07mv9l6vwnwq057")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ;no test suite (native-inputs (list pkg-config)) @@ -5282,6 +5374,20 @@ abstraction layer that allows the session user to manage packages in a secure way.") (license license:lgpl2.1+))) +(define-public packagekit-qt6 + (package + (inherit packagekit-qt5) + (name "packagekit-qt6") + (arguments (substitute-keyword-arguments (package-arguments packagekit-qt5) + ((#:configure-flags flags #~'()) + #~(cons "-DBUILD_WITH_QT6=ON" #$flags)))) + (inputs (modify-inputs (package-inputs packagekit-qt5) + (replace "qtbase" qtbase))) + (synopsis "Qt6 bindings for PackageKit") + (description "Provides Qt6 bindings to PackageKit which is a DBUS +abstraction layer that allows the session user to manage packages in +a secure way."))) + (define-public signond (package (name "signond") @@ -5328,6 +5434,31 @@ a secure way.") authentication on behalf of its clients.") (license license:lgpl2.1+))) +;; fork for support qt6 +(define-public signond-qt6 + (let ((commit "c8ad98249af541514ff7a81634d3295e712f1a39") + (revision "0")) + (package + (inherit signond) + (name "signond-qt6") + (version (git-version "8.61" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/nicolasfella/signond") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13cgdf6hhi2z3c8sax79dwi7450n8h228kpyl2w5lx0xglb2savq")))) + (native-inputs (modify-inputs (package-native-inputs signond) + (delete "qtbase") + (replace "qttools" qttools))) + (arguments + (substitute-keyword-arguments (package-arguments signond) + ((#:qtbase _ #f) + qtbase)))))) + (define-public signon-plugin-oauth2 (package (name "signon-plugin-oauth2") diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 2b20353159..f43a314983 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -201,7 +201,7 @@ ;; ;; CODE: -(define %racket-version "8.12") ; Remember to update chez-scheme-for-racket! +(define %racket-version "8.13") ; Remember to update chez-scheme-for-racket! (define %racket-commit (string-append "v" %racket-version)) (define %racket-origin @@ -211,10 +211,9 @@ (url "https://github.com/racket/racket") (commit %racket-commit))) (sha256 - (base32 "1f52yadmrsd2ddry47s68kxig185a58n19j23458wkck19nawjz5")) + (base32 "0pf9lmch7bz3gs4dbn2qb7mraxzjfiz50aij9zsli9jc022ybqb9")) (file-name (git-file-name "racket" %racket-version)) (patches (search-patches "racket-chez-scheme-bin-sh.patch" - "racket-backport-8.12-chez-configure.patch" "racket-rktio-bin-sh.patch")) (modules '((guix build utils))) (snippet @@ -243,7 +242,7 @@ (define-public zuo (package (name "zuo") - (version "1.9") ; defined in racket/src/zuo/zuo.c or the following + (version "1.10") ; defined in racket/src/zuo/zuo.c or the following #;(displayln (~a (hash-ref (runtime-env) 'version) "." (hash-ref (runtime-env) 'minor-version))) (source (origin @@ -252,7 +251,7 @@ (url "https://github.com/racket/zuo") (commit (string-append "v" version)))) (sha256 - (base32 "0zasir33nx1qi1ciz9dn6h8k39i443lr6apw5d1i6mjmhpzxmdhp")) + (base32 "007bjbhxbw3dq75klaa6f6ljhri2qxi43q6n74wyy50vr9yhx4s1")) (file-name (git-file-name name version)) (patches (search-patches "zuo-bin-sh.patch")))) (outputs '("out" "debug")) @@ -709,7 +708,7 @@ DrRacket IDE, are not included.") "contract-profile" (base32 "1xm2z8g0dpv5d9h2sg680vx1a8ix9gbsdpxxb8qv1w7akp73paj3") '(("contract-profile" "."))) (simple-racket-origin - "data" (base32 "01sinnsnjiazvkj83k84izdnp38pd2aglbrs14mrdkwajgmpampk") + "data" (base32 "11ai6c9h0brbblc6xn045ajj4gyrvbjpk1pqcqm1m0dy9q2rzd4a") '("data" "data-doc" "data-enumerate-lib" "data-lib")) (simple-racket-origin "datalog" (base32 "0nf6cy4djpyhfvgpa6yn72apbz9s83gp0qg95pzjd0az4v6qwq1s") @@ -718,7 +717,7 @@ DrRacket IDE, are not included.") "db" (base32 "0xx0k8yw2vb9b4vk2dwjfbpixnmriqsv7kpv3fvfxbwyg42y0db5") '("db" "db-doc" "db-lib")) (simple-racket-origin - "deinprogramm" (base32 "0f41sh90i4mml95x2gcmfvl2rc7m77vjbagmgjx270ng7xvz16lj") + "deinprogramm" (base32 "05l643h1mc4v7jhs4fq7yi84zl24nk1zx6ld07a6zgn85kik3vzb") '("deinprogramm" "deinprogramm-signature")) (simple-racket-origin "distributed-places" (base32 "1dajpkj9balqcpv6cdk9hwjz592h1vq8rrx5vncariiac4vbdpa0") @@ -727,7 +726,7 @@ DrRacket IDE, are not included.") "draw" (base32 "1h7mckay8yjcgmj3r0jkf1csn430gn43n8jl1l956q9gcprlmncl") '("draw" "draw-doc" "draw-lib")) (simple-racket-origin - "drracket" (base32 "17bdbvsf5l8z96bwzg1q75gg70c6svbhw0g1k239fsjd3mivmki4") + "drracket" (base32 "155qzbg2jg5kbv580z30z4w1ac3p527ixk0daan86wkgpl0lxnzn") '("drracket" "drracket-plugin-lib" "drracket-tool" @@ -741,13 +740,13 @@ DrRacket IDE, are not included.") "eli-tester" (base32 "0icx6wn14gjm8kdmq1jppqgq87sxkras4qb5xmdr6wigxafhjqyk") '(("eli-tester" "."))) (simple-racket-origin - "eopl" (base32 "1n8lzvhggp6bp2hg4n51zg8f4ya10isb92pfzngss2ch7299zfj2") + "eopl" (base32 "0qihajdpwf2q7hbs6fsw6mmmzy57kgzgry3vyp9z8w7ay8df3w15") '(("eopl" "."))) (simple-racket-origin "errortrace" (base32 "0l9k2rx6z4jkid7kxhbs763s66pxbzvfrgxajykbrmqkv77lhb3w") '("errortrace" "errortrace-doc" "errortrace-lib")) (simple-racket-origin - "expeditor" (base32 "10841c60nxqvwnjn6f9c6dcp4vsqbvi7n8nvi59vjk7d3b2qfpbq") + "expeditor" (base32 "0m9ga4scg49pbv60gnl0ky5al72012psa4dfgnkzq0bnf5lwwm2i") '("expeditor" "expeditor-doc" "expeditor-lib")) (simple-racket-origin "frtime" (base32 "0ydz2yn8vvv6z7brwlswcyx0f31a6y6d443i89rysfvd2xkhpfd5") @@ -761,13 +760,13 @@ DrRacket IDE, are not included.") "games" (base32 "13z7fnbr48s98lmfxc0nbfhbqkd4hphymy2r63hqm783xzn6ylzi") '(("games" "."))) (simple-racket-origin - "gui" (base32 "08kzyscqc8hgc1f8q0bhibl44fkq8iiyz12f8bqdhqkcz8nx44sw") + "gui" (base32 "1vz3h9mwmycl9sbx19dsfkx5sqh71nwv360g80khwyvnsx99fxfs") '("gui" "gui-doc" "gui-lib" "tex-table")) (simple-racket-origin "gui-pkg-manager" (base32 "1ji9448d723nklqvycwdswj0ni28sabrncag14f9mx47did5myb5") '("gui-pkg-manager-lib")) (simple-racket-origin - "htdp" (base32 "13d8xsvs60d7797w93g14dbdm98bixgy65akayij256pyiwnqwdc") + "htdp" (base32 "0z58askwixx0vh99dmpbjvv099hkhykgnlgfs679vxbjcnfwafd6") '("htdp" "htdp-doc" "htdp-lib")) (simple-racket-origin "html" (base32 "18n1jnjgzfknc8nv8dppi85nb8q08gqdwkg6hfjk08x0p00anx2x") @@ -791,7 +790,7 @@ DrRacket IDE, are not included.") "make" (base32 "10852fj30bz5r46c3d99s37fkgy5yh44gb01j29sf3kxnhi0g2sa") '(("make" "."))) (simple-racket-origin - "math" (base32 "1l0r4xpbbjz0b2s6v3kn490zgs2q1dnj3ga95y1505jmcwgb2hl9") + "math" (base32 "03ybjcp1w38f539dzsh8qb5cw0mb2hslpyqwbcsqxj3l9vqjlm8y") '("math" "math-doc" "math-lib")) (simple-racket-origin "mysterx" (base32 "11p9jzrafw0hizhl0cs4sxx7rv281185q8hryic2rpk0kzjdyr48") @@ -809,7 +808,7 @@ DrRacket IDE, are not included.") (url "https://github.com/RenaissanceBug/racket-cookies") (commit %racket-commit))) (sha256 (base32 - "1zr31y1gqa3kkrwlf9bnw08nzij00x1l70qhfbpz0239bksn4mmb")) + "1fbl717w5801bydx3nzwxddd1rh1cc0gxwpjc7ka9zh5ak09sb0w")) (file-name (git-file-name "RenaissanceBug-racket-cookies" %racket-version))) '("net-cookies" "net-cookies-doc" "net-cookies-lib")) @@ -826,7 +825,7 @@ DrRacket IDE, are not included.") (git-file-name "stamourv-optimization-coach" %racket-version))) '(("optimization-coach" "."))) (simple-racket-origin - "option-contract" (base32 "07cncg9pi15cm19k7rzv54vx83wq7y42i2m6bgzaqja1h8vnj2ww") + "option-contract" (base32 "1914dcxy6qzpg3cpnzdm9lj0kwyw8xdb85mwiamqfkbg0xlyyhpa") '("option-contract" "option-contract-doc" "option-contract-lib")) (simple-racket-origin "parser-tools" (base32 "1lp7wixmxcnha7cz834xfqqr48c2nldjbn9lng69bihpw01h9zms") @@ -835,7 +834,7 @@ DrRacket IDE, are not included.") "pconvert" (base32 "00czi0p399mmyrvxyrs5kniizpkqfxyz2ncxqi2jy79a7wk79pb1") '("pconvert-lib")) (simple-racket-origin - "pict" (base32 "1ghds5by8i0k2djbig82xqp2ssy3nvdwm45l8ibsr99y0ay6z7gv") + "pict" (base32 "1swnwihfnbsz9k11515i0fbfhx1gn7qcygn1dxkrdvb89g4h1pf3") '("pict" "pict-doc" "pict-lib")) (simple-racket-origin "pict-snip" (base32 "081nwiy4a0n4f7xws16hqbhf0j3kz5alizndi3nnyr3chm4kng6x") @@ -844,13 +843,13 @@ DrRacket IDE, are not included.") "picturing-programs" (base32 "1g6xr39hx1j03gb3d4dljm3v91xcj2gfpq3dgy5xvplzr6cmmxgr") '(("picturing-programs" "."))) (simple-racket-origin - "plai" (base32 "18kz31pj4lanlf9mn2yc0q9sxis264wb4f9v85ga23wd7g1hrzbq") + "plai" (base32 "1vcplmrzk2wr0n0m4fa0nq9ir986d5nk3dvcd7h1rv2jvhkcqdaq") '("plai" "plai-doc" "plai-lib")) (simple-racket-origin "planet" (base32 "0r2yqrzrmdjjyr14k6hhlzc5kzrcx3583m1s02mhrcmpfw0s85w9") '("planet" "planet-doc" "planet-lib")) (simple-racket-origin - "plot" (base32 "0jq9a366g7b2c9vp6yvpqikvklgyd6p4xj6v224g99yj8cgip40b") + "plot" (base32 "0skmir4njxmh3yx3ng23dvwkal79dd3fd23ijk6lyk8b013w1kj2") '("plot" "plot-compat" "plot-doc" "plot-gui-lib" "plot-lib")) (simple-racket-origin "preprocessor" (base32 "1p5aid58ifnjy4xl0ysh85cq39k25661v975jrpk182z3k5621mg") @@ -889,7 +888,7 @@ DrRacket IDE, are not included.") "racklog" (base32 "0fr8xij0sssfnmwn6dfdi4jj3l62f2yj3jrjljv13kaycrfls032") '(("racklog" "."))) (simple-racket-origin - "rackunit" (base32 "06kpl51alm7akgmmh110ya28zgmx3as0szykfv2gwqmf7xcms1b7") + "rackunit" (base32 "18s2rg5y5i68m83z3b81dwv6ixm67iyv3varm9azmnr7di0gflzj") '("rackunit" "rackunit-doc" "rackunit-gui" @@ -905,7 +904,7 @@ DrRacket IDE, are not included.") "realm" (base32 "0rlvwyd6rpyl0zda4a5p8dp346fvqzc8555dgfnrhliymkxb6x4g") '(("realm" "."))) (simple-racket-origin - "redex" (base32 "1mwnxbfk2vbalndlq0996rzdi3a2z48m5xnb1ywzlsvnydrnkrk2") + "redex" (base32 "083ql7xx7slnpvyr0a8z2wdyib84lh155frjx8gmcisri5895z28") '("redex" "redex-benchmark" "redex-doc" @@ -920,7 +919,7 @@ DrRacket IDE, are not included.") "scheme-lib" (base32 "0pcf0y8rp4qyjhaz5ww5sr5diq0wpcdfrrnask7zapyklzx1jx8x") '(("scheme-lib" "."))) (simple-racket-origin - "scribble" (base32 "0rk5q9r9fw826ag0npk5cwkzkapj2p243wwm9gn2l7j7cr6z1rvb") + "scribble" (base32 "03sgcgq8s0dk2zbn4jm514lx720rdx2pj8plr0sy7j0wnvm3rzsi") '("scribble" "scribble-doc" "scribble-html-lib" @@ -949,10 +948,10 @@ DrRacket IDE, are not included.") "slideshow" (base32 "147s7si6lxx6hm84wk2rfplk6wprladl9zni9pdvaxfa25chrabf") '("slideshow" "slideshow-doc" "slideshow-exe" "slideshow-lib" "slideshow-plugin")) (simple-racket-origin - "snip" (base32 "1b90ccqilnyszbphms3svm3c7dbk7870ifybjjipss5srb32mj2d") + "snip" (base32 "1aikzimkxvdvf81jxacm2zm8xir7nx1j6l6539pywl3xaf3nb2fm") '("snip" "snip-lib")) (simple-racket-origin - "typed-racket" (base32 "0vdsyr0qhpvac6h8mfdy6vqrsqsfa7kpg39n3h637hccxyfxv63f") + "typed-racket" (base32 "1r746jaxi5xxrk2zsn6v7bhb0drnlf7nx1ni0lvf7mvhqw7f97ci") '("source-syntax" "typed-racket" "typed-racket-compatibility" @@ -960,7 +959,7 @@ DrRacket IDE, are not included.") "typed-racket-lib" "typed-racket-more")) (simple-racket-origin - "srfi" (base32 "1l3nr3a8mlp505aaxlyp4i8jfijmpyl9h1wwv8hzm4kzzjv4sl8p") + "srfi" (base32 "0z7kchsz9m6cb4qmbznzqs2px45fz1g81amg9zn7n1sa31x3jzch") '("srfi" "srfi-doc" "srfi-lib" "srfi-lite-lib")) (simple-racket-origin "string-constants" (base32 "0225f1wmq1n9f2x1pg50fssdnd4bpc11q1jgsykwf4ik4fnaa520") @@ -978,7 +977,7 @@ DrRacket IDE, are not included.") "unix-socket" (base32 "02dfwas5ynbpyz74w9kwb4wgb37y5wys7svrlmir8k0n9ph9vq0y") '("unix-socket" "unix-socket-doc" "unix-socket-lib")) (simple-racket-origin - "web-server" (base32 "1i4sxmcgj00ml7czsbyx1433hgf091n1p54xyal2f1fsskx5fg0y") + "web-server" (base32 "0wpsgdz38zxjrs4kazad71dl9y11cvn6jj4fz2maba77021byzyn") '("web-server" "web-server-doc" "web-server-lib")) (simple-racket-origin "wxme" (base32 "1qp5gr9gqsakiq3alw6m4yyv5vw4i3hp4y4nhq8vl2nkjmirvn0b") diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index db8b2c9de6..502b04495a 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -2670,7 +2670,7 @@ voice formats.") qtcharts qtdeclarative-5 qtgamepad - qtlocation + qtlocation-5 qtmultimedia-5 qtquickcontrols2-5 qtserialport-5 @@ -3260,7 +3260,7 @@ memory contents between them.") (substitute* "lib/CMakeLists.txt" (("(DESTINATION \")/etc/udev/" _ directive) (string-append directive #$output "/lib/udev/")))))))) - (inputs (list libusb qtbase-5 qtlocation qtserialport-5 yaml-cpp)) + (inputs (list libusb qtbase-5 qtlocation-5 qtserialport-5 yaml-cpp)) (native-inputs (list qttools-5)) (home-page "https://dm3mat.darc.de/qdmr/") (synopsis "GUI application and command line tool to program DMR radios") diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm index 254ba4d06b..eb17fa929c 100644 --- a/gnu/packages/rdesktop.scm +++ b/gnu/packages/rdesktop.scm @@ -168,7 +168,7 @@ of parts of the Windows API.") (define-public xrdp (package (name "xrdp") - (version "0.9.23.1") + (version "0.10.0") (source (origin (method url-fetch) (uri (string-append @@ -176,7 +176,7 @@ of parts of the Windows API.") version "/xrdp-" version ".tar.gz")) (sha256 (base32 - "1jpmwywzb6law2hrzm94qy2hgivs7izc2ci0w2h9yxn2j1mizdwg")))) + "1nakn842p759xxd9713335ms3h8dmr33xbmylnbk2j03m4dhvlnx")))) (build-system gnu-build-system) (inputs (list check fuse-2 @@ -196,6 +196,7 @@ of parts of the Windows API.") python python-libxml2)) (native-inputs (list bison + cmocka flex gettext-minimal intltool diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index a385344473..8119f4560a 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -73,7 +73,9 @@ #:use-module (ice-9 match) #:use-module (ice-9 optargs) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26)) + #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35)) ;; This is the hash for the empty file, and the reason it's relevant is not ;; the most obvious. @@ -1309,6 +1311,13 @@ exec -a \"$0\" \"~a\" \"$@\"" (define make-rust-sysroot/implementation (mlambda (target base-rust) + (unless (platform-rust-target (lookup-platform-by-target target)) + (raise + (condition + (&package-unsupported-target-error + (package base-rust) + (target target))))) + (package (inherit base-rust) (name (string-append "rust-sysroot-for-" target)) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index d3a0e33b19..c24089c0e3 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -571,8 +571,8 @@ directory.") (properties '((upstream-name . "SDL2_ttf"))))) (define-public sdl2-gamecontrollerdb - (let ((commit "6f3c4edcb5a2e2ed090ca8af40d2c0f00dcd77f6") - (revision "0")) + (let ((commit "9d0994523206c9d73925d78d185531c4c7331db7") + (revision "1")) (package (name "sdl2-gamecontrollerdb") (version (git-version "0" revision commit)) @@ -584,7 +584,7 @@ directory.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1gciqc8qm2qgcjj5s9jpclznznsp6awl4ldrnj7g01chkcx0l6a3")))) + (base32 "08rv3i6sh90ibphxnv9r6h1zjyq88x9hq3smvf6cnlqvirnam94s")))) (build-system copy-build-system) (arguments '(#:install-plan '(("gamecontrollerdb.txt" "share/sdl2/")))) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 6e66aec3f5..6aaf416467 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -856,8 +856,8 @@ style and key ordering are kept, so you can diff the source.") (sha256 (base32 "1dmv163cnslyqccrybkxn0c9s1jk1mmafmgxv75iamnz5lk5l8hk")))) - (build-system python-build-system) - (home-page "https://bitbucket.org/bodhisnarkva/cbor") + (build-system pyproject-build-system) + (home-page "https://github.com/brianolson/cbor_py") (synopsis "Implementation of the Concise Binary Object Representation") (description "Python-cbor provides an implementation of the Concise Binary Object diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index ae4e73956e..28d5670a1d 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2023 David Pflug <david@pflug.io> ;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com> ;;; Copyright © 2024 Tanguy Le Carrour <tanguy@bioneland.org> +;;; Copyright © 2024 Vinicius Monego <monego@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +47,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages crates-crypto) #:use-module (gnu packages crates-graphics) @@ -65,11 +67,14 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-build) + #:use-module (gnu packages python-check) + #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages rust) #:use-module (gnu packages rust-apps) #:use-module (gnu packages scheme) + #:use-module (gnu packages terminals) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages xdisorg) @@ -79,6 +84,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (guix download) @@ -547,18 +553,18 @@ ksh, and tcsh.") (define-public xonsh (package (name "xonsh") - (version "0.15.1") + (version "0.17.0") (source (origin (method url-fetch) (uri (pypi-uri "xonsh" version)) (sha256 (base32 - "0427mimr4k75myg5mnig564kq7xbb5f5hws2ly3gxxl6g8mk79il")) + "17jhhxwm1nbh7yq72y7d4n880x46817iami7lvcj3ywdbzrfg6r9")) (modules '((guix build utils))) (snippet #~(begin - (substitute* "setup.py" + (substitute* "pyproject.toml" (("\"xonsh\\.ply\\.ply\",") "")) ;; Use our properly packaged PLY instead. (substitute* (list "setup.py" @@ -566,28 +572,65 @@ ksh, and tcsh.") "xonsh/lexer.py" "xonsh/parsers/base.py" "xonsh/parsers/completion_context.py" + "xonsh/parsers/v310.py" "xonsh/xonfig.py") (("from xonsh\\.ply\\.(.*) import" _ module) (format #f "from ~a import" module)) - (("from xonsh\\.ply import") "import")) - #t)))) - (build-system python-build-system) + (("from xonsh\\.ply import") "import")))))) + (build-system pyproject-build-system) (arguments - (list ;; TODO Try running run the test suite. - ;; See 'requirements-tests.txt' in the source distribution for more - ;; information. - #:tests? #f + ;; Some tests are failing for reasons like not accessing parent directory + ;; with os.getcwd(), not activating virtual environments, not finding + ;; some commands (man, echo), and not running subprocesses. + (list #:test-flags + #~(list "-k" + (string-append + "not " + (string-join + (list "test_aliases_print" + "test_argv0" + "test_bash_and_is_alias_is_only_functional_alias" + "test_bash_completer" + "test_bash_completer_empty_prefix" + "test_complete_command" + "test_complete_dots" + "test_dirty_working_directory" + "test_equal_sign_arg" + "test_man_completion" + "test_parser_show" + "test_printfile" + "test_printname" + "test_quote_handling" + "test_script" + "test_skipper_command" + "test_sourcefile" + "test_spec_modifier_alias_output_format" + "test_vc_get_branch" + "test_xonsh_activator" + "test_xonsh_lexer") + " and not "))) #:phases #~(modify-phases %standard-phases (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (invoke "python" "-m" "compileall" - "--invalidation-mode=unchecked-hash" out) - (invoke "python" "setup.py" "install" "--root=/" - (string-append "--prefix=" out)))))))) + (lambda _ + (invoke "python" "-m" "compileall" + "--invalidation-mode=unchecked-hash" #$output) + (invoke "python" "setup.py" "install" "--root=/" + (string-append "--prefix=" #$output)))) + ;; Some tests run os.mkdir(). + (add-before 'check 'writable-home + (lambda _ + (setenv "HOME" "/tmp")))))) (native-inputs - (list python-setuptools ;needed at build time + (list git-minimal + python-pyte + python-pytest + python-pytest-mock + python-pytest-rerunfailures + python-pytest-subprocess + python-pytest-timeout + python-requests + python-setuptools ;needed at build time python-wheel)) (inputs (list python-distro diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 4fa2e93d81..824318bf51 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler@gmail.com> ;;; Copyright © 2023 Reza Housseini <reza@housseini.me> ;;; Copyright © 2024 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1180,30 +1181,68 @@ command-line utility for mesh optimisation.") (name "python-dolfin-adjoint") (version "2019.1.0") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dolfin-adjoint/pyadjoint") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0xhy76a5f33hz94wc9g2mc5qmwkxfccbbc6yxl7psm130afp8lhn")) - (modules '((guix build utils))) - (snippet - '(begin - ;; One of the migration tests attempts to call openmpi - ;; recursively and fails. See - ;; https://bitbucket.org/mpi4py/mpi4py/issues/95. Run the - ;; test sequentially instead. - (with-directory-excursion "tests/migration/optimal_control_mms" - (substitute* "test_optimal_control_mms.py" - (("\\\"mpirun\\\", \\\"-n\\\", \\\"2\\\", ") ""))) - ;; Result files are regenerated in the check phase. - (delete-file-recursively - "tests/migration/viscoelasticity/test-results") - #t)))) - (build-system python-build-system) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dolfin-adjoint/pyadjoint") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xhy76a5f33hz94wc9g2mc5qmwkxfccbbc6yxl7psm130afp8lhn")) + (modules '((guix build utils))) + (snippet + '(begin + ;; One of the migration tests attempts to call openmpi + ;; recursively and fails. See + ;; https://bitbucket.org/mpi4py/mpi4py/issues/95. Run the + ;; test sequentially instead. + (with-directory-excursion "tests/migration/optimal_control_mms" + (substitute* "test_optimal_control_mms.py" + (("\\\"mpirun\\\", \\\"-n\\\", \\\"2\\\", ") ""))) + ;; Result files are regenerated in the check phase. + (delete-file-recursively + "tests/migration/viscoelasticity/test-results"))))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list + ;; Ignore tests which require missing packages and/or failed during + ;; tests collection. + "--ignore=tests/firedrake_adjoint/test_assignment.py" + "--ignore=tests/firedrake_adjoint/test_burgers_newton.py" + "--ignore=tests/firedrake_adjoint/test_dynamic_meshes.py" + "--ignore=tests/firedrake_adjoint/test_hessian.py" + "--ignore=tests/firedrake_adjoint/test_reduced_functional.py" + "--ignore=tests/firedrake_adjoint/test_shape_derivatives.py" + "--ignore=tests/firedrake_adjoint/test_solving.py" + "--ignore=tests/firedrake_adjoint/test_tlm.py" + "--ignore=tests/migration/burgers_newton/test_burgers_newton.py" + "--ignore=tests/migration/linear_solver/test_linear_solver.py" + "--ignore=tests/migration/optimization_scipy/test_optimization_scipy.py" + "--ignore=tests/migration/projection/test_projection.py" + "--ignore=tests/migration/reduced_functional/test_reduced_functional.py" + "--ignore=tests/migration/split/test_split.py" + "-k" (string-append "not test_read_checkpoint" + " and not test_krylov_solver_preconditioner_function_ctrl")) + #:phases + #~(modify-phases %standard-phases + (add-after 'build 'mpi-setup #$%openmpi-setup) + (add-before 'check 'set-environment-variables + (lambda _ + (setenv "HOME" (getcwd)))) + (add-after 'install 'install-doc + (lambda _ + (let* ((doc (string-append #$output "/share/doc/" #$name "-" #$version)) + (examples (string-append doc "/examples"))) + (mkdir-p examples) + (copy-recursively "examples" examples)))) + ;; Remove 'sanity-check, because it tries to import + ;; firedrake_adjoint after importing fenics_adjoint. + ;; Both load a module named 'backend' and firedrake_adjoint + ;; fails with an ImportError if it sees that the backend module + ;; has already been loaded. + (delete 'sanity-check)))) (inputs (list fenics openmpi pybind11)) (native-inputs @@ -1214,48 +1253,18 @@ command-line utility for mesh optimisation.") python-pkgconfig python-pytest)) (propagated-inputs - `(("scipy" ,python-scipy))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'build 'mpi-setup - ,%openmpi-setup) - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((doc (string-append (assoc-ref outputs "out") - "/share/doc/" ,name "-" - ,version)) - (examples (string-append doc "/examples"))) - (mkdir-p examples) - (copy-recursively "examples" examples)) - #t)) - (replace 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (setenv "HOME" (getcwd)) - (and (invoke "py.test" "-v" "tests/fenics_adjoint" - "-k" "not test_read_checkpoint") - (invoke "py.test" "-v" "tests/migration") - (invoke "py.test" "-v" "tests/pyadjoint"))) - #t)) - ;; Remove 'sanity-check, because it tries to import - ;; firedrake_adjoint after importing fenics_adjoint. - ;; Both load a module named 'backend' and firedrake_adjoint - ;; fails with an ImportError if it sees that the backend module - ;; has already been loaded. - (delete 'sanity-check)))) + (list python-scipy)) (home-page "https://www.dolfin-adjoint.org") (synopsis "Automatic differentiation library") - (description "@code{python-dolfin-adjoint} is a solver of -differential equations associated with a governing system and a -functional of interest. Working from the forward model the solver -automatically derives the discrete adjoint and tangent linear models. -These additional models are key ingredients in many algorithms such as -data assimilation, optimal control, sensitivity analysis, design -optimisation and error estimation. The dolfin-adjoint project -provides the necessary tools and data structures for cases where the -forward model is implemented in @code{fenics} or + (description + "@code{python-dolfin-adjoint} is a solver of differential equations +associated with a governing system and a functional of interest. Working from +the forward model the solver automatically derives the discrete adjoint and +tangent linear models. These additional models are key ingredients in many +algorithms such as data assimilation, optimal control, sensitivity analysis, +design optimisation and error estimation. The dolfin-adjoint project provides +the necessary tools and data structures for cases where the forward model is +implemented in @code{fenics} or @url{https://firedrakeproject.org,firedrake}.") (license license:lgpl3))) diff --git a/gnu/packages/spreadsheet.scm b/gnu/packages/spreadsheet.scm index 363d0ae16f..3ccd922747 100644 --- a/gnu/packages/spreadsheet.scm +++ b/gnu/packages/spreadsheet.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020, 2021 Ryan Prior <rprior@protonmail.com> ;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech> -;;; Copyright © 2021, 2023 jgart <jgart@dismail.de> +;;; Copyright © 2021, 2023-2024 jgart <jgart@dismail.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -99,24 +99,24 @@ (define-public visidata (package (name "visidata") - (version "2.8") + (version "3.0.2") (source (origin (method url-fetch) (uri (pypi-uri "visidata" version)) (sha256 (base32 - "1jfhrk0xvzzqfzs0khbig2dc94718qki8zys1f1a9553vjncvmi6")))) + "0nn0fwm0172gn5ffil310k7hmxqrrc1dn6xfz7jxsj0vikq8vhrq")))) (build-system python-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? (invoke "pytest")) - #t))))) + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? (invoke "pytest"))))))) (inputs (list python-dateutil + python-importlib-metadata python-requests python-lxml python-openpyxl diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index fe352f1b4e..1dd7cad2d9 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com> ;;; Copyright © 2023 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2023 Troy Figiel <troy@troyfigiel.com> +;;; Copyright © 2024 Vinicius Monego <monego@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -227,7 +228,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.") (define r-with-tests (package (name "r-with-tests") - (version "4.4.0") + (version "4.4.1") (source (origin (method url-fetch) (uri (string-append "mirror://cran/src/base/R-" @@ -235,7 +236,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.") version ".tar.gz")) (sha256 (base32 - "0c7hnmr0w26vpaf8b10m83f4w3g3fl6a7z65pi9jqvcpkdgi5r5c")))) + "0kfrn8v8l555n5xrpf753jar5wa3vs622p967ffjkdxfx9fngjxl")))) (build-system gnu-build-system) (arguments (list @@ -539,14 +540,14 @@ D.V. Hinkley (1997, CUP), originally written by Angelo Canty for S.") (define-public r-mass (package (name "r-mass") - (version "7.3-60.2") + (version "7.3-61") (source (origin (method url-fetch) (uri (cran-uri "MASS" version)) (sha256 (base32 - "13ky8mbni09zviv5lan10ff6l2klsfv7v3vmfq88dxpz8xknx75v")))) + "140ah1719zad8gd0glvy9qlkxxakgz12i5r5gk2bgmwxayzwhi1i")))) (properties `((upstream-name . "MASS"))) (build-system r-build-system) (home-page "https://www.stats.ox.ac.uk/pub/MASS4/") @@ -623,14 +624,14 @@ code for possible problems.") (define-public r-foreign (package (name "r-foreign") - (version "0.8-86") + (version "0.8-87") (source (origin (method url-fetch) (uri (cran-uri "foreign" version)) (sha256 (base32 - "1qf3x1vacc4sdcmw4mbh0251ii4xd8z1xmmd9isak75j100i4ad7")))) + "0mi8vf3bsvrn2nh9kxjlgsmvxrc8icw51scr0mscqyp8r3saq90s")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/foreign") (synopsis "Read data stored by other statistics software") @@ -643,14 +644,14 @@ for reading and writing some dBase files.") (define-public r-kernsmooth (package (name "r-kernsmooth") - (version "2.23-22") + (version "2.23-24") (source (origin (method url-fetch) (uri (cran-uri "KernSmooth" version)) (sha256 (base32 - "1sblhl7b9d3m6034xd3254ddkj9ssqxawknzksfbgjh68s849q3n")))) + "0pxc53sw9f4hhxnl3zkalkkk0fvzcfxw7c4ibrb95zbzahwyrcyh")))) (properties `((upstream-name . "KernSmooth"))) (build-system r-build-system) (native-inputs @@ -709,13 +710,13 @@ and operations on them using LAPACK and SuiteSparse.") (define-public r-nlme (package (name "r-nlme") - (version "3.1-164") + (version "3.1-165") (source (origin (method url-fetch) (uri (cran-uri "nlme" version)) (sha256 - (base32 "1s6lpp4hpjhyn7ygfngw2f60a40kbbikd0y2wqzbhdvhrqha19br")))) + (base32 "16clxh0b8sr2k3vddfip3awimn17ffkd5kwgygi8n4y2jfjbndzw")))) (build-system r-build-system) (propagated-inputs (list r-lattice)) @@ -811,14 +812,14 @@ analysis.") (define-public r-survival (package (name "r-survival") - (version "3.6-4") + (version "3.7-0") (source (origin (method url-fetch) (uri (cran-uri "survival" version)) (sha256 (base32 - "1zpfqslpzck10pmaiyc8x7852ajbjd0l6aw18hwfrm418wjamy1f")))) + "1vzy8kg159yqnvg733air11la2qrirwcqhn9d67h5c18r67b15nd")))) (build-system r-build-system) (propagated-inputs (list r-matrix)) @@ -976,13 +977,13 @@ effects of different types of color-blindness.") (define-public r-digest (package (name "r-digest") - (version "0.6.35") + (version "0.6.36") (source (origin (method url-fetch) (uri (cran-uri "digest" version)) (sha256 - (base32 "07vqv2mnf8ppan2a3gydh4yr84n8489hypfas1rlk7050nxkycyc")))) + (base32 "0dz6gbfd9qnhn1jjfc4ni3w440183dygla4lszwkz2rmn9j76xyi")))) (build-system r-build-system) ;; Vignettes require r-knitr, which requires r-digest, so we have to ;; disable them and the tests. @@ -1424,13 +1425,13 @@ evaluation (NSE) in R.") (define-public r-dbi (package (name "r-dbi") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) (uri (cran-uri "DBI" version)) (sha256 (base32 - "10d7sl9nk1gkkbinmvplyp2hg9zgxgs03llamrvbf4a5cnrs0mcd")))) + "1gid1mfzq1j3n5fsnpzdb50p2m73z92s6njp0sgr503aaskhhryg")))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -1464,13 +1465,13 @@ for template use among CRAN packages.") (define-public r-evaluate (package (name "r-evaluate") - (version "0.23") + (version "0.24.0") (source (origin (method url-fetch) (uri (cran-uri "evaluate" version)) (sha256 (base32 - "0p540jl6sixpgk08cp2h9470d28p7n66pfafiskvz3rba0vrrky9")))) + "1mkzb2f8rv0qd33h3gqq7idkpxnnx7zcr93xsmbm4lp7b157cgg2")))) (build-system r-build-system) (home-page "https://github.com/hadley/evaluate") (synopsis "Parsing and evaluation tools for R") @@ -1506,13 +1507,13 @@ There is also a Shiny app as a user interface in this package.") (define-public r-highr (package (name "r-highr") - (version "0.10") + (version "0.11") (source (origin (method url-fetch) (uri (cran-uri "highr" version)) (sha256 (base32 - "0yrlpjs8qzq1d7iy4gypnf4x1gvxq6vaghkdh1kfv433yqgvqmgc")))) + "19z0gwdy46z6gb46b3fs2ljxa2cn0bpvx7aam0jk75h180l183g9")))) (build-system r-build-system) (propagated-inputs (list r-xfun)) @@ -1580,13 +1581,13 @@ data derived from /etc/mime.types in UNIX-type systems.") (define-public r-markdown (package (name "r-markdown") - (version "1.12") + (version "1.13") (source (origin (method url-fetch) (uri (cran-uri "markdown" version)) (sha256 (base32 - "182b290dj0c6m4qf4azyih521ski0ssk1awzmbzfbqlcy3lf7p3x")))) + "1nfgngskgb4r34r3cnkm0gn7p1axpcb7rpyi0jxg4nygfk322m1q")))) (build-system r-build-system) ;; Skip check phase because the tests require the r-knitr package to be ;; installed. This prevents installation failures. Knitr normally @@ -1624,13 +1625,13 @@ emitter (http://pyyaml.org/wiki/LibYAML) for R.") (define-public r-knitr (package (name "r-knitr") - (version "1.46") + (version "1.47") (source (origin (method url-fetch) (uri (cran-uri "knitr" version)) (sha256 (base32 - "0ng8kw79csvcg46lsm3yf147jh6rf91jbj8qlryaihd8jcyc6lcg")))) + "1kx6g8ddbigwx3bmq771gwi3din3fxjn59l801904kjaz6dq9pgs")))) (build-system r-build-system) (propagated-inputs (list r-evaluate r-highr r-xfun r-yaml)) @@ -1728,13 +1729,13 @@ you call it again with the same arguments it returns the pre-computed value.") (define-public r-crayon (package (name "r-crayon") - (version "1.5.2") + (version "1.5.3") (source (origin (method url-fetch) (uri (cran-uri "crayon" version)) (sha256 (base32 - "0yjsnhifr3nipaid0q11jjglvqmp51g9d2xdh9kfxh5knl2sbabh")))) + "0sfsx4k77fsx1dx9c186dg273psrr3awz4ivfvmbbvs1amla0x1y")))) (build-system r-build-system) (home-page "https://github.com/gaborcsardi/crayon") (synopsis "Colored terminal output for R") @@ -1828,13 +1829,13 @@ defined in different packages.") (define-public r-rlang (package (name "r-rlang") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) (uri (cran-uri "rlang" version)) (sha256 (base32 - "02mz53g8lk26yi0js6qq57ijhl1mw7xm82vwbwzbvi62bm5l58r4")))) + "1qd6chyciwhj6f6w56d3pcy4q8qdvqkyn2s709qjiwwba0klbmzj")))) (build-system r-build-system) (home-page "http://rlang.tidyverse.org") (synopsis "Functions for base types, core R and Tidyverse features") @@ -1998,14 +1999,14 @@ side.") (define-public r-locfit (package (name "r-locfit") - (version "1.5-9.9") + (version "1.5-9.10") (source (origin (method url-fetch) (uri (cran-uri "locfit" version)) (sha256 (base32 - "1m7ji1ykvffqvs9ly1pzadiwhwxcyv4xivziikmahp0w0sv45lck")))) + "01mcfsqqqwdf9iggabyckid7rf5c9f0v0hjz8g58fflr2hc6c82c")))) (build-system r-build-system) (propagated-inputs (list r-lattice)) @@ -2180,7 +2181,7 @@ machine learning, computer vision, and high-dimensional statistics.") (define-public python-arviz (package (name "python-arviz") - (version "0.17.1") + (version "0.18.0") (source (origin (method git-fetch) ; PyPI misses some test files (uri (git-reference @@ -2189,7 +2190,7 @@ machine learning, computer vision, and high-dimensional statistics.") (file-name (git-file-name name version)) (sha256 (base32 - "1rpm2a9swzhnqn84dfsbc8kvz6qnn8w2icr3p08gwax9h9pg4ksp")))) + "1bdj2mm8zdd83ln9ka9p6bln3n5kkpfmrhgqyy018h51l156m529")))) (build-system pyproject-build-system) (arguments ;; FIXME: matplotlib tests fail because of the "--save" test flag. @@ -2208,7 +2209,8 @@ machine learning, computer vision, and high-dimensional statistics.") ;; 3 tests require write permission. (setenv "HOME" "/tmp")))))) (native-inputs (list python-cloudpickle python-pytest)) - (propagated-inputs (list python-h5netcdf + (propagated-inputs (list python-dm-tree + python-h5netcdf python-matplotlib python-numpy python-packaging @@ -2386,13 +2388,13 @@ Meier, Nelson Aalen and regression.") (define-public python-mapie (package (name "python-mapie") - (version "0.8.3") + (version "0.8.6") (source (origin (method url-fetch) (uri (pypi-uri "MAPIE" version)) (sha256 (base32 - "13kgyqk1hp603n9zym835kp1pqs83k0j7ymayw4fk0zx4z1nmvdx")))) + "013ljcjjl3k9yb3166fnvr6nsb9ph4rhidpdjjks78qw0w1j7faa")))) (build-system pyproject-build-system) ;; See https://github.com/scikit-learn-contrib/MAPIE/issues/432 (arguments @@ -2416,13 +2418,13 @@ conformal prediction methods intervals.") (define-public python-emcee (package (name "python-emcee") - (version "3.1.4") + (version "3.1.6") (source (origin (method url-fetch) (uri (pypi-uri "emcee" version)) (sha256 - (base32 "1vbz67cwzig28dlndkm6g246p1vcvj6yy2w65z8cdyffigf1j3lf")))) + (base32 "0zb3ihja3hyj6zjbhkpxhyyppnv58q2jjg0yd1lwmydqdaplvbqi")))) (build-system pyproject-build-system) (propagated-inputs (list python-numpy)) (native-inputs (list python-coverage @@ -2714,14 +2716,14 @@ limited to R.") (define-public r-backports (package (name "r-backports") - (version "1.4.1") + (version "1.5.0") (source (origin (method url-fetch) (uri (cran-uri "backports" version)) (sha256 (base32 - "0x144hij0rzhrxdq3k5ph8fk7pdgl1avjca25j4mlpmhzdckqp44")))) + "18kwi50bvha6p5jfl833grmhqzi55adnd3glcy4yh18mizdxjghd")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/backports") (synopsis "Reimplementations of functions introduced since R 3.0.0") @@ -2900,13 +2902,13 @@ tables, autolinks and strikethrough text.") (define-public r-roxygen2 (package (name "r-roxygen2") - (version "7.3.1") + (version "7.3.2") (source (origin (method url-fetch) (uri (cran-uri "roxygen2" version)) (sha256 (base32 - "1j72arkadw93f4wrzxhryn3666jwnablr1bhk0zv6g77q2lrypi1")))) + "0701v8dglv0mdsjs1mijpylpciiijb2schplavkf5drjj6gqg25p")))) (build-system r-build-system) (propagated-inputs (list r-brew @@ -2935,14 +2937,14 @@ collation, and NAMESPACE files.") (define-public r-openssl (package (name "r-openssl") - (version "2.1.2") + (version "2.2.0") (source (origin (method url-fetch) (uri (cran-uri "openssl" version)) (sha256 (base32 - "0mm0rlf3m6wkvz5p8prxwjr37rn30lmhddsdi4ffnsmrysfl3rbp")))) + "1cyx2yv2l446xwf0a0im70zfd6jlpg8113ncgdydajyvx1mb9f0q")))) (properties `((upstream-name . "openssl") (updater-extra-inputs . ("openssl")))) @@ -3225,13 +3227,13 @@ well as additional utilities such as panel and axis annotation functions.") (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.12.8.3.0") + (version "0.12.8.4.0") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "02sj42apznls45sapiisaggfijdvg69a2ja2mz4fraqaajrkkwc7")))) + "0iihy2pbmc56s5s6x7ac1c1biqda60gyqkddvn2c211j0xjnigya")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) (propagated-inputs @@ -3317,13 +3319,13 @@ certain criterion, e.g., it contains a certain regular file.") (define-public r-rmarkdown (package (name "r-rmarkdown") - (version "2.26") + (version "2.27") (source (origin (method url-fetch) (uri (cran-uri "rmarkdown" version)) (sha256 - (base32 "1q6z2j1y6pjdz4nzw44srv9j62irnxqhkvrsi46ma7xrzq6ig34g")))) + (base32 "17rba2k1n945i56am345v9zfgdwm4rjmhcwdm7z8g1agmczcpsb1")))) (properties `((upstream-name . "rmarkdown") (updater-extra-propagated-inputs . ("pandoc")))) @@ -3438,13 +3440,13 @@ a column in data frame.") (define-public r-rsqlite (package (name "r-rsqlite") - (version "2.3.6") + (version "2.3.7") (source (origin (method url-fetch) (uri (cran-uri "RSQLite" version)) (sha256 (base32 - "1wpqr71wckxrh8ih5f01wkqqqnq5s3zaj0m8b40g76pliyjvgcgv")))) + "1kllna6hfnyy3rizr8wkpfn7p5sxv3sra12x9vz68hp6i4jmgq15")))) (properties `((upstream-name . "RSQLite"))) (build-system r-build-system) (propagated-inputs @@ -3509,13 +3511,13 @@ ldap, and also supports cookies, redirects, authentication, etc.") (define-public r-xml (package (name "r-xml") - (version "3.99-0.16.1") + (version "3.99-0.17") (source (origin (method url-fetch) (uri (cran-uri "XML" version)) (sha256 (base32 - "1i7fs9i2f6bdkxb45w2bck7sshlwxy2s32hi9fwa4nfmw2iy62m3")))) + "1n52k06jrgyjmz96mv4sv6kczqkhmz2spr3gymcjzzv9zxjk48vf")))) (properties `((upstream-name . "XML"))) (build-system r-build-system) @@ -3630,14 +3632,14 @@ statements.") (define-public r-segmented (package (name "r-segmented") - (version "2.0-4") + (version "2.1-0") (source (origin (method url-fetch) (uri (cran-uri "segmented" version)) (sha256 (base32 - "0a7qfs83kgn7g98kiwlk8zm2q9pzgkvmms9l15sgc5y952yig926")))) + "1whcch1lw9y5fgy205377hr69xdjmav57z63vzgj7ammihja0yvd")))) (build-system r-build-system) (propagated-inputs (list r-mass r-nlme)) (home-page "https://cran.r-project.org/web/packages/segmented") @@ -3672,17 +3674,17 @@ worker processes and collect and return the results on the master.") (define-public r-sparsem (package (name "r-sparsem") - (version "1.81") + (version "1.84") (source (origin (method url-fetch) (uri (cran-uri "SparseM" version)) (sha256 (base32 - "0csbqd9wm6r4162mday1iaigzf9wv2rp1zq8hnihys6f38w8z0xx")))) + "05pxj16l1d9smlsn9h3pxcnd49s8l7f6088xvn808pa1f3h9dybn")))) (properties `((upstream-name . "SparseM"))) (native-inputs - (list gfortran)) + (list gfortran r-knitr)) (build-system r-build-system) (home-page "http://www.econ.uiuc.edu/~roger/research/sparse/sparse.html") (synopsis "Sparse linear algebra") @@ -4478,13 +4480,13 @@ vignettes.") (define-public r-mvtnorm (package (name "r-mvtnorm") - (version "1.2-4") + (version "1.2-5") (source (origin (method url-fetch) (uri (cran-uri "mvtnorm" version)) (sha256 (base32 - "1zws7myh61622v46gir6bs0dpyp6siz0hx7lrsvymshn02xqg0l4")))) + "19pdwdkhc7bv6r9xkzpxmpgmz7mvsrzxfvj6jy02hpjdlaiq4y4y")))) (build-system r-build-system) (native-inputs (list gfortran)) @@ -4811,14 +4813,14 @@ data behind them) can be viewed and modified in a web browser.") (define-public r-biased-urn (package (name "r-biased-urn") - (version "2.0.11") + (version "2.0.12") (source (origin (method url-fetch) (uri (cran-uri "BiasedUrn" version)) (sha256 (base32 - "0dvmkrdmhfh4swilyxf10y856kx0zf9sj1gc0g62bm6r5jhz35b2")))) + "14jpijms81pgl4zyqrhwwdfj0jmlmml21blspvin8lqw8fbbbcr9")))) (properties `((upstream-name . "BiasedUrn"))) (build-system r-build-system) (home-page "https://www.agner.org/random/") @@ -4998,13 +5000,13 @@ package instead.") (define-public r-hmisc (package (name "r-hmisc") - (version "5.1-2") + (version "5.1-3") (source (origin (method url-fetch) (uri (cran-uri "Hmisc" version)) (sha256 - (base32 "088gniwbymzhqg3vp0kpkbazryjzy9iq6wdvf9hg9qf0sjbibpg7")))) + (base32 "1sq5qvlr9swhdvf3l420y9fxq5s1qw8aiyl9a62sb357ywppfq9w")))) (properties `((upstream-name . "Hmisc"))) (build-system r-build-system) (native-inputs @@ -5733,14 +5735,14 @@ can be efficiently implemented directly in the R language.") (define-public r-robustbase (package (name "r-robustbase") - (version "0.99-2") + (version "0.99-3") (source (origin (method url-fetch) (uri (cran-uri "robustbase" version)) (sha256 (base32 - "0i6dzri3bfkpmp7h0h5nyzigs9rjzdd3c4ilapmvadmfywl9d9mn")))) + "11h0v9q44i8gl55q40aszmzn7214pljpzncgcws9pvgbypf17g31")))) (build-system r-build-system) (native-inputs (list gfortran)) @@ -5906,13 +5908,13 @@ groupings.") (define-public r-vgam (package (name "r-vgam") - (version "1.1-10") + (version "1.1-11") (source (origin (method url-fetch) (uri (cran-uri "VGAM" version)) (sha256 - (base32 "04yy5rxid3fwn42sak9rjbxd1h4d7iigiznpbrvwxl06b1xficyb")))) + (base32 "199kicvlxciff9x243h357n4bjl00yg9k5jgs9awzz5wsadr17fy")))) (properties `((upstream-name . "VGAM"))) (build-system r-build-system) (native-inputs @@ -5950,14 +5952,14 @@ showing the progress is useful e.g. bootstrap.") (define-public r-minqa (package (name "r-minqa") - (version "1.2.6") + (version "1.2.7") (source (origin (method url-fetch) (uri (cran-uri "minqa" version)) (sha256 (base32 - "0421b4ysslaqmdgwlz080abis8m4xkcvjq7lx1wywbsz1s2vi9si")))) + "1qigwpcj8mz1fgq4ikq64pkqfwgw50bd928xbc4xaq6q3sflbwvn")))) (build-system r-build-system) (propagated-inputs (list r-rcpp)) @@ -6041,13 +6043,13 @@ using modular prediction and response module classes.") (define-public r-quantreg (package (name "r-quantreg") - (version "5.97") + (version "5.98") (source (origin (method url-fetch) (uri (cran-uri "quantreg" version)) (sha256 - (base32 "18bdcxm2f8gc2bxdxrk80dcafl8d5snckp0913pkdsfyfrbxxrw7")))) + (base32 "0qbad2wzw7qvsrm821k2vr0dsx75jj3qbs2sl9k3ymngv1cv5359")))) (build-system r-build-system) (arguments (list @@ -6073,21 +6075,18 @@ expected shortfall risk are also included.") (define-public r-nloptr (package (name "r-nloptr") - (version "2.0.3") + (version "2.1.1") (source (origin (method url-fetch) (uri (cran-uri "nloptr" version)) (sha256 (base32 - "1mqnjswm0dl6vqc8b2s5k3n1mhanaha3l33vh68dh6zx8q9aq9kv")))) + "1snqvav2pxjhssn1nld49mjj89cn2zv7gjn2y8ch22gbzmfzbnjc")))) (build-system r-build-system) (native-inputs - (list r-knitr ; for building vignettes - pkg-config gfortran)) - (inputs - (list nlopt)) - (propagated-inputs (list r-testthat)) + (list gfortran pkg-config r-knitr)) + (inputs (list nlopt)) (home-page "https://cran.r-project.org/web/packages/nloptr") (synopsis "R interface to NLopt") (description @@ -6101,14 +6100,14 @@ algorithms.") (define-public r-lme4 (package (name "r-lme4") - (version "1.1-35.3") + (version "1.1-35.4") (source (origin (method url-fetch) (uri (cran-uri "lme4" version)) (sha256 (base32 - "0ij37wly0d28x143xdkjry5jsj4chlbli2fl9zbp8fkcgh95r1xl")))) + "1zwr0wyrxllysbm2ca7hawzh4kmyxk23hkvszvzddjgi7wkw76jq")))) (build-system r-build-system) (propagated-inputs (list r-boot @@ -6134,17 +6133,18 @@ C++ library for numerical linear algebra and RcppEigen glue.") (define-public r-pbkrtest (package (name "r-pbkrtest") - (version "0.5.2") + (version "0.5.3") (source (origin (method url-fetch) (uri (cran-uri "pbkrtest" version)) (sha256 (base32 - "1qxnd4pfpsq762x81s3vkw09wdwpfj25bba5474g7z506pqasycf")))) + "0qxswrk54r40qmi9ky7jzv53mrlr2w2mrlf1czma597nzrb52gmh")))) (build-system r-build-system) (propagated-inputs (list r-broom + r-doby r-dplyr r-lme4 r-mass @@ -7095,18 +7095,18 @@ mediation and estimating power.") (define-public r-clubsandwich (package (name "r-clubsandwich") - (version "0.5.10") + (version "0.5.11") (source (origin (method url-fetch) (uri (cran-uri "clubSandwich" version)) (sha256 (base32 - "0qx4qq0k01q06hrs348n417pf338dyfbcy2vsi0y3ap6y1rb7w6s")))) + "1y9iy86w2440y22279is7vgi9m9v876p5954nhq5lg9ghpzbwzdq")))) (properties `((upstream-name . "clubSandwich"))) (build-system r-build-system) (propagated-inputs - (list r-sandwich)) + (list r-lifecycle r-sandwich)) (native-inputs (list r-knitr)) (home-page "https://github.com/jepusto/clubSandwich") (synopsis "Cluster-Robust (Sandwich) Variance Estimators with Small-Sample @@ -7802,13 +7802,13 @@ Neyman, 1936; cf. Spiller et al., 2012), etc.") (define-public r-mumin (package (name "r-mumin") - (version "1.47.5") + (version "1.48.4") (source (origin (method url-fetch) (uri (cran-uri "MuMIn" version)) (sha256 (base32 - "0xqasb79lmdhff25zalzrpjwv6qs9qnxr54ypnqjjgshi96mbwvg")))) + "04zn63snv218c44nllfh8bqh5xg0gamd9fcpwxisvi9gwb3f20i0")))) (properties `((upstream-name . "MuMIn"))) (build-system r-build-system) (propagated-inputs (list r-insight r-matrix r-nlme)) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index e2d67b0600..af736d0c28 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -190,12 +190,12 @@ dbus desktop-file-utils glib - karchive - kconfig - kcoreaddons - kio + karchive-5 + kconfig-5 + kcoreaddons-5 + kio-5 kjs - kwidgetsaddons + kwidgetsaddons-5 libcloudproviders libzip openssl diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index ea8249869d..47cbb7ee74 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -66,7 +66,6 @@ (list #:modules '((srfi srfi-26) ; for cut (guix build utils) (guix build go-build-system)) - #:go go-1.20 #:import-path "github.com/syncthing/syncthing" ;; We don't need to install the source code for end-user applications. #:install-source? #f diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 358374a5bb..a77164b93e 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -505,8 +505,8 @@ Telegram project, for its use in telegram desktop client.") hime hunspell jemalloc - kcoreaddons - kimageformats + kcoreaddons-5 + kimageformats-5 libdispatch libexpected libjpeg-turbo diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index b6eb48785d..ecccf039f7 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -626,13 +626,13 @@ OpenBSD team.") (define-public nano (package (name "nano") - (version "8.0") + (version "8.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) (sha256 - (base32 "1i4ski9l06w3ra4z1nf2ml4bignm073hk8jhxqrnncrp1vy46zy1")))) + (base32 "1jz8rgqd0r1gn9vk1fim51h2kb0f72mvg76gkkz8kqss2ply7cwk")))) (build-system gnu-build-system) (inputs (list gettext-minimal ncurses)) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 0d704faed9..39205f3784 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -1484,9 +1484,6 @@ community around it also has a list of style guides implemented with Vale in @url{https://github.com/errata-ai/styles, their styles repo}.") (license license:expat))) -(define-public go-github-com-errata-ai-vale - (deprecated-package "go-github-com-errata-ai-vale" vale)) - (define-public utf-8-lineseparator (package (name "utf-8-lineseparator") @@ -1562,9 +1559,6 @@ JSON for post-processing @end itemize") (license license:expat))) -(define-public go-github-com-aswinkarthik-csvdiff - (deprecated-package "go-github-com-aswinkarthik-csvdiff" csvdiff)) - (define-public miller (package (name "miller") @@ -1581,7 +1575,6 @@ JSON for post-processing (build-system go-build-system) (arguments (list - #:go go-1.19 #:install-source? #f #:import-path "github.com/johnkerl/miller/cmd/mlr" #:unpack-path "github.com/johnkerl/miller" diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 2612201c11..27cea548ec 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -644,7 +644,6 @@ calls.") (build-system go-build-system) (arguments (list - #:go go-1.17 #:install-source? #f #:import-path "github.com/oz/tz")) (inputs diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 760b917768..fdc003731d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -84,7 +84,9 @@ #:use-module (gnu packages time) #:use-module (gnu packages version-control) #:use-module (gnu packages base) - #:use-module (srfi srfi-1)) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35)) (define-public libtasn1 (package @@ -390,7 +392,7 @@ bindings that were formerly provided as part of GnuTLS.") (modify-inputs (package-inputs guile-gnutls) (replace "guile" guile-2.2))))) -(define (target->openssl-target target) +(define (target->openssl-target pkg target) "Return the value to set CONFIGURE_TARGET_ARCH to when cross-compiling OpenSSL for TARGET." ;; Keep this code outside the build code, @@ -411,7 +413,10 @@ OpenSSL for TARGET." ((target-linux? target) "linux") (else - (error "unsupported openssl target kernel")))) + (raise (condition + (&package-unsupported-target-error + (package pkg) + (target target))))))) (arch (cond ((target-x86-32? target) @@ -438,7 +443,10 @@ OpenSSL for TARGET." ((target-64bit? target) "generic64") (else - (error "unsupported openssl target architecture"))))) + (raise (condition + (&package-unsupported-target-error + (package pkg) + (target target)))))))) (string-append kernel "-" arch)))) (define-public openssl-1.1 @@ -488,6 +496,7 @@ OpenSSL for TARGET." (setenv "CROSS_COMPILE" (string-append target "-")) (setenv "CONFIGURE_TARGET_ARCH" #$(target->openssl-target + this-package (%current-target-system)))))) #~()) #$@(if (target-hurd?) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index eb72b415ee..2f6e6809d7 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -531,6 +531,14 @@ which will be used as a snippet in origin." (git-version "0.19.0" revision commit) #:commit commit))) +(define-public tree-sitter-prisma + (tree-sitter-grammar + "prisma" "Prisma" + "19zb3dkwp2kpyivygqxk8yph0jpl7hn9zzcry15mshn2n0rs9sih" + "1.4.0" + #:repository-url "https://github.com/victorhqc/tree-sitter-prisma" + #:license license:expat)) + (define-public tree-sitter-python (tree-sitter-grammar "python" "Python" diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index fe188ed71d..5f8a3655b0 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -32,39 +32,44 @@ (define-public libunibreak (package (name "libunibreak") - (version "5.0") + (version "6.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/adah1972/libunibreak") (commit (string-append "libunibreak_" - (string-replace-substring version "." "_"))))) + (string-replace-substring version "." "_"))))) (file-name (git-file-name name version)) (sha256 (base32 - "0r5dndhwsiy65lmavz3vdgal9nl8g97hbmdjg6zyq3zh5hs87vwf")))) + "0mhkbji89cyjg4g1rviyprchxzpv8pmlmqw4m10cvgfjwmpmwa7k")))) (build-system gnu-build-system) (native-inputs - (list autoconf-wrapper - automake - libtool - ucd)) + (list autoconf-wrapper + automake + libtool + ucd)) (arguments `(#:parallel-tests? #f ; parallel tests cause non-deterministic - ; build failures - #:phases - (modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) - (for-each (lambda (file) - (copy-file - (search-input-file inputs - (string-append "/share/ucd/auxiliary/" - file)) - (string-append "src/" file))) - '("LineBreakTest.txt" - "WordBreakTest.txt" - "GraphemeBreakTest.txt"))))))) + ;; see https://github.com/adah1972/libunibreak/issues/41 + ;; There is currently no plan to implement full Unicode 15.1 support for + ;; line breaking, mostly because tailoring for Brahmic scripts, as + ;; described in LB28a of UAX #14-51, is problematic within the current + ;; framework. + ;; #:phases + ;; (modify-phases %standard-phases + ;; (add-before 'check 'pre-check + ;; (lambda* (#:key inputs #:allow-other-keys) + ;; (for-each (lambda (file) + ;; (copy-file + ;; (search-input-file inputs + ;; (string-append "/share/ucd/auxiliary/" + ;; file)) + ;; (string-append "src/" file))) + ;; '("LineBreakTest.txt" + ;; "WordBreakTest.txt" + ;; "GraphemeBreakTest.txt"))))) + )) (home-page "https://vimgadgets.sourceforge.net/libunibreak/") (synopsis "Unicode line breaking and word breaking algorithms") (description diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 29401f87ff..3267a541a1 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3810,7 +3810,7 @@ If several repos are related, it helps to see their status together.") (define-public ghq (package (name "ghq") - (version "1.1.7") + (version "1.6.2") (home-page "https://github.com/x-motemen/ghq") (source (origin (method git-fetch) @@ -3820,12 +3820,11 @@ If several repos are related, it helps to see their status together.") (file-name (git-file-name name version)) (sha256 (base32 - "155sfmhmh4ia3iinm1s8fk7fxyn5dxdryad9xkbg7mr3i3ikqjwh")))) + "00rrm0gykmj60i0lnr4js6d4193c92zm3cimimb03xva4n9frvxw")))) (build-system go-build-system) (arguments (list #:install-source? #f - #:go go-1.21 #:import-path "github.com/x-motemen/ghq" #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0732eda288..ddfa3a2b72 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2332,13 +2332,13 @@ It is usually a complement to @code{ffmpeg-normalize}.") (define-public ffmpeg-normalize (package (name "ffmpeg-normalize") - (version "1.27.7") + (version "1.28.2") (source (origin (method url-fetch) (uri (pypi-uri "ffmpeg-normalize" version)) (sha256 (base32 - "0idqqgsr3p840vx2x3idn851qwghjdbm6v4yrq2kprppyfvglni7")))) + "129jicvifh5bpxrn62mpfanv5z2266bryxd6cd5xhhi4vfwcinx5")))) (build-system pyproject-build-system) (arguments (list #:phases @@ -2711,40 +2711,31 @@ projects while introducing many more.") (define-public smplayer (package (name "smplayer") - (version "21.10.0") + (version "23.12.0") (source (origin - (method url-fetch) - (uri (string-append - "mirror://sourceforge/smplayer/SMPlayer/" version - "/smplayer-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/smplayer-dev/smplayer") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "12nvcl0cfix1xay9hfi7856vg4lpv8y5b0a22212bsjbvl5g22rc")))) + (base32 "0yrm57rib910h9m4avhg6mkmkzy9xjb3f185c5zr6jls100az8h1")))) (build-system qt-build-system) (native-inputs (list qttools-5)) (inputs - (list bash-minimal qtbase-5 zlib mpv)) + (list bash-minimal + qtbase-5 + qtdeclarative-5 + zlib + mpv)) (arguments (list #:tests? #false ; no tests #:make-flags #~(list (string-append "PREFIX=" #$output) - (string-append "CC=" #+(cc-for-target)) - ;; A KLUDGE to turn off invoking lrelease on the - ;; project for now, because it fails consistently - ;; with "WARNING: Could not find qmake spec - ;; 'default'". See below. - "LRELEASE=true") + (string-append "CC=" #+(cc-for-target))) #:phases #~(modify-phases %standard-phases (delete 'configure) - ;; Due to the above, we must run lrelease separately on each .ts file - ;; (as opposed to running `lrelease-pro smplayer.pro` for the entire - ;; project, as the Makefile does normally without the above kludge). - (add-after 'build 'compile-ts-files - (lambda _ - (for-each (lambda (file) - (invoke "lrelease" file)) - (find-files "./" "\\.ts$")))) (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -2984,8 +2975,7 @@ To load this plugin, specify the following option when starting mpv: (delete-file "orfondl"))))) (build-system go-build-system) (arguments - (list #:go go-1.19 - #:install-source? #f + (list #:install-source? #f #:import-path "github.com/badlogic/orfondl" #:phases #~(modify-phases %standard-phases @@ -3138,7 +3128,7 @@ YouTube.com and many more sites.") (define-public yt-dlp (package (name "yt-dlp") - (version "2024.05.27") + (version "2024.07.09") (source (origin (method git-fetch) @@ -3147,7 +3137,7 @@ YouTube.com and many more sites.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "13j6vg0kxfw3hppq7gzbz2d72g415071gh5arkwzj902rh0c7777")))) + (base32 "1zw8zaihfx6fg1l9ynwm0d4zy6k30jwi7qbq9ylsl93yg1a73js9")))) (build-system pyproject-build-system) (arguments `(#:tests? ,(not (%current-target-system)) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 4ff9676e79..dfd0e19e4b 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013-2017, 2020-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2016-2021, 2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016-2021, 2023, 2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017 Andy Patterson <ajpatter@uwaterloo.ca> @@ -33,6 +33,7 @@ ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2023, 2024 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2024 Raven Hallsby <karl@hallsby.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -221,8 +222,11 @@ "share/qemu/opensbi-riscv64-generic-fw_dynamic.bin")) (seabios (search-input-file %build-inputs "share/qemu/bios.bin")) - (ipxe (search-input-file %build-inputs - "share/qemu/pxe-virtio.rom")) + (ipxe + #$@(if (this-package-input "ipxe-qemu") + #~((search-input-file %build-inputs + "share/qemu/pxe-virtio.rom")) + #~((string-append #$output "/share/qemu")))) (out #$output)) (list (string-append "--cc=" gcc) ;; Some architectures insist on using HOST_CC. @@ -255,8 +259,11 @@ (let* ((seabios (dirname (search-input-file inputs "share/qemu/bios.bin"))) (seabios-firmwares (find-files seabios "\\.bin$")) - (ipxe (dirname (search-input-file - inputs "share/qemu/pxe-virtio.rom"))) + (ipxe + #$@(if (this-package-input "ipxe-qemu") + #~((dirname (search-input-file + inputs "share/qemu/pxe-virtio.rom"))) + #~((string-append #$output "/share/qemu")))) (ipxe-firmwares (find-files ipxe "\\.rom$")) (openbios (search-input-file inputs "share/qemu/openbios-ppc")) @@ -285,6 +292,28 @@ "\"~a\",~%" file)) allowed-differences) (close-port allowed-differences-whitelist)))) + ;; If the ipxe firmware isn't available, remove it from the list + ;; of files expected to be available and remove some of the tests. + #$@(if (not (this-package-input "ipxe-qemu")) + #~((add-after 'unpack 'dont-require-ipxe-firmware + (lambda _ + (substitute* "pc-bios/meson.build" + ((".*(pxe|efi)-.*") "")) + (substitute* "tests/qtest/meson.build" + ((".*qom-test.*") "") + ((".*qos-test.*") "") + ((".*test-hmp.*") "") + ((".*'pxe-test':.*") "") + ((",? ?'boot-serial-test',?") "") + ((",? ?'endianness-test',?") "") + ((",? ?'prom-env-test',?") "") + ((",? ?'pxe-test',?") "") + ((",? ?'test-filter-mirror',?") "") + ((",? ?'test-filter-redirector',?") "") + ((",? ?'test-netfilter',?") "") + ;; Fix the slow_qtests array after the substitutions + ((" : .*") ""))))) + #~()) (add-after 'unpack 'extend-test-time-outs (lambda _ ;; These tests can time out on heavily-loaded and/or slow storage. @@ -449,41 +478,44 @@ exec smbd $@"))) (rename-file (string-append out "/share/doc/qemu") (string-append qemu-doc "/html")))))))) (inputs - (list alsa-lib - bash-minimal - dtc - glib - gtk+ - ipxe-qemu - libaio - libcacard ;smartcard support - attr libcap-ng ;VirtFS support - libdrm - libepoxy - libjpeg-turbo - libpng - libseccomp - libslirp - liburing - libusb ;USB pass-through support - mesa - ncurses - openbios-qemu-ppc - opensbi-qemu - ;; ("pciutils" ,pciutils) - pixman - pulseaudio - sdl2 - seabios-qemu - spice - usbredir - util-linux - vde2 - virglrenderer - - ;; Formats to support for .qcow2 (and possibly other) compression. - zlib - `(,zstd "lib"))) + (append + (if (supported-package? ipxe-qemu) + (list ipxe-qemu) + '()) + (list alsa-lib + bash-minimal + dtc + glib + gtk+ + libaio + libcacard ;smartcard support + attr libcap-ng ;VirtFS support + libdrm + libepoxy + libjpeg-turbo + libpng + libseccomp + libslirp + liburing + libusb ;USB pass-through support + mesa + ncurses + openbios-qemu-ppc + opensbi-qemu + ;; pciutils + pixman + pulseaudio + sdl2 + seabios-qemu + spice + usbredir + util-linux + vde2 + virglrenderer + + ;; Formats to support for .qcow2 (and possibly other) compression. + zlib + `(,zstd "lib")))) (native-inputs ;; Note: acpica is here only to pretty-print firmware differences with IASL ;; (see the replace-firmwares phase above). @@ -1663,7 +1695,8 @@ virtualization library.") version ".tar.gz")) (sha256 (base32 - "18lhlnd3gmyzhbnjc16gdyzhjcd33prlxnca4xlidiidngbq21lm")))) + "18lhlnd3gmyzhbnjc16gdyzhjcd33prlxnca4xlidiidngbq21lm")) + (patches (search-patches "virt-manager-fix-gtk-cursor-theme-backtace.patch")))) (build-system python-build-system) (arguments (list #:use-setuptools? #f ; uses custom distutils 'install' command diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 90f7330f2b..62328ca868 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -148,6 +148,7 @@ #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-compression) #:use-module (gnu packages golang-web) #:use-module (gnu packages golang-xyz) #:use-module (gnu packages gperf) @@ -338,51 +339,60 @@ and its related documentation.") (define-public miniflux (package (name "miniflux") - (version "2.0.46") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/miniflux/v2") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1qv95kipjlg374kiq6gssh5jsb5arahq4jsb7vkg3njnx0ldwvkb")))) + (version "2.1.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/miniflux/v2") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1m1rcxcjswni3adgjkn3hvb59cbfdh9cl22d5qqwn0lxs8mgqhfl")))) (build-system go-build-system) (arguments - (list #:go go-1.19 - #:install-source? #f - #:import-path "miniflux.app" - #:build-flags - #~(list (string-append - "-ldflags= -X miniflux.app/version.Version=" #$version)) - #:phases - #~(modify-phases %standard-phases - (add-before 'build 'disable-cgo - (lambda _ - (setenv "CGO_ENABLED" "0"))) - (add-after 'install 'install-manpage - (lambda* (#:key import-path #:allow-other-keys) - (let ((man1 (string-append #$output "/share/man/man1/")) - (page (format #f "src/~a/miniflux.1" import-path))) - (install-file page man1)))) - (add-after 'install-manpage 'rename-binary - (lambda _ - (let ((bindir (string-append #$output "/bin/"))) - (rename-file (string-append bindir "miniflux.app") - (string-append bindir "miniflux")))))))) + (list + #:go go-1.22 + #:install-source? #f + #:import-path "miniflux.app/v2" + #:build-flags + #~(list (string-append + "-ldflags= -X miniflux.app/v2/internal/version.Version=" + #$version)) + #:phases + #~(modify-phases %standard-phases + ;; XXX: Replace when go-build-system supports nested path. + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./..."))))) + (add-after 'install 'install-manpage + (lambda* (#:key import-path #:allow-other-keys) + (let ((man1 (string-append #$output "/share/man/man1/")) + (page (format #f "src/~a/miniflux.1" import-path))) + (install-file page man1)))) + (add-after 'install-manpage 'rename-binary + (lambda _ + (let ((bindir (string-append #$output "/bin/"))) + (rename-file (string-append bindir "v2") + (string-append bindir "miniflux")))))))) (inputs - (list go-github-com-coreos-go-oidc-v3 - go-github-com-go-telegram-bot-api-telegram-bot-api + (list go-github-com-abadojack-whatlanggo + go-github-com-andybalholm-brotli + go-github-com-coreos-go-oidc-v3 + go-github-com-go-webauthn-webauthn go-github-com-gorilla-mux go-github-com-lib-pq - go-github-com-matrix-org-gomatrix go-github-com-prometheus-client-golang go-github-com-puerkitobio-goquery - go-github-com-rylans-getlang go-github-com-tdewolff-minify-v2 go-github-com-yuin-goldmark + go-golang-org-x-crypto + go-golang-org-x-net + go-golang-org-x-oauth2 go-golang-org-x-term + go-golang-org-x-text go-mvdan-cc-xurls)) (home-page "https://miniflux.app/") (synopsis "Minimalist and opinionated feed reader") @@ -397,7 +407,7 @@ and its related documentation.") @item Use only modern vanilla Javascript (ES6 and Fetch API) @item Single binary compiled statically without dependency @item The number of features is voluntarily limited -@end itemize\n") +@end itemize") (license license:asl2.0))) (define-public mod-wsgi @@ -533,6 +543,7 @@ the same, being completely separated from the Internet.") "--with-http_sub_module" "--with-pcre-jit" "--with-debug" + "--with-compat" "--with-stream" "--with-stream_ssl_module" "--with-http_stub_status_module" @@ -5448,7 +5459,7 @@ you'd expect.") go-github-com-elliotchance-orderedmap go-github-com-fatih-color go-github-com-goccy-go-json - go-github-com-goccy-yaml + go-github-com-goccy-go-yaml go-github-com-jinzhu-copier go-github-com-magiconair-properties go-github-com-pelletier-go-toml-v2 diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 505ce09c1a..eecaaa2cf7 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -73,6 +73,7 @@ ;;; Copyright © 2024 James Smith <jsubuntuxp@disroot.org> ;;; Copyright © 2024 bigbug <bigbookofbug@proton.me> ;;; Copyright © 2024 dan <i@dan.games> +;;; Copyright © 2024 Wamm K. D. <jaft.r@outlook.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -145,6 +146,7 @@ #:use-module (gnu packages logging) #:use-module (gnu packages lua) #:use-module (gnu packages man) + #:use-module (gnu packages maths) #:use-module (gnu packages mpd) #:use-module (gnu packages pciutils) #:use-module (gnu packages music) @@ -3910,3 +3912,25 @@ configuration.")))) for short) for X11 and Wayland, that goes to great lengths to be both CPU and battery efficient---polling is only done when absolutely necessary.") (license license:expat))) + +(define-public wf-config + (package + (name "wf-config") + (version "0.8.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/WayfireWM/" name "/")) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 + "07x6dapv2xyg0cn44dd2faw5gpk7mwfpbkpld9kyiaa9d44362z1")))) + (build-system meson-build-system) + (native-inputs (list pkg-config)) + (inputs (list glm libxml2 wlroots libevdev)) + (home-page "https://github.com/WayfireWM/wf-config") + (synopsis "Library for managing configuration files for Wayfire") + (description "The package provides a library for managing the +configuration files of Wayifre. It can set key and mouse bindings, +configure input, and customize Wayfire plugins.") + (license license:expat))) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 9e1e9fbc6f..4c12835b24 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -396,7 +396,7 @@ with X11 or Wayland, or in a text terminal with ncurses.") qtdeclarative-5 qtwayland-5 wayland - knotifications)) + knotifications-5)) (native-inputs (list extra-cmake-modules qttools-5)) (synopsis "Clipboard manager with advanced features") diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index c13a1f4215..6b953ef152 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6158,7 +6158,7 @@ basic eye-candy effects.") (define-public xpra (package (name "xpra") - (version "6.0.1") + (version "6.0.2") (source (origin (method git-fetch) @@ -6167,7 +6167,7 @@ basic eye-candy effects.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0l92zscy1kjb0bpsdd8r2mchv2gks0krz6dj34s65c34zwa1rwg6")) + (base32 "176qxrksgr07jhrlny3zxybnvf091kxkfmfnv9ci3h2k1nbwqh2x")) (patches (search-patches "xpra-6.0-systemd-run.patch" "xpra-6.0-install_libs.patch")))) (build-system python-build-system) |