Merge remote-tracking branch 'origin/master' into core-updates

This commit is contained in:
Andreas Enge 2023-04-17 19:17:39 +02:00
commit 216d7bdb73
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
23 changed files with 593 additions and 365 deletions

View file

@ -1828,7 +1828,6 @@ dist_patch_DATA = \
%D%/packages/patches/racket-zuo-bin-sh.patch \
%D%/packages/patches/remake-impure-dirs.patch \
%D%/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch \
%D%/packages/patches/r-mixedpower-r2power.patch \
%D%/packages/patches/rng-tools-revert-build-randstat.patch \
%D%/packages/patches/rocm-comgr-3.1.0-dependencies.patch \
%D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch \

View file

@ -35,7 +35,7 @@
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021 qblade <qblade@protonmail.com>
@ -2785,13 +2785,13 @@ (define-public fdupes
(define-public ansible-core
(package
(name "ansible-core")
(version "2.11.6")
(version "2.14.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ansible-core" version))
(sha256
(base32 "0fih7nxszni8imi5sywsifd976v77ydhip43pzg7dd65qy1h5mck"))))
(base32 "057g87smxcn6zc558xk4zr6ga4q8clmkyxghn5gx60a94sy61clh"))))
(build-system python-build-system)
(arguments
`(#:modules ((guix build python-build-system)
@ -2827,10 +2827,25 @@ (define bin (string-append (assoc-ref outputs "out") "/bin"))
(and (eq? 'symlink (stat:type (lstat x)))
(string-prefix? "ansible-" x)
(string=? "ansible" (readlink x)))))))))
(add-after 'unpack 'skip-controller-tests
(lambda _
;; XXX: This disables all the controller tests, which fail for
;; unknown reasons, seemingly while attempting to set the
;; locale to en_US.UTF-8.
(substitute* "test/lib/ansible_test/_internal/commands\
/units/__init__.py"
(("^ if test_context == TestContext.controller:.*"
all)
(string-append all " continue\n")))))
(add-after 'unpack 'preserve-pythonpath
(lambda _
(substitute* "test/lib/ansible_test/_internal/ansible_util.py"
(("PYTHONPATH=get_ansible_python_path\\(args\\)" all)
(string-append all "+ ':' + os.environ['GUIX_PYTHONPATH']")))
(substitute* "test/lib/ansible_test/_internal/commands\
/units/__init__.py"
(("PYTHONPATH=get_units_ansible_python_path\\(args, \
test_context)" all)
(string-append all "+ ':' + os.environ['GUIX_PYTHONPATH']")))))
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
@ -2842,18 +2857,10 @@ (define bin (string-append (assoc-ref outputs "out") "/bin"))
(("/usr/bin/python")
(which "python")))))
(replace 'check
;; The environment for the test suite can be tricky to get right.
;; The environment used for Ansible's CI defined in the following
;; Dockerfile can be used as a reference:
;; https://raw.githubusercontent.com/ansible/
;; default-test-container/master/Dockerfile.
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
(when tests?
;; Otherwise Ansible fails to create its config directory.
(setenv "HOME" "/tmp")
(setenv "PATH" (string-append (getenv "PATH") ":"
(assoc-ref outputs "out") "/bin"))
(add-installed-pythonpath inputs outputs)
;; This test module messes up with sys.path and causes many
;; test failures.
(delete-file "test/units/_vendor/test_vendor.py")
@ -2862,11 +2869,23 @@ (define bin (string-append (assoc-ref outputs "out") "/bin"))
(delete-file "test/units/utils/test_display.py")
;; This test fail for reasons unknown.
(delete-file "test/units/cli/test_adhoc.py")
;; These tests fail in the container; it appears that the
;; mocking of the absolute file names such as /usr/bin/svcs do
;; not work as intended there.
(delete-file "test/units/modules/test_iptables.py")
(delete-file "test/units/modules/test_service.py")
;; These tests fail with a "unsupported locale setting" error
;; when invoking 'locale.setlocale(locale.LC_ALL, '')'
(delete-file "test/units/module_utils/basic/\
test_command_nonexisting.py")
(delete-file "test/units/module_utils/basic/test_tmpdir.py")
;; The test suite needs to be run with 'ansible-test', which
;; does some extra environment setup. Taken from
;; https://raw.githubusercontent.com/ansible/ansible/\
;; devel/test/utils/shippable/shippable.sh.
(invoke "ansible-test" "units" "-v")))))))
(invoke "ansible-test" "units" "-v"
"--num-workers" (number->string
(parallel-job-count)))))))))
(native-inputs
(list openssh
openssl
@ -2884,7 +2903,7 @@ (define bin (string-append (assoc-ref outputs "out") "/bin"))
(list python-cryptography
python-jinja2
python-pyyaml
python-packaging ;for version number parsing
python-packaging ;for version number parsing
python-resolvelib-0.5))
(home-page "https://www.ansible.com/")
(synopsis "Radically simple IT automation")
@ -2912,16 +2931,15 @@ (define bin (string-append (assoc-ref outputs "out") "/bin"))
(define-public ansible
(package
(name "ansible")
(version "4.7.0")
(version "7.4.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ansible" version))
(sha256
(base32 "0aab9id6dqfw2111r731c7y1p77dpzczynmgl4d989p3a7n54z0b"))))
(base32 "142barhwz0wx5kn74xi0bfl21iwq2yq3jp14kxajsg9nggndcr09"))))
(build-system python-build-system)
(propagated-inputs
(list ansible-core))
(propagated-inputs (list ansible-core))
;; The Ansible collections are found by ansible-core via the Python search
;; path; the following search path ensures that they are found even when
;; Python is not present in the profile.

View file

@ -329,7 +329,7 @@ (define-public cmh
(define-public giac
(package
(name "giac")
(version "1.9.0-37")
(version "1.9.0-43")
(source
(origin
(method url-fetch)
@ -341,7 +341,7 @@ (define-public giac
"~parisse/debian/dists/stable/main/source/"
"giac_" version ".tar.gz"))
(sha256
(base32 "0ch18wp6b3nr0zg31961rxng2mbw5mj76s00jf5qz7jdxl65s27n"))))
(base32 "1fqs9nxjj0kimisfsfhscgzfmc470lyzm63hwla7ka2iqq3s7bp3"))))
(build-system gnu-build-system)
(arguments
(list
@ -360,8 +360,8 @@ (define-public giac
;; FIXME: Tests failing. Not sure why.
(lambda _
(substitute* "check/Makefile.in"
(("chk_fhan4") "")
(("chk_fhan11") ""))))
(("chk_fhan(4|11)") "")
(("chk_fhan(14|21)") "")))) ;fail specifically on i686
(add-after 'install 'fix-doc
(lambda _
;; Most French documentation has a non-commercial license, so we

View file

@ -9667,6 +9667,78 @@ (define-public r-demultiplex
")
(license license:cc0))))
(define-public r-demultiplex2
(let ((commit "e42bc8310c0ea035af100e6ccea59b46ad6385f5")
(revision "1"))
(package
(name "r-demultiplex2")
(version (git-version "1.0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Gartner-Lab/deMULTIplex2")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"15f3kshsdvm97w24ql9b1wjlfbabimdsam0482hg7jivlvpl8j9w"))))
(properties `((upstream-name . "deMULTIplex2")))
(build-system r-build-system)
(propagated-inputs (list r-data-table
r-devtools
r-dplyr
r-ggextra
r-ggplot2
r-gridextra
r-magrittr
r-mass
r-matrix
r-rcolorbrewer
r-shortread
r-stringdist
r-tidyr
r-uwot
r-viridis
r-xvector))
(home-page "https://github.com/Gartner-Lab/deMULTIplex2")
(synopsis "Robust sample demultiplexing for scRNA-seq")
(description
"This package implements a bioinformatics algorithm for demultiplexing
multiplexed single cell datasets. It is built on a statistical model of tag
read counts derived from the physical mechanism of tag cross-contamination.")
(license license:cc0))))
(define-public r-demuxmix
(let ((commit "09a7918ca6e0cd23e6bbaed2b97388bc499e248e")
(revision "1"))
(package
(name "r-demuxmix")
(version (git-version "1.1.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/huklein/demuxmix")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"03kfnns7m2447jsc3xplyv9qx8hvvdjmii7j837g3bb6smyxss96"))))
(properties `((upstream-name . "demuxmix")))
(build-system r-build-system)
(propagated-inputs (list r-ggplot2 r-gridextra r-mass r-matrix))
(native-inputs (list r-knitr))
(home-page "https://github.com/huklein/demuxmix")
(synopsis
"Demultiplexing oligo-barcoded scRNA-seq data using regression mixture models")
(description
"This package is used for demultiplexing single-cell sequencing
experiments of pooled cells. These cells are labeled with barcode
oligonucleotides. The package implements methods to fit regression mixture
models for a probabilistic classification of cells, including multiplet
detection. Demultiplexing error rates can be estimated, and methods for
quality control are provided.")
(license license:artistic2.0))))
(define-public gdc-client
(package
(name "gdc-client")

View file

@ -131,7 +131,7 @@ (define-public nss-certs
;; XXX We used to refer to the nss package here, but that eventually caused
;; module cycles. The below is a quick copy-paste job that must be kept in
;; sync manually. Surely there's a better way…?
(version "3.82")
(version "3.85")
(source (origin
(method url-fetch)
(uri (let ((version-with-underscores
@ -142,7 +142,7 @@ (define-public nss-certs
"nss-" version ".tar.gz")))
(sha256
(base32
"0wqmgibacxf5i3jlm8jl50qasv2spwx07ixlscz9byf2f8xnggrj"))
"15yj2gddlp68wj1k9q4q70vs6r7zx5qkbavcppmls5di212xdndg"))
;; Create nss.pc and nss-config.
(patches (search-patches "nss-3.56-pkgconfig.patch"
"nss-getcwd-nonnull.patch"

View file

@ -1409,14 +1409,14 @@ (define-public r-bwstest
(define-public r-v8
(package
(name "r-v8")
(version "4.2.2")
(version "4.3.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "V8" version))
(sha256
(base32
"0friwpw3cbg40hfsqnlp8g3a6l4zhfag6lh005ya6dw634kkarah"))))
"1l70vdqcagp9cdyxa231gk33z5blsg96j0l28zbaklnhmr7mqfby"))))
(properties `((upstream-name . "V8")))
(build-system r-build-system)
(arguments
@ -1712,13 +1712,13 @@ (define-public r-zcompositions
(define-public r-zoo
(package
(name "r-zoo")
(version "1.8-11")
(version "1.8-12")
(source (origin
(method url-fetch)
(uri (cran-uri "zoo" version))
(sha256
(base32
"19cw09bhwj2qyd72765ym1cm2wmhh801ccif889nzq5gfpw513l4"))))
"1f1g7f362sidh99n2pcgnj8iwsn7hnjgpdnkrqml5qzrd0k8dhz6"))))
(build-system r-build-system)
(propagated-inputs
(list r-lattice))
@ -5186,13 +5186,13 @@ (define-public r-pastecs
(define-public r-partykit
(package
(name "r-partykit")
(version "1.2-19")
(version "1.2-20")
(source (origin
(method url-fetch)
(uri (cran-uri "partykit" version))
(sha256
(base32
"0ma3haanf5pkj8r8q3bd0ig3zq9ppfjhhfkh6v50m82z6fprm3p4"))))
"1np0sa7fx7wvwxbpk5lpgbdpz0xwcvppq0sc52nifx1dxnirll33"))))
(build-system r-build-system)
(propagated-inputs
(list r-formula
@ -6698,6 +6698,41 @@ (define-public r-limsolve
;; Any GPL version.
(license (list license:gpl2+ license:gpl3+))))
(define-public r-littler
(package
(name "r-littler")
(version "0.3.18")
(source (origin
(method url-fetch)
(uri (cran-uri "littler" version))
(sha256
(base32
"1lp6a62g3yhzr4pv9kynibv7k9pd546w6hifs1aficyxbyg4dgqq"))))
(properties `((upstream-name . "littler")))
(build-system r-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'install-executable
(lambda _
(install-file "inst/bin/r"
(string-append #$output "/bin")))))))
(inputs (list icu4c zlib))
(native-inputs
(list r-simplermarkdown pkg-config))
(home-page "https://github.com/eddelbuettel/littler")
(synopsis "R at the command-line via r")
(description
"This package provides a scripting and command-line front-end is provided
by r (aka littler) as a lightweight binary wrapper around the GNU R language
and environment for statistical computing and graphics. While R can be used
in batch mode, the r binary adds full support for both shebang-style scripting
(i.e. using a hash-mark-exclamation-path expression as the first line in
scripts) as well as command-line use in standard pipelines. In other words, r
provides the R language without the environment.")
(license license:gpl2+)))
(define-public r-fitdistrplus
(package
(name "r-fitdistrplus")
@ -7801,14 +7836,14 @@ (define-public r-ordinal
(define-public r-jomo
(package
(name "r-jomo")
(version "2.7-5")
(version "2.7-6")
(source
(origin
(method url-fetch)
(uri (cran-uri "jomo" version))
(sha256
(base32
"05xfkj65nqd987pp5bhl4jy46qxwjll5mxnjii6qrmfmjld177q5"))))
"1np2sw0kq21kdhkv227pz2rqvpxg06r3mk93ggkrz5nl45ajmyiz"))))
(build-system r-build-system)
(propagated-inputs
(list r-lme4 r-mass r-ordinal r-survival r-tibble))
@ -9499,17 +9534,17 @@ (define-public r-aggregation
(define-public r-quantmod
(package
(name "r-quantmod")
(version "0.4.21")
(version "0.4.22")
(source
(origin
(method url-fetch)
(uri (cran-uri "quantmod" version))
(sha256
(base32
"1qmpdk91smiqg63h4jsrw4izl4pnbgwlzi16zjvin0fs29kx01jf"))))
"0pknwssha01hjsf3c7lgrabk2c3rzq5wa2m7mf8sz7wsrbqrd57j"))))
(build-system r-build-system)
(propagated-inputs
(list r-curl r-ttr r-xts r-zoo))
(list r-curl r-jsonlite r-ttr r-xts r-zoo))
(home-page "https://cran.r-project.org/web/packages/quantmod/")
(synopsis "Quantitative financial modelling framework")
(description "This package provides a quantitative financial modelling
@ -11401,14 +11436,14 @@ (define-public r-rentrez
(define-public r-renv
(package
(name "r-renv")
(version "0.17.2")
(version "0.17.3")
(source
(origin
(method url-fetch)
(uri (cran-uri "renv" version))
(sha256
(base32
"1qar7s3zdnhqsi6am6f58wg3ygpwv73qmrcp36glz0galzigc0y2"))))
"1w7mwk3drf3bzfyhsy6mlnpbhgp8il8is7q95ad567ry4g6jhkqw"))))
(properties `((upstream-name . "renv")))
(build-system r-build-system)
(native-inputs
@ -12635,6 +12670,29 @@ (define-public r-writexl
libxlsxwriter.")
(license license:bsd-2)))
(define-public r-writexls
(package
(name "r-writexls")
(version "6.4.0")
(source (origin
(method url-fetch)
(uri (cran-uri "WriteXLS" version))
(sha256
(base32
"1dqr98kx930y6mcvb9b39xiwshhs250gkd2vw2v6iil34sl90jv4"))))
(properties `((upstream-name . "WriteXLS")))
(build-system r-build-system)
(inputs (list perl))
(home-page "https://github.com/marcschwartz/WriteXLS")
(synopsis "Create Excel 2003 (XLS) and Excel 2007 (XLSX) files")
(description
"This package provides a cross-platform Perl-based R function to create
Excel 2003 (XLS) and Excel 2007 (XLSX) files from one or more data frames.
Each data frame will be written to a separate named worksheet in the Excel
spreadsheet. The worksheet name will be the name of the data frame it
contains or can be specified by the user.")
(license license:gpl2+)))
(define-public r-biasedurn
(package
(name "r-biasedurn")
@ -13657,14 +13715,14 @@ (define-public r-mosaiccore
(define-public r-labelled
(package
(name "r-labelled")
(version "2.10.0")
(version "2.11.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "labelled" version))
(sha256
(base32
"02n4r4bizsysnlmxpw86w7zkiqi6aill9dq2nmrn43xzrffy54sy"))))
"1pg5l2c3ai8gkrqryq5xzsal85pljmdzc2ln8k1ak3j4racm5p7d"))))
(properties `((upstream-name . "labelled")))
(build-system r-build-system)
(propagated-inputs
@ -13688,13 +13746,13 @@ (define-public r-labelled
(define-public r-ggformula
(package
(name "r-ggformula")
(version "0.10.2")
(version "0.10.4")
(source
(origin
(method url-fetch)
(uri (cran-uri "ggformula" version))
(sha256
(base32 "0xb39gjn6q7va1d1fhvf2dw9428s1q13wasx4y3cz2f0lls1r2wl"))))
(base32 "07d9sq0dqi0g5x9h58icfk1f4hgg1xz4mhbp2z2rxg9qgs74fvdj"))))
(build-system r-build-system)
(propagated-inputs
(list r-ggforce
@ -14871,13 +14929,13 @@ (define-public r-multcomp
(define-public r-multcompview
(package
(name "r-multcompview")
(version "0.1-8")
(version "0.1-9")
(source
(origin
(method url-fetch)
(uri (cran-uri "multcompView" version))
(sha256
(base32 "1rfq9wvvrghq0542ff40wy8vdmsyd8spzz6ihcywcvxdfa8m6g8j"))))
(base32 "15vki166n2k4ng72hy62c2mzz18s10h6l6w839qplg0zsplr6f8z"))))
(properties `((upstream-name . "multcompView")))
(build-system r-build-system)
(home-page "https://cran.r-project.org/package=multcompView")
@ -15125,14 +15183,14 @@ (define-public r-glmmtmb
(define-public r-bayestestr
(package
(name "r-bayestestr")
(version "0.13.0")
(version "0.13.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "bayestestR" version))
(sha256
(base32
"1951zm88qlbmr4ragrzfzgw72awm7mqhh464s6kck0mcx7shas90"))))
"0mmnifi3j29qlsj917wbdqpgpk05x3cc7111k842gsv7y34h4ir7"))))
(properties `((upstream-name . "bayestestR")))
(build-system r-build-system)
(propagated-inputs
@ -15152,14 +15210,14 @@ (define-public r-bayestestr
(define-public r-performance
(package
(name "r-performance")
(version "0.10.2")
(version "0.10.3")
(source
(origin
(method url-fetch)
(uri (cran-uri "performance" version))
(sha256
(base32
"0r9x5pqf1asf0sy0255jv0d4cki4xd5sfp5rl9mldclykpswf022"))))
"1l4sr6cgg8rkgs5w98a36n79b1lbg241p60grsnz12hskppa1a6q"))))
(build-system r-build-system)
(propagated-inputs
(list r-bayestestr r-datawizard r-insight))
@ -18014,14 +18072,14 @@ (define-public r-ontologyindex
(define-public r-gargle
(package
(name "r-gargle")
(version "1.3.0")
(version "1.4.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "gargle" version))
(sha256
(base32
"02ldshm8phs1ls0djqfprv5yy8i50ijh16y7smkb61wrwd4zr3s2"))))
"12s980jfw98czzrxdn83b2blj4qcrkqqmycjplkzvm4mapgiw3wf"))))
(build-system r-build-system)
(propagated-inputs
(list r-cli
@ -18033,7 +18091,6 @@ (define-public r-gargle
r-openssl
r-rappdirs
r-rlang
r-rstudioapi
r-withr))
(native-inputs
(list r-knitr))
@ -19771,14 +19828,14 @@ (define-public r-rarpack
(define-public r-compositions
(package
(name "r-compositions")
(version "2.0-5")
(version "2.0-6")
(source
(origin
(method url-fetch)
(uri (cran-uri "compositions" version))
(sha256
(base32
"0niccv8i3jrcjnjm7dygzhz6bfah9za6lswa669pfpgsycilpf51"))))
"0d0wlrwfpjvz02cwrqpg5bnrf8isz359dl9qqxn9yb6czpmp9ls5"))))
(build-system r-build-system)
(propagated-inputs
(list r-bayesm r-mass r-robustbase r-tensora))
@ -21249,13 +21306,13 @@ (define-public r-polspline
(define-public r-rms
(package
(name "r-rms")
(version "6.5-0")
(version "6.6-0")
(source
(origin
(method url-fetch)
(uri (cran-uri "rms" version))
(sha256
(base32 "11dibpjgbhlqzn97254hlp6p6wfld7bnw4j5rr0dqwynj6fq2vzx"))))
(base32 "0p32nqb4pj8dddi4dwjbr59wp6q6vvmarq97vpdaxwrr8fwsvazk"))))
(build-system r-build-system)
(propagated-inputs
(list r-cluster
@ -21265,7 +21322,8 @@ (define-public r-rms
r-hmisc
r-htmltable
r-htmltools
r-lattice
r-kableextra
r-knitr
r-mass
r-multcomp
r-nlme
@ -23474,13 +23532,13 @@ (define-public r-sccore
(define-public r-scs
(package
(name "r-scs")
(version "3.0-1")
(version "3.2.4")
(source (origin
(method url-fetch)
(uri (cran-uri "scs" version))
(sha256
(base32
"04srf33zw4dxv22b1h5qwjch5yg7hrvk4iq8yvxqnbr8qzp1x26n"))))
"13r944b9ip078hqwdpzn3jv21zm47d9l2b1f5y6glcj5pxs9iwy3"))))
(properties `((upstream-name . "scs")))
(build-system r-build-system)
(home-page "https://github.com/FlorianSchwendinger/scs")
@ -23878,18 +23936,18 @@ (define-public r-dalex
(define-public r-enrichr
(package
(name "r-enrichr")
(version "3.1")
(version "3.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "enrichR" version))
(sha256
(base32
"0ad7jp398prvmm2fym07268qhv40mg67dx55ml4ayqkwxwffr1i9"))))
"1g97q6vqwvb2l02y61343sblarqi433gjl3qmlyxjxq2lnjrnak1"))))
(properties `((upstream-name . "enrichR")))
(build-system r-build-system)
(propagated-inputs
(list r-curl r-ggplot2 r-httr r-rjson))
(list r-curl r-ggplot2 r-httr r-rjson r-writexls))
(native-inputs
(list r-knitr))
(home-page "https://cran.r-project.org/web/packages/enrichR/")
@ -24808,14 +24866,14 @@ (define-public r-graphlayouts
(define-public r-terra
(package
(name "r-terra")
(version "1.7-18")
(version "1.7-23")
(source
(origin
(method url-fetch)
(uri (cran-uri "terra" version))
(sha256
(base32
"0ipavj170yzp88dvbka6a0y683qn78dj7chr1ym1ghncrqkmk0fn"))))
"1xri4cxvkpdyxvm1cv6dypyv0ww9al99vmrhzhscvwj7xycckabg"))))
(properties `((upstream-name . "terra")))
(build-system r-build-system)
(inputs
@ -27789,13 +27847,13 @@ (define-public r-tolerance
(define-public r-torch
(package
(name "r-torch")
(version "0.9.1")
(version "0.10.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "torch" version))
(sha256
(base32 "03qbdws6j5v2vmdgdnwfd0248s2qirnxpm9v4302vqlq3c0i83c2"))))
(base32 "1ydazl7v10vm69573y871rq1dvbgdvlvhcs6di7xw7i4z4kg2gxm"))))
(properties `((upstream-name . "torch")))
(build-system r-build-system)
(arguments
@ -27826,6 +27884,7 @@ (define-public r-torch
r-callr
r-cli
r-coro
r-desc
r-ellipsis
r-glue
r-magrittr
@ -28220,13 +28279,13 @@ (define-public r-idpmisc
(define-public r-qqconf
(package
(name "r-qqconf")
(version "1.3.1")
(version "1.3.2")
(source (origin
(method url-fetch)
(uri (cran-uri "qqconf" version))
(sha256
(base32
"1vvw79l8nqpqvmfpff5khgdjbs1s2q5ylg72lvkihd2qfk0d8cf5"))))
"18wfvljd6gbf9am3hh14fgp06gpa04vw9nhl7q07li7rmlkxc1cl"))))
(properties `((upstream-name . "qqconf")))
(build-system r-build-system)
(inputs (list fftw))
@ -28980,18 +29039,19 @@ (define-public r-snowballc
(define-public r-quanteda
(package
(name "r-quanteda")
(version "3.2.4")
(version "3.3.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "quanteda" version))
(sha256
(base32
"1yg3lgckh6fncmw037p4gaa2bab59yh6izqix1cgyysjg4jpcw62"))))
"19b36r1fd493mfcjp58fd986kgyhd2q396il8gb1cpa5cfpny983"))))
(properties `((upstream-name . "quanteda")))
(build-system r-build-system)
(propagated-inputs
(list r-fastmatch
r-jsonlite
r-magrittr
r-matrix
r-rcpp
@ -30097,14 +30157,14 @@ (define-public r-rstan
(define-public r-rstanarm
(package
(name "r-rstanarm")
(version "2.21.3")
(version "2.21.4")
(source
(origin
(method url-fetch)
(uri (cran-uri "rstanarm" version))
(sha256
(base32
"19rj396q84maxnd9d2xcd5rblg3310xn7sqbd6k18kwf3dvd7wp9"))))
"11diz486ak31zx5402kra3s6nd76cvnla8frfn0kc7dzwhiwcspc"))))
(properties `((upstream-name . "rstanarm")))
(build-system r-build-system)
(inputs
@ -32062,14 +32122,14 @@ (define-public r-spatstat-core
(define-public r-spatstat-linnet
(package
(name "r-spatstat-linnet")
(version "3.0-6")
(version "3.1-0")
(source
(origin
(method url-fetch)
(uri (cran-uri "spatstat.linnet" version))
(sha256
(base32
"0sk0zg4fhy3pryi06i0lvhkrgh47r3h4jxw231i8n5mzng1x828n"))))
"037hggsd9wmiwlxc8wjabzsiqlk5gf6mflm87pps370nmxkavc5r"))))
(properties
`((upstream-name . "spatstat.linnet")))
(build-system r-build-system)
@ -32872,13 +32932,13 @@ (define-public r-config
(define-public r-confintr
(package
(name "r-confintr")
(version "0.2.0")
(version "1.0.0")
(source (origin
(method url-fetch)
(uri (cran-uri "confintr" version))
(sha256
(base32
"1zpprv5ysmnqn83xdsixsm6jhsi1gck32z6x60gp0y8xs25mwcbg"))))
"15vsdbqj5w4qbk7kwp1jqyc3phmmy8s981xjj0n0yy48xhy37f8g"))))
(properties `((upstream-name . "confintr")))
(build-system r-build-system)
(propagated-inputs (list r-boot))
@ -32978,21 +33038,21 @@ (define-public r-diffusionmap
(define-public r-igraph
(package
(name "r-igraph")
(version "1.4.1")
(version "1.4.2")
(source
(origin
(method url-fetch)
(uri (cran-uri "igraph" version))
(sha256
(base32
"1waxa15ng4lqr07s68br81ihdnxy5dnx8iygyzkwnyz8dbs5i8h8"))))
"1raaih254dcd19d4sqmb8w8ih5plbvik11nsr9q68nm2n6nh0lvx"))))
(build-system r-build-system)
(native-inputs
(list gfortran r-knitr))
(inputs
(list gmp glpk libxml2 zlib))
(propagated-inputs
(list r-magrittr r-matrix r-pkgconfig r-rlang))
(list r-cpp11 r-magrittr r-matrix r-pkgconfig r-rlang))
(home-page "https://igraph.org")
(synopsis "Network analysis and visualization")
(description
@ -33318,14 +33378,14 @@ (define-public r-dials
(define-public r-tune
(package
(name "r-tune")
(version "1.1.0")
(version "1.1.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "tune" version))
(sha256
(base32
"1pp3pgxwpqihxfjwf9mb5rc0yv60q47n7z399z21zp4jbwryxymh"))))
"0kl8bpd1i5ir6lrx055rilvb7kg0iws5f4618956h3g8sif1lvmg"))))
(properties `((upstream-name . "tune")))
(build-system r-build-system)
(propagated-inputs
@ -33363,14 +33423,14 @@ (define-public r-tune
(define-public r-workflowsets
(package
(name "r-workflowsets")
(version "1.0.0")
(version "1.0.1")
(source
(origin
(method url-fetch)
(uri (cran-uri "workflowsets" version))
(sha256
(base32
"12wj0m6kqnjh8k5k14kqh40wf14gzyg5l3shhbpr2lvk87l9ssqq"))))
"1rv82lx1vmhjqlim7y5vpfsa7mb6msvkhiz17hxr5k9244ykmbhi"))))
(properties `((upstream-name . "workflowsets")))
(build-system r-build-system)
(propagated-inputs
@ -33642,14 +33702,14 @@ (define-public r-tidytext
(define-public r-parsnip
(package
(name "r-parsnip")
(version "1.0.4")
(version "1.1.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "parsnip" version))
(sha256
(base32
"1305z2pamxxaqy0qylb8vq6ixs934kfc9h2si2fdy7q5wjpdjnjh"))))
"13bp44i8i99yiahdjikf0xidfgxd251nhbxsnsw0ax1lv24fpggc"))))
(properties `((upstream-name . "parsnip")))
(build-system r-build-system)
(propagated-inputs
@ -34036,14 +34096,14 @@ (define-public r-qtl2
(define-public r-seqminer
(package
(name "r-seqminer")
(version "8.6")
(version "8.9")
(source
(origin
(method url-fetch)
(uri (cran-uri "seqminer" version))
(sha256
(base32
"1fm76mam5hp5v0hj27ywna7vafrw7mnwph30fqdb17163rrhr1ca"))))
"1cnsy1cjz4rcm32hzcvr1d43y4m7sdkzim1mwsn3490mf3xmi3i1"))))
(build-system r-build-system)
(inputs
(list zlib))
@ -35842,14 +35902,14 @@ (define-public r-lwgeom
(define-public r-stars
(package
(name "r-stars")
(version "0.6-0")
(version "0.6-1")
(source
(origin
(method url-fetch)
(uri (cran-uri "stars" version))
(sha256
(base32
"0zwbsqp8bihcq5sjdw05pvbh4l9s68p0qw3ffkk0jphsipvy9za9"))))
"19q44bs2w12lyim8gzfpgxfkp2cdf29cav4cv74vzsxrv8xdny0z"))))
(properties `((upstream-name . "stars")))
(build-system r-build-system)
(propagated-inputs

View file

@ -124,6 +124,7 @@
;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan@selidor.net>
;;; Copyright © 2022 Demis Balbach <db@minikn.xyz>
;;; Copyright © 2020, 2021, 2022, 2023 Andrew Tropin <andrew@trop.in>
;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw>
;;;
;;; This file is part of GNU Guix.
;;;
@ -421,7 +422,7 @@ (define-public emacs-geiser
(define-public emacs-gptel
(package
(name "emacs-gptel")
(version "0.3.2")
(version "0.3.5")
(source (origin
(method git-fetch)
(uri (git-reference
@ -430,7 +431,7 @@ (define-public emacs-gptel
(file-name (git-file-name name version))
(sha256
(base32
"0g4p0y7bk14ixiz841am2v36fdbwigz77q4zz745m4hviaq3s30y"))))
"1ymqx9m6ypxdqcc9y3d90ibs3d2n6lb9dg7fn7q30lz6qa5nsc94"))))
(build-system emacs-build-system)
(arguments
(list
@ -3101,6 +3102,30 @@ (define-public emacs-marginalia-emprise
playback status, artist name and title for Emprise using Marginalia.")
(license license:gpl3+)))
(define-public emacs-eradio
(let ((commit "47769986c79def84307921f0277e9bb2714756c2")
(revision "0"))
(package
(name "emacs-eradio")
(version (git-version "0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/olavfosse/eradio")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0lks2pph44qxc9l34nr55ha667974r8ckxdwmvcp6v9mnm05317s"))))
(build-system emacs-build-system)
(home-page "https://github.com/olavfosse/eradio")
(synopsis "Simple radio player for GNU Emacs")
(description
"Eradio is a simple internet radio player for Emacs. Start, stop or
toggle custom-defined channels. An external media player like mpv or VLC is
required.")
(license license:gpl3+))))
;;;
;;; Miscellaneous.
@ -4026,7 +4051,7 @@ (define-public emacs-corfu-doc
(define-public emacs-cape
(package
(name "emacs-cape")
(version "0.13")
(version "0.14")
(source
(origin
(method git-fetch)
@ -4035,7 +4060,7 @@ (define-public emacs-cape
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0nvmqfp9rv2mrisyvwfr285yww22c6wb5by3s25c83ay2ivpi8ya"))))
(base32 "0xicfjf49fz8kbh7wqpj9fwhm5f6s6fcb3919icggjsf2465yqls"))))
(build-system emacs-build-system)
(arguments
(list
@ -7926,14 +7951,14 @@ (define-public emacs-sudo-edit
(define-public emacs-subed
(package
(name "emacs-subed")
(version "1.2.1")
(version "1.2.2")
(source (origin
(method url-fetch)
(uri (string-append "https://elpa.nongnu.org/nongnu/subed-"
version ".tar"))
(sha256
(base32
"09a3ggnqsm4lxqhj0z9z3df6qzibvv9lpwqij2gpiifbb4lkvj4b"))))
"1xlh4kqa8516rvmzy67pzs0ghk9rc919nq5b2sywd5mvzi5spxnh"))))
(arguments
(list
#:tests? #t
@ -11643,13 +11668,13 @@ (define-public emacs-major-mode-hydra
(define-public emacs-ivy
(package
(name "emacs-ivy")
(version "0.13.4")
(version "0.14.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/ivy-" version ".tar"))
(sha256
(base32 "0qpza1c45mr8fcpnm32cck4v22fnzz1yb7kww05rzgq1k9iivx5v"))))
(base32 "1fzl7xcmxjg005g4676ac3jcshgmcmdr81ywmxvjcs8wj71v56jv"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-hydra))
@ -11667,14 +11692,14 @@ (define-public emacs-ivy
(define-public emacs-counsel
(package
(name "emacs-counsel")
(version "0.13.4")
(version "0.14.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/"
"counsel-" version ".tar"))
(sha256
(base32 "094zfapfn1l8wjf3djkipk0d9nks0g77sbk107pfsbr3skkzh031"))))
(base32 "03n1qk66dcbh9xlnlzpwkb441c2xdpfc7bzx4i2szw0xh4a6g5sj"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-swiper))
@ -11700,13 +11725,13 @@ (define-public emacs-counsel
(define-public emacs-swiper
(package
(name "emacs-swiper")
(version "0.13.4")
(version "0.14.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/swiper-" version ".tar"))
(sha256
(base32 "197pq2cvvskib87aky907wv2am55vilr7y5dabmmm07a8vr9py0v"))))
(base32 "1p2qil6gj4y8y3ydqs8pbxn8j16q9r42nnc2f61c30hws504pkms"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-ivy))
@ -15288,7 +15313,7 @@ (define-public emacs-neotree
(define-public emacs-org
(package
(name "emacs-org")
(version "9.6.3")
(version "9.6.4")
(source
(origin
(method git-fetch)
@ -15297,7 +15322,7 @@ (define-public emacs-org
(commit (string-append "release_" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0gsvhqn93mlgzhwhy5ynb03fbvl55zdfbbdgzh0y42ffyc643v8p"))))
(base32 "0n285p8az9386jdfixv8bzkjx5agdfyfg9a122nnk1km15j53xdj"))))
(build-system emacs-build-system)
(arguments
(list
@ -17205,7 +17230,7 @@ (define-public emacs-cdlatex
(define-public emacs-cnfonts
(package
(name "emacs-cnfonts")
(version "1.1.0")
(version "1.1.1")
(source
(origin
(method git-fetch)
@ -17214,7 +17239,7 @@ (define-public emacs-cnfonts
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "156qj5dkipa5a3f3scldf1mcfvmp1g199ds2wyi6jk5gqfv73zsd"))))
(base32 "0k0mh653sjwhli6hxdyzvcqdmpxdsx1s0fwzsw69dfr6nxr7f1dv"))))
(build-system emacs-build-system)
(home-page "https://github.com/tumashu/cnfonts")
(synopsis "Emacs Chinese fonts setup tool")
@ -17522,13 +17547,13 @@ (define-public emacs-pyim-basedict
(define-public emacs-pyim
(package
(name "emacs-pyim")
(version "5.3.1")
(version "5.3.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/pyim-" version ".tar"))
(sha256
(base32 "0lkshw52xdrcbdrgmjb665bpyga61qlk29rrzrrj7s82n09bq9kv"))))
(base32 "13irkmhlfq99glyy0vhj559si5672cqcysjxlxn7lvckxr298vzc"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-async emacs-popup emacs-posframe emacs-xr))
@ -19030,16 +19055,16 @@ (define-public emacs-emamux
(define-public emacs-plz
(package
(name "emacs-plz")
(version "0.4")
(version "0.5.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/alphapapa/plz.el")
(commit version)))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0sfgbq6nn9prxqg5qs576rlpszbhp70yj3d8r7hqckrd5s0sbk13"))))
(base32 "1ccddvbhb3n02s2krgyqapll7kbzxjhldzn8g8gmnqfsmwpg9d2r"))))
(build-system emacs-build-system)
(inputs (list curl))
(arguments
@ -19061,7 +19086,7 @@ (define-public emacs-plz
(define-public emacs-ement
(package
(name "emacs-ement")
(version "0.8.2")
(version "0.8.3")
(source
(origin
(method git-fetch)
@ -19070,7 +19095,7 @@ (define-public emacs-ement
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0qzml4hrylvsd25vyyj1pf77kvv8kzjyzap00d4s182gvva4lvks"))))
(base32 "17s3sl0dijgmhnaryw08g6vn6za46xz6a709rsfrdis8v1knqd7z"))))
(build-system emacs-build-system)
(arguments
(list #:emacs emacs)) ;need libxml support
@ -24386,6 +24411,12 @@ (define-public emacs-wordgen
(sha256
(base32 "06vbc9ycz1nbjwjkg99y3lj6jwb6lnwnmkqf09yr00jjrrfhfash"))))
(build-system emacs-build-system)
(arguments
(list
#:emacs (if (target-64bit?)
emacs-minimal
;; Require wide-int support for 32-bit platform.
emacs-wide-int)))
(home-page "https://github.com/Fanael/wordgen.el")
(synopsis "Random word generator")
(description "This package provides functions to generate random words
@ -24522,14 +24553,14 @@ (define-public emacs-slime-company
(define-public emacs-sml-mode
(package
(name "emacs-sml-mode")
(version "6.11")
(version "6.12")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/sml-mode-"
version ".tar"))
(sha256
(base32 "05vga709kphbx6jacqh57cq5gyicwrxxf81gask5lbq7vzfzlbfc"))))
(base32 "19wyxsnw60lmjbb7ijislpv9vzk9996rh1b0iw7wyrqszfxy2p20"))))
(build-system emacs-build-system)
(home-page "https://elpa.gnu.org/packages/sml-mode.html")
(synopsis "Major mode for editing (Standard) ML")
@ -28031,7 +28062,7 @@ (define-public emacs-navigel
(define-public emacs-eat
(package
(name "emacs-eat")
(version "0.7")
(version "0.8")
(source
(origin
(method git-fetch)
@ -28041,7 +28072,7 @@ (define-public emacs-eat
(file-name (git-file-name name version))
(sha256
(base32
"05wpjqbj0jv1sax788rdj0myfi596rimvfwh4mg0w6kcza291xiq"))
"1fb66g7jjc7dhw61323d94mx7gqfp6ylf9a7v5qym1n92mv48bdr"))
(modules '((guix build utils)))
(snippet
#~(begin
@ -35305,7 +35336,7 @@ (define-public emacs-keystore-mode
(define-public emacs-ivy-avy
(package
(name "emacs-ivy-avy")
(version "0.13.4")
(version "0.14.0")
(source
(origin
(method url-fetch)
@ -35313,7 +35344,7 @@ (define-public emacs-ivy-avy
"https://elpa.gnu.org/packages/"
"ivy-avy-" version ".tar"))
(sha256
(base32 "1q5caxm4rnh4jy5n88dhkdbx1afsshmfki5dl8xsqbdb3y0zq7yi"))))
(base32 "0gjpvjahhkxsakqrcni78v71fsrh3f0jrs55a4kqc5hv6qyn8hk9"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-ivy emacs-avy))
@ -35397,7 +35428,7 @@ (define-public emacs-wisp-mode
(define-public emacs-ivy-hydra
(package
(name "emacs-ivy-hydra")
(version "0.13.5")
(version "0.14.0")
(source
(origin
(method url-fetch)
@ -35405,7 +35436,7 @@ (define-public emacs-ivy-hydra
"https://elpa.gnu.org/packages/"
"ivy-hydra-" version ".tar"))
(sha256
(base32 "06rln9bnq5hli5rqlm47fb68b8llpqrmzwqqv4rn7mx3854i9a5x"))))
(base32 "1gsjr2yny9qcj56cb4xy47la11z0lszq0f2qws0yzyh02ng30k1n"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-ivy emacs-hydra))
@ -36735,6 +36766,30 @@ (define-public emacs-tintin-mode
accomplish different tasks.")
(license license:asl2.0))))
(define-public emacs-totp
(let ((commit "a5e059b8475b32bc7f5ddadda248cf84449ed722") ;no releases
(revision "0"))
(package
(name "emacs-totp")
(home-page "https://github.com/juergenhoetzel/emacs-totp")
(version (git-version "0.1.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0b76fxk9r3n9zii75q1957ivb6ap5px5h87kagxz083nl77jky7a"))))
(build-system emacs-build-system)
(synopsis "Generate Time-based One-time Passwords (TOTP) in Emacs")
(description
"emacs-TOTP implements @acronym{TOTP, Time-based One-time Passwords} as
specified in RFC 6238. It supports reading secrets in HEX and multiple base32
variations, including non-standard base32 encodings.")
(license license:gpl3+))))
;;;
;;; 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

View file

@ -589,6 +589,7 @@ (define-public gst-plugins-base
xorg-server-for-tests))
(arguments
(list
#:meson meson-0.63
#:phases
#~(modify-phases %standard-phases
#$@%common-gstreamer-phases
@ -654,6 +655,7 @@ (define-public gst-plugins-good
(build-system meson-build-system)
(arguments
(list
#:meson meson-0.63
#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:phases
#~(modify-phases %standard-phases
@ -776,6 +778,7 @@ (define-public gst-plugins-bad
(build-system meson-build-system)
(arguments
(list
#:meson meson-0.63
#:configure-flags #~(list "-Dsctp-internal-usrsctp=disabled")
#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:phases
@ -954,7 +957,8 @@ (define-public gst-plugins-ugly
(base32 "1486x08bwasq6l7kc75nph5az61siq9mbgkgpw4kf1mxn16z8c4g"))))
(build-system meson-build-system)
(arguments
(list #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
(list #:meson meson-0.63
#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:phases
#~(modify-phases %standard-phases
#$@%common-gstreamer-phases
@ -1035,6 +1039,7 @@ (define-public gst-editing-services
(build-system meson-build-system)
(arguments
(list
#:meson meson-0.63
#:tests? #f ; FIXME: 16/23 failing tests.
#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:phases #~(modify-phases %standard-phases
@ -1103,6 +1108,7 @@ (define-public python-gst
(build-system meson-build-system)
(arguments
(list
#:meson meson-0.63
#:modules `((guix build meson-build-system)
(guix build utils)
((guix build python-build-system) #:prefix python:))

View file

@ -484,7 +484,7 @@ (define (%upstream-linux-source version hash)
;; The current "stable" kernels. That is, the most recently released major
;; versions that are still supported upstream.
(define-public linux-libre-6.2-version "6.2.10")
(define-public linux-libre-6.2-version "6.2.11")
(define-public linux-libre-6.2-gnu-revision "gnu")
(define deblob-scripts-6.2
(linux-libre-deblob-scripts
@ -494,12 +494,12 @@ (define deblob-scripts-6.2
(base32 "0ir5vvbdh6dly5ld8mfp7285g8k88w5bb32hj4wmgyqsbfqc6rf2")))
(define-public linux-libre-6.2-pristine-source
(let ((version linux-libre-6.2-version)
(hash (base32 "1zm4xvxdy6sqqwcich46mr4dh3kpmp40bawwahrg4lr7rp1n5iap")))
(hash (base32 "0iyx03z58pv1d5nrryjx94k3nxwyvm4b3bim6nawg1qbws26f8qd")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-6.2)))
(define-public linux-libre-6.1-version "6.1.23")
(define-public linux-libre-6.1-version "6.1.24")
(define-public linux-libre-6.1-gnu-revision "gnu")
(define deblob-scripts-6.1
(linux-libre-deblob-scripts
@ -509,7 +509,7 @@ (define deblob-scripts-6.1
(base32 "0cchdhjra74zanyk14brv2l2dvxpg8dn58rn477lgfb44mcnhq33")))
(define-public linux-libre-6.1-pristine-source
(let ((version linux-libre-6.1-version)
(hash (base32 "1szblfmm8gx0am017y30ywc60b1gqarplgmcs5zy7bshhwp3fn3l")))
(hash (base32 "0135aj8asplpxqr48hwdmwynx8n8hzhdgh55yl8r0n1kivisgrma")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-6.1)))
@ -517,7 +517,7 @@ (define-public linux-libre-6.1-pristine-source
;; The "longterm" kernels — the older releases with long-term upstream support.
;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html>
(define-public linux-libre-5.15-version "5.15.106")
(define-public linux-libre-5.15-version "5.15.107")
(define-public linux-libre-5.15-gnu-revision "gnu")
(define deblob-scripts-5.15
(linux-libre-deblob-scripts
@ -527,7 +527,7 @@ (define deblob-scripts-5.15
(base32 "03hwhwbcicwyx5i30d6m715kwgrxz4h21xhk55wnawlk8zhx3r35")))
(define-public linux-libre-5.15-pristine-source
(let ((version linux-libre-5.15-version)
(hash (base32 "1r4g7ipcmj7k9dpwd5p2kd0f3iidnzl6z9g2cq4mfcw0h97r7rl4")))
(hash (base32 "1a5gqpxmzls5mp4a0cw10ldrps4pvbn19nzfri91ys25j1v0wdqr")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.15)))

View file

@ -11717,11 +11717,11 @@ (define-public ecl-cl-lex
(sbcl-package->ecl-package sbcl-cl-lex))
(define-public sbcl-cl-colors2
(let ((commit "795aedee593b095fecde574bd999b520dd03ed24")
(revision "1"))
(let ((commit "d620e7fb504bbec3ed48cc7cd03f60ce2bb3735d")
(revision "2"))
(package
(name "sbcl-cl-colors2")
(version (git-version "0.2.1" revision commit))
(version (git-version "0.5.0" revision commit))
(source
(origin
(method git-fetch)
@ -11730,7 +11730,7 @@ (define-public sbcl-cl-colors2
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0hlyf4h5chkjdp9armla5w4kw5acikk159sym7y8c4jbjp9x47ih"))))
(base32 "14wx006lv4bhf86z68484kphm5jsh86ns60pb4i1bi8kl8lp03r0"))))
(build-system asdf-build-system/sbcl)
(native-inputs
(list sbcl-clunit2))

View file

@ -435,7 +435,13 @@ (define-public sbcl
(uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-"
version "-source.tar.bz2"))
(sha256
(base32 "1ahyrc3p9cf7y5zbgzvb9yxa8a480ccis4ksijlajck3z8n1dk24"))))
(base32 "1ahyrc3p9cf7y5zbgzvb9yxa8a480ccis4ksijlajck3z8n1dk24"))
(modules '((guix build utils)))
(snippet
'(begin
;; Don't force ARMv5.
(substitute* "src/runtime/Config.arm-linux"
(("-march=armv5") ""))))))
(build-system gnu-build-system)
(outputs '("out" "doc"))
(native-inputs

View file

@ -3364,7 +3364,7 @@ (define-public python-pytorch-for-r-torch
(package
(inherit python-pytorch)
(name "python-pytorch")
(version "1.12.1")
(version "1.13.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -3374,7 +3374,7 @@ (define-public python-pytorch-for-r-torch
(file-name (git-file-name name version))
(sha256
(base32
"1wimgnmn8kfazc8vhf65b9psdwj80n3chzkd8ic28541ac2zqzpk"))
"17yxjzwp4zp75fz7czgz9acijzw7dpyqcza50v8y1x7hfg2gw369"))
(patches (search-patches "python-pytorch-system-libraries.patch"
"python-pytorch-runpath.patch"))
(modules '((guix build utils)))
@ -3394,7 +3394,10 @@ (define-public python-pytorch-for-r-torch
"gloo" "googletest" "ios-cmake" "NNPACK"
"onnx" "protobuf" "pthreadpool"
"pybind11" "python-enum" "python-peachpy"
"python-six" "tbb" "XNNPACK" "zstd"))))))))
"python-six" "tbb" "XNNPACK" "zstd"))
(substitute* "functorch/CMakeLists.txt"
(("\\$\\{_rpath_portable_origin\\}/../torch/lib")
"$ORIGIN/../torch/lib"))))))))
;; Keep this in sync with python-pytorch
(define-public python-torchvision
@ -3500,7 +3503,7 @@ (define-public python-hmmlearn
(define-public liblantern
(package
(name "liblantern")
(version "0.9.1")
(version "0.10.0")
(source
(origin
(method git-fetch)
@ -3509,7 +3512,7 @@ (define-public liblantern
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1rycs7fgm03fxp8lxj8ljrdwy5whxd4554xzklbcmn4mcwbxgg57"))))
(base32 "12480fac9xq7rgw0q5f2cnvmakhakjsnq1gvh2ncjfwxz34n8fl7"))))
(build-system cmake-build-system)
(arguments
(list
@ -3518,7 +3521,7 @@ (define-public liblantern
(let ((python-version (version-major+minor (package-version python))))
#~(modify-phases %standard-phases
(add-after 'unpack 'chdir
(lambda _ (chdir "lantern")))
(lambda _ (chdir "src/lantern")))
(add-after 'chdir 'do-not-download-binaries
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
@ -3844,8 +3847,8 @@ (define-public python-vosk
"lib.")))))))))
(define-public nerd-dictation
(let* ((commit "53ab129a5ee0f8b5df284e8cf2229219b732c59e")
(revision "0"))
(let* ((commit "0eb44b7fd0927d69c92de5566e5807ed2c2e20b7")
(revision "1"))
(package
(name "nerd-dictation")
(version (git-version "0" revision commit))
@ -3857,7 +3860,7 @@ (define-public nerd-dictation
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "184qijiva1h1x00dzicik0yzgh78pq2lqr5fkgicgp26mkarlyhc"))))
(base32 "0frdpswv6w3cwj3c7wd5w8gj3s1hvpdwd48qhfhfxf7imahz9bqf"))))
(build-system python-build-system)
(arguments
'(#:phases
@ -3875,7 +3878,7 @@ (define-public nerd-dictation
operations. It has zero overhead, as this relies on manual activation and
there are no background processes. Dictation is accessed manually with
@code{nerd-dictation begin} and @code{nerd-dictation end} commands.")
(license license:gpl3+))))
(license license:gpl2+))))
(define-public nerd-dictation/wayland
(package

View file

@ -52,6 +52,7 @@
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;; Copyright © 2023 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2023 Antero Mejr <antero@mailbox.org>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -69,33 +70,32 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages music)
#:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu)
#:use-module (guix build-system ant)
#:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
#:use-module (guix build-system meson)
#:use-module (guix build-system perl)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system python)
#:use-module (guix build-system qt)
#:use-module (guix build-system scons)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system qt)
#:use-module (guix build-system waf)
#:use-module (guix build-system trivial)
#:use-module (guix build-system go)
#:use-module (guix build-system qt)
#:use-module (guix build-system waf)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module (gnu packages algebra)
#:use-module (gnu packages apr)
#:use-module (gnu packages assembly)
#:use-module (gnu packages audio)
#:use-module (gnu packages autotools)
#:use-module (gnu packages assembly)
#:use-module (gnu packages backup)
#:use-module (gnu packages base) ;libbdf
#:use-module (gnu packages bash)
@ -104,9 +104,9 @@ (define-module (gnu packages music)
#:use-module (gnu packages boost)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages cdrom)
#:use-module (gnu packages code)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages code)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
#:use-module (gnu packages crypto)
@ -125,13 +125,14 @@ (define-module (gnu packages music)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages game-development)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnunet)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages golang)
#:use-module (gnu packages gpodder)
#:use-module (gnu packages graphics)
#:use-module (gnu packages graphviz)
@ -144,12 +145,13 @@ (define-module (gnu packages music)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages java)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages libffi)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libffi)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux) ; for alsa-utils
#:use-module (gnu packages lirc)
#:use-module (gnu packages llvm)
#:use-module (gnu packages lua)
#:use-module (gnu packages man)
#:use-module (gnu packages mp3)
#:use-module (gnu packages mpd)
@ -182,8 +184,8 @@ (define-module (gnu packages music)
#:use-module (gnu packages stb)
#:use-module (gnu packages tcl)
#:use-module (gnu packages terminals)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages tex)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages time)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control)
@ -194,11 +196,9 @@ (define-module (gnu packages music)
#:use-module (gnu packages wm)
#:use-module (gnu packages wxwidgets)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (gnu packages xiph)
#:use-module (gnu packages golang)
#:use-module (gnu packages lua)
#:use-module ((srfi srfi-1) #:select (last)))
(define-public audacious
@ -1556,50 +1556,51 @@ (define-public music21
(define-public abjad
(package
(name "abjad")
;; XXX: The latest version which supports current Guix's Python 3.9.9.
(version "3.4")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Abjad/abjad")
(commit (string-append "v" version))))
(url "https://github.com/Abjad/abjad")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0s63vk9fifp0im9c31kb9ck39mbaxhrls993d8fvg0nkg41z1jnz"))))
(build-system python-build-system)
(base32 "0s63vk9fifp0im9c31kb9ck39mbaxhrls993d8fvg0nkg41z1jnz"))))
(build-system pyproject-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'loosen-requirements
(lambda _
(substitute* "setup.py"
;; Permit newer versions of uqbar. Remove for >3.4.
((", <0\\.5\\.0")
""))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
;; See: https://stackoverflow.com/a/34140498
(invoke "python" "-m" "pytest" "tests")))))))
(list
#:phases
#~(modify-phases %standard-phases
;; XXX. Permit newer version of uqbar, remove for >3.4. Remove in
;; the next update.
(add-after 'unpack 'loosen-requirements
(lambda _
(substitute* "setup.py"
((", <0\\.5\\.0") ""))))
;; FIXME: Check why it's failing with this: Note: compilation failed
;; and \version outdated, did you update input syntax with
;; convert-ly?
(add-before 'check 'disable-failing-tests
(lambda _
(substitute* "tests/test_ext_sphinx.py"
(("def test_ext_sphinx_01") "def __off_test_ext_sphinx_01")))))))
(inputs
(list lilypond))
(propagated-inputs
(list python-ply
python-quicktions
python-roman
python-six
python-uqbar
;; XXX: These test dependencies(?) are listed as install_requires
;; in setup.py. Propagate accordingly.
python-black
python-flake8
(native-inputs
(list python-flake8
python-isort
python-mypy
python-pytest
python-pytest-cov
python-pytest-helpers-namespace
python-six
python-sphinx-autodoc-typehints))
(propagated-inputs
(list python-quicktions
python-ply
python-roman
python-uqbar))
(home-page "https://abjad.github.io")
(synopsis "Python API for building LilyPond files")
(description
@ -1609,7 +1610,7 @@ (define-public abjad
programming language, you can use Abjad to make systematic changes to music as you work.
Because Abjad wraps the LilyPond music notation package, you can use Abjad to control the
typographic detail of symbols on the page.")
(license license:expat)))
(license license:expat)))
(define-public abjad-ext-rmakers
(package

View file

@ -1377,8 +1377,8 @@ (define-public gwl/next
"0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc")))))))
(define-public guix-build-coordinator
(let ((commit "7f6db4b55411f79ab5f2639318dc5871c1452f00")
(revision "77"))
(let ((commit "2efcd8b11954708f0b2f26ce6eb9d785e2f6aae4")
(revision "78"))
(package
(name "guix-build-coordinator")
(version (git-version "0" revision commit))
@ -1389,7 +1389,7 @@ (define-public guix-build-coordinator
(commit commit)))
(sha256
(base32
"07pi5yjgagv0xyz9f5cnfz1c06gzx1mpi17h3a1w5h6lp3kwqrv9"))
"1s7q3bn1cccbafd5b4dk0xn2r5qjabl7rclbwf7hfjj7csv8ag2i"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments

View file

@ -4,7 +4,7 @@
;;; Copyright © 2015-2018, 2020-2023 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 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2020, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 20182022 Tobias Geerinckx-Rice <me@tobias.gr>
@ -465,8 +465,8 @@ (define-public pthreadpool
(define-public cpuinfo
;; There's currently no tag on this repo.
(let ((version "0.0")
(revision "1")
(commit "866ae6e5ffe93a1f63be738078da94cf3005cce2"))
(revision "2")
(commit "53298db833c5c5a1598639e9b47cc1a602bbac26"))
(package
(name "cpuinfo")
(version (git-version version revision commit))
@ -477,10 +477,20 @@ (define-public cpuinfo
(file-name (git-file-name name version))
(sha256
(base32
"1lmsf4bpkm19a31i40qwcjn46qf7prggziv4pbsi695bkx5as71p"))
"01kfgxya2w32dz9bd3qm3i2d6nffw0qfyql11rxl7d3g830brj5k"))
(patches (search-patches "cpuinfo-system-libraries.patch"))))
(build-system cmake-build-system)
(arguments '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
(arguments
(list
#:configure-flags '(list "-DBUILD_SHARED_LIBS=ON")
#:phases
'(modify-phases %standard-phases
(add-after 'unpack 'skip-bad-test
(lambda _
(substitute* "test/init.cc"
(("TEST\\(CORE, known_uarch\\) \\{" m)
(string-append m "\
GTEST_SKIP() << \"See https://github.com/pytorch/cpuinfo/issues/132\";"))))))))
(inputs
(list googletest googlebenchmark))
(synopsis "C/C++ library to obtain information about the CPU")

View file

@ -1,26 +0,0 @@
From e882fda905150649aa887c72731144330ca297b5 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Fri, 28 Oct 2022 09:18:11 +0200
Subject: [PATCH] Fix R2power with R>=4.2
The previous commit missed this if statement.
---
R/meta_functions.R | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/R/meta_functions.R b/R/meta_functions.R
index a65f0c1..fb3feba 100644
--- a/R/meta_functions.R
+++ b/R/meta_functions.R
@@ -172,7 +172,7 @@ R2power <- function(model, data, fixed_effects, simvar,
} # end if databased
# 2. SESOI
- suppressWarnings(if (SESOI != F){ # supress warning generated by if statement if SESOI =! F
+ suppressWarnings(if (!is.logical(SESOI)){
# change beta coeficients to SESOI values
model@beta <- SESOI
--
2.37.4

View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015-2021, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au>
@ -1361,14 +1361,13 @@ (define-public python-ntlm-auth
(define-public python-secretstorage
(package
(name "python-secretstorage")
(version "3.3.1")
(version "3.3.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "SecretStorage" version))
(sha256
(base32
"15ginv4gzxrx77n7517xnvf2jcpqc6ran12s951hc85zlr8nqrpx"))))
(base32 "0xxxxr77sgmjm1rqzdd1rkan9xg0qmv8awc1pb9adv39ycz560r4"))))
(build-system python-build-system)
(arguments
'(#:tests? #f)) ; Tests require a running dbus service.
@ -1443,17 +1442,23 @@ (define-public python-certipy
(define-public python-jeepney
(package
(name "python-jeepney")
(version "0.6.0")
(version "0.8.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "jeepney" version))
(sha256
(base32 "0mw6ch5s4czpmsiwqwhcidgk27858pl8vlvb7acrxjkm4ribcnbx"))))
(build-system python-build-system)
(base32 "01jqrk7pn94i7bpmj834pjrw7id659gfag6wpbv04fcpap94izjy"))))
(build-system pyproject-build-system)
(native-inputs
(list python-testpath python-tornado python-trio python-pytest
python-pytest-trio))
(list python-async-timeout
python-testpath
python-trio
python-pytest
python-pytest-asyncio
python-pytest-trio
;; For the build backend
python-flit-core))
(home-page "https://gitlab.com/takluyver/jeepney")
(synopsis "Low-level, pure Python DBus protocol wrapper")
(description

View file

@ -14,7 +14,7 @@
;;; Copyright © 2015, 2016, 2017, 2019, 2022 Leo Famulari <leo@famulari.name>
;;; Copyright © 2015, 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2015, 2016 Erik Edrosa <erik.edrosa@gmail.com>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2017, 2020 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2015, 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
@ -24740,7 +24740,7 @@ (define-public python-outcome
(native-inputs
(list python-pytest python-pytest-cov python-pytest-asyncio))
(propagated-inputs
(list python-async-generator python-attrs))
(list python-attrs))
(home-page "https://github.com/python-trio/outcome")
(synopsis "Capture the outcome of Python function calls")
(description

View file

@ -1887,7 +1887,7 @@ (define-public qtlocation
(uri (qt-urls name version))
(sha256
(base32
"0r16qxy0pfpwvna4gpz67jk3qv3qizfd659kc9iwdh8bhz7lpjrw"))))
"0mlhhhcxx3gpr9kh04c6fljxcj50c2j21r0wb9f7d7nk4flip7b2"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f) ; TODO: Enable the tests
@ -2116,8 +2116,7 @@ (define-public qtgamepad
(sha256
(base32
"0vgxprgk7lak209wsg2ljzfkpwgjzscpbxmj5fyvvwm2pbnpspvk"))))
(native-inputs
(list perl pkg-config))
(native-inputs (list perl pkg-config))
(inputs
(list fontconfig
freetype
@ -2201,8 +2200,7 @@ (define-public qtpurchasing
(sha256
(base32
"0bjky5ncg9yhz4a63g3jl1r5pa6i09f6g8wgzs591mhybrbmhcw8"))))
(inputs
(list qtbase-5 qtdeclarative-5))
(inputs (list qtbase-5 qtdeclarative-5))
(synopsis "Qt Purchasing module")
(description "The Qt Purchasing module provides and in-app API for
purchasing goods and services.")))
@ -2250,8 +2248,7 @@ (define-public qtdatavis3d
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs
(list qtbase-5 qtdeclarative-5))
(inputs (list qtbase-5 qtdeclarative-5))
(synopsis "Qt Data Visualization module")
(description "The Qt Data Visualization module provides a way to visualize
data in 3D as bar, scatter, and surface graphs. It is especially useful for

View file

@ -12,6 +12,7 @@
;;; Copyright © 2022 Sheng Yang <styang@fastmail.com>
;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 Ryan Tolboom <ryan@using.tech>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -1097,7 +1098,7 @@ (define-public gr-satellites
(define-public gqrx
(package
(name "gqrx")
(version "2.15.9")
(version "2.15.10")
(source
(origin
(method git-fetch)
@ -1106,7 +1107,7 @@ (define-public gqrx
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1a70lmcidp5ccmpvlvpfk1g7pshyp8xq2k0kgxrplf8za5hns019"))))
(base32 "0c1s3y7w0gcav666mnkwkb60cczab0rkwdkaqicq1768fsgyhad3"))))
(build-system qt-build-system)
(native-inputs
(list pkg-config))
@ -1591,7 +1592,6 @@ (define-public jtdx
(define-public js8call
(package
(inherit wsjtx)
(name "js8call")
(version "2.2.0")
(source
@ -1603,49 +1603,63 @@ (define-public js8call
(base32 "149sjwc4zg6ckgq26af93p4fxappa4k9dh7rdy67g8ajfjad4cd8"))
(modules '((guix build utils)))
(snippet
'(begin
;; Delete bundled boost to use the shared one.
(delete-file-recursively "boost")
#t))))
#~(begin
;; Delete bundled boost to use the shared one.
(delete-file-recursively "boost")))))
(build-system qt-build-system)
(native-inputs
(list asciidoc gfortran pkg-config qttools-5 ruby-asciidoctor))
(inputs
`(("boost" ,boost)
("fftw" ,fftw)
("fftwf" ,fftwf)
("hamlib" ,wsjtx-hamlib)
("libusb" ,libusb)
("qtbase" ,qtbase-5)
("qtmultimedia-5" ,qtmultimedia-5)
("qtserialport" ,qtserialport)))
(arguments
`(#:tests? #f ; No test suite
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "CMakeLists.txt"
(("DESTINATION /usr/share")
(string-append "DESTINATION "
(assoc-ref outputs "out")
"/share")))))
(add-after 'unpack 'fix-hamlib
(lambda _
(substitute* "CMake/Modules/Findhamlib.cmake"
(("set \\(ENV\\{PKG_CONFIG_PATH\\}.*\\)")
"set (__pc_path $ENV{PKG_CONFIG_PATH})
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda _
;; XXX: How to get the /tmp/<build-name>.drv-<num> path? Use
;; output path for after install check phase instead.
(substitute* "media/tests/test"
(("~/js8call-prefix/build/js8")
(string-append #$output "/bin/js8"))
(("/opt/js8call/bin/js8")
(string-append #$output "/bin/js8")))
(substitute* "CMakeLists.txt"
(("DESTINATION /usr/share")
(string-append "DESTINATION " #$output "/share")))))
(add-after 'unpack 'fix-hamlib
(lambda _
(substitute* "CMake/Modules/Findhamlib.cmake"
(("set \\(ENV\\{PKG_CONFIG_PATH\\}.*\\)")
"set (__pc_path $ENV{PKG_CONFIG_PATH})
list (APPEND __pc_path \"${__hamlib_pc_path}\")
set (ENV{PKG_CONFIG_PATH} \"${__pc_path}\")"))
(substitute* "HamlibTransceiver.hpp"
(("#ifdef JS8_USE_LEGACY_HAMLIB")
"#if 1")))))))
(substitute* "HamlibTransceiver.hpp"
(("#ifdef JS8_USE_LEGACY_HAMLIB")
"#if 1"))))
(delete 'check)
(add-after 'install 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(with-directory-excursion "../js8call/media/tests"
(invoke "./test"))))))))
(native-inputs
(list asciidoc
gfortran
pkg-config
qttools-5
ruby-asciidoctor))
(inputs
(list boost
fftw
fftwf
libusb
qtbase-5
qtmultimedia-5
qtserialport
wsjtx-hamlib))
(home-page "http://js8call.com/")
(synopsis "Weak-signal ham radio communication program")
(description
"JS8Call is a software using the JS8 digital mode (a derivative of the FT8
mode) providing weak signal keyboard to keyboard messaging to amateur radio
operators.")
(home-page "http://js8call.com/")
(license license:gpl3)))
(define-public xnec2c
@ -2577,7 +2591,7 @@ (define-public inspectrum
(define-public wfview
(package
(name "wfview")
(version "1.50")
(version "1.62")
(source
(origin
(method git-fetch)
@ -2586,37 +2600,46 @@ (define-public wfview
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1djgn1z4hibzci53mrvskz47jfq6hk8lhhqckpa93pvsi9kadl4k"))))
(base32 "0rrj6h5k8plq4m6fd2yxargfhqcwkxv6bdp4rmgh6bs4prl4wvwd"))))
(build-system qt-build-system)
(arguments
(list
#:tests? #f ; No test suite.
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda _
(substitute* "wfview.pro"
(("\\.\\./wfview/")
"../"))
(substitute* '("wfmain.cpp")
(("/usr/share")
(string-append #$output "/share")))))
(replace 'configure
(lambda _
(mkdir-p "build")
(chdir "build")
(invoke "qmake"
(string-append "PREFIX=" #$output)
"../wfview.pro"))))))
;; XXX: During the build it complains on missing git and hostname commands
;; but it successfully finishes the build.
(inputs
(list eigen
hidapi
opus
portaudio
pulseaudio
qcustomplot
;; TODO: Needs to be renamed to qtgamepad-5 when version 6 is
;; packed.
qtgamepad
qtbase-5
qtmultimedia-5
;; TODO: Needs to be renamed to qtserialport-5. when version 6 is
;; packed.
qtserialport
rtaudio))
(arguments
`(#:tests? #f ; No test suite.
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "wfview.pro"
(("\\.\\./wfview/")
"../"))
(substitute* '("wfmain.cpp")
(("/usr/share")
(string-append (assoc-ref outputs "out") "/share")))))
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(mkdir-p "build")
(chdir "build")
(invoke "qmake"
(string-append "PREFIX=" (assoc-ref outputs "out"))
"../wfview.pro"))))))
(home-page "https://wfview.org/")
(synopsis "Software to control Icom radios")
(description

View file

@ -1523,13 +1523,13 @@ (define-public r-mime
(define-public r-markdown
(package
(name "r-markdown")
(version "1.5")
(version "1.6")
(source (origin
(method url-fetch)
(uri (cran-uri "markdown" version))
(sha256
(base32
"05lq5r698bk4qs2qklvri3rlbdss9w58n5y91yf3k6x5bzwh6580"))))
"1sjrynkg42g7s2czwmx4lzk92fssnd73cqj63djlpbk1h66qn8j6"))))
(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
@ -2546,13 +2546,13 @@ (define-public r-httr
(define-public r-git2r
(package
(name "r-git2r")
(version "0.31.0")
(version "0.32.0")
(source (origin
(method url-fetch)
(uri (cran-uri "git2r" version))
(sha256
(base32
"0vfn7kkkarha63vv3k8hi9y5snfsdpwdrbmych560126z9w95nzi"))))
"0wa6k1g7y0sx6s7map7mn579c1h07n185m163msmcjk81i62ap8v"))))
(build-system r-build-system)
(inputs
(list libgit2 zlib))
@ -3175,14 +3175,14 @@ (define-public r-futile-logger
(define-public r-segmented
(package
(name "r-segmented")
(version "1.6-3")
(version "1.6-4")
(source
(origin
(method url-fetch)
(uri (cran-uri "segmented" version))
(sha256
(base32
"0x7k5ycbvnfqsygrcyaaxnl0060x6869b345xc697hhr9sfxb4ai"))))
"14ci6hd5xlrz22gvnvy2fzpnp50fbds3wpx4mf2fgi5i7sp0hb27"))))
(build-system r-build-system)
(propagated-inputs (list r-mass r-nlme))
(home-page "https://cran.r-project.org/web/packages/segmented")
@ -5372,14 +5372,14 @@ (define-public r-prabclus
(define-public r-deoptimr
(package
(name "r-deoptimr")
(version "1.0-11")
(version "1.0-12")
(source
(origin
(method url-fetch)
(uri (cran-uri "DEoptimR" version))
(sha256
(base32
"0nqn12n5qlyk2zsgh57dvizy5z71xgqrhrcqj6lbzybm9c7v6x0q"))))
"0y9xc6lkadk3h1j22q7vnykm1xyhlbn24lkjqn8sdsmw660gjdk1"))))
(properties `((upstream-name . "DEoptimR")))
(build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/DEoptimR")
@ -5703,13 +5703,13 @@ (define-public r-matrixmodels
(define-public r-quantreg
(package
(name "r-quantreg")
(version "5.94")
(version "5.95")
(source
(origin
(method url-fetch)
(uri (cran-uri "quantreg" version))
(sha256
(base32 "1h8p3gzaas8gdvyh13ir8xc92hiybmizb0yhnwk7gvbjp768bmaj"))))
(base32 "1k4n5armw4lfyy4q8llnrpgvcw7s5n8w9zfff9rr5ggbrqgah1ab"))))
(build-system r-build-system)
(arguments
`(#:phases
@ -7244,13 +7244,13 @@ (define-public r-binom
(define-public r-simr
(package
(name "r-simr")
(version "1.0.6")
(version "1.0.7")
(source
(origin
(method url-fetch)
(uri (cran-uri "simr" version))
(sha256
(base32 "1q8ip54c5pc7pjf8127jpk56nr3f8rmwqdcrr84faj4lfbr27wqb"))))
(base32 "1rfnhyqvdazvar7r1ml71lskh1hdk3yfzv5jlcz18wzffscgkgmb"))))
(properties `((upstream-name . "simr")))
(build-system r-build-system)
(propagated-inputs
@ -7276,9 +7276,10 @@ (define-public r-simr
(license license:gpl2+)))
(define-public r-mixedpower
;; This commit contains fixes for R>=4.2. A newer release does not exist.
(let ((commit "6520195481bca3ce01862ef80a28c53b0a35d0f5")
(revision "1"))
;; This commit contains fixes for R>=4.2 and contains new features. A
;; newer release does not exist.
(let ((commit "b2b87068546327d8f592d141e5482e0478c1b2ee")
(revision "2"))
(package
(name "r-mixedpower")
(version (git-version "2.0" revision commit))
@ -7291,9 +7292,7 @@ (define-public r-mixedpower
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "114z9pvya2jg10y804ga41gq00r7zcw4a7c7234ybhmv3jqw78q1"))
(patches
(search-patches "r-mixedpower-r2power.patch"))))
(base32 "0pys66a6c1k2fp5qk9grhzg1q1d3q51rggcilmdssimkmcsm234z"))))
(properties `((upstream-name . "mixedpower")))
(build-system r-build-system)
(propagated-inputs

View file

@ -183,6 +183,7 @@ (define-module (guix packages)
package-closure
default-guile
guile-for-grafts
default-guile-derivation
set-guile-for-build
package-file

View file

@ -43,34 +43,42 @@ (define-module (guix self)
;;; Dependency handling.
;;;
(define specification->package
(define %packages
(let ((ref (lambda (module variable)
(delay
(module-ref (resolve-interface
`(gnu packages ,module))
variable)))))
`(("guile" . ,(ref 'guile 'guile-3.0-latest))
("guile-avahi" . ,(ref 'guile-xyz 'guile-avahi))
("guile-json" . ,(ref 'guile 'guile-json-4))
("guile-ssh" . ,(ref 'ssh 'guile-ssh))
("guile-git" . ,(ref 'guile 'guile-git))
("guile-semver" . ,(ref 'guile-xyz 'guile-semver))
("guile-lib" . ,(ref 'guile-xyz 'guile-lib))
("guile-sqlite3" . ,(ref 'guile 'guile-sqlite3))
("guile-zlib" . ,(ref 'guile 'guile-zlib))
("guile-lzlib" . ,(ref 'guile 'guile-lzlib))
("guile-zstd" . ,(ref 'guile 'guile-zstd))
("guile-gcrypt" . ,(ref 'gnupg 'guile-gcrypt))
("guile-gnutls" . ,(ref 'tls 'guile-gnutls))
("guix-daemon" . ,(ref 'package-management 'guix-daemon))
("disarchive" . ,(ref 'backup 'disarchive))
("guile-lzma" . ,(ref 'guile 'guile-lzma))
("gzip" . ,(ref 'compression 'gzip))
("bzip2" . ,(ref 'compression 'bzip2))
("xz" . ,(ref 'compression 'xz))
("po4a" . ,(ref 'gettext 'po4a))
("gettext-minimal" . ,(ref 'gettext 'gettext-minimal))
("gcc-toolchain" . ,(ref 'commencement 'gcc-toolchain))
("glibc-utf8-locales" . ,(ref 'base 'glibc-utf8-locales))
("graphviz" . ,(ref 'graphviz 'graphviz))
("texinfo" . ,(ref 'texinfo 'texinfo)))))
(define (specification->package name)
;; Use our own variant of that procedure because that of (gnu packages)
;; would traverse all the .scm files, which is wasteful.
(let ((ref (lambda (module variable)
(module-ref (resolve-interface module) variable))))
(match-lambda
("guile" (ref '(gnu packages guile) 'guile-3.0-latest))
("guile-avahi" (ref '(gnu packages guile-xyz) 'guile-avahi))
("guile-json" (ref '(gnu packages guile) 'guile-json-4))
("guile-ssh" (ref '(gnu packages ssh) 'guile-ssh))
("guile-git" (ref '(gnu packages guile) 'guile-git))
("guile-semver" (ref '(gnu packages guile-xyz) 'guile-semver))
("guile-lib" (ref '(gnu packages guile-xyz) 'guile-lib))
("guile-sqlite3" (ref '(gnu packages guile) 'guile-sqlite3))
("guile-zlib" (ref '(gnu packages guile) 'guile-zlib))
("guile-lzlib" (ref '(gnu packages guile) 'guile-lzlib))
("guile-zstd" (ref '(gnu packages guile) 'guile-zstd))
("guile-gcrypt" (ref '(gnu packages gnupg) 'guile-gcrypt))
("guile-gnutls" (ref '(gnu packages tls) 'guile-gnutls))
("disarchive" (ref '(gnu packages backup) 'disarchive))
("guile-lzma" (ref '(gnu packages guile) 'guile-lzma))
("gzip" (ref '(gnu packages compression) 'gzip))
("bzip2" (ref '(gnu packages compression) 'bzip2))
("xz" (ref '(gnu packages compression) 'xz))
("po4a" (ref '(gnu packages gettext) 'po4a))
("gettext" (ref '(gnu packages gettext) 'gettext-minimal))
("gcc-toolchain" (ref '(gnu packages commencement) 'gcc-toolchain))
(_ #f)))) ;no such package
(and=> (assoc-ref %packages name) force))
;;;
@ -239,9 +247,8 @@ (define* (locale-data source domain
#:optional (directory domain))
"Return the locale data from 'po/DIRECTORY' in SOURCE, corresponding to
DOMAIN, a gettext domain."
(define gettext
(module-ref (resolve-interface '(gnu packages gettext))
'gettext-minimal))
(define gettext-minimal
(specification->package "gettext-minimal"))
(define build
(with-imported-modules '((guix build utils))
@ -257,7 +264,7 @@ (define (compile language)
(let ((gmo (string-append #$output "/" language "/LC_MESSAGES/"
#$domain ".mo")))
(mkdir-p (dirname gmo))
(invoke #+(file-append gettext "/bin/msgfmt")
(invoke #+(file-append gettext-minimal "/bin/msgfmt")
"-c" "--statistics" "--verbose"
"-o" gmo
(string-append po-directory "/" language ".po"))))
@ -279,20 +286,19 @@ (define (translate-texi-manuals source)
"Return the translated texinfo manuals built from SOURCE."
(define po4a
(specification->package "po4a"))
(define gettext
(specification->package "gettext"))
(define gettext-minimal
(specification->package "gettext-minimal"))
(define glibc-utf8-locales
(module-ref (resolve-interface '(gnu packages base))
'glibc-utf8-locales))
(specification->package "glibc-utf8-locales"))
(define documentation
(file-append* source "doc"))
(define documentation-po
(file-append* source "po/doc"))
(define build
(with-imported-modules '((guix build utils) (guix build po))
#~(begin
@ -364,7 +370,7 @@ (define parallel-jobs
(setenv "GUIX_LOCPATH"
#+(file-append glibc-utf8-locales "/lib/locale"))
(setenv "PATH" #+(file-append gettext "/bin"))
(setenv "PATH" #+(file-append gettext-minimal "/bin"))
(setenv "LC_ALL" "en_US.UTF-8")
(setlocale LC_ALL "en_US.UTF-8")
@ -393,16 +399,13 @@ (define parallel-jobs
(define (info-manual source)
"Return the Info manual built from SOURCE."
(define texinfo
(module-ref (resolve-interface '(gnu packages texinfo))
'texinfo))
(specification->package "texinfo"))
(define graphviz
(module-ref (resolve-interface '(gnu packages graphviz))
'graphviz))
(specification->package "graphviz"))
(define glibc-utf8-locales
(module-ref (resolve-interface '(gnu packages base))
'glibc-utf8-locales))
(specification->package "glibc-utf8-locales"))
(define documentation
(file-append* source "doc"))
@ -585,8 +588,7 @@ (define* (guix-command modules
"Return the 'guix' command such that it adds MODULES and DEPENDENCIES in its
load path."
(define glibc-utf8-locales
(module-ref (resolve-interface '(gnu packages base))
'glibc-utf8-locales))
(specification->package "glibc-utf8-locales"))
(define module-directory
;; To minimize the number of 'stat' calls needed to locate a module,
@ -1029,10 +1031,7 @@ (define (built-modules node-subset)
;; Include 'guix-daemon'. XXX: Here we inject an
;; older snapshot of guix-daemon, but that's a good
;; enough approximation for now.
#:daemon (module-ref (resolve-interface
'(gnu packages
package-management))
'guix-daemon)
#:daemon (specification->package "guix-daemon")
#:info (info-manual source)
#:miscellany (miscellaneous-files source)