diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-15 19:26:55 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-15 19:26:55 +0200 |
| commit | bd21acf6c390e4fe87eb6053f0b5185d6ecbcf9f (patch) | |
| tree | 09fe91a8351471e5e7a821cb28521dd9b9d7e357 /gnu | |
| parent | a4f1a7e2db22cd028fb514846c2791928b8734d3 (diff) | |
| parent | b44e19acd1a0d449427cea0333f02ac98605be1c (diff) | |
| download | patches-bd21acf6c390e4fe87eb6053f0b5185d6ecbcf9f.tar patches-bd21acf6c390e4fe87eb6053f0b5185d6ecbcf9f.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu')
42 files changed, 1092 insertions, 411 deletions
diff --git a/gnu/installer.scm b/gnu/installer.scm index 8fbfc29261..3b69cdbdee 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -118,9 +118,8 @@ version of this file." ;; printed on the console. (parameterize ((shepherd-message-port (%make-void-port "w"))) - (lambda () - (stop-service 'term-tty2) - (start-service 'term-tty2 (list locale))))))) + (stop-service 'term-tty2) + (start-service 'term-tty2 (list locale)))))) (define* (compute-locale-step #:key locales-name diff --git a/gnu/local.mk b/gnu/local.mk index 0d49838398..b11876d14d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -943,6 +943,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-9-strmov-store-file-names.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-brect-bounds.patch \ + %D%/packages/patches/gdm-default-session.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ @@ -1179,7 +1180,6 @@ dist_patch_DATA = \ %D%/packages/patches/libvnc-CVE-2018-20750.patch \ %D%/packages/patches/libvnc-CVE-2019-15681.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ - %D%/packages/patches/libvpx-use-after-free-in-postproc.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ %D%/packages/patches/libxt-guix-search-paths.patch \ %D%/packages/patches/lierolibre-check-unaligned-access.patch \ @@ -1385,7 +1385,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-flint-includes.patch \ - %D%/packages/patches/python-jedi-deleted-variables.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ @@ -1506,7 +1505,6 @@ dist_patch_DATA = \ %D%/packages/patches/ttfautohint-source-date-epoch.patch \ %D%/packages/patches/tomb-fix-errors-on-open.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ - %D%/packages/patches/txr-shell.patch \ %D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/udiskie-no-appindicator.patch \ diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 3ada92085e..a49c05dbce 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1958,14 +1958,14 @@ experiments.") (define-public r-genomicinteractions (package (name "r-genomicinteractions") - (version "1.20.2") + (version "1.20.3") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicInteractions" version)) (sha256 (base32 - "0mqb899wah5n7bp2lajhwy2zpqqhi18plza3i3m51rfl9n62smph")))) + "01ps97cs29qvzy5piq2l2k0yyr56rmg5cycfiqhbbvqpjrfvy60g")))) (properties `((upstream-name . "GenomicInteractions"))) (build-system r-build-system) @@ -3332,14 +3332,14 @@ peak definition in combination with known profile characteristics.") (define-public r-varianttools (package (name "r-varianttools") - (version "1.28.0") + (version "1.28.1") (source (origin (method url-fetch) (uri (bioconductor-uri "VariantTools" version)) (sha256 (base32 - "0aafcprsqbn1xl8jqnxfl8r2d0lmzhssqpr26lam2cprh3yk0xiv")))) + "1x57shc3slcbnc807ra1nwnjr37sqjh04n2xfwd469m4hkjb0jzh")))) (properties `((upstream-name . "VariantTools"))) (build-system r-build-system) (propagated-inputs @@ -3783,14 +3783,14 @@ provides reporting features.") (define-public r-a4base (package (name "r-a4base") - (version "1.34.0") + (version "1.34.1") (source (origin (method url-fetch) (uri (bioconductor-uri "a4Base" version)) (sha256 (base32 - "0dgqyq4dnlcik5qqygnhxlhfr98sh6kmdcj2qllhrwyk0lmsfk01")))) + "1a0yk05ikk1hr1vpxynydrb5xb1hj4hdqlh9zd13n83ir89dss83")))) (properties `((upstream-name . "a4Base"))) (build-system r-build-system) (propagated-inputs @@ -4032,14 +4032,14 @@ position-specific scores within R and Bioconductor.") (define-public r-atacseqqc (package (name "r-atacseqqc") - (version "1.10.3") + (version "1.10.4") (source (origin (method url-fetch) (uri (bioconductor-uri "ATACseqQC" version)) (sha256 (base32 - "18zf90iksglbs13cwr4jjwsv332a19lf4bpdmy69jz8bpwrklv22")))) + "1g07ni134cyl3jd9y19afip39kxddfgpm1jjm0rhrm7jgssp24in")))) (properties `((upstream-name . "ATACseqQC"))) (build-system r-build-system) (propagated-inputs diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index cd01027bce..cb4cfd58af 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7502,13 +7502,13 @@ checks on R packages that are to be submitted to the Bioconductor repository.") (define-public r-s4vectors (package (name "r-s4vectors") - (version "0.24.3") + (version "0.24.4") (source (origin (method url-fetch) (uri (bioconductor-uri "S4Vectors" version)) (sha256 (base32 - "01f7dms4kw9ajwqlvh5s47riv748xrrs41na03byhjvn4fbdc44y")))) + "1fzs8j2d3wwfzm2fq63ywf68a4dbggyl5l098f148yn4jw7jd3bc")))) (properties `((upstream-name . "S4Vectors"))) (build-system r-build-system) @@ -7944,13 +7944,13 @@ tab-delimited (tabix) files.") (define-public r-delayedarray (package (name "r-delayedarray") - (version "0.12.2") + (version "0.12.3") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedArray" version)) (sha256 (base32 - "09lackgix5jpm16k0mz2zkibflfb4wzidbz4q32mlxmklf40037q")))) + "02i88ll2d7r83nk0wdj28akvsz3jq19g6ixpaahfy3jy5av4byv6")))) (properties `((upstream-name . "DelayedArray"))) (build-system r-build-system) @@ -7961,6 +7961,8 @@ tab-delimited (tabix) files.") ("r-iranges" ,r-iranges) ("r-matrix" ,r-matrix) ("r-matrixstats" ,r-matrixstats))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/DelayedArray") (synopsis "Delayed operations on array-like objects") (description @@ -12769,7 +12771,7 @@ expression report comparing samples in an easily configurable manner.") (define-public pigx-chipseq (package (name "pigx-chipseq") - (version "0.0.41") + (version "0.0.42") (source (origin (method url-fetch) (uri (string-append "https://github.com/BIMSBbioinfo/pigx_chipseq/" @@ -12777,7 +12779,7 @@ expression report comparing samples in an easily configurable manner.") "/pigx_chipseq-" version ".tar.gz")) (sha256 (base32 - "0akbxdmsjsq5fzbwaap04hqjpsfgv1l6yrc2pwgbya1xgqvcq6vy")))) + "0xbvgqpk32a8iczhvac56cacr46rdkqb0allhhpvmj940idf72bi")))) (build-system gnu-build-system) ;; parts of the tests rely on access to the network (arguments '(#:tests? #f)) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index e988a47f09..9e9d4c36df 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -443,7 +443,7 @@ tree binary files. These are board description files used by Linux and BSD.") (define u-boot (package (name "u-boot") - (version "2020.01") + (version "2020.04") (source (origin (method url-fetch) (uri (string-append @@ -451,7 +451,7 @@ tree binary files. These are board description files used by Linux and BSD.") "u-boot-" version ".tar.bz2")) (sha256 (base32 - "1w9ml4jl15q6ixpdqzspxjnl7d3rgxd7f99ms1xv5c8869h3qida")))) + "0wjkasnz87q86hx93inspdjfjsinmxi87bcvj30c773x0fpjlwzy")))) (native-inputs `(("bc" ,bc) ("bison" ,bison) diff --git a/gnu/packages/cook.scm b/gnu/packages/cook.scm index 16c288cc82..ba13709eda 100644 --- a/gnu/packages/cook.scm +++ b/gnu/packages/cook.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,6 +61,13 @@ (substitute* "test/00/t0077a.sh" (("ar qc") "ar qcU")) + ;; Guix builds have LC_ALL set to "en_US.utf8", which causes + ;; `date` to use a 12-hour clock instead of 24h, which in turn + ;; makes t0217a.sh fail because of unexpected date output. + (substitute* "test/02/t0217a.sh" + (("export TZ") + "export TZ\nLC_ALL=POSIX\nexport LC_ALL")) + (setenv "SH" (which "sh")) #t))))) (native-inputs `(("bison" ,bison) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ecfc053017..e8b635ac16 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1559,15 +1559,20 @@ colors are provided.") (define-public r-glue (package (name "r-glue") - (version "1.3.2") + (version "1.4.0") (source (origin (method url-fetch) (uri (cran-uri "glue" version)) (sha256 (base32 - "0alklqcf68kmccssp4j7a7fv553pyqyy6mkkfslav83inppm4d3g")))) + "1hb9j2519jv9zgkgjb25hnqi22i7zxnaksqd16m4nxa1f6gl0v7a")))) (build-system r-build-system) + ;; knitr depends on glue, so we can't add knitr here to build the + ;; vignettes. + #; + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/tidyverse/glue") (synopsis "Interpreted string literals") (description @@ -1727,13 +1732,13 @@ you to rapidly iterate while developing a package.") (define-public r-rcpp (package (name "r-rcpp") - (version "1.0.4") + (version "1.0.4.6") (source (origin (method url-fetch) (uri (cran-uri "Rcpp" version)) (sha256 - (base32 "1m80pdhzi2p82db5xkbwc2m3fzv6df59955yj03nlq40fj7zx4nr")))) + (base32 "00mk23zmrqn1c4mk9d6csjcbnl12wd7yicjk2ikmw5dyvdfngbs5")))) (build-system r-build-system) (home-page "http://www.rcpp.org") (synopsis "Seamless R and C++ integration") @@ -4042,14 +4047,18 @@ iVAT).") (define-public r-xfun (package (name "r-xfun") - (version "0.12") + (version "0.13") (source (origin (method url-fetch) (uri (cran-uri "xfun" version)) (sha256 - (base32 "0sgh8kafi9x1glmmcp1ly827pm8q7fsfngbplr41fbb4nc9363df")))) + (base32 "03iyqgx9mmdbd3qih70qzijjqcdg7k7ps5r1y6q8praanx9qvnm3")))) (build-system r-build-system) + ;; knitr itself depends on xfun + #; + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/yihui/xfun") (synopsis "Miscellaneous functions") (description @@ -5387,14 +5396,14 @@ evaluated by the @dfn{Akaike Information Criterion} (AIC).") (define-public r-arules (package (name "r-arules") - (version "1.6-4") + (version "1.6-5") (source (origin (method url-fetch) (uri (cran-uri "arules" version)) (sha256 (base32 - "003c5cd3xzq39h7c19px077ygm0n1v7k83icy5zzrnkagyds2p8n")))) + "0bcvfn8lvcv74vv9z3kgg7yq5hm7wjqhmzadi55cbm8zxd76g84v")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) @@ -6500,14 +6509,14 @@ vice versa), or to deal with multiple declared missing values.") (define-public r-sjmisc (package (name "r-sjmisc") - (version "2.8.3") + (version "2.8.4") (source (origin (method url-fetch) (uri (cran-uri "sjmisc" version)) (sha256 (base32 - "0w8l9grmp4q775jrf4q6rxx36ld5daz9b0gdxyyh42xfihk6m62h")))) + "1ad7ca71w0v9ja4wb47aygczc987zz1lnjljhh2n497nzrpzzv64")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) @@ -6517,6 +6526,8 @@ vice versa), or to deal with multiple declared missing values.") ("r-rlang" ,r-rlang) ("r-sjlabelled" ,r-sjlabelled) ("r-tidyselect" ,r-tidyselect))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/strengejacke/sjmisc") (synopsis "Data and variable transformation functions") (description @@ -7905,14 +7916,14 @@ console, resulting in an interactive editing environment.") (define-public r-survey (package (name "r-survey") - (version "3.37") + (version "4.0") (source (origin (method url-fetch) (uri (cran-uri "survey" version)) (sha256 (base32 - "1f31dvh48gzzan13pdrwh84ls35x9116095i7mdrcbrhz809r8dy")))) + "1q9x0s86s72gl43zj49gypg6jj2b78xjvxr4lmy5147s9h7z8lxh")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice) @@ -8285,14 +8296,14 @@ packages maintained by Torsten Hothorn.") (define-public r-multcomp (package (name "r-multcomp") - (version "1.4-12") + (version "1.4-13") (source (origin (method url-fetch) (uri (cran-uri "multcomp" version)) (sha256 (base32 - "14c2f10rz546w7ly5f4r6wnd07yj5gic38an17gxny1vf2nsff0b")))) + "1nszi22rcc551yc75h9cdfkdqsxw1rz30vadazmpyzihp1bh63yk")))) (build-system r-build-system) (propagated-inputs `(("r-codetools" ,r-codetools) @@ -8630,20 +8641,22 @@ results using @code{ggplot2}.") (define-public r-effectsize (package (name "r-effectsize") - (version "0.2.0") + (version "0.3.0") (source (origin (method url-fetch) (uri (cran-uri "effectsize" version)) (sha256 (base32 - "1liix8rf8xq3hzi7684bl0s20iflsq6g5mxr5k59wp2qwn1i6aww")))) + "0kijp4wamkidaxysc11dd4vhvnm4wnbi87871wcbwn27k5b6i5dg")))) (properties `((upstream-name . "effectsize"))) (build-system r-build-system) (propagated-inputs `(("r-bayestestr" ,r-bayestestr) ("r-insight" ,r-insight) ("r-parameters" ,r-parameters))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/easystats/effectsize") (synopsis "Indices of effect size and standardized parameters") (description @@ -8744,14 +8757,14 @@ back to file after modifications.") (define-public r-fs (package (name "r-fs") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (cran-uri "fs" version)) (sha256 (base32 - "1ishdxrxy88w1lrn657a573wdra5v7xf1yfa1c4kss07rlynwrj7")))) + "0kksig9pk8aid9l6r250na8z8j9919jvs20lj0s6m9bcybgh74df")))) (build-system r-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -8786,18 +8799,18 @@ terminals that do not support Unicode.") (define-public r-usethis (package (name "r-usethis") - (version "1.5.1") + (version "1.6.0") (source (origin (method url-fetch) (uri (cran-uri "usethis" version)) (sha256 (base32 - "07an5wbikilg7cb3q6x5aykw8dfqnjrc3wpfb7gjmy0d9fh20fcy")))) + "12iyimqyza752anj29wpfisl8nz5r25kfcqbssybg24nb4wyy146")))) (build-system r-build-system) (propagated-inputs - `(("r-clipr" ,r-clipr) - ("r-clisymbols" ,r-clisymbols) + `(("r-cli" ,r-cli) + ("r-clipr" ,r-clipr) ("r-crayon" ,r-crayon) ("r-curl" ,r-curl) ("r-desc" ,r-desc) @@ -8806,6 +8819,7 @@ terminals that do not support Unicode.") ("r-git2r" ,r-git2r) ("r-glue" ,r-glue) ("r-purrr" ,r-purrr) + ("r-rematch2" ,r-rematch2) ("r-rlang" ,r-rlang) ("r-rprojroot" ,r-rprojroot) ("r-rstudioapi" ,r-rstudioapi) @@ -9175,14 +9189,14 @@ experiments using ANOVA or mixed models.") (define-public r-lmertest (package (name "r-lmertest") - (version "3.1-1") + (version "3.1-2") (source (origin (method url-fetch) (uri (cran-uri "lmerTest" version)) (sha256 (base32 - "0r2vvs3nl6p8xla3gd943khb4ixp0alvspqpnz2y6n3wk8zgh3jj")))) + "1qkdxx5sri65zgpb9gw4nkfkdam51kgy4hxclk5c40yk7y3p0n1q")))) (properties `((upstream-name . "lmerTest"))) (build-system r-build-system) (propagated-inputs @@ -12067,14 +12081,14 @@ users of rARPACK are advised to switch to the RSpectra package.") (define-public r-compositions (package (name "r-compositions") - (version "1.40-4") + (version "1.40-5") (source (origin (method url-fetch) (uri (cran-uri "compositions" version)) (sha256 (base32 - "0z40llyij3cc80ac1vzzrpykk6ysp89bn6dyyh40fbnc4anwx69a")))) + "0l9ayz2nb2wqhl7v9hkfl7pd950ba0h6hma8zqncbcxh6xh2k7l7")))) (build-system r-build-system) (propagated-inputs `(("r-bayesm" ,r-bayesm) @@ -12817,14 +12831,14 @@ can be used with function approximation, eligibility traces (Singh & Sutton, (define-public r-lemon (package (name "r-lemon") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) (uri (cran-uri "lemon" version)) (sha256 (base32 - "0wsn5bfg10wq4dnrgpyraz2bzx9p19c7hf1pwj3h4zmpqfgsdbpw")))) + "0m9hqwi709j9iwsxn8jh63741jiyr7ppwgqaw2zkv285p3m5wvd5")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) @@ -12833,6 +12847,7 @@ can be used with function approximation, eligibility traces (Singh & Sutton, ("r-knitr" ,r-knitr) ("r-lattice" ,r-lattice) ("r-plyr" ,r-plyr) + ("r-rlang" ,r-rlang) ("r-scales" ,r-scales))) (home-page "https://github.com/stefanedwards/lemon") (synopsis "Freshen up your ggplot2 plots") @@ -13113,21 +13128,23 @@ classes.") (define-public r-classint (package (name "r-classint") - (version "0.4-2") + (version "0.4-3") (source (origin (method url-fetch) (uri (cran-uri "classInt" version)) (sha256 (base32 - "0w980hrw8sgfdfyd5dsimalq7gwhvqm7507abk7k363pvgks23dv")))) + "1b1lqhpzxm6b8pza8l3s0cxy74mm9y45lcd3354i2v3bg8m7mply")))) (properties `((upstream-name . "classInt"))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class) ("r-e1071" ,r-e1071) ("r-kernsmooth" ,r-kernsmooth))) - (native-inputs `(("gfortran" ,gfortran))) + (native-inputs + `(("gfortran" ,gfortran) + ("r-knitr" ,r-knitr))) (home-page "https://github.com/r-spatial/classInt/") (synopsis "Choose univariate class intervals") (description @@ -13138,14 +13155,14 @@ univariate class intervals for mapping or other graphics purposes.") (define-public r-spdata (package (name "r-spdata") - (version "0.3.3") + (version "0.3.5") (source (origin (method url-fetch) (uri (cran-uri "spData" version)) (sha256 (base32 - "1v66qkvsx77hvv5c78v760yp0hknf7xzcjir2ri3ha456mz79yl5")))) + "09l9j1vjbfyc8mikb8kliqmdjkg4xigq3zhdx98mv51flh5q87lh")))) (properties `((upstream-name . "spData"))) (build-system r-build-system) (propagated-inputs @@ -13215,14 +13232,14 @@ tessellation.") (define-public r-sf (package (name "r-sf") - (version "0.9-0") + (version "0.9-1") (source (origin (method url-fetch) (uri (cran-uri "sf" version)) (sha256 (base32 - "117r9l3v7nkdj9bfy6qr0yz0gd5bv0pwnkc9vk2gv3xqj0h1fpf6")))) + "1qghrskqwwlwxmmvkv7knhlr1a32ngyimycasy5gfazgviljsfn4")))) (build-system r-build-system) (inputs `(("gdal" ,gdal) @@ -15960,14 +15977,14 @@ in pipelines.") (define-public r-parameters (package (name "r-parameters") - (version "0.6.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (cran-uri "parameters" version)) (sha256 (base32 - "0zin3ikc013hc713n5zs0dbhc3m4nfw1vhc3924z0mrww8r241xn")))) + "0mylxkf1y6mk4kf6c57x102sf4c800pfasjcfbf1hnsh6ya0m6dy")))) (properties `((upstream-name . "parameters"))) (build-system r-build-system) (propagated-inputs @@ -16191,14 +16208,14 @@ are noisy or are discontinuous at the solution.") (define-public r-txtplot (package (name "r-txtplot") - (version "1.0-3") + (version "1.0-4") (source (origin (method url-fetch) (uri (cran-uri "txtplot" version)) (sha256 (base32 - "1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h")))) + "00sriml48y70j18jz235dsfm5x3a81bnzskfp3hnv6cbjwwsmca4")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/txtplot/") (synopsis "Text-based plotting") @@ -17112,17 +17129,19 @@ See e.g. Gentle (2003) @url{doi:10.1007/b97336}.") (define-public r-lhs (package (name "r-lhs") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (cran-uri "lhs" version)) (sha256 (base32 - "0lzaqr7xi3ckln5nglv5xf5njm359slpz1jc6s02hpsqdw6armd4")))) + "0n0i1hr9gmc0hfcs2cvpjvdfgm6k26rhcq3q22r8ic0gfj953572")))) (properties `((upstream-name . "lhs"))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/bertcarnell/lhs") (synopsis "Latin Hypercube Samples") (description @@ -18790,14 +18809,14 @@ Edition), John Wiley and Sons.") (define-public r-anthropometry (package (name "r-anthropometry") - (version "1.13") + (version "1.14") (source (origin (method url-fetch) (uri (cran-uri "Anthropometry" version)) (sha256 (base32 - "1f568ri1s6psaby8y737vrkarbjg64v89d4jyw23hy17apdmszr8")))) + "0y52g15pcgs4b68sfczn6nnpdqsialsb4mq3wb9a2gba7qdcf76y")))) (properties `((upstream-name . "Anthropometry"))) (build-system r-build-system) (propagated-inputs @@ -18810,6 +18829,8 @@ Edition), John Wiley and Sons.") ("r-nnls" ,r-nnls) ("r-rgl" ,r-rgl) ("r-shapes" ,r-shapes))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://cran.r-project.org/web/packages/Anthropometry/") (synopsis "Statistical methods for anthropometric data") (description @@ -20804,19 +20825,21 @@ Encyclopedia of Integer Sequences} (OEIS) in the function help page.") (define-public r-isoband (package (name "r-isoband") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (cran-uri "isoband" version)) (sha256 (base32 - "1r023s73qypnvpx18znr9ymylr022m90v65mz2jasn0a1kjrfcbq")))) + "1ndlnv4g9pbd02y50sx4ffg2ccwqbi7fm2v1lh22wdd8pq33d20q")))) (properties `((upstream-name . "isoband"))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp) ("r-testthat" ,r-testthat))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/wilkelab/isoband") (synopsis "Generate isolines and isobands from regularly spaced elevation grids") (description @@ -20924,13 +20947,13 @@ carrying out convergence diagnostics and statistical and graphical analysis of (define-public r-httpcode (package (name "r-httpcode") - (version "0.2.0") + (version "0.3.0") (source (origin (method url-fetch) (uri (cran-uri "httpcode" version)) (sha256 (base32 - "06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv")))) + "0xig0rvc81hg7mw0iq9s0an1nw24fg0kfs2p2n6dzhwl9w506fjr")))) (build-system r-build-system) (home-page "https://github.com/sckott/httpcode") (synopsis "HTTP status code helper") diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm index 3b0c799dc3..5db012c680 100644 --- a/gnu/packages/dlang.scm +++ b/gnu/packages/dlang.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017 Frederick Muriithi <fredmanglis@gmail.com> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,9 +36,11 @@ #:use-module (gnu packages gdb) #:use-module (gnu packages libedit) #:use-module (gnu packages llvm) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) - #:use-module (gnu packages textutils)) + #:use-module (gnu packages textutils) + #:use-module (gnu packages xorg)) (define-public rdmd (package @@ -348,3 +351,49 @@ The design emphasis is on maximum simplicity for simple projects, while providing the opportunity to customize things when needed.") (license license:expat))) + +(define-public gtkd + (package + (name "gtkd") + (version "3.9.0") + (source + (origin + (method url-fetch/zipbomb) + (uri (string-append "https://gtkd.org/Downloads/sources/GtkD-" + version ".zip")) + (sha256 + (base32 "0qv8qlpwwb1d078pnrf0a59vpbkziyf53cf9p6m8ms542wbcxllp")))) + (build-system gnu-build-system) + (native-inputs + `(("unzip" ,unzip) + ("ldc" ,ldc) + ("pkg-config" ,pkg-config) + ("xorg-server-for-tests" ,xorg-server-for-tests))) + (arguments + `(#:test-target "test" + #:make-flags + `("DC=ldc2" + ,(string-append "prefix=" (assoc-ref %outputs "out")) + ,(string-append "libdir=" (assoc-ref %outputs "out") + "/lib")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'patch-makefile + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "GNUmakefile" + ;; We do the tests ourselves. + (("default-goal: libs test") "default-goal: libs") + (("all: libs shared-libs test") "all: libs shared-libs") + ;; Work around upstream bug. + (("\\$\\(prefix\\)\\/\\$\\(libdir\\)") "$(libdir)")) + #t)) + (add-before 'check 'prepare-x + (lambda _ + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + #t))))) + (home-page "https://gtkd.org/") + (synopsis "D binding and OO wrapper of GTK+") + (description "This package provides bindings to GTK+ for D.") + (license license:lgpl2.1))) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d8bf2c129f..37c449f437 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -67,6 +67,7 @@ ;;; Copyright © 2020 6033fe7de85d <6033fe7de85d@airmail.cc> ;;; Copyright © 2020 John Soo <jsoo1@asu.edu> ;;; Copyright © 2020 Jérémy Korwin-Zmijowski <jeremy@korwin-zmijowski.fr> +;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero <barbanegra+guix@posteo.mx> ;;; ;;; This file is part of GNU Guix. ;;; @@ -596,6 +597,45 @@ Gitea, Gogs and Bitbucket. It abstracts access to API resources using only a handful of functions that are not resource-specific.") (license license:gpl3+)))) +(define-public emacs-typit + ;; Last release is from 2017. + (let ((commit "231cb7df43253b84323520b8ed70f128d37003af") + (revision "1")) + (package + (name "emacs-typit") + (version (git-version "0.2.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mrkkrp/typit.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1savrxs7xl92ifyxpxkkzv2didr7lb405h0dwz1bs1wldr5fb53f")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-dictionaries + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (site-lisp + (string-append + out "/share/emacs/site-lisp/dict"))) + (mkdir-p site-lisp) + (copy-recursively "dict" site-lisp) + #t)))))) + (propagated-inputs + `(("emacs-f" ,emacs-f) + ("emacs-mmt" ,emacs-mmt))) + (home-page "https://github.com/mrkkrp/typit") + (synopsis "Typing game for Emacs with two difficulties") + (description "Emacs Typit is a typing game for Emacs. Words that are +picked randomly from the most frequent words in language you're practicing, +until time is up.") + (license license:gpl3+)))) + (define-public emacs-scribble-mode (let ((commit "217945d54de5e4bb207033f2116baa28f5c5ecf2") (revision "2")) @@ -2122,6 +2162,26 @@ window).") single buffer.") (license license:gpl3+))) +(define-public emacs-mmt + (package + (name "emacs-mmt") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mrkkrp/mmt.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13vbfc5597v0gd87qyhn10f93nb477vjpg3jlpphbax9fvkf4gav")))) + (build-system emacs-build-system) + (home-page "https://github.com/mrkkrp/mmt") + (synopsis "Classic tools to write Emacs Lisp macros") + (description "Emacs MMT is a package that contains classic tools for Emacs +Lisp developers who want to write macros with convenience.") + (license license:gpl3+))) + (define-public emacs-tablist (package (name "emacs-tablist") @@ -7424,29 +7484,27 @@ for search-based navigation of buffers.") (license license:gpl2+))) (define-public emacs-helm-ag - (let ((commit "2fc02c4ead29bf0db06fd70740cc7c364cb650ac") - (revision "1")) - (package - (name "emacs-helm-ag") - (version (git-version "0.58" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/syohex/emacs-helm-ag.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1gnn0byywbld6afcq1vp92cjvy4wlag9d1wgymnqn86c3b1bcf21")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-helm" ,emacs-helm))) - (home-page "https://github.com/syohex/emacs-helm-ag") - (synopsis "Helm interface to the Silver Searcher") - (description - "This package provides a frontend for grepping tools like ag and ack, + (package + (name "emacs-helm-ag") + (version "0.59") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/syohex/emacs-helm-ag.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0vsz2b5qw4qahlf74059z4p1grinhfz28f0psw4c3qf4jasv3b9j")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm))) + (home-page "https://github.com/syohex/emacs-helm-ag") + (synopsis "Helm interface to the Silver Searcher") + (description + "This package provides a frontend for grepping tools like ag and ack, as well as features for editing search results.") - (license license:gpl3+)))) + (license license:gpl3+))) ;; There hasn't been a tag or release since 2016, so we take the latest ;; commit. @@ -12864,7 +12922,7 @@ into sections while preserving the structure imposed by any timestamps.") (define-public emacs-org-make-toc (package (name "emacs-org-make-toc") - (version "0.4") + (version "0.5") (source (origin (method git-fetch) (uri (git-reference @@ -12873,7 +12931,7 @@ into sections while preserving the structure imposed by any timestamps.") (file-name (git-file-name name version)) (sha256 (base32 - "0348iq3bc3rxs5bqdvskyly4agqxiapamqkfm0323620kxl70agw")))) + "180ji6nnj6qj0rs1rdp1zlcrfsqf7ikb44ym8icbp5d6al2s4hnr")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-org" ,emacs-org) @@ -14158,12 +14216,12 @@ their meaning for the current Emacs major-mode.") (license license:gpl3+))) (define-public emacs-org-ref - (let ((commit "8c9b5d7efb9f0c1ad5186b8203bdd017f4249129") - (revision "1")) + ;; No release since June 2017. + (let ((commit "5bb9be2232db72b04754d7e4c02a3976ad422f6f") + (revision "2")) (package (name "emacs-org-ref") - (version (string-append "1.1.1" "-" revision "." - (string-take commit 7))) + (version (git-version "1.1.1" revision commit)) (source (origin (method git-fetch) @@ -14172,29 +14230,40 @@ their meaning for the current Emacs major-mode.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 - "1rxz0bjdsayk0slv23i07d9xhj2m7s4hsc81wc2d1cs52dkr5zmz")))) + (base32 "15gcvbfj19kyv4nxa632b261dwhb26m99plq230qhv9ssfwfgxbx")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) + ("emacs-f" ,emacs-f) ("emacs-helm" ,emacs-helm) ("emacs-helm-bibtex" ,emacs-helm-bibtex) - ("emacs-ivy" ,emacs-ivy) + ("emacs-htmlize" ,emacs-htmlize) ("emacs-hydra" ,emacs-hydra) + ("emacs-ivy" ,emacs-ivy) ("emacs-key-chord" ,emacs-key-chord) - ("emacs-s" ,emacs-s) - ("emacs-f" ,emacs-f) - ("emacs-pdf-tools" ,emacs-pdf-tools))) + ("emacs-pdf-tools" ,emacs-pdf-tools) + ("emacs-s" ,emacs-s))) (home-page "https://github.com/jkitchin/org-ref") - (synopsis "Citations, cross-references and bibliographies in org-mode") + (synopsis "Citations, cross-references and bibliographies in Org mode") (description - "Lisp code to setup bibliography, cite, ref and label org-mode links. -Also sets up reftex and helm for org-mode citations. The links are -clickable and do things that are useful. - -The default setup uses helm-bibtex. - -You should really read org-ref.org in this package for details.") + "Org Ref is an Emacs library that provides rich support for citations, +labels and cross-references in Org mode. + +The basic idea of Org Ref is that it defines a convenient interface to insert +citations from a reference database (e.g., from BibTeX files), and a set of +functional Org links for citations, cross-references and labels that export +properly to LaTeX, and that provide clickable functionality to the user. Org +Ref interfaces with Helm BibTeX to facilitate citation entry, and it can also +use RefTeX. + +It also provides a fairly large number of utilities for finding bad citations, +extracting BibTeX entries from citations in an Org file, and functions to +create and modify BibTeX entries from a variety of sources, most notably from +a DOI. + +Org Ref is especially suitable for Org documents destined for LaTeX export and +scientific publication. Org Ref is also useful for research documents and +notes.") (license license:gpl3+)))) ;; This project is unmaintained. Please use emacs-org-re-reveal instead. @@ -22407,3 +22476,59 @@ conventions.") (description "Haskell-Snippets is a collection of YASnippet Haskell snippets for Emacs.") (license license:expat)))) + +(define-public emacs-org-roam + (package + (name "emacs-org-roam") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jethrokuan/org-roam.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08pfa63k194dpk0y2gfa0nzn5lig81q0l9axkq5j4ibj6ifaap4a")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-company" ,emacs-company) + ("emacs-dash" ,emacs-dash) + ("emacs-emacsql-sqlite" ,emacs-emacsql) + ("emacs-f" ,emacs-f) + ("emacs-org-ref" ,emacs-org-ref) + ("emacs-s" ,emacs-s))) + (home-page "https://github.com/jethrokuan/org-roam/") + (synopsis "Non-hierarchical note-taking with Org mode") + (description "Emacs Org Roam is a solution for taking non-hierarchical +notes with Org mode. Notes are captured without hierarchy and are connected +by tags. Notes can be found and created quickly. Org Roam should also work +as a plug-and-play solution for anyone already using Org mode for their +personal wiki.") + (license license:gpl3+))) + +(define-public emacs-uml-mode + ;; Package has no release. Version is extracted from "Version:" keyword in + ;; main file. + (let ((commit "4c37ac1c4424b2313cd8f16ba48a98a4cc214200") + (revision "1")) + (package + (name "emacs-uml-mode") + (version (git-version "0.0.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ianxm/emacs-uml.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "145i4srnfvd1vyibri2a1l6p9mbjvkkwlrpi41134pbarqffcnka")))) + (build-system emacs-build-system) + (home-page "https://github.com/ianxm/emacs-uml") + (synopsis "Minor mode for editing ASCII UML sequence diagrams") + (description "Emacs UML mode is a minor mode that makes it easy to build +ASCII UML sequence diagrams in Emacs, which can be embedded in source code, +comments or emails.") + (license license:gpl3+)))) + diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 6a5f12db6d..15101e3aee 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1018,22 +1018,42 @@ the 'showing the effect of'-style of operation.") (define-public volk (package (name "volk") - (version "1.3") + (version "2.2.1") (source (origin (method url-fetch) - (uri (string-append "http://libvolk.org/releases/volk-" + (uri (string-append "https://www.libvolk.org/releases/volk-" version ".tar.gz")) (sha256 (base32 - "1bz3ywc6y5wmz3i8p4z2wbzhns8bc0ywdkl9qnxpcvfcscarbdlh")))) + "1wz5nhmw6np8ka30pgy1qnima3rk2ksln4klfhrj7wah3fian0k9")))) (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-pythonpath + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (python (assoc-ref inputs "python")) + (file (string-append out "/bin/volk_modtool")) + (path (string-append + out + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages:" + (getenv "PYTHONPATH")))) + (wrap-program file + `("PYTHONPATH" ":" prefix (,path)) + `("PATH" ":" prefix + (,(string-append python "/bin:"))))) + #t))))) (inputs `(("boost" ,boost))) (native-inputs - `(("python-2" ,python-2) - ("python2-cheetah" ,python2-cheetah))) - (home-page "http://libvolk.org/") + `(("python" ,python-wrapper) + ("python-mako" ,python-mako))) + (home-page "https://www.libvolk.org/") (synopsis "Vector-Optimized Library of Kernels") (description "@code{volk} contains procedures with machine-specific optimizations diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8db9a7c529..f20a0bdca8 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -397,6 +397,56 @@ Playing bastet can be a painful experience, especially if you usually make canyons and wait for the long I-shaped block to clear four rows at a time.") (license license:gpl3+))) +(define-public blobwars + (package + (name "blobwars") + (version "2.00") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/blobwars/" + "blobwars-" version ".tar.gz")) + (sha256 + (base32 "16aagvkx6azf75gm5kaa94bh5npydvhqp3fvdqyfsanzdjgjf1n4")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no test + #:make-flags + (let ((out (assoc-ref %outputs "out"))) + (list (string-append "PREFIX=" out) + (string-append "BINDIR=" out "/bin/") + "USEPAK=1" + "RELEASE=1")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'werror-begone + (lambda _ + (substitute* "Makefile" (("-Werror") "")) + #t)) + (delete 'configure)))) ;no configure script + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config))) + (inputs + `(("hicolor-icon-theme" ,hicolor-icon-theme) + ("sdl" ,(sdl-union (list sdl2 + sdl2-image + sdl2-mixer + sdl2-ttf + sdl2-net))))) + (home-page "https://sourceforge.net/projects/blobwars/") + (synopsis "Platform action game featuring a blob with a lot of weapons") + (description "Blobwars: Metal Blob Solid is a 2D platform game, the first +in the Blobwars series. You take on the role of a fearless Blob agent. Your +mission is to infiltrate various enemy bases and rescue as many MIAs as +possible, while battling many vicious aliens.") + (license (list license:gpl2 ; For code and graphics + license:cc0 ; Music and sounds have specific licenses + license:cc-by3.0 ; see /doc/readme + license:cc-by-sa3.0 + license:lgpl2.1+ + license:bsd-2)))) + (define-public cataclysm-dda (package (name "cataclysm-dda") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fe511bc075..2e406c5485 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6741,7 +6741,8 @@ libxml2.") name "-" version ".tar.xz")) (sha256 (base32 - "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4")))) + "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4")) + (patches (search-patches "gdm-default-session.patch")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 3992b0ccc8..e1c8b4fccf 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -750,7 +750,7 @@ from forcing GEXP-PROMISE." ("libxt" ,libxt) ("libffi" ,libffi) ("ffmpeg" ,ffmpeg) - ("libvpx" ,libvpx-1.7) + ("libvpx" ,libvpx) ("icu4c" ,icu4c) ("pixman" ,pixman) ("pulseaudio" ,pulseaudio) diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 8bf69c6551..02aef3ed47 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 Pierre Langlois <pierre.langlois@gmx.com> +;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -167,14 +168,13 @@ downloading episode status changes.") (define-public python-podcastparser (package (name "python-podcastparser") - (version "0.6.4") + (version "0.6.5") (source (origin (method url-fetch) (uri (pypi-uri "podcastparser" version)) (sha256 - (base32 - "1ksj1gcmbnm5i43xhpqxbs2mqi6xzawwwkwbh9h6lwa1wxxvv247")))) + (base32 "0k62ppg20i41gcc5x8ddjn7zbpy47hqpxzrq9257g2c71m4qw07b")))) (native-inputs `(("python-nose" ,python-nose))) (build-system python-build-system) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index dc83cf7c65..ac8155fc89 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1140,7 +1140,7 @@ microblogging service.") (define-public guile-parted (package (name "guile-parted") - (version "0.0.3") + (version "0.0.4") (source (origin (method git-fetch) (uri (git-reference @@ -1149,7 +1149,7 @@ microblogging service.") (file-name (git-file-name name version)) (sha256 (base32 - "0kwi777fhfb4rq6fik9bwqzr63k82qjl94dm5lyyyal4rh724xrc")) + "0b7h8psfm9gmmwb65pp5zwzglvwnfmw5j40g09hhf3f7kwxc0mv2")) (modules '((guix build utils))))) (build-system gnu-build-system) (arguments @@ -1679,6 +1679,84 @@ capabilities.") (home-page "https://dthompson.us/projects/sly.html") (license license:gpl3+))) +(define-public g-golf + (let ((commit "4a4edf25e4877df9182c77843bdd98ab59e13ef7")) + (package + (name "g-golf") + (version (git-version "1" "683" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/g-golf.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09p0gf71wbmlm9kri693a8fvr9hl3hhlmlidyadwjdh7853xg0h8")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("texinfo" ,texinfo) + ("gettext" ,gettext-minimal) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-2.2) + ("guile-lib" ,guile-lib) + ("clutter" ,clutter) + ("gtk" ,gtk+) + ("glib" ,glib))) + (propagated-inputs + `(("gobject-introspection" ,gobject-introspection))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'tests-work-arounds + (lambda* (#:key inputs #:allow-other-keys) + ;; In build environment, There is no /dev/tty + (substitute* + "test-suite/tests/gobject.scm" + (("/dev/tty") "/dev/null")))) + (add-before 'configure 'substitute-libs + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((get (lambda (key lib) + (string-append (assoc-ref inputs key) "/lib/" lib))) + (libgi (get "gobject-introspection" "libgirepository-1.0")) + (libglib (get "glib" "libglib-2.0")) + (libgobject (get "glib" "libgobject-2.0")) + (libgdk (get "gtk" "libgdk-3"))) + (substitute* "configure" + (("SITEDIR=\"\\$datadir/g-golf\"") + "SITEDIR=\"$datadir/guile/site/$GUILE_EFFECTIVE_VERSION\"") + (("SITECCACHEDIR=\"\\$libdir/g-golf/") + "SITECCACHEDIR=\"$libdir/")) + (substitute* "g-golf/init.scm" + (("libgirepository-1.0") libgi) + (("libglib-2.0") libglib) + (("libgdk-3") libgdk) + (("libgobject-2.0") libgobject) + (("\\(dynamic-link \"libg-golf\"\\)") + (format #f "~s" + `(dynamic-link + (format #f "~alibg-golf" + (if (getenv "GUILE_GGOLF_UNINSTALLED") + "" + ,(format #f "~a/lib/" + (assoc-ref outputs "out")))))))) + (setenv "GUILE_AUTO_COMPILE" "0") + (setenv "GUILE_GGOLF_UNINSTALLED" "1") + #t)))))) + (home-page "https://www.gnu.org/software/g-golf/") + (synopsis "Guile bindings for GObject Introspection") + (description + "G-Golf (Gnome: (Guile Object Library for)) is a library for developing +modern applications in Guile Scheme. It comprises a direct binding to the +GObject Introspection API and higher-level functionality for importing Gnome +libraries and making GObject classes (and methods) available in Guile's +object-oriented programming system, GOOPS.") + (license license:lgpl3+)))) + (define-public g-wrap (package (name "g-wrap") @@ -2722,11 +2800,11 @@ in C using Gtk+-3 and WebKitGtk.") (license license:gpl3+))) (define-public emacsy-minimal - (let ((commit "f3bf0dbd803d7805b6ae8303253507ad13922293")) + (let ((commit "d459ca1d3d09e7624e662bc4cfc3596850796fc6")) (package (inherit emacsy) (name "emacsy-minimal") - (version (git-version "v0.4.1" "19" commit)) + (version (git-version "v0.4.1" "28" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2735,7 +2813,7 @@ in C using Gtk+-3 and WebKitGtk.") (file-name (git-file-name name version)) (sha256 (base32 - "0ivy28km1p7nlrf63xx3hvrpxf5ld5amk1wcan3k7sqv1kq9mqdb")))) + "1ps15w8cxj9kc18gmvys9jv9xa1qqa7m43ismv34l3cmhddrn0sr")))) (build-system gnu-build-system) (inputs `(("guile" ,guile-2.2) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 4c9c45bc48..7ee657a75a 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -17,6 +18,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages hardware) + #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages gcc) #:use-module (gnu packages glib) @@ -276,3 +278,32 @@ supported by the Linux kernel.") ;; Source file headers still say GPL2+, but the authorial intent ;; (from COPYING and the F9 'about' screen) is clearly GPL3+. (license license:gpl3+))) + +(define-public rkdeveloptool + (let ((commit "6e92ebcf8b1812da02663494a68972f956e490d3") + (revision "0")) + (package + (name "rkdeveloptool") + (version (git-version "1.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rockchip-linux/rkdeveloptool.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0zwrkqfxd671iy69v3q0844gfdpm1yk51i9qh2rqc969bd8glxga")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("libusb" ,libusb))) + (home-page "https://github.com/rockchip-linux/rkdeveloptool") + (synopsis "Read from and write to RockChicp devices over USB") + (description + "Rkdeveloptool can read from and write to RockChip devices over USB, such +as the Pinebook Pro.") + (license license:gpl2+)))) diff --git a/gnu/packages/i2p.scm b/gnu/packages/i2p.scm index a317cd590c..0061701304 100644 --- a/gnu/packages/i2p.scm +++ b/gnu/packages/i2p.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> +;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,7 +22,6 @@ #:use-module (gnu packages compression) #:use-module (gnu packages tls) #:use-module (gnu packages upnp) - #:use-module (gnu packages web) #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system cmake) @@ -30,7 +30,7 @@ (define-public i2pd (package (name "i2pd") - (version "2.29.0") + (version "2.31.0") (source (origin (method git-fetch) @@ -39,12 +39,11 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1issg3aidwikk4g12sa8q81zzp0hd0g8wdy2dx4899z8yrscl300")))) + (base32 "1q2gxz041ha9n5lfn91iy11sdf3z7d806vcq4z43m7lf92m7i4nn")))) (build-system cmake-build-system) (inputs `(("boost" ,boost) ("miniupnpc" ,miniupnpc) ("openssl" ,openssl) - ("websocketpp" ,websocketpp) ("zlib" ,zlib))) (arguments '(#:configure-flags (let ((source (assoc-ref %build-inputs "source"))) @@ -52,7 +51,6 @@ "-DWITH_PCH=OFF" "-DWITH_STATIC=OFF" "-DWITH_UPNP=ON" - "-DWITH_WEBSOCKETS=ON" "-DWITH_LIBRARY=ON" "-DBUILD_SHARED_LIBS=ON" "-DWITH_BINARY=ON")) diff --git a/gnu/packages/kawa.scm b/gnu/packages/kawa.scm index 5771eeda8e..9550a01720 100644 --- a/gnu/packages/kawa.scm +++ b/gnu/packages/kawa.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Carlo Zancanaro <carlo@zancanaro.id.au> ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,18 +28,25 @@ (define-public kawa (package (name "kawa") - (version "3.0") + (version "3.1.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/kawa/kawa-" version ".tar.gz")) (sha256 - (base32 - "1k9qpydc64ar4aqyg3q7jmmxy503ayj85227qfhc5n6ngchqavhy")))) + (base32 "06g015zjlfgsx0n4lb326czkbf1grlx0n6dx074m808hdg6m16lc")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f - #:parallel-tests? #f)) + #:parallel-tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-kawa + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/share/kawa/bin/kawa") + `("JAVA_HOME" ":" = (,(assoc-ref inputs "icedtea")))) + #t)))))) (inputs `(("icedtea" ,icedtea-8 "jdk"))) (home-page "https://www.gnu.org/software/kawa/") diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8793e55e46..0970a3909c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,50 +369,50 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (sha256 hash))) -(define-public linux-libre-5.6-version "5.6.3") +(define-public linux-libre-5.6-version "5.6.4") (define-public linux-libre-5.6-pristine-source (let ((version linux-libre-5.6-version) - (hash (base32 "1ajh1iw3bplm6ckcycg45wfmmqkvfiqmh6i3m1895dfapfd6h4qx"))) + (hash (base32 "14cxbc9xi4s3xwx4yb1yd4z0kidsk3d443skf5sgmdhcalg79wax"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.6))) -(define-public linux-libre-5.4-version "5.4.31") +(define-public linux-libre-5.4-version "5.4.32") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1svf4wf4j1vqhdpgx63ry4c99fc54d9nfi4d1xm7z209z3w86451"))) + (hash (base32 "1czjjnln1cqrnjxw0md6mpw9haw9abdyvmxnjds56ym4nzx9jb8r"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.114") +(define-public linux-libre-4.19-version "4.19.115") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "03hz6vg5bg728ilbm4z997pf52cgxzsxb03vz5cs55gwdbfa0h0y"))) + (hash (base32 "1hh170z3mv181l6cc6qqc12wif5jsmxbh2qxbq6b9km5irydkchi"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.175") +(define-public linux-libre-4.14-version "4.14.176") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0b12w0d21sk261jr4p1pm32v0r20a5c2j1p5hasdqw80sb2hli6b"))) + (hash (base32 "18jwxhf29ax54xnylmz9zfkslnxw7y3h215dbfmmvddfp9b0kbmw"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.218") +(define-public linux-libre-4.9-version "4.9.219") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1ka98c8sbfipzll6ss9fcsn26lh4cy60372yfw27pif4brhnwfnz"))) + (hash (base32 "0i5wlyp11ss9p035bhq73xjx8iyk5dk4ynvd7msw5qfkrs6265vb"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.218") +(define-public linux-libre-4.4-version "4.4.219") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0qzhcy8i111jbpnkpzq7hqf9nkwq4s7smi820hfvnmd2ky7cns7a"))) + (hash (base32 "1mpxqb2m24ay4n9px4n2cyklxy4lhnv9q6wlvilx13rs5qfbb62f"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 1e32624c51..907fd55223 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1711,7 +1711,7 @@ also be supported.") (define-public sbcl-ironclad (package (name "sbcl-ironclad") - (version "0.48") + (version "0.49") (source (origin (method git-fetch) @@ -1719,8 +1719,7 @@ also be supported.") (url "https://github.com/sharplispers/ironclad/") (commit (string-append "v" version)))) (sha256 - (base32 - "1wzczpgvgjc5h8ghz75kxi7iykmqxqchdhgdhkif9j99kyqvbyam")) + (base32 "0kbzqg2aasrhjwy3nrzy2ddy809n1j045w4qkyc3r2syqd203d4q")) (file-name (git-file-name name version)))) (build-system asdf-build-system/sbcl) (native-inputs @@ -1728,7 +1727,8 @@ also be supported.") `(("rt" ,sbcl-rt))) (inputs `(("bordeaux-threads" ,sbcl-bordeaux-threads) - ("flexi-streams" ,sbcl-flexi-streams))) + ("flexi-streams" ,sbcl-flexi-streams) + ("trivial-garbage" ,sbcl-trivial-garbage))) (synopsis "Cryptographic toolkit written in Common Lisp") (description "Ironclad is a cryptography library written entirely in Common Lisp. @@ -6321,10 +6321,10 @@ various string metrics in Common Lisp: (sbcl-package->cl-source-package sbcl-mk-string-metrics)) (define-public sbcl-cl-str - (let ((commit "3d5ec86e3a0199e5973aacde951086dfd754b5e5")) + (let ((commit "eb480f283e28802d67b35bf916506701152f9a2a")) (package (name "sbcl-cl-str") - (version (git-version "0.8" "1" commit)) + (version (git-version "0.17" "1" commit)) (home-page "https://github.com/vindarel/cl-str") (source (origin (method git-fetch) @@ -6332,12 +6332,13 @@ various string metrics in Common Lisp: (url home-page) (commit commit))) (sha256 - (base32 "0szzzbygw9h985yxz909vvqrp69pmpcpahn7hn350lnyjislk9ga")) + (base32 "1hpq5m8zjjnzns370zy27z2vcm1p8n2ka5ij2x67gyc9amz9vla0")) (file-name (git-file-name name version)))) (build-system asdf-build-system/sbcl) (inputs `(("cl-ppcre" ,sbcl-cl-ppcre) - ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode))) + ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode) + ("cl-change-case" ,sbcl-cl-change-case))) (native-inputs `(("prove" ,sbcl-prove) ("prove-asdf" ,sbcl-prove-asdf))) @@ -11358,3 +11359,67 @@ multiple checkers, including Aspell and Hunspell.") (define-public cl-enchant (sbcl-package->cl-source-package sbcl-enchant)) + +(define-public sbcl-cl-change-case + (let ((commit "5ceff2a5f8bd845b6cb510c6364176b27a238fd3")) + (package + (name "sbcl-cl-change-case") + (version (git-version "0.1.0" "1" commit)) + (home-page "https://github.com/rudolfochrist/cl-change-case") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1afyglglk9z3yg8gylcl301bl2r8vq3sllyznzj9s5xi5gs6qyf2")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl-ppcre" ,sbcl-cl-ppcre) + ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (arguments + '(;; FIXME: Test pass but phase fails with 'Component + ;; "cl-change-case-test" not found, required by'. + #:tests? #f + #:test-asd-file "cl-change-case-test.asd")) + (synopsis "Convert Common Lisp strings between camelCase, PascalCase and more") + (description + "@code{cl-change-case} is library to convert strings between camelCase, +PascalCase, snake_case, param-case, CONSTANT_CASE and more.") + (license license:llgpl)))) + +(define-public cl-change-case + (sbcl-package->cl-source-package sbcl-cl-change-case)) + +(define-public sbcl-moptilities + (let ((commit "a436f16b357c96b82397ec018ea469574c10dd41")) + (package + (name "sbcl-moptilities") + (version (git-version "0.3.13" "1" commit)) + (home-page "https://github.com/gwkkwg/moptilities/") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1q12bqjbj47lx98yim1kfnnhgfhkl80102fkgp9pdqxg0fp6g5fc")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("closer-mop" ,sbcl-closer-mop))) + (native-inputs + `(("lift" ,sbcl-lift))) + (synopsis "Compatibility layer for Common Lisp MOP implementation differences") + (description + "MOP utilities provide a common interface between Lisps and make the +MOP easier to use.") + (license license:expat)))) + +(define-public cl-moptilities + (sbcl-package->cl-source-package sbcl-moptilities)) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index cc40f58e6e..48836934f4 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz> @@ -855,7 +855,7 @@ enough to play the original mainframe Zork all the way through.") (define-public txr (package (name "txr") - (version "234") + (version "235") (source (origin (method git-fetch) @@ -863,24 +863,29 @@ enough to play the original mainframe Zork all the way through.") (url "http://www.kylheku.com/git/txr/") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) - (patches (search-patches "txr-shell.patch")) (sha256 - (base32 - "0c9qsj4xwc24c9g02mr5n97m4d87d4n0pcc2c2n58l2vg5dnzba0")))) + (base32 "0kpqk2x0sz7sqxsrhasq0xnljjlnxwhh4xjx2nii0zy2jkv4vsbn")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("cc=gcc") - #:phases (modify-phases %standard-phases - (add-after 'configure 'fix-tests - (lambda _ - (substitute* "tests/017/realpath.tl" - (("/usr/bin") "/")) - (substitute* "tests/017/realpath.expected" - (("/usr/bin") "/")) - #t)) - (replace 'check - (lambda _ - (invoke "make" "tests")))))) + '(#:configure-flags + (list "cc=gcc" + (string-append "--prefix=" (assoc-ref %outputs "out"))) + #:test-target "tests" + #:phases + (modify-phases %standard-phases + (replace 'configure + ;; ./configure is a hand-written script that can't handle standard + ;; autotools arguments like CONFIG_SHELL. + (lambda* (#:key configure-flags #:allow-other-keys) + (setenv "txr_shell" (which "bash")) + (apply invoke "./configure" configure-flags) + #t)) + (add-after 'configure 'fix-tests + (lambda _ + (substitute* (list "tests/017/realpath.tl" + "tests/017/realpath.expected") + (("/usr/bin") "/")) + #t))))) (native-inputs `(("bison" ,bison) ("flex" ,flex))) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 2acc6ecec0..b5cd660f21 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -387,7 +387,7 @@ aliasing facilities to work just as they would on normal mail.") (define-public mutt (package (name "mutt") - (version "1.13.4") + (version "1.13.5") (source (origin (method url-fetch) (uri (list @@ -397,7 +397,7 @@ aliasing facilities to work just as they would on normal mail.") version ".tar.gz"))) (sha256 (base32 - "016dzx2c0kr9xgnw4nfzpkn4nvpk56rdlcqhrwa820fq8083yzdm")) + "0lx65a44b03rbvcrz0y9syrik67fx3hvblxyyvz5l9bb7rdipmvc")) (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 3f8354e7b4..4dfac4f87b 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -164,7 +164,7 @@ the traditional flat-text whatis databases.") (define-public man-pages (package (name "man-pages") - (version "5.05") + (version "5.06") (source (origin (method url-fetch) @@ -174,7 +174,7 @@ the traditional flat-text whatis databases.") (string-append "mirror://kernel.org/linux/docs/man-pages/Archive/" "man-pages-" version ".tar.xz"))) (sha256 - (base32 "0izb6shcczvg37cyd3kzxsfsrffqj1qw9nqhhq9mi4kd36qkbcfm")))) + (base32 "0l7ypgl36jswa077qvdh1rcsvnwr64vja6cc32bab86sm41akf3h")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index c96d67d8f2..303af32983 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -92,7 +92,7 @@ interfacing MPD in the C, C++ & Objective C languages.") (define-public mpd (package (name "mpd") - (version "0.21.21") + (version "0.21.22") (source (origin (method url-fetch) (uri @@ -101,7 +101,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "/mpd-" version ".tar.xz")) (sha256 (base32 - "1kk8q5z99zdzwv3angn03jwnxhqdad0pnyi5j67c2qiv1rgv3gg1")))) + "18lvyv3crijki5nxjdhf1byayyavdvj07dk6rm856n4vi78qfmjn")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'... diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f9657e4aa3..4618817b43 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2024,14 +2024,14 @@ displays the results in real time.") (define-public strongswan (package (name "strongswan") - (version "5.8.2") + (version "5.8.4") (source (origin (method url-fetch) (uri (string-append "https://download.strongswan.org/strongswan-" version ".tar.bz2")) (sha256 - (base32 "03j3fx357bh89n44a5v9wdc92azdx2d37j7jmlyr4z1kwzdhv446")))) + (base32 "0g2m08gmgdi3qvvqz6zy7n16np53sp232xd0rdc2vdhk73img6id")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index ee3e017326..33c0d90cf9 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -111,9 +111,9 @@ ;; Latest version of Guix, which may or may not correspond to a release. ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. - (let ((version "1.0.1") - (commit "09844816c77caaa60f4149f99a34733966724627") - (revision 15)) + (let ((version "1.1.0") + (commit "d62c9b2671be55ae0305bebfda17b595f33797f2") + (revision 0)) (package (name "guix") @@ -129,7 +129,7 @@ (commit commit))) (sha256 (base32 - "1fciffls6cw9zz13vig5x37r73qxc0irzyh0caimciddlksvabf7")) + "0v76hb0pidfgvxa22gq6hqf5yc3m527gl7hpzykazgjh881g2vmy")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/patches/gdm-default-session.patch b/gnu/packages/patches/gdm-default-session.patch new file mode 100644 index 0000000000..4839a04de4 --- /dev/null +++ b/gnu/packages/patches/gdm-default-session.patch @@ -0,0 +1,91 @@ +This patch ensures '.desktop' files are picked up in the system profile +and not in the directories listed in $XDG_DATA_DIRS. The latter includes +'gnome-session.desktop', which should be used if it's in +/run/current-system/profile, and only then. + +Fixes <https://bugs.gnu.org/37831>. + +diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c +index 6a116a8..02c1458 100644 +--- a/daemon/gdm-session.c ++++ b/daemon/gdm-session.c +@@ -348,24 +348,18 @@ get_system_session_dirs (GdmSession *self) + GArray *search_array = NULL; + char **search_dirs; + int i; +- const gchar * const *system_data_dirs = g_get_system_data_dirs (); + + static const char *x_search_dirs[] = { + "/etc/X11/sessions/", + DMCONFDIR "/Sessions/", + DATADIR "/gdm/BuiltInSessions/", +- DATADIR "/xsessions/", ++ "/run/current-system/profile/share/xsessions/" + }; + + static const char *wayland_search_dir = DATADIR "/wayland-sessions/"; + + search_array = g_array_new (TRUE, TRUE, sizeof (char *)); + +- for (i = 0; system_data_dirs[i]; i++) { +- gchar *dir = g_build_filename (system_data_dirs[i], "xsessions", NULL); +- g_array_append_val (search_array, dir); +- } +- + g_array_append_vals (search_array, x_search_dirs, G_N_ELEMENTS (x_search_dirs)); + + #ifdef ENABLE_WAYLAND_SUPPORT +@@ -373,16 +367,7 @@ get_system_session_dirs (GdmSession *self) + #ifdef ENABLE_USER_DISPLAY_SERVER + g_array_prepend_val (search_array, wayland_search_dir); + +- for (i = 0; system_data_dirs[i]; i++) { +- gchar *dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL); +- g_array_insert_val (search_array, i, dir); +- } + #else +- for (i = 0; system_data_dirs[i]; i++) { +- gchar *dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL); +- g_array_append_val (search_array, dir); +- } +- + g_array_append_val (search_array, wayland_search_dir); + #endif + } +diff --git a/libgdm/gdm-sessions.c b/libgdm/gdm-sessions.c +index afbc5c0..bb5e3e6 100644 +--- a/libgdm/gdm-sessions.c ++++ b/libgdm/gdm-sessions.c +@@ -238,19 +238,11 @@ collect_sessions (void) + "/etc/X11/sessions/", + DMCONFDIR "/Sessions/", + DATADIR "/gdm/BuiltInSessions/", +- DATADIR "/xsessions/", +- NULL ++ "/run/current-system/profile/share/xsessions/" + }; + + xorg_search_array = g_array_new (TRUE, TRUE, sizeof (char *)); + +- const gchar * const *system_data_dirs = g_get_system_data_dirs (); +- +- for (i = 0; system_data_dirs[i]; i++) { +- session_dir = g_build_filename (system_data_dirs[i], "xsessions", NULL); +- g_array_append_val (xorg_search_array, session_dir); +- } +- + g_array_append_vals (xorg_search_array, xorg_search_dirs, G_N_ELEMENTS (xorg_search_dirs)); + + #ifdef ENABLE_WAYLAND_SUPPORT +@@ -261,11 +253,6 @@ collect_sessions (void) + + wayland_search_array = g_array_new (TRUE, TRUE, sizeof (char *)); + +- for (i = 0; system_data_dirs[i]; i++) { +- session_dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL); +- g_array_append_val (wayland_search_array, session_dir); +- } +- + g_array_append_vals (wayland_search_array, wayland_search_dirs, G_N_ELEMENTS (wayland_search_dirs)); + #endif + diff --git a/gnu/packages/patches/libvpx-use-after-free-in-postproc.patch b/gnu/packages/patches/libvpx-use-after-free-in-postproc.patch deleted file mode 100644 index 04f2a953b7..0000000000 --- a/gnu/packages/patches/libvpx-use-after-free-in-postproc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 52add5896661d186dec284ed646a4b33b607d2c7 Mon Sep 17 00:00:00 2001 -From: Jerome Jiang <jianj@google.com> -Date: Wed, 23 May 2018 15:43:00 -0700 -Subject: [PATCH] VP8: Fix use-after-free in postproc. - -The pointer in vp8 postproc refers to show_frame_mi which is only -updated on show frame. However, when there is a no-show frame which also -changes the size (thus new frame buffers allocated), show_frame_mi is -not updated with new frame buffer memory. - -Change the pointer in postproc to mi which is always updated. - -Bug: 842265 -Change-Id: I33874f2112b39f74562cba528432b5f239e6a7bd ---- - vp8/common/postproc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c -index d67ee8a57..8c292d616 100644 ---- a/vp8/common/postproc.c -+++ b/vp8/common/postproc.c -@@ -65,7 +65,7 @@ void vp8_deblock(VP8_COMMON *cm, YV12_BUFFER_CONFIG *source, - double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065; - int ppl = (int)(level + .5); - -- const MODE_INFO *mode_info_context = cm->show_frame_mi; -+ const MODE_INFO *mode_info_context = cm->mi; - int mbr, mbc; - - /* The pixel thresholds are adjusted according to if or not the macroblock --- -2.19.0 - diff --git a/gnu/packages/patches/python-jedi-deleted-variables.patch b/gnu/packages/patches/python-jedi-deleted-variables.patch deleted file mode 100644 index 53bdc05cde..0000000000 --- a/gnu/packages/patches/python-jedi-deleted-variables.patch +++ /dev/null @@ -1,38 +0,0 @@ -Fix test failure in some environments, including Guix. - -Taken from upstream: -https://github.com/davidhalter/jedi/commit/bec87f7ff82b0731713c6520a14c213341b4cecf - -diff --git a/test/completion/basic.py b/test/completion/basic.py -index b40068179..3ff919ca6 100644 ---- a/test/completion/basic.py -+++ b/test/completion/basic.py -@@ -209,11 +209,11 @@ def global_as_import(): - - deleted_var = 3 - del deleted_var --#? int() -+#? - deleted_var --#? ['deleted_var'] -+#? [] - deleted_var --#! ['deleted_var = 3'] -+#! [] - deleted_var - - # ----------------- -diff --git a/test/test_api/test_full_name.py b/test/test_api/test_full_name.py -index 4fdb861b0..6858b6ca8 100644 ---- a/test/test_api/test_full_name.py -+++ b/test/test_api/test_full_name.py -@@ -112,7 +112,8 @@ def test_os_path(Script): - - def test_os_issues(Script): - """Issue #873""" -- assert [c.name for c in Script('import os\nos.nt''').complete()] == ['nt'] -+ # nt is not found, because it's deleted -+ assert [c.name for c in Script('import os\nos.nt''').complete()] == [] - - - def test_param_name(Script): diff --git a/gnu/packages/patches/txr-shell.patch b/gnu/packages/patches/txr-shell.patch deleted file mode 100644 index a4abb73eac..0000000000 --- a/gnu/packages/patches/txr-shell.patch +++ /dev/null @@ -1,59 +0,0 @@ -Use the current shell instead of trying to find another one and -failing to do so. - -diff --git a/configure b/configure -index f1adb919..7891b4dc 100755 ---- a/configure -+++ b/configure -@@ -26,28 +26,6 @@ - # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - --# --# The #!/bin/sh might be some legacy piece of crap, --# not even up to 1990 POSIX.2 spec. So the first step --# is to look for a better shell in some known places --# and re-execute ourselves with that interpreter. --# -- --if test x$txr_shell = x ; then -- for shell in /bin/bash /usr/bin/bash /usr/xpg4/bin/sh ; do -- if test -x $shell ; then -- txr_shell=$shell -- break -- fi -- done -- if test x$txr_shell = x ; then -- echo "No known POSIX shell found: falling back on /bin/sh, which may not work" -- txr_shell=/bin/sh -- fi -- export txr_shell -- exec $txr_shell $0 ${@+"$@"} --fi -- - set -u - - # -@@ -190,13 +168,6 @@ while [ $# -gt 0 ] ; do - exit 1 - fi - -- eval "var_exists=\${$var+y}" -- -- if [ "$var_exists" != y ] ; then -- printf "$0: nonexistent option: '%s'\n" "$1" -- exit 1 -- fi -- - eval "$var='$val'" - - eval "var_given_exists=\${${var}_given+y}" -@@ -208,6 +179,8 @@ while [ $# -gt 0 ] ; do - shift - done - -+txr_shell=$CONFIG_SHELL -+ - # - # If --help was given (or --help=<nonempty> or help=<nonempty>) then - # print help and exit. The termination status is failed, to indicate diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 4b3ce036e2..d6a75506ec 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -53,6 +53,7 @@ #:use-module (guix build-system perl) #:use-module (gnu packages base) #:use-module (gnu packages compression) + #:use-module (gnu packages databases) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gd) #:use-module (gnu packages less) @@ -386,6 +387,49 @@ functions. The password hashing function is implemented in XS with a pure Perl backup version for systems that cannot handle XS.") (license gpl2+))) +(define-public perl-authen-passphrase + (package + (name "perl-authen-passphrase") + (version "0.008") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-Passphrase-" + version ".tar.gz")) + (sha256 + (base32 + "0qq4krap687rxf6xr31bg5nj5dqmm1frcm7fq249v1bxc4h4bnsm")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build) + ("perl-test-pod" ,perl-test-pod) + ("perl-test-pod-coverage" ,perl-test-pod-coverage))) + (propagated-inputs + `(("perl-authen-dechpwd" ,perl-authen-dechpwd) + ("perl-crypt-des" ,perl-crypt-des) + ("perl-crypt-eksblowfish" ,perl-crypt-eksblowfish) + ("perl-crypt-mysql" ,perl-crypt-mysql) + ("perl-crypt-passwdmd5" ,perl-crypt-passwdmd5) + ("perl-crypt-unixcrypt_xs" ,perl-crypt-unixcrypt_xs) + ("perl-data-entropy" ,perl-data-entropy) + ("perl-digest-md4" ,perl-digest-md4) + ("perl-module-runtime" ,perl-module-runtime) + ("perl-params-classify" ,perl-params-classify))) + (home-page "https://metacpan.org/release/Authen-Passphrase") + (synopsis "Hashed passwords/passphrases as objects") + (description "@code{Authen-Passphrase} is the base class for a +system of objects that encapsulate passphrases. An object of this +type is a passphrase recogniser; its job is to recognise whether an +offered passphrase is the right one. For security such passphrase +recognisers usually do not themselves know the passphrase they are +looking for; they can merely recognise it when they see it. There are +many schemes in use to achieve this effect and the intent of this +class is to provide a consistent interface to them all. In addition +to the base class, this module also contains implementations of +several specific passphrase schemes.") + (license perl-license))) + (define-public perl-autovivification (package (name "perl-autovivification") @@ -1849,6 +1893,55 @@ CPAN::Meta object are present.") versa.") (license (package-license perl)))) +(define-public perl-crypt-cbc + (package + (name "perl-crypt-cbc") + (version "2.33") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-" + version ".tar.gz")) + (sha256 + (base32 + "0ig698lmpjz7fslnznxm0609lvlnvf4f3s370082nzycnqhxww3a")))) + (build-system perl-build-system) + (native-inputs + `(("perl-crypt-rijndael" ,perl-crypt-rijndael))) + (home-page "https://metacpan.org/release/Crypt-CBC") + (synopsis "Encrypt Data with Cipher Block Chaining Mode") + (description "@code{Crypt::CBC} is a Perl-only implementation of +the cryptographic Cipher Block Chaining (CBC) mode. In combination +with a block cipher such as @code{Crypt::Rijndael} you can encrypt and +decrypt messages of arbitrarily long length. The encrypted messages +are compatible with the encryption format used by SSLeay.") + (license perl-license))) + +(define-public perl-crypt-des + (package + (name "perl-crypt-des") + (version "2.07") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/D/DP/DPARIS/Crypt-DES-" + version ".tar.gz")) + (sha256 + (base32 + "1rypxlhpd1jc0c327aghgl9y6ls47drmpvn0a40b4k3vhfsypc9d")))) + (build-system perl-build-system) + (native-inputs + `(("perl-crypt-cbc" ,perl-crypt-cbc))) + (home-page "https://metacpan.org/release/Crypt-DES") + (synopsis "DES encryption module") + (description "@code{Crypt::DES} is an XS-based implementation of +the DES cryptography algorithm. The module implements the +@code{Crypt::CBC} interface which has blocksize, keysize, encrypt and +decrypt functions.") + (license bsd-3))) + (define-public perl-crypt-eksblowfish (package (name "perl-crypt-eksblowfish") @@ -1883,6 +1976,57 @@ also includes an implementation of @code{bcrypt}, the Unix crypt() password hashing algorithm based on Eksblowfish.") (license perl-license))) +(define-public perl-crypt-mysql + (package + (name "perl-crypt-mysql") + (version "0.04") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/I/IK/IKEBE/Crypt-MySQL-" + version ".tar.gz")) + (sha256 + (base32 + "1qyx6ha13r0rh80ldv5wy2bq2pa74igwh8817xlapsfgxymdzswk")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build) + ("perl-dbd-mysql" ,perl-dbd-mysql))) + (propagated-inputs + `(("perl-digest-sha1" ,perl-digest-sha1))) + (home-page "https://metacpan.org/release/Crypt-MySQL") + (synopsis "Emulate the MySQL PASSWORD() function") + (description "@code{Crypt::MySQL} emulates the MySQL PASSWORD() +function. The module does not depend on an interface to the MySQL +database server. This enables the comparison of encrypted passwords +without the need for a real MySQL environment.") + (license perl-license))) + +(define-public perl-crypt-passwdmd5 + (package + (name "perl-crypt-passwdmd5") + (version "1.40") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-" + version ".tgz")) + (sha256 + (base32 + "0j0r74f18nk63phddzqbf7wqma2ci4p4bxvrwrxsy0aklbp6lzdp")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) + (home-page "https://metacpan.org/release/Crypt-PasswdMD5") + (synopsis "Interoperable MD5-based crypt() functions") + (description "@code{Crypt::PasswdMD5} provides various +crypt()-compatible interfaces to the MD5-based crypt() function found +in various *nixes. It is based on the implementation found on FreeBSD +2.2.[56]-RELEASE.") + (license perl-license))) + (define-public perl-crypt-randpasswd (package (name "perl-crypt-randpasswd") @@ -1957,6 +2101,29 @@ supported encryption modes are: (description "A pure Perl implementation of the RC4 algorithm.") (license (package-license perl)))) +(define-public perl-crypt-unixcrypt_xs + (package + (name "perl-crypt-unixcrypt_xs") + (version "0.11") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/B/BO/BORISZ/Crypt-UnixCrypt_XS-" + version ".tar.gz")) + (sha256 + (base32 + "1ajg3x6kwxy4x9p3nw1j36qjxpjvdpi9wkca5gfd86y9q8939sv2")))) + (build-system perl-build-system) + (home-page "https://metacpan.org/release/Crypt-UnixCrypt_XS") + (synopsis "XS interface for a portable traditional crypt function") + (description "@code{Crypt::UnixCrypt_XS} implements the DES-based +Unix @code{crypt} function. For those who need to construct +non-standard variants of @code{crypt}, the various building blocks +used in @code{crypt} are also supplied separately.") + ;; Files in the 'fcrypt' directory are covered by a BSD licence. + (license (list perl-license bsd-3)))) + (define-public perl-cwd-guard (package (name "perl-cwd-guard") @@ -3413,6 +3580,29 @@ for CRC-CCITT, CRC-16 and CRC-32.") interface for the RFC 2104 HMAC mechanism.") (license (package-license perl)))) +(define-public perl-digest-md4 + (package + (name "perl-digest-md4") + (version "1.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/Digest-MD4-" + version ".tar.gz")) + (sha256 + (base32 + "19ma1hmvgiznq95ngzvm6v4dfxc9zmi69k8iyfcg6w14lfxi0lb6")))) + (build-system perl-build-system) + (home-page "https://metacpan.org/release/Digest-MD4") + (synopsis "Interface to the MD4 Algorithm") + (description "The @code{Digest::MD4} module allows you to use the +RSA Data Security Inc.@: MD4 Message Digest algorithm from within Perl +programs. The algorithm takes as input a message of arbitrary length +and produces as output a 128-bit \"fingerprint\" or \"message digest\" +of the input. MD4 is described in RFC 1320.") + (license perl-license))) + (define-public perl-digest-md5 (package (name "perl-digest-md5") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e6540a0a36..7c73b40181 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -76,6 +76,7 @@ ;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org> ;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com> +;;; Copyright © 2020 Matthew Kraai <kraai@ftbfs.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2268,14 +2269,14 @@ from git information. (define-public python-pyrsistent (package (name "python-pyrsistent") - (version "0.15.7") + (version "0.16.0") (home-page "https://github.com/tobgu/pyrsistent") (source (origin (method url-fetch) (uri (pypi-uri "pyrsistent" version)) (sha256 (base32 - "103j63g6lb5dfspph96zxjdpnq9h991kazd4f09ddgkpxpivbiyd")))) + "1lrsjgblnapfimd0alsi1as5nz2lfqv97131l7d6anbjzq2rjri8")))) (build-system python-build-system) (native-inputs `(("python-hypothesis" ,python-hypothesis) @@ -11991,15 +11992,14 @@ characters, mouse support, and auto suggestions.") (define-public python-jedi (package (name "python-jedi") - (version "0.16.0") + (version "0.17.0") (source (origin (method url-fetch) (uri (pypi-uri "jedi" version)) - (patches (search-patches "python-jedi-deleted-variables.patch")) (sha256 (base32 - "1mb5kmrk9bkc3kwzx02j62cdan1jqd92q1z7h7wi9d30jg5p3j6m")))) + "0c1h9x3a9klvk2g288wl328x8xgzw7136k6vs9hkd56b85vcjh6z")))) (build-system python-build-system) (arguments `(#:phases @@ -16358,14 +16358,14 @@ time-based (TOTP) passwords.") (define-public python-parso (package (name "python-parso") - (version "0.6.2") + (version "0.7.0") (source (origin (method url-fetch) (uri (pypi-uri "parso" version)) (sha256 (base32 - "0mr1j4ijqnrihz1yap34g6i8vjldg5lz814sz4v0d8pbqvh5jmhc")))) + "0b7irps2dqmzq41sxbpvxbivhh1x2hwmbqp45bbpd82446p9z3lh")))) (native-inputs `(("python-pytest" ,python-pytest))) (build-system python-build-system) @@ -18696,14 +18696,14 @@ tests.") (define-public python-gssapi (package (name "python-gssapi") - (version "1.6.1") + (version "1.6.5") (source (origin (method url-fetch) (uri (pypi-uri "gssapi" version)) (sha256 (base32 - "1gymg4asvwrz7y13qpwp2s5g8qwq179d72gkj09q6bfcgs82l5wr")))) + "02i5s7998dg5kcr4m0xwamd8vjqk1816xbzldyp68l91f6bynwcr")))) (build-system python-build-system) (propagated-inputs `(("python-decorator" ,python-decorator) @@ -19611,3 +19611,27 @@ there are extensions that allow you to use it with other frameworks.") register external CLI commands via setuptools entry-points.") (home-page "https://github.com/click-contrib/click-plugins") (license license:bsd-3))) + +(define-public python-diceware + (package + (name "python-diceware") + (version "0.9.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "diceware" version)) + (sha256 + (base32 + "0klb0ysybzlh2wihvir82hgq62v0jjmlcqklwajyms7c0p529yby")))) + (build-system python-build-system) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner))) + (home-page "https://github.com/ulif/diceware/") + (synopsis "Generates memorable passphrases") + (description "This package generates passphrases by concatenating words +randomly picked from wordlists. It supports several sources of +randomness (including real life dice) and different wordlists (including +cryptographically signed ones).") + (license license:gpl3+))) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index e1e5a98c68..a84a31fd9c 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -34,6 +34,7 @@ #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages documentation) + #:use-module (gnu packages engineering) #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) #:use-module (gnu packages gstreamer) @@ -243,7 +244,13 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") (uri (string-append "https://www.gnuradio.org/releases/gnuradio/" "gnuradio-" version ".tar.xz")) (sha256 - (base32 "0aw55gf5549b0fz2qdi7vplcmaf92bj34h40s34b2ycnqasv900r")))) + (base32 "0aw55gf5549b0fz2qdi7vplcmaf92bj34h40s34b2ycnqasv900r")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete bundled volk to use the shared one. + (delete-file-recursively "volk") + #t)))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) @@ -288,6 +295,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") ("python-pyyaml" ,python-pyyaml) ("qtbase" ,qtbase) ("qwt" ,qwt) + ("volk" ,volk) ("zeromq" ,zeromq))) (arguments `(#:modules ((guix build cmake-build-system) @@ -298,6 +306,8 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") #:imported-modules (,@%cmake-build-system-modules (guix build glib-or-gtk-build-system) (guix build python-build-system)) + #:configure-flags + '("-DENABLE_INTERNAL_VOLK=OFF") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-paths @@ -383,7 +393,8 @@ environment.") ("gnuradio" ,gnuradio) ("log4cpp" ,log4cpp) ;; TODO: Add more drivers. - ("rtl-sdr" ,rtl-sdr))) + ("rtl-sdr" ,rtl-sdr) + ("volk" ,volk))) (synopsis "GNU Radio block for interfacing with various radio hardware") (description "This is a block for GNU Radio allowing to use a common API to access different radio hardware.") @@ -462,7 +473,8 @@ primitives for SDR (Software Defined Radio).") ("gmp" ,gmp) ("gnuradio" ,gnuradio) ("libosmo-dsp" ,libosmo-dsp) - ("log4cpp" ,log4cpp))) + ("log4cpp" ,log4cpp) + ("volk" ,volk))) (synopsis "GNU Radio block to correct IQ imbalance") (description "This is a GNU Radio block to correct IQ imbalance in quadrature @@ -504,7 +516,8 @@ to the fix block above. ("portaudio" ,portaudio) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg) + ("volk" ,volk))) (arguments `(#:tests? #f)) ; No tests (synopsis "Software defined radio receiver") diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 4ab8329fcd..5a66ed75de 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -720,14 +720,14 @@ interactive POSIX shell targeted at resource-constrained systems.") (define-public mksh (package (name "mksh") - (version "57") + (version "58") (source (origin (method url-fetch) (uri (string-append "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R" version ".tgz")) (sha256 - (base32 "0xdykm1z710wriwd6nc8s8lwk2dwjl63dq96xxaawlid31a1241x")))) + (base32 "1337zjvzh14yncg9igdry904a3ns52l8rnm1kcq262w7f5xyp2v0")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; tests require access to /dev/tty diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c5ad6c72a1..38d75941d6 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -590,13 +590,13 @@ and operations on them using LAPACK and SuiteSparse.") (define-public r-nlme (package (name "r-nlme") - (version "3.1-145") + (version "3.1-147") (source (origin (method url-fetch) (uri (cran-uri "nlme" version)) (sha256 - (base32 "1i9a3afdmn2ziks0imz0j09ay9n0zb9mhrymy9mg97vvlz5diwrh")))) + (base32 "1rqc3wy3lmy0wczsvsn8yszzsxhppfwg4iznb1j6ki2qawpdij7g")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) @@ -693,14 +693,14 @@ analysis.") (define-public r-survival (package (name "r-survival") - (version "3.1-11") + (version "3.1-12") (source (origin (method url-fetch) (uri (cran-uri "survival" version)) (sha256 (base32 - "1fbhbm3bnpg1nmj37h1d76x813ggvwk0cp51ixmmgb3pz47i5xj4")))) + "07zj3gpwncw89hbiwjb6ih9axv5zwdqnbgz9yw9xzws6nrpdcbmn")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) @@ -1066,13 +1066,13 @@ the input of another.") (define-public r-reshape2 (package (name "r-reshape2") - (version "1.4.3") + (version "1.4.4") (source (origin (method url-fetch) (uri (cran-uri "reshape2" version)) (sha256 - (base32 "03ki5ka1dj208fc0dclbm0b4xp9d769pah2j9cs34l776p4r9zwa")))) + (base32 "1n0jrajpvc8hjkh9z4g8bwq63qy5vy5cgl2pzjardyih4ngcz3fq")))) (build-system r-build-system) (propagated-inputs `(("r-plyr" ,r-plyr) @@ -1148,14 +1148,14 @@ agnes cluster diagrams.") (define-public r-gdtools (package (name "r-gdtools") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) (uri (cran-uri "gdtools" version)) (sha256 (base32 - "1aax50wyrs4336zpf247l8wmp4spab2n70msziy1ip4gbjn26wa1")))) + "08njzin0c6biw62j5w30r9j85vr1m2cg4hmv5d76nym860yrlqjf")))) (build-system r-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -1989,14 +1989,14 @@ and environmental data in the framework of Euclidean exploratory methods.") (define-public r-xml2 (package (name "r-xml2") - (version "1.3.0") + (version "1.3.1") (source (origin (method url-fetch) (uri (cran-uri "xml2" version)) (sha256 (base32 - "138v9374xwc7flw8fz8qp8q3w4fch2jviij0g10dg92xn9dsyani")))) + "0r7rxp922785dcryghbb3wxqgdav7mafwnmxjqfx8zaj3v1q2j3z")))) (build-system r-build-system) (inputs `(("libxml2" ,libxml2) @@ -2080,14 +2080,14 @@ limited to R.") (define-public r-backports (package (name "r-backports") - (version "1.1.5") + (version "1.1.6") (source (origin (method url-fetch) (uri (cran-uri "backports" version)) (sha256 (base32 - "0k19w68b2aihyj5mflw3732gkkzs78sssqdns960pdw3yfnkiv33")))) + "170rphqq28j0pcr28g6dxv3isp436ajhyzkpri31pn0lfm3szs6h")))) (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") @@ -2401,13 +2401,13 @@ informative error messages when it's not available.") (define-public r-devtools (package (name "r-devtools") - (version "2.2.2") + (version "2.3.0") (source (origin (method url-fetch) (uri (cran-uri "devtools" version)) (sha256 (base32 - "1bhb2j8ilpdzwd0c678mcgfpdw88vncsjma79afcikxmzcsz9279")))) + "1l6w765q180bg5mmdq5k2ymf6apz7ldhnknzf6ynfp1kf70pbhsg")))) (build-system r-build-system) (propagated-inputs `(("r-callr" ,r-callr) @@ -2435,6 +2435,8 @@ informative error messages when it's not available.") ("r-testthat" ,r-testthat) ("r-usethis" ,r-usethis) ("r-withr" ,r-withr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/hadley/devtools") (synopsis "Tools to make developing R packages easier") (description "The devtools package is a collection of package development @@ -2573,21 +2575,15 @@ well as additional utilities such as panel and axis annotation functions.") (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.9.850.1.0") + (version "0.9.860.2.0") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "0q9clhmbwwph47hrhx5827m7njrcl2klihyqbkf0ihwlbqrjijwz")))) + "1rg9ak0zbv8d9cyj10jq52nrcbk1pvfz28kbkhpx79mpjhrl7pb5")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) - ;; All needed for vignettes - (native-inputs - `(("r-knitr" ,r-knitr) - ("r-rmarkdown" ,r-rmarkdown) - ("ghc-pandoc" ,ghc-pandoc) - ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc))) (propagated-inputs `(("r-rcpp" ,r-rcpp))) (home-page "https://github.com/RcppCore/RcppArmadillo") @@ -3769,13 +3765,13 @@ features present in other programming languages.") (define-public r-plotly (package (name "r-plotly") - (version "4.9.2") + (version "4.9.2.1") (source (origin (method url-fetch) (uri (cran-uri "plotly" version)) (sha256 (base32 - "19zw3qnhfgqdxlvma8xyikir46aiqhfcwxf072z9xgq0hknpblm5")))) + "1f0x83a2s7200iqi6gpngijks06fcvcbm6701d5r5rxpb8rawppl")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) @@ -4101,14 +4097,14 @@ existing packages provide.") (define-public r-sfsmisc (package (name "r-sfsmisc") - (version "1.1-5") + (version "1.1-6") (source (origin (method url-fetch) (uri (cran-uri "sfsmisc" version)) (sha256 (base32 - "173qgm2bn84x544fc3x9gc2rv995sbsvji9lnn2drx8drvzyy8lf")))) + "04fvjdab6vyyghyqy0abxvfbyr1myz6yib7ibwiyjw9yf7fjrcjp")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/sfsmisc") (synopsis "Utilities from \"Seminar fuer Statistik\" ETH Zurich") @@ -4695,17 +4691,18 @@ models, generalized linear models and model-based clustering.") (define-public r-mclust (package (name "r-mclust") - (version "5.4.5") + (version "5.4.6") (source (origin (method url-fetch) (uri (cran-uri "mclust" version)) (sha256 (base32 - "0whandnda1fnjn5k3hgxdbp3b0xr7nlzy1j37saqb536h8q9dwkm")))) + "1z46qask09x3xpv0wzvhn09218vwyrip4f5jrhnx96khpwvczzyl")))) (build-system r-build-system) (native-inputs - `(("gfortran" ,gfortran))) + `(("gfortran" ,gfortran) + ("r-knitr" ,r-knitr))) (home-page "https://www.stat.washington.edu/mclust/") (synopsis "Gaussian mixture modelling for model-based clustering etc.") (description @@ -5137,14 +5134,14 @@ algorithms.") (define-public r-lme4 (package (name "r-lme4") - (version "1.1-21") + (version "1.1-23") (source (origin (method url-fetch) (uri (cran-uri "lme4" version)) (sha256 (base32 - "035j2hqkwv939xl07pm2vykvf3wlx8qj317846n9pkpqkyv58mbz")))) + "0qh29kqli0l3naylgb6jha6jllx4nwryr3hv9yk37blgyyql5mcr")))) (build-system r-build-system) (propagated-inputs `(("r-boot" ,r-boot) @@ -5155,7 +5152,10 @@ algorithms.") ("r-nloptr" ,r-nloptr) ("r-nlme" ,r-nlme) ("r-rcpp" ,r-rcpp) - ("r-rcppeigen" ,r-rcppeigen))) + ("r-rcppeigen" ,r-rcppeigen) + ("r-statmod" ,r-statmod))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://cran.r-project.org/web/packages/lme4") (synopsis "Linear mixed-effects models using eigen and S4") (description @@ -5403,14 +5403,14 @@ genome-wide association studies can be analyzed efficiently.") (define-public r-cairo (package (name "r-cairo") - (version "1.5-11") + (version "1.5-12") (source (origin (method url-fetch) (uri (cran-uri "Cairo" version)) (sha256 (base32 - "1k9kpxcg5n4g6x2gydv344f4w0snqbhww14fnbbj1bny0mmv28xg")))) + "02v29am4fac3fyq6y1w6r89zwbqqkxjsxrafcwb5s124ikxyl22f")))) (properties `((upstream-name . "Cairo"))) (build-system r-build-system) (inputs @@ -5439,20 +5439,21 @@ is supported.") (define-public r-lubridate (package (name "r-lubridate") - (version "1.7.4") + (version "1.7.8") (source (origin (method url-fetch) (uri (cran-uri "lubridate" version)) (sha256 (base32 - "14a823il77w3wmmnzr89vwrqp50y56dh5raycnaw6c8nv5xsh32i")))) + "0g2m9dyhgds4shdrk76w7rqdl9msam4rii2qrhz12gipzhi9k89x")))) (build-system r-build-system) (propagated-inputs - `(("r-rcpp" ,r-rcpp) - ("r-stringr" ,r-stringr))) - (home-page - "https://cran.r-project.org/web/packages/lubridate") + `(("r-generics" ,r-generics) + ("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://cran.r-project.org/web/packages/lubridate/") (synopsis "Make dealing with dates a little easier") (description "This package provides functions to work with date-times and time-spans: diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 694f37cadd..b0cf2bd152 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -152,14 +152,14 @@ as well as the classic centralized workflow.") (define-public git (package (name "git") - (version "2.26.0") + (version "2.26.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "1mlmwibfgcv42c28fxmbd3iim8fc06r17dljd8vdgq550z5hvkly")))) + "0s03ix9j1h0yychkh1l1cgpr1l9lwzn3rprl08rk8ii5ix02i0l8")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -176,7 +176,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "09ilv5gg7167mwc0qqw2fz3lmdm360crnxc0xzkqn53wnsh4cziq")))) + "0j2031x3qchwjmiy2h849j4x1vd8y4rgqv2ak9dc87xbbpsbfg59")))) ;; For subtree documentation. ("asciidoc" ,asciidoc-py3) ("docbook-xsl" ,docbook-xsl) @@ -892,9 +892,9 @@ collaboration using typical untrusted file hosts or services.") (method url-fetch) ;; cgit is tightly bound to git. Use GIT_VER from the Makefile, ;; which may not match the current (package-version git). - (uri "mirror://kernel.org/software/scm/git/git-2.25.1.tar.xz") + (uri "mirror://kernel.org/software/scm/git/git-2.25.3.tar.xz") (sha256 - (base32 "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2")))) + (base32 "0yvr97cl0dvj3fwblq1mb0cp97v8hrn9l98p8b1jx8815mbsnz9h")))) ("openssl" ,openssl) ("groff" ,groff) ("python" ,python) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d726d85cc1..947598d289 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -602,7 +602,7 @@ available.") (define-public x265 (package (name "x265") - (version "3.2.1") + (version "3.3") (outputs '("out" "static")) (source (origin @@ -612,7 +612,7 @@ available.") (string-append "https://download.videolan.org/videolan/x265/" "x265_" version ".tar.gz"))) (sha256 - (base32 "1k5vijsy6cgcghw69f5275xfmbjjx7js0nlbgxbd6krnjb7sv6zv")) + (base32 "170b61cgpcs5n35qps0p40dqs1q81vkgagzbs4zv7pzls6718vpj")) (patches (search-patches "x265-arm-flags.patch")) (modules '((guix build utils))) (snippet '(begin @@ -1622,25 +1622,6 @@ To load this plugin, specify the following option when starting mpv: (license license:bsd-3) (home-page "https://www.webmproject.org/"))) -;; GNU IceCat fails to build against 1.8.0, so keep this version for now. -(define-public libvpx-1.7 - (package - (inherit libvpx) - (version "1.7.0") - (source (origin - (inherit (package-source libvpx)) - (uri (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit (string-append "v" version)))) - (file-name (git-file-name "libvpx" version)) - (sha256 - (base32 - "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6")) - (patches - (append - (origin-patches (package-source libvpx)) - (search-patches "libvpx-use-after-free-in-postproc.patch"))))))) - (define-public youtube-dl (package (name "youtube-dl") diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 5602a93143..2254d5adc1 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016, 2017, 2018. 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> @@ -133,6 +133,12 @@ `(;; Running tests in parallel can occasionally lead to failures, like: ;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead) #:parallel-tests? #f + + ;; FIXME: Disable tests on i686 to work around + ;; <https://bugs.gnu.org/40527>. + #:tests? ,(or (%current-target-system) + (not (string=? "i686-linux" (%current-system)))) + #:configure-flags (list "--enable-usb-redir" "--enable-opengl" "--enable-docs" (string-append "--smbd=" @@ -1177,7 +1183,7 @@ DOS or Microsoft Windows.") (define-public xen (package (name "xen") - (version "4.11.1") + (version "4.13.0") (source (origin (method git-fetch) (uri (git-reference @@ -1186,7 +1192,7 @@ DOS or Microsoft Windows.") (file-name (git-file-name name version)) (sha256 (base32 - "1wv1hyfii14vi9lfjmnv07h2gpm3b7kvh2p55f4yy2b40simksgk")))) + "0py50n995gv909i0d1lfdcj9wcp5g1d5z6m2291jqqlfyany138g")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -1300,14 +1306,13 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc")) new-search-path ":"))) (setenv env-name new-env-value))) environment-variable-names)) - (setenv "CROSS_C_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) - (setenv "CROSS_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_PATH")) + (setenv "CROSS_CPATH" (getenv "CPATH")) (setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH")) (filter-environment! cross? - '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH" + '("CROSS_CPATH" "CROSS_LIBRARY_PATH")) (filter-environment! (lambda (e) (not (cross? e))) - '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" + '("CPATH" "LIBRARY_PATH")) ;; Guix tries to be helpful and automatically adds ;; mini-os-git-checkout/include to the include path, @@ -1316,7 +1321,7 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc")) (not (string-contains e "mini-os-git-checkout"))) - '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" + '("CPATH" "LIBRARY_PATH")) (setenv "EFI_VENDOR" "guix") #t)) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 3c0cfa2b89..377fc0dfaf 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> @@ -121,14 +121,14 @@ engine that uses Wayland for graphics output.") (define-public webkitgtk (package (name "webkitgtk") - (version "2.28.0") + (version "2.28.1") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" "webkitgtk-" version ".tar.xz")) (sha256 (base32 - "12qfs9w93c5kiyi14ynm4rf4ad3c213dvzmdrc9c3ab2iwbks7rn")))) + "1n7k4yriqhr38f4fgy8pzdn1nm60m53z8p478sgg64swxnijdg5c")))) (build-system cmake-build-system) (outputs '("out" "doc")) (arguments diff --git a/gnu/services/linux.scm b/gnu/services/linux.scm index 781a61973c..12934c2084 100644 --- a/gnu/services/linux.scm +++ b/gnu/services/linux.scm @@ -142,7 +142,6 @@ representation." (documentation "Load kernel modules.") (provision '(kernel-module-loader)) (requirement '(file-systems)) - (respawn? #f) (one-shot? #t) (modules `((srfi srfi-1) (srfi srfi-34) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index bad089844d..9906ae43c4 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -291,6 +291,13 @@ and return the resulting '.go' file." (default-environment-variables '("PATH=/run/current-system/profile/bin")) + ;; Booting off a DVD, especially on a slow machine, can make + ;; everything slow. Thus, increase the timeout compared to the + ;; default 5s in the Shepherd 0.7.0. See + ;; <https://bugs.gnu.org/40572>. + ;; XXX: Use something better when the next Shepherd is out. + (set! (@@ (shepherd service) %pid-file-timeout) 30) + ;; Arrange to spawn a REPL if something goes wrong. This is better ;; than a kernel panic. (call-with-error-handling diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 0dc26b2871..8b3a5d5fc0 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix monads) + #:use-module (guix modules) #:use-module ((guix packages) #:select (package-version)) #:use-module ((guix store) #:select (%store-prefix)) #:use-module (gnu installer) @@ -50,6 +52,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages compression) #:use-module (gnu packages nvi) + #:use-module (gnu packages xorg) #:use-module (ice-9 match) #:use-module (srfi srfi-26) #:export (installation-os @@ -287,6 +290,38 @@ the user's target storage device rather than on the RAM disk." (persistent? #f) (max-database-size (* 5 (expt 2 20)))))) ;5 MiB + +;; These define a service to load the uvesafb kernel module with the +;; appropriate options. The GUI installer needs it when the machine does not +;; support Kernel Mode Setting. Otherwise kmscon is missing /dev/fb0. +(define (uvesafb-shepherd-service _) + (list (shepherd-service + (documentation "Load the uvesafb kernel module.") + (provision '(uvesafb)) + (requirement '(file-systems)) + (start #~(lambda () + ;; uvesafb is only supported on x86 and x86_64. + (or (not (and (string-suffix? "linux-gnu" %host-type) + (or (string-prefix? "x86_64" %host-type) + (string-prefix? "i686" %host-type)))) + (file-exists? "/dev/fb0") + (invoke #+(file-append kmod "/bin/modprobe") + "uvesafb" + (string-append "v86d=" #$v86d "/sbin/v86d") + "mode_option=1024x768")))) + (respawn? #f) + (one-shot? #t)))) + +(define uvesafb-service-type + (service-type + (name 'uvesafb) + (extensions + (list (service-extension shepherd-root-service-type + uvesafb-shepherd-service))) + (description + "Load the @code{uvesafb} kernel module with the right options.") + (default-value #t))) + (define %installation-services ;; List of services of the installation system. (let ((motd (plain-file "motd" " @@ -407,7 +442,13 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m (list bare-bones-os glibc-utf8-locales texinfo - guile-2.2))))) + guile-2.2)) + + ;; Machines without Kernel Mode Setting (those with many old and + ;; current AMD GPUs, SiS GPUs, ...) need uvesafb to show the GUI + ;; installer. Some may also need a kernel parameter like nomodeset + ;; or vga=793, but we leave that for the user to specify in GRUB. + (service uvesafb-service-type)))) (define %issue ;; Greeting. |