diff options
Diffstat (limited to 'gnu/packages')
69 files changed, 3885 insertions, 2808 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 0d484ca9f5..4dba607bd6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -66,6 +66,7 @@ ;;; Copyright © 2023 Tomás Ortín Fernández <tomasortin@mailbox.org> ;;; Copyright © 2024 dan <i@dan.games> ;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com> +;;; Copyright © 2024 Richard Sent <richard@freakingpenguin.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -392,14 +393,14 @@ interface and is based on GNU Guile.") (define-public shepherd-0.10 (package (inherit shepherd-0.9) - (version "0.10.4") + (version "0.10.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/shepherd/shepherd-" version ".tar.gz")) (sha256 (base32 - "0206r2l914qjahzd1qill57r1qcg1x8faj0f6qv3x42wqx6x28ky")))) + "0k40n9qm5r5rqf94isa1857ghd4329zc5rjf3ll2572gpiw3ij4x")))) (native-inputs (modify-inputs (package-native-inputs shepherd-0.9) (replace "guile-fibers" ;; Work around @@ -4261,6 +4262,37 @@ everyone's screenshots nowadays.") information tool.") (license license:expat)))) +(define-public fastfetch + (package + (name "fastfetch") + (version "2.16.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fastfetch-cli/fastfetch") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "112dvfx7gvp6n20i1lkd0jbh897jf7bxjxq96bj4099j3x313y3m")))) + (build-system cmake-build-system) + (inputs (list dbus + glib + imagemagick + libxcb + mesa + wayland + zlib)) ;for imagemagick and an #ifdef + (native-inputs (list pkg-config)) + (arguments (list #:tests? #f)) ; no test target + (home-page "https://github.com/fastfetch-cli/fastfetch") + (synopsis "Display system information in a stylized manner") + (description + "Fastfetch is a tool for fetching system information and displaying it in +a stylized way. Fastfetch displays this information next to a logo of the +system distribution, akin to many similar tools.") + (license license:expat))) + (define-public nnn (package (name "nnn") diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 954776f545..2ce0d66894 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -83,6 +83,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages sqlite) #:use-module (gnu packages sphinx) + #:use-module (gnu packages statistics) #:use-module (gnu packages textutils) #:use-module (gnu packages time) #:use-module (gnu packages tls) @@ -948,21 +949,21 @@ exitinction laws found in the literature.") (define-public python-fitsio (package (name "python-fitsio") - (version "1.2.1") + (version "1.2.4") (source (origin (method url-fetch) (uri (pypi-uri "fitsio" version)) (sha256 - (base32 "19him5rcpjyz14ghkmifnd1xl3ivlyy84h45k6j2pyr5ixc60ky6")) + (base32 "0y7n7wh73ha6439djrhwmqbvgpagrdgaasbrikvw2zb5qx3y6zym")) (modules '((guix build utils))) (snippet ;; Remove the bundled cfitsio. When update the package check the ;; current bundled version. #~(begin - (delete-file-recursively "cfitsio-4.2.0") + (delete-file-recursively "cfitsio-4.4.1-20240617") (substitute* "MANIFEST.in" - (("recursive-include cfitsio-4.2.0.*$\n") "")))))) + (("recursive-include cfitsio-4.4.0.*$\n") "")))))) (build-system pyproject-build-system) (arguments (list @@ -1044,13 +1045,13 @@ Python.") (define-public python-ginga (package (name "python-ginga") - (version "5.0.1") + (version "5.1.0") (source (origin (method url-fetch) (uri (pypi-uri "ginga" version)) (sha256 - (base32 "1zw93487a0ilkb5w5qjgrdnavxlmdmjp6c2wyc1wp8qahby9c0xa")))) + (base32 "0c6vpcz59x889z8ggq6r5ci9cf10m7r9h262r6chx31mzdr010wf")))) (build-system pyproject-build-system) (arguments (list @@ -1385,7 +1386,7 @@ crowded star fields.") (define-public siril (package (name "siril") - (version "1.2.1") + (version "1.2.3") (source (origin (method git-fetch) (uri (git-reference @@ -1393,7 +1394,7 @@ crowded star fields.") (commit version))) (sha256 (base32 - "1lc6ga1n18br43rlj8qmg23chfniyvjz3vx73km6sv171z4c2fwy")) + "0gkd8w2bpwq4ibl3vawx008yrm5k6zlj77lp98fflffcf7cj8hr5")) (file-name (git-file-name name version)))) (build-system meson-build-system) (native-inputs (list cmake git glib libconfig pkg-config)) @@ -1636,13 +1637,13 @@ objects.") (define-public python-astropy (package (name "python-astropy") - (version "6.1.0") + (version "6.1.1") (source (origin (method url-fetch) (uri (pypi-uri "astropy" version)) (sha256 - (base32 "03wm12bpfifvjbvf7rixv9yr5ya5c9gy9p0dff862mxi21gr2fvc")) + (base32 "0f31wgjg22phcx8fw7p612qp3v2ak7nziisnsnwaqc0wj5fz9ip5")) (modules '((guix build utils))) (snippet '(begin @@ -1782,13 +1783,13 @@ astronomy and astrophysics.") ;; In case of changing the source method git-fetch, consider to check the ;; tag as it's not following the PyPI version, see ;; <https://github.com/astropy/astropy-iers-data/issues/17>. - (version "0.2024.5.13.0.30.12") + (version "0.2024.6.17.0.31.35") (source (origin (method url-fetch) (uri (pypi-uri "astropy_iers_data" version)) (sha256 - (base32 "1vs3aqg0mb54bkci646h5pqbnfb50798ajim6xjg7nacpjhr8j3p")))) + (base32 "1sqp7g3akbv0d10jil5rkssldc5j57xqnl7wyg2dy5ayk2hdrq56")))) (build-system pyproject-build-system) (arguments (list @@ -2172,13 +2173,13 @@ monochromatic sequential colormaps like @code{blue}, @code{green}, and (define-public python-crds (package (name "python-crds") - (version "11.17.22") + (version "11.17.25") (source (origin (method url-fetch) (uri (pypi-uri "crds" version)) (sha256 - (base32 "1i2wh7cgyn7r0fnn7ikfsdqjrcpg46xsk619mhdqywk5yjcxlz9f")))) + (base32 "18j0mn11nfgnbx42h1hzhfmyzg9ww9bgmrjxss8ni98kdj35q9kv")))) (build-system pyproject-build-system) (arguments (list @@ -2274,7 +2275,7 @@ used with local NetDRMS sites.") (define-public python-drizzle (package (name "python-drizzle") - (version "1.15.1") + (version "1.15.2") (source (origin (method git-fetch) ;PyPi doesn't have the test data sets @@ -2283,7 +2284,7 @@ used with local NetDRMS sites.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "14l3d3bx73r7cxhcl1cfh1q088qh5wq5pz5fs9dx7w79kp8mp6pg")))) + (base32 "1fp6gcvp6nz4a2mmy9vjn5wwywldhkg8bjjgb4ldn0vpv9k4nv8q")))) (build-system pyproject-build-system) (arguments (list @@ -2316,13 +2317,13 @@ code to be greatly simplified.") (define-public python-dust-extinction (package (name "python-dust-extinction") - (version "1.4") + (version "1.4.1") (source (origin (method url-fetch) (uri (pypi-uri "dust_extinction" version)) (sha256 - (base32 "0yw2mdsbsmk0cs9wzsmmrnkhriyhj1gir6irjsfxd518fa8bik2k")))) + (base32 "00vyglyq2209y0mp0d5vipqrfjxp4qb8x8nx8ic2x4s19xq8ds88")))) (build-system pyproject-build-system) (propagated-inputs (list python-astropy python-scipy)) @@ -2407,21 +2408,59 @@ of dates.") the easy construction of interactive matplotlib widget based animations.") (license license:bsd-3))) +(define-public python-naima + (package + (name "python-naima") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "naima" version)) + (sha256 + (base32 "1lng2prl2kzzpgrkj11hl53cvqdh0gpk8cdqkvcg08k3bivzk8q8")))) + (build-system pyproject-build-system) + (propagated-inputs + (list python-astropy + python-corner + python-emcee + python-h5py + python-matplotlib + python-pyyaml + python-scipy)) + (native-inputs + (list python-pytest python-setuptools-scm)) + (home-page "http://github.com/zblz/naima") + (synopsis "Derivation of non-thermal particle distributions through MCMC spectral fitting") + (description + "This package implement functionality for computation of non-thermal +radiation from relativistic particle populations. It includes tools to +perform MCMC fitting of radiative models to X-ray, GeV, and TeV spectra using +@code{emcee}, an affine-invariant ensemble sampler for Markov Chain Monte +Carlo.") + (license license:bsd-3))) + (define-public python-ndcube (package (name "python-ndcube") - (version "2.2.0") + (version "2.2.2") (source (origin (method url-fetch) (uri (pypi-uri "ndcube" version)) (sha256 - (base32 "1b3vbnm438j5jb48vilp145lq137fbrg1l4845rc55mz2p025x34")))) + (base32 "0d82xldinvjw4csql4w3k44ibprbz0b0g5ixq9a5f6c7zbvfc24l")))) (build-system pyproject-build-system) (arguments (list + ;; Break cycle: python-ndcube -> python-specutils -> python-ndcube, see + ;; <https://github.com/sunpy/ndcube/issues/733>. + #:test-flags #~(list "-k" "not test_rebin_specutils") #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'break-cycle + (lambda _ + (substitute* "ndcube/tests/test_ndcube.py" + (("from specutils import Spectrum1D") "")))) (add-before 'check 'set-home-env (lambda _ ;; Tests require HOME to be set. @@ -2689,19 +2728,14 @@ interest, and which require portability between platforms or ease of scripting." (define-public python-pyvo (package (name "python-pyvo") - (version "1.5.1") + (version "1.5.2") (source (origin (method url-fetch) (uri (pypi-uri "pyvo" version)) (sha256 - (base32 "0cm6agaf1gvc5bi95wx6a70ngj9vn95rx78fs59vlrmpww7q2807")))) + (base32 "0wcg3jhfwjd9gqs74mw63sgi1yhmgljx1bwk3mxn0p6fv924r8mq")))) (build-system pyproject-build-system) - (arguments - (list - ;; Disable one failing test, see - ;; <https://github.com/astropy/pyvo/issues/547>. - #:test-flags #~(list "-k" "not test_single_table_description"))) (native-inputs (list python-pytest-astropy python-requests-mock python-setuptools-scm)) (propagated-inputs @@ -2766,6 +2800,54 @@ setup(ext_modules=get_extensions())"))))) (description "Regions is an Astropy package for region handling.") (license license:bsd-3))) +(define-public python-regularizepsf + (package + (name "python-regularizepsf") + (version "0.3.4") + (source + (origin + (method git-fetch) ; no tests data in the PyPI tarball + (uri (git-reference + (url "https://github.com/punch-mission/regularizepsf") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "078nklks6hjq0hgv6wpbh2x1m2yh6kmzyfgdzd9q82lxpjy1vq0i")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "setup.py" + ;; numpy==1.26.4 + (("==1.26.4") ">=1.23")))) + (add-before 'check 'build-extensions + (lambda _ + (invoke "python" "setup.py" "build_ext" "--inplace")))))) + (propagated-inputs + (list python-astropy + python-dill + python-h5py + python-lmfit + python-matplotlib + python-numpy + python-scikit-image + python-scipy + python-sep)) + (native-inputs + (list python-cython + python-pytest + python-pytest-mpl + python-pytest-runner)) + (home-page "https://github.com/punch-mission/regularizepsf") + (synopsis "Point spread function modeling and regularization") + (description + "This package inplements functionality of @acronym{Point Spread Function, +PSF} describing how the optical system spreads light from sources.") + (license license:expat))) + (define-public python-reproject (package (name "python-reproject") @@ -2871,13 +2953,13 @@ orbits described in TLE files.") (define-public python-sunpy (package (name "python-sunpy") - (version "5.1.3") + (version "5.1.4") (source (origin (method url-fetch) (uri (pypi-uri "sunpy" version)) (sha256 - (base32 "0bqpbdgd3blpa4y5f45j5cqn0xdnmqvqnqr1vmqwn5ddlx88z5lh")))) + (base32 "0c41h0ml8wh1jfjpny824jpjnaw6rrm6vklvjk2h1sw2iza71syb")))) (build-system pyproject-build-system) (arguments (list @@ -3174,7 +3256,7 @@ see @url{https://github.com/astropy/astropy-APEs/blob/main/APE13.rst, APE13}.") (define-public python-spherical-geometry (package (name "python-spherical-geometry") - (version "1.3.1") + (version "1.3.2") (source (origin (method git-fetch) @@ -3183,7 +3265,7 @@ see @url{https://github.com/astropy/astropy-APEs/blob/main/APE13.rst, APE13}.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "172f81h42jq6mv3gpx497z2nkhkx11w4pzmcqljcicri2zqj1m6g")))) + (base32 "0znzfy3bmnsncvahf8qdav0c9403fn99d1gp25lainhv7kxfk44c")))) (build-system pyproject-build-system) (arguments (list @@ -3222,16 +3304,43 @@ spherical polygons that represent arbitrary regions of the sky.") ;; QD_LIBRARY_LICENSE.rst for bandeled QD source (license license:bsd-3))) +(define-public python-statmorph + (package + (name "python-statmorph") + (version "0.5.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "statmorph" version)) + (sha256 + (base32 "06rbwrqlvdzn9innx05kjjmm4mmacd8kwwsfdf5idbwzby5ny5lw")))) + (build-system pyproject-build-system) + (propagated-inputs + (list python-astropy + python-numpy + python-photutils + python-scikit-image + python-scipy)) + (native-inputs + (list python-pytest)) + (home-page "https://github.com/vrodgom/statmorph") + (synopsis "Non-parametric morphological diagnostics of galaxy images") + (description + "The package @code{statmorph} implements functionality of calculating +non-parametric morphological diagnostics of galaxy images (e.g., Gini-M_{20} +and CAS statistics), as well as fitting 2D Sérsic profiles.") + (license license:bsd-3))) + (define-public python-stsci-image (package (name "python-stsci-image") - (version "2.3.7") + (version "2.3.9") (source (origin (method url-fetch) (uri (pypi-uri "stsci_image" version)) (sha256 - (base32 "13sbych5929isrick2035rk31qcb1icm2l6pz7pjqsi45hsffxxm")))) + (base32 "0w7s93jsz61ccbhj7irl28q4jgiwa7y9k8pfj24q8vc9zvs530pj")))) (build-system pyproject-build-system) (arguments (list @@ -3253,7 +3362,7 @@ Telescope Science Institute} image array manipulation functions.") (define-public python-stsci-imagestats (package (name "python-stsci-imagestats") - (version "1.8.2") + (version "1.8.3") (source (origin (method url-fetch) (uri (pypi-uri "stsci.imagestats" version)) @@ -3286,16 +3395,17 @@ task}.") (name "python-stsci-stimage") ;; PyPI version was 0.2.8 but the latest version tag on GiHub was 0.2.7, ;; see <https://github.com/spacetelescope/stsci.stimage/issues/38> - (version "0.2.8") + (version "0.2.9") (source (origin (method url-fetch) (uri (pypi-uri "stsci_stimage" version)) (sha256 (base32 - "0p188my6djy65a8j6qsc3v0dpr2svqqv90n0pxxzy52vdjiz3w0w")))) + "18sqmjiyn76hzkmv3g8549vfygi136gnar6pb0s7wb44j7cvc0in")))) (build-system pyproject-build-system) (arguments (list + #:build-backend "setuptools.build_meta" #:test-flags #~(list "test_c") #:phases #~(modify-phases %standard-phases @@ -3310,7 +3420,10 @@ task}.") (propagated-inputs (list python-numpy)) (native-inputs - (list python-pytest python-setuptools-scm python-waf)) + (list python-pytest + python-wheel + python-setuptools-scm + python-waf)) (home-page "https://stscistimage.readthedocs.io/en/latest/") (synopsis "STScI image processing") (description @@ -3321,13 +3434,13 @@ processing functions: @code{xyxymatch}, @code{geomap}.") (define-public python-stcal (package (name "python-stcal") - (version "1.7.0") + (version "1.7.1") (source (origin (method url-fetch) (uri (pypi-uri "stcal" version)) (sha256 - (base32 "04ippj90dn2671xg4rvncf7jsbpcflr7dr6jc2h52z7xfd1msb4d")))) + (base32 "003ygbfa25awvy2zjfxd1k4f1aklsvd53sdk7qa0w42v6ys2kabs")))) (build-system pyproject-build-system) (arguments (list @@ -3410,13 +3523,22 @@ implemented in the @acronym{JWST, James Webb Space Telescope} and (define-public python-stpipe (package (name "python-stpipe") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (pypi-uri "stpipe" version)) (sha256 (base32 - "11ccb3v2s20lf851061s4nanljwm9s9xzkcfgb3qhv0hjwziq0vr")))) + "0r29m143ll1j9irixazrkqggzg9xbkcw7fl9xmi69zpxbh5mjgz0")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Replace reference to external configobj. + (substitute* (find-files "." "\\.py$") + (("from astropy.extern import configobj") "import configobj") + (("from astropy.extern.configobj import validate") "import validate") + (("from astropy.extern.configobj.configobj import ") "from configobj import ") + (("from astropy.extern.configobj.validate import ") "from validate import ")))))) (arguments (list ;; See https://github.com/spacetelescope/stpipe/issues/114 @@ -3916,7 +4038,7 @@ floating-point (no compression, LZW- or ZIP-compressed), FITS 8-bit, 16-bit, (define-public indi-2.0 (package (name "indi") - (version "2.0.7") + (version "2.0.8") (source (origin (method git-fetch) @@ -3925,7 +4047,7 @@ floating-point (no compression, LZW- or ZIP-compressed), FITS 8-bit, 16-bit, (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0w3494by88g0sz92adgvy75g7f1609ilsblink9z37n02v83dfxi")))) + (base32 "1rsy6ihwl3fnv502pmycx0xry9qn1qfz13kwdifcf2075wqd1lx9")))) (build-system cmake-build-system) (arguments ;; TODO: fix failing tests on aarch64-system. @@ -4032,7 +4154,16 @@ milliarcsecond).") (uri (pypi-uri "jwst" version)) (sha256 (base32 - "0knl2x0z3djsln8mi3a4bkxjz49iwmnr1v6wwsk13zvpkfq21vv4")))) + "0knl2x0z3djsln8mi3a4bkxjz49iwmnr1v6wwsk13zvpkfq21vv4")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Replace reference to external configobj. + (substitute* (find-files "." "\\.py$") + (("from astropy.extern import configobj") "import configobj") + (("from astropy.extern.configobj import validate") "import validate") + (("from astropy.extern.configobj.configobj import ") "from configobj import ") + (("from astropy.extern.configobj.validate import ") "from validate import ")))))) (build-system pyproject-build-system) (arguments (list @@ -4094,16 +4225,57 @@ science corrections sequentially, producing both fully-calibrated individual exposures and high-level data products (mosaics, extracted spectra, etc.).") (license license:bsd-3))) +(define-public python-jwst-reffiles + (package + (name "python-jwst-reffiles") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jwst_reffiles" version)) + (sha256 + (base32 "1dlw955cw49qczdmimglmlcbal8vd3wbv5j48ckllvjgd59pwr3s")))) + (build-system pyproject-build-system) + (arguments + (list + ;; FIXME: Invistigate why it failes on python-jwst side where the + ;; python-tweakwcs is built just fine: + ;; + ;; <...>/tweakwcs/matchutils.py:18: in <module> + ;; from stsci.stimage import xyxymatch + ;; E ModuleNotFoundError: No module named 'stsci.stimage' + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (delete 'sanity-check)))) + (propagated-inputs + (list python-astropy + python-jwst + python-matplotlib + python-numpy + python-scipy)) + (native-inputs + (list python-pytest + python-stsci-stimage)) + (home-page "https://github.com/spacetelescope/jwst_reffiles") + (synopsis "Tool for JWST's CRDS-formatted reference files creation") + (description + "This package provides a tool to create @acronym{Calibration References +Data System,CRDS}-formatted reference files for @acronym{James Webb Space +Telescope,JWST} from a set of input dark current files and a set of flat field +files.") + (license license:bsd-3))) + (define-public python-pyerfa (package (name "python-pyerfa") - (version "2.0.1.1") + (version "2.0.1.4") (source (origin (method url-fetch) (uri (pypi-uri "pyerfa" version)) (sha256 - (base32 "0swsdkipnk73iflsa7qbaw89wahbnfyvplqaxwi0yfrxippp9b6v")) + (base32 "1lwx4hril705r2iz4pirgn0wrpv1wk20mr669g03bsij69qsdf5c")) (modules '((guix build utils))) (snippet #~(begin @@ -4902,7 +5074,7 @@ pipelines.") (define-public python-skyfield (package (name "python-skyfield") - (version "1.48") + (version "1.49") (source (origin (method git-fetch) ; PyPI tarball lacks test data @@ -4911,7 +5083,7 @@ pipelines.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0l324r4pz7d5w72c7c5akvjx40287hl7sl0qv7swvn2da53vmq0r")))) + (base32 "1rk71lzy8w28f2kzhxb3pyndncrj91jay43nvqlrlzjxi2rbg7ix")))) (build-system pyproject-build-system) (arguments (list @@ -5106,6 +5278,50 @@ using (multivariate) polynomials.") ;; yt/frontends/artio/artio_headers/LICENSE: for C code. license:lgpl3)))) +(define-public python-yt-astro-analysis + (package + (name "python-yt-astro-analysis") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "yt_astro_analysis" version)) + (sha256 + (base32 "1fb3sdp6hq2c4c28pd33v9yj14x9l7qizf3y3qpl594qdq1ffmpi")))) + (build-system pyproject-build-system) + (arguments + (list + ;; Disable test which require MPI setup and failed to run, check why. + #:test-flags #~(list "--ignore=test_halo_finders_ts.py") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'build-extensions + (lambda _ + (invoke "python" "setup.py" "build_ext" "--inplace")))))) + (propagated-inputs + (list python-h5py + python-numpy + python-packaging + python-yt)) + (native-inputs + (list python-cython + python-nose + python-tomli)) + (home-page "https://github.com/yt-project/yt_astro_analysis") + (synopsis "YT astrophysical analysis modules") + (description + "This package provides an @code{yt} extension package for astrophysical +analysis. This package contains functionality for: + +@itemize +@item halo finding and analysis +@item lightcones +@item planning cosmological simulations for making lightcones and lightrays +@item exporting to the RADMC-3D radiation transport code +@item creating PPV FITS cubes +@end itemize") + (license (list license:bsd-3 license:lgpl3)))) + (define-public qfits (package (name "qfits") diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index ebc1af7b75..b728220e1f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -46,6 +46,7 @@ ;;; Copyright © 2023 Gabriel Wicki <gabriel@erlikon.ch> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Parnikkapore <poomklao@yahoo.com> +;;; Copyright © 2024 hapster <o.rojon@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -4220,7 +4221,7 @@ Tracker 3 S3M and Impulse Tracker IT files.") (define-public soundtouch (package (name "soundtouch") - (version "2.2") + (version "2.3.1") (source (origin (method git-fetch) @@ -4229,7 +4230,7 @@ Tracker 3 S3M and Impulse Tracker IT files.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "12i6yg8vvqwyk412lxl2krbfby6hnxld8qxy0k4m5xp4g94jiq4p")))) + (base32 "10znckb8mrnmvwj7vq12732al873qhqw27fpb5f8r0bkjdpcj3vr")))) (build-system gnu-build-system) (native-inputs (list autoconf automake libtool file)) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index cdda029809..063017a8aa 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2021 Hong Li <hli@mdc-berlin.de> ;;; Copyright © 2021, 2022, 2023 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> -;;; Copyright © 2022, 2023 Navid Afkhami <navid.afkhami@mdc-berlin.de> +;;; Copyright © 2022, 2023, 2024 Navid Afkhami <navid.afkhami@mdc-berlin.de> ;;; Copyright © 2022 Antero Mejr <antero@mailbox.org> ;;; Copyright © 2024 Alexis Simon <alexis.simon@runbox.com> ;;; @@ -752,6 +752,54 @@ directly access various slots (e.g. X, obs, var), or convert the data into @code{SingleCellExperiment} and Seurat objects.") (license license:expat)))) +(define-public r-anpan + (let ((commit "286b88dcf5e9e963a595482139aade154ee1dc86") + (revision "1")) + (package + (name "r-anpan") + (version (git-version "0.3.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/biobakery/anpan") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "10nw5v69gn4pxb4g5gd8nh9r1ywd6yczapl3dpdfms0434wcmkxm")))) + (properties `((upstream-name . "anpan"))) + (build-system r-build-system) + (propagated-inputs (list r-ape + r-cmdstanr + r-data-table + r-dplyr + r-fastglm + r-furrr + r-future + r-ggdendro + r-ggnewscale + r-ggplot2 + r-loo + r-mass + r-patchwork + r-phylogram + r-posterior + r-progressr + r-purrr + r-r-utils + r-stringr + r-tibble + r-tidyselect)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/biobakery/anpan") + (synopsis "Quantifying microbial strain-host associations") + (description + "The goal of anpan is to consolidate statistical methods for strain +analysis. This includes automated filtering of metagenomic functional +profiles, testing genetic elements for association with outcomes, phylogenetic +association testing, and pathway-level random effects models.") + (license license:expat)))) + (define-public r-bedtorch (let ((commit "f5ff4f83b94f59eac660333c64e4b2f296b35cea") (revision "1")) @@ -4443,6 +4491,102 @@ It is designed to provide functionality to load, process, and store multimodal omics data.") (license license:bsd-3))) +(define-public python-mofapy2 + (package + (name "python-mofapy2") + (version "0.7.1") + (source + (origin + ;; The tarball from PyPi doesn't include tests. + (method git-fetch) + (uri (git-reference + (url "https://github.com/bioFAM/mofapy2") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ahhnqk6gjrhyq286mrd5n7mxcv8l6040ffsawbjx9maqx8wbam0")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + ;; cupy is an optional dependency, which + ;; itself has nonfree dependencies (CUDA) + '(list "--ignore=mofapy2/notebooks/test_cupy.py"))) + (propagated-inputs (list python-anndata + python-h5py + python-numpy + python-pandas + python-scikit-learn + python-scipy)) + (native-inputs (list python-poetry-core + python-pytest)) + (home-page "https://biofam.github.io/MOFA2/") + (synopsis "Multi-omics factor analysis") + (description "MOFA is a factor analysis model that provides a general +framework for the integration of multi-omic data sets in an unsupervised +fashion. Intuitively, MOFA can be viewed as a versatile and statistically +rigorous generalization of principal component analysis to multi-omics data. +Given several data matrices with measurements of multiple -omics data types on +the same or on overlapping sets of samples, MOFA infers an interpretable +low-dimensional representation in terms of a few latent factors. These learnt +factors represent the driving sources of variation across data modalities, +thus facilitating the identification of cellular states or disease +subgroups.") + (license license:lgpl3))) + +(define-public python-muon + (package + (name "python-muon") + (version "0.1.6") + (source + (origin + ;; The tarball from PyPi doesn't include tests. + (method git-fetch) + (uri (git-reference + (url "https://github.com/scverse/muon") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1kd3flgy41dc0sc71wfnirh8vk1psxgyjxkbx1zx9yskkh6anbgw")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + ;; Even providing a random seed, scipy.sparse.rand produces inconsistent + ;; results across scipy versions. + '(list "-k" "not test_tfidf") + #:phases + '(modify-phases %standard-phases + ;; Numba needs a writable dir to cache functions. + (add-before 'build 'set-numba-cache-dir + (lambda _ + (setenv "NUMBA_CACHE_DIR" "/tmp")))))) + (propagated-inputs (list python-anndata + python-h5py + python-matplotlib + python-mofapy2 + python-mudata + python-numba + python-numpy + python-pandas + python-protobuf + python-pybedtools + python-pysam + python-scanpy + python-scikit-learn + python-seaborn + python-tqdm + python-umap-learn)) + (native-inputs (list python-flit-core + python-pytest + python-pytest-flake8)) + (home-page "https://github.com/scverse/muon") + (synopsis "Multimodal omics analysis framework") + (description "muon is a multimodal omics Python framework.") + (license license:bsd-3))) + (define-public python-pyega3 (deprecated-package "python-pyega3" python-ega-download-client)) @@ -8391,7 +8535,7 @@ translated into a human-readable text format using the @code{jellyfish dump} command, or queried for specific k-mers with @code{jellyfish query}.") (home-page "http://www.genome.umd.edu/jellyfish.html") ;; JELLYFISH seems to be 64-bit only. - (supported-systems '("x86_64-linux" "aarch64-linux" "mips64el-linux")) + (supported-systems %64bit-supported-systems) ;; One of these licenses may be picked (license (list license:gpl3+ license:bsd-3)))) @@ -11534,6 +11678,41 @@ tasks.") Pore-C concatemers.") (license license:gpl3)))) +(define-public r-cmdstanr + (let ((commit "a45d4f7d686aa6b57ce25f342a71eea79507f01c") + (revision "1")) + (package + (name "r-cmdstanr") + (version (git-version "0.8.1.9000" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stan-dev/cmdstanr") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "01vyh3sy704rs7yvaka2hp6vld0mdl7hbrs20dpbwidgm4ksrvsi")))) + (properties `((upstream-name . "cmdstanr"))) + (build-system r-build-system) + (propagated-inputs (list r-checkmate + r-data-table + r-jsonlite + r-posterior + r-processx + r-r6 + r-rlang + r-withr)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/stan-dev/cmdstanr") + (synopsis "R interface to 'CmdStan'") + (description + "This package provides a lightweight interface to Stan +<https://mc-stan.org>. The @code{CmdStanR} interface is an alternative +to RStan that calls the command line interface for compilation and +running algorithms instead of interfacing with C++ via Rcpp'.") + (license license:bsd-3)))) + (define-public r-dnamcrosshyb ;; There aren't any releases. (let ((commit "fe8acb33667e81f00dcb84e0fa75c87ab2db5d8f") @@ -13915,6 +14094,50 @@ for analyzing gene-level association tests in meta-analyses for binary trait.") (license license:gpl3))) +(define-public r-rnacrosslinkoo + (let ((commit "a317e0fa6ddf34c309529d57390769e2b2b5bfb7") + (revision "1")) + (package + (name "r-rnacrosslinkoo") + (version (git-version "0.1.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cran/rnaCrosslinkOO") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0csv9924z0ish960k034qzv3gxh1yabnxni8hsrn5j6xl1r3cdpl")))) + (properties `((upstream-name . "rnaCrosslinkOO"))) + (build-system r-build-system) + (propagated-inputs (list r-classdiscovery + r-doparallel + r-foreach + r-genomicranges + r-ggplot2 + r-ggrepel + r-heatmap3 + r-igraph + r-iranges + r-mass + r-mixtools + r-patchwork + r-r4rna + r-rcolorbrewer + r-reshape2 + r-rrna + r-s4vectors + r-seqinr + r-tidyverse + r-topdom)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/cran/rnaCrosslinkOO") + (synopsis "Analysis of RNA crosslinking data") + (description + "The package is ideal for analyzing RNA structure and chemical probing data.") + (license license:gpl3)))) + (define-public r-rnaseqdtu (let ((commit "5bee1e769d2e1dc6a3f1cecb78078050eeb5b9ac") (revision "1")) @@ -14133,6 +14356,58 @@ an important subset of samtools functionality, including view, index, sort, markdup, and depth.") (license license:gpl2+))) +(define-public r-rphyloxml + (let ((commit "a30e39249239b2de01d6964ae2a2205a6c48b475") + (revision "1")) + (package + (name "r-rphyloxml") + (version (git-version "0.0-9000" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/USCbiostats/rphyloxml") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15ijzqvjxx6vqyqlg5asdbqlhw1g0ix6palf1rism3si0qapddgw")) + (snippet + '(delete-file "docs/jquery.sticky-kit.min.js")))) + (properties `((upstream-name . "rphyloxml"))) + (build-system r-build-system) + (arguments + (list + #:modules + '((guix build r-build-system) + (guix build minify-build-system) + (guix build utils)) + #:imported-modules + `(,@%r-build-system-modules (guix build minify-build-system)) + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'process-javascript + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "inst/" + (minify (assoc-ref inputs "js-jquery-sticky-kit") + #:target "docs/jquery.sticky-kit.min.js"))))))) + (propagated-inputs (list r-ape r-xml2)) + (native-inputs + `(("esbuild" ,esbuild) + ("js-jquery-sticky-kit" + ,(origin + (method url-fetch) + (uri "https://raw.githubusercontent.com/leafo/sticky-kit/\ +v1.1.2/jquery.sticky-kit.js") + (sha256 + (base32 + "17c3a1hqc3ybwj7hpw8prazajp2x98aq7nyfn71h6lzjvblq297g")))))) + (home-page "https://github.com/USCbiostats/rphyloxml") + (synopsis "Read and write phyloXML files in R") + (description + "The package reads phylogenetic data in the @code{phyloXML} format. +It also includes functions for writing data in this format.") + (license license:expat)))) + (define-public ritornello (package (name "ritornello") diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 503c7d4a19..cc973837a3 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -153,7 +153,7 @@ (when mdadm (substitute* "grub-core/osdep/linux/getroot.c" (("argv\\[0\\] = \"mdadm\"") - (string-append "argv[0] = \"" mdadm "/sbin/mdadm\""))))) + (string-append "argv[0] = \"" mdadm "\""))))) ;; Make the font visible. (copy-file #+unifont "unifont.bdf.gz") diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index bbd9cf3181..550a5d0f1d 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1063,8 +1063,8 @@ but it works for any C/C++ project.") go-github-com-mattn-go-colorable go-github-com-mattn-go-runewidth go-github-com-robfig-cron - go-golang.org-x-sync-errgroup - go-golang.org-x-sync-semaphore + go-golang-org-x-sync + go-golang-org-x-sync go-gopkg-in-yaml-v3)) (native-inputs (list go-github-com-google-go-cmp-cmp)) (home-page "https://rhysd.github.io/actionlint/") diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index de27f50e0c..818a80b94e 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,6 +20,7 @@ (define-module (gnu packages configuration-management) #:use-module (gnu packages) #:use-module (guix build-system go) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) @@ -45,41 +47,42 @@ "0ildvlq7v8vnw74y4fgnv3hpq49bpl6zh1wmakfh46crwg7ffmjb")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/twpayne/chezmoi" - #:install-source? #f - #:phases - (modify-phases %standard-phases - ;; Remove test script which expect additional user's programs available - ;; in the PATH. The testdata directory is removed in the latest version - ;; (2.46.1) of the program. - (add-after 'unpack 'remove-failing-test-scripts - (lambda* (#:key import-path #:allow-other-keys) - (for-each (lambda (f) - (delete-file (string-append "src/" import-path "/testdata/scripts/" f))) - '("bitwarden.txt" - "cd.txt" - "cd_unix.txt" - "completion.txt" - "diff.txt" - "edit.txt" - "editconfig.txt" - "git.txt" - "gopass.txt" - "keepassxc.txt" - "lastpass.txt" - "onepassword.txt" - "pass.txt" - "runscriptdir_unix.txt" - "script_unix.txt" - "secretgeneric.txt" - "secretgopass.txt" - "secretkeepassxc.txt" - "secretlastpass.txt" - "secretonepassword.txt" - "secretpass.txt"))))))) + (list + #:go go-1.21 + #:import-path "github.com/twpayne/chezmoi" + #:install-source? #f + #:phases + #~(modify-phases %standard-phases + ;; Remove test script which expect additional user's programs available + ;; in the PATH. The testdata directory is removed in the latest version + ;; (2.46.1) of the program. + (add-after 'unpack 'remove-failing-test-scripts + (lambda* (#:key import-path #:allow-other-keys) + (for-each (lambda (f) + (delete-file (string-append "src/" import-path "/testdata/scripts/" f))) + '("bitwarden.txt" + "cd.txt" + "cd_unix.txt" + "completion.txt" + "diff.txt" + "edit.txt" + "editconfig.txt" + "git.txt" + "gopass.txt" + "keepassxc.txt" + "lastpass.txt" + "onepassword.txt" + "pass.txt" + "runscriptdir_unix.txt" + "script_unix.txt" + "secretgeneric.txt" + "secretgopass.txt" + "secretkeepassxc.txt" + "secretlastpass.txt" + "secretonepassword.txt" + "secretpass.txt"))))))) (native-inputs - (list go-etcd-io-bbolt - go-github-com-alecthomas-chroma + (list go-github-com-alecthomas-chroma go-github-com-aymerick-douceur go-github-com-bmatcuk-doublestar-v2 go-github-com-charmbracelet-glamour @@ -92,19 +95,12 @@ go-github-com-google-go-querystring go-github-com-google-goterm go-github-com-google-renameio - go-github-com-google-uuid go-github-com-gorilla-css - go-github-com-huandu-xstrings - go-github-com-imdario-mergo go-github-com-lucasb-eyer-go-colorful - go-github-com-masterminds-goutils - go-github-com-masterminds-semver - go-github-com-masterminds-sprig + go-github-com-masterminds-sprig-v3 go-github-com-mattn-go-isatty go-github-com-mattn-go-runewidth go-github-com-microcosm-cc-bluemonday - go-github-com-mitchellh-copystructure - go-github-com-mitchellh-reflectwalk go-github-com-muesli-reflow-ansi go-github-com-muesli-reflow-indent go-github-com-muesli-reflow-padding @@ -124,7 +120,7 @@ go-github-com-yuin-goldmark go-github-com-zalando-go-keyring go-github-go-git - go-golang-org-x-crypto + go-go-etcd-io-bbolt go-golang-org-x-net go-golang-org-x-oauth2 go-golang-org-x-term diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 85e0fa98f9..274432d194 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -704,6 +704,40 @@ to other implementations such a @code{purrr::partial()} the operators in etc.") (license license:gpl2+))) +(define-public r-cutpointr + (package + (name "r-cutpointr") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "cutpointr" version)) + (sha256 + (base32 "1qxnh20hs3bh9v04ls7gwwl7lfc6bwl8c88dn8lkcdqyp3nyr01j")))) + (properties `((upstream-name . "cutpointr"))) + (build-system r-build-system) + (propagated-inputs (list r-dplyr + r-foreach + r-ggplot2 + r-gridextra + r-purrr + r-rcpp + r-rlang + r-tibble + r-tidyr + r-tidyselect)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/thie1e/cutpointr") + (synopsis "Determine optimal cutpoints for binary classification") + (description + "This package estimates optimal cutpoints for binary classification metrics. +It also validates performance using bootstrapping. Some methods for more +robust cutpoint estimation are supported, e.g. a parametric method assuming +normal distributions, bootstrapped cutpoints, and smoothing of the metric +values per cutpoint using Generalized Additive Models. Various plotting +functions are included.") + (license license:gpl3))) + (define-public r-datawizard (package (name "r-datawizard") @@ -1749,6 +1783,23 @@ Functions include searching for people, searching by DOI, or searching by Orcid ID.") (license license:expat))) +(define-public r-rrna + (package + (name "r-rrna") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "RRNA" version)) + (sha256 + (base32 "0bgsakpz1wr3wr6c5xa7wx2xmzs3xzkscrgwn6dc7f93kpq1j17p")))) + (properties `((upstream-name . "RRNA"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/package=RRNA") + (synopsis "Secondary structure plotting for RNA") + (description "This package facilitates RNA secondary structure plotting.") + (license license:gpl3))) + (define-public r-ruv (package (name "r-ruv") @@ -5239,6 +5290,30 @@ are used. Fastmap avoids this memory leak issue by implementing the map using data structures in C++.") (license license:expat))) +(define-public r-fastglm + (package + (name "r-fastglm") + (version "0.0.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "fastglm" version)) + (sha256 + (base32 "0283kgk81cxbii7ljmp1rzqg5mzkvf7cj7lflhhhkgj5ljqina2i")))) + (properties `((upstream-name . "fastglm"))) + (build-system r-build-system) + (propagated-inputs (list r-bh r-bigmemory r-rcpp r-rcppeigen)) + (native-inputs (list r-knitr)) + (home-page "https://cran.r-project.org/package=fastglm") + (synopsis + "Fast and stable fitting of generalized linear models using 'RcppEigen'") + (description + "This package fits generalized linear models efficiently using @code{RcppEigen}'. +The iteratively reweighted least squares implementation utilizes the +step-halving approach of Marschner to help safeguard against convergence +issues.") + (license license:gpl2+))) + (define-public r-fastghquad (package (name "r-fastghquad") @@ -31108,6 +31183,30 @@ and multivariate regression), and analysis of variance tolerance intervals. Visualizations are also available for most of these settings.") (license license:gpl2+))) +(define-public r-topdom + (package + (name "r-topdom") + (version "0.10.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "TopDom" version)) + (sha256 + (base32 "1rryfnwvdlpdrjgs6sciy91cxfp4jykll0swclasydjvj4n642i6")))) + (properties `((upstream-name . "TopDom"))) + (build-system r-build-system) + (propagated-inputs (list r-ggplot2 r-matrixstats r-reshape2 r-tibble)) + (home-page "https://github.com/HenrikBengtsson/TopDom") + (synopsis "Efficient method for identifying genomic topological domains") + (description + "This method identifies topological domains in genomes from Hi-C sequence +data. The authors published an implementation of their method as an R script. +This package originates from those original @code{TopDom} R scripts and +provides help pages adopted from the original @code{TopDom} PDF documentation. +It also provides a small number of bug fixes to the original code.") + ;; Either version of the GPL + (license (list license:gpl2 license:gpl3)))) + ;; Keep this in sync with the liblantern package. (define-public r-torch (package diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 624371ccf4..628bdf5689 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2845,7 +2845,7 @@ more efficient access and storage of column subsets) and log-structured merge trees (LSM), for sustained throughput under random insert workloads.") (license license:gpl3) ; or GPL-2 ;; configure.ac: WiredTiger requires a 64-bit build. - (supported-systems '("x86_64-linux" "mips64el-linux" "aarch64-linux")))) + (supported-systems (delete "riscv64-linux" %64bit-supported-systems)))) (define-public wiredtiger-3 (package @@ -3032,34 +3032,6 @@ on another machine, accessed via TCP/IP.") (home-page "https://pqxx.org/") (license license:bsd-3))) -(define-public go-go-etcd-io-bbolt - (package - (name "go-go-etcd-io-bbolt") - (version "1.3.6") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/etcd-io/bbolt") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0pj5245d417za41j6p09fmkbv05797vykr1bi9a6rnwddh1dbs8d")))) - (build-system go-build-system) - (arguments - `(#:import-path "go.etcd.io/bbolt" - ;; Extending the test timeout to 30 minutes still times out on aarch64. - #:tests? ,(not target-arm?))) - (propagated-inputs - (list go-golang-org-x-sys)) - (home-page "https://go.etcd.io/bbolt") - (synopsis "Embedded key/value database for Go") - (description "Bolt is a pure Go key/value store inspired by Howard Chu's -LMDB project. The goal of the project is to provide a simple, fast, and -reliable database for projects that don't require a full database server such as -Postgres or MySQL.") - (license license:expat))) - (define-public python-peewee (package (name "python-peewee") @@ -3583,7 +3555,7 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.") relational, graph, and document data management with web application server and web services platform functionality.") ;; configure: error: ... can only be build on 64bit platforms - (supported-systems '("x86_64-linux" "mips64el-linux" "aarch64-linux")) + (supported-systems %64bit-supported-systems) (license license:gpl2))) (define-public python-ccm diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 4060819a35..4404c8368d 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -64,9 +64,16 @@ (sha256 (base32 "1ha6c5j3pizbsfzw37r52lvdz8z5lblq4iwa99mpkdzz92aiqp2y")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - '(#:phases + '(#:test-flags + (list + ;; By default tests run in parallel, which may cause various race + ;; conditions. Run sequentially for consistent results. + "--parallel=1" + ;; The test suite fails as soon as a single test fails. + "--failfast") + #:phases (modify-phases %standard-phases (add-before 'check 'pre-check (lambda* (#:key inputs #:allow-other-keys) @@ -82,19 +89,15 @@ ;; harmless, so just ignore this test. (substitute* "tests/settings_tests/tests.py" ((".*def test_incorrect_timezone.*" all) - (string-append " @unittest.skipIf(True, 'Disabled by Guix')\n" + (string-append " @unittest.skip('Disabled by Guix')\n" all))))) (replace 'check - (lambda* (#:key tests? #:allow-other-keys) + (lambda* (#:key tests? test-flags #:allow-other-keys) (if tests? (with-directory-excursion "tests" ;; Tests expect PYTHONPATH to contain the root directory. (setenv "PYTHONPATH" "..") - (invoke "python" "runtests.py" - ;; By default tests run in parallel, which may cause - ;; various race conditions. Run sequentially for - ;; consistent results. - "--parallel=1")) + (apply invoke "python" "runtests.py" test-flags)) (format #t "test suite not run~%")))) ;; XXX: The 'wrap' phase adds native inputs as runtime dependencies, ;; see <https://bugs.gnu.org/25235>. The django-admin script typically @@ -108,12 +111,12 @@ ;; Remaining packages are test requirements taken from ;; tests/requirements/py3.txt python-docutils - ;; optional for tests: ("python-geoip2" ,python-geoip2) - ;; optional for tests: ("python-memcached" ,python-memcached) + ;; optional for tests: python-geoip2 + ;; optional for tests: python-memcached python-numpy python-pillow python-pyyaml - ;; optional for tests: ("python-selenium" ,python-selenium) + ;; optional for tests: python-selenium python-tblib)) (propagated-inputs (list python-asgiref diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index b18de182fe..c033486c6a 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -547,6 +547,7 @@ runcexecutor/executor.go" ;; Our LD doesn't like the statically linked relocatable things ;; that go produces, so install the dynamic version of ;; dockerd instead. + (setenv "BUILDFLAGS" "-trimpath") (invoke "hack/make.sh" "dynbinary"))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) @@ -570,9 +571,7 @@ runcexecutor/executor.go" (install-file "bundles/dynbinary-daemon/dockerd" out-bin) (install-file (string-append "bundles/dynbinary-daemon/dockerd-" (getenv "VERSION")) - out-bin)))) - (add-after 'install 'remove-go-references - (assoc-ref go:%standard-phases 'remove-go-references))))) + out-bin))))))) (inputs (list btrfs-progs containerd ; for containerd-shim diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 903c22bbcb..ab6a4cf4ab 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -142,6 +142,8 @@ ;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu> ;;; Copyright © 2024 Noé Lopez <noelopez@free.fr> ;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com> +;;; Copyright © 2024 Daniel Szmulewicz <daniel.szmulewicz@gmail.com> + ;;; ;;; This file is part of GNU Guix. ;;; @@ -520,7 +522,7 @@ e.g. emacs-geiser-guile for Guile.") (define-public emacs-gptel (package (name "emacs-gptel") - (version "0.8.6") + (version "0.9.0") (source (origin (method git-fetch) (uri (git-reference @@ -529,7 +531,7 @@ e.g. emacs-geiser-guile for Guile.") (file-name (git-file-name name version)) (sha256 (base32 - "1k3mq0xjxdbwbhssd16yh6hfg3jpm9qqx4q4jc2igisjja75nmrv")))) + "0q99lms7dwfa5w48mykynyjs1wv4qjnlhf7qd816j6lvxkd40pi4")))) (build-system emacs-build-system) (arguments (list @@ -1486,7 +1488,7 @@ configuration files, such as @file{.gitattributes}, @file{.gitignore}, and (define-public emacs-with-editor (package (name "emacs-with-editor") - (version "3.3.2") + (version "3.3.4") (source (origin (method git-fetch) @@ -1495,7 +1497,7 @@ configuration files, such as @file{.gitattributes}, @file{.gitignore}, and (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1wzzymlka4f798m75kizjh1yvnh49y8m029c7p5pg7gbv6d0wd8a")))) + (base32 "1jnjd2pzx03vzimsfdcaa3d11fiqiv6hi5nrk6wj2m9qz8alnj2b")))) (build-system emacs-build-system) (arguments (list @@ -1860,6 +1862,34 @@ leveraging built-in functionality.") (license (list license:gpl3+ license:fdl1.3+)))) ; GFDLv1.3+ for the manual +(define-public emacs-meyvn + (let ((commit "f2b809da1d1bf66f1a215a0e5c64f95d10118b76")) ;version bump + (package + (name "emacs-meyvn") + (version "1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/danielsz/meyvn-el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zcckiqk046lbc059jxkh94sjicpvpsf1xkgi8i73rds2xxjyvpk")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-cider + emacs-dash + emacs-geiser + emacs-parseclj + emacs-parseedn + emacs-projectile + emacs-s)) + (home-page "https://github.com/danielsz/meyvn-el") + (synopsis "Emacs client for the Meyvn build tool") + (description + "This package provides an Emacs client for the @url{https://meyvn.org, Meyvn} build tool.") + (license license:gpl3+)))) + (define-public emacs-fzf (let ((commit "21912ebc7e1084aa88c9d8b7715e782a3978ed23") (revision "0")) @@ -1916,7 +1946,7 @@ files left by ArchLinux's pacman.") (define-public emacs-minions (package (name "emacs-minions") - (version "1.0.0") + (version "1.0.1") (source (origin (method git-fetch) @@ -1925,7 +1955,7 @@ files left by ArchLinux's pacman.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ralw9znj749ii046l0dfa3aacm05g1ix59rfsjafhky8fiwz37m")))) + (base32 "1m51amzflq3l8x02azwjri721zf6aj0q4sld266j7fcyp24wwk1g")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat emacs-dash)) @@ -1946,10 +1976,10 @@ Alternatively the menu can be bound globally, for example: (license license:gpl3+))) (define-public emacs-nano-modeline - (let ((commit "a18780c277838983932623870752f0adddef0345")) ;version bump + (let ((commit "04676d57a1e602123a593836745a744d1b2028fb")) ;version bump (package (name "emacs-nano-modeline") - (version "1.0.1") + (version "1.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -1958,7 +1988,7 @@ Alternatively the menu can be bound globally, for example: (file-name (git-file-name name version)) (sha256 (base32 - "017vxz96fh26jb2xj7jnz8w580knvybcdr4xjad4xs72l2lrkj37")))) + "1q10zd8aiq5xm7p4sm1mrfmw0sfgfyznyk4lvh2rl9pqh9kh700a")))) (build-system emacs-build-system) (home-page "https://github.com/rougier/nano-modeline") (synopsis "Emacs minor mode controlling mode line") @@ -1970,7 +2000,7 @@ displayed at the bottom or at the top.") (define-public emacs-moody (package (name "emacs-moody") - (version "1.0.0") + (version "1.1.0") (source (origin (method git-fetch) @@ -1979,7 +2009,7 @@ displayed at the bottom or at the top.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "03rg1f8lnxc16cipadaxgvl9cdxlihn64xbww35n8cbkhgmmir5z")))) + (base32 "1pj1gpwmwl5affnvwb8ckx4xl9vm7xs8bn1xncsr0m8aamv2rh03")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -3830,7 +3860,7 @@ code completion and project management support.") (define-public emacs-auto-compile (package (name "emacs-auto-compile") - (version "2.0.1") + (version "2.0.2") (source (origin (method git-fetch) (uri (git-reference @@ -3839,7 +3869,7 @@ code completion and project management support.") (file-name (git-file-name name version)) (sha256 (base32 - "05nphhbf5nzghi5pi35hhbnal66wi7qmflllf72i5x668whc0aq1")))) + "1a7b0k0znlqxc47plp7ydm0qs3ql29fk0rzg13jg23n8g1sjhsnl")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat emacs-packed)) (home-page "https://github.com/emacscollective/auto-compile") @@ -5007,7 +5037,7 @@ that the binary uses instead of the actual binary contents.") (define-public emacs-ellama (package (name "emacs-ellama") - (version "0.9.10") + (version "0.9.11") (source (origin (method git-fetch) (uri (git-reference @@ -5015,7 +5045,7 @@ that the binary uses instead of the actual binary contents.") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "08kfa89m2mz6j5wfc73bwid2384v4kf944q1qymkjg3r53i1a9c7")))) + "18wxp7shzqhi7paqidv8j80fsiikvsckzm02cwhqy8fyyypv9pdc")))) (build-system emacs-build-system) (propagated-inputs (list emacs-dash emacs-llm emacs-spinner)) (home-page "https://github.com/s-kostyaev/ellama") @@ -7465,16 +7495,16 @@ Lisp.") (define-public emacs-paren-face (package (name "emacs-paren-face") - (version "1.1.0") + (version "1.1.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/tarsius/paren-face") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ma2sxhds4b73zap8kyphbng7a77fsbwrzlybar11if4asd1dfba")))) + (base32 "16rq4q4irzdxcnyhqbjcg7sy2n54wmbp9awn0dbz4w0yif80374v")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -9202,7 +9232,7 @@ src blocks.") (define-public emacs-ol-notmuch (package (name "emacs-ol-notmuch") - (version "2.0.1") + (version "2.0.2") (source (origin (method git-fetch) @@ -9211,7 +9241,7 @@ src blocks.") (commit (string-append "v" version)))) (sha256 (base32 - "1rlpl3kb709q5brkjrrpirdnhvyh447q93li9lgfz67yya29rfqd")) + "1hqppr7z3b9wwlsh5ahv3n3snqll6ipdczk47g72bihzjvg9fxyn")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (propagated-inputs @@ -10521,7 +10551,7 @@ in HTML mode.") ;; Update together with sbcl-slime-swank. (package (name "emacs-slime") - (version "2.29.1") + (version "2.30") (source (origin (method git-fetch) @@ -10530,7 +10560,7 @@ in HTML mode.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1fcasqsdfwsphkfx1vd3r5mr89vgvzb9g2dbw82mc9lijg1mr1ki")))) + (base32 "1z9mi663cs5gks1fz5yy9dycx47sbs6fdr47z05yc1nl8znqib99")))) (build-system emacs-build-system) (arguments (list @@ -11059,7 +11089,7 @@ sgml/html integration, and indentation (working with sgml).") (define-public emacs-jinx (package (name "emacs-jinx") - (version "1.7") + (version "1.8") (source (origin (method git-fetch) @@ -11069,7 +11099,7 @@ sgml/html integration, and indentation (working with sgml).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "04f9yd710rrn1v5b44jaackrnc7f6ywy4r5j5ig12gkddbx3r29i")))) + (base32 "0sdirjxi5gsmc1vbmkj494s54zcmf6xrl6lrdqjnqmlbgq8517nw")))) (build-system emacs-build-system) (arguments (list @@ -12741,7 +12771,7 @@ between symbols.") (define-public emacs-hl-todo (package (name "emacs-hl-todo") - (version "3.6.0") + (version "3.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -12750,7 +12780,7 @@ between symbols.") (file-name (git-file-name name version)) (sha256 (base32 - "1rq16zrdmq9j2jrsg136r5qbqvsgd2bkgpb2wmxca91kfx86r2qq")))) + "0am37ndwz8gkfs0d1va86q84yjdvvf0wag8fns3q87i5yhssi7vp")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -17140,7 +17170,7 @@ passive voice.") (define-public emacs-org (package (name "emacs-org") - (version "9.7.5") + (version "9.7.6") (source (origin (method git-fetch) @@ -17149,7 +17179,7 @@ passive voice.") (commit (string-append "release_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1a2l5y2f5jciv90nfa9rybfw37zqibwl3jaxcd0z15h3alfiyb2d")))) + (base32 "0n3lnccd011njmy6srpjran2pi2frc3vq1cx11cqzd5p5961v7mj")))) (build-system emacs-build-system) (arguments (list @@ -17890,44 +17920,45 @@ using a convenient notation.") license:fdl1.3+)))) ;GFDLv1.3+ for the manual (define-public emacs-beframe - (package - (name "emacs-beframe") - (version "1.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/protesilaos/beframe") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "03b5yb2vxcfg2ihiqkl3434rhwn51mr312kzcfhvr4xshgp2g0q5")))) - (build-system emacs-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'makeinfo - (lambda _ - (invoke "emacs" - "--batch" - "--eval=(require 'ox-texinfo)" - "--eval=(find-file \"README.org\")" - "--eval=(org-texinfo-export-to-info)") - (install-file "beframe.info" - (string-append #$output "/share/info"))))))) - (native-inputs - (list texinfo)) - (home-page "https://protesilaos.com/emacs/beframe") - (synopsis "Isolate Emacs buffers per frame") - (description - "Beframe enables a frame-oriented Emacs workflow where each frame has + (let ((commit "c3f4583b0767e7f8c38c83ed29af40af8ba3bdfa")) ;version bump + (package + (name "emacs-beframe") + (version "1.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/protesilaos/beframe") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1j9v85wxahnm2h828c8dbjm0f81j9pxlf54dgcw443cl0kwcda9c")))) + (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'makeinfo + (lambda _ + (invoke "emacs" + "--batch" + "--eval=(require 'ox-texinfo)" + "--eval=(find-file \"README.org\")" + "--eval=(org-texinfo-export-to-info)") + (install-file "beframe.info" + (string-append #$output "/share/info"))))))) + (native-inputs + (list texinfo)) + (home-page "https://protesilaos.com/emacs/beframe") + (synopsis "Isolate Emacs buffers per frame") + (description + "Beframe enables a frame-oriented Emacs workflow where each frame has access to the list of buffers visited therein. In the interest of brevity, we call buffers that belong to frames ``beframed''. Producing multiple frames does not generate multiple buffer lists. There still is only one global list of buffers. Beframing them simply filters the list.") - (license (list license:gpl3+ - license:fdl1.3+)))) ; GFDLv1.3+ for the manual + (license (list license:gpl3+ + license:fdl1.3+))))) ; GFDLv1.3+ for the manual (define-public emacs-gn-mode (package @@ -23169,7 +23200,7 @@ match and total match information in the mode-line in various search modes.") (define-public emacs-pg (package (name "emacs-pg") - (version "0.35") + (version "0.36") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/emarsden/pg-el") @@ -23177,7 +23208,7 @@ match and total match information in the mode-line in various search modes.") (file-name (git-file-name name version)) (sha256 (base32 - "1ksr1crjl27s481xyr22wlj7i0ss3k5hp68zlzz2cfrl0a5fdsmv")))) + "17ymqf6jf359l3hrl4ayqj8bfskhdh282j230bxqc3ihf5vkzl77")))) (build-system emacs-build-system) (propagated-inputs (list emacs-peg)) (home-page "https://github.com/emarsden/pg-el") @@ -23931,7 +23962,7 @@ interactive commands and functions, such as @code{completing-read}.") (define-public emacs-org-ql (package (name "emacs-org-ql") - (version "0.8.6") + (version "0.8.7") (source (origin (method git-fetch) (uri (git-reference @@ -23939,7 +23970,7 @@ interactive commands and functions, such as @code{completing-read}.") (commit (string-append "v" version)))) (sha256 (base32 - "0425r0qjl83d1zq2z9myish3iqa6pc9ml2jlwmffjnj5gm3vgfsj")) + "0smk5affzlf0i4m10kx8mcffpysd61pjm4zidz2qdv5vsg3j9z50")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments @@ -28259,7 +28290,7 @@ accept and reject GitHub pull requests.") (define-public emacs-deadgrep (package (name "emacs-deadgrep") - (version "0.12") + (version "0.13") (source (origin (method git-fetch) @@ -28269,7 +28300,7 @@ accept and reject GitHub pull requests.") (file-name (git-file-name name version)) (sha256 (base32 - "0bwf8gsqw7hsmacqd34piwgv066ijfclmxaigkvhvpac0lpsmi79")))) + "1ry9qvvxwhh3gkb0kkwiwpx37jpdzgky1h2zkwpzjpkv5jm022dr")))) (build-system emacs-build-system) (arguments (list @@ -30753,7 +30784,7 @@ interface to attach and interact with the processes.") (define-public emacs-dtrt-indent (package (name "emacs-dtrt-indent") - (version "1.17") + (version "1.18") (source (origin (method git-fetch) (uri (git-reference @@ -30762,7 +30793,7 @@ interface to attach and interact with the processes.") (file-name (git-file-name name version)) (sha256 (base32 - "0mjdqzl5mbasix8awav2qp9367waycmbcjy07s53nhv2xpqam9la")))) + "1sw0wabk68ixqip7kmkdvhw9rxz266cj8rs4hz3zlbcf7q6pjq6r")))) (build-system emacs-build-system) (home-page "https://github.com/jscheid/dtrt-indent") (synopsis "Minor mode that guesses the indentation offset") @@ -31718,7 +31749,7 @@ given search terms.") (define-public emacs-notmuch-maildir (package (name "emacs-notmuch-maildir") - (version "0.2.2") + (version "0.2.3") (source (origin (method git-fetch) @@ -31727,7 +31758,7 @@ given search terms.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "09f5g2xll2wh9jkd8crgngnbhxxkiy1rqsjg5g4c0i3hdyk4c3s5")))) + (base32 "00b0jzb6k629bwnrci36wmi2s48cddqva3v8b0bwz2ik43ba8d0n")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat emacs-notmuch)) @@ -31764,7 +31795,7 @@ as Emacs Lisp.") (define-public emacs-transient (package (name "emacs-transient") - (version "0.7.0") + (version "0.7.2") (source (origin (method git-fetch) (uri (git-reference @@ -31773,7 +31804,7 @@ as Emacs Lisp.") (file-name (git-file-name name version)) (sha256 (base32 - "1hkb10b3d76cm0gqcyhi4dyzjdx4fbblx0qcv9nb7xlnwwgm2y80")))) + "0fkgl374jxar2fhpjn4j67r7qc71xlg15r968lk1bny3aj3wf989")))) (build-system emacs-build-system) (arguments `(#:tests? #f ;no test suite @@ -33003,7 +33034,7 @@ all of your projects, then override or add variables on a per-project basis.") (define-public emacs-casual-dired (package (name "emacs-casual-dired") - (version "1.3.0") + (version "1.5.0") (source (origin (method git-fetch) @@ -33012,7 +33043,7 @@ all of your projects, then override or add variables on a per-project basis.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1lhdsnbw6b38gy8v6cvv0mcl4rhzfqccls507n81zrip7h78yij9")))) + (base32 "17a2jgm01hjhq1nkx50bm5qakb0inf0x6vry57n33jq4ay1kfnfq")))) (build-system emacs-build-system) (arguments (list @@ -33020,12 +33051,44 @@ all of your projects, then override or add variables on a per-project basis.") #~(modify-phases %standard-phases (add-after 'unpack 'chdir (lambda _ (chdir "lisp")))))) + (propagated-inputs (list emacs-casual-lib)) (home-page "https://github.com/kickingvegas/casual-dired") (synopsis "Transient-based porcelain for dired") (description "Casual Dired is an opinionated Transient-based porcelain for Emacs Dired.") (license license:gpl3+))) +(define-public emacs-casual-lib + (package + (name "emacs-casual-lib") + (version "1.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kickingvegas/casual-lib") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dn6jz8bbz17326g0jd1hvz80xxmbl7dwifb2nnw7nl6q6adbkmf")))) + (build-system emacs-build-system) + (arguments + (list #:tests? #t + #:test-command #~(list "make" "tests") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'move-source-files + (lambda _ + (let ((el-files (find-files "./lisp" ".*\\.el$"))) + (for-each (lambda (f) (copy-file f (basename f))) + el-files))))))) + (native-inputs (list python-minimal)) + (home-page "https://github.com/kickingvegas/casual-lib") + (synopsis "Library package for the Emacs Casual porcelains") + (description + "Casual Lib is a library package used to support the Casual porcelains.") + (license license:gpl3+))) + (define-public emacs-calibredb (package (name "emacs-calibredb") @@ -36607,7 +36670,7 @@ launching other commands/applications from within Emacs, similar to the (define-public emacs-no-littering (package (name "emacs-no-littering") - (version "1.5.0") + (version "1.7.0") (source (origin (method git-fetch) @@ -36616,7 +36679,7 @@ launching other commands/applications from within Emacs, similar to the (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "14f07irjbk3akc07a0y5awyflmhsxvj8gg67y81zp90danjkgvvr")))) + (base32 "062fdryl8yhk6qcj1x98qa732d9lfn8x9dsa25ss11c5x3sywjv4")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -37887,16 +37950,16 @@ displayed for sharing.") (define-public emacs-orglink (package (name "emacs-orglink") - (version "1.2.2") + (version "1.2.3") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/tarsius/orglink") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0jkk6jiqmsns1pb0almaihyz6c3lim0r6l4x75qp7448p46q2him")))) + (base32 "00lxfn78768kwp1sxcafzpycarqi7a9zsy4p22cjbp9vi6l8qx7j")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -39614,27 +39677,25 @@ by leveraging @code{emacs-consult} APIs.") (license license:expat))) (define-public emacs-context-transient - (let ((commit "16b8e16645ebcdc44d2777ba16ac85e1d3ee468b") - (revision "0")) - (package - (name "emacs-context-transient") - (version (git-version "1.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/licht1stein/context-transient.el") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "147yv3ih9il6a4k2cw1kcqgdpls83jf7aspjf8km650ry0apycc6")))) - (build-system emacs-build-system) - (home-page "https://github.com/licht1stein/context-transient.el") - (synopsis "Context specific transients") - (description "This package makes it easy to define and call + (package + (name "emacs-context-transient") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/licht1stein/context-transient.el") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1slj9js7c4cggdidr7miri9gf9xm7ij4hmd7y99km7bqmg57837l")))) + (build-system emacs-build-system) + (home-page "https://github.com/licht1stein/context-transient.el") + (synopsis "Context specific transients") + (description "This package makes it easy to define and call context-specific @code{emacs-transient} menus for current project, git repo, buffer or any other condition.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-purs-mode ;; XXX: Upstream set no tag nor any Version keyword. Using 0 as the base diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index e518d24fa2..64335d89f7 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2783,7 +2783,9 @@ comments."))) (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0s720q6vxlh78jzahqp69nl8wagb42l05dym5aqhfnr31dx666hc")))) + (base32 "0s720q6vxlh78jzahqp69nl8wagb42l05dym5aqhfnr31dx666hc")) + ;; https://github.com/FreeCAD/FreeCAD/pull/11496 + (patches (search-patches "freecad-vtk-9.3.patch")))) (build-system qt-build-system) (native-inputs (list doxygen @@ -3157,13 +3159,13 @@ program that can perform mesh processing tasks in batch mode, without a GUI.") (define-public poke (package (name "poke") - (version "4.1") + (version "4.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/poke/poke-" version ".tar.gz")) (sha256 - (base32 "0h6px4k31m5rfdmrazlismrfbmccgvwvn4lf4gaaqx3k3yjaxv08")) + (base32 "1plv26x38jy2g97f7gj2kivjwlgcx5cja3m41qa56yin3vk3dbwa")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/mastodon.scm b/gnu/packages/fediverse.scm index b8006292ca..6c35f633d8 100644 --- a/gnu/packages/mastodon.scm +++ b/gnu/packages/fediverse.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2019-2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2021 Taiju HIGASHI <higashi@taiju.info> +;;; Copyright © 2024 Sergio Durigan Junior <sergiodj@sergiodj.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,17 +19,20 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. -(define-module (gnu packages mastodon) +(define-module (gnu packages fediverse) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix git-download) + #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages check) + #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) @@ -44,6 +48,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages time) + #:use-module (gnu packages tls) #:use-module (gnu packages xml)) (define-public toot @@ -190,3 +195,57 @@ seamlessly with your desktop environment.") (description "This package provides a python wrapper for the Mastodon API.") (license license:expat))) + +(define-public snac2 + (package + (name "snac") + (version "2.55") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/grunfink/snac2") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06qmg0wy1f4r6l8j52jnma4d2b8sj8fqf52vn7qqbbs8jz7aj74s")))) + (build-system gnu-build-system) + (inputs (list curl openssl)) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'remove-usr-local + (lambda _ + (substitute* "Makefile" + (("-I/usr/local/include") + "") + (("-L/usr/local/lib") + ""))))) + #:tests? #f ; no test target + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "CFLAGS=-O2 -g -Wall -Wextra") + (string-append "PREFIX=" #$output)))) + (home-page "https://codeberg.org/grunfink/snac2") + (synopsis + "Simple, minimalistic ActivityPub instance written in portable C") + (description + "Snac is a simple, minimalistic ActivityPub instance written in +portable C. + +It features: + +@itemize +@item Lightweight, minimal dependencies +@item Extensive support of ActivityPub operations, e.g. write public notes, +follow users, be followed, reply to the notes of others, admire wonderful +content (like or boost), write private messages, etc. +@item Multiuser support +@item Mastodon API support, so Mastodon-compatible apps can be used +@item Simple but effective web interface +@item Easily-accessed MUTE button to silence users +@item Tested interoperability with related software +@item No database needed +@item Totally JavaScript-free; no cookies either +@end itemize") + (license license:expat))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9274fc494d..b2d050d626 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7492,7 +7492,7 @@ at their peak of economic growth and military prowess. (define-public open-adventure (package (name "open-adventure") - (version "1.18") + (version "1.19") (source (origin (method git-fetch) @@ -7501,7 +7501,7 @@ at their peak of economic growth and military prowess. (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1zl72lsp443aryzmwzh5w4j439jgf5njvh9xig6vjvmzhfcjkk9q")))) + (base32 "19nspsvkzh3xw70mwlvralfr2ia7a8knd9s7x7abmjvk8p5rx468")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index e13ce3afa8..086dbaeb17 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -79,7 +79,7 @@ (define-public go-golang-org-x-crypto (package (name "go-golang-org-x-crypto") - (version "0.4.0") + (version "0.14.0") (source (origin (method git-fetch) @@ -89,7 +89,7 @@ (file-name (string-append "go.googlesource.com-crypto-" version "-checkout")) (sha256 - (base32 "13i0yz4hvc4qdr438nmzilvl5ns73v3910bakcddny3jbzq72i2m")))) + (base32 "08124qkp0l0blq6rw68llfbf84kp99255q0yvxyv27c05b0wkh66")))) (build-system go-build-system) (arguments '(#:import-path "golang.org/x/crypto" @@ -100,7 +100,10 @@ ;; Source-only package (delete 'build)))) (propagated-inputs - (list go-golang-org-x-sys)) + (list go-golang-org-x-net + go-golang-org-x-sys + go-golang-org-x-term + go-golang-org-x-text)) (home-page "https://go.googlesource.com/crypto/") (synopsis "Supplementary cryptographic libraries in Go") (description "This package provides supplementary cryptographic libraries @@ -238,6 +241,8 @@ loading algorithms.") #~(modify-phases %standard-phases ;; Source-only package (delete 'build)))) + (propagated-inputs + (list go-golang-org-x-sys go-golang-org-x-term go-golang-org-x-text)) (home-page "https://go.googlesource.com/net") (synopsis "Go supplemental networking libraries") (description "This package provides supplemental Go networking libraries.") @@ -262,116 +267,80 @@ loading algorithms.") (sha256 (base32 "17zhim2m0r8nyy18g2lsawxm4rawix2qbjyn80x9vc6jc8fv05m9"))))))) -(define-public go-golang-org-x-net-html +(define-public go-golang-org-x-sync (package - (inherit go-golang-org-x-net) - (name "go-golang-org-x-net-html") + (name "go-golang-org-x-sync") + (version "0.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/sync") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03yq3pnjwqxqy1cvbkaa39ca2b9cli1k5wnz76l3a65n9fafai6q")))) + (build-system go-build-system) (arguments - '(#:import-path "golang.org/x/net/html" - #:unpack-path "golang.org/x/net")) - (propagated-inputs (list go-golang-org-x-text)) - (home-page "https://godoc.org/golang.org/x/net/html") - (synopsis "HTML5-compliant tokenizer and parser") + (list + #:import-path "golang.org/x/sync" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (home-page "https://go.googlesource.com/sync/") + (synopsis "Additional Go concurrency primitives") (description - "This package provides an HTML5-compliant tokenizer and parser."))) - -(define-public go-golang-org-x-sync - (let ((commit "8fcdb60fdcc0539c5e357b2308249e4e752147f1") - (revision "1")) - (package - (name "go-golang-org-x-sync") - (version (git-version "0.1.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/sync") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "07qrhni6f5hh5p95k1yk6s4wsj341q663irvx6rllrxfsymj6a0z")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/sync" - #:tests? #f - ;; Source-only package - #:phases (modify-phases %standard-phases - (delete 'build)))) - (home-page "https://go.googlesource.com/sync/") - (synopsis "Additional Go concurrency primitives") - (description "This package provides Go concurrency primitives in -addition to the ones provided by the language and “sync” and “sync/atomic” -packages.") - (license license:bsd-3)))) - -(define-public go-golang.org-x-sync-errgroup - (let ((commit "cd5d95a43a6e21273425c7ae415d3df9ea832eeb") - (revision "0")) - (package - (name "go-golang.org-x-sync-errgroup") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/sync") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds")))) - (build-system go-build-system) - (arguments - '(#:import-path "golang.org/x/sync/errgroup" - #:unpack-path "golang.org/x/sync")) - (home-page "https://godoc.org/golang.org/x/sync/errgroup") - (synopsis "Synchronization, error propagation, and Context cancellation -for groups of goroutines working on subtasks of a common task") - (description "This package provides synchronization, error -propagation, and Context cancellation for groups of goroutines working on -subtasks of a common task.") - (license license:bsd-3)))) + "This package provides Go concurrency primitives in addition to the ones +provided by the language and @code{sync} and @code{sync/atomic} packages. +The package provides several Golang submodules: +@itemize +@item @code{errgroup} - synchronization, error propagation, and Context +cancelation for groups of goroutines working on subtasks of a common task +@item @code{semaphore} - a weighted semaphore implementation +@item @code{singleflight} - a duplicate function call suppression mechanism +@item @code{syncmap} - a concurrent map implementation +@end itemize") + (license license:bsd-3))) -(define-public go-golang.org-x-sync-semaphore +(define-public go-golang-org-x-sys (package - (inherit go-golang.org-x-sync-errgroup) - (name "go-golang.org-x-sync-semaphore") + (name "go-golang-org-x-sys") + (version "0.21.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/sys") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "000fcyi863sbmamdn3cwfv3s3z9ls5l34xnjavcbgjs591ghki8y")))) + (build-system go-build-system) (arguments - '(#:import-path "golang.org/x/sync/semaphore" - #:unpack-path "golang.org/x/sync")) - (home-page "https://godoc.org/golang.org/x/sync/semaphore") - (synopsis "Weighted semaphore implementation in Go") - (description "Weighted semaphore implementation in Go."))) - -(define-public go-golang-org-x-sys - (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78") - (revision "0")) - (package - (name "go-golang-org-x-sys") - (version (git-version "0.8.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/sys") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq")))) - (build-system go-build-system) - (arguments - (list - #:import-path "golang.org/x/sys" - ;; Source-only package - #:tests? #f - #:phases - #~(modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) - (home-page "https://go.googlesource.com/sys") - (synopsis "Go support for low-level system interaction") - (description "This package provides supplemental libraries offering Go + (list + #:import-path "golang.org/x/sys" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (home-page "https://go.googlesource.com/sys") + (synopsis "Go support for low-level system interaction") + (description "This package provides supplemental libraries offering Go support for low-level interaction with the operating system.") - (license license:bsd-3)))) + (license license:bsd-3))) (define-public go-golang-org-x-term (package diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 1caf1e6069..dd0b71ff13 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -1,9 +1,9 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com> -;;; Copyright © 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz> @@ -657,7 +657,7 @@ Gomega matcher library.") #:go go-1.21 #:import-path "github.com/onsi/gomega")) (propagated-inputs - (list go-github-com-golang-protobuf-proto + (list go-github-com-golang-protobuf go-golang-org-x-net go-golang-org-x-sys go-golang-org-x-text @@ -732,6 +732,57 @@ Go application.") original value once the test has been run.") (license license:expat))) +(define-public go-github-com-petermattis-goid + (let ((commit "bb94eb51e7a772d09cef11768f3248ac25adf9f9") + (revision "2")) + (package + (name "go-github-com-petermattis-goid") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/petermattis/goid") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0hr94frr0rhac4mb9r7ixdgr6hm63rxh6z43rhn2wn7fdy8csw11")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/petermattis/goid")) + (home-page "https://github.com/petermattis/goid") + (synopsis "Identify the running goroutine") + (description + "This package offers a method of programmatically retrieving the +current goroutine's ID.") + (license license:asl2.0)))) + +(define-public go-github-com-sasha-s-go-deadlock + (package + (name "go-github-com-sasha-s-go-deadlock") + (version "0.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sasha-s/go-deadlock") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0arb35idnyz4n118xz7p2snazqi35gk1975h1xfk0y4riiks58yz")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/sasha-s/go-deadlock")) + (propagated-inputs + (list go-github-com-petermattis-goid)) + (home-page "https://github.com/sasha-s/go-deadlock") + (synopsis "Deadlock detection in go") + (description + "This package provides tools for detecting deadlocks at run-time in Go.") + (license license:asl2.0))) + (define-public go-github-com-stretchr-testify (package (name "go-github-com-stretchr-testify") @@ -905,6 +956,37 @@ makes extraction of setup/teardown behavior (as well as invoking the system under test) much simpler.") (license license:expat))) +(define-public go-go-etcd-io-gofail + (package + (name "go-go-etcd-io-gofail") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/etcd-io/gofail") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jh0qjgfb2irshwj7an3lj0w9bv6c5gbnkdhisgpdr7x7hk682m1")))) + (build-system go-build-system) + (arguments + (list + #:import-path "go.etcd.io/gofail" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-examples + (lambda* (#:key import-path #:allow-other-keys) + (delete-file-recursively + (string-append "src/" import-path "/examples"))))))) + (native-inputs (list go-github-com-stretchr-testify)) + (home-page "https://pkg.go.dev/go.etcd.io/gofail") + (synopsis "Failpoints for go") + (description + "This package provides an implementation of +@url{http://www.freebsd.org/cgi/man.cgi?query=fail,failpoints} for Golang.") + (license license:asl2.0))) + (define-public go-golang-org-sql-mock (let ((commit "e98392b8111b45f8126e00af035a0dd95dc12e8b") (version "1.3.3") diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm index f40664d8f7..ddeb65a967 100644 --- a/gnu/packages/golang-compression.scm +++ b/gnu/packages/golang-compression.scm @@ -168,9 +168,9 @@ library. This is beneficial for large amounts of data, say more than 1MB at a time, as otherwise the internal gzip library will likely be faster.") (license (list license:bsd-3 license:expat)))) -(define-public go-github-com-nwaples-rardecode-v2 +(define-public go-github-com-nwaples-rardecode (package - (name "go-github-com-nwaples-rardecode-v2") + (name "go-github-com-nwaples-rardecode") (version "2.0.0-beta.2") (source (origin diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index baf68b7089..ddeb79badf 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -1,9 +1,10 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017-2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org> -;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2020, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca> ;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org> @@ -11,16 +12,15 @@ ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> ;;; Copyright © 2021 Vagrant Cascadian <vagrant@debian.org> ;;; Copyright © 2022 (unmatched-parenthesis <paren@disroot.org> -;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2022, 2023 Nicolas Graves <ngraves@ngraves.fr> -;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2023 Benjamin <benjamin@uvy.fr> ;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com> ;;; Copyright © 2023 Jack Hill <jackhill@jackhill.us> -;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com> +;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2024 Jesse Eisses <jesse@eisses.email> +;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -321,6 +321,42 @@ the Ristretto prime-order group built from Edwards25519.") xxHash algorithm (XXH64).") (license license:expat))) +(define-public go-github-com-chmduquesne-rollinghash + (let ((commit "9a5199be7309f50c496efc87d29bd08788605ae7") + (revision "1")) + (package + (name "go-github-com-chmduquesne-rollinghash") + (version (git-version "4.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chmduquesne/rollinghash") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gkdgsgrmwagwyp4lmd4k11mbwi8f1yw9c9rhnkmav87gy1k84jr")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/chmduquesne/rollinghash/" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Run all tests, workaround for go-build-system's lack of Go + ;; modules support. + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (propagated-inputs + (list go-code-cloudfoundry-org-bytefmt)) + (home-page "https://github.com/chmduquesne/rollinghash") + (synopsis "Rolling hashes in Go") + (description + "This package provides a Go implementation of several rolling hashes.") + (license license:expat)))) + (define-public go-github-com-cloudflare-circl (package (name "go-github-com-cloudflare-circl") @@ -454,6 +490,30 @@ providing bidirectional mapping values to their names, plus enum convenience for values.") (license license:bsd-3))) +(define-public go-github-com-go-asn1-ber-asn1-ber + (package + (name "go-github-com-go-asn1-ber-asn1-ber") + (version "1.5.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-asn1-ber/asn1-ber") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xa1s1q2is9fr02pvrc9sq8zfq9ba6gk64yg1ncglppp30f50q52")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/go-asn1-ber/asn1-ber")) + (home-page "https://github.com/go-asn1-ber/asn1-ber") + (synopsis "ASN.1 BER encoding and decoding in Go") + (description + "This package provides @acronym{Abstract Syntax Notation One, ASN.1} BER +encoding and decoding in the Go language.") + (license license:expat))) + (define-public go-github-com-golang-jwt-jwt (package (name "go-github-com-golang-jwt-jwt") diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index bb0712e143..e64f20801c 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -190,6 +190,44 @@ result and details about the health status of each component.") the parse trees produced by the html package.") (license license:bsd-2))) +(define-public go-github-com-audriusbutkevicius-pfilter + (package + (name "go-github-com-audriusbutkevicius-pfilter") + (version "0.0.11") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AudriusButkevicius/pfilter") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03kwi1hnhcz9qdblmhpaqg2063k2ch29hc5dr8cl2z7q5rp81m9i")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/AudriusButkevicius/pfilter" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-failing-tests + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + ;; Remove tests requiring setting up local + ;; connection. + (list "quic_test.go")))))))) + (propagated-inputs + (list go-github-com-pkg-errors + go-github-com-quic-go-quic-go + go-golang-org-x-net)) + (home-page "https://github.com/AudriusButkevicius/pfilter") + (synopsis "Filter packets into multiple virtual connections") + (description + "Pfilter is a Go package for filtering packets into multiple virtual +connections from a single physical connection.") + (license license:expat))) + (define-public go-github-com-aws-sdk (package (name "go-github-com-aws-sdk") @@ -399,6 +437,34 @@ for Go") (description "This package provides a CSS parser and inliner.") (license license:expat))) +(define-public go-github-com-azure-go-ntlmssp + (package + (name "go-github-com-azure-go-ntlmssp") + (version "0.0.0-20221128193559-754e69321358") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Azure/go-ntlmssp") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dg20fwylf5lpsc5fgnnzw7jxz0885bg97lla1b5wrlhjas6lidn")))) + (build-system go-build-system) + (arguments + (list + ;; See <https://github.com/Azure/go-ntlmssp/issues/40>. + #:tests? #f + #:import-path "github.com/Azure/go-ntlmssp")) + (propagated-inputs + (list go-golang-org-x-crypto)) + (home-page "https://github.com/Azure/go-ntlmssp") + (synopsis "NTLM negotiation in Go") + (description + "This package provides @acronym{NT (New Technology) LAN +Manager,NTLM}/Negotiate authentication over HTTP.") + (license license:expat))) + (define-public go-github-com-bep-golibsass (package (name "go-github-com-bep-golibsass") @@ -456,6 +522,30 @@ for Go") "This package provides SCSS compiler support for Go applications.") (license license:expat))) +(define-public go-github-com-ccding-go-stun + (package + (name "go-github-com-ccding-go-stun") + (version "0.1.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ccding/go-stun") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wjhckyg42kp04njhj7gni84cyk0s7m17n13kqf6r7mjzx8a83pw")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/ccding/go-stun")) + (home-page "https://github.com/ccding/go-stun") + (synopsis "STUN client implementation") + (description + "Go-stun is a go implementation of the STUN client (RFC 3489 +and RFC 5389).") + (license license:asl2.0))) + (define-public go-github-com-cenkalti-backoff-v4 (package (name "go-github-com-cenkalti-backoff-v4") @@ -723,6 +813,44 @@ Signing and Encryption set of standards. This includes support for JSON Web Encryption, JSON Web Signature, and JSON Web Token standards.") (license license:asl2.0))) +(define-public go-github-com-go-ldap-ldap + (package + (name "go-github-com-go-ldap-ldap") + (version "3.4.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-ldap/ldap") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fbmhlc8ss5vn6zz0iiifvy4pm0mwaf13qpz70k83mmnv9vrv16x")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/go-ldap/ldap/v3" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-failing-tests + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + ;; FAIL <...> LDAP Result Code 200 "Network Error": + ;; dial tcp: lookup ldap.itd.umich.edu on <...> + (list "ldap_test.go")))))))) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-github-com-azure-go-ntlmssp + go-github-com-go-asn1-ber-asn1-ber + go-github-com-google-uuid)) + (home-page "https://github.com/go-ldap/ldap") + (synopsis "LDAP v3 functionality for Go") + (description "This package provides basic LDAP v3 functionality in the Go +language.") + (license license:expat))) + (define-public go-github-com-go-telegram-bot-api-telegram-bot-api (package (name "go-github-com-go-telegram-bot-api-telegram-bot-api") @@ -791,7 +919,7 @@ Encryption, JSON Web Signature, and JSON Web Token standards.") (arguments (list #:import-path "github.com/golang/groupcache")) (propagated-inputs - (list go-github-com-golang-protobuf-proto)) + (list go-github-com-golang-protobuf)) (home-page "https://github.com/golang/groupcache") (synopsis "Groupcache is a caching and cache-filling library") (description @@ -905,7 +1033,7 @@ language.") (define-public go-github-com-gorilla-csrf (package (name "go-github-com-gorilla-csrf") - (version "1.7.0") + (version "1.7.2") (source (origin (method git-fetch) @@ -914,13 +1042,14 @@ language.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0iryq0z48yi7crfbd8jxyn7lh1gsglpiglvjgnf23bz6xfisssav")))) + (base32 "01d56sr9yggn6gs4lf5bnj15q6bkwvsim8kzj8m4arv1ccj7918j")))) (build-system go-build-system) - (propagated-inputs - `(("github.com/gorilla/securecookie" ,go-github-com-gorilla-securecookie) - ("github.com/pkg/errors" ,go-github-com-pkg-errors))) (arguments - '(#:import-path "github.com/gorilla/csrf")) + (list + #:import-path "github.com/gorilla/csrf")) + (propagated-inputs + (list go-github-com-gorilla-securecookie + go-github-com-pkg-errors)) (home-page "https://github.com/gorilla/csrf") (synopsis "Cross Site Request Forgery (CSRF) prevention middleware") (description @@ -1150,6 +1279,35 @@ used like a user interface for humans, to read and edit before passing the JSON data to the machine.") (license license:expat))) +(define-public go-github-com-jackpal-gateway + (package + (name "go-github-com-jackpal-gateway") + (version "1.0.15") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jackpal/gateway") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dlspnbdz63b3kpavibd2764hdy53mx1v3vrqi721dsjy77r9ig3")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/jackpal/gateway")) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-golang-org-x-net)) + (home-page "https://github.com/jackpal/gateway") + (synopsis "Discover the address of a LAN gateway") + (description + "@code{gateway} is a Go library for discovering the IP address of the +default LAN gateway.") + (license license:bsd-3))) + (define-public go-github-com-jackpal-go-nat-pmp (package (name "go-github-com-jackpal-go-nat-pmp") @@ -1671,6 +1829,80 @@ which produce colorized output using github.com/fatih/color.") (description "OpenTracing-Go is a Go implementation of the OpenTracing API.") (license license:asl2.0))) +(define-public go-github-com-oschwald-geoip2-golang + (package + (name "go-github-com-oschwald-geoip2-golang") + (version "1.11.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oschwald/geoip2-golang") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0670cv1b9c2p0lx63rlwl7kplbvzr79apbw13109v0pv4qlapmhx")))) + (build-system go-build-system) + (arguments + (list + #:tests? #f ; Requires some unpackaged software and test data + #:go go-1.21 + #:import-path "github.com/oschwald/geoip2-golang")) + (propagated-inputs + (list go-github-com-oschwald-maxminddb-golang)) + (home-page "https://github.com/oschwald/geoip2-golang") + (synopsis "MaxMind GeoIP2 reader") + (description + "This package provides a library for reading MaxMind GeoLite2 and GeoIP2 +databases in Go.") + (license license:isc))) + +(define-public go-github-com-oschwald-maxminddb-golang + (package + (name "go-github-com-oschwald-maxminddb-golang") + (version "1.13.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oschwald/maxminddb-golang") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1p0c10r6850znvarc9h3y0jlwika9qmq0ys7rmg2aj8x2cffz3z6")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/oschwald/maxminddb-golang" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Remove most of the tests requiring test-data from submodule + ;; <https://github.com/maxmind/MaxMind-DB>, there is a documented + ;; process on how to generate it, consider to pack and activate + ;; tests in the next update cycle. + (add-after 'unpack 'remove-failing-tests + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + (list "decoder_test.go" + "deserializer_test.go" + "example_test.go" + "reader_test.go" + "traverse_test.go" + "verifier_test.go")))))))) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-golang-org-x-sys)) + (home-page "https://github.com/oschwald/maxminddb-golang") + (synopsis "MaxMind DB Reader for Go") + (description + "This is a Go reader for the MaxMind DB format. Although this can be +used to read GeoLite2 and GeoIP2 databases, @code{geoip2} provides a +higher-level API for doing so.") + (license license:isc))) + (define-public go-github-com-pion-dtls (package (name "go-github-com-pion-dtls") diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index cd945fe006..dafa4b2904 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -522,6 +522,35 @@ optimized for sparse nodes of @url{http://en.wikipedia.org/wiki/Radix_tree,radix tree}.") (license license:expat))) +(define-public go-github-com-audriusbutkevicius-recli + (package + (name "go-github-com-audriusbutkevicius-recli") + (version "0.0.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AudriusButkevicius/recli") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0mxrpn8p6ylf5qjzsqrk96nky5vgagjkkpd5jwpm6sa977qb0v3i")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/AudriusButkevicius/recli")) + (native-inputs + (list go-github-com-pkg-errors + go-github-com-urfave-cli)) + (home-page "https://github.com/AudriusButkevicius/recli") + (synopsis "Reflection-based CLI generator") + (description + "For a given struct, @code{recli} builds a set of @code{urfave/cli} +commands which allows you to modify it from the command line. It is useful +for generating command line clients for your application configuration that is +stored in a Go struct.") + (license license:mpl2.0))) + (define-public go-github-com-benbjohnson-clock (package (name "go-github-com-benbjohnson-clock") @@ -745,6 +774,33 @@ indicator to any terminal application.") similar to Go's standard library @code{json} and @code{xml} package.") (license license:expat))) +;; XXX: This repository has been archived by the owner on Feb 21, 2018. It is +;; now read-only. +(define-public go-github-com-calmh-xdr + (package + (name "go-github-com-calmh-xdr") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/calmh/xdr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "072wqdncz3nd4a3zkhvzzx1y3in1lm29wfvl0d8wrnqs5pyqh0mh")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/calmh/xdr")) + (home-page "https://github.com/calmh/xdr") + (synopsis "XDR marshalling and unmarshalling") + (description + "XDR is an External Data Representation (XDR) +marshalling and unmarshalling library in Go. It uses code generation and not +reflection.") + (license license:expat))) + (define-public go-github-com-cheggaaa-pb (package (name "go-github-com-cheggaaa-pb") @@ -1011,6 +1067,30 @@ submodules: metrics to Graphite.") (license license:bsd-2))) +(define-public go-github-com-d4l3k-messagediff + (package + (name "go-github-com-d4l3k-messagediff") + (version "1.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/d4l3k/messagediff") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "104hl8x57ciaz7mzafg1vp9qggxcyfm8hsv9bmlihbz9ml3nyr8v")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/d4l3k/messagediff")) + (home-page "https://github.com/d4l3k/messagediff") + (synopsis "Diff arbitrary Go structs") + (description + "Messagediff is a library for calculating diffs of arbitrary +structs in the Go programming language.") + (license license:expat))) + (define-public go-github-com-danwakefield-fnmatch (let ((commit "cbb64ac3d964b81592e64f957ad53df015803288") (revision "0")) @@ -1160,6 +1240,29 @@ atimes for files.") mtime,ctime and btime for files.") (license license:expat))) +(define-public go-github-com-dlclark-regexp2 + (package + (name "go-github-com-dlclark-regexp2") + (version "1.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dlclark/regexp2") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1irfv89b7lfkn7k3zgx610ssil6k61qs1wjj31kvqpxb3pdx4kry")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/dlclark/regexp2")) + (home-page "https://github.com/dlclark/regexp2/") + (synopsis "Full featured regular expressions for Go") + (description + "Regexp2 is a feature-rich RegExp engine for Go.") + (license license:expat))) + (define-public go-github-com-docopt-docopt-go (let ((commit "ee0de3bc6815ee19d4a46c7eb90f829db0e014b1") (revision "0")) @@ -1300,6 +1403,34 @@ Alphanum Algorithm} developed by Dave Koelle in Go.") defined output to the standard output.") (license license:expat))) +;; XXX: This repository has been archived by the owner on Nov 9, 2017. It is +;; now read-only. +(define-public go-github-com-flynn-archive-go-shlex + (let ((commit "3f9db97f856818214da2e1057f8ad84803971cff") + (revision "0")) + (package + (name "go-github-com-flynn-archive-go-shlex") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/flynn-archive/go-shlex") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/flynn-archive/go-shlex")) + (synopsis "Go lexer") + (description + "Shlex is a simple lexer for go that supports shell-style +quoting, commenting, and escaping.") + (home-page "https://github.com/flynn-archive/go-shlex") + (license license:asl2.0)))) + (define-public go-github-com-gabriel-vasile-mimetype (package (name "go-github-com-gabriel-vasile-mimetype") @@ -2044,6 +2175,51 @@ word-splitting rules.") (home-page "https://github.com/kballard/go-shellquote") (license license:expat)))) +(define-public go-github-com-klauspost-cpuid + (package + (name "go-github-com-klauspost-cpuid") + (version "1.2.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klauspost/cpuid") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1s510210wdj5dkamii1qrk7v87k4qpdcrrjzflp5ha9iscw6b06l")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/klauspost/cpuid")) + (home-page "https://github.com/klauspost/cpuid") + (synopsis "CPU feature identification for Go") + (description + "@code{cpuid} provides information about the CPU running the current +program. CPU features are detected on startup, and kept for fast access +through the life of the application. Currently x86 / x64 (AMD64) is +supported, and no external C (cgo) code is used, which should make the library +very eas to use.") + (license license:expat))) + +(define-public go-github-com-klauspost-cpuid-v2 + (package + (inherit go-github-com-klauspost-cpuid ) + (name "go-github-com-klauspost-cpuid-v2") + (version "2.2.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klauspost/cpuid") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fys5v9vslar483arj7wy4id5kg1c7vqv4437kgjnwvki69j9mxf")))) + (arguments + (list + #:import-path "github.com/klauspost/cpuid/v2")))) + (define-public go-github-com-lestrrat-go-envload (package (name "go-github-com-lestrrat-go-envload") @@ -2235,6 +2411,83 @@ implementing features like: @end itemize") (license license:expat)))) +(define-public go-github-com-masterminds-semver-v3 + (package + (name "go-github-com-masterminds-semver-v3") + (version "3.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Masterminds/semver") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1h4c647dgq6k5q78j3m98ccdrzd7kbcq4ahdy25j72rbxjmci8al")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/Masterminds/semver/v3")) + (native-inputs + (list go-github-com-stretchr-testify-next)) + (home-page "https://github.com/Masterminds/semver/") + (synopsis "@code{semver} helps to work with semantic versions") + (description + "The semver package provides the ability to work with +semantic versions. Specifically it provides the ability to: +@itemize +@item Parse semantic versions +@item Sort semantic versions +@item Check if a semantic version fits within a set of constraints +@item Optionally work with a @code{v} prefix +@end itemize") + (license license:expat))) + +(define-public go-github-com-masterminds-sprig-v3 + (package + (name "go-github-com-masterminds-sprig-v3") + (version "3.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Masterminds/sprig") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wwi8n2adjc5jlga25lqq0hrz4jcgd5vpll68y2dfji034caaq18")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/Masterminds/sprig/v3" + #:phases + #~(modify-phases %standard-phases + ;; Tests tries to reach Google: + ;; tpl := `{{"www.google.com" | getHostByName}}` + (add-after 'unpack 'remove-network-tests + (lambda* (#:key import-path #:allow-other-keys) + (delete-file + (string-append "src/" import-path "/network_test.go"))))))) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-github-com-google-uuid + go-github-com-huandu-xstrings + go-github-com-imdario-mergo + go-github-com-masterminds-goutils + go-github-com-masterminds-semver-v3 + go-github-com-mitchellh-copystructure + go-github-com-mitchellh-reflectwalk + go-github-com-spf13-cast + go-golang-org-x-crypto)) + (home-page "https://github.com/Masterminds/sprig/") + (synopsis "Template functions for Go templates") + (description + "Sprig is a library that provides more than 100 commonly used template +functions.") + (license license:expat))) + (define-public go-github-com-matryer-try (package (name "go-github-com-matryer-try") @@ -2449,6 +2702,45 @@ the @code{cpan} module @code{Parse::CommandLine}.") other directories. It is optimized for filewalking.") (license license:expat))) +(define-public go-github-com-matttproud-golang-protobuf-extensions-v2 + (package + (name "go-github-com-matttproud-golang-protobuf-extensions-v2") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/matttproud/golang_protobuf_extensions") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jw4vjycwx0a82yvixmp25805krdyqd960y8lnyggllb6br0vh41")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/matttproud/golang_protobuf_extensions/v2" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Activate when go-build-system supports submodules. + (delete 'build) + ;; XXX: Replace when go-build-system supports nested path. + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (propagated-inputs + (list go-github-com-golang-protobuf + go-google-golang-org-protobuf)) + (home-page "https://github.com/matttproud/golang_protobuf_extensions") + (synopsis "Streaming Protocol Buffers in Go") + (description + "This package provides various Protocol Buffer extensions for the Go +language, namely support for record length-delimited message streaming.") + (license license:asl2.0))) + (define-public go-github-com-mgutz-ansi (let ((commit "9520e82c474b0a04dd04f8a40959027271bab992") (revision "0")) @@ -3160,7 +3452,7 @@ Pion}.") ;; Source-only package (delete 'build)))) (propagated-inputs - (list go-github-com-golang-protobuf-proto)) + (list go-github-com-golang-protobuf)) (synopsis "Data model artifacts for Prometheus") (description "This package provides data model artifacts for Prometheus.") (home-page "https://github.com/prometheus/client_model") @@ -3496,6 +3788,51 @@ well as a program to generate applications and command files.") storage system.") (license license:bsd-2))) +(define-public go-github-com-thejerf-suture + (package + (name "go-github-com-thejerf-suture") + (version "3.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/thejerf/suture") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "166hbjc1gn7skvq9vcp5h1xkavw9zw6dwx63vhih8fzm3nbbp0ic")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/thejerf/suture")) + (home-page "https://github.com/thejerf/suture") + (synopsis "Supervisor trees for Go") + (description "Suture provides Erlang-ish supervisor trees for Go. +\"Supervisor trees\" -> \"sutree\" -> \"suture\" -> holds your code together +when it's trying to die. + +It is intended to deal gracefully with the real failure cases that can occur +with supervision trees (such as burning all your CPU time endlessly restarting +dead services), while also making no unnecessary demands on the \"service\" +code, and providing hooks to perform adequate logging with in a production +environment") + (license license:expat))) + +(define-public go-github-com-thejerf-suture-v4 + (package + (inherit go-github-com-thejerf-suture) + (name "go-github-com-thejerf-suture-v4") + (version "4.0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/thejerf/suture") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15qi7v2a1kbf70yi3w6y26wbwj0sm8hv9f6xjrb4rl6nv9l8j88c")))))) + (define-public go-github-com-tidwall-gjson (package (name "go-github-com-tidwall-gjson") @@ -3703,6 +4040,34 @@ supported by the time package @end itemize") (license license:expat))) +(define-public go-github-com-vitrun-qart + (let ((commit "bf64b92db6b05651d6c25a3dabf2d543b360c0aa") + (revision "0")) + (package + (name "go-github-com-vitrun-qart") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vitrun/qart") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xk7qki703xmay9ghi3kq2bjf1iw9dz8wik55739d6i7sn77vvkc")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/vitrun/qart")) + (home-page "https://github.com/vitrun/qart") + (synopsis "Create QR codes with an embedded image") + (description + "This package provides a library for embedding human-meaningful +graphics in QR codes. However, instead of scribbling on redundant pieces and +relying on error correction to preserve the meaning, @code{qart} engineers the +encoded values to create the picture in a code with no inherent errors.") + (license license:bsd-3)))) + (define-public go-github-com-vividcortex-ewma (package (name "go-github-com-vividcortex-ewma") @@ -3779,6 +4144,34 @@ string. The string can be a string retorned for @code{time.Duration} or a similar string with weeks or days too.") (license license:bsd-3))) +(define-public go-go-etcd-io-bbolt + (package + (name "go-go-etcd-io-bbolt") + (version "1.3.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/etcd-io/bbolt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pj5245d417za41j6p09fmkbv05797vykr1bi9a6rnwddh1dbs8d")))) + (build-system go-build-system) + (arguments + `(#:import-path "go.etcd.io/bbolt" + ;; Extending the test timeout to 30 minutes still times out on aarch64. + #:tests? ,(not target-arm?))) + (propagated-inputs + (list go-golang-org-x-sys)) + (home-page "https://go.etcd.io/bbolt") + (synopsis "Embedded key/value database for Go") + (description "Bolt is a pure Go key/value store inspired by Howard Chu's +LMDB project. The goal of the project is to provide a simple, fast, and +reliable database for projects that don't require a full database server such as +Postgres or MySQL.") + (license license:expat))) + (define-public go-go-uber-org-atomic (package (name "go-go-uber-org-atomic") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4e3fe5bd10..d9145e9ac4 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org> ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> -;;; Copyright © 2018, 2019, 2020, 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com> +;;; Copyright © 2018, 2019, 2020, 2023, 2024 Katherine Cox-Buday <cox.katherine.e@gmail.com> ;;; Copyright © 2019 Giovanni Biscuolo <g@xelera.eu> ;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019, 2020, 2021 Arun Isaac <arunisaac@systemreboot.net> @@ -45,6 +45,7 @@ ;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com> ;;; Copyright © 2024 Greg Hogan <code@greghogan.com> +;;; Copyright © 2024 Brennan Vincent <brennan@umanwizard.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,7 +98,6 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages ruby) - #:use-module (gnu packages syncthing) #:use-module (gnu packages terminals) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) @@ -266,11 +266,11 @@ in the style of communicating sequential processes (@dfn{CSP}).") (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux")) (license license:bsd-3))) -(define-public go-1.14 +(define-public go-1.16 (package (inherit go-1.4) (name "go") - (version "1.14.15") + (version "1.16.15") (source (origin (method git-fetch) @@ -280,63 +280,39 @@ in the style of communicating sequential processes (@dfn{CSP}).") (file-name (git-file-name name version)) (sha256 (base32 - "1crh90qkvhlx23hwsi4wxy3l3h8973lr18135y6h1nnzzwr3n3ps")))) - (arguments - (substitute-keyword-arguments (package-arguments go-1.4) - ((#:system system) - (if (string-prefix? "aarch64-linux" (or (%current-system) - (%current-target-system))) - "aarch64-linux" - system)) + "0vlk0r4600ah9fg5apdd93g7i369k0rkzcgn7cs8h6qq2k6hpxjl")))) + (arguments + (substitute-keyword-arguments + (strip-keyword-arguments '(#:tests? #:system) (package-arguments go-1.4)) ((#:phases phases) `(modify-phases ,phases + (add-after 'unpack 'remove-unused-sourcecode-generators + (lambda _ + ;; Prevent perl from inclusion in closure through unused files + (for-each delete-file (find-files "src" "\\.pl$")))) (replace 'prebuild (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")) - (ld (string-append (assoc-ref inputs "libc") "/lib")) - (loader (car (append (find-files ld "^ld-linux.+") - (find-files ld "^ld(64)?\\.so.+")))) (net-base (assoc-ref inputs "net-base")) (tzdata-path - (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) - (output (assoc-ref outputs "out"))) + (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))) ;; Having the patch in the 'patches' field of <origin> breaks ;; the 'TestServeContent' test due to the fact that ;; timestamps are reset. Thus, apply it from here. (invoke "patch" "-p2" "--force" "-i" (assoc-ref inputs "go-skip-gc-test.patch")) - - ;; A side effect of these test scripts is testing - ;; cgo. Attempts at using cgo flags and directives with these - ;; scripts as specified here (https://golang.org/cmd/cgo/) - ;; have not worked. The tests continue to state that they can - ;; not find object files/headers despite being present. - (for-each - delete-file - '("cmd/go/testdata/script/mod_case_cgo.txt" - "cmd/go/testdata/script/list_find.txt" - "cmd/go/testdata/script/list_compiled_imports.txt" - "cmd/go/testdata/script/cgo_syso_issue29253.txt" - "cmd/go/testdata/script/cover_cgo.txt" - "cmd/go/testdata/script/cover_cgo_xtest.txt" - "cmd/go/testdata/script/cover_cgo_extra_test.txt" - "cmd/go/testdata/script/cover_cgo_extra_file.txt" - "cmd/go/testdata/script/cgo_path_space.txt" - "cmd/go/testdata/script/ldflag.txt" - "cmd/go/testdata/script/cgo_path.txt")) + (invoke "patch" "-p2" "--force" "-i" + (assoc-ref inputs "go-fix-script-tests.patch")) (for-each make-file-writable (find-files ".")) (substitute* "os/os_test.go" (("/usr/bin") (getcwd)) - (("/bin/pwd") (which "pwd")) (("/bin/sh") (which "sh"))) - ;; Backport fix for go-1.14 with GCC 9+ - ;; https://github.com/golang/go/issues/39157 - (substitute* "cmd/go/note_test.go" - (("cannot find 'ld'") "cannot find [‘']ld[’']")) + (substitute* "cmd/go/testdata/script/cgo_path_space.txt" + (("/bin/sh") (which "sh"))) ;; Add libgcc to runpath (substitute* "cmd/link/internal/ld/lib.go" @@ -344,7 +320,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (substitute* "cmd/go/internal/work/gccgo.go" (("cgoldflags := \\[\\]string\\{\\}") (string-append "cgoldflags := []string{" - "\"-rpath=" gcclib "\"" + "\"-Wl,-rpath=" gcclib "\"" "}")) (("\"-lgcc_s\", ") (string-append @@ -413,28 +389,42 @@ in the style of communicating sequential processes (@dfn{CSP}).") (substitute* "net/port_unix.go" (("/etc/services") (string-append net-base "/etc/services"))) (substitute* "time/zoneinfo_unix.go" - (("/usr/share/zoneinfo/") tzdata-path)) - (substitute* (find-files "cmd" "\\.go") - (("/lib(64)?/ld-linux.*\\.so\\.[0-9]") loader)) - #t))) + (("/usr/share/zoneinfo/") tzdata-path))))) (add-before 'build 'set-bootstrap-variables (lambda* (#:key outputs inputs #:allow-other-keys) ;; Tell the build system where to find the bootstrap Go. (let ((go (assoc-ref inputs "go"))) (setenv "GOROOT_BOOTSTRAP" go) - (setenv "GOGC" "400") - #t))) + (setenv "GOGC" "400")))) (replace 'build - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key inputs outputs (parallel-build? #t) + #:allow-other-keys) ;; FIXME: Some of the .a files are not bit-reproducible. - (let* ((output (assoc-ref outputs "out"))) + ;; (Is this still true?) + (let* ((njobs (if parallel-build? (parallel-job-count) 1)) + (output (assoc-ref outputs "out")) + (loader (string-append (assoc-ref inputs "libc") + ,(glibc-dynamic-linker)))) (setenv "CC" (which "gcc")) + (setenv "GO_LDSO" loader) (setenv "GOOS" "linux") (setenv "GOROOT" (dirname (getcwd))) (setenv "GOROOT_FINAL" output) (setenv "GOCACHE" "/tmp/go-cache") - (setenv "CGO_ENABLED" "1") - (invoke "sh" "all.bash")))) + (setenv "GOMAXPROCS" (number->string njobs)) + (invoke "sh" "make.bash" "--no-banner")))) + (replace 'check + (lambda* (#:key target (tests? (not target)) (parallel-tests? #t) + #:allow-other-keys) + (let* ((njobs (if parallel-tests? (parallel-job-count) 1))) + (when tests? + (setenv "GOMAXPROCS" (number->string njobs)) + (invoke "sh" "run.bash" "--no-rebuild"))))) + (add-before 'install 'unpatch-perl-shebangs + (lambda _ + ;; Rewrite references to perl input in test scripts + (substitute* "net/http/cgi/testdata/test.cgi" + (("^#!.*") "#!/usr/bin/env perl\n")))) (replace 'install ;; TODO: Most of this could be factorized with Go 1.4. (lambda* (#:key outputs #:allow-other-keys) @@ -468,8 +458,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") '("README.md" "CONTRIBUTORS" "AUTHORS" "PATENTS" "LICENSE" "VERSION" "CONTRIBUTING.md" "robots.txt")) - (copy-recursively "../" output) - #t))))))) + (copy-recursively "../" output)))))))) (native-inputs `(,@(if (member (%current-system) (package-supported-systems go-1.4)) `(("go" ,go-1.4)) @@ -479,167 +468,11 @@ in the style of communicating sequential processes (@dfn{CSP}).") ((or "armhf-linux" "aarch64-linux") `(("gold" ,binutils-gold))) (_ `())) + ("go-fix-script-tests.patch" ,(search-patch "go-fix-script-tests.patch")) ,@(package-native-inputs go-1.4))) (supported-systems (fold delete %supported-systems (list "powerpc-linux" "i586-gnu"))))) -(define-public go-1.16 - (package - (inherit go-1.14) - (name "go") - (version "1.16.15") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/golang/go") - (commit (string-append "go" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0vlk0r4600ah9fg5apdd93g7i369k0rkzcgn7cs8h6qq2k6hpxjl")))) - (arguments - (substitute-keyword-arguments - (strip-keyword-arguments '(#:tests?) (package-arguments go-1.14)) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'remove-unused-sourcecode-generators - (lambda _ - ;; Prevent perl from inclusion in closure through unused files - (for-each delete-file (find-files "src" "\\.pl$")))) - (replace 'prebuild - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")) - (net-base (assoc-ref inputs "net-base")) - (tzdata-path - (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))) - - ;; Having the patch in the 'patches' field of <origin> breaks - ;; the 'TestServeContent' test due to the fact that - ;; timestamps are reset. Thus, apply it from here. - (invoke "patch" "-p2" "--force" "-i" - (assoc-ref inputs "go-skip-gc-test.patch")) - (invoke "patch" "-p2" "--force" "-i" - (assoc-ref inputs "go-fix-script-tests.patch")) - - (for-each make-file-writable (find-files ".")) - - (substitute* "os/os_test.go" - (("/usr/bin") (getcwd)) - (("/bin/sh") (which "sh"))) - - (substitute* "cmd/go/testdata/script/cgo_path_space.txt" - (("/bin/sh") (which "sh"))) - - ;; Add libgcc to runpath - (substitute* "cmd/link/internal/ld/lib.go" - (("!rpath.set") "true")) - (substitute* "cmd/go/internal/work/gccgo.go" - (("cgoldflags := \\[\\]string\\{\\}") - (string-append "cgoldflags := []string{" - "\"-Wl,-rpath=" gcclib "\"" - "}")) - (("\"-lgcc_s\", ") - (string-append - "\"-Wl,-rpath=" gcclib "\", \"-lgcc_s\", "))) - (substitute* "cmd/go/internal/work/gc.go" - (("ldflags = setextld\\(ldflags, compiler\\)") - (string-append - "ldflags = setextld(ldflags, compiler)\n" - "ldflags = append(ldflags, \"-r\")\n" - "ldflags = append(ldflags, \"" gcclib "\")\n"))) - - ;; Disable failing tests: these tests attempt to access - ;; commands or network resources which are neither available - ;; nor necessary for the build to succeed. - (for-each - (match-lambda - ((file regex) - (substitute* file - ((regex all before test_name) - (string-append before "Disabled" test_name))))) - '(("net/net_test.go" "(.+)(TestShutdownUnix.+)") - ("net/dial_test.go" "(.+)(TestDialTimeout.+)") - ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPort.+)") - ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPortWithCancel.+)") - ;; 127.0.0.1 doesn't exist - ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPTR.+)") - ;; 127.0.0.1 doesn't exist - ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPTRWithCancel.+)") - ;; /etc/services doesn't exist - ("net/parse_test.go" "(.+)(TestReadLine.+)") - ("os/os_test.go" "(.+)(TestHostname.+)") - ;; The user's directory doesn't exist - ("os/os_test.go" "(.+)(TestUserHomeDir.+)") - ("time/format_test.go" "(.+)(TestParseInSydney.+)") - ("time/format_test.go" "(.+)(TestParseInLocation.+)") - ("os/exec/exec_test.go" "(.+)(TestEcho.+)") - ("os/exec/exec_test.go" "(.+)(TestCommandRelativeName.+)") - ("os/exec/exec_test.go" "(.+)(TestCatStdin.+)") - ("os/exec/exec_test.go" "(.+)(TestCatGoodAndBadFile.+)") - ("os/exec/exec_test.go" "(.+)(TestExitStatus.+)") - ("os/exec/exec_test.go" "(.+)(TestPipes.+)") - ("os/exec/exec_test.go" "(.+)(TestStdinClose.+)") - ("os/exec/exec_test.go" "(.+)(TestIgnorePipeErrorOnSuccess.+)") - ("syscall/syscall_unix_test.go" "(.+)(TestPassFD\\(.+)") - ("os/exec/exec_test.go" "(.+)(TestExtraFiles/areturn.+)") - ("cmd/go/go_test.go" "(.+)(TestCoverageWithCgo.+)") - ("cmd/go/go_test.go" "(.+)(TestTwoPkgConfigs.+)") - ("os/exec/exec_test.go" "(.+)(TestOutputStderrCapture.+)") - ("os/exec/exec_test.go" "(.+)(TestExtraFiles.+)") - ("os/exec/exec_test.go" "(.+)(TestExtraFilesRace.+)") - ("net/lookup_test.go" "(.+)(TestLookupPort.+)") - ("syscall/exec_linux_test.go" - "(.+)(TestCloneNEWUSERAndRemapNoRootDisableSetgroups.+)"))) - - ;; These tests fail on aarch64-linux - (substitute* "cmd/dist/test.go" - (("t.registerHostTest\\(\"testsanitizers/msan.*") "")) - - ;; fix shebang for testar script - ;; note the target script is generated at build time. - (substitute* "../misc/cgo/testcarchive/carchive_test.go" - (("#!/usr/bin/env") (string-append "#!" (which "env")))) - - (substitute* "net/lookup_unix.go" - (("/etc/protocols") (string-append net-base "/etc/protocols"))) - (substitute* "net/port_unix.go" - (("/etc/services") (string-append net-base "/etc/services"))) - (substitute* "time/zoneinfo_unix.go" - (("/usr/share/zoneinfo/") tzdata-path))))) - (replace 'build - (lambda* (#:key inputs outputs (parallel-build? #t) - #:allow-other-keys) - ;; FIXME: Some of the .a files are not bit-reproducible. - ;; (Is this still true?) - (let* ((njobs (if parallel-build? (parallel-job-count) 1)) - (output (assoc-ref outputs "out")) - (loader (string-append (assoc-ref inputs "libc") - ,(glibc-dynamic-linker)))) - (setenv "CC" (which "gcc")) - (setenv "GO_LDSO" loader) - (setenv "GOOS" "linux") - (setenv "GOROOT" (dirname (getcwd))) - (setenv "GOROOT_FINAL" output) - (setenv "GOCACHE" "/tmp/go-cache") - (setenv "GOMAXPROCS" (number->string njobs)) - (invoke "sh" "make.bash" "--no-banner")))) - (replace 'check - (lambda* (#:key target (tests? (not target)) (parallel-tests? #t) - #:allow-other-keys) - (let* ((njobs (if parallel-tests? (parallel-job-count) 1))) - (when tests? - (setenv "GOMAXPROCS" (number->string njobs)) - (invoke "sh" "run.bash" "--no-rebuild"))))) - (add-before 'install 'unpatch-perl-shebangs - (lambda _ - ;; Rewrite references to perl input in test scripts - (substitute* "net/http/cgi/testdata/test.cgi" - (("^#!.*") "#!/usr/bin/env perl\n")))))))) - (native-inputs - `(("go-fix-script-tests.patch" ,(search-patch "go-fix-script-tests.patch")) - ,@(package-native-inputs go-1.14))))) - ;; https://github.com/golang/go/wiki/MinimumRequirements#microarchitecture-support (define %go-1.17-arm-micro-architectures (list "armv5" "armv6" "armv7")) @@ -1114,6 +947,44 @@ in the style of communicating sequential processes (@dfn{CSP}).") ("api" "share/go/api" ,tests) ("test" "share/go/test" ,tests)))))))))))) +(define-public go-1.22 + (package + (inherit go-1.21) + (name "go") + (version "1.22.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/golang/go") + (commit (string-append "go" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0p6v5dl4mzlrma6v1a26d8zr4csq5mm10d9sdhl3kn9d22vphql1")))) + (arguments + (substitute-keyword-arguments (package-arguments go-1.21) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'unpatch-perl-shebangs + (lambda _ + ;; Avoid inclusion of perl in closure by rewriting references + ;; to perl input in sourcecode generators and test scripts + (substitute* (find-files "src" "\\.pl$") + (("^#!.*") + "#!/usr/bin/env perl\n")))) + (add-after 'unpack 'remove-flakey-thread-sanitizer-tests + (lambda _ + ;; These tests have been identified as flakey: + ;; https://github.com/golang/go/issues/66427 + (substitute* "src/cmd/cgo/internal/testsanitizers/tsan_test.go" + ((".*tsan1[34].*") "")))))))) + (native-inputs + ;; Go 1.22 and later requires Go 1.20 (min. 1.20.6, which we don't have) + ;; as the bootstrap toolchain. + (alist-replace "go" + (list go-1.21) + (package-native-inputs go-1.21))))) + (define-public go go-1.17) (define make-go-std @@ -1150,13 +1021,13 @@ in the style of communicating sequential processes (@dfn{CSP}).") (export make-go-std) ;; Make those public so they have a corresponding Cuirass job. -(define-public go-std-1.14 (make-go-std go-1.14)) (define-public go-std-1.16 (make-go-std go-1.16)) (define-public go-std-1.17 (make-go-std go-1.17)) (define-public go-std-1.18 (make-go-std go-1.18)) (define-public go-std-1.19 (make-go-std go-1.19)) (define-public go-std-1.20 (make-go-std go-1.20)) (define-public go-std-1.21 (make-go-std go-1.21)) +(define-public go-std-1.22 (make-go-std go-1.22)) (define-public go-0xacab-org-leap-shapeshifter (let ((commit "0aa6226582efb8e563540ec1d3c5cfcd19200474") @@ -6335,7 +6206,7 @@ test when a comparison fails.") '(#:import-path "gotest.tools/gotestsum")) (native-inputs (list go-github-com-fatih-color - go-golang.org-x-sync-errgroup + go-golang-org-x-sync go-github-com-pkg-errors go-github-com-sirupsen-logrus go-github-com-spf13-pflag @@ -6357,25 +6228,34 @@ test results.") (home-page "https://github.com/gotestyourself/gotestsum") (license license:asl2.0))) -(define-public go-github-com-golang-protobuf-proto +(define-public go-github-com-golang-protobuf (package - (name "go-github-com-golang-protobuf-proto") - (version "1.3.1") + (name "go-github-com-golang-protobuf") + (version "1.5.3") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/golang/protobuf") - (commit (string-append "v" version)))) + (url "https://github.com/golang/protobuf") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl")))) + "03f1w2cd4s8a3xhl61x7yjx81kbzlrjpvnnwmbhqnz814yi7h43i")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/golang/protobuf/proto" - #:unpack-path "github.com/golang/protobuf" - ;; Requires unpackaged golang.org/x/sync/errgroup - #:tests? #f)) + (list #:import-path "github.com/golang/protobuf" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (propagated-inputs + (list go-google-golang-org-protobuf)) (synopsis "Go support for Protocol Buffers") (description "This package provides Go support for the Protocol Buffers data serialization format.") @@ -6385,7 +6265,7 @@ data serialization format.") (define-public go-google-golang-org-protobuf (package (name "go-google-golang-org-protobuf") - (version "1.28.0") + (version "1.31.0") (source (origin (method git-fetch) (uri (git-reference @@ -6394,16 +6274,22 @@ data serialization format.") (file-name (git-file-name name version)) (sha256 (base32 - "1nzcc4qc00afi24nb7nlnwyzvvr6b8s8qdrn1sw085nygh2y2x8r")))) + "1xf18kzz96hgfy1vlbnydrizzpxkqj2iamfdbj3dx5a1zz5mi8n0")))) (build-system go-build-system) (arguments - (list #:import-path "google.golang.org/protobuf" - #:tests? #f ; source-only package - #:phases #~(modify-phases %standard-phases - ;; source-only package - (delete 'build)))) - (propagated-inputs (list go-github-com-google-go-cmp-cmp - go-github-com-golang-protobuf-proto)) + (list #:go go-1.21 + #:import-path "google.golang.org/protobuf" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (propagated-inputs (list go-github-com-google-go-cmp-cmp)) (home-page "https://google.golang.org/protobuf") (synopsis "Go library for Protocol Buffers") (description @@ -6603,31 +6489,6 @@ characters with their ASCII approximations.") (description "Go library that pluralizes and singularizes English nouns.") (license license:bsd-2)))) -(define-public go-github-com-klauspost-cpuid - (package - (name "go-github-com-klauspost-cpuid") - (version "1.2.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/klauspost/cpuid") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1s510210wdj5dkamii1qrk7v87k4qpdcrrjzflp5ha9iscw6b06l")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/klauspost/cpuid")) - (home-page "https://github.com/klauspost/cpuid") - (synopsis "CPU feature identification for Go") - (description "@code{cpuid} provides information about the CPU running the -current program. CPU features are detected on startup, and kept for fast access -through the life of the application. Currently x86 / x64 (AMD64) is supported, -and no external C (cgo) code is used, which should make the library very eas -to use.") - (license license:expat))) - (define-public go-github-com-surge-glog (let ((commit "2578deb2b95c665e6b1ebabf304ce2085c9e1985") (revision "1")) @@ -6704,34 +6565,6 @@ various ways. It is a Go implementation of some string manipulation libraries of Java Apache Commons.") (license license:asl2.0))) -(define-public go-github-com-masterminds-semver - (package - (name "go-github-com-masterminds-semver") - (version "3.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Masterminds/semver") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1g1wizfdy29d02l9dh8gsb029yr4m4swp13swf0pnh9ryh5f1msz")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/Masterminds/semver")) - (home-page "https://github.com/Masterminds/semver/") - (synopsis "@code{semver} helps to work with semantic versions") - (description "The semver package provides the ability to work with -semantic versions. Specifically it provides the ability to: -@itemize -@item Parse semantic versions -@item Sort semantic versions -@item Check if a semantic version fits within a set of constraints -@item Optionally work with a @code{v} prefix -@end itemize\n") - (license license:expat))) - (define-public go-github-com-huandu-xstrings (package (name "go-github-com-huandu-xstrings") @@ -6804,40 +6637,6 @@ maps (because they are not addressable using Go reflection).") (native-inputs (list go-gopkg-in-yaml-v3)))) -(define-public go-github-com-masterminds-sprig - (package - (name "go-github-com-masterminds-sprig") - (version "3.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Masterminds/sprig") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0wwi8n2adjc5jlga25lqq0hrz4jcgd5vpll68y2dfji034caaq18")))) - (build-system go-build-system) - (arguments - `(#:tests? #f ;network tests only - #:import-path "github.com/Masterminds/sprig")) - (native-inputs - (list go-github-com-masterminds-goutils - go-github-com-masterminds-semver - go-github-com-google-uuid - go-github-com-huandu-xstrings - go-github-com-imdario-mergo - go-github-com-mitchellh-reflectwalk - go-github-com-mitchellh-copystructure - go-github-com-spf13-cast - go-golang-org-x-crypto - go-github-com-stretchr-testify)) - (home-page "https://github.com/Masterminds/sprig/") - (synopsis "Template functions for Go templates") - (description "Sprig is a library that provides more than 100 commonly used -template functions.") - (license license:expat))) - (define-public go-github-com-bmatcuk-doublestar (package (name "go-github-com-bmatcuk-doublestar") @@ -6889,26 +6688,23 @@ matching and globbing with support for \"doublestar\" patterns.") #:unpack-path "github.com/bmatcuk/doublestar/v2" #:import-path "github.com/bmatcuk/doublestar/v2")))) -(define-public go-github-com-dlclark-regexp2 +(define-public go-github-com-bmatcuk-doublestar-v4 (package - (name "go-github-com-dlclark-regexp2") - (version "1.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dlclark/regexp2") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1irfv89b7lfkn7k3zgx610ssil6k61qs1wjj31kvqpxb3pdx4kry")))) - (build-system go-build-system) + (inherit go-github-com-bmatcuk-doublestar) + (name "go-github-com-bmatcuk-doublestar-v4") + (version "4.6.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bmatcuk/doublestar") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12rf4a9isgg2nh927gikgbmyaynaqp4kjahgscb4qnr04m3vpr41")))) (arguments - `(#:import-path "github.com/dlclark/regexp2")) - (home-page "https://github.com/dlclark/regexp2/") - (synopsis "Full featured regular expressions for Go") - (description "Regexp2 is a feature-rich RegExp engine for Go.") - (license license:expat))) + (list + #:import-path "github.com/bmatcuk/doublestar/v4")))) (define-public go-github-com-alecthomas-colour (package @@ -7801,8 +7597,8 @@ formatting information, rather than the current locale name.") ;; Source-only package (delete 'build)))) (propagated-inputs - (list go-github-com-golang-protobuf-proto - go-github-com-matttproud-golang-protobuf-extensions-pbutil + (list go-github-com-golang-protobuf + go-github-com-matttproud-golang-protobuf-extensions-v2 go-github-com-prometheus-client-model)) (synopsis "Prometheus metrics") (description "This package provides tools for reading and writing @@ -7829,7 +7625,7 @@ Prometheus metrics.") ;; The tests require Go modules, which are not yet supported in Guix's ;; Go build system. #:tests? #f)) - (propagated-inputs (list go-golang.org-x-sync-errgroup)) + (propagated-inputs (list go-golang-org-x-sync)) (synopsis "Go library for reading @file{/proc}") (description "The @code{procfs} Go package provides functions to retrieve system, kernel, and process metrics from the @file{/proc} pseudo file system.") @@ -7859,7 +7655,7 @@ system, kernel, and process metrics from the @file{/proc} pseudo file system.") (delete 'build)))) (propagated-inputs (list go-github-com-beorn7-perks-quantile - go-github-com-golang-protobuf-proto + go-github-com-golang-protobuf go-github-com-prometheus-client-model go-github-com-prometheus-common go-github-com-prometheus-procfs @@ -7927,29 +7723,6 @@ losing type information. The primary intended use is for implementing configuration languages, but other uses may be possible too.") (license license:expat))) -(define-public go-etcd-io-bbolt - (package - (name "go-etcd-io-bbolt") - (version "1.3.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/etcd-io/bbolt") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0pj5245d417za41j6p09fmkbv05797vykr1bi9a6rnwddh1dbs8d")))) - (build-system go-build-system) - (arguments - `(#:import-path "go.etcd.io/bbolt")) - (propagated-inputs - (list go-golang-org-x-sys)) - (home-page "https://pkg.go.dev/go.etcd.io/bbolt/") - (synopsis "Low-level key/value store in Go") - (description "This package implements a low-level key/value store in Go.") - (license license:expat))) - (define-public go-github-com-rogpeppe-go-internal (package (name "go-github-com-rogpeppe-go-internal") diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 5447ecec1e..6f6ac3fd08 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -190,13 +190,13 @@ framework}.") (define-public ghc-tasty-hspec (package (name "ghc-tasty-hspec") - (version "1.2.0.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "tasty-hspec" version)) - (sha256 - (base32 - "0ibl2xi6mmqad2mriz67nb7pjwwvjik385amp24j9kc7a7zkx091")))) + (version "1.2.0.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "tasty-hspec" version)) + (sha256 + (base32 "0cfcpi25jmnmzfzsx364qsj68q6gyph5z112kl8ja222hnhhr2n2")))) (build-system haskell-build-system) (properties '((upstream-name . "tasty-hspec"))) (inputs (list ghc-hspec @@ -206,9 +206,6 @@ framework}.") ghc-tasty-smallcheck ghc-tasty-quickcheck ghc-tagged)) - (arguments - `(#:cabal-revision ("1" - "0a6r4gzxzp6n90z0nif7ha7p7am57hs48i54i2y4z9kgjv6lnvll"))) (home-page "https://github.com/mitchellwrosen/tasty-hspec") (synopsis "Hspec support for the Tasty test framework") (description @@ -365,13 +362,13 @@ development.") (define-public ghc-quickcheck-instances (package (name "ghc-quickcheck-instances") - (version "0.3.28") - (source (origin - (method url-fetch) - (uri (hackage-uri "quickcheck-instances" version)) - (sha256 - (base32 - "1jycijv7gaj6qrkp219nllrdv9zd0ifp0mb0rch430fm95xin4f4")))) + (version "0.3.29.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "quickcheck-instances" version)) + (sha256 + (base32 "0jx2wfy7y5dr14s9i457g2aah4isjxry4mlbqhj7vlav6ib84gdj")))) (build-system haskell-build-system) (properties '((upstream-name . "quickcheck-instances"))) (inputs (list ghc-quickcheck @@ -392,7 +389,11 @@ development.") ghc-unordered-containers ghc-uuid-types ghc-vector + ghc-data-array-byte ghc-text-short)) + (arguments + `(#:cabal-revision ("2" + "118xy4z4dy4bpkzsp98daiv3l4n5j7ph9my0saca7cqjybqwkcip"))) (home-page "https://github.com/haskellari/qc-instances") (synopsis "Common quickcheck instances") (description "This package provides QuickCheck instances for types @@ -445,14 +446,13 @@ use HUnit assertions as QuickCheck properties.") (define-public ghc-quickcheck (package (name "ghc-quickcheck") - (version "2.14.2") + (version "2.14.3") (source (origin (method url-fetch) (uri (hackage-uri "QuickCheck" version)) (sha256 - (base32 - "1wrnrm9sq4s0bly0q58y80g4153q45iglqa34xsi2q3bd62nqyyq")))) + (base32 "0085lwy14r7hk7ibmv8d7d54ja9zin0ijf0b27xai898dfrj43sw")))) (build-system haskell-build-system) (properties '((upstream-name . "QuickCheck"))) (inputs @@ -755,18 +755,18 @@ Haskell, inspired by the Ruby library RSpec.") (package (name "ghc-hspec-contrib") (version "0.5.1.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "hspec-contrib" version)) - (sha256 - (base32 - "1nyb5n2jiq920yyf3flzyxrs5xpfyppl3jn18zhviyysjjk5drpx")))) + (source + (origin + (method url-fetch) + (uri (hackage-uri "hspec-contrib" version)) + (sha256 + (base32 "1nyb5n2jiq920yyf3flzyxrs5xpfyppl3jn18zhviyysjjk5drpx")))) (build-system haskell-build-system) (properties '((upstream-name . "hspec-contrib"))) - (inputs (list ghc-hunit ghc-hspec-core)) + (inputs (list ghc-hunit ghc-call-stack ghc-hspec-core)) (native-inputs (list ghc-quickcheck ghc-hspec hspec-discover)) - (arguments (list #:tests? #f)) ; Tests fail to compile. - (home-page "http://hspec.github.io/") + (arguments (list #:tests? #f)) ; Fail to build. + (home-page "https://hspec.github.io/") (synopsis "Contributed functionality for Hspec") (description "This package provides contributed Hspec extensions.") (license license:expat))) diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 7e1935ece3..83ba8bc10b 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -324,17 +324,19 @@ elsewhere.") (define-public ghc-digest (package (name "ghc-digest") - (version "0.0.1.4") - (source (origin - (method url-fetch) - (uri (hackage-uri "digest" version)) - (sha256 - (base32 - "05pc5l4bwddszc6vy1hazwi1dnrxg323521gdkis9cvh7zs2a4gr")))) + (version "0.0.1.7") + (source + (origin + (method url-fetch) + (uri (hackage-uri "digest" version)) + (sha256 + (base32 "02jzw0bsng87y1n2kgpy7vb30lvqsnpbfd8dpg4hmvbg9s06qgdj")))) (build-system haskell-build-system) (properties '((upstream-name . "digest"))) (arguments - `(#:extra-directories ("zlib"))) + `(#:extra-directories ("zlib") + #:cabal-revision ("1" + "0wh34kyag2vhwvsdwv8qmvm13gy32nc94yfyqfdnl67nyc2sx8wl"))) (inputs (list zlib)) (native-inputs (list pkg-config)) (home-page "http://hackage.haskell.org/package/digest") @@ -722,13 +724,13 @@ extensions.") (define-public ghc-hsopenssl (package (name "ghc-hsopenssl") - (version "0.11.7.4") - (source (origin - (method url-fetch) - (uri (hackage-uri "HsOpenSSL" version)) - (sha256 - (base32 - "0zxcfa8b0ng97v53vb8fvg2gss89b28xiz83rx38a0h4lsxpn2xf")))) + (version "0.11.7.5") + (source + (origin + (method url-fetch) + (uri (hackage-uri "HsOpenSSL" version)) + (sha256 + (base32 "0y0l5nb0jsc8lm12w66a2n7nwcrgjxy1q2xdy8a788695az5xy71")))) (build-system haskell-build-system) (properties '((upstream-name . "HsOpenSSL"))) (inputs (list ghc-network openssl)) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 75b84b10a7..0aaa609e42 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -72,29 +72,22 @@ for screen-scraping.") (define-public ghc-cookie (package (name "ghc-cookie") - (version "0.4.5") + (version "0.4.6") (source (origin (method url-fetch) (uri (hackage-uri "cookie" version)) (sha256 - (base32 - "10rmdasb7mypbwxdj2mhr810vqhkakpik7hyd8fvj60hng8r8zvh")))) + (base32 "1ajbcsk4k0jc6v2fqn36scs6l8wa6fq46gd54pak75rbqdbajhcc")))) (build-system haskell-build-system) (properties '((upstream-name . "cookie"))) - (inputs - (list ghc-old-locale - ghc-blaze-builder - ghc-data-default-class - ghc-hunit - ghc-quickcheck - ghc-tasty - ghc-tasty-hunit - ghc-tasty-quickcheck)) + (inputs (list ghc-data-default-class)) + (native-inputs (list ghc-hunit ghc-quickcheck ghc-tasty ghc-tasty-hunit + ghc-tasty-quickcheck)) (home-page "https://github.com/snoyberg/cookie") (synopsis "HTTP cookie parsing and rendering") (description "HTTP cookie parsing and rendering library for Haskell.") - (license license:bsd-3))) + (license license:expat))) (define-public ghc-curl (package @@ -363,58 +356,54 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.") (define-public ghc-http-conduit (package - (name "ghc-http-conduit") - (version "2.3.8") + (name "ghc-http-conduit") + (version "2.3.8.1") (source (origin (method url-fetch) (uri (hackage-uri "http-conduit" version)) (sha256 - (base32 - "1bj24phbcb7s3k6v48l5gk82m3m23j8zy9l7c5ccxp3ghn9z5gng")))) + (base32 "11zf4hyw8f1gpj0w1cmgc9g62xwy2v4hhzqazdsla4q49iqbzxgd")))) (build-system haskell-build-system) (properties '((upstream-name . "http-conduit"))) - ;; FIXME: `httpLbs TLS` in test-suite `test` fails with - ;; ConnectionFailure getProtocolByName: does not exist (no such protocol - ;; name: tcp) - (arguments `(#:tests? #f)) - (inputs - (list ghc-aeson - ghc-resourcet - ghc-conduit - ghc-conduit-extra - ghc-http-types - ghc-lifted-base - ghc-http-client - ghc-http-client-tls - ghc-monad-control - ghc-exceptions - ghc-unliftio)) - (native-inputs - (list ghc-hunit - ghc-hspec - ghc-data-default-class - ghc-connection - ghc-warp-tls - ghc-blaze-builder - ghc-conduit - ghc-utf8-string - ghc-case-insensitive - ghc-lifted-base - ghc-network - ghc-wai - ghc-warp - ghc-wai-conduit - ghc-http-types - ghc-cookie - ghc-conduit-extra - ghc-streaming-commons - ghc-aeson - ghc-temporary - ghc-resourcet)) - (home-page "https://hackage.haskell.org/package/http-conduit") + (inputs (list ghc-attoparsec + ghc-resourcet + ghc-conduit + ghc-conduit-extra + ghc-http-types + ghc-http-client + ghc-http-client-tls + ghc-unliftio-core + ghc-aeson)) + (native-inputs (list ghc-hunit + ghc-hspec + ghc-data-default-class + ghc-warp-tls + ghc-tls + ghc-blaze-builder + ghc-utf8-string + ghc-case-insensitive + ghc-unliftio + ghc-wai + ghc-warp + ghc-wai-conduit + ghc-cookie + ghc-streaming-commons + ghc-temporary + ghc-network)) + (arguments + `(#:cabal-revision ("1" + "1wvr0v948s5fmlf47r4pqjan355x6v65rm7dz7y65ngj10xwk5f9") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "http-conduit.cabal" + ((", network") ", network\n , connection\n"))))))) + (home-page "https://github.com/snoyberg/http-client") (synopsis "HTTP/HTTPS client with conduit interface") - (description "This library uses attoparsec for parsing the actual + (description + "This library uses attoparsec for parsing the actual contents of the HTTP connection. It also provides higher-level functions which allow you to avoid direct usage of conduits.") (license license:bsd-3))) @@ -781,18 +770,21 @@ See also: (define-public ghc-xss-sanitize (package (name "ghc-xss-sanitize") - (version "0.3.7.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "xss-sanitize" version)) - (sha256 - (base32 - "1lmmyh28mb1k44m63m7qx6iy4x2fgqq5srmky47dsm0fby9iag1h")))) + (version "0.3.7.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "xss-sanitize" version)) + (sha256 + (base32 "0in9kn51i2ddh5c8scyf9l8zi6zxidwznn34qwj02nglw5dpzfqv")))) (build-system haskell-build-system) (properties '((upstream-name . "xss-sanitize"))) (inputs (list ghc-attoparsec ghc-css-text ghc-network-uri ghc-tagsoup ghc-utf8-string)) (native-inputs (list ghc-hunit ghc-hspec)) + (arguments + `(#:cabal-revision ("1" + "1l8y52nja9a2iyxawm3vp23jcs46ziwx0yj2w46drb7knaa306d0"))) (home-page "https://github.com/yesodweb/haskell-xss-sanitize#readme") (synopsis "Sanitize untrusted HTML to prevent XSS attacks") (description @@ -930,7 +922,8 @@ entity decoding bugfixes applied.") (uri (hackage-uri "aeson" version)) (sha256 (base32 - "09dk0j33n262dm75vff3y3i9fm6lh06dyqswwv7a6kvnhhmhlxhr")))) + "09dk0j33n262dm75vff3y3i9fm6lh06dyqswwv7a6kvnhhmhlxhr")) + (patches (search-patches "ghc-aeson-encodeDouble.patch")))) (build-system haskell-build-system) (properties '((upstream-name . "aeson"))) (inputs (list ghc-base-compat-batteries @@ -1196,13 +1189,13 @@ avoid any issues with characters.") (define-public ghc-yesod-core (package (name "ghc-yesod-core") - (version "1.6.24.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "yesod-core" version)) - (sha256 - (base32 - "19ilgm73108ki1hvqc86kir0yrx36vp9g45na6g8dmfsvk9izr10")))) + (version "1.6.24.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "yesod-core" version)) + (sha256 + (base32 "0cql4gk83ya0lyv0nyrp387nljpab4dwwy288rzp8klq9z5r2a7j")))) (build-system haskell-build-system) (properties '((upstream-name . "yesod-core"))) (inputs (list ghc-aeson @@ -1241,9 +1234,6 @@ avoid any issues with characters.") ghc-hspec-expectations ghc-network ghc-streaming-commons)) - (arguments - `(#:cabal-revision ("1" - "1406s7is60ji6nn3h1mafkdh7729ipq3i06cqsq77hz2ilj264jl"))) (home-page "http://www.yesodweb.com/") (synopsis "Core package for the Yesod web framework") (description @@ -1282,13 +1272,13 @@ from Yesod.") (define-public ghc-yesod-form (package (name "ghc-yesod-form") - (version "1.7.3") - (source (origin - (method url-fetch) - (uri (hackage-uri "yesod-form" version)) - (sha256 - (base32 - "10y3mfh96sicqyzngvl7f4wrjgkvl3znqnh71s8gx1vf7158sjww")))) + (version "1.7.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "yesod-form" version)) + (sha256 + (base32 "012w6pq0zznwqn19nx5h30rmd7dazcd0d75a6426d7brxvf9vn98")))) (build-system haskell-build-system) (properties '((upstream-name . "yesod-form"))) (inputs (list ghc-aeson @@ -2156,13 +2146,13 @@ aims to be compliant with @url{https://www.w3.org/TR/cors}.") (define-public ghc-network-run (package (name "ghc-network-run") - (version "0.2.4") + (version "0.2.5") (source - (origin - (method url-fetch) - (uri (hackage-uri "network-run" version)) - (sha256 - (base32 "0w3dmwk03j4n01xkiq8m4sqa27bskh239mpw7m4ihjmkxqcwc5gl")))) + (origin + (method url-fetch) + (uri (hackage-uri "network-run" version)) + (sha256 + (base32 "08662w7ja9w4a4fwikaawxnxcszkd0mdmaajmshas2dd25xyikwi")))) (build-system haskell-build-system) (properties '((upstream-name . "network-run"))) (inputs (list ghc-network)) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b5943f2f47..fa423ae2ca 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -150,22 +150,19 @@ module for more details.") (define-public ghc-active (package (name "ghc-active") - (version "0.2.0.16") - (source (origin - (method url-fetch) - (uri (hackage-uri "active" version)) - (sha256 - (base32 - "1fz2rsyk41p9f9avlmn9lrdmii5alv88lkw677mw8q6mzyxpw67i")))) + (version "0.2.0.18") + (source + (origin + (method url-fetch) + (uri (hackage-uri "active" version)) + (sha256 + (base32 "1fn3cyf43x18p2phs8bhacbp8zl8aifrh7ndzs0qi6n6g9sw95qn")))) (build-system haskell-build-system) (properties '((upstream-name . "active"))) (inputs (list ghc-vector ghc-semigroups ghc-semigroupoids ghc-lens ghc-linear)) (native-inputs (list ghc-quickcheck)) - (arguments - `(#:cabal-revision ("1" - "0cyfwrr5c14f5rgrf8dv7i8qsrnmnzigw0xp6l88kfxd61zhk4n8"))) - (home-page "http://hackage.haskell.org/package/active") + (home-page "https://hackage.haskell.org/package/active") (synopsis "Abstractions for animation") (description "This package defines an @code{Active} abstraction for @@ -198,7 +195,7 @@ diagrams framework}.") ghc-transformers-compat ghc-void)) (native-inputs (list ghc-generic-deriving ghc-hspec hspec-discover)) - (home-page "http://github.com/ekmett/adjunctions/") + (home-page "https://github.com/ekmett/adjunctions/") (synopsis "Adjunctions and representable functors") (description "This library provides adjunctions and representable functors for Haskell.") @@ -299,13 +296,13 @@ systems.") (define-public ghc-alex (package (name "ghc-alex") - (version "3.2.7.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "alex" version)) - (sha256 - (base32 - "1v0vm1l4xvybzwj1p6j5j58yiw5nhbnx7yxjnpyjy6wggsig3llv")))) + (version "3.2.7.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "alex" version)) + (sha256 + (base32 "0vr2jmh7qba9c5lrd969p0qqdc9mi22cw5axsyikm200x80zl4wa")))) (build-system haskell-build-system) (properties '((upstream-name . "alex"))) (home-page "http://www.haskell.org/alex/") @@ -699,7 +696,7 @@ Web Services.") (native-inputs (list ghc-hunit ghc-quickcheck ghc-test-framework ghc-test-framework-hunit ghc-test-framework-quickcheck2)) - (home-page "http://github.com/haskell/base16-bytestring") + (home-page "https://github.com/haskell/base16-bytestring") (synopsis "Fast base16 (hex) encoding and decoding for ByteStrings") (description "This package provides a Haskell library for working with base16-encoded @@ -739,7 +736,7 @@ Haskell @code{ByteString}s.") "1gah466nd6hkj716gwljfh0g270iaqy2rq2a1vw3di2s7a4dqam6")))) (build-system haskell-build-system) (properties '((upstream-name . "base-compat"))) - (home-page "http://hackage.haskell.org/package/base-compat") + (home-page "https://hackage.haskell.org/package/base-compat") (synopsis "Haskell compiler compatibility library") (description "This library provides functions available in later versions @@ -761,7 +758,7 @@ pragmas in your code.") (properties '((upstream-name . "base-compat-batteries"))) (inputs (list ghc-base-compat)) (native-inputs (list ghc-hspec ghc-quickcheck hspec-discover)) - (home-page "http://hackage.haskell.org/package/base-compat-batteries") + (home-page "https://hackage.haskell.org/package/base-compat-batteries") (synopsis "base-compat with extra batteries") (description "This library provides functions available in later @@ -775,14 +772,13 @@ than @code{base-compat}, which has no dependencies.") (define-public ghc-basement (package (name "ghc-basement") - (version "0.0.15") - (source (origin - (method url-fetch) - (uri (hackage-uri "basement" version)) - (sha256 - (base32 - "1d2xj5dmjps7nc7rwp5s0kyjcg9v8xfql6ik4yk1d3affnvazhjn")) - (patches (search-patches "ghc-basement-fix-32bit.patch")))) + (version "0.0.16") + (source + (origin + (method url-fetch) + (uri (hackage-uri "basement" version)) + (sha256 + (base32 "00332i4n98gh06x8ii4p8mhjpq0ch1bdan9hxmdblxpgk8j7xdvz")))) (build-system haskell-build-system) (properties '((upstream-name . "basement"))) (home-page "https://github.com/haskell-foundation/foundation#readme") @@ -795,13 +791,13 @@ packages.") (define-public ghc-base-orphans (package (name "ghc-base-orphans") - (version "0.8.7") - (source (origin - (method url-fetch) - (uri (hackage-uri "base-orphans" version)) - (sha256 - (base32 - "0iz4v4h2ydncdwfqzs8fd2qwl38dx0n94w5iymw2g4xy1mzxd3w8")))) + (version "0.8.8.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "base-orphans" version)) + (sha256 + (base32 "14jhh848q3451hqi4knslc7nnvw9dn77vawnhp4qs4l4703fgjk1")))) (build-system haskell-build-system) (properties '((upstream-name . "base-orphans"))) (native-inputs (list ghc-quickcheck ghc-hspec hspec-discover)) @@ -940,18 +936,18 @@ storing and transmitting loosely structured data.") (define-public ghc-bifunctors (package (name "ghc-bifunctors") - (version "5.5.14") - (source (origin - (method url-fetch) - (uri (hackage-uri "bifunctors" version)) - (sha256 - (base32 - "0r4jd4s66xvnx0bk75rz0cwnf6cr0lgx3dxrqdv3ppkwqk81c0ak")))) + (version "5.5.15") + (source + (origin + (method url-fetch) + (uri (hackage-uri "bifunctors" version)) + (sha256 + (base32 "1dz3v6qdilm6z9vl25xrma2if6i151v6rmgnvd461parsd89sdfn")))) (build-system haskell-build-system) (properties '((upstream-name . "bifunctors"))) (inputs (list ghc-base-orphans ghc-comonad ghc-th-abstraction ghc-tagged)) (native-inputs (list ghc-hspec ghc-quickcheck ghc-transformers-compat hspec-discover)) - (home-page "http://github.com/ekmett/bifunctors/") + (home-page "https://github.com/ekmett/bifunctors/") (synopsis "Bifunctors for Haskell") (description "This package provides bifunctors for Haskell.") (license license:bsd-3))) @@ -1238,13 +1234,13 @@ Compatibility package for older packages.") (define-public ghc-bytestring-lexing (package (name "ghc-bytestring-lexing") - (version "0.5.0.9") - (source (origin - (method url-fetch) - (uri (hackage-uri "bytestring-lexing" version)) - (sha256 - (base32 - "14nx7sfs75g57mlfiwgzm5sc3wm4va58zryjp27m5lmfdp30873c")))) + (version "0.5.0.10") + (source + (origin + (method url-fetch) + (uri (hackage-uri "bytestring-lexing" version)) + (sha256 + (base32 "0mvqiss323vwvgqx2pv8cww1mkx29hpi094ff54hx545mmvhwb16")))) (build-system haskell-build-system) (properties '((upstream-name . "bytestring-lexing"))) (native-inputs (list ghc-tasty ghc-tasty-smallcheck ghc-tasty-quickcheck)) @@ -1340,19 +1336,20 @@ imported with the correct Haskell types.") (define-public ghc-cairo (package (name "ghc-cairo") - (version "0.13.8.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "cairo" version)) - (sha256 - (base32 - "1sq2imy359vnbny610n7655a4z5a8fgdxanys4f5nw84246hc2yl")))) + (version "0.13.10.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "cairo" version)) + (sha256 + (base32 "16dwjqg8gqk2dzp3qpcvhwdgn16rxxasll8qs2fl2gf84z41h0mf")))) (build-system haskell-build-system) (properties '((upstream-name . "cairo"))) (inputs (list ghc-utf8-string cairo)) (native-inputs (list ghc-gtk2hs-buildtools pkg-config)) (arguments - `(#:extra-directories ("cairo"))) + `(#:cabal-revision ("2" + "1irj5yrz74j6wypni9pk9mbd7v2mzcy3ndyl7irada8szgdl3kkv"))) (home-page "https://projects.haskell.org/gtk2hs/") (synopsis "Haskell bindings to the Cairo vector graphics library") (description @@ -1519,13 +1516,13 @@ provides for better error messages at the expense of some speed.") (define-public ghc-cborg (package (name "ghc-cborg") - (version "0.2.8.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "cborg" version)) - (sha256 - (base32 - "07mh5bk61k5dz2x5g7fqw2cv7bjzs7v65yxvzkq7mdbkq8kwhn9f")))) + (version "0.2.9.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "cborg" version)) + (sha256 + (base32 "1apwdb0y08l3mbxb6pb006355nnn1lag035dvm006v7h4cbqvd6w")))) (build-system haskell-build-system) (properties '((upstream-name . "cborg"))) (inputs (list ghc-half ghc-primitive)) @@ -1542,7 +1539,7 @@ provides for better error messages at the expense of some speed.") ghc-vector)) (arguments `(#:cabal-revision ("1" - "13m2shrlpvg5s9d40a2463mmckzg50y8jb47zfd6i1rg6q3q6xx6"))) + "0fissmr1a82ij6l4wmmr1bzn08myikwyak27mmn6kqgpihgl8fws"))) (home-page "https://hackage.haskell.org/package/cborg") (synopsis "Concise Binary Object Representation") (description @@ -1681,7 +1678,7 @@ parser isolation, and labeled blocks for better error messages.") (build-system haskell-build-system) (properties '((upstream-name . "charset"))) (inputs (list ghc-unordered-containers ghc-semigroups)) - (home-page "http://github.com/ekmett/charset") + (home-page "https://github.com/ekmett/charset") (synopsis "Fast unicode character sets for Haskell") (description "This package provides fast unicode character sets for Haskell, based on complemented PATRICIA tries.") @@ -1756,7 +1753,7 @@ backend for the Charts library.") (build-system haskell-build-system) (properties '((upstream-name . "ChasingBottoms"))) (inputs (list ghc-quickcheck ghc-random ghc-syb)) - (home-page "http://hackage.haskell.org/package/ChasingBottoms") + (home-page "https://hackage.haskell.org/package/ChasingBottoms") (synopsis "Testing of partial and infinite values in Haskell") (description "This is a library for testing code involving bottoms or infinite values. @@ -1911,7 +1908,8 @@ classy-prelude.") (uri (hackage-uri "clock" version)) (sha256 (base32 - "1l850pf1dxjf3i15wc47d64gzkpzgvw0bq13fd8zvklq9kdyap44")))) + "1l850pf1dxjf3i15wc47d64gzkpzgvw0bq13fd8zvklq9kdyap44")) + (patches (search-patches "ghc-clock-realfrag.patch")))) (build-system haskell-build-system) (properties '((upstream-name . "clock"))) (native-inputs (list ghc-tasty ghc-tasty-quickcheck)) @@ -1982,19 +1980,17 @@ of the C library.") (define-public ghc-cmdargs (package (name "ghc-cmdargs") - (version "0.10.21") + (version "0.10.22") (source (origin (method url-fetch) (uri (hackage-uri "cmdargs" version)) (sha256 - (base32 - "0xfabq187n1vqrnnm4ciprpl0dcjq97rksyjnpcniwva9rffmn7p")))) + (base32 "1vwvdszal6clkvsqd1amcap8wy3cp19x8qmhgc1i7kwmhxzjxcdq")))) (build-system haskell-build-system) (properties '((upstream-name . "cmdargs"))) - (outputs '("out" "doc")) - (home-page - "http://community.haskell.org/~ndm/cmdargs/") + (inputs (list ghc-semigroups)) + (home-page "https://github.com/ndmitchell/cmdargs#readme") (synopsis "Command line argument processing") (description "This library provides an easy way to define command line parsers.") @@ -2158,17 +2154,17 @@ Python.") (define-public ghc-concurrent-output (package (name "ghc-concurrent-output") - (version "1.10.16") - (source (origin - (method url-fetch) - (uri (hackage-uri "concurrent-output" version)) - (sha256 - (base32 - "0l4k0bkq5bddqraf14g3ngyzwff17f3ngg4axlilcl3zf3c4bamh")))) + (version "1.10.18") + (source + (origin + (method url-fetch) + (uri (hackage-uri "concurrent-output" version)) + (sha256 + (base32 "1nxc7wl37hsyz8axzy99gy40qsa6065z6m9a9pfjkgfq4s4k7a5p")))) (build-system haskell-build-system) (properties '((upstream-name . "concurrent-output"))) (inputs (list ghc-async ghc-ansi-terminal ghc-terminal-size)) - (home-page "http://hackage.haskell.org/package/concurrent-output") + (home-page "https://hackage.haskell.org/package/concurrent-output") (synopsis "Ungarble output from several threads or commands") (description "Lets multiple threads and external processes concurrently output to the @@ -2182,30 +2178,23 @@ concurrent threads. Can be used for progress displays etc.") (define-public ghc-conduit (package (name "ghc-conduit") - (version "1.3.1.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "conduit" version)) - (sha256 - (base32 - "18izjgff4pmrknc8py06yvg3g6x27nx0rzmlwjxcflwm5v4szpw4")))) + (version "1.3.5") + (source + (origin + (method url-fetch) + (uri (hackage-uri "conduit" version)) + (sha256 + (base32 "0bbq3hr0y4hyia8dbqibfpg5q5zr2ici5hngv38y6hycxvhd7c1b")))) (build-system haskell-build-system) (properties '((upstream-name . "conduit"))) - (outputs '("out" "doc")) - (inputs - (list ghc-exceptions - ghc-lifted-base - ghc-mono-traversable - ghc-mmorph - ghc-resourcet - ghc-silently - ghc-transformers-base - ghc-unliftio - ghc-unliftio-core - ghc-vector - ghc-void)) - (native-inputs - (list ghc-quickcheck ghc-hspec ghc-safe ghc-split)) + (inputs (list ghc-resourcet ghc-primitive ghc-unliftio-core + ghc-mono-traversable ghc-vector)) + (native-inputs (list ghc-hspec + ghc-quickcheck + ghc-safe + ghc-split + ghc-silently + ghc-unliftio)) (home-page "https://github.com/snoyberg/conduit") (synopsis "Streaming data library") (description @@ -2313,7 +2302,7 @@ as well as a convenient Conduit module.") ghc-typed-process hspec-discover)) (native-inputs (list ghc-hspec ghc-quickcheck ghc-transformers-base)) - (home-page "http://github.com/snoyberg/conduit") + (home-page "https://github.com/snoyberg/conduit") (synopsis "Conduit adapters for common libraries") (description "The @code{conduit} package itself maintains relative small dependencies. @@ -2511,7 +2500,7 @@ the choice of SSL/TLS, and SOCKS.") (inputs (list ghc-hashable ghc-transformers-compat ghc-type-equality ghc-semigroups-bootstrap)) (native-inputs (list ghc-hspec hspec-discover)) - (home-page "http://github.com/ekmett/constraints/") + (home-page "https://github.com/ekmett/constraints/") (synopsis "Constraint manipulation") (description "GHC 7.4 gave us the ability to talk about @code{ConstraintKinds}. @@ -2522,19 +2511,19 @@ a vocabulary for working with them.") (define-public ghc-constraints-extras (package (name "ghc-constraints-extras") - (version "0.4.0.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "constraints-extras" version)) - (sha256 - (base32 - "1irf4kd7a5h1glczbc73c3590m58azn4s68nfrjfg1h96i7mjfgn")))) + (version "0.3.2.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "constraints-extras" version)) + (sha256 + (base32 "0w2wwqsgxqkn8byivrgcsi6fh1kxbivqarmdnpxyh1a1cg373xfp")))) (build-system haskell-build-system) (properties '((upstream-name . "constraints-extras"))) (inputs (list ghc-constraints ghc-aeson)) (arguments `(#:cabal-revision ("1" - "1fdabah3ilq9yf94916ml3c3rxgcgab1jhzl4mk1zgzsw78j53qf"))) + "1smha6ljia9bfgdy1h0lkgi9464rwa9lnw7rqfi1c23pzyiw13lh"))) (home-page "https://github.com/obsidiansystems/constraints-extras") (synopsis "Utility package for constraints") (description @@ -2623,7 +2612,7 @@ Free Monads, MPC'08} (properties '((upstream-name . "convertible"))) (inputs (list ghc-old-time)) (native-inputs (list ghc-quickcheck)) - (home-page "http://hackage.haskell.org/package/convertible") + (home-page "https://hackage.haskell.org/package/convertible") (synopsis "Typeclasses and instances for converting between types") (description "This package provides a typeclass with a single function that is @@ -2666,16 +2655,19 @@ lingua franca for spreadsheets, and for certain web services.") (define-public ghc-data-accessor (package (name "ghc-data-accessor") - (version "0.2.3") + (version "0.2.3.1") (source (origin (method url-fetch) (uri (hackage-uri "data-accessor" version)) (sha256 - (base32 "0f1yvvzr24qgrx6k2g101s7vp012802iw6kli903n28nig93yn0x")))) + (base32 "14ap1lxizxkgphl4kg8lr3ny9lblx1k6hm8i9nm7l43yla8cg8q6")))) (build-system haskell-build-system) (properties '((upstream-name . "data-accessor"))) - (home-page "https://wiki.haskell.org/Record_access") + (arguments + `(#:cabal-revision ("1" + "1v16s3d1kwlx9vzf6agacr2rfamnhyl7fgd81arznka51v3my2fs"))) + (home-page "https://www.haskell.org/haskellwiki/Record_access") (synopsis "Haskell utilities for accessing and manipulating fields of records") (description "This package provides Haskell modules for accessing and @@ -2685,17 +2677,17 @@ manipulating fields of records.") (define-public ghc-data-accessor-transformers (package (name "ghc-data-accessor-transformers") - (version "0.2.1.7") + (version "0.2.1.8") (source (origin (method url-fetch) (uri (hackage-uri "data-accessor-transformers" version)) (sha256 - (base32 "0yp030vafbpddl27m606aibbbr5ar5j5bsv4bksscz3cq4yq5j10")))) + (base32 "1m18bdhddi4l7ijd1mighjbjdw5qkznsgrqb8532cv9al55r9y83")))) (build-system haskell-build-system) (properties '((upstream-name . "data-accessor-transformers"))) (inputs (list ghc-data-accessor)) - (home-page "https://wiki.haskell.org/Record_access") + (home-page "https://www.haskell.org/haskellwiki/Record_access") (synopsis "Use Accessor to access state in transformers State monad") (description "This package provides Haskell modules to allow use of Accessor to access state in transformers State monad.") @@ -2917,13 +2909,13 @@ It includes hashing functions for all basic Haskell98 types.") (define-public ghc-dbus (package (name "ghc-dbus") - (version "1.2.27") - (source (origin - (method url-fetch) - (uri (hackage-uri "dbus" version)) - (sha256 - (base32 - "0lkk9hd78h2ilvi0bj5jqq5q5lwyxzdlknwvckhwyxnlf3y6dz8z")))) + (version "1.2.29") + (source + (origin + (method url-fetch) + (uri (hackage-uri "dbus" version)) + (sha256 + (base32 "0c2c2lfckhzgf9n5hf2w39ryyb2q0wxsymrxr54y4j95353wdsn2")))) (build-system haskell-build-system) (properties '((upstream-name . "dbus"))) (inputs (list ghc-cereal @@ -3038,13 +3030,13 @@ related modules split from the statistics library.") (define-public ghc-diagrams-core (package (name "ghc-diagrams-core") - (version "1.5.0.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "diagrams-core" version)) - (sha256 - (base32 - "1gv1p5hrxi3hks0nb4l38gdgfq9bh9d86b6dxcyzqxrwxbxk1khn")))) + (version "1.5.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "diagrams-core" version)) + (sha256 + (base32 "08bmb2r4gf7arc0wasxla6w1qpgrgrhcs24bb7sv2qgiyb6c22j6")))) (build-system haskell-build-system) (properties '((upstream-name . "diagrams-core"))) (inputs (list ghc-unordered-containers @@ -3056,9 +3048,6 @@ related modules split from the statistics library.") ghc-adjunctions ghc-distributive ghc-profunctors)) - (arguments - `(#:cabal-revision ("1" - "1gahbyv00xyr4pcmpq4g95jyh7844fp8z0g9l2ybifv4s73vdrym"))) (home-page "https://diagrams.github.io") (synopsis "Core libraries for diagrams embedded domain-specific language") (description @@ -3214,7 +3203,7 @@ members are shared.") (properties '((upstream-name . "Diff"))) (native-inputs (list ghc-quickcheck ghc-test-framework ghc-test-framework-quickcheck2)) - (home-page "http://hackage.haskell.org/package/Diff") + (home-page "https://hackage.haskell.org/package/Diff") (synopsis "O(ND) diff algorithm in Haskell") (description "This package provides an implementation of the standard diff algorithm, @@ -3407,7 +3396,7 @@ between double precision floating point and text.") (properties '((upstream-name . "dual-tree"))) (inputs (list ghc-semigroups ghc-monoid-extras)) (native-inputs (list ghc-quickcheck ghc-testing-feat)) - (home-page "http://hackage.haskell.org/package/dual-tree") + (home-page "https://hackage.haskell.org/package/dual-tree") (synopsis "Rose trees with cached and accumulating monoidal annotations") (description "Rose (@math{n}-ary) trees with both upwards- (i.e. @@ -3420,18 +3409,17 @@ diagrams framework}, but potentially has other applications as well.") (define-public ghc-easy-file (package (name "ghc-easy-file") - (version "0.2.2") + (version "0.2.5") (source (origin (method url-fetch) (uri (hackage-uri "easy-file" version)) (sha256 - (base32 - "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj")))) + (base32 "1fzj9x9br57rcik3dvwxqb5mqy524g6xg2d670l6dcrv9f8s03zf")))) (build-system haskell-build-system) (properties '((upstream-name . "easy-file"))) - (home-page - "https://github.com/kazu-yamamoto/easy-file") + (native-inputs (list ghc-tasty ghc-tasty-hunit)) + (home-page "https://github.com/kazu-yamamoto/easy-file") (synopsis "File handling library for Haskell") (description "This library provides file handling utilities for Haskell.") (license license:bsd-3))) @@ -3557,7 +3545,7 @@ but is otherwise agnostic to: (inputs (list ghc-bifunctors ghc-profunctors ghc-semigroupoids)) (native-inputs (list ghc-test-framework ghc-test-framework-quickcheck2 ghc-quickcheck)) - (home-page "http://github.com/ekmett/either/") + (home-page "https://github.com/ekmett/either/") (synopsis "Provides an either monad transformer for Haskell") (description "This Haskell package provides an either monad transformer.") (license license:bsd-3))) @@ -3707,13 +3695,13 @@ directly uses the type system, rather than out-of-band exceptions.") (define-public ghc-esqueleto (package (name "ghc-esqueleto") - (version "3.5.8.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "esqueleto" version)) - (sha256 - (base32 - "0k7h2hbxv14x0kq9w2wi83h0swzlri99ic9rj76540l39yqwjc5v")))) + (version "3.5.10.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "esqueleto" version)) + (sha256 + (base32 "0nbb6l4q22y8rwcjsrwqri3ndjn4rslpnglj3nkh00rixdm9jhsr")))) (build-system haskell-build-system) (properties '((upstream-name . "esqueleto"))) (inputs (list ghc-aeson @@ -3725,9 +3713,7 @@ directly uses the type system, rather than out-of-band exceptions.") ghc-resourcet ghc-tagged ghc-unliftio - ghc-unordered-containers - openssl - zlib)) + ghc-unordered-containers)) (native-inputs (list ghc-hspec ghc-hspec-core ghc-mysql @@ -3770,7 +3756,7 @@ generated SQL and optimize it for your backend.") (arguments `(#:cabal-revision ("1" "1v6my8bnhjhw7k3v2q9iwjpz9lj5g6ilvlzdq6svcabxahmzbr2c"))) - (home-page "http://hackage.haskell.org/package/ghc-exactprint") + (home-page "https://hackage.haskell.org/package/ghc-exactprint") (synopsis "ExactPrint for GHC") (description "Using the API Annotations available from GHC 7.10.2, this library @@ -3848,13 +3834,13 @@ versions of GHC (i.e., < 6.10).") (define-public ghc-extra (package (name "ghc-extra") - (version "1.7.12") - (source (origin - (method url-fetch) - (uri (hackage-uri "extra" version)) - (sha256 - (base32 - "0g5h8fp0nq4k9asiknw0bhvb10zpfnsixfp0n3xz0rc83pnajwg5")))) + (version "1.7.13") + (source + (origin + (method url-fetch) + (uri (hackage-uri "extra" version)) + (sha256 + (base32 "0rvvbix6dh6nwg0c2vdfvnkmkgzjrrwpnbz0magn9r3c66qcbsmx")))) (build-system haskell-build-system) (properties '((upstream-name . "extra"))) (inputs (list ghc-clock)) @@ -3896,18 +3882,18 @@ when used with GHC versions which already provide the (define-public ghc-fast-logger (package (name "ghc-fast-logger") - (version "3.1.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "fast-logger" version)) - (sha256 - (base32 - "1rx866swvqq7lzngv4bx7qinnwmm3aa2la8caljvbfbi0xz6wps3")))) + (version "3.1.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "fast-logger" version)) + (sha256 + (base32 "1l0h4ddb17xm6qkjhn5gqyfz18szyqcq9wqq92fc24sp2zbd7rv5")))) (build-system haskell-build-system) (properties '((upstream-name . "fast-logger"))) (inputs (list ghc-auto-update ghc-easy-file ghc-unix-time ghc-unix-compat - ghc-bytestring-builder hspec-discover)) - (native-inputs (list ghc-hspec)) + ghc-bytestring-builder)) + (native-inputs (list ghc-hspec hspec-discover)) (home-page "https://github.com/kazu-yamamoto/logger") (synopsis "Fast logging system") (description "This library provides a fast logging system for Haskell.") @@ -4098,7 +4084,7 @@ file contents, and more.") (lambda _ (substitute* "filepath-bytestring.cabal" (("filepath >= 1\\.4\\.2 && <= 1\\.4\\.2\\.1") "filepath"))))))) - (home-page "http://hackage.haskell.org/package/filepath-bytestring") + (home-page "https://hackage.haskell.org/package/filepath-bytestring") (synopsis "Library for manipulating RawFilePaths in a cross-platform way") (description "This package provides a drop-in replacement for the standard @@ -4143,7 +4129,7 @@ an executable.") (native-inputs (list ghc-hunit ghc-quickcheck ghc-test-framework ghc-test-framework-hunit ghc-test-framework-quickcheck2)) - (home-page "http://hackage.haskell.org/package/fingertree") + (home-page "https://hackage.haskell.org/package/fingertree") (synopsis "Generic finger-tree structure") (description "This library provides finger trees, a general sequence @@ -4219,13 +4205,13 @@ completely unverified though.") (define-public ghc-foldl (package (name "ghc-foldl") - (version "1.4.13") - (source (origin - (method url-fetch) - (uri (hackage-uri "foldl" version)) - (sha256 - (base32 - "14vlhgf40qmwkznwza37z4www3q1v5acsx4nw5vmg25wdnc8ibfw")))) + (version "1.4.14") + (source + (origin + (method url-fetch) + (uri (hackage-uri "foldl" version)) + (sha256 + (base32 "0ihfari2d8czfxfxv5svczpq1cvi3qi55mxphjjqlnabxa76y1cc")))) (build-system haskell-build-system) (properties '((upstream-name . "foldl"))) (inputs (list ghc-random @@ -4239,7 +4225,10 @@ completely unverified though.") ghc-comonad ghc-semigroups)) (native-inputs (list ghc-doctest)) - (home-page "http://hackage.haskell.org/package/foldl") + (arguments + `(#:cabal-revision ("2" + "1a7g9j8ds4zrpdx9qrqzbz3clhz1caky9znb8yzfsc7xcnbbgqpn"))) + (home-page "https://hackage.haskell.org/package/foldl") (synopsis "Composable, streaming, and efficient left folds for Haskell") (description "This Haskell library provides strict left folds that stream @@ -4251,13 +4240,13 @@ and are often as efficient as hand-written folds.") (define-public ghc-foundation (package (name "ghc-foundation") - (version "0.0.29") - (source (origin - (method url-fetch) - (uri (hackage-uri "foundation" version)) - (sha256 - (base32 - "1hbkh6a3g6wsj2z48pjimd7djkm82mdxfwc24bnmmzag8amrp0rl")))) + (version "0.0.30") + (source + (origin + (method url-fetch) + (uri (hackage-uri "foundation" version)) + (sha256 + (base32 "11hdqd01ggdr7fjw3w00giay06bzz97qqiiq60vi1l1dzz1wrwzn")))) (build-system haskell-build-system) (properties '((upstream-name . "foundation"))) (inputs (list ghc-basement)) @@ -4301,7 +4290,7 @@ Foundation has the following goals: ghc-th-abstraction ghc-transformers-base ghc-profunctors)) - (home-page "http://github.com/ekmett/free/") + (home-page "https://github.com/ekmett/free/") (synopsis "Unrestricted monads for Haskell") (description "This library provides free monads, which are useful for many @@ -4344,13 +4333,13 @@ specific Windows, Mac, and Linux file system event notification.") (define-public ghc-generic-deriving (package (name "ghc-generic-deriving") - (version "1.14.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "generic-deriving" version)) - (sha256 - (base32 - "0bxacg6b1vz135x93vf7jk6129m08hdyj7426ymaylfl2w8kapi6")))) + (version "1.14.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "generic-deriving" version)) + (sha256 + (base32 "0p0rv3z6icjw7f05arq6aqs6bx249544l0h2hvzwxm0yr6r8farp")))) (build-system haskell-build-system) (properties '((upstream-name . "generic-deriving"))) (inputs (list ghc-th-abstraction)) @@ -4400,20 +4389,17 @@ and @code{withBaseCase}) or implicitly (@code{genericArbitrary'}).") (define-public ghc-generics-sop (package (name "ghc-generics-sop") - (version "0.5.1.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "generics-sop" version)) - (sha256 - (base32 - "098blydb7c7wg77dn658r0zb1z20vfkar1him1rqlq0da90437b3")))) + (version "0.5.1.3") + (source + (origin + (method url-fetch) + (uri (hackage-uri "generics-sop" version)) + (sha256 + (base32 "01xgd5b4na6xz2bw117hw37k3iqfk3mabi4aadkzs527rawwg77c")))) (build-system haskell-build-system) (properties '((upstream-name . "generics-sop"))) (inputs (list ghc-sop-core ghc-th-abstraction)) - (arguments - `(#:cabal-revision ("1" - "1s8bx25yrjqy1cj9y1s1m8a8qlby9dxjzin16yymz7g39fqcqxz8"))) - (home-page "http://hackage.haskell.org/package/generics-sop") + (home-page "https://hackage.haskell.org/package/generics-sop") (synopsis "Generic Programming using True Sums of Products for Haskell") (description "This Haskell package supports the definition of generic @@ -4467,21 +4453,18 @@ properties for functions operating on them.") (define-public ghc-getopt-generics (package (name "ghc-getopt-generics") - (version "0.13.0.4") + (version "0.13.1.0") (source (origin (method url-fetch) (uri (hackage-uri "getopt-generics" version)) (sha256 - (base32 - "1rszkcn1rg38wf35538ljk5bbqjc57y9sb3a0al7qxm82gy8yigr")))) + (base32 "00xswyi9y49qab2fpkdx7isx40kfa93p3gfransivzgg9m3si37d")))) (build-system haskell-build-system) (properties '((upstream-name . "getopt-generics"))) - (inputs - (list ghc-base-compat ghc-base-orphans ghc-generics-sop ghc-tagged)) - (native-inputs - (list ghc-quickcheck ghc-hspec ghc-safe ghc-silently hspec-discover)) - (home-page "https://github.com/soenkehahn/getopt-generics") + (inputs (list ghc-base-compat ghc-base-orphans ghc-generics-sop ghc-tagged)) + (native-inputs (list ghc-quickcheck ghc-hspec ghc-safe ghc-silently hspec-discover)) + (home-page "https://github.com/soenkehahn/getopt-generics#readme") (synopsis "Create command line interfaces with ease") (description "This library provides tools to create command line interfaces with ease.") @@ -4666,17 +4649,20 @@ monoid with invertibility.") (define-public ghc-gtk2hs-buildtools (package (name "ghc-gtk2hs-buildtools") - (version "0.13.8.3") - (source (origin - (method url-fetch) - (uri (hackage-uri "gtk2hs-buildtools" version)) - (sha256 - (base32 - "0fcm0v32hm9j908nyziia16ahb181y9hqppsy18clx2prvj480rv")))) + (version "0.13.10.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "gtk2hs-buildtools" version)) + (sha256 + (base32 "0ww53n596h39smwf1k0wfk5k0s56n8mkapa8b0q9v9d9bpllgfyw")))) (build-system haskell-build-system) (properties '((upstream-name . "gtk2hs-buildtools"))) (inputs (list ghc-random ghc-hashtables)) (native-inputs (list ghc-alex ghc-happy)) + (arguments + `(#:cabal-revision ("1" + "16ckrhii6pbd64mgrm4s4x7vzd800w8g6x18rvij2cfm784yz6by"))) (home-page "https://projects.haskell.org/gtk2hs/") (synopsis "Tools to build the Gtk2Hs suite of user interface libraries") (description @@ -4722,7 +4708,7 @@ tools are not needed to actually run Gtk2Hs programs.") (synopsis "Hackage security library") (description "This Hackage security library provides both server and -client utilities for securing @uref{http://hackage.haskell.org/, the +client utilities for securing @uref{httsp://hackage.haskell.org/, the Hackage package server}. It is based on @uref{http://theupdateframework.com/, The Update Framework}, a set of recommendations developed by security researchers at various universities @@ -4892,52 +4878,46 @@ computation library for Haskell.") (define-public ghc-happy (package (name "ghc-happy") - (version "1.20.0") + (version "1.20.1.1") (source (origin (method url-fetch) (uri (hackage-uri "happy" version)) (sha256 - (base32 - "1346r2x5ravs5fqma65bzjragqbb2g6v41wz9maknwm2jf7kl79v")))) + (base32 "06w8g3lfk2ynrfhqznhp1mnp8a5b64lj6qviixpndzf5lv2psklb")))) (build-system haskell-build-system) (properties '((upstream-name . "happy"))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-test-issue93 - (lambda _ - ;; Tests run out of memory on a system with 2GB of available RAM, - ;; in 'issue93.a.hs' and 'issue93.n.hs'. - (substitute* "tests/Makefile" - ((" issue93.y ") " ")) - #t))))) - (home-page "https://hackage.haskell.org/package/happy") + (home-page "https://www.haskell.org/happy/") (synopsis "Parser generator for Haskell") - (description "Happy is a parser generator for Haskell. Given a grammar + (description + "Happy is a parser generator for Haskell. Given a grammar specification in BNF, Happy generates Haskell code to parse the grammar. Happy works in a similar way to the yacc tool for C.") - (license license:bsd-3))) + (license license:bsd-2))) (define-public ghc-hashable (package (name "ghc-hashable") - (version "1.4.1.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "hashable" version)) - (sha256 - (base32 - "11sycr73821amdz8g0k8c97igi4z7f9xdvgaxlkxhsp6h310bcz1")))) + (version "1.4.2.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "hashable" version)) + (sha256 + (base32 "1y73606pcrs7zi6f4f07a5rkhc6620n1bx0adpa6j7xqhbm00h0v")))) (build-system haskell-build-system) (properties '((upstream-name . "hashable"))) + (inputs (list ghc-data-array-byte)) (native-inputs (list ghc-hunit ghc-quickcheck ghc-random ghc-test-framework ghc-test-framework-hunit ghc-test-framework-quickcheck2)) - (home-page "http://github.com/haskell-unordered-containers/hashable") + (arguments + `(#:cabal-revision ("1" + "12nmnmm2kyjalkvmz0l1l895ikc938lwppx8iykxnhamblrr4msq"))) + (home-page "https://github.com/haskell-unordered-containers/hashable") (synopsis "Class for types that can be converted to a hash value") (description "This package defines a class, @code{Hashable}, for types that can be @@ -4975,7 +4955,7 @@ combine hash values.") ghc-test-framework ghc-test-framework-quickcheck2 ghc-test-framework-hunit)) - (home-page "http://github.com/gregorycollins/hashtables") + (home-page "https://github.com/gregorycollins/hashtables") (synopsis "Haskell Mutable hash tables in the ST monad") (description "This package provides a Haskell library including a @@ -4987,22 +4967,22 @@ a set of wrappers to use the hash tables in the IO monad.") (define-public ghc-haskeline (package (name "ghc-haskeline") - (version "0.8.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "haskeline" version)) - (sha256 - (base32 - "1pr7zik1138cj0463867i1qqb2bgsq716mryap18jx7zb9f1b7gc")))) + (version "0.8.2.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "haskeline" version)) + (sha256 + (base32 "1zs0rlhd7lzp5g4kp7v5ca7cdwan7w4bx3jh5q2ri950svr2k1x0")))) (build-system haskell-build-system) (properties '((upstream-name . "haskeline"))) (native-inputs (list ghc-hunit which)) (arguments (list + #:cabal-revision '("1" + "1vmsi909jaykpaqfssnv92lzr1n2gy34s07lsh29p75187ps6gny") #:tests? #f ; Cannot run binary haskeline-examples-Test, which is just ; built, even with PATH and LD_LIBRARY_PATH set. - #:cabal-revision - '("3" "101qavk0fmc4c6qa307kswz3345psskxqyxhk6hmykynjm05jjrv") #:phases #~(modify-phases %standard-phases (add-before 'configure 'patch-which @@ -5054,7 +5034,7 @@ Haskeline runs both on POSIX-compatible systems and on Windows.") (arguments `(#:cabal-revision ("1" "0dfjzq0sxxcalqxygp2svx4890qx8b4amad0xldwy1f4xrp3lsnb"))) - (home-page "http://hackage.haskell.org/package/haskell-src") + (home-page "https://hackage.haskell.org/package/haskell-src") (synopsis "Support for manipulating Haskell source code") (description "The @code{haskell-src} package provides support for manipulating Haskell @@ -5116,18 +5096,18 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") (define-public ghc-haskell-src-meta (package (name "ghc-haskell-src-meta") - (version "0.8.11") - (source (origin - (method url-fetch) - (uri (hackage-uri "haskell-src-meta" version)) - (sha256 - (base32 - "1wks0xb7ah2gj9n0ffbcaskjihy45l99qkf2h9k13cyfvqkzp9rw")))) + (version "0.8.12") + (source + (origin + (method url-fetch) + (uri (hackage-uri "haskell-src-meta" version)) + (sha256 + (base32 "12dsv49rzhayp8cvkqkilammq4a6d4nrb2bd2w98ivzzrbkijy02")))) (build-system haskell-build-system) (properties '((upstream-name . "haskell-src-meta"))) (inputs (list ghc-haskell-src-exts ghc-syb ghc-th-orphans)) (native-inputs (list ghc-hunit ghc-tasty ghc-tasty-hunit)) - (home-page "http://hackage.haskell.org/package/haskell-src-meta") + (home-page "https://hackage.haskell.org/package/haskell-src-meta") (synopsis "Parse source to template-haskell abstract syntax") (description "This package provides tools to parse Haskell sources to the template-haskell abstract syntax.") @@ -5486,13 +5466,13 @@ representations of current time.") (define-public ghc-hpack (package (name "ghc-hpack") - (version "0.35.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "hpack" version)) - (sha256 - (base32 - "1hpc6bwx94v943p73l12nnncbs656f2fn7q3hb4qs13xrxygzl4g")))) + (version "0.35.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "hpack" version)) + (sha256 + (base32 "1v4h5dkbfwx8wlmbaq76av22ald9iyk80k8k7pz808nw30yh3dq3")))) (build-system haskell-build-system) (properties '((upstream-name . "hpack"))) (inputs (list ghc-glob @@ -5514,6 +5494,9 @@ representations of current time.") ghc-mockery ghc-temporary hspec-discover)) + (arguments + `(#:cabal-revision ("2" + "0vwxfg5ixlr18q8gb1x8vz3grp339cbnhm51hfp7rk6vc0bd61k5"))) (home-page "https://github.com/sol/hpack#readme") (synopsis "Tools for an alternative Haskell package format") (description @@ -5653,13 +5636,13 @@ described in @url{https://www.lua.org/}.") (define-public ghc-hslua-module-system (package (name "ghc-hslua-module-system") - (version "1.0.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "hslua-module-system" version)) - (sha256 - (base32 - "0lacf9jzd53r75dk5nvkx0nwgiakpkingjnz58bhjfnvi81r6ddn")))) + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (hackage-uri "hslua-module-system" version)) + (sha256 + (base32 "08rajlihgsg843sgvlvh7qx43s5yiqqccvnxa336hw06ppfycyf9")))) (build-system haskell-build-system) (properties '((upstream-name . "hslua-module-system"))) (inputs (list ghc-hslua-core ghc-hslua-packaging ghc-hslua-marshalling @@ -5678,13 +5661,13 @@ already been loaded before the loader can be added.") (define-public ghc-hslua-module-text (package (name "ghc-hslua-module-text") - (version "1.0.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "hslua-module-text" version)) - (sha256 - (base32 - "0xq5ndgjhs37d73s8lvm0pndwjpj2pqb67pr0ckjap8yzhjna7fq")))) + (version "1.0.3.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "hslua-module-text" version)) + (sha256 + (base32 "025n8vmaq22bl1x60hpg57ih44g6z71jc1qnlxfsi06hram1wcqc")))) (build-system haskell-build-system) (properties '((upstream-name . "hslua-module-text"))) (inputs (list ghc-hslua-core ghc-hslua-packaging ghc-hslua-marshalling)) @@ -5770,7 +5753,7 @@ for user-defined custom schemas). (arguments `(#:cabal-revision ("6" "0q4rhz81r5v0z1mn7x9q0ldbfv1a2cp3dpw8s2j96halsq34l4zl"))) - (home-page "http://github.com/fizruk/http-api-data") + (home-page "https://github.com/fizruk/http-api-data") (synopsis "Convert to/from HTTP API data like URL pieces, headers and query parameters") (description "This Haskell package defines typeclasses used for converting @@ -5890,13 +5873,13 @@ read and write configuration files in the simple INI format.") (define-public ghc-inline-c (package (name "ghc-inline-c") - (version "0.9.1.6") - (source (origin - (method url-fetch) - (uri (hackage-uri "inline-c" version)) - (sha256 - (base32 - "06az494fp2nh6fnibq28yw8jsrpj4jq1swyx53a328qv04cbhrym")))) + (version "0.9.1.8") + (source + (origin + (method url-fetch) + (uri (hackage-uri "inline-c" version)) + (sha256 + (base32 "1qa1rspwyac0f68g7qll17a0wc2a4qrr9fkfarpymfhm7gxzf947")))) (build-system haskell-build-system) (properties '((upstream-name . "inline-c"))) (inputs (list ghc-ansi-wl-pprint ghc-hashable ghc-parsers @@ -5907,7 +5890,7 @@ read and write configuration files in the simple INI format.") ghc-raw-strings-qq ghc-regex-posix ghc-split)) - (home-page "http://hackage.haskell.org/package/inline-c") + (home-page "https://hackage.haskell.org/package/inline-c") (synopsis "Write Haskell source files including C code inline") (description "inline-c lets you seamlessly call C libraries and embed high-performance @@ -5930,7 +5913,7 @@ minimal overhead. No FFI required.") (properties '((upstream-name . "inline-c-cpp"))) (inputs (list ghc-inline-c ghc-safe-exceptions)) (native-inputs (list ghc-hspec ghc-vector)) - (home-page "http://hackage.haskell.org/package/inline-c-cpp") + (home-page "https://hackage.haskell.org/package/inline-c-cpp") (synopsis "Lets you embed C++ code into Haskell") (description "This package provides utilities to inline C++ code into Haskell using @@ -6006,18 +5989,17 @@ Haskell.") (define-public ghc-intervalmap (package (name "ghc-intervalmap") - (version "0.6.1.2") + (version "0.6.2.1") (source (origin (method url-fetch) (uri (hackage-uri "IntervalMap" version)) (sha256 - (base32 - "03smzhwk1zf5na544b0azp49j4gvafqsih9ggwf6yng38yhixwld")))) + (base32 "17v9q1vnm3pzrr5xhv8xvxqh27facwwfladrr10l57fzibp82265")))) (build-system haskell-build-system) (properties '((upstream-name . "IntervalMap"))) - (native-inputs - (list ghc-quickcheck)) + (native-inputs (list ghc-quickcheck ghc-quickcheck ghc-quickcheck + ghc-quickcheck)) (home-page "https://www.chr-breitkopf.de/comp/IntervalMap") (synopsis "Containers for intervals, with efficient search") (description @@ -6052,13 +6034,13 @@ which represets a closed, convex set of floating point values.") (define-public ghc-invariant (package (name "ghc-invariant") - (version "0.6") - (source (origin - (method url-fetch) - (uri (hackage-uri "invariant" version)) - (sha256 - (base32 - "07ffgcfpacsdihcmcmx2m1gp8czlg28657bxncxjykjiiiwjlaxm")))) + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "invariant" version)) + (sha256 + (base32 "1w6ln343d72hx8q4i7h1ca7gfqyb79ghc3q2fxp9qkjmwsnr8wpv")))) (build-system haskell-build-system) (properties '((upstream-name . "invariant"))) (inputs (list ghc-bifunctors @@ -6071,9 +6053,6 @@ which represets a closed, convex set of floating point values.") ghc-transformers-compat ghc-unordered-containers)) (native-inputs (list ghc-hspec ghc-quickcheck hspec-discover)) - (arguments - `(#:cabal-revision ("1" - "0551ll1swnrmq09j89jqnxl4qnirbbpdpsdym23adaf36qdd7v37"))) (home-page "https://github.com/nfrisby/invariant-functors") (synopsis "Haskell98 invariant functors") (description @@ -6102,7 +6081,7 @@ functors). For more information, see Edward Kmett's article ghc-test-framework ghc-test-framework-hunit ghc-test-framework-quickcheck2)) - (home-page "http://hackage.haskell.org/package/io-streams") + (home-page "https://hackage.haskell.org/package/io-streams") (synopsis "Simple and composable stream I/O") (description "This library contains simple and easy-to-use primitives for I/O using streams.") @@ -6179,7 +6158,7 @@ removed. Both IPv4 and IPv6 are supported.") (arguments `(#:cabal-revision ("1" "0fl9x5amq0g5dg57dcgc0g4ir0r1fdbx06aldsqdwzdc9zs97v6k"))) - (home-page "http://hackage.haskell.org/package/ipynb") + (home-page "https://hackage.haskell.org/package/ipynb") (synopsis "Data structure for working with Jupyter notebooks") (description "This library defines a data structure for representing @@ -6304,7 +6283,7 @@ TIFF and GIF formats.") ghc-semigroupoids ghc-tagged ghc-transformers-compat)) - (home-page "http://github.com/ekmett/kan-extensions/") + (home-page "https://github.com/ekmett/kan-extensions/") (synopsis "Kan extensions library") (description "This library provides Kan extensions, Kan lifts, various @@ -6314,17 +6293,18 @@ forms of the Yoneda lemma, and (co)density (co)monads for Haskell.") (define-public ghc-language-c (package (name "ghc-language-c") - (version "0.9.1") + (version "0.9.2") (source (origin (method url-fetch) (uri (hackage-uri "language-c" version)) (sha256 - (base32 - "0g5djsnzzmi1d1ndcmmrmwz4xnv1m3w009d6kx9jz9jxxdk9adcl")))) + (base32 "1cvcxwnbg71xijadr4aqzwxaw29fxj5z2gpnz3lp5pqnv8phscdj")))) (build-system haskell-build-system) (properties '((upstream-name . "language-c"))) - (inputs (list ghc-syb)) + (arguments + `(#:cabal-revision ("1" + "03qfp9mf4yrdw3m6sab3np7wjaigg5p3xiiirxin8ihsnnx4rv5l"))) (native-inputs (list ghc-happy ghc-alex)) (home-page "https://visq.github.io/language-c/") @@ -6442,7 +6422,7 @@ with @code{wc} (for a web service).") (arguments `(#:cabal-revision ("1" "19z3k7ikpfa96b86yabxghfqpnq9d0ayy4gdlvci3ycvws0s8cy6"))) - (home-page "http://github.com/ekmett/lens/") + (home-page "https://github.com/ekmett/lens/") (synopsis "Lenses, Folds and Traversals") (description "This library provides @code{Control.Lens}. The combinators @@ -6601,17 +6581,17 @@ Music Player Daemon.") (define-public ghc-lib-parser (package (name "ghc-lib-parser") - (version "9.2.5.20221107") - (source (origin - (method url-fetch) - (uri (hackage-uri "ghc-lib-parser" version)) - (sha256 - (base32 - "1xh8rm5lwbh96g4v34whkcbb1yjsyvx3rwwycj30lrglhqk7f4c4")))) + (version "9.2.7.20230228") + (source + (origin + (method url-fetch) + (uri (hackage-uri "ghc-lib-parser" version)) + (sha256 + (base32 "1bny37dny7jv37mpynp3zwdlp8993xikc1c4p6h5f2zwjb7nx2ny")))) (build-system haskell-build-system) (properties '((upstream-name . "ghc-lib-parser"))) - (outputs '("out" "doc")) ; documentation is 39M - (native-inputs (list ghc-alex ghc-happy)) + (inputs (list ghc-alex)) + (native-inputs (list ghc-happy)) (home-page "https://github.com/digital-asset/ghc-lib") (synopsis "The GHC API, decoupled from GHC versions") (description @@ -6679,13 +6659,13 @@ LibYAML C library.") (define-public ghc-lifted-async (package (name "ghc-lifted-async") - (version "0.10.2.3") - (source (origin - (method url-fetch) - (uri (hackage-uri "lifted-async" version)) - (sha256 - (base32 - "1kq96cp9czf358gykai2vcmynnd7zivqja4pb3f8bif9ypln9vai")))) + (version "0.10.2.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "lifted-async" version)) + (sha256 + (base32 "0pdy7q508n7gvy338xsv9a8fg7saksi8qb9av6j3a37l2pp4vvcv")))) (build-system haskell-build-system) (properties '((upstream-name . "lifted-async"))) (inputs (list ghc-async ghc-lifted-base ghc-transformers-base @@ -6697,6 +6677,9 @@ LibYAML C library.") ghc-tasty-th ghc-tasty-hunit ghc-tasty-th)) + (arguments + `(#:cabal-revision ("2" + "0bg2qmg6lav4zizki1cvqpvd3wqjhfjff7zz17wg5hzlm5318gky"))) (home-page "https://github.com/maoe/lifted-async") (synopsis "Run lifted IO operations asynchronously and wait for their results") @@ -6762,7 +6745,7 @@ Kaseorg.") ghc-void)) (native-inputs (list ghc-simple-reflect ghc-test-framework ghc-test-framework-hunit ghc-hunit)) - (home-page "http://github.com/ekmett/linear/") + (home-page "https://github.com/ekmett/linear/") (synopsis "Linear algebra library for Haskell") (description "This package provides types and combinators for linear algebra on free @@ -6783,7 +6766,7 @@ vector spaces.") (properties '((upstream-name . "ListLike"))) (inputs (list ghc-vector ghc-dlist ghc-fmlist ghc-utf8-string)) (native-inputs (list ghc-hunit ghc-quickcheck ghc-random)) - (home-page "http://github.com/ddssff/listlike") + (home-page "https://github.com/ddssff/listlike") (synopsis "Generic support for list-like structures") (description "The ListLike module provides a common interface to the @@ -6853,20 +6836,20 @@ online}.") (define-public ghc-lucid (package (name "ghc-lucid") - (version "2.11.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "lucid" version)) - (sha256 - (base32 - "13krwrvv0w24rnl7pc7qhv18c6030fkxpx7sxkffdm8sr9173xfw")))) + (version "2.11.20230408") + (source + (origin + (method url-fetch) + (uri (hackage-uri "lucid" version)) + (sha256 + (base32 "07a41xkql96hkp9jawlaxn0lflvjf8a2djb45k3b3ig9zs82j48g")))) (build-system haskell-build-system) (properties '((upstream-name . "lucid"))) (inputs (list ghc-blaze-builder ghc-hashable ghc-mmorph)) (native-inputs (list ghc-hunit ghc-hspec ghc-bifunctors)) (arguments `(#:cabal-revision ("1" - "0wipmh3xcs00x8lbq5j780rdc2klfj67nzni21qc1pdbhr2whn9d"))) + "1gb3b79xf4jp0xvk2anlvpvac6gqcfpffylkwki19lrx6jbd8fqs"))) (home-page "https://github.com/chrisdone/lucid") (synopsis "Haskell DSL for rendering HTML") (description @@ -6885,17 +6868,20 @@ Same combinator can be used for attributes and elements (define-public ghc-lzma (package (name "ghc-lzma") - (version "0.0.0.4") - (source (origin - (method url-fetch) - (uri (hackage-uri "lzma" version)) - (sha256 - (base32 - "0fy11i7fanrsbh8w7cclwx0i6csn5df6vl38dh2112aqw6n7h382")))) + (version "0.0.1.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "lzma" version)) + (sha256 + (base32 "0knz0d6456zf6wbqifzcsw2xvdgaqnig2zn96kav7aqn5i4nfbvj")))) (build-system haskell-build-system) (properties '((upstream-name . "lzma"))) (native-inputs (list ghc-hunit ghc-quickcheck ghc-tasty ghc-tasty-hunit - ghc-tasty-quickcheck)) + ghc-tasty-quickcheck pkg-config)) + (arguments + `(#:cabal-revision ("1" + "0k1f4qy46m4z9phbifasi4x6sjcld2zr45hsawbyb0az9y8p2vnd"))) (home-page "https://github.com/hvr/lzma") (synopsis "LZMA/XZ compression and decompression") (description @@ -6923,7 +6909,7 @@ monadic incremental interface is provided as well.") ghc-test-framework-quickcheck2 ghc-hunit ghc-quickcheck)) - (home-page "http://github.com/alphaHeavy/lzma-conduit") + (home-page "https://github.com/alphaHeavy/lzma-conduit") (synopsis "Conduit interface for lzma/xz compression") (description "This package provides a @code{Conduit} interface for the LZMA @@ -6954,18 +6940,15 @@ than its name.") (define-public ghc-managed (package (name "ghc-managed") - (version "1.0.9") - (source (origin - (method url-fetch) - (uri (hackage-uri "managed" version)) - (sha256 - (base32 - "0vx8aim8bcyyvxxnmi1xkbl3kwrvskjn99z3y8h458g7nsinsisd")))) + (version "1.0.10") + (source + (origin + (method url-fetch) + (uri (hackage-uri "managed" version)) + (sha256 + (base32 "0ngpk6zkpnc9hl9a46pgkc8ii4d7y06xci52birc5vy1a2fwl8is")))) (build-system haskell-build-system) (properties '((upstream-name . "managed"))) - (arguments - `(#:cabal-revision ("3" - "017h9533j7rlxlsf65ynxpva59yr0qwrdmvhp7if141i98ld4664"))) (home-page "https://hackage.haskell.org/package/managed") (synopsis "Monad for managed values") (description @@ -7179,13 +7162,13 @@ microlens.") (build-system haskell-build-system) (properties '((upstream-name . "microlens-ghc"))) (inputs (list ghc-microlens)) - (home-page "http://github.com/monadfix/microlens") + (home-page "https://github.com/monadfix/microlens") (synopsis "Use @code{microlens} with GHC libraries like @code{array}") (description "This library provides everything that @code{microlens} provides plus instances to make @code{each}, @code{at}, and @code{ix} usable with arrays, @code{ByteString}, and containers. This package is -a part of the @uref{http://hackage.haskell.org/package/microlens, +a part of the @uref{httsp://hackage.haskell.org/package/microlens, microlens} family; see the readme @uref{https://github.com/aelve/microlens#readme, on Github}.") (license license:bsd-3))) @@ -7203,13 +7186,13 @@ microlens} family; see the readme (build-system haskell-build-system) (properties '((upstream-name . "microlens-mtl"))) (inputs (list ghc-microlens ghc-transformers-compat)) - (home-page "http://github.com/monadfix/microlens") + (home-page "https://github.com/monadfix/microlens") (synopsis "@code{microlens} support for Reader/Writer/State from mtl") (description "This package contains functions (like @code{view} or @code{+=}) which work on @code{MonadReader}, @code{MonadWriter}, and @code{MonadState} from the mtl package. This package is a part of the -@uref{http://hackage.haskell.org/package/microlens, microlens} family; see the +@uref{httsp://hackage.haskell.org/package/microlens, microlens} family; see the readme @uref{https://github.com/aelve/microlens#readme, on Github}.") (license license:bsd-3))) @@ -7232,42 +7215,42 @@ readme @uref{https://github.com/aelve/microlens#readme, on Github}.") ghc-microlens-th ghc-unordered-containers ghc-vector)) - (home-page "http://github.com/monadfix/microlens") + (home-page "https://github.com/monadfix/microlens") (synopsis "Feature-complete microlens") (description "This package exports a module which is the recommended starting point -for using @uref{http://hackage.haskell.org/package/microlens, microlens} if +for using @uref{httsp://hackage.haskell.org/package/microlens, microlens} if you aren't trying to keep your dependencies minimal. By importing @code{Lens.Micro.Platform} you get all functions and instances from -@uref{http://hackage.haskell.org/package/microlens, microlens}, -@uref{http://hackage.haskell.org/package/microlens-th, microlens-th}, -@uref{http://hackage.haskell.org/package/microlens-mtl, microlens-mtl}, -@uref{http://hackage.haskell.org/package/microlens-ghc, microlens-ghc}, as +@uref{httsp://hackage.haskell.org/package/microlens, microlens}, +@uref{httsp://hackage.haskell.org/package/microlens-th, microlens-th}, +@uref{httsp://hackage.haskell.org/package/microlens-mtl, microlens-mtl}, +@uref{httsp://hackage.haskell.org/package/microlens-ghc, microlens-ghc}, as well as instances for @code{Vector}, @code{Text}, and @code{HashMap}. The minor and major versions of @code{microlens-platform} are incremented whenever the minor and major versions of any other @code{microlens} package are incremented, so you can depend on the exact version of @code{microlens-platform} without specifying the version of @code{microlens} you need. This package is a part of the -@uref{http://hackage.haskell.org/package/microlens, microlens} family; see the +@uref{httsp://hackage.haskell.org/package/microlens, microlens} family; see the readme @uref{https://github.com/aelve/microlens#readme, on Github}.") (license license:bsd-3))) (define-public ghc-microlens-th (package (name "ghc-microlens-th") - (version "0.4.3.11") - (source (origin - (method url-fetch) - (uri (hackage-uri "microlens-th" version)) - (sha256 - (base32 - "1vjjaclfxr0kvlpmj8zh7f6ci4n4b8vynqd67zszx42al7gal6pj")))) + (version "0.4.3.13") + (source + (origin + (method url-fetch) + (uri (hackage-uri "microlens-th" version)) + (sha256 + (base32 "1g41wb61k2l99xxy23yp2zqk0wanskgdypbjhib71ji0y1dcsfz7")))) (build-system haskell-build-system) (properties '((upstream-name . "microlens-th"))) (inputs (list ghc-microlens ghc-th-abstraction)) (native-inputs (list ghc-tagged)) - (home-page "http://github.com/monadfix/microlens") + (home-page "https://github.com/stevenfontanella/microlens") (synopsis "Automatic generation of record lenses for @code{ghc-microlens}") (description @@ -7299,7 +7282,7 @@ used both from lens and microlens).") (arguments `(#:cabal-revision ("2" "11d922r06p00gcgzhb29hhjkq8ajy1xbqdiwdpbmhp2ar7fw7g9l"))) - (home-page "http://hackage.haskell.org/package/MissingH") + (home-page "https://hackage.haskell.org/package/MissingH") (synopsis "Large utility library") (description "MissingH is a library of all sorts of utility functions for Haskell @@ -7344,7 +7327,7 @@ do on-demand loading.") (arguments `(#:cabal-revision ("3" "1582vcpjiyimb1vwnhgq8gp805iziwa8sivv2frir0cgq4z236yz"))) - (home-page "http://hackage.haskell.org/package/mmorph") + (home-page "https://hackage.haskell.org/package/mmorph") (synopsis "Monad morphisms") (description "This library provides monad morphism utilities, most commonly used for @@ -7409,13 +7392,13 @@ a subset of @code{MonadBase} into which generic control operations such as (define-public ghc-monad-logger (package (name "ghc-monad-logger") - (version "0.3.37") - (source (origin - (method url-fetch) - (uri (hackage-uri "monad-logger" version)) - (sha256 - (base32 - "1z275a428zcj73zz0cpfha2adwiwqqqp7klx3kbd3i9rl20xa106")))) + (version "0.3.40") + (source + (origin + (method url-fetch) + (uri (hackage-uri "monad-logger" version)) + (sha256 + (base32 "1aff4ks9615x51841l8g906702xk2g3pn4n5x9ndxppnrxkqdvfb")))) (build-system haskell-build-system) (properties '((upstream-name . "monad-logger"))) (inputs (list ghc-conduit @@ -7429,9 +7412,6 @@ a subset of @code{MonadBase} into which generic control operations such as ghc-transformers-base ghc-transformers-compat ghc-unliftio-core)) - (arguments - `(#:cabal-revision ("3" - "1dzkw08b4ijacdw0vcfxlr13rd819x2yj7b6sr9jrrwicd45zm1z"))) (home-page "https://github.com/snoyberg/monad-logger#readme") (synopsis "Provides a class of monads which can log messages for Haskell") (description @@ -7603,7 +7583,7 @@ data structures as non-empty.") (build-system haskell-build-system) (properties '((upstream-name . "monoid-extras"))) (inputs (list ghc-groups ghc-semigroupoids)) - (home-page "http://hackage.haskell.org/package/monoid-extras") + (home-page "https://hackage.haskell.org/package/monoid-extras") (synopsis "Various extra monoid-related definitions and utilities") (description "This package provides various extra monoid-related @@ -7677,7 +7657,7 @@ the top of your file to get all of the ExceptT instances in scope.") "145z91zkx8jdd3y181pi8z9imqjgpk99cl55pbda4fl201hasbz9")))) (build-system haskell-build-system) (properties '((upstream-name . "murmur-hash"))) - (home-page "http://github.com/nominolo/murmur-hash") + (home-page "https://github.com/nominolo/murmur-hash") (synopsis "MurmurHash2 implementation for Haskell") (description "This package provides an implementation of MurmurHash2, a good, fast, @@ -7789,17 +7769,19 @@ ncurses.") (define-public ghc-network (package (name "ghc-network") - (version "3.1.2.7") - (source (origin - (method url-fetch) - (uri (hackage-uri "network" version)) - (sha256 - (base32 - "119xqsyj44ix0z79mzfpww0cd9936bki1xa7cwykvbx1y7z20xkz")))) + (version "3.1.4.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "network" version)) + (sha256 + (base32 "13hmp4va00ydpzbnwjzgf5wd5iy7373j0f7baxrj1ncmmjps4lml")))) (build-system haskell-build-system) (properties '((upstream-name . "network"))) - (native-inputs (list ghc-hunit ghc-temporary ghc-hspec ghc-quickcheck - ghc-doctest hspec-discover)) + (native-inputs (list ghc-hunit ghc-temporary ghc-hspec ghc-quickcheck hspec-discover)) + (arguments + `(#:cabal-revision ("1" + "1vwxy5zj4bizgg2g0hk3dy52kjh5d7lzn33lphmvbbs36aqcslp1"))) (home-page "https://github.com/haskell/network") (synopsis "Low-level networking interface") (description "This package provides a low-level networking interface.") @@ -7862,7 +7844,7 @@ byte order.") "015lm3b8n8sb16qsffjxz1jvijyy0z600ch0sm8h6a685wqqhbcv")))) (build-system haskell-build-system) (properties '((upstream-name . "network-info"))) - (home-page "http://github.com/jacobstanley/network-info") + (home-page "https://github.com/jacobstanley/network-info") (synopsis "Access the local computer's basic network configuration") (description "This Haskell library provides simple read-only access to the @@ -7937,7 +7919,7 @@ sending UDP datagrams over multicast (class D) addresses.") (arguments `(#:cabal-revision ("1" "0xgc7sxs1p3qibgwbikjdrhn47j7m4gk5x1wrv9hncks6hd6hsyf"))) - (home-page "http://github.com/sjakobi/newtype-generics") + (home-page "https://github.com/sjakobi/newtype-generics") (synopsis "Typeclass and set of functions for working with newtypes") (description "The @code{Newtype} typeclass represents the packing and @@ -8177,17 +8159,20 @@ found at runtime, a userError is thrown.") (define-public ghc-operational (package (name "ghc-operational") - (version "0.2.4.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "operational" version)) - (sha256 - (base32 - "0aa1pxymvkhbs0x03ikfiap2skzyf2z7307kz5adkmb3qmykcqa2")))) + (version "0.2.4.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "operational" version)) + (sha256 + (base32 "1dx6vpmg21fskxyz12ba26hffk25b2qk9sznqfczgaamn6rahzc5")))) (build-system haskell-build-system) (properties '((upstream-name . "operational"))) (inputs (list ghc-random)) - (home-page "http://wiki.haskell.org/Operational") + (arguments + `(#:cabal-revision ("1" + "0hdqwjm1jp6f8n8qglg9ylz07sbhrc7cm4kvcglymi2s4i9mdsai"))) + (home-page "https://github.com/HeinrichApfelmus/operational") (synopsis "Implementation of difficult monads made easy with operational semantics") (description @@ -8279,17 +8264,20 @@ easily work with command-line options.") (define-public ghc-optparse-applicative (package (name "ghc-optparse-applicative") - (version "0.17.0.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "optparse-applicative" version)) - (sha256 - (base32 - "097p1bkvw9r3rvcr65w53yw14drb0s46ldkkl1jbmq5g7m6jwnw2")))) + (version "0.17.1.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "optparse-applicative" version)) + (sha256 + (base32 "1vx5w03vvfr3hdk79lvl34x8bxj5xbx0xh53mmnmxi9r05scnyfi")))) (build-system haskell-build-system) (properties '((upstream-name . "optparse-applicative"))) (inputs (list ghc-transformers-compat ghc-ansi-wl-pprint)) (native-inputs (list ghc-quickcheck)) + (arguments + `(#:cabal-revision ("1" + "1mhyjlmb1hylmhv77w6gq663drpyiqd09w1x1vy4d63lr46mypyb"))) (home-page "https://github.com/pcapriotti/optparse-applicative") (synopsis "Utilities and combinators for parsing command line options") (description "This package provides utilities and combinators for parsing @@ -8371,13 +8359,13 @@ require aeson (define-public ghc-text-icu (package (name "ghc-text-icu") - (version "0.8.0.4") + (version "0.8.0.2") (source (origin (method url-fetch) (uri (hackage-uri "text-icu" version)) (sha256 - (base32 "1yj0jdjrsx12sy6lj1gizb2ys5likp9rcv8ryc6sjf2dw74097rd")))) + (base32 "0frxrsj580ipgb3pdvw1msdz8d63j02vvrqhzjja3ixlq24am69d")))) (build-system haskell-build-system) (properties '((upstream-name . "text-icu"))) (inputs (list icu4c)) @@ -8387,6 +8375,7 @@ require aeson ghc-test-framework ghc-test-framework-hunit ghc-test-framework-quickcheck2 + ghc-semigroups pkg-config)) (home-page "https://github.com/haskell/text-icu") (synopsis "Bindings to the ICU library") @@ -8425,7 +8414,7 @@ formatting.") (arguments `(#:cabal-revision ("1" "0gmmwwchy9312kz8kr5jhiamqrnjqxdqg1wkrww4289yfj1p7dzb"))) - (home-page "http://hackage.haskell.org/package/text-short") + (home-page "https://hackage.haskell.org/package/text-short") (synopsis "Memory-efficient representation of Unicode text strings") (description "This package provides the @code{ShortText} type which @@ -8468,21 +8457,18 @@ Implementations using both of these examples are provided.") (define-public ghc-doclayout (package (name "ghc-doclayout") - (version "0.4") - (source (origin - (method url-fetch) - (uri (hackage-uri "doclayout" version)) - (sha256 - (base32 - "18xkzywfw0hl3hgbq9z36hs040vb0iz9yygx33cybxfi4i0dwbkx")))) + (version "0.4.0.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "doclayout" version)) + (sha256 + (base32 "02xkf2shcrb897yrh9i6ch9qi4gm42avya4znsjxgpxb85fm3lzp")))) (build-system haskell-build-system) (properties '((upstream-name . "doclayout"))) (inputs (list ghc-emojis ghc-safe)) (native-inputs (list ghc-tasty ghc-tasty-golden ghc-tasty-hunit ghc-tasty-quickcheck)) - (arguments - `(#:cabal-revision ("1" - "0djwb7nrdablc0iy1qakrxpd4m7nn0w94vhb78il3jhjbj2ji179"))) (home-page "https://github.com/jgm/doclayout") (synopsis "Pretty-printing library for laying out text documents") (description @@ -8749,7 +8735,7 @@ combinators.") ghc-attoparsec ghc-semigroups)) (native-inputs (list ghc-quickcheck ghc-quickcheck-instances)) - (home-page "http://github.com/ekmett/parsers/") + (home-page "https://github.com/ekmett/parsers/") (synopsis "Parsing combinators") (description "This library provides convenient combinators for working @@ -8779,7 +8765,7 @@ the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s ghc-genvalidity-hspec ghc-hspec ghc-validity)) - (home-page "http://hackage.haskell.org/package/path") + (home-page "https://hackage.haskell.org/package/path") (synopsis "Support for well-typed paths") (description "This package introduces a type for paths upholding useful invariants.") @@ -8914,7 +8900,7 @@ syntax and semantics as Perl 5.") (arguments `(#:cabal-revision ("3" "0wl22dnz6ld300cg6id3lw991bp8kdfi8h0nbv37vn79i1zdcj5n"))) - (home-page "http://hackage.haskell.org/package/peano") + (home-page "https://hackage.haskell.org/package/peano") (synopsis "Peano numbers") (description "Provides an efficient Haskell implementation of Peano numbers") @@ -8968,13 +8954,13 @@ storage systems like PostgreSQL, SQLite, and MariaDB in a type-safe way.") (define-public ghc-persistent-sqlite (package (name "ghc-persistent-sqlite") - (version "2.13.1.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "persistent-sqlite" version)) - (sha256 - (base32 - "1z8650nv10f6yldn9sihk54c7mlcnkxwaj956igvs6q3x3s8aa1b")))) + (version "2.13.1.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "persistent-sqlite" version)) + (sha256 + (base32 "0a7s0znm4580spgadiqy14dhvm2kzbh6v3kc4px41yyk8br6vnpj")))) (build-system haskell-build-system) (properties '((upstream-name . "persistent-sqlite"))) (inputs (list ghc-persistent @@ -8995,6 +8981,7 @@ storage systems like PostgreSQL, SQLite, and MariaDB in a type-safe way.") ghc-system-fileio ghc-system-filepath ghc-temporary)) + (arguments (list #:tests? #f)) ; ghc-persistent-test is too old. (home-page "http://www.yesodweb.com/book/persistent") (synopsis "Backend for the persistent library using sqlite3") (description @@ -9451,7 +9438,7 @@ of the @code{primitive} library before @code{primitive-0.7.0.0}.") (home-page "https://github.com/seereason/process-extras") (synopsis "Extra tools for managing processes") (description "This package extends -@url{http://hackage.haskell.org/package/process}. It allows you to read +@url{httsp://hackage.haskell.org/package/process}. It allows you to read process input and output as ByteStrings or Text, or write your own ProcessOutput instance. It also provides lazy process input and output, and a ProcessMaker class for more flexibility in the process creation @@ -9497,7 +9484,7 @@ API.") "1cbccbvrx73drr1jf3yyw0rp1mcfv3jc1rvdcby5xxx4ja543fjs")))) (build-system haskell-build-system) (properties '((upstream-name . "indexed-profunctors"))) - (home-page "http://hackage.haskell.org/package/indexed-profunctors") + (home-page "https://hackage.haskell.org/package/indexed-profunctors") (synopsis "Utilities for indexed profunctors") (description "This package contains basic definitions related to indexed profunctors. These @@ -9539,17 +9526,20 @@ the ideal templating system.") (define-public ghc-protolude (package (name "ghc-protolude") - (version "0.3.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "protolude" version)) - (sha256 - (base32 - "0i53yxg44nrz0czwr8cqhw1fdapz9db8kfnqz9a3lmj5skrikh3y")))) + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (hackage-uri "protolude" version)) + (sha256 + (base32 "0ihsjx48p9dgsp0i0l73h16mycnba40hyh7412jv3xz9qz9dwfbc")))) (build-system haskell-build-system) (properties '((upstream-name . "protolude"))) (inputs (list ghc-async ghc-hashable ghc-mtl-compat ghc-transformers-compat)) + (arguments + `(#:cabal-revision ("2" + "0f949f93wml7h7na9d1n9lvignwphxr2r18jwmpy33g0dxgn21h1"))) (home-page "https://github.com/sdiehl/protolude") (synopsis "Sensible set of defaults for writing custom Preludes") (description @@ -9603,7 +9593,7 @@ keys, in linear time.") ghc-tasty-hunit ghc-tasty-quickcheck ghc-tagged)) - (home-page "http://hackage.haskell.org/package/psqueues") + (home-page "https://hackage.haskell.org/package/psqueues") (synopsis "Pure priority search queues") (description "The psqueues package provides @@ -9698,7 +9688,7 @@ usable.") ; ghc-tasty-hunit ; ghc-tasty ; ghc-tasty-inspection-testing)) - (home-page "http://hackage.haskell.org/package/random") + (home-page "https://hackage.haskell.org/package/random") (synopsis "Random number library") (description "This package provides a basic random number generation @@ -9839,7 +9829,7 @@ the community, with the missing features being added with pull-requests.") (arguments `(#:cabal-revision ("2" "1ji6rp0f857d0vp2kjqcck7avrjgqvqjgwnhdcxs3zbjkwpqyhfb"))) - (home-page "http://github.com/ekmett/reducers/") + (home-page "https://github.com/ekmett/reducers/") (synopsis "Semigroups, specialized containers and a general map/reduce framework") (description "This library provides various semigroups, specialized @@ -9870,23 +9860,25 @@ specify refactorings without depending on GHC.") (define-public ghc-reflection (package (name "ghc-reflection") - (version "2.1.6") + (version "2.1.7") (source (origin (method url-fetch) (uri (hackage-uri "reflection" version)) (sha256 - (base32 - "1kd6dgnp99dzbkxdnj01g81j03v7zq5cwg0sf19rlcmvgs8i8gmz")))) + (base32 "1z8mwkqb0ljxpc45hkj0jiyhjfl1frpxqhdnp0xm6w98n2l1ifvc")))) (build-system haskell-build-system) (properties '((upstream-name . "reflection"))) (inputs (list ghc-tagged)) - (native-inputs - (list ghc-hspec ghc-quickcheck hspec-discover)) + (native-inputs (list ghc-hspec ghc-quickcheck hspec-discover)) + (arguments + `(#:cabal-revision ("1" + "011s5ci385yccv576d1mh0n7v5k2pbmqkx1swlb5sq1sk3qb7dgj"))) (home-page "https://github.com/ekmett/reflection") (synopsis "Reify arbitrary terms into types that can be reflected back into terms") - (description "This package addresses the 'configuration problem' which is + (description + "This package addresses the 'configuration problem' which is propagating configurations that are available at run-time, allowing multiple configurations to coexist without resorting to mutable global variables or @code{System.IO.Unsafe.unsafePerformIO}.") @@ -10169,17 +10161,20 @@ Haskell library @code{regex-base}.") (define-public ghc-regex-tdfa (package (name "ghc-regex-tdfa") - (version "1.3.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "regex-tdfa" version)) - (sha256 - (base32 - "1lfzhir5zbgga44zhr4qvc2xc9pa9lslv12c8lwqqw80bzfdfq16")))) + (version "1.3.2.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "regex-tdfa" version)) + (sha256 + (base32 "15c2gc7c0y2xv9sm586jvys2kx1dc18lzfvjzad5mm2d4yszi2sw")))) (build-system haskell-build-system) (properties '((upstream-name . "regex-tdfa"))) (inputs (list ghc-regex-base)) (native-inputs (list ghc-utf8-string ghc-doctest-parallel)) + (arguments + `(#:cabal-revision ("1" + "1005mqjhq2blz8kqxmk84xajyqd85n91j9nraw6jrwfv11vxfvxa"))) (home-page "https://wiki.haskell.org/Regular_expressions") (synopsis "POSIX extended regular expressions in Haskell") (description @@ -10301,7 +10296,7 @@ connections.") (properties '((upstream-name . "resourcet"))) (inputs (list ghc-unliftio-core ghc-primitive)) (native-inputs (list ghc-hspec)) - (home-page "http://github.com/snoyberg/conduit") + (home-page "https://github.com/snoyberg/conduit") (synopsis "Deterministic allocation and freeing of scarce resources") (description "ResourceT is a monad transformer which creates a region of code where you can safely allocate resources.") @@ -10310,19 +10305,19 @@ code where you can safely allocate resources.") (define-public ghc-retry (package (name "ghc-retry") - (version "0.9.3.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "retry" version)) - (sha256 - (base32 - "1kafm17xk6hylr0lwa98wxjcx7z3rgnqi4fzxcks7dy9dz5ms7n1")))) + (version "0.9.3.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "retry" version)) + (sha256 + (base32 "1mky1dfllmx6dr1gayf636n3z5xrfmam3rhs5vx7c3wj9c8kabk2")))) (build-system haskell-build-system) (properties '((upstream-name . "retry"))) (inputs (list ghc-random ghc-mtl-compat ghc-unliftio-core)) (native-inputs (list ghc-hunit ghc-tasty ghc-tasty-hunit ghc-tasty-hedgehog ghc-hedgehog)) - (home-page "http://github.com/Soostone/retry") + (home-page "https://github.com/Soostone/retry") (synopsis "Retry combinators for monadic actions that may fail") (description "This package exposes combinators that can wrap @@ -10641,22 +10636,21 @@ award winning Linux port of \"Civilization: Call To Power.\"") (define-public ghc-sdl2 (package (name "ghc-sdl2") - (version "2.5.4.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "sdl2" version)) - (sha256 - (base32 - "1g35phifz49kxk48s8jmgglxhxl79cbzc1cg2qlgk0vdpxpin8ym")))) + (version "2.5.5.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "sdl2" version)) + (sha256 + (base32 "1kai6mmnwz9qq7q5y8c7wmcdf9qc5m167dzy3brj11jjds4smz93")))) (build-system haskell-build-system) (properties '((upstream-name . "sdl2"))) (inputs (list ghc-statevar ghc-vector ghc-linear sdl2)) (native-inputs (list ghc-weigh pkg-config)) (arguments - `(#:tests? #f ; Needs a graphics card. - #:cabal-revision ("2" - "1yxzq4gb6ig3d94lc76i5d50fa0j1fxr1wdlmgwhkvlfd4xnh6sg"))) - (home-page "http://hackage.haskell.org/package/sdl2") + `(#:cabal-revision ("1" + "0r0lzn3hyjvzwqsrqprdzb2c167g7ip2cf07jvm1h5b53qc2a4cx"))) + (home-page "https://hackage.haskell.org/package/sdl2") (synopsis "High- and low-level bindings to the SDL library") (description "This package contains bindings to the SDL 2 library, in both high- and @@ -10683,7 +10677,7 @@ programming.") (properties '((upstream-name . "sdl2-image"))) (inputs (list ghc-sdl2 sdl2-image)) (native-inputs (list pkg-config)) - (home-page "http://hackage.haskell.org/package/sdl2-image") + (home-page "https://hackage.haskell.org/package/sdl2-image") (synopsis "Bindings to SDL2_image") (description "This package provides Haskell bindings to @code{SDL2_image}.") @@ -10704,7 +10698,7 @@ programming.") (inputs (list ghc-data-default-class ghc-lifted-base ghc-monad-control ghc-sdl2 ghc-vector sdl2-mixer)) (native-inputs (list pkg-config)) - (home-page "http://hackage.haskell.org/package/sdl2-mixer") + (home-page "https://hackage.haskell.org/package/sdl2-mixer") (synopsis "Bindings to SDL2 mixer") (description "This package provides Haskell bindings to @code{SDL2_mixer}.") @@ -10724,7 +10718,7 @@ programming.") (properties '((upstream-name . "sdl2-ttf"))) (inputs (list ghc-sdl2 ghc-th-abstraction sdl2-ttf)) (native-inputs (list pkg-config)) - (home-page "http://hackage.haskell.org/package/sdl2-ttf") + (home-page "https://hackage.haskell.org/package/sdl2-ttf") (synopsis "Bindings to SDL2_ttf") (description "This package provides Haskell bindings to SDL2_ttf C++ library.") @@ -10744,7 +10738,7 @@ library.") (properties '((upstream-name . "sdl2-gfx"))) (inputs (list ghc-lifted-base ghc-monad-control ghc-sdl2 ghc-vector sdl2-gfx)) (native-inputs (list pkg-config)) - (home-page "http://hackage.haskell.org/package/sdl2-gfx") + (home-page "https://hackage.haskell.org/package/sdl2-gfx") (synopsis "Haskell bindings to SDL2_gfx") (description "This package provides Haskell bindings to the SDL2_gfx graphics @@ -10883,7 +10877,7 @@ class, forming lattice-like structure.") ghc-tagged ghc-hashable ghc-unordered-containers)) - (home-page "http://github.com/ekmett/semigroupoids") + (home-page "https://github.com/ekmett/semigroupoids") (synopsis "Semigroupoids operations for Haskell") (description "This library provides a wide array of (semi)groupoids and @@ -10910,7 +10904,7 @@ just a @code{Semigroup} are added.") (properties '((upstream-name . "semigroups"))) (inputs (list ghc-nats ghc-tagged ghc-hashable ghc-unordered-containers ghc-transformers-compat)) - (home-page "http://github.com/ekmett/semigroups/") + (home-page "https://github.com/ekmett/semigroups/") (synopsis "Semigroup operations for Haskell") (description "This package provides semigroups for Haskell. In @@ -11080,13 +11074,13 @@ interpolates variables according to the type being inserted.") (define-public ghc-shelly (package (name "ghc-shelly") - (version "1.10.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "shelly" version)) - (sha256 - (base32 - "0hgzh0rrhipir8378civ5mwvkvcsd063jm2pyx8dqngdynph0h65")))) + (version "1.10.0.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "shelly" version)) + (sha256 + (base32 "0nm3yg6mhgxj670xn18v4zvzzqxqv9b1r6psdmsppgqny1szqm3x")))) (build-system haskell-build-system) (properties '((upstream-name . "shelly"))) (inputs (list ghc-async @@ -11097,10 +11091,7 @@ interpolates variables according to the type being inserted.") ghc-transformers-base ghc-unix-compat)) (native-inputs (list ghc-hspec ghc-hspec-contrib ghc-hunit)) - (arguments - `(#:cabal-revision ("1" - "07c1rjwvg2ldam6yaksvrr9f703b7d1rcw0482ns5yi2f7y1kczp"))) - (home-page "https://github.com/yesodweb/Shelly.hs") + (home-page "https://github.com/gregwebs/Shelly.hs") (synopsis "Shell-like (systems) programming in Haskell") (description "Shelly provides convenient systems programming in Haskell, similar in @@ -11162,21 +11153,19 @@ them.") (define-public ghc-simple-sendfile (package (name "ghc-simple-sendfile") - (version "0.2.30") + (version "0.2.31") (source (origin (method url-fetch) (uri (hackage-uri "simple-sendfile" version)) (sha256 - (base32 - "112j0qfsjazf9wg1zywf7hjybgsiywk9wkm27yi8xzv27hmlv1mn")))) + (base32 "0q65dnvmwwcvpzhg3963s7yy404h4yrjgxvdbjy0grrs1qi6w1v6")))) (build-system haskell-build-system) (properties '((upstream-name . "simple-sendfile"))) - (inputs - (list ghc-conduit ghc-conduit-extra ghc-network ghc-resourcet)) - (native-inputs - (list ghc-hspec hspec-discover)) - (home-page "https://github.com/kazu-yamamoto/simple-sendfile") + (inputs (list ghc-network)) + (native-inputs (list ghc-hunit ghc-conduit ghc-conduit-extra ghc-resourcet + ghc-hspec hspec-discover)) + (home-page "https://hackage.haskell.org/package/simple-sendfile") (synopsis "Cross platform library for the sendfile system call") (description "This library tries to call minimum system calls which are the bottleneck of web servers.") @@ -11195,7 +11184,7 @@ are the bottleneck of web servers.") (build-system haskell-build-system) (properties '((upstream-name . "size-based"))) (inputs (list ghc-dictionary-sharing ghc-testing-type-modifiers)) - (home-page "http://hackage.haskell.org/package/size-based") + (home-page "https://hackage.haskell.org/package/size-based") (synopsis "Sized functors for size-based enumerations") (description "This library provides a framework for size-based enumerations.") @@ -11204,42 +11193,39 @@ enumerations.") (define-public ghc-skylighting-core (package (name "ghc-skylighting-core") - (version "0.13.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "skylighting-core" version)) - (sha256 - (base32 - "0iwzfgynj3l8rnvvrl4kg0i1n31rz15da8cf1943gw1vcfh6w585")))) + (version "0.13.2.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "skylighting-core" version)) + (sha256 + (base32 "1ib59w12f7mlh10nwj7404jv8x7z2r58g8a9ndr6ag8pxnf81054")))) (build-system haskell-build-system) (properties '((upstream-name . "skylighting-core"))) - (inputs - (list ghc-aeson - ghc-ansi-terminal - ghc-attoparsec - ghc-base64-bytestring - ghc-blaze-html - ghc-case-insensitive - ghc-colour - ghc-safe - ghc-utf8-string - ghc-xml-conduit)) - (native-inputs - (list ghc-diff - ghc-pretty-show - ghc-quickcheck - ghc-tasty - ghc-tasty-golden - ghc-tasty-hunit - ghc-tasty-quickcheck)) + (inputs (list ghc-aeson + ghc-case-insensitive + ghc-attoparsec + ghc-utf8-string + ghc-xml-conduit + ghc-safe + ghc-base64-bytestring + ghc-colour)) + (native-inputs (list ghc-tasty + ghc-tasty-golden + ghc-tasty-hunit + ghc-tasty-quickcheck + ghc-quickcheck + ghc-diff + ghc-pretty-show)) (home-page "https://github.com/jgm/skylighting") (synopsis "Syntax highlighting library") - (description "Skylighting is a syntax highlighting library with support + (description + "Skylighting is a syntax highlighting library with support for over one hundred languages. It derives its tokenizers from XML syntax definitions used by KDE's @code{KSyntaxHighlighting} framework, so any syntax supported by that framework can be added. An optional command-line program is provided. Skylighting is intended to be the successor to highlighting-kate.") - (license license:gpl2))) + (license license:bsd-3))) (define-public ghc-skylighting-format-blaze-html (package @@ -11283,13 +11269,13 @@ macros.") (define-public ghc-skylighting-format-context (package (name "ghc-skylighting-format-context") - (version "0.1.0.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "skylighting-format-context" version)) - (sha256 - (base32 - "1d4nf16wl2l4r627qnph09x21xwcq03r7bznqm08d4di1z241xv0")))) + (version "0.1.0.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "skylighting-format-context" version)) + (sha256 + (base32 "1gc8pjbhd1npka22m5m7s5333jcqxskgzmqj17m95dl97phi6hh0")))) (build-system haskell-build-system) (properties '((upstream-name . "skylighting-format-context"))) (inputs (list ghc-skylighting-core)) @@ -11323,13 +11309,13 @@ colored text.") (define-public ghc-skylighting (package (name "ghc-skylighting") - (version "0.13.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "skylighting" version)) - (sha256 - (base32 - "0dh4k39ddqca5px2d06ni8n9x3mifvkwd5i16077l472dwjcs879")))) + (version "0.13.2.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "skylighting" version)) + (sha256 + (base32 "0lq68cavdp73praa2h8cclgnrh53fqg9x4r6q3fsvnr8lbcb4x7h")))) (build-system haskell-build-system) (properties '((upstream-name . "skylighting"))) (inputs (list ghc-skylighting-core @@ -11354,22 +11340,20 @@ syntax modules based on the KDE XML definitions provided by the (define-public ghc-smallcheck (package (name "ghc-smallcheck") - (version "1.2.1") + (version "1.2.1.1") (source (origin (method url-fetch) (uri (hackage-uri "smallcheck" version)) (sha256 - (base32 - "0sf87zjlrgjw7q6a0499g2ywx66zvpv6rg6953fjc18fnl8rs7z4")))) + (base32 "07zyb3hnq242mdwak5briqc48wakp9pjsfizl78l06070i824hz0")))) (build-system haskell-build-system) (properties '((upstream-name . "smallcheck"))) - (inputs - (list ghc-logict)) - (home-page - "https://github.com/feuerbach/smallcheck") + (inputs (list ghc-logict ghc-semigroups ghc-nats ghc-void)) + (home-page "https://github.com/Bodigrim/smallcheck") (synopsis "Property-based testing library") - (description "SmallCheck is a testing library that verifies + (description + "SmallCheck is a testing library that verifies properties for all test cases up to some depth. The test cases are generated automatically by SmallCheck.") (license license:bsd-3))) @@ -11409,7 +11393,7 @@ automatically by SmallCheck.") (arguments `(#:cabal-revision ("1" "1p6zyqja021gyndskn1qnj29glqr0hldyhxplnpxz06hz4xqwngz"))) - (home-page "http://hackage.haskell.org/package/sop-core") + (home-page "https://hackage.haskell.org/package/sop-core") (synopsis "True Sums of Products") (description "This package provides an implementation of @@ -11459,7 +11443,7 @@ used for example by QuickCheck, see quickcheck-special." ) (build-system haskell-build-system) (properties '((upstream-name . "split"))) (native-inputs (list ghc-quickcheck)) - (home-page "http://hackage.haskell.org/package/split") + (home-page "https://hackage.haskell.org/package/split") (synopsis "Combinator library for splitting lists") (description "This package provides a collection of Haskell functions for @@ -11496,7 +11480,7 @@ mainstream languages.") `(#:tests? #f ; Missing library testu01. #:cabal-revision ("1" "1iqlg2d4mybqwzwp67c5a1yxzd47cbp4f7mrpa6d0ckypis2akl0"))) - (home-page "http://hackage.haskell.org/package/splitmix") + (home-page "https://hackage.haskell.org/package/splitmix") (synopsis "Fast and splittable pseudorandom number generator") (description "This package provides a Pure Haskell implementation of the @@ -11572,13 +11556,13 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") (define-public ghc-statistics (package (name "ghc-statistics") - (version "0.16.1.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "statistics" version)) - (sha256 - (base32 - "15yr0w25dqaqz16635qxkxvr6nj6mkjj9pl7wzw5yr3pn84xjryq")))) + (version "0.16.2.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "statistics" version)) + (sha256 + (base32 "1gsql118657j74v7r3yidzymzjvlcjvvs1pd37dg2lrz3xndyddk")))) (build-system haskell-build-system) (properties '((upstream-name . "statistics"))) (inputs (list ghc-math-functions @@ -11601,6 +11585,7 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") ghc-tasty-hunit ghc-tasty-quickcheck ghc-tasty-expected-failure)) + (arguments (list #:tests? #f)) ;; Fail. (home-page "https://github.com/haskell/statistics") (synopsis "Haskell library of statistical types, data, and functions") (description @@ -11629,19 +11614,19 @@ and regression and autocorrelation analysis. (define-public ghc-stm-chans (package (name "ghc-stm-chans") - (version "3.0.0.6") + (version "3.0.0.9") (source (origin (method url-fetch) (uri (hackage-uri "stm-chans" version)) (sha256 - (base32 - "04hafqjq8ngvhcavkfx88a0zky8yc7i18q2n9ajav03kns1kwvpa")))) + (base32 "0p9jq5fq3g77kf2kq807zrwqpw0z9a6zhw57h21wk4yb6zshs1ks")))) (build-system haskell-build-system) (properties '((upstream-name . "stm-chans"))) - (home-page "https://hackage.haskell.org/package/stm-chans") + (home-page "https://wrengr.org/software/hackage.html") (synopsis "Additional types of channels for ghc-stm") - (description "This Haskell package offers a collection of channel types, + (description + "This Haskell package offers a collection of channel types, similar to @code{Control.Concurrent.STM.@{TChan,TQueue@}} but with additional features.") (license license:bsd-3))) @@ -11687,23 +11672,21 @@ source and a sink.") (define-public ghc-stmonadtrans (package (name "ghc-stmonadtrans") - (version "0.4.6") + (version "0.4.7") (source (origin (method url-fetch) (uri (hackage-uri "STMonadTrans" version)) (sha256 - (base32 "0rvhh0hhwz601ibpzisry7xf3j61r5sxfgp47imaa37i5bvrlynb")))) + (base32 "1x83f48wbzx6rzbls6h8walfayzdv4j3j1mqbk8lfnkdqff9ri5d")))) (build-system haskell-build-system) (properties '((upstream-name . "STMonadTrans"))) - (arguments `(#:tests? #f)) ; TODO: Loops. (inputs (list ghc-fail)) -; (native-inputs -; `(("ghc-tasty" ,ghc-tasty) -; ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) -; ("ghc-tasty-hunit" ,ghc-tasty-hunit) -; ("ghc-stmonadtrans" ,ghc-stmonadtrans))) - (home-page "https://hackage.haskell.org/package/STMonadTrans") + (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-hunit)) + (arguments + `(#:cabal-revision ("1" + "01zfv7jdqf8wfmgxx2gdb1nik93iqvkmblrd18py5hy5mpbxp9dy"))) + (home-page "https://github.com/josefs/STMonadTrans") (synopsis "Monad transformer version of the ST monad") (description "This package provides a monad transformer version of the @code{ST} monad @@ -11734,13 +11717,13 @@ and Fortran complex data types.") (define-public ghc-storable-record (package (name "ghc-storable-record") - (version "0.0.6") - (source (origin - (method url-fetch) - (uri (hackage-uri "storable-record" version)) - (sha256 - (base32 - "1d4c1ccbrpq8rnacsjib9nmxhgxk9yb1zxx1nvfavhqhv8nwq2fd")))) + (version "0.0.7") + (source + (origin + (method url-fetch) + (uri (hackage-uri "storable-record" version)) + (sha256 + (base32 "1c1f58v13nxpq2ix30d2kpvsamk44apl6ms1a2pq54fkjk44didy")))) (build-system haskell-build-system) (properties '((upstream-name . "storable-record"))) (inputs (list ghc-quickcheck ghc-semigroups ghc-utility-ht @@ -11818,35 +11801,36 @@ arrays with a list interface, a chunky lazy list interface with variable chunk size and an interface for write access via the ST monad. This is much like bytestring and binary but can be used for every @code{Foreign.Storable.Storable} type. See also -@url{http://hackage.haskell.org/package/vector}, a library with a +@url{https://hackage.haskell.org/package/vector}, a library with a similar intention. This library does not do advanced fusion optimization, since especially for lazy vectors this would either be incorrect or not applicable. See -@url{http://hackage.haskell.org/package/storablevector-streamfusion} for +@url{httsp://hackage.haskell.org/package/storablevector-streamfusion} for a library that provides fusion with lazy lists.") (license license:bsd-3))) (define-public ghc-streaming-commons (package (name "ghc-streaming-commons") - (version "0.2.2.5") + (version "0.2.2.6") (source (origin (method url-fetch) (uri (hackage-uri "streaming-commons" version)) (sha256 - (base32 - "0157xjz8nhr65y9rm7rdf3pnjlrsgaqam7qfg7nqq91bvfdq2l6a")))) + (base32 "0ydzkx00akxf2kw5ifdmfia2if5iqa3fhbw15ckgdc1fi259b001")))) (build-system haskell-build-system) (properties '((upstream-name . "streaming-commons"))) - (inputs - (list ghc-async ghc-blaze-builder ghc-network ghc-random ghc-zlib)) - (native-inputs - (list ghc-quickcheck ghc-hspec hspec-discover)) - (home-page "https://hackage.haskell.org/package/streaming-commons") + (inputs (list ghc-async ghc-network ghc-random ghc-zlib)) + (native-inputs (list ghc-hspec ghc-quickcheck hspec-discover)) + (arguments + `(#:cabal-revision ("1" + "0jz2g82kzdiy6qwqx6a21y412v71hwnmzmai0gdiprylxyczpinm"))) + (home-page "https://github.com/fpco/streaming-commons") (synopsis "Conduit and pipes needed by some streaming data libraries") - (description "This package provides low-dependency functionality commonly + (description + "This package provides low-dependency functionality commonly needed by various Haskell streaming data libraries, such as @code{conduit} and @code{pipe}s.") (license license:expat))) @@ -11971,13 +11955,13 @@ building Scalable Vector Graphics (SVG).") (define-public ghc-syb (package (name "ghc-syb") - (version "0.7.2.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "syb" version)) - (sha256 - (base32 - "1qxjjndfwz2vvpz9707banmcn6jl2v6w6zp401zxaj327fccchw1")))) + (version "0.7.2.3") + (source + (origin + (method url-fetch) + (uri (hackage-uri "syb" version)) + (sha256 + (base32 "06nrr3x9zgk0ml7xckx04hr46lr15w3p8mrdrgcw8ix92spjvdyh")))) (build-system haskell-build-system) (properties '((upstream-name . "syb"))) (native-inputs (list ghc-tasty ghc-tasty-hunit)) @@ -12290,16 +12274,16 @@ This is a better maintained fork of the \"temporary\" package.") (define-public ghc-terminal-size (package (name "ghc-terminal-size") - (version "0.3.3") - (source (origin - (method url-fetch) - (uri (hackage-uri "terminal-size" version)) - (sha256 - (base32 - "1hv0r8gr1ms258rrz602gd5kziykkxw5zlnnzz5f42r0ly7lq5wc")))) + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "terminal-size" version)) + (sha256 + (base32 "0jbznrlf95lc6ajhh26h1qgcmbr3bj753i8jlkrsrnkcjbb71w5h")))) (build-system haskell-build-system) (properties '((upstream-name . "terminal-size"))) - (home-page "http://hackage.haskell.org/package/terminal-size") + (home-page "https://hackage.haskell.org/package/terminal-size") (synopsis "Get terminal window height and width") (description "Get terminal window height and width without ncurses dependency.") @@ -12308,18 +12292,18 @@ dependency.") (define-public ghc-texmath (package (name "ghc-texmath") - (version "0.12.5.4") - (source (origin - (method url-fetch) - (uri (hackage-uri "texmath" version)) - (sha256 - (base32 - "1dn88s352y641c1vlj5j5mqwhnz6r1algkd7mx83y3fr0wp3nhlq")))) + (version "0.12.5.5") + (source + (origin + (method url-fetch) + (uri (hackage-uri "texmath" version)) + (sha256 + (base32 "0hm88495sql6dz10hkrhfdnzfpgaa8zcy00v3irkzibq886nbcva")))) (build-system haskell-build-system) (properties '((upstream-name . "texmath"))) (inputs (list ghc-syb ghc-xml ghc-pandoc-types ghc-split)) (native-inputs (list ghc-pretty-show ghc-tasty ghc-tasty-golden ghc-tagged)) - (home-page "http://github.com/jgm/texmath") + (home-page "https://github.com/jgm/texmath") (synopsis "Conversion between formats used to represent mathematics") (description "The texmath library provides functions to read and write TeX math, @@ -12385,23 +12369,20 @@ upgraded. Consider yourself warned!") (define-public ghc-text-metrics (package (name "ghc-text-metrics") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (hackage-uri "text-metrics" version)) (sha256 - (base32 - "17bp1lnbkqr5ykrcd6v5sqv0fhljck7hky8zrrpw7rlkb1f3sdc2")))) + (base32 "0vl3vnm7xhy2zwcx1m293gp64q5sxfa3vmzdaqnqmjgby6l31mxx")))) (build-system haskell-build-system) (properties '((upstream-name . "text-metrics"))) - (inputs - (list ghc-vector)) - (native-inputs - (list ghc-quickcheck ghc-hspec)) + (inputs (list ghc-vector)) + (native-inputs (list ghc-quickcheck ghc-hspec)) (arguments - `(#:cabal-revision - ("4" "017drxq9x56b345d8w5m8xdsi1zzs0z16pbdx8j35cd1lsnh3kf1"))) + `(#:cabal-revision ("3" + "1hdxv7jka6x7d621cxn4r802w4rip45calmvjrb8aar34dshkg4q"))) (home-page "https://github.com/mrkkrp/text-metrics") (synopsis "Calculate various string metrics efficiently") (description "This library provides tools to calculate various @@ -12456,16 +12437,19 @@ Template Haskell.") (define-public ghc-th-expand-syns (package (name "ghc-th-expand-syns") - (version "0.4.10.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "th-expand-syns" version)) - (sha256 - (base32 - "044h1hv4b0ihpwr9wndj55fa843cbzqp1difgj9wyy3mw925higm")))) + (version "0.4.11.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "th-expand-syns" version)) + (sha256 + (base32 "1l7pkc16vnjgiam31745av14j7ngnr5mqmgp77xwd3h7fg75kkca")))) (build-system haskell-build-system) (properties '((upstream-name . "th-expand-syns"))) (inputs (list ghc-syb ghc-th-abstraction)) + (arguments + `(#:cabal-revision ("4" + "0vjznxgzzvlr39hq0pqvachaihsbp0m2fwrii89rjzhx0mlfy4l7"))) (home-page "https://github.com/DanielSchuessler/th-expand-syns") (synopsis "Expands type synonyms in Template Haskell ASTs") (description @@ -12476,21 +12460,17 @@ Template Haskell.") (define-public ghc-th-lift (package (name "ghc-th-lift") - (version "0.8.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "th-lift" version)) - (sha256 - (base32 - "1r2wrnrn6qwy6ysyfnlqn6xbfckw0b22h8n00pk67bhhg81jfn9s")))) + (version "0.8.3") + (source + (origin + (method url-fetch) + (uri (hackage-uri "th-lift" version)) + (sha256 + (base32 "0xbbii04c60l6v6fnd50lldhpsg1ba03j1ff9bmyzpp7z3sppm95")))) (build-system haskell-build-system) (properties '((upstream-name . "th-lift"))) - (inputs - (list ghc-th-abstraction)) - (arguments - `(#:cabal-revision ("2" - "1s95i774zy3q8yzk18ygdzhzky6wfcr7g55hd2g8h8lc05xzcdgi"))) - (home-page "https://github.com/mboes/th-lift") + (inputs (list ghc-th-abstraction)) + (home-page "https://github.com/RyanGlScott/th-lift") (synopsis "Derive Template Haskell's Lift class for datatypes") (description "This is a Haskell library to derive Template Haskell's Lift class for @@ -12511,7 +12491,7 @@ datatypes.") (properties '((upstream-name . "th-lift-instances"))) (inputs (list ghc-vector ghc-th-lift)) (native-inputs (list ghc-quickcheck)) - (home-page "http://github.com/bennofs/th-lift-instances/") + (home-page "https://github.com/bennofs/th-lift-instances/") (synopsis "Lift instances for template-haskell for common data types") (description "Most data types in the Haskell platform do not have Lift @@ -12534,7 +12514,7 @@ instances. This package provides orphan instances for @code{containers}, (inputs (list ghc-th-compat ghc-th-lift ghc-th-reify-many ghc-generic-deriving ghc-th-lift-instances)) (native-inputs (list ghc-hspec)) - (home-page "http://hackage.haskell.org/package/th-orphans") + (home-page "https://hackage.haskell.org/package/th-orphans") (synopsis "Orphan instances for TH datatypes") (description "This package provides orphan instances for Template Haskell datatypes. In particular, @@ -12753,7 +12733,7 @@ used CPU time of monadic computation with an IO base.") (arguments `(#:cabal-revision ("1" "1ak05p8z1q2nispv1xw32j7lhfmf3sfj2ibjrxpm347s37fmxnwc"))) - (home-page "http://projects.haskell.org/time-ng/") + (home-page "https://projects.haskell.org/time-ng/") (synopsis "Enhanced timezone handling for Time") (description "This package endows @code{Data.Time}, from the time package, with several @@ -12774,7 +12754,7 @@ create timezone series, see the ghc-timezone-olson package.") (build-system haskell-build-system) (properties '((upstream-name . "timezone-olson"))) (inputs (list ghc-timezone-series ghc-extensible-exceptions)) - (home-page "http://projects.haskell.org/time-ng/") + (home-page "https://projects.haskell.org/time-ng/") (synopsis "Parser and renderer for binary Olson timezone files") (description "A parser and renderer for binary Olson timezone files whose format @@ -12819,17 +12799,16 @@ man pages with practical examples.") (define-public ghc-torrent (package (name "ghc-torrent") - (version "10000.1.1") + (version "10000.1.3") (source (origin (method url-fetch) (uri (hackage-uri "torrent" version)) (sha256 - (base32 "0m7s0q7f8c7glxzqhf2j86ch5xhk6jnzwwsa4mkywag22119c290")))) + (base32 "1pp9qfpai7v8vlylw4zfgmnbznwjldqlbl3p6awlhzkpszvqzgny")))) (build-system haskell-build-system) (properties '((upstream-name . "torrent"))) - (inputs - (list ghc-bencode ghc-syb)) + (inputs (list ghc-bencode ghc-syb)) (home-page "https://hackage.haskell.org/package/torrent") (synopsis "BitTorrent file parser and generator") (description "This library provides support for parsing and generating @@ -12911,7 +12890,7 @@ compatibility to run on old versions of the platform.") (build-system haskell-build-system) (properties '((upstream-name . "transformers-compat"))) (inputs (list ghc-generic-deriving)) - (home-page "http://github.com/ekmett/transformers-compat/") + (home-page "https://github.com/ekmett/transformers-compat/") (synopsis "Small compatibility shim between transformers 0.3 and 0.4") (description "This package includes backported versions of types that were @@ -12934,7 +12913,7 @@ but also need those types.") (properties '((upstream-name . "exception-transformers"))) (inputs (list ghc-fail ghc-transformers-compat)) (native-inputs (list ghc-hunit ghc-test-framework ghc-test-framework-hunit)) - (home-page "http://hackage.haskell.org/package/exception-transformers") + (home-page "https://hackage.haskell.org/package/exception-transformers") (synopsis "Type classes and monads for unchecked extensible exceptions") (description "This package provides type classes, a monad and a monad transformer that support @@ -13015,7 +12994,7 @@ compute the difference between arbitrary abstract datatypes (ADTs) using (arguments `(#:cabal-revision ("1" "0a7cfbd04w3zbm234mmpib9mxar46ra5xvb62gcnbmixr7b343j9"))) - (home-page "http://github.com/ekmett/trifecta/") + (home-page "https://github.com/ekmett/trifecta/") (synopsis "Parser combinator library with convenient diagnostics") (description "Trifecta is a modern parser combinator library for Haskell, with slicing and Clang-style colored diagnostics.") @@ -13097,13 +13076,13 @@ similar functionality.") (define-public ghc-typed-process (package (name "ghc-typed-process") - (version "0.2.10.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "typed-process" version)) - (sha256 - (base32 - "17h9jl7gi26v3cxb4jdcksbp755sqqp8w7303q8x8r36rmf8fdp4")))) + (version "0.2.11.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "typed-process" version)) + (sha256 + (base32 "09gnj7m3jcl145fhslwzd30kwwc6hvdmqa4yr4smzn3m0ra5k34l")))) (build-system haskell-build-system) (properties '((upstream-name . "typed-process"))) (inputs (list ghc-async ghc-unliftio-core)) @@ -13156,7 +13135,7 @@ function.") (properties '((upstream-name . "unagi-chan"))) (inputs (list ghc-atomic-primops ghc-primitive)) (arguments (list #:tests? #f)) ; counter is atomic... test: Counter broken: expecting 10000000 got 9999996 - (home-page "http://hackage.haskell.org/package/unagi-chan") + (home-page "https://hackage.haskell.org/package/unagi-chan") (synopsis "Fast concurrent queues with a Chan-like API, and more") (description "This library provides implementations of concurrent FIFO queues (for @@ -13209,17 +13188,17 @@ handled safely, this is what you're left with.") (define-public ghc-unicode-data (package (name "ghc-unicode-data") - (version "0.4.0.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "unicode-data" version)) - (sha256 - (base32 - "1030n3h11hk1rbq0fdbpry3aclz6yz8bki2abjvbwh0rh2kdx99p")))) + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "unicode-data" version)) + (sha256 + (base32 "0q2wygqg0z9b22gzi083cxm73a8iz14zqvdsjmix9i57jxa827xy")))) (build-system haskell-build-system) (properties '((upstream-name . "unicode-data"))) - (native-inputs (list ghc-hspec)) - (home-page "http://github.com/composewell/unicode-data") + (native-inputs (list ghc-hspec hspec-discover)) + (home-page "https://github.com/composewell/unicode-data") (synopsis "Access Unicode Character Database (UCD)") (description "This package provides Haskell APIs to efficiently access the @@ -13245,7 +13224,7 @@ are generated programmatically from the UCD files.") (arguments `(#:cabal-revision ("2" "1imm3svpz2shilj2kmmmcyy5yd4c1mpmz5v1gvjrr98hrab2i9x7"))) - (home-page "http://github.com/composewell/unicode-transforms") + (home-page "https://github.com/composewell/unicode-transforms") (synopsis "Unicode normalization") (description "This library provides tools for fast Unicode 12.1.0 @@ -13313,7 +13292,7 @@ work, but is substantially simpler and faster.") (arguments `(#:cabal-revision ("2" "0mik6xb1jdmb2jlxlmzf0517mxfj0c1j2i4r6h5212m4q6znqqcm"))) - (home-page "http://github.com/jacobstanley/unix-compat") + (home-page "https://github.com/jacobstanley/unix-compat") (synopsis "Portable POSIX-compatibility layer") (description "This package provides portable implementations of parts of the unix @@ -13324,19 +13303,18 @@ isn't available, portable implementations are used.") (define-public ghc-unix-time (package (name "ghc-unix-time") - (version "0.4.8") - (source (origin - (method url-fetch) - (uri (hackage-uri "unix-time" version)) - (sha256 - (base32 - "0hz8mi08kg84hiqnch5ycscgqmjyn1mnl5ih1bsrclyb3fhvdppy")))) + (version "0.4.9") + (source + (origin + (method url-fetch) + (uri (hackage-uri "unix-time" version)) + (sha256 + (base32 "024bmjy16mwdyf4rkyy6l2s63ym5gg04vxdk5ylml1hfhva381s9")))) (build-system haskell-build-system) (properties '((upstream-name . "unix-time"))) (inputs (list ghc-old-time)) - (native-inputs (list ghc-doctest ghc-old-locale ghc-quickcheck ghc-hspec - hspec-discover)) - (home-page "http://hackage.haskell.org/package/unix-time") + (native-inputs (list ghc-old-locale ghc-quickcheck ghc-hspec hspec-discover)) + (home-page "https://hackage.haskell.org/package/unix-time") (synopsis "Unix time parser/formatter and utilities") (description "This library provides fast parsing and formatting utilities for Unix time in Haskell.") @@ -13345,13 +13323,13 @@ for Unix time in Haskell.") (define-public ghc-unliftio (package (name "ghc-unliftio") - (version "0.2.23.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "unliftio" version)) - (sha256 - (base32 - "1zg4ddi4z85550abw9ijycbbjg8ddig7r0vcma8ik03dxzga71id")))) + (version "0.2.25.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "unliftio" version)) + (sha256 + (base32 "0aqiia15p5y0jddk6fsb00das035f8x5cpkzrmc9x3z7j4ia51gv")))) (build-system haskell-build-system) (properties '((upstream-name . "unliftio"))) (inputs (list ghc-async ghc-safe-exceptions ghc-unliftio-core ghc-nats)) @@ -13368,23 +13346,23 @@ working with it.") (define-public ghc-unliftio-core (package (name "ghc-unliftio-core") - (version "0.2.0.1") + (version "0.2.1.0") (source (origin (method url-fetch) (uri (hackage-uri "unliftio-core" version)) (sha256 - (base32 - "16i97jax8rys57l0g0qswfwxh1cl5bgw2lw525rm6bzajw90v7wi")))) + (base32 "1qz3gxcq1x8fjgq6fqsnws5vgkgbjcx332p3hldxdnaninx4qf4r")))) (build-system haskell-build-system) (properties '((upstream-name . "unliftio-core"))) (arguments - `(#:cabal-revision - ("2" "1xx9nmxxg87nhwxgbmmw0xbrppnjc23ppyryar04i3njyg9wvazr"))) + `(#:cabal-revision ("4" + "0ah7x2k1p5d43iwr2xr12z5fk5jdxb9l7jjd73cr0lwbhmpp78pn"))) (home-page "https://github.com/fpco/unliftio/tree/master/unliftio-core#readme") (synopsis "The MonadUnliftIO typeclass for unlifting monads to IO") - (description "This Haskell package provides the core @code{MonadUnliftIO} + (description + "This Haskell package provides the core @code{MonadUnliftIO} typeclass, instances for base and transformers, and basic utility functions.") (license license:expat))) @@ -13444,7 +13422,7 @@ and high speed.") "1bmafx363gfsd9wwrf3xyrw9mnw6anmc1zdfv0p8597y4lxxach7")))) (build-system haskell-build-system) (properties '((upstream-name . "commutative-semigroups"))) - (home-page "http://hackage.haskell.org/package/commutative-semigroups") + (home-page "https://hackage.haskell.org/package/commutative-semigroups") (synopsis "Commutative semigroups") (description "This package provides a commutative semigroup is a semigroup where the order of @@ -13608,18 +13586,21 @@ UTF8 without truncation.") (define-public ghc-utility-ht (package (name "ghc-utility-ht") - (version "0.0.16") - (home-page "https://hackage.haskell.org/package/utility-ht") + (version "0.0.17") (source (origin (method url-fetch) (uri (hackage-uri "utility-ht" version)) (sha256 - (base32 "10dvmfhhhj5w4wz5drhvs6i0yv35kbbcbzhy6ci34r3ppcik5rdw")))) + (base32 "164sy6vdq5vspvfcj59hsmynn97x0wimw4xa5jyzkl4b0vp8lhb2")))) (build-system haskell-build-system) (properties '((upstream-name . "utility-ht"))) - (native-inputs - (list ghc-quickcheck ghc-doctest-exitcode-stdio ghc-doctest-lib)) + (native-inputs (list ghc-quickcheck ghc-doctest-exitcode-stdio + ghc-doctest-lib)) + (arguments + `(#:cabal-revision ("1" + "11i3n06rg580c87br6ic3m75bd83p9incz1nmkkqrawpr7s2fk5f"))) + (home-page "https://hackage.haskell.org/package/utility-ht") (synopsis "Haskell helper functions for Lists, Maybes, Tuples, Functions") (description "This package includes Hakell modules providing various helper functions for Lists, Maybes, Tuples, Functions.") @@ -13959,45 +13940,40 @@ given term should not exist.") (define-public ghc-vty (package - (name "ghc-vty") - (version "5.35.1") - (source - (origin - (method url-fetch) - (uri (hackage-uri "vty" version)) - (sha256 - (base32 "062dpz8fxrnggzpl041zpbph0xj56jki98ajm2s78dldg5vy0c9k")))) - (build-system haskell-build-system) - (native-inputs - (list ghc-hunit - ghc-quickcheck - ghc-quickcheck-assertions - ghc-random - ghc-smallcheck - ghc-string-qq - ghc-test-framework - ghc-test-framework-smallcheck - ghc-test-framework-hunit)) - (inputs - (list ghc-ansi-terminal - ghc-blaze-builder - ghc-hashable - ghc-microlens - ghc-microlens-mtl - ghc-microlens-th - ghc-parallel - ghc-utf8-string - ghc-vector)) - (arguments - `(#:cabal-revision ("1" - "1zqcvgqhcij92241g20zn3c3a4033biid3f3cqg05q1ygrmznxb5"))) - (properties '((upstream-name . "vty"))) - (home-page "https://github.com/jtdaugherty/vty") - (synopsis "Simple terminal UI library") - (description - "vty is a terminal GUI library in the niche of ncurses, intended to be easy + (name "ghc-vty") + (version "5.37") + (source + (origin + (method url-fetch) + (uri (hackage-uri "vty" version)) + (sha256 + (base32 "1w6dc25npvlaflxcyzdssnymgi7x03zkwg7swyjw6cjjfdmkgqb7")))) + (build-system haskell-build-system) + (properties '((upstream-name . "vty"))) + (inputs (list ghc-blaze-builder + ghc-microlens + ghc-microlens-mtl + ghc-microlens-th + ghc-hashable + ghc-parallel + ghc-utf8-string + ghc-vector + ghc-ansi-terminal)) + (native-inputs (list ghc-hunit + ghc-quickcheck + ghc-quickcheck-assertions + ghc-random + ghc-smallcheck + ghc-string-qq + ghc-test-framework + ghc-test-framework-hunit + ghc-test-framework-smallcheck)) + (home-page "https://github.com/jtdaugherty/vty") + (synopsis "Simple terminal UI library") + (description + "vty is a terminal GUI library in the niche of ncurses, intended to be easy to use and to provide good support for common terminal types.") - (license license:bsd-3))) + (license license:bsd-3))) (define-public ghc-wave (package @@ -14168,7 +14144,7 @@ modernized interface.") (build-system haskell-build-system) (properties '((upstream-name . "wl-pprint-text"))) (inputs (list ghc-base-compat)) - (home-page "http://hackage.haskell.org/package/wl-pprint-text") + (home-page "https://hackage.haskell.org/package/wl-pprint-text") (synopsis "Wadler/Leijen Pretty Printer for Text values") (description "A clone of wl-pprint for use with the text library.") (license license:bsd-3))) @@ -14274,7 +14250,7 @@ bindings are a direct translation of the C bindings.") `(#:extra-directories ("libx11" "libxft" "xorgproto"))) (inputs (list ghc-x11 ghc-utf8-string libx11 libxft xorgproto)) (native-inputs (list pkg-config)) - (home-page "http://hackage.haskell.org/package/X11-xft") + (home-page "https://hackage.haskell.org/package/X11-xft") (synopsis "Bindings to Xft") (description "Bindings to the Xft, X Free Type interface library, and some Xrender @@ -14320,39 +14296,24 @@ parts.") (define-public ghc-xml-conduit (package (name "ghc-xml-conduit") - (version "1.9.1.1") + (version "1.9.1.2") (source (origin (method url-fetch) (uri (hackage-uri "xml-conduit" version)) (sha256 - (base32 - "1zzh7xnmbm68dab1vqsjkr6ghxqgnla5nik4amrwlmhbdih1gcdx")))) + (base32 "1pa8arh2s7ql61pap9599j9ll94rb4j70c11vpgqymm01gx4d6wm")))) (build-system haskell-build-system) (properties '((upstream-name . "xml-conduit"))) - (inputs - (list ghc-conduit - ghc-conduit-extra - ghc-resourcet - ghc-xml-types - ghc-attoparsec - ghc-data-default-class - ghc-blaze-markup - ghc-blaze-html)) - (native-inputs (list ghc-hspec ghc-hunit ghc-doctest hspec-discover)) - (arguments - `(#:cabal-revision ("2" - "0m6sknp9xxz8a3dhvyfpyjvxp8ph511w19j4vj1qsd6hl2pazjy6") - #:tests? #f ; Depend on non-existent doctest API. - #:phases - (modify-phases %standard-phases - ;; Tries to use non-existent doctest API. - (add-after 'unpack 'disable-doctest - (lambda _ - (with-output-to-file "Setup.hs" - (lambda _ - (display - "import Distribution.Simple\nmain = defaultMain\n")))))))) + (inputs (list ghc-conduit + ghc-conduit-extra + ghc-resourcet + ghc-xml-types + ghc-attoparsec + ghc-data-default-class + ghc-blaze-markup + ghc-blaze-html)) + (native-inputs (list ghc-hspec ghc-hunit ghc-doctest ghc-cabal-doctest)) (home-page "https://github.com/snoyberg/xml") (synopsis "Utilities for dealing with XML with the conduit package") (description @@ -14403,13 +14364,13 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.") (define-public ghc-yaml (package (name "ghc-yaml") - (version "0.11.8.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "yaml" version)) - (sha256 - (base32 - "1s0arllihjjqp65jbc8c1w5106i2infppsirvbsifpmpkf14w6pn")))) + (version "0.11.11.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "yaml" version)) + (sha256 + (base32 "0j7xa3bgznaj35x3x184c0dy6hjflxkdwp3iprfnhmz2ds2dr790")))) (build-system haskell-build-system) (properties '((upstream-name . "yaml"))) (inputs (list ghc-aeson @@ -14429,8 +14390,8 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.") ghc-temporary hspec-discover)) (arguments - `(#:cabal-revision ("2" - "1dix5jm3d380vjr9l6wqz54zk883kilk8rijlvjp6b13mjxwcj1l"))) + `(#:cabal-revision ("1" + "1pqiq7x2ccjjx4ibf6l1fgvc673k2ny9cwh9061mf9pn5qhg51n5"))) (home-page "https://github.com/snoyberg/yaml#readme") (synopsis "Parsing and rendering YAML documents") (description @@ -14440,13 +14401,13 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.") (define-public ghc-zip-archive (package (name "ghc-zip-archive") - (version "0.4.2.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "zip-archive" version)) - (sha256 - (base32 - "02b76hm76gqallij70z77xz1y981ig4biklzm0wgxran8d06n0d4")))) + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (hackage-uri "zip-archive" version)) + (sha256 + (base32 "01ax0idyvggizbdbg38nynmm5dk53apsjbj2xaq8v11ry6h0y1b8")))) (build-system haskell-build-system) (properties '((upstream-name . "zip-archive"))) (inputs (list ghc-zlib ghc-digest)) @@ -14461,7 +14422,7 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.") (path (getenv "PATH"))) (setenv "PATH" (string-append unzip "/bin:" which "/bin:" path)) #t)))))) - (home-page "http://github.com/jgm/zip-archive") + (home-page "https://github.com/jgm/zip-archive") (synopsis "Zip archive library for Haskell") (description "The zip-archive library provides functions for creating, @@ -14484,7 +14445,7 @@ modifying, and extracting files from zip archives in Haskell.") `(#:extra-directories ("zlib"))) (inputs (list zlib)) (native-inputs (list ghc-quickcheck ghc-tasty ghc-tasty-quickcheck)) - (home-page "http://hackage.haskell.org/package/zlib") + (home-page "https://hackage.haskell.org/package/zlib") (synopsis "Compression and decompression in the gzip and zlib formats") (description "This package provides a pure interface for compressing and decompressing @@ -14548,20 +14509,17 @@ compression ratios.") (define-public ghc-indexed-traversable (package (name "ghc-indexed-traversable") - (version "0.1.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "indexed-traversable" version)) - (sha256 - (base32 - "13b91rkhs6wcshaz3dwx6x3xjpw5z5bm2riwp78zxccqf7p5hs2i")))) + (version "0.1.2.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "indexed-traversable" version)) + (sha256 + (base32 "1926yzk0gc2vd6p12addj70fnh57504xl29yzvbcgssx5084r1gy")))) (build-system haskell-build-system) (properties '((upstream-name . "indexed-traversable"))) (inputs (list ghc-generic-deriving)) - (arguments - `(#:cabal-revision ("2" - "0l2k9jrmixkkf7qzzq0bqgvk6axaqi9sxxkpb4dgj8frmc4bg8aj"))) - (home-page "http://hackage.haskell.org/package/indexed-traversable") + (home-page "https://hackage.haskell.org/package/indexed-traversable") (synopsis "Indexed Functor, Foldable, and Traversable typeclasses") (description "This Haskell package provides three useful generalizations: @@ -14663,7 +14621,7 @@ on selective functors} for more details.") (arguments `(#:cabal-revision ("2" "1sb7ii9mhx77rhviqbmdc5r6wlimkmadxi1pyk7k3imdqcdzgjlp"))) - (home-page "http://github.com/ekmett/keys/") + (home-page "https://github.com/ekmett/keys/") (synopsis "Keyed functors and containers") (description "This package provides a bunch of ad hoc classes for accessing parts of @@ -14693,7 +14651,7 @@ dependencies.") ghc-transformers-compat ghc-hashable ghc-unordered-containers)) - (home-page "http://github.com/ekmett/pointed/") + (home-page "https://github.com/ekmett/pointed/") (synopsis "Pointed and copointed data types") (description "This Haskell library provides pointed and copointed data types.") @@ -14702,23 +14660,21 @@ dependencies.") (define-public ghc-vector-instances (package (name "ghc-vector-instances") - (version "3.4") + (version "3.4.2") (source (origin (method url-fetch) (uri (hackage-uri "vector-instances" version)) (sha256 - (base32 "10akvpa5w9bp0d8hflab63r9laa9gy2hv167smhjsdzq1kplc0hv")))) + (base32 "0rynfy4agx66mwslj50bfqdyrylr2zba3r6dg5yqykpnfxp2vn9l")))) (build-system haskell-build-system) (properties '((upstream-name . "vector-instances"))) - (inputs - (list ghc-vector - ghc-semigroupoids - ghc-semigroups - ghc-comonad - ghc-pointed - ghc-keys - ghc-hashable)) + (inputs (list ghc-vector + ghc-semigroupoids + ghc-comonad + ghc-pointed + ghc-keys + ghc-hashable)) (home-page "https://github.com/ekmett/vector-instances") (synopsis "Orphan instances for @code{Data.Vector}") (description @@ -14834,13 +14790,13 @@ it.") (define-public ghc-unicode-collation (package (name "ghc-unicode-collation") - (version "0.1.3.3") - (source (origin - (method url-fetch) - (uri (hackage-uri "unicode-collation" version)) - (sha256 - (base32 - "0imcdsk0qqwj31zwgpick4s2nbxlyxwa64lq6r212jd0y0hrrvvl")))) + (version "0.1.3.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "unicode-collation" version)) + (sha256 + (base32 "0afllqpds1ak3gailsn18r7pjdp1mqycdpwwcfifvmk9nadvx3dh")))) (build-system haskell-build-system) (properties '((upstream-name . "unicode-collation"))) (inputs (list ghc-th-lift-instances)) @@ -14859,13 +14815,13 @@ provided.") (define-public ghc-citeproc (package (name "ghc-citeproc") - (version "0.8.0.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "citeproc" version)) - (sha256 - (base32 - "1rja6vdggmh7d40gsg2xfs9md6m1zbfddpsd27a15qyqb3530jzw")))) + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "citeproc" version)) + (sha256 + (base32 "003488k6ckfknh62lkxy07w72h95jcdx20kfc1njrxrqijyknlik")))) (build-system haskell-build-system) (properties '((upstream-name . "citeproc"))) (inputs (list ghc-safe @@ -14883,7 +14839,7 @@ provided.") ghc-base-compat ghc-aeson-pretty)) (native-inputs (list ghc-timeit ghc-diff)) - (home-page "http://hackage.haskell.org/package/citeproc") + (home-page "https://hackage.haskell.org/package/citeproc") (synopsis "Generate citations and bibliography from CSL styles") (description "@code{ghc-citeproc} parses @acronym{Citation Style Language, CSL} style files @@ -14927,13 +14883,13 @@ varies linearly with input length.") (define-public ghc-commonmark-extensions (package (name "ghc-commonmark-extensions") - (version "0.2.3.3") - (source (origin - (method url-fetch) - (uri (hackage-uri "commonmark-extensions" version)) - (sha256 - (base32 - "009yrsb2xxna73q6nnijfx5ngffaz369mildvqvn91qbrkrzq7pl")))) + (version "0.2.3.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "commonmark-extensions" version)) + (sha256 + (base32 "0pk6ckpb01pr9i2xyx2bm1sbkzbxy5vfy8l67pca1y0i0glyz150")))) (build-system haskell-build-system) (properties '((upstream-name . "commonmark-extensions"))) (inputs (list ghc-network-uri ghc-commonmark ghc-emojis)) @@ -14949,13 +14905,13 @@ footnotes, math, and more.") (define-public ghc-commonmark-pandoc (package (name "ghc-commonmark-pandoc") - (version "0.2.1.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "commonmark-pandoc" version)) - (sha256 - (base32 - "1dpi8zvjshab96w56qfqcys9h09f46lld8sc9q4xzb0y1p6lwmap")))) + (version "0.2.1.3") + (source + (origin + (method url-fetch) + (uri (hackage-uri "commonmark-pandoc" version)) + (sha256 + (base32 "08bzi6q3jma7xy1ygbpj8li06zwsykmmgl01i4qmp6i9fj8czbbp")))) (build-system haskell-build-system) (properties '((upstream-name . "commonmark-pandoc"))) (inputs (list ghc-commonmark ghc-commonmark-extensions ghc-pandoc-types)) @@ -15044,21 +15000,25 @@ information.") (define-public ghc-binary-orphans (package (name "ghc-binary-orphans") - (version "1.0.3") - (source (origin - (method url-fetch) - (uri (hackage-uri "binary-orphans" version)) - (sha256 - (base32 - "0b302hhjaybwbnpzrd8qmdp24g2xj2svib34zfxqqxg67j159rg2")))) + (version "1.0.4.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "binary-orphans" version)) + (sha256 + (base32 "1lphlb7nar3d9db87wl0sh6srx03dad2ssxqak8bn9bdr2dphnsz")))) (build-system haskell-build-system) (properties '((upstream-name . "binary-orphans"))) + (inputs (list ghc-data-array-byte)) (native-inputs (list ghc-onetuple ghc-quickcheck ghc-quickcheck-instances ghc-tagged ghc-tasty ghc-tasty-quickcheck)) + (arguments + `(#:cabal-revision ("3" + "085flwx82nvvyb479jma9j62q8i9sbz65rarsqhasgz4vczxqawx"))) (home-page "https://hackage.haskell.org/package/binary-orphans") (synopsis "Compatibility package for binary") (description "This package provides instances defined in later versions of @@ -15091,17 +15051,17 @@ of Netlink families.") (define-public ghc-doctest-driver-gen (package (name "ghc-doctest-driver-gen") - (version "0.3.0.6") - (source (origin - (method url-fetch) - (uri (hackage-uri "doctest-driver-gen" version)) - (sha256 - (base32 - "0a4jdg4mzhdgfal7jp60yrlv63iv7d8f7nxc9aqvrl93mairny8l")))) + (version "0.3.0.7") + (source + (origin + (method url-fetch) + (uri (hackage-uri "doctest-driver-gen" version)) + (sha256 + (base32 "0xxfp1x92qi8p5xkhyymylm8m3s56c7ivc82mv13sw14msds8miq")))) (build-system haskell-build-system) (properties '((upstream-name . "doctest-driver-gen"))) (native-inputs (list ghc-doctest)) - (arguments (list #:tests? #f)) ;; XXX: doctest-driver-gen: error while loading shared libraries: libHSdoctest-driver-gen-0.3.0.6-3WJHXaMfGwJFKjjgcmC868-ghc9.2.5.so: cannot open shared object file: No such file or directory + (arguments (list #:tests? #f)) ; Test executable fails to run. (home-page "https://github.com/Hexirp/doctest-driver-gen#readme") (synopsis "Generate driver file for Doctest's Cabal integration") (description @@ -15112,13 +15072,13 @@ lets you automatically generate driver file for Doctest's Cabal integration.") (define-public ghc-template-haskell-compat-v0208 (package (name "ghc-template-haskell-compat-v0208") - (version "0.1.9.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "template-haskell-compat-v0208" version)) - (sha256 - (base32 - "1z87rla4vcbghdrvjkay59b686f0by02102vwrcayn4vbwzn4am1")))) + (version "0.1.9.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "template-haskell-compat-v0208" version)) + (sha256 + (base32 "1sfp8bzkxqbk7cjc70sz51mm2mcq9lz6cqk9pch8g3qgcscf02f0")))) (build-system haskell-build-system) (properties '((upstream-name . "template-haskell-compat-v0208"))) (home-page @@ -15162,21 +15122,19 @@ built.") (define-public ghc-blaze-textual (package (name "ghc-blaze-textual") - (version "0.2.2.1") + (version "0.2.3.1") (source (origin (method url-fetch) (uri (hackage-uri "blaze-textual" version)) (sha256 - (base32 "0zjnwnjpcpnnm0815h9ngr3a3iy0szsnb3nrcavkbx4905s9k4bs")))) + (base32 "1chpaynfqiykqdk4jrmwxczj01wph8qfb411600l0gj3g34wlanx")))) (build-system haskell-build-system) (properties '((upstream-name . "blaze-textual"))) - (inputs - (list ghc-blaze-builder ghc-old-locale ghc-vector)) - (native-inputs - (list ghc-quickcheck ghc-double-conversion ghc-test-framework - ghc-test-framework-quickcheck2)) - (home-page "https://github.com/bos/blaze-textual") + (inputs (list ghc-blaze-builder ghc-old-locale ghc-vector)) + (native-inputs (list ghc-quickcheck ghc-double-conversion + ghc-test-framework ghc-test-framework-quickcheck2)) + (home-page "https://github.com/swamp-agr/blaze-textual") (synopsis "Fast rendering of common datatypes") (description "@code{ghc-blaze-textual} is a fast Haskell library for rendering common @@ -15244,13 +15202,13 @@ Language} for @code{ghc-persistent}.") (define-public ghc-persistent-mysql (package (name "ghc-persistent-mysql") - (version "2.13.1.3") - (source (origin - (method url-fetch) - (uri (hackage-uri "persistent-mysql" version)) - (sha256 - (base32 - "0fm6agqwawwraw6l6kxm8lq40pm5pnjg093f574a7sdf648q21yc")))) + (version "2.13.1.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "persistent-mysql" version)) + (sha256 + (base32 "10i8x5byqjqgqmjwfjj56dgjhnkv7wf4bg1pad9dd1ld3crlaf8d")))) (build-system haskell-build-system) (properties '((upstream-name . "persistent-mysql"))) (inputs (list ghc-persistent @@ -15262,8 +15220,7 @@ Language} for @code{ghc-persistent}.") ghc-mysql-simple ghc-resourcet ghc-resource-pool - ghc-unliftio-core - openssl)) + ghc-unliftio-core)) (native-inputs (list ghc-fast-logger ghc-hspec ghc-http-api-data @@ -15273,7 +15230,7 @@ Language} for @code{ghc-persistent}.") ghc-persistent-test ghc-quickcheck ghc-quickcheck-instances)) - (arguments (list #:tests? #f)) ; Fails to connect to server. + (arguments (list #:tests? #f)) ; Tests fail to build. (home-page "http://www.yesodweb.com/book/persistent") (synopsis "Backend for the @code{ghc-persistent} library using MySQL database server") @@ -15331,19 +15288,19 @@ string types into values of other string types.") (define-public ghc-postgresql-libpq (package (name "ghc-postgresql-libpq") - (version "0.9.4.3") + (version "0.9.5.0") (source (origin (method url-fetch) (uri (hackage-uri "postgresql-libpq" version)) (sha256 - (base32 "1gfnhc5pibn7zmifdf2g0c112xrpzsk756ln2kjzqljkspf4dqp3")))) + (base32 "0w2l687r9z92snvd0cjyv3dxghgr5alyw0vc2c6bp2600pc2nnfi")))) (build-system haskell-build-system) (properties '((upstream-name . "postgresql-libpq"))) + (native-inputs (list postgresql)) (arguments - `(#:cabal-revision ("3" - "02cj493a2qxl5hddiq0579079s398hdqqy164pig6d61nl7q66cs"))) - (inputs (list postgresql)) + `(#:cabal-revision ("1" + "02g69cm1nqvvakyjs7ps2q9nkl4vpcdcxl41s7hzpy3vjhyar036"))) (home-page "https://github.com/haskellari/postgresql-libpq") (synopsis "Low-level bindings to @code{libpq}") (description @@ -15400,13 +15357,13 @@ server and to receive the results of these queries.") (define-public ghc-persistent-postgresql (package (name "ghc-persistent-postgresql") - (version "2.13.5.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "persistent-postgresql" version)) - (sha256 - (base32 - "1q9hy49nfrb3azgz5rjz235d7scy27l5axkih7crskaa04hf4k8d")))) + (version "2.13.5.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "persistent-postgresql" version)) + (sha256 + (base32 "0p8hikvynl6yfdv030pk6vpczpw52ys8m4vba1qb9h2w1vkr4a3i")))) (build-system haskell-build-system) (properties '((upstream-name . "persistent-postgresql"))) (inputs (list ghc-persistent @@ -15436,7 +15393,10 @@ server and to receive the results of these queries.") ghc-http-api-data ghc-unordered-containers ghc-vector)) - (arguments (list #:tests? #f)) ; Fails to connect to server. + (arguments + `(#:cabal-revision ("1" + "1qbd3s0nyii6s69jvn8bw9hmxrqs41wimy9jn6j359w4rl1xslqc") + #:tests? #f)) ; Tests fail to build. (home-page "http://www.yesodweb.com/book/persistent") (synopsis "Backend for the @code{ghc-persistent library} using Postgresql") (description @@ -15467,18 +15427,17 @@ using the @code{ghc-postgresql-simple} package.") (define-public ghc-filelock (package (name "ghc-filelock") - (version "0.1.1.5") + (version "0.1.1.6") (source (origin (method url-fetch) (uri (hackage-uri "filelock" version)) (sha256 - (base32 "06a44i7a956d7xkk2na4090xj2a7b7a228pk4spmccs4x20ymssh")))) + (base32 "122v6nv13rgi7nprdcpz8zc534i85yz6lshx0jx5mfqjam4zcx5g")))) (build-system haskell-build-system) (properties '((upstream-name . "filelock"))) - (native-inputs - (list ghc-async ghc-async)) - (home-page "https://github.com/takano-akio/filelock") + (native-inputs (list ghc-async)) + (home-page "https://github.com/haskell-pkg-janitors/filelock") (synopsis "Portable interface to file locking") (description "This package provides an interface to file locking functionalities.") @@ -15501,7 +15460,7 @@ using the @code{ghc-postgresql-simple} package.") (arguments `(#:cabal-revision ("5" "06v8vkn58d67yx4v59rhvxpc0sjrpi6k8krvjrvbyl0fn0v0jd14"))) - (home-page "http://hackage.haskell.org/package/HsYAML-aeson") + (home-page "https://hackage.haskell.org/package/HsYAML-aeson") (synopsis "JSON to YAML adapter") (description "The @uref{https://yaml.org/spec/1.2/spec.html, YAML 1.2} format provides @@ -15654,18 +15613,18 @@ pages.") (define-public ghc-breakpoint (package (name "ghc-breakpoint") - (version "0.1.2.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "breakpoint" version)) - (sha256 - (base32 - "1hk9mjijxvqjzcfqllzi53rmxiyggbxash05jbb742wrq832h2xw")))) + (version "0.1.2.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "breakpoint" version)) + (sha256 + (base32 "1bj3bccmrk5c7zxb29rwzz39l0ph6qk0crw1vdhhsrcybmdc96h5")))) (build-system haskell-build-system) (properties '((upstream-name . "breakpoint"))) (inputs (list ghc-pretty-simple ghc-ansi-terminal)) (native-inputs (list ghc-tasty ghc-tasty-hunit)) - (home-page "http://hackage.haskell.org/package/breakpoint") + (home-page "https://hackage.haskell.org/package/breakpoint") (synopsis "Set breakpoints using a GHC plugin") (description "This package provides a plugin that allows you to set breakpoints for debugging @@ -15715,7 +15674,7 @@ purposes. See the (properties '((upstream-name . "git-lfs"))) (inputs (list ghc-http-client ghc-http-types ghc-aeson ghc-network-uri ghc-case-insensitive)) - (home-page "http://hackage.haskell.org/package/git-lfs") + (home-page "https://hackage.haskell.org/package/git-lfs") (synopsis "git-lfs protocol") (description "An implementation of the git-lfs protocol.") (license license:agpl3))) @@ -15735,7 +15694,7 @@ purposes. See the (inputs (list ghc-vector)) ;(native-inputs (list ghc-hedgehog ghc-random ghc-tasty ghc-tasty-hedgehog)) (arguments (list #:tests? #f)) ; Fail to compile. - (home-page "http://hackage.haskell.org/package/nothunks") + (home-page "https://hackage.haskell.org/package/nothunks") (synopsis "Examine values for unexpected thunks") (description "Long lived application data typically should not contain any thunks. This @@ -15797,7 +15756,7 @@ comfortably.") (arguments `(#:cabal-revision ("3" "0g4siv8s6dlrdsivap2qy6ig08y5bjbs93jk192zmgkp8iscncpw"))) - (home-page "http://hackage.haskell.org/package/OneTuple") + (home-page "https://hackage.haskell.org/package/OneTuple") (synopsis "Singleton Tuple") (description "This package is a compatibility package for a singleton data type . > data Solo @@ -15808,21 +15767,24 @@ a = Solo a . Note: it's not a @@newtype@@ . @@Solo@@ is available in (define-public ghc-indexed-traversable-instances (package (name "ghc-indexed-traversable-instances") - (version "0.1.1.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "indexed-traversable-instances" version)) - (sha256 - (base32 - "1c60vhf47y8ln33scyvwiffg24dvhm4aavya624vbqjr7l3fapl9")))) + (version "0.1.1.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "indexed-traversable-instances" version)) + (sha256 + (base32 "0jippsyqg8ss61z5vc6vfjmlrirwc69kr4azs5s9z0fcbj4lx6qg")))) (build-system haskell-build-system) (properties '((upstream-name . "indexed-traversable-instances"))) (inputs (list ghc-indexed-traversable ghc-onetuple ghc-tagged ghc-unordered-containers ghc-vector)) (native-inputs (list ghc-quickcheck ghc-quickcheck-instances ghc-tasty ghc-tasty-quickcheck)) + (arguments + `(#:cabal-revision ("2" + "0yrww1y9zrnqwymik9kkdqkx81n3jhr0kq27lpvy1gp297hy7m80"))) (home-page - "http://hackage.haskell.org/package/indexed-traversable-instances") + "https://hackage.haskell.org/package/indexed-traversable-instances") (synopsis "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex") (description @@ -15927,29 +15889,21 @@ Documentation is at (define-public ghc-pcg-random (package (name "ghc-pcg-random") - (version "0.1.3.7") - (source (origin - (method url-fetch) - (uri (hackage-uri "pcg-random" version)) - (sha256 - (base32 - "1l6jq5nvmg1ygk7i7g50s47p6qkh74p9avl1wbcxdl5m85lc5j76")))) + (version "0.1.4.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "pcg-random" version)) + (sha256 + (base32 "09hnckb3xzb3spn79jvqlsbg05zm9r1l3dqq44ka07ik4zbagjbf")))) (build-system haskell-build-system) (properties '((upstream-name . "pcg-random"))) (inputs (list ghc-primitive ghc-random ghc-entropy)) - (native-inputs (list ghc-doctest)) + (native-inputs (list ghc-doctest ghc-cabal-doctest)) (arguments - `(#:tests? #f ; Could not find module ‘Build_doctests’ - #:phases - (modify-phases %standard-phases - ;; Tries to use non-existent doctest API. - (add-after 'unpack 'disable-doctest - (lambda _ - (with-output-to-file "Setup.hs" - (lambda _ - (display - "import Distribution.Simple\nmain = defaultMain\n")))))))) - (home-page "http://github.com/cchalmers/pcg-random") + `(#:cabal-revision ("1" + "1f8h0lv34cmqaxccg2yf6q4s8r5g2s8q8s9kql212iggd2l3vv77"))) + (home-page "https://github.com/cchalmers/pcg-random") (synopsis "Haskell bindings to the PCG random number generator.") (description "PCG is a family of simple fast space-efficient statistically good algorithms for @@ -16040,7 +15994,7 @@ benchmarks](https://hackage.haskell.org/package/random-bytestring-0.1.3.2/src/be "18w1dasny6xffbjlvmz9861l2xbkqlg2w5qxz9kw6frgfl2rg11n")))) (build-system haskell-build-system) (properties '((upstream-name . "ordered-containers"))) - (home-page "http://hackage.haskell.org/package/ordered-containers") + (home-page "https://hackage.haskell.org/package/ordered-containers") (synopsis "Set- and Map-like types that remember the order elements were inserted") (description "") @@ -16124,13 +16078,13 @@ embeddable scripting language <https://lua.org Lua>.") (define-public ghc-lua-arbitrary (package (name "ghc-lua-arbitrary") - (version "1.0.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "lua-arbitrary" version)) - (sha256 - (base32 - "01g2pkvy7yhcrk8p1d9xzmqv279ldgy9z5aa6xj5msbxrpxvbpma")))) + (version "1.0.1.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "lua-arbitrary" version)) + (sha256 + (base32 "0kbvcgi54ycl8zfdkc80ap5yhz0dml9bjdgmzx9l9m4rkhyi9xnm")))) (build-system haskell-build-system) (properties '((upstream-name . "lua-arbitrary"))) (inputs (list ghc-lua ghc-quickcheck)) @@ -16247,13 +16201,13 @@ as a way to specfiy column alignments.") (define-public ghc-lpeg (package (name "ghc-lpeg") - (version "1.0.3") - (source (origin - (method url-fetch) - (uri (hackage-uri "lpeg" version)) - (sha256 - (base32 - "19vvsvdw8l2zjwdcypnzw12vc9ycix92mkd6g3f6kx1i364z9hg1")))) + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "lpeg" version)) + (sha256 + (base32 "1fsl43m4p1h40npwd51qn2vafzjwyvs5yb5159l37w95l8hlf214")))) (build-system haskell-build-system) (properties '((upstream-name . "lpeg"))) (inputs (list ghc-lua)) @@ -16305,7 +16259,7 @@ Lua tables, but are augmented with convenience functions.") (properties '((upstream-name . "should-not-typecheck"))) (inputs (list ghc-hunit)) (native-inputs (list ghc-hspec ghc-hspec-expectations)) - (home-page "http://github.com/CRogers/should-not-typecheck") + (home-page "https://github.com/CRogers/should-not-typecheck") (synopsis "A HUnit/hspec assertion library to verify that an expression does not typecheck") (description @@ -16482,19 +16436,19 @@ CHANGELOG>") (define-public ghc-boring (package (name "ghc-boring") - (version "0.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "boring" version)) - (sha256 - (base32 - "0d2cm9ra69cvaxs5x3lr2rfv7xx6xrbpb3dbcpyd8m77cqxm7b0b")))) + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "boring" version)) + (sha256 + (base32 "0m1imbkvwfjz7cz7ibksiz63fyfmaq42f6x059sch2nmz7qdvzxi")))) (build-system haskell-build-system) (properties '((upstream-name . "boring"))) (inputs (list ghc-tagged)) (arguments - `(#:cabal-revision ("2" - "04pn94i3mysi7px93k86sf29vw99sf38sl4n0gy2nma0iqsik828"))) + `(#:cabal-revision ("1" + "0jrfhidd91k0bkb98qm8nvv9wizqa906mgr8qjkhxc4d7vcnc9cy"))) (home-page "https://github.com/phadej/boring") (synopsis "Boring and Absurd types") (description @@ -16631,7 +16585,7 @@ scripting language <https://lua.org Lua>.") (properties '((upstream-name . "recv"))) (inputs (list ghc-network)) (native-inputs (list ghc-hspec hspec-discover)) - (home-page "http://github.com/yesodweb/wai") + (home-page "https://github.com/yesodweb/wai") (synopsis "Efficient netowrk recv") (description "Network recv based on buffer pools") (license license:bsd-3))) @@ -16639,18 +16593,21 @@ scripting language <https://lua.org Lua>.") (define-public ghc-glib (package (name "ghc-glib") - (version "0.13.8.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "glib" version)) - (sha256 - (base32 - "09qamkxkpx2paazbh8x225wvwgzgpp0g0a3s708n96q76b4bvd46")))) + (version "0.13.10.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "glib" version)) + (sha256 + (base32 "149y33ddv8vkvak0042ismiwh6lgc706n3n3bvnmrgw67fmi57m1")))) (build-system haskell-build-system) (properties '((upstream-name . "glib"))) (inputs (list ghc-utf8-string glib)) (native-inputs (list ghc-gtk2hs-buildtools pkg-config)) - (home-page "https://github.com/gtk2hs/gtk2hs") + (arguments + `(#:cabal-revision ("2" + "19zg675zvyi87415yyfyl1s7i65rz8hx8hw4scxwalcq50axj99s"))) + (home-page "https://projects.haskell.org/gtk2hs/") (synopsis "GLib bindings for for Gtk2Hs") (description "GLib is a collection of C data structures and utility functions for the GObject @@ -16662,18 +16619,21 @@ support the packages that wrap libraries that are themselves based on GLib.") (define-public ghc-pango (package (name "ghc-pango") - (version "0.13.8.2") - (source (origin - (method url-fetch) - (uri (hackage-uri "pango" version)) - (sha256 - (base32 - "1mndcb904vlkqpbmj5np9lxqw2qw3pzawvrgbsbxa9xjayh0ylw5")))) + (version "0.13.10.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "pango" version)) + (sha256 + (base32 "0qdk18vj07qivyyd0limjprni77q2xvydx748lsxsrw2ws8hb1ax")))) (build-system haskell-build-system) (properties '((upstream-name . "pango"))) (inputs (list ghc-glib ghc-cairo pango)) (native-inputs (list ghc-gtk2hs-buildtools pkg-config)) - (home-page "https://hackage.haskell.org/package/pango") + (arguments + `(#:cabal-revision ("2" + "064bpj5mmxc31snkfysb9c52v1695kxyqbj617m933mgjrw13q91"))) + (home-page "https://projects.haskell.org/gtk2hs/") (synopsis "Haskell bindings to the Pango text rendering engine") (description "This package provides a wrapper around the Pango C library that allows @@ -16685,13 +16645,13 @@ on-screen.") (define-public ghc-monoidal-containers (package (name "ghc-monoidal-containers") - (version "0.6.3.0") - (source (origin - (method url-fetch) - (uri (hackage-uri "monoidal-containers" version)) - (sha256 - (base32 - "0m41z50r3jvr8vvfry99kamb2h3knm0g7bqfwspchmhwsgqqczh4")))) + (version "0.6.4.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "monoidal-containers" version)) + (sha256 + (base32 "09sg4gsrvgnsy12819sps2l0j97baanbsq2w1pvypnrkanzrw083")))) (build-system haskell-build-system) (properties '((upstream-name . "monoidal-containers"))) (inputs (list ghc-aeson @@ -16702,7 +16662,10 @@ on-screen.") ghc-witherable ghc-semialign ghc-these)) - (home-page "http://github.com/bgamari/monoidal-containers") + (arguments + `(#:cabal-revision ("3" + "0ip71g8nd07vinwlynhbq0iaxmzzwjz9gx15k1d9p7llv961rc74"))) + (home-page "https://github.com/bgamari/monoidal-containers") (synopsis "Containers with monoidal accumulation") (description "Containers with merging via monoidal accumulation. The Monoid instances @@ -16728,7 +16691,7 @@ type's mappend'.") (arguments `(#:cabal-revision ("3" "0yll88ydchd2gqcvdk28fchf2vygpd42ky2bigg4ga08jan2nacx"))) - (home-page "http://hackage.haskell.org/package/newtype") + (home-page "https://hackage.haskell.org/package/newtype") (synopsis "Typeclass and set of functions for working with newtypes") (description "Per Conor McBride, the Newtype typeclass represents the packing and unpacking of @@ -16837,7 +16800,7 @@ such as ala'.") (build-system haskell-build-system) (properties '((upstream-name . "random-shuffle"))) (inputs (list ghc-random ghc-monadrandom)) - (home-page "http://hackage.haskell.org/package/random-shuffle") + (home-page "https://hackage.haskell.org/package/random-shuffle") (synopsis "Random shuffle implementation") (description "Random shuffle implementation, on immutable lists. Based on @@ -16848,20 +16811,20 @@ implementation by Oleg Kiselyov}.") (define-public ghc-deriving-aeson (package (name "ghc-deriving-aeson") - (version "0.2.8") - (source (origin - (method url-fetch) - (uri (hackage-uri "deriving-aeson" version)) - (sha256 - (base32 - "0f59ar4cax7g0h6wrk8ckni7i4gw5wls5ybzbrji2a0qpd7q5lrd")))) + (version "0.2.9") + (source + (origin + (method url-fetch) + (uri (hackage-uri "deriving-aeson" version)) + (sha256 + (base32 "0cqq4ri9dgqkdh9wybf3wf5zxb9nihql591bk1lacnzdyxfrgcn0")))) (build-system haskell-build-system) (properties '((upstream-name . "deriving-aeson"))) (inputs (list ghc-aeson)) (arguments `(#:cabal-revision ("1" - "0pwx7lmdhpipg9ksqkz6xpjzh1aw2hip8y3jsk20ndl4wdzvxak5"))) - (home-page "http://hackage.haskell.org/package/deriving-aeson") + "14iqkk7vs0lb0sgq159z0xw95pa87r60i1f4m17gfh2gbbddcywm"))) + (home-page "https://hackage.haskell.org/package/deriving-aeson") (synopsis "Type driven generic aeson instance customisation") (description "This package provides a newtype wrapper with FromJSON/ToJSON instances @@ -16979,7 +16942,7 @@ provided from returning something else.") "0isilgcbw12zyh8s2liaj5r9r5m3yg1xskyhag6f36qi60y29hx5")))) (build-system haskell-build-system) (properties '((upstream-name . "ref-tf"))) - (home-page "http://hackage.haskell.org/package/ref-tf") + (home-page "https://hackage.haskell.org/package/ref-tf") (synopsis "Type class for monads with references using type families") (description "This package contains a @code{MonadRef} type class that abstracts over @@ -16987,6 +16950,33 @@ the details of manipulating references, allowing one to write code that can operate in either the @code{ST} monad or the @code{IO} monad.") (license license:bsd-3))) +(define-public ghc-data-array-byte + (package + (name "ghc-data-array-byte") + (version "0.1.0.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "data-array-byte" version)) + (sha256 + (base32 "002n0af7q08q3fmgsc5b47s1clirxy0lrqglwxzhabg0nfhfrdhv")))) + (build-system haskell-build-system) + (properties '((upstream-name . "data-array-byte"))) + ;(native-inputs (list ghc-quickcheck-classes-base ghc-tasty + ; ghc-tasty-quickcheck)) + (arguments + `(#:tests? #f ; Avoid dependency cycle. + #:cabal-revision ("3" + "136rjhg0m49d2l8z7kp46hc8q7bkipvkwnn40nv8kqkpvrgrg8d4"))) + (home-page "https://github.com/Bodigrim/data-array-byte") + (synopsis "Compatibility layer for Data.Array.Byte") + (description + "Compatibility layer for +@url{https://hackage.haskell.org/package/base/docs/Data-Array-Byte.html,Data.Array.Byte} +providing boxed wrappers for @code{ByteArray} and +@code{MutableByteArray} and relevant instances for GHC < 9.4.") + (license license:bsd-3))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6d8675d37e..57696aeead 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1436,15 +1436,16 @@ interactive environment for the functional language Haskell.") (package (inherit base) (name "ghc") - (version "9.2.5") + (version "9.2.8") (source (origin (method url-fetch) (uri (string-append "https://www.haskell.org/ghc/dist/" version "/ghc-" version "-src.tar.xz")) (sha256 (base32 - "07028i0hm74svvq9b3jpkczaj6lsdgn3hgr4wa7diqiq3dypj1h6")) - (patches (search-patches "ghc-9.2-glibc-2.33-link-order.patch")))) + "18b7ln4gx2vy62jpv3z5slv3zfxmxnmkgajznks15zglddwd24sz")) + (patches (search-patches "ghc-9.2-glibc-2.33-link-order.patch" + "ghc-9.2-cabal-support-package-path.patch")))) (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases '%standard-phases) @@ -1474,7 +1475,7 @@ interactive environment for the functional language Haskell.") version "/ghc-" version "-testsuite.tar.xz")) (sha256 (base32 - "19ha0hidrijawy53vm2r0sgml5zkl8126mqy7p0pyacmw3k7913l")) + "0cmmwhcwv9fjzvmgjj85d354858qqbmqfzaz5160xqj4yl9zk225")) (patches (search-patches "ghc-9.2-grep-warnings.patch")))) ,@(filter (match-lambda (("ghc-bootstrap" . _) #f) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 7c9d12557e..65fe793f2d 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -309,7 +309,7 @@ many popular formats.") (define-public vtk (package (name "vtk") - (version "9.2.2") + (version "9.3.0") (source (origin (method url-fetch) (uri (string-append "https://vtk.org/files/release/" @@ -317,7 +317,7 @@ many popular formats.") "/VTK-" version ".tar.gz")) (sha256 (base32 - "0x8h2bwxq2870067j7wqd0qym87pa3inkbri93zrdb0zwwmhlnqw")) + "1s8vd34nhrgnw1bf9zhfn062d53fwq3csjfwvm7lxcr5a8lvkizx")) (modules '((guix build utils))) (snippet '(begin @@ -388,6 +388,7 @@ many popular formats.") ;; Do not retain a reference to GCC. (substitute* (choose + "Common/Core/vtkBuild.h.in" ;dummy >=v9.3 "Common/Core/vtkConfigureDeprecated.h.in" ;v9.x "Common/Core/vtkConfigure.h.in") ;v7.x (("@CMAKE_CXX_COMPILER@") "c++"))))) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 281e087869..7cfea42938 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -121,6 +121,10 @@ (list #:phases #~(modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "glirc.cabal" + (("vty\\s+>=5.35\\s+&&\\s+<5.36") "vty")))) (add-after 'install 'install-extra-documentation (lambda _ (install-file "glirc.1" diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 948d5dbccc..d5157a6eeb 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2022 Jacob Hrbek <kreyren@rixotstudio.cz> ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> +;;; Copyright © 2024 hapster <o.rojon@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -681,7 +682,7 @@ devices.") (define-public hidapi (package (name "hidapi") - (version "0.10.1") + (version "0.14.0") (source (origin (method git-fetch) @@ -690,7 +691,7 @@ devices.") (commit (string-append "hidapi-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1nr4z4b10vpbh3ss525r7spz4i43zim2ba5qzfl15dgdxshxxivb")))) + (base32 "121laqsml0104d1h4hp115gp21qiqi0r9dgcaqdi9ismmq3b6yx7")))) (build-system gnu-build-system) (inputs (list libusb eudev)) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 876d7fa02b..841418d6bf 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -20560,7 +20560,12 @@ like Ruby's ActiveRecord. (sbcl-package->cl-source-package sbcl-mito)) (define-public ecl-mito - (sbcl-package->ecl-package sbcl-mito)) + (let ((pkg (sbcl-package->ecl-package sbcl-mito))) + (package + (inherit pkg) + (arguments + ;; FIXME: Tests never end. + '(#:tests? #f))))) (define-public sbcl-mk-string-metrics (package @@ -26410,7 +26415,7 @@ the Processing language and shares some of the API.") ;; Update together with emacs-slime. (package (name "sbcl-slime-swank") - (version "2.29.1") + (version "2.30") (source (origin (file-name (git-file-name "cl-slime-swank" version)) @@ -26419,7 +26424,7 @@ the Processing language and shares some of the API.") (url "https://github.com/slime/slime/") (commit (string-append "v" version)))) (sha256 - (base32 "1fcasqsdfwsphkfx1vd3r5mr89vgvzb9g2dbw82mc9lijg1mr1ki")) + (base32 "1z9mi663cs5gks1fz5yy9dycx47sbs6fdr47z05yc1nl8znqib99")) (modules '((guix build utils))) (snippet ;; The doc folder drags `gawk' into the closure. Doc is already diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 971f5b2e25..2614a403c1 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017 Roel Janssen <roel@gnu.org> ;;; Copyright © 2018–2022 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2018, 2021-2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2018, 2021-2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com> @@ -376,6 +376,11 @@ until LLVM/Clang 14." "add_subdirectory(${LLVM_THIRD_PARTY_DIR}/uni\ ttest third-party/unittest)\n" line)))))) '()) + ;; The build daemon goes OOM on i686-linux on this phase. + ,@(if (and (version>=? version "15") + (target-x86-32?)) + '((delete 'make-dynamic-linker-cache)) + '()) ;; Awkwardly, multiple phases added after the same phase, ;; e.g. unpack, get applied in the reverse order. In other ;; words, adding 'change-directory last means it occurs @@ -550,7 +555,7 @@ output), and Binutils.") ("15.0.7" . "12sggw15sxq1krh1mfk3c1f07h895jlxbcifpwk3pznh4m1rjfy2") ("16.0.6" . "0jxmapg7shwkl88m4mqgfjv4ziqdmnppxhjz6vz51ycp2x4nmjky") ("17.0.6" . "1a7rq3rgw5vxm8y39fyzr4kv7w97lli4a0c1qrkchwk8p0n07hgh") - ("18.1.7" . "1c77pcqsfgvnxa3zq2i7giz86d6cdzl1scphi2dmcq3n73bzy4m8"))) + ("18.1.8" . "1l9wm0g9jrpdf309kxjx7xrzf13h81kz8bbp0md14nrz38qll9la"))) (define %llvm-patches '(("14.0.6" . ("clang-14.0-libc-search-path.patch")) @@ -558,7 +563,7 @@ output), and Binutils.") ("16.0.6" . ("clang-16.0-libc-search-path.patch")) ("17.0.6" . ("clang-17.0-libc-search-path.patch" "clang-17.0-link-dsymutil-latomic.patch")) - ("18.1.7" . ("clang-18.0-libc-search-path.patch" + ("18.1.8" . ("clang-18.0-libc-search-path.patch" "clang-17.0-link-dsymutil-latomic.patch")))) (define (llvm-monorepo version) @@ -1387,7 +1392,15 @@ Library.") (package (inherit llvm-15) (version "16.0.6") - (source (llvm-monorepo version)))) + (source (llvm-monorepo version)) + (arguments + (substitute-keyword-arguments (package-arguments llvm-15) + ;; The build daemon goes OOM on i686-linux on this phase. + ((#:phases phases #~'%standard-phases) + (if (target-x86-32?) + #~(modify-phases #$phases + (delete 'make-dynamic-linker-cache)) + phases)))))) (define-public clang-runtime-16 (clang-runtime-from-llvm llvm-16)) @@ -1421,7 +1434,15 @@ Library.") (package (inherit llvm-15) (version "17.0.6") - (source (llvm-monorepo version)))) + (source (llvm-monorepo version)) + (arguments + (substitute-keyword-arguments (package-arguments llvm-15) + ;; The build daemon goes OOM on i686-linux on this phase. + ((#:phases phases #~'%standard-phases) + (if (target-x86-32?) + #~(modify-phases #$phases + (delete 'make-dynamic-linker-cache)) + phases)))))) (define-public clang-runtime-17 (clang-runtime-from-llvm llvm-17)) @@ -1454,8 +1475,16 @@ Library.") (define-public llvm-18 (package (inherit llvm-15) - (version "18.1.7") - (source (llvm-monorepo version)))) + (version "18.1.8") + (source (llvm-monorepo version)) + (arguments + (substitute-keyword-arguments (package-arguments llvm-15) + ;; The build daemon goes OOM on i686-linux on this phase. + ((#:phases phases #~'%standard-phases) + (if (target-x86-32?) + #~(modify-phases #$phases + (delete 'make-dynamic-linker-cache)) + phases)))))) (define-public clang-runtime-18 (clang-runtime-from-llvm llvm-18)) @@ -1470,7 +1499,7 @@ Library.") (package-version llvm-18))) (sha256 (base32 - "0f1g9mlz4jmrws9sd81j1b8q5i2frvln6gp5vrvbdlzks5mlpj95"))))) + "1wd7y1a0db4y51swlq6dmm9hrv8pvmv158yi9f10dlayv7y7g275"))))) (define-public libomp-18 (package diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index de6d21e7cc..6aacdcb73c 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1823,7 +1823,7 @@ compresses it.") (define-public claws-mail (package (name "claws-mail") - (version "4.1.1") + (version "4.3.0") (source (origin (method url-fetch) @@ -1831,7 +1831,7 @@ compresses it.") (string-append "https://www.claws-mail.org/releases/claws-mail-" version ".tar.xz")) (sha256 - (base32 "0i037bskrnmsmylhmqayjg0pmsr0m2zx8xhbxc6mwvw9q40fg2di")))) + (base32 "1q8wb2fh5fmbbyrvzdwkhxkzdbsvyk5w783z8qlg05mris41vp4m")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index de8e886485..d39292e825 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5204,8 +5204,7 @@ parts of it.") (define-public openblas-ilp64 (package/inherit openblas (name "openblas-ilp64") - (supported-systems '("x86_64-linux" "aarch64-linux" "mips64el-linux" - "powerpc64le-linux")) + (supported-systems %64bit-supported-systems) (arguments (substitute-keyword-arguments (package-arguments openblas) ((#:make-flags flags #~'()) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 64bcbe2d7e..efe0b2a784 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -154,15 +154,14 @@ parsers to allow execution with Guile as extension languages."))) (define-public mes (package (name "mes") - (version "0.26.1") + (version "0.26.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mes/" "mes-" version ".tar.gz")) - (patches (search-patches "mes-0.26.1-fixups.patch")) (sha256 (base32 - "1x7wq9cj8pybdl736mn8z48zcwgvyvi9mr9mr9vv9jxzii90sdz1")))) + "120a7ljnyi9127inaarlqv6cl98cmk72s3gmyad7cjrwy6cvzf1g")))) (supported-systems '("armhf-linux" "i686-linux" "x86_64-linux" "riscv64-linux")) (propagated-inputs (list mescc-tools nyacc-1.00.2)) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index e14536b957..9ba83c0712 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com> ;;; Copyright © 2024 Carlo Zancanaro <carlo@zancanaro.id.au> ;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu> +;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1387,7 +1388,7 @@ Encryption to Gajim.") (define-public dino (package (name "dino") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) @@ -1395,7 +1396,7 @@ Encryption to Gajim.") (string-append "https://github.com/dino/dino/releases/download/v" version "/dino-" version ".tar.gz")) (sha256 - (base32 "01jbggjqsbqrzd76bq4h8ccnijsw3m3mav838mnk20kls8agq5d6")))) + (base32 "1zvxyvql695bwbic17z86vrh2j1qkwvab1irqjkvza4szbklr29i")))) (build-system cmake-build-system) (outputs '("out" "debug")) (arguments @@ -3300,39 +3301,11 @@ designed for experienced users.") (sha256 (base32 "0939fiy7z53izznfhlr7c6vaskbmkbj3ncb09fzx5dmz9cjngy80")))) - ;; Using the go-build-system results in the same error message - ;; than in the bug 1551[1]. So we fix it by running go build - ;; manually in the git repository as-is as this is the solution - ;; given to that bug by the matterbridge developers. - ;; [1]https://github.com/42wim/matterbridge/issues/1551 - (build-system gnu-build-system) + (build-system go-build-system) (arguments - `(#:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (setenv "GOCACHE" - (string-append (getcwd) "/go-build")) - (setenv "GOBIN" - (string-append (assoc-ref outputs "out") "/bin")) - (invoke "go" "build" "-v" "-x"))) - (replace 'check - (lambda* (#:key outputs tests? #:allow-other-keys) - (when tests? - (setenv "GOCACHE" - (string-append (getcwd) "/go-build")) - (setenv "GOBIN" - (string-append (assoc-ref outputs "out") - "/bin")) - (invoke "go" "test" "-v" "-x")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (setenv "GOCACHE" - (string-append (getcwd) "/go-build")) - (setenv "GOBIN" - (string-append (assoc-ref outputs "out") "/bin")) - (invoke "go" "install" "-v" "-x")))))) - (native-inputs (list go)) + (list + #:go go-1.21 + #:import-path "github.com/42wim/matterbridge")) (synopsis "Bridge together various messaging networks and protocols") (description "Relays messages between different channels from various diff --git a/gnu/packages/mold.scm b/gnu/packages/mold.scm index 7188f533e7..a229d3dcb7 100644 --- a/gnu/packages/mold.scm +++ b/gnu/packages/mold.scm @@ -35,7 +35,7 @@ (define-public mold (package (name "mold") - (version "2.32.0") + (version "2.32.1") (source (origin (method git-fetch) @@ -44,7 +44,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1wl7mp7r5hxmvfpmrq32ffjpgn8z8pk775y423nr56gvrb39vj6i")) + (base32 "1raddkjazb05bkqv7n3k97k0hk2wgvl03hpbx3xq8gpg1rbviam4")) (modules '((guix build utils))) (snippet #~(begin diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c12bb843fe..cb29fa5816 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -56,6 +56,7 @@ ;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Parnikkapore <poomklao@yahoo.com> +;;; Copyright © 2024 hapster <o.rojon@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2429,7 +2430,7 @@ a JACK session.") (define-public mixxx (package (name "mixxx") - (version "2.3.6") + (version "2.4.1") (source (origin (method git-fetch) @@ -2437,90 +2438,85 @@ a JACK session.") (url "https://github.com/mixxxdj/mixxx") (commit version))) (file-name (git-file-name name version)) - (patches - (search-patches "mixxx-link-qtscriptbytearray-qtscript.patch" - "mixxx-system-googletest-benchmark.patch")) (sha256 - (base32 "1v1sza75rf2q1m0bdc0j2k53qd34m12d1573jmac3g7vvyqh5n2m")) + (base32 "0cfdgrxfhck6cg4j9mb2rdp06n57kca1403qw92c3pmk1y05grq4")) (modules '((guix build utils))) (snippet ;; Delete libraries that we already have or don't need. ;; TODO: try to unbundle more (see lib/). `(begin - (let ((third-parties '("apple" "benchmark" "googletest" "hidapi" - "libebur128"))) + (let ((third-parties '("apple" "hidapi"))) (with-directory-excursion "lib" (map (lambda (third-party) - (delete-file-recursively third-party)) - third-parties))) + (delete-file-recursively third-party)) third-parties))) #t)))) (build-system qt-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - ;; Tests need a running X server. - (add-before 'check 'prepare-x-for-test - (lambda _ - (system "Xvfb &") - (setenv "DISPLAY" ":0"))) - (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (faad2 (assoc-ref inputs "faad2"))) - (wrap-program (string-append out "/bin/mixxx") - `("LD_LIBRARY_PATH" ":" prefix - ,(list (string-append faad2 "/lib")))))))))) - (native-inputs - (list benchmark - googletest - python-wrapper - qttools-5 - xorg-server-for-tests)) - (inputs - (list bash-minimal - chromaprint - faad2 - ffmpeg - fftw - flac - glu - hidapi - jack-1 - lame - libdjinterop - libebur128 - libid3tag - libkeyfinder - libmad - libmp4v2 - libmodplug - libsndfile - libshout - ;; XXX: Mixxx complains the libshout-idjc package suffers from bug - ;; lp1833225 and refuses to use it. Use the bundle for now. - ;; libshout-idjc - libusb - libvorbis - lilv - mp3guessenc - openssl - opusfile - portaudio - portmidi - protobuf - qtbase-5 - qtdeclarative-5 - qtkeychain - qtscript - qtsvg-5 - qtx11extras - rubberband - soundtouch - sqlite - taglib - upower - vamp - wavpack)) + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-bugged-test + ;; This test regularly fails and aborts the build process, hence it + ;; was disabled (no impact on functionality). It appears this is a + ;; problem for some upstream as well, as indicated by: + ;; https://github.com/mixxxdj/mixxx/issues/12887 (featuring a + ;; reference to another issue related to the same problem). + (lambda _ + (substitute* "src/test/soundproxy_test.cpp" + (("TEST_F\\(SoundSourceProxyTest, firstSoundTest\\)") + "TEST_F(SoundSourceProxyTest, DISABLED_firstSoundTest)")))) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (faad2 (assoc-ref inputs "faad2"))) + (wrap-program (string-append out "/bin/mixxx") + `("LD_LIBRARY_PATH" ":" prefix + ,(list (string-append faad2 "/lib")))))))))) + (native-inputs (list benchmark googletest python-wrapper qttools-5 + xorg-server-for-tests)) + (inputs (list bash-minimal + chromaprint + faad2 + ffmpeg + fftw + flac + glu + hidapi + jack-1 + lame + libdjinterop + libebur128 + libid3tag + libkeyfinder + libmad + libmp4v2 + libmodplug + libsndfile + libshout + ;; XXX: Mixxx complains the libshout-idjc package suffers from bug + ;; lp1833225 and refuses to use it. Use the bundle for now. + libshout-idjc + libusb + libvorbis + lilv + mp3guessenc + openssl + opusfile + portaudio + portmidi + protobuf + qtbase-5 + qtdeclarative-5 + qtkeychain + qtscript + qtsvg-5 + qtx11extras + rubberband + soundtouch + sqlite + taglib + upower + vamp + wavpack + c++-gsl)) (home-page "https://mixxx.org/") (synopsis "DJ software to perform live mixes") (description "Mixxx is a DJ software. It integrates the tools DJs need to @@ -5633,7 +5629,7 @@ specification and header.") (define-public rosegarden (package (name "rosegarden") - (version "23.12") + (version "24.06") (source (origin (method url-fetch) @@ -5641,7 +5637,7 @@ specification and header.") (version-major+minor version) "/" "rosegarden-" version ".tar.xz")) (sha256 - (base32 "0clkzrs931dypvqcn5hzx2v3bq9gc439g71phahgwkh4c1jfcmrz")))) + (base32 "09www13ndba14krzycwm44qgcy7j11wa6a6xiqh6i2hjghlx8v46")))) (build-system cmake-build-system) (arguments (list diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 2b73b849b5..40747686c4 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2023 jgart <jgart@dismail.de> ;;; Copyright © 2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de> ;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -177,8 +178,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.4.0") - (commit "b345a5e17f60e1cf700980e608a5b33e51062978") - (revision 21)) + (commit "1a34b9b725e731a6d5f602d104f09a1c68afa6a4") + (revision 22)) (package (name "guix") @@ -194,7 +195,7 @@ (commit commit))) (sha256 (base32 - "0gddkkcnkn9j86imp07lpi83r9j96mssgsr59w356hnxkb0npdaz")) + "0fz7n9pl0g3cw3zvx9m5c51ly5m9ga71v85mf4jqp7x8j5g21lhy")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -1547,8 +1548,8 @@ environments.") "0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc"))))))) (define-public guix-build-coordinator - (let ((commit "0d1e6e64c7a339fed717a0b017b9650a07da87db") - (revision "108")) + (let ((commit "406db8a8db53731de432c452902a098915e876c2") + (revision "109")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1559,7 +1560,7 @@ environments.") (commit commit))) (sha256 (base32 - "15y8s121ildf4lnyw2sz2r1xzvc9isk4syiinkf00babxnbqphvq")) + "0yi3xji5qm6r5h6nmfbxqgaipp4al08h2mn6sci85ikm80vvy66a")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -2043,7 +2044,8 @@ the boot loader configuration.") (sha256 (base32 "0ij93vl9skcfdfgkmgd80q0q4c6q39dss4rds7phxizqqsr3d3sk")) (patches - (search-patches "flatpak-fix-path.patch" + (search-patches "flatpak-fix-fonts-icons.patch" + "flatpak-fix-path.patch" "flatpak-unset-gdk-pixbuf-for-sandbox.patch")))) ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 84436eaeac..7bd2834e13 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -36,6 +36,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) + #:use-module (guix build-system pyproject) #:use-module ((guix licenses) #:prefix license:) #:use-module ((guix utils) #:select (target-64bit?)) #:use-module (guix packages) @@ -56,6 +57,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-science) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) @@ -66,14 +68,14 @@ (define-public parallel (package (name "parallel") - (version "20240522") + (version "20240622") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "0a396j54857hqqbbskpyh31km7nzly67w3jhkpq2agmz66nrzvb7")) + (base32 "1m9qpx6c7b62s1kjp6aj0qfnj3fw2pl72q32bdykqi5x0z4i1qip")) (snippet '(begin (use-modules (guix build utils)) @@ -410,6 +412,33 @@ can use the same high-level API to link their software with different cluster/resource management systems.") (license license:gpl3+))) +(define-public python-schwimmbad + (package + (name "python-schwimmbad") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "schwimmbad" version)) + (sha256 + (base32 "1aac1rswb0r0vzbxvjj2jyx5j0vqyjj7mygc71n9zbkpmr8m1rpg")))) + (build-system pyproject-build-system) + (propagated-inputs + (list python-dill + python-joblib + python-mpi4py + python-multiprocess)) + (native-inputs + (list python-hatch-vcs python-hatchling python-pytest)) + (home-page "https://github.com/adrn/schwimmbad") + (synopsis "Common interface for parallel processing pools") + (description + "@code{schwimmbad} provides a uniform interface to parallel processing +pools and enables switching easily between local development (e.g., serial +processing or with @code{multiprocessing}) and deployment on a cluster or +supercomputer (via, e.g., MPI or JobLib).") + (license license:expat))) + (define-public python-slurm-magic (let ((commit "73dd1a2b85799f7dae4b3f1cd9027536eff0c4d7") (revision "0")) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index d77aa1c8b0..499c8b8312 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -976,6 +976,53 @@ using password-store through rofi interface: @end enumerate") (license license:gpl3)))) +(define-public rofi-pass-wayland + (package + (inherit rofi-pass) + (name "rofi-pass-wayland") + (arguments + (substitute-keyword-arguments (package-arguments rofi-pass) + ((#:phases phases) + #~(modify-phases #$phases + ;; Set the clipboard and backend tools to ones for Wayland in the + ;; default configuration file. + (add-after 'fix-etc-path 'set-wayland-defaults + (lambda _ + (substitute* "config.example" + ;; Note the typo in current configuration. + (("#clibpoard_backend=xclip") + "clipboard_backend=wl-clipboard") + (("#backend=xdotool") + "backend=wtype")) + (substitute* "rofi-pass" + (("/etc") + (string-append #$output "/etc"))))) + ;; Use Wayland related tools instead. + (replace 'wrap-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((bin (string-append #$output "/bin"))) + (for-each + (lambda (script) + (wrap-program (string-append bin "/" script) + (list "PATH" 'prefix + (map + (lambda (binary) + (dirname (search-input-file + inputs + (string-append "bin/" binary)))) + ;; wl-copy for wl-clipboard. + '("pass" "pwgen" "rofi" "wl-copy" "wtype"))))) + (list "addpass" "rofi-pass"))))))))) + (inputs + (modify-inputs (package-inputs rofi-pass) + (replace "rofi" rofi-wayland) + (replace "xclip" wl-clipboard) + (replace "xdotool" wtype) + (delete "xset"))) + (description (string-append + (package-description rofi-pass) + "\nThis package provides Wayland support by default.")))) + (define-public tessen (package (name "tessen") diff --git a/gnu/packages/patches/flatpak-fix-fonts-icons.patch b/gnu/packages/patches/flatpak-fix-fonts-icons.patch new file mode 100644 index 0000000000..5b9d855b2e --- /dev/null +++ b/gnu/packages/patches/flatpak-fix-fonts-icons.patch @@ -0,0 +1,89 @@ +modify from https://github.com/NixOS/nixpkgs/pull/262462 + +diff --git a/common/flatpak-run.c b/common/flatpak-run.c +index 94ad013..5c9f55e 100644 +--- a/common/flatpak-run.c ++++ b/common/flatpak-run.c +@@ -871,6 +871,49 @@ out: + return res; + } + ++static void ++get_gnu_closure (GHashTable *closure, const gchar *source_path) ++{ ++ if (g_file_test (source_path, G_FILE_TEST_IS_SYMLINK)) ++ { ++ g_autofree gchar *path = g_malloc(PATH_MAX); ++ realpath(source_path, path); ++ if (g_str_has_prefix(path, "/gnu/store/")) ++ { ++ *strchr(path + strlen("/gnu/store/"), '/') = 0; ++ g_hash_table_add(closure, g_steal_pointer (&path)); ++ } ++ } ++ else if (g_file_test (source_path, G_FILE_TEST_IS_DIR)) ++ { ++ g_autoptr(GDir) dir = g_dir_open(source_path, 0, NULL); ++ const gchar *file_name; ++ while ((file_name = g_dir_read_name(dir))) ++ { ++ g_autofree gchar *path = g_build_filename (source_path, file_name, NULL); ++ get_gnu_closure (closure, path); ++ } ++ } ++} ++ ++static void ++add_gnu_store_symlink_targets (FlatpakBwrap *bwrap, const gchar *source_path) ++{ ++ GHashTable *closure = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); ++ ++ get_gnu_closure(closure, source_path); ++ ++ GHashTableIter iter; ++ gpointer path; ++ g_hash_table_iter_init(&iter, closure); ++ while (g_hash_table_iter_next(&iter, &path, NULL)) ++ { ++ flatpak_bwrap_add_args (bwrap, "--ro-bind", path, path, NULL); ++ } ++ ++ g_hash_table_destroy(closure); ++} ++ + static void + add_font_path_args (FlatpakBwrap *bwrap) + { +@@ -898,6 +946,18 @@ add_font_path_args (FlatpakBwrap *bwrap) + "\t<remap-dir as-path=\"%s\">/run/host/fonts</remap-dir>\n", + SYSTEM_FONTS_DIR); + } ++ else if (g_file_test ("/run/current-system/profile/share/fonts", G_FILE_TEST_EXISTS)) ++ { ++ add_gnu_store_symlink_targets (bwrap, "/run/current-system/profile/share/fonts"); ++ flatpak_bwrap_add_args (bwrap, ++ "--ro-bind", ++ "/run/current-system/profile/share/fonts", ++ "/run/host/fonts", ++ NULL); ++ g_string_append_printf (xml_snippet, ++ "\t<remap-dir as-path=\"%s\">/run/host/fonts</remap-dir>\n", ++ "/run/current-system/profile/share/fonts"); ++ } + + if (g_file_test ("/usr/local/share/fonts", G_FILE_TEST_EXISTS)) + { +@@ -998,6 +1058,13 @@ add_icon_path_args (FlatpakBwrap *bwrap) + "--ro-bind", "/usr/share/icons", "/run/host/share/icons", + NULL); + } ++ else if (g_file_test ("/run/current-system/profile/share/icons", G_FILE_TEST_IS_DIR)) ++ { ++ add_gnu_store_symlink_targets (bwrap, "/run/current-system/profile/share/icons"); ++ flatpak_bwrap_add_args (bwrap, ++ "--ro-bind", "/run/current-system/profile/share/icons", "/run/host/share/icons", ++ NULL); ++ } + + user_icons_path = g_build_filename (g_get_user_data_dir (), "icons", NULL); + user_icons = g_file_new_for_path (user_icons_path); diff --git a/gnu/packages/patches/freecad-vtk-9.3.patch b/gnu/packages/patches/freecad-vtk-9.3.patch new file mode 100644 index 0000000000..af9d654046 --- /dev/null +++ b/gnu/packages/patches/freecad-vtk-9.3.patch @@ -0,0 +1,43 @@ +From d0fb2b8b29fe0428d9dd8aa790b0d6e45c8a9516 Mon Sep 17 00:00:00 2001 +From: Adrian Insaurralde Avalos <adrianinsaval@gmail.com> +Date: Wed, 22 Nov 2023 16:42:06 -0300 +Subject: [PATCH] 3rdPart/salomesmesh - fix for vtk 9.3 compatibility + +minimum required version is 7.1 +--- + src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx | 4 ---- + src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp | 5 +++++ + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx +index 7f89573efd0d..47a52fe585fe 100644 +--- a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx ++++ b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx +@@ -39,10 +39,6 @@ + #define SMDS_EXPORT + #endif + +-#ifdef VTK_HAS_MTIME_TYPE + #define VTK_MTIME_TYPE vtkMTimeType +-#else +-#define VTK_MTIME_TYPE unsigned long +-#endif + + #endif +diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp +index 7e3de0070a02..e9895d615717 100644 +--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp ++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp +@@ -1026,7 +1026,12 @@ void SMDS_UnstructuredGrid::BuildLinks() + GetLinks()->Allocate(this->GetNumberOfPoints()); + GetLinks()->Register(this); + //FIXME: vtk9 ++ #if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9,3,0) + GetLinks()->BuildLinks(this); ++ #else ++ GetLinks()->SetDataSet(this); ++ GetLinks()->BuildLinks(); ++ #endif + GetLinks()->Delete(); + #else + this->Links = SMDS_CellLinks::New();
\ No newline at end of file diff --git a/gnu/packages/patches/ghc-9.2-cabal-support-package-path.patch b/gnu/packages/patches/ghc-9.2-cabal-support-package-path.patch new file mode 100644 index 0000000000..9e4c405c50 --- /dev/null +++ b/gnu/packages/patches/ghc-9.2-cabal-support-package-path.patch @@ -0,0 +1,67 @@ +Without this patch, Cabal terminates if GHC_PACKAGE_PATH is set. This is +an annoyance with Guix as it makes heavy use of GHC_PACKAGE_PATH to have +GHC pickup Haskell package installed via Guix. Therefore, Cabal does +presently not work by default in environments created by Guix. This is +a workaround which makes Cabal respect GHC_PACKAGE_PATH. + +Taken from https://github.com/haskell/cabal/issues/3728 + +diff -upr a/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs b/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs +--- a/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs 2022-11-06 20:41:17.000000000 +0100 ++++ b/libraries/Cabal/Cabal/src/Distribution/Simple/GHC.hs 2023-12-18 14:34:15.148911717 +0100 +@@ -71,6 +71,7 @@ module Distribution.Simple.GHC ( + ) where + + import Prelude () ++import Distribution.Compat.Environment (lookupEnv) + import Distribution.Compat.Prelude + + import qualified Distribution.Simple.GHC.Internal as Internal +@@ -117,7 +118,7 @@ import System.Directory + , canonicalizePath, removeFile, renameFile, getDirectoryContents ) + import System.FilePath ( (</>), (<.>), takeExtension + , takeDirectory, replaceExtension +- ,isRelative ) ++ , isRelative, searchPathSeparator ) + import qualified System.Info + #ifndef mingw32_HOST_OS + import System.Posix (createSymbolicLink) +@@ -333,9 +334,11 @@ getInstalledPackages :: Verbosity -> Com + -> ProgramDb + -> IO InstalledPackageIndex + getInstalledPackages verbosity comp packagedbs progdb = do +- checkPackageDbEnvVar verbosity + checkPackageDbStack verbosity comp packagedbs +- pkgss <- getInstalledPackages' verbosity packagedbs progdb ++ envPackageDBs <- ++ maybe [] (map SpecificPackageDB . unintersperse searchPathSeparator) ++ <$> lookupEnv "GHC_PACKAGE_PATH" ++ pkgss <- getInstalledPackages' verbosity (envPackageDBs ++ packagedbs) progdb + index <- toPackageIndex verbosity pkgss progdb + return $! hackRtsPackage index + +@@ -405,10 +408,6 @@ getUserPackageDB _verbosity ghcProg plat + packageConfFileName = "package.conf.d" + ghcVersion = fromMaybe (error "GHC.getUserPackageDB: no ghc version") $ programVersion ghcProg + +-checkPackageDbEnvVar :: Verbosity -> IO () +-checkPackageDbEnvVar verbosity = +- Internal.checkPackageDbEnvVar verbosity "GHC" "GHC_PACKAGE_PATH" +- + checkPackageDbStack :: Verbosity -> Compiler -> PackageDBStack -> IO () + checkPackageDbStack verbosity comp = + if flagPackageConf implInfo +@@ -461,8 +460,11 @@ getInstalledPackagesMonitorFiles :: Verb + -> ProgramDb + -> [PackageDB] + -> IO [FilePath] +-getInstalledPackagesMonitorFiles verbosity platform progdb = +- traverse getPackageDBPath ++getInstalledPackagesMonitorFiles verbosity platform progdb packageDBs = do ++ envPackageDBs <- ++ maybe [] (map SpecificPackageDB . unintersperse searchPathSeparator) ++ <$> lookupEnv "GHC_PACKAGE_PATH" ++ traverse getPackageDBPath (envPackageDBs ++ packageDBs) + where + getPackageDBPath :: PackageDB -> IO FilePath + getPackageDBPath GlobalPackageDB = diff --git a/gnu/packages/patches/ghc-aeson-encodeDouble.patch b/gnu/packages/patches/ghc-aeson-encodeDouble.patch new file mode 100644 index 0000000000..11ad425eae --- /dev/null +++ b/gnu/packages/patches/ghc-aeson-encodeDouble.patch @@ -0,0 +1,25 @@ +From 58766a1916b4980792763bab74f0c86e2a7ebf20 Mon Sep 17 00:00:00 2001 +From: Oleg Grenrus <oleg.grenrus@iki.fi> +Date: Thu, 1 Jun 2023 22:58:28 +0300 +Subject: [PATCH] QC-2.14.3 Double generators generates infinite number too + +--- + tests/PropUtils.hs | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tests/PropUtils.hs b/tests/PropUtils.hs +index 3c449029a..43de85d7f 100644 +--- a/tests/PropUtils.hs ++++ b/tests/PropUtils.hs +@@ -51,8 +51,9 @@ import qualified Data.Aeson.Decoding as Dec + + encodeDouble :: Double -> Double -> Property + encodeDouble num denom +- | isInfinite d || isNaN d = encode d === "null" +- | otherwise = (read . L.unpack . encode) d === d ++ | isNaN d = encode d === "null" ++ | isInfinite d = if d > 0 then encode d === "\"+inf\"" else encode d === "\"-inf\"" ++ | otherwise = (read . L.unpack . encode) d === d + where d = num / denom + + encodeInteger :: Integer -> Property diff --git a/gnu/packages/patches/ghc-clock-realfrag.patch b/gnu/packages/patches/ghc-clock-realfrag.patch new file mode 100644 index 0000000000..0f7bb0542a --- /dev/null +++ b/gnu/packages/patches/ghc-clock-realfrag.patch @@ -0,0 +1,22 @@ +From 8372e801ef062223756db69818a7b60cfd9bb066 Mon Sep 17 00:00:00 2001 +From: amesgen <amesgen@amesgen.de> +Date: Tue, 8 Aug 2023 23:36:45 +0200 +Subject: [PATCH] Fix `RealFrac Seconds` instance + +--- + System/Clock/Seconds.hs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/System/Clock/Seconds.hs b/System/Clock/Seconds.hs +index a9a1c78..f7457cb 100644 +--- a/System/Clock/Seconds.hs ++++ b/System/Clock/Seconds.hs +@@ -50,7 +50,7 @@ instance Fractional Seconds where + + instance RealFrac Seconds where + properFraction (Seconds (TimeSpec s ns)) +- | s >= 0 = (fromIntegral s, Seconds $ TimeSpec 0 ns) ++ | s >= 0 || ns == 0 = (fromIntegral s, Seconds $ TimeSpec 0 ns) + | otherwise = (fromIntegral (s+1), Seconds $ TimeSpec (-1) ns) + + -- | The 'getTime' function shall return the current value for the diff --git a/gnu/packages/patches/libvpx-CVE-2023-44488.patch b/gnu/packages/patches/libvpx-CVE-2023-44488.patch new file mode 100644 index 0000000000..4ebb034eb4 --- /dev/null +++ b/gnu/packages/patches/libvpx-CVE-2023-44488.patch @@ -0,0 +1,107 @@ +From the upstream repo, can be removed after 1.14.1 +https://github.com/webmproject/libvpx/commit/df9fd9d5b7325060b2b921558a1eb20ca7880937.patch +https://www.openwall.com/lists/oss-security/2023/09/30/4 + +The test change didn't apply so it was removed from the patch + +From df9fd9d5b7325060b2b921558a1eb20ca7880937 Mon Sep 17 00:00:00 2001 +From: Jerome Jiang <jianj@google.com> +Date: Thu, 30 Jun 2022 13:48:56 -0400 +Subject: [PATCH] Fix bug with smaller width bigger size + +Fixed previous patch that clusterfuzz failed on. + +Local fuzzing passing overnight. + +Bug: webm:1642 +Change-Id: If0e08e72abd2e042efe4dcfac21e4cc51afdfdb9 +(cherry picked from commit 263682c9a29395055f3b3afe2d97be1828a6223f) +--- + test/resize_test.cc | 11 +++-------- + vp9/common/vp9_alloccommon.c | 13 ++++++------- + vp9/encoder/vp9_encoder.c | 27 +++++++++++++++++++++++++-- + 3 files changed, 34 insertions(+), 17 deletions(-) + +diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c +index e53883f621d..9e73e40ea09 100644 +--- a/vp9/common/vp9_alloccommon.c ++++ b/vp9/common/vp9_alloccommon.c +@@ -135,13 +135,6 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) { + cm->free_mi(cm); + if (cm->alloc_mi(cm, new_mi_size)) goto fail; + } +- +- if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) { +- // Create the segmentation map structure and set to 0. +- free_seg_map(cm); +- if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail; +- } +- + if (cm->above_context_alloc_cols < cm->mi_cols) { + vpx_free(cm->above_context); + cm->above_context = (ENTROPY_CONTEXT *)vpx_calloc( +@@ -156,6 +149,12 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) { + cm->above_context_alloc_cols = cm->mi_cols; + } + ++ if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) { ++ // Create the segmentation map structure and set to 0. ++ free_seg_map(cm); ++ if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail; ++ } ++ + if (vp9_alloc_loop_filter(cm)) goto fail; + + return 0; +diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c +index b66fdc0bca3..e3850775455 100644 +--- a/vp9/encoder/vp9_encoder.c ++++ b/vp9/encoder/vp9_encoder.c +@@ -1973,6 +1973,17 @@ static void alloc_copy_partition_data(VP9_COMP *cpi) { + } + } + ++static void free_copy_partition_data(VP9_COMP *cpi) { ++ vpx_free(cpi->prev_partition); ++ cpi->prev_partition = NULL; ++ vpx_free(cpi->prev_segment_id); ++ cpi->prev_segment_id = NULL; ++ vpx_free(cpi->prev_variance_low); ++ cpi->prev_variance_low = NULL; ++ vpx_free(cpi->copied_frame_cnt); ++ cpi->copied_frame_cnt = NULL; ++} ++ + void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { + VP9_COMMON *const cm = &cpi->common; + RATE_CONTROL *const rc = &cpi->rc; +@@ -2052,6 +2063,8 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { + new_mi_size = cm->mi_stride * calc_mi_size(cm->mi_rows); + if (cm->mi_alloc_size < new_mi_size) { + vp9_free_context_buffers(cm); ++ vp9_free_pc_tree(&cpi->td); ++ vpx_free(cpi->mbmi_ext_base); + alloc_compressor_data(cpi); + realloc_segmentation_maps(cpi); + cpi->initial_width = cpi->initial_height = 0; +@@ -2070,8 +2083,18 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { + update_frame_size(cpi); + + if (last_w != cpi->oxcf.width || last_h != cpi->oxcf.height) { +- memset(cpi->consec_zero_mv, 0, +- cm->mi_rows * cm->mi_cols * sizeof(*cpi->consec_zero_mv)); ++ vpx_free(cpi->consec_zero_mv); ++ CHECK_MEM_ERROR( ++ cm, cpi->consec_zero_mv, ++ vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(*cpi->consec_zero_mv))); ++ ++ vpx_free(cpi->skin_map); ++ CHECK_MEM_ERROR( ++ cm, cpi->skin_map, ++ vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(cpi->skin_map[0]))); ++ ++ free_copy_partition_data(cpi); ++ alloc_copy_partition_data(cpi); + if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ) + vp9_cyclic_refresh_reset_resize(cpi); + rc->rc_1_frame = 0; diff --git a/gnu/packages/patches/mes-0.26.1-fixups.patch b/gnu/packages/patches/mes-0.26.1-fixups.patch deleted file mode 100644 index 511b85cfc5..0000000000 --- a/gnu/packages/patches/mes-0.26.1-fixups.patch +++ /dev/null @@ -1,126 +0,0 @@ -Taken from upstream. - -From 7f549d02ac997505a7ed8a05339e73b851a875b8 Mon Sep 17 00:00:00 2001 -From: Janneke Nieuwenhuizen <janneke@gnu.org> -Date: Sun, 9 Jun 2024 08:18:35 +0200 -Subject: [PATCH 1/4] build: Remove a0-call-trunc-int from xfail for - mescc-x86_64. - -Reported by Vagrant Cascadian <vagrant@debian.org> via IRC. - -* build-aux/check-mescc.sh (xfail_tests)[mescc x86_64]: Remove -a0-call-trunc-int.c. ---- - build-aux/check-mescc.sh | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/build-aux/check-mescc.sh b/build-aux/check-mescc.sh -index fb5e1ef46..b2d771c89 100755 ---- a/build-aux/check-mescc.sh -+++ b/build-aux/check-mescc.sh -@@ -273,7 +273,6 @@ lib/tests/scaffold/91-goto-array.c - lib/tests/scaffold/16-cast.c - lib/tests/scaffold/17-compare-unsigned-le.c - lib/tests/scaffold/17-compare-rotated.c --lib/tests/scaffold/a0-call-trunc-int.c - " - fi - --- -2.41.0 - -From 3389cf4aef17cec38a5fd693c4c5d62520b0eab3 Mon Sep 17 00:00:00 2001 -From: Janneke Nieuwenhuizen <janneke@gnu.org> -Date: Sun, 9 Jun 2024 08:28:13 +0200 -Subject: [PATCH 2/4] lib: arm: Fix signal.h header. - -This is a follow-up to commit - 83a08a0788a5417d0a0bae3a43dc9c4026e09d99 - lib: Add ucontext_t for all architectures. - -* include/linux/arm/signal.h: Add missing semicolon. ---- - include/linux/arm/signal.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/linux/arm/signal.h b/include/linux/arm/signal.h -index 06cb09176..381811714 100644 ---- a/include/linux/arm/signal.h -+++ b/include/linux/arm/signal.h -@@ -1,6 +1,7 @@ - /* -*-comment-start: "//";comment-end:""-*- - * GNU Mes --- Maxwell Equations of Software - * Copyright © 2024 Ekaitz Zarraga <ekaitz@elenq.tech> -+ * Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> - * - * This file is part of GNU Mes. - * -@@ -20,7 +21,7 @@ - - // Taken from musl libc (4a16ddf5) - --typedef int greg_t -+typedef int greg_t; - typedef int gregset_t[18]; - typedef struct sigcontext - { --- -2.41.0 - -From 835d13ee2614a8b6ed54e5b7ead44b3d93cd63b4 Mon Sep 17 00:00:00 2001 -From: Janneke Nieuwenhuizen <janneke@gnu.org> -Date: Sun, 9 Jun 2024 11:20:42 +0200 -Subject: [PATCH 3/4] build: Add 90-signal to xfail for mescc-arm. - -Bisected until 0.23; this test sadly never worked on arm. - -* build-aux/check-mescc.sh (xfail_tests)[mescc-arm]: Add 90-signal.c ---- - build-aux/check-mescc.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build-aux/check-mescc.sh b/build-aux/check-mescc.sh -index b2d771c89..3900601e9 100755 ---- a/build-aux/check-mescc.sh -+++ b/build-aux/check-mescc.sh -@@ -280,6 +280,7 @@ lib/tests/scaffold/17-compare-rotated.c - xfail_tests="$xfail_tests - lib/tests/scaffold/17-compare-rotated.c - lib/tests/scaffold/67-m1-overflow-check.c -+lib/tests/signal/90-signal.c - " - fi - --- -2.41.0 - -From 1683f074a0462bc27023ce5a980ff3d35d4126cf Mon Sep 17 00:00:00 2001 -From: Janneke Nieuwenhuizen <janneke@gnu.org> -Date: Sun, 9 Jun 2024 11:24:25 +0200 -Subject: [PATCH 4/4] build: Remove 17-compare-rotated, 67-m1-overflow-check - xfail for mescc-arm. - -These were fixed by the riscv64 work. - -* build-aux/check-mescc.sh (xfail_tests)[mescc arm]: Remove -17-compare-rotated, 67-m1-overflow-check. ---- - build-aux/check-mescc.sh | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/build-aux/check-mescc.sh b/build-aux/check-mescc.sh -index 3900601e9..9abf43384 100755 ---- a/build-aux/check-mescc.sh -+++ b/build-aux/check-mescc.sh -@@ -278,8 +278,6 @@ lib/tests/scaffold/17-compare-rotated.c - - if test $mes_cpu = arm; then - xfail_tests="$xfail_tests --lib/tests/scaffold/17-compare-rotated.c --lib/tests/scaffold/67-m1-overflow-check.c - lib/tests/signal/90-signal.c - " - fi --- -2.41.0 - diff --git a/gnu/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch b/gnu/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch deleted file mode 100644 index d7cd1c0d28..0000000000 --- a/gnu/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7554aefc886d4ebc4b4c139a5cddcab6163cf72f Mon Sep 17 00:00:00 2001 -From: Vinicius Monego <monego@posteo.net> -Date: Thu, 30 Sep 2021 23:37:29 -0300 -Subject: [PATCH] Link QtScriptByteArray with QtScript. - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 492ccae..05fec08 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2077,7 +2077,7 @@ add_library(QtScriptByteArray STATIC EXCLUDE_FROM_ALL - lib/qtscript-bytearray/bytearrayprototype.cpp - ) - set_target_properties(QtScriptByteArray PROPERTIES AUTOMOC ON) --target_link_libraries(QtScriptByteArray Qt5::Core) -+target_link_libraries(QtScriptByteArray Qt5::Core Qt5::Script) - target_include_directories(mixxx-lib SYSTEM PUBLIC lib/qtscript-bytearray) - target_link_libraries(mixxx-lib PRIVATE QtScriptByteArray) - --- -2.30.2 - diff --git a/gnu/packages/patches/mixxx-system-googletest-benchmark.patch b/gnu/packages/patches/mixxx-system-googletest-benchmark.patch deleted file mode 100644 index 7adbe66208..0000000000 --- a/gnu/packages/patches/mixxx-system-googletest-benchmark.patch +++ /dev/null @@ -1,43 +0,0 @@ -From eb2079d467f8658eea13e2ed86cc69d864632866 Mon Sep 17 00:00:00 2001 -From: Vinicius Monego <monego@posteo.net> -Date: Wed, 29 Sep 2021 19:07:35 -0300 -Subject: [PATCH] Use system googletest and benchmark. - ---- - CMakeLists.txt | 13 +++---------- - 1 file changed, 3 insertions(+), 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 10e9b0a..492ccae 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1467,12 +1467,7 @@ set(gtest_force_shared_crt ON CACHE BOOL "Pass Mixxx compiler/linker options to - # Prevent installation of GoogleTest libraries - set(INSTALL_GTEST OFF CACHE BOOL "Disable installation of GoogleTest" FORCE) - --# Add googletest directly to our build. This adds the following targets: --# gtest, gtest_main, gmock and gmock_main --add_subdirectory( -- "${CMAKE_CURRENT_SOURCE_DIR}/lib/googletest" -- "${CMAKE_CURRENT_BINARY_DIR}/lib/googletest" --) -+find_package(GTest CONFIG REQUIRED) - - add_executable(mixxx-test - src/test/analyserwaveformtest.cpp -@@ -1582,10 +1577,8 @@ set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "" FORCE) - # Prevent installation of google/benchmark artifacts - set(BENCHMARK_ENABLE_INSTALL OFF CACHE BOOL "Disable installation of google/benchmark" FORCE) - --add_subdirectory( -- "${CMAKE_CURRENT_SOURCE_DIR}/lib/benchmark" -- "${CMAKE_CURRENT_BINARY_DIR}/lib/benchmark" --) -+find_package(benchmark CONFIG REQUIRED) -+ - target_link_libraries(mixxx-test PRIVATE benchmark) - - # Test Suite --- -2.30.2 - diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 72201770c7..e5e766f576 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -62,7 +62,7 @@ (define-public php (package (name "php") - (version "8.3.6") + (version "8.3.8") (home-page "https://www.php.net/") (source (origin (method url-fetch) @@ -70,7 +70,7 @@ "php-" version ".tar.xz")) (sha256 (base32 - "1bjygxjaqmvccyk4ic3lrca5j34f0pjb6f1ldmi9gbr345mkij2k")) + "1mxqbfp1jlrqc72wym798wyi6nckbc0cjl6kpg147yc6c6smi8xf")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index c7d4b15c4a..59901caa47 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -67,14 +67,14 @@ (define-public asymptote (package (name "asymptote") - (version "2.89") + (version "2.90") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asymptote/" version "/asymptote-" version ".src.tgz")) (sha256 - (base32 "0nvzlnabxjn74ybv3jns9vsr33prlvlg3i20hskz31agxss64kpn")) + (base32 "0h3kf0jajn67izpg6h1bi50qrsdslr7mnacp4j7lmx4bh3xmcscc")) (modules '((guix build utils))) (snippet ;; Remove bundled RapidJSON. @@ -108,7 +108,8 @@ texlive-ocgx2 texlive-parskip texlive-pdftexcmds - texlive-texinfo)))) + texlive-texinfo + texlive-type1cm)))) (inputs (list bash-minimal eigen diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 0a4c36d99c..a5e68964f9 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -180,7 +180,7 @@ it.") (define-public trealla (package (name "trealla") - (version "2.53.2") + (version "2.53.10") (source (origin (method git-fetch) @@ -189,7 +189,7 @@ it.") (url "https://github.com/trealla-prolog/trealla") (commit (string-append "v" version)))) (sha256 - (base32 "1szq4virrbxi41izd1wxr5xiggyxrhqj12sbj5s2dmr1m0691arf")) + (base32 "15lbzbqsam4832jnynsj7ksn17xrwqwdhs66ajpi4jf8hy4bqh15")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs diff --git a/gnu/packages/purescript.scm b/gnu/packages/purescript.scm index ef58ecbf82..245d6ca79c 100644 --- a/gnu/packages/purescript.scm +++ b/gnu/packages/purescript.scm @@ -109,7 +109,8 @@ (lambda _ (substitute* "purescript.cabal" (("\\b(language-javascript|process)\\s+[^,]+" all dep) - dep)))) + dep) + (("happy:happy ==1.20.0") "happy:happy")))) (add-after 'register 'remove-libraries (lambda _ (delete-file-recursively diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 82089da775..57b852c2bd 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -1545,6 +1545,38 @@ region of practical equivalence (rope), or that the second classifier has higher scores.") (license license:expat))) +(define-public python-fast-histogram + (package + (name "python-fast-histogram") + (version "0.14") + (source + (origin + (method url-fetch) + (uri (pypi-uri "fast_histogram" version)) + (sha256 + (base32 "1sk9xa85cgm4sylzblwv3qr2dmm0ic06zkwxqa2xlazjiawp629r")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'build-extensions + (lambda _ + (invoke "python" "setup.py" "build_ext" "--inplace")))))) + (propagated-inputs (list python-numpy)) + (native-inputs (list python-hypothesis python-pytest)) + (home-page "https://github.com/astrofrog/fast-histogram") + (synopsis "Fast simple 1D and 2D histograms") + (description + "The fast-histogram mini-package aims to provide simple and fast +histogram functions for regular bins that don't compromise on performance. It +doesn't do anything complicated - it just implements a simple histogram +algorithm in C and keeps it simple. The aim is to have functions that are fast +but also robust and reliable. The result is a 1D histogram function here that +is 7-15x faster than @code{numpy.histogram}, and a 2D histogram function that +is 20-25x faster than @code{numpy.histogram2d}.") + (license license:bsd-3))) + (define-public python-fastcluster (package (name "python-fastcluster") @@ -2898,6 +2930,63 @@ heavily biased to machine learning scenarios. It works on top of @command{numpy} and (partially) @command{gnumpy}.") (license license:bsd-3))) +(define-public python-corner + (package + (name "python-corner") + (version "2.2.2") + (source + (origin + (method git-fetch) ;no tests in PyPi archive + (uri (git-reference + (url "https://github.com/dfm/corner.py") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1i4dk4jxh0saysya2cnsfwlxwpldbdl174i9pwi4qj82av9jr2ii")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list + ;; XXX: Disable tests which failed with mismatched images, check why. + "-k" (string-append "not test_labels[png]" + " and not test_title_quantiles[png]" + " and not test_title_quantiles_default[png]" + " and not test_title_quantiles_raises[png]" + " and not test_bins[png]" + " and not test_bins_log[png]" + " and not test_titles1[png]" + " and not test_titles2[png]" + " and not test_pandas[png]" + " and not test_tight[png]" + " and not test_extended_overplotting[png]" + " and not test_reverse_overplotting[png]" + " and not test_arviz[png]" + " and not test_range_fig_arg[png]")) + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'pretend-version + ;; XXX: Make sure you're either building from a fully intact git + ;; repository or PyPI tarballs. Most other sources (such as GitHub's + ;; tarballs, a git checkout without the .git folder) don't contain + ;; the necessary metadata and will not work. + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)))))) + (propagated-inputs + (list python-matplotlib)) + (native-inputs + (list python-arviz python-pytest python-scipy python-setuptools-scm)) + (home-page "http://corner.readthedocs.io/") + (synopsis "Make some beautiful corner plots") + (description + "This Python module uses @code{matplotlib} to visualize multidimensional +samples using a scatterplot matrix. In these visualizations, each one- and +two-dimensional projection of the sample is plotted to reveal covariances. +corner was originally conceived to display the results of Markov Chain Monte +Carlo simulations and the defaults are chosen with this application in mind but +it can be used for displaying many qualitatively different samples.") + (license license:bsd-2))) + (define-public python-paramz (package (name "python-paramz") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ff507e1855..36f75b4b40 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22801,13 +22801,13 @@ numbers, real numbers, mixed types and more, and comes with a shell command (define-public glances (package (name "glances") - (version "3.4.0.3") + (version "4.1.1") (source (origin (method url-fetch) - (uri (pypi-uri "Glances" version)) + (uri (pypi-uri "glances" version)) (sha256 - (base32 "0pf8hxbgwkhv8l5frg61b073vscz5a7bz1al7xhn36fvh10xbcg7")) + (base32 "10yjwbmwv2x4x1n3hr1631m8l6l9w8fa7rnvfz1vmzkjs199ihib")) (modules '((guix build utils))) (snippet '(begin @@ -22821,7 +22821,7 @@ numbers, real numbers, mixed types and more, and comes with a shell command #t)))) (build-system python-build-system) (propagated-inputs - (list python-defusedxml python-future python-packaging python-psutil python-ujson)) + (list python-defusedxml python-orjson python-packaging python-psutil)) (home-page "https://github.com/nicolargo/glances") (synopsis "Cross-platform curses-based monitoring tool") (description diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index be8d9bdc25..a6a8bb0cd1 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -912,3 +912,30 @@ with Guix Home: \"source \" liquidprompt \"/share/liquidprompt/themes/powerline/powerline.theme\")))))) @end example\n") (license license:agpl3+))) + +(define-public fzf-tab + (package + (name "fzf-tab") + (version "1.1.2") + (home-page "https://github.com/Aloxaf/fzf-tab") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Aloxaf/fzf-tab") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "061jjpgghn8d5q2m2cd2qdjwbz38qrcarldj16xvxbid4c137zs2")))) + (build-system copy-build-system) + (arguments + '(#:install-plan '(("lib" "/share/zsh/plugins/fzf-tab/") + ("modules" "/share/zsh/plugins/fzf-tab/") + ("fzf-tab.plugin.zsh" "/share/zsh/plugins/fzf-tab/") + ("fzf-tab.zsh" "/share/zsh/plugins/fzf-tab/") + ("README.md" "/share/doc/fzf-tab/")))) + (synopsis "Replace the zsh default completion menu with fzf") + (description + "The fzf-tab package replaces the default completion menu of the zsh +shell with fzf, enabling fuzzy finding and multi-selection.") + (license license:expat))) diff --git a/gnu/packages/specifications.scm b/gnu/packages/specifications.scm index 4e6c7b81ff..6b5e1e6fbe 100644 --- a/gnu/packages/specifications.scm +++ b/gnu/packages/specifications.scm @@ -138,3 +138,31 @@ CID}).") well-established cryptographic hash functions, addressing size + encoding considerations.") (license (list license:expat license:cc-by-sa3.0))))) + +(define-public specification-specreduce-data + (let ((commit "dcba1c601348ee3a5797ae2d84a068d83393058e") + (revision "0")) + (package + (name "specification-specreduce-data") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/astropy/specreduce-data") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1c6mrjfykkfbbyg489h7czr65nz6bcb3gszz5xa2cg2ccs00m8ii")))) + (build-system copy-build-system) + (arguments + '(#:install-plan '(("specreduce_data/" "share/specreduce_data//")) + #:phases (modify-phases %standard-phases + (delete 'strip)))) + (home-page "https://specreduce.readthedocs.io/") + (synopsis "Reference and calibration data for the reducing optical/IR spectra") + (description + "This package provides a general reference and calibration data for +spectroscopic data reduction (e.g. standard star spectra, atmospheric +extinction curves, line lists for calibration lamps).") + (license license:bsd-3)))) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index ff39aea9ba..f4c80347a1 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2023 Simon Streit <simon@netpanic.org> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -198,7 +199,7 @@ a server that supports the SSH-2 protocol.") (define-public openssh (package (name "openssh") - (version "9.7p1") + (version "9.8p1") (source (origin (method url-fetch) @@ -206,7 +207,7 @@ a server that supports the SSH-2 protocol.") "openssh-" version ".tar.gz")) (patches (search-patches "openssh-trust-guix-store-directory.patch")) (sha256 - (base32 "1z9zfw7ndibxwprazlkv1isrh1yplczdin5cziijfanqcvvjc129")))) + (base32 "1wrrb8zrfj9wa9nbpx310kl2k05gm4gxsl5hvycx9dbrlc1d12yx")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 7269e91ec0..ea8249869d 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -213,326 +213,6 @@ notification area icon for Syncthing. Supported Syncthing features: (define-public qsyncthingtray (deprecated-package "qsyncthingtray" syncthing-gtk)) -(define-public go-github-com-audriusbutkevicius-recli - (package - (name "go-github-com-audriusbutkevicius-recli") - (version "0.0.5") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/AudriusButkevicius/recli") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1m1xna1kb78pkmr1lfmvvnpk9j7c4x71j3a7c6vj7zpzc4srpsmf")))) - (build-system go-build-system) - (inputs - (list go-github-com-pkg-errors go-github-com-urfave-cli)) - (arguments - `(#:import-path "github.com/AudriusButkevicius/recli")) - (synopsis "Reflection-based CLI generator") - (description "For a given struct, @code{recli} builds a set of -@code{urfave/cli} commands which allows you to modify it from the command line. -It is useful for generating command line clients for your application -configuration that is stored in a Go struct.") - (home-page "https://github.com/AudriusButkevicius/recli") - (license mpl2.0))) - -(define-public go-github-com-bkaradzic-go-lz4 - (let ((commit "7224d8d8f27ef618c0a95f1ae69dbb0488abc33a") - (revision "0")) - (package - (name "go-github-com-bkaradzic-go-lz4") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/bkaradzic/go-lz4") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "10lmya17vdqg2pvqni0p73iahni48s1v11ya9a0hcz4jh5vw4dkb")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/bkaradzic/go-lz4")) - (synopsis "LZ4 compression algorithm") - (description "This package provides @code{go-lz4}, a Go implementation of -the LZ4 compression algorithm.") - (home-page "https://github.com/bkaradzic/go-lz4") - (license bsd-2)))) - -(define-public go-github-com-calmh-du - (package - (name "go-github-com-calmh-du") - (version "1.0.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/calmh/du") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0qb3a6y3p9nkyn3s66k6zcm16y8n8578qh23ddj14cxf2scrr2n2")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/calmh/du")) - (synopsis "Get total and available disk space of a given volume") - (description "This is a Go implementation of `du`. It provides disk usage -information, such as how much storage space is available, free, and used.") - (home-page "https://github.com/calmh/du") - (license public-domain))) - -(define-public go-github-com-calmh-xdr - (package - (name "go-github-com-calmh-xdr") - (version "1.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/calmh/xdr") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "072wqdncz3nd4a3zkhvzzx1y3in1lm29wfvl0d8wrnqs5pyqh0mh")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/calmh/xdr")) - (synopsis "XDR marshalling and unmarshalling") - (description "XDR is an External Data Representation (XDR) -marshalling and unmarshalling library in Go. It uses code generation and not -reflection.") - (home-page "https://github.com/calmh/xdr") - (license expat))) - -(define-public go-github-com-d4l3k-messagediff - (package - (name "go-github-com-d4l3k-messagediff") - (version "1.2.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/d4l3k/messagediff") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "104hl8x57ciaz7mzafg1vp9qggxcyfm8hsv9bmlihbz9ml3nyr8v")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/d4l3k/messagediff")) - (synopsis "Diff arbitrary Go structs") - (description "Messagediff is a library for calculating diffs of arbitrary -structs in the Go programming language.") - (home-page "https://github.com/d4l3k/messagediff") - (license expat))) - -(define-public go-github-com-jackpal-gateway - (package - (name "go-github-com-jackpal-gateway") - (version "1.0.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jackpal/gateway") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1yms2dw4dnz4cvj9vhwh6193d50jhvn5awsp2g3a4lcc3sjrgd6m")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/jackpal/gateway")) - (synopsis "Discover the address of a LAN gateway") - (description "@code{gateway} is a Go library for discovering the IP -address of the default LAN gateway.") - (home-page "https://github.com/jackpal/gateway") - (license bsd-3))) - -(define-public go-github-com-oschwald-geoip2-golang - (package - (name "go-github-com-oschwald-geoip2-golang") - (version "1.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/oschwald/geoip2-golang") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1jj4rbdpy87rbl79czg5hs5dyn6xlbnk0bnvyzi71dsxan57nixw")))) - (build-system go-build-system) - (propagated-inputs - (list go-github-com-oschwald-maxminddb-golang go-golang-org-x-sys)) - (arguments - `(#:import-path "github.com/oschwald/geoip2-golang" - #:tests? #f)) ; Requires some unpackaged software and test data - (synopsis "MaxMind GeoIP2 reader") - (description "This package provides a library for reading MaxMind -GeoLite2 and GeoIP2 databases in Go.") - (home-page "https://github.com/oschwald/geoip2-golang") - (license isc))) - -(define-public go-github-com-oschwald-maxminddb-golang - (package - (name "go-github-com-oschwald-maxminddb-golang") - (version "1.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/oschwald/maxminddb-golang") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "100wd5qv00pkcm6cb8c4x5gavc9jnn7drh6xrqh85hzci4rils66")))) - (build-system go-build-system) - (propagated-inputs - (list go-golang-org-x-sys)) - (arguments - `(#:import-path "github.com/oschwald/maxminddb-golang" - #:tests? #f)) ; Requires some unpackaged software and test data - (synopsis "MaxMind DB Reader for Go") - (description "This is a Go reader for the MaxMind DB format. Although -this can be used to read GeoLite2 and GeoIP2 databases, @code{geoip2} provides a -higher-level API for doing so.") - (home-page "https://github.com/oschwald/maxminddb-golang") - (license isc))) - -(define-public go-github-com-sasha-s-go-deadlock - (package - (name "go-github-com-sasha-s-go-deadlock") - (version "0.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/sasha-s/go-deadlock") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "13p7b7pakd9k1c2k0fs1hfim3c8mivz679977ai6zb01s4aw7gyg")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/sasha-s/go-deadlock")) - (propagated-inputs - (list go-github-com-petermattis-goid)) - (synopsis "Deadlock detection in go") - (description "This package provides tools for detecting deadlocks at -run-time in Go.") - (home-page "https://github.com/sasha-s/go-deadlock") - (license asl2.0))) - -(define-public go-github-com-thejerf-suture - (package - (name "go-github-com-thejerf-suture") - (version "3.0.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/thejerf/suture") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "03bdrl78jfwk0kw40lj63ga9cxhgccgss8yi9lp5j0m0ml7921gh")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/thejerf/suture")) - (synopsis "Supervisor trees for Go") - (description "Suture provides Erlang-ish supervisor trees for Go. -\"Supervisor trees\" -> \"sutree\" -> \"suture\" -> holds your code together -when it's trying to die. - -It is intended to deal gracefully with the real failure cases that can occur -with supervision trees (such as burning all your CPU time endlessly restarting -dead services), while also making no unnecessary demands on the \"service\" -code, and providing hooks to perform adequate logging with in a production -environment") - (home-page "https://github.com/thejerf/suture") - (license expat))) - -(define-public go-github-com-vitrun-qart - (let ((commit "bf64b92db6b05651d6c25a3dabf2d543b360c0aa") - (revision "0")) - (package - (name "go-github-com-vitrun-qart") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/vitrun/qart") - (commit commit))) - (file-name (string-append "go-github-com-vitrun-qart-" - version "-checkout")) - (sha256 - (base32 - "1xk7qki703xmay9ghi3kq2bjf1iw9dz8wik55739d6i7sn77vvkc")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/vitrun/qart")) - (synopsis "Create QR codes with an embedded image") - (description "This package provides a library for embedding -human-meaningful graphics in QR codes. However, instead of scribbling on -redundant pieces and relying on error correction to preserve the meaning, -@code{qart} engineers the encoded values to create the picture in a code with no -inherent errors.") - (home-page "https://github.com/vitrun/qart") - (license bsd-3)))) - -(define-public go-github-com-chmduquesne-rollinghash - (let ((commit "a60f8e7142b536ea61bb5d84014171189eeaaa81") - (revision "0")) - (package - (name "go-github-com-chmduquesne-rollinghash") - (version (git-version "4.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/chmduquesne/rollinghash") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0fpaqq4zb0wikgbhn7vwqqj1h865f5xy195vkhivsp922p7qwsjr")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/chmduquesne/rollinghash/")) - (synopsis "Rolling hashes in Go") - (description "This package provides a Go implementation of several rolling -hashes.") - (home-page "https://github.com/chmduquesne/rollinghash") - (license expat)))) - -(define-public go-github-com-petermattis-goid - (let ((commit "b0b1615b78e5ee59739545bb38426383b2cda4c9") - (revision "1")) - (package - (name "go-github-com-petermattis-goid") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/petermattis/goid") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ghfxn045r0bbn2vszw897lxzmhnm4k59aypjvpxl0pbzsw9ab2c")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/petermattis/goid")) - (synopsis "Identify the running goroutine") - (description "This package offers a method of programmatically retrieving -the current goroutine's ID.") - (home-page "https://github.com/petermattis/goid") - (license asl2.0)))) - (define-public go-github-com-syncthing-notify (let ((commit "69c7a957d3e261f9744f46b3dd4d608d8480ad90") (revision "5")) @@ -558,175 +238,3 @@ the current goroutine's ID.") notification library in Go.") (home-page "https://github.com/syncthing/notify") (license expat)))) - -(define-public go-github-com-matttproud-golang-protobuf-extensions-pbutil - (package - (name "go-github-com-matttproud-golang-protobuf-extensions-pbutil") - (version "2.0.0") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/matttproud/golang_protobuf_extensions") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0jw4vjycwx0a82yvixmp25805krdyqd960y8lnyggllb6br0vh41")))) - (build-system go-build-system) - (arguments - (list - #:import-path "github.com/matttproud/golang_protobuf_extensions/v2/pbutil" - #:unpack-path "github.com/matttproud/golang_protobuf_extensions/v2")) - (propagated-inputs - (list go-github-com-golang-protobuf-proto - go-google-golang-org-protobuf)) - (synopsis "Streaming Protocol Buffers in Go") - (description "This package provides various Protocol Buffer -extensions for the Go language, namely support for record length-delimited -message streaming.") - (home-page "https://github.com/matttproud/golang_protobuf_extensions") - (license asl2.0))) - -(define-public go-github-com-go-asn1-ber-asn1-ber - (package - (name "go-github-com-go-asn1-ber-asn1-ber") - (version "1.5.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/go-asn1-ber/asn1-ber") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15ygmfmdwwjda9xdq58rx6gnmsfc14m1qqhcj7cn7rm0mx4wk2vb")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/go-asn1-ber/asn1-ber")) - (synopsis "ASN.1 BER encoding and decoding in Go") - (description "This package provides ASN.1 BER encoding and decoding in the -Go language.") - (home-page "https://github.com/go-asn1-ber/asn1-ber") - (license expat))) - -(define-public go-github-com-go-ldap-ldap - (package - (name "go-github-com-go-ldap-ldap") - (version "3.4.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/go-ldap/ldap") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1xf2jrwhgr06jy4liba48hrz4b7j27r7m9dnl7fj95vazsx2n5br")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/go-ldap/ldap/v3" - #:tests? #f)) ; test suite requires internet access - (propagated-inputs - (list go-github-com-go-asn1-ber-asn1-ber - go-github-com-azure-go-ntlmssp)) - (home-page "https://github.com/go-ldap/ldap") - (synopsis "LDAP v3 functionality for Go") - (description "This package provides basic LDAP v3 functionality in the Go -language.") - (license expat))) - -(define-public go-github-com-azure-go-ntlmssp - (package - (name "go-github-com-azure-go-ntlmssp") - (version "0.0.0-20211209120228-48547f28849e") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Azure/go-ntlmssp") - (commit (go-version->git-ref version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0im28kp9p6ncdmh7qq5qwl85nmiwmp8jka2qgrjiqzc5n36q56np")))) - (build-system go-build-system) - (arguments '(#:import-path "github.com/Azure/go-ntlmssp")) - (propagated-inputs - (list go-golang-org-x-crypto)) - (home-page "https://github.com/Azure/go-ntlmssp") - (synopsis "NTLM negotiation in Go") - (description - "This package provides NTLM/Negotiate authentication over HTTP.") - (license expat))) - -(define-public go-github-com-flynn-archive-go-shlex - (let ((commit "3f9db97f856818214da2e1057f8ad84803971cff") - (revision "0")) - (package - (name "go-github-com-flynn-archive-go-shlex") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/flynn-archive/go-shlex") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/flynn-archive/go-shlex")) - (synopsis "Go lexer") - (description "Shlex is a simple lexer for go that supports shell-style -quoting, commenting, and escaping.") - (home-page "https://github.com/flynn-archive/go-shlex") - (license asl2.0)))) - -(define-public go-github-com-audriusbutkevicius-pfilter - (package - (name "go-github-com-audriusbutkevicius-pfilter") - (version "0.0.5") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/AudriusButkevicius/pfilter") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0xzhwyd0w21bhvzl5pinn22hp0y6h44rh3s2ppql69rafc6zd3c6")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/AudriusButkevicius/pfilter")) - (synopsis "Filter packets into multiple virtual connections") - (description "Pfilter is a Go package for filtering packets into multiple -virtual connections from a single physical connection.") - (home-page "https://github.com/AudriusButkevicius/pfilter") - (license expat))) - -(define-public go-github-com-ccding-go-stun - (let ((commit "be486d185f3dfcb2dbf8429332da50a0da7f95a6") - (revision "2")) - (package - (name "go-github-com-ccding-go-stun") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ccding/go-stun") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1gr0rw1c1y7wh6913lyn5k4ig023by27i36bly6am8dwgrgp34ww")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/ccding/go-stun")) - (synopsis "STUN client implementation") - (description "Go-stun is a go implementation of the STUN client (RFC 3489 -and RFC 5389).") - (home-page "https://github.com/ccding/go-stun") - (license asl2.0)))) diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index 96df50d747..b665195740 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -290,8 +290,8 @@ time to a logfile.") (replace 'build (lambda* (#:key import-path #:allow-other-keys) (with-directory-excursion (string-append "src/" import-path) - (invoke "go" "build" "-o" "dstask" "cmd/dstask/main.go") - (invoke "go" "build" "-o" "dstask-import" + (invoke "go" "build" "-trimpath" "-o" "dstask" "cmd/dstask/main.go") + (invoke "go" "build" "-trimpath" "-o" "dstask-import" "cmd/dstask-import/main.go")))) (replace 'install (lambda* (#:key import-path outputs #:allow-other-keys) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 3ab79837e0..c227ff53dc 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1039,7 +1039,7 @@ programmer to write text-based user interfaces.") go-github-com-gdamore-tcell go-github-com-rivo-uniseg go-github-com-saracen-walker - go-golang.org-x-sync-errgroup + go-golang-org-x-sync go-golang-org-x-term go-golang-org-x-crypto)) (home-page "https://github.com/junegunn/fzf") diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index b58038dcc2..0d704faed9 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -1471,7 +1471,7 @@ of a Unix terminal to HTML code.") go-github-com-spf13-afero go-github-com-urfave-cli go-github-com-yuin-goldmark - go-golang-org-x-net-html + go-golang-org-x-net go-gopkg-in-ini-v1 go-gopkg-in-yaml-v2)) (home-page "https://github.com/errata-ai/vale") diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm index 8e47834fef..d8eb17111d 100644 --- a/gnu/packages/uucp.scm +++ b/gnu/packages/uucp.scm @@ -116,6 +116,7 @@ between computers.") (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) + (setenv "GO_LDFLAGS" "-trimpath") ;; Set configuration path. (setenv "CFGPATH" "/etc/nncp.hjson") ;; Set output directories. @@ -142,9 +143,7 @@ between computers.") (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "contrib/do" "-c" "test")))) - (add-after 'install 'remove-go-references - (assoc-ref go:%standard-phases 'remove-go-references))))) + (invoke "contrib/do" "-c" "test"))))))) (inputs (list go-github-com-davecgh-go-xdr go-github-com-dustin-go-humanize diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index da02d0e4ea..29401f87ff 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3505,7 +3505,7 @@ will reconstruct the object along its delta-base chain and return it.") go-github-com-xeipuuv-gojsonreference go-github-com-xeipuuv-gojsonpointer go-golang-org-x-net - go-golang.org-x-sync-semaphore + go-golang-org-x-sync go-github-com-ssgelm-cookiejarparser go-github-com-rubyist-tracerx go-github-com-olekukonko-ts @@ -3849,8 +3849,8 @@ If several repos are related, it helps to see their status together.") go-github-com-motemen-go-colorine go-github-com-saracen-walker go-github-com-urfave-cli-v2 - go-golang-org-x-net-html - go-golang.org-x-sync-errgroup)) + go-golang-org-x-net + go-golang-org-x-sync)) (synopsis "Manage remote repository clones") (description "@code{ghq} provides a way to organize remote repository clones, like diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 77cdfe9078..411ad4c2bf 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2962,7 +2962,8 @@ To load this plugin, specify the following option when starting mpv: (origin (inherit (package-source libvpx)) (patches (search-patches "libvpx-CVE-2016-2818.patch" - "libvpx-CVE-2023-5217.patch")))))) + "libvpx-CVE-2023-5217.patch" + "libvpx-CVE-2023-44488.patch")))))) (define-public orfondl (package diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 16c2b75510..4ff9676e79 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -2319,6 +2319,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") #~(list (string-append "CC=" #$(cc-for-target)) "PREFIX=" (string-append "DESTDIR=" #$output) + "GOGCFLAGS=-trimpath" (string-append "GOMD2MAN=" #$go-github-com-go-md2man "/bin/go-md2man")) #:tests? #f ; The tests require Docker @@ -2357,9 +2358,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") (wrap-program (string-append #$output "/bin/skopeo") `("PATH" suffix ;; We need at least newuidmap, newgidmap and mount. - ("/run/setuid-programs"))))) - (add-after 'install 'remove-go-references - (@@ (guix build go-build-system) remove-go-references))))) + ("/run/setuid-programs")))))))) (home-page "https://github.com/containers/skopeo") (synopsis "Interact with container images and container image registries") (description diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7f9c63ad18..90f7330f2b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5182,8 +5182,8 @@ Cloud.") (license license:expat))) (define-public guix-data-service - (let ((commit "eeb026b654939c3f7457f0a355757f17745a16ab") - (revision "51")) + (let ((commit "b5fbde5ac832e34987a05b1445c1c465c19d5340") + (revision "52")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -5195,7 +5195,7 @@ Cloud.") (file-name (git-file-name name version)) (sha256 (base32 - "0b2fg0vd3mvkmrc52p7kfzwhra0ji4cmnxjyzab8m87ijrpgh13l")))) + "1dp26bj14jaac9f5332pd6hasm3wr1hg9wrbjm9m8wb7cdll9h2p")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index c3cd596e6c..505ce09c1a 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -860,37 +860,17 @@ manager and a system tray.") (define-public xmonad (package (name "xmonad") - (version "0.17.1") - (source (origin - (method url-fetch) - (uri (hackage-uri "xmonad" version)) - (sha256 - (base32 - "1apqwyqmc51gamfgsvlanzqqig9qvjss89ibcamhnha1gs1k4jl8")) - (patches (search-patches "xmonad-dynamic-linking.patch")))) + (version "0.17.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "xmonad" version)) + (sha256 + (base32 "19qz9a23377nzc0qq8nca45s745mfncd4i2vwba14gi7ipipfcil")))) (build-system haskell-build-system) (properties '((upstream-name . "xmonad"))) (inputs (list ghc-x11 ghc-data-default-class ghc-setlocale)) (native-inputs (list ghc-quickcheck ghc-quickcheck-classes)) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'install-xsession - (lambda _ - (let ((xsessions (string-append #$output "/share/xsessions"))) - (mkdir-p xsessions) - (call-with-output-file (string-append xsessions - "/xmonad.desktop") - (lambda (port) - (format port "~ - [Desktop Entry]~@ - Name=~a~@ - Comment=xmonad window manager~@ - Exec=~a/bin/xmonad~@ - Type=Application~%" #$name #$output))))))) - #:cabal-revision '("2" - "1rgwrnyb7kijzl2mqm8ks2nydh37q5vkbg4400rg9n6x13w2r9b3"))) (home-page "http://xmonad.org") (synopsis "Tiling window manager") (description @@ -950,7 +930,11 @@ tiled on several screens.") (add-before 'build 'patch-test-shebang (lambda* (#:key inputs #:allow-other-keys) (substitute* "test/Xmobar/Plugins/Monitors/AlsaSpec.hs" - (("/bin/bash") (which "bash")))))))) + (("/bin/bash") (which "bash"))))) + (add-before 'build 'patch-cairo-path + (lambda _ + (substitute* "src/Xmobar/X11/CairoSurface.hsc" + (("cairo/cairo-xlib.h") "cairo-xlib.h"))))))) (home-page "https://xmobar.org") (synopsis "Haskell library for minimalistic text based status bars") (description @@ -2426,7 +2410,6 @@ wlr-output-management-unstable-v1 protocol.") (list sbcl-alexandria sbcl-cl-ppcre sbcl-clx)) - (outputs '("out" "lib")) (arguments (list #:phases @@ -2439,12 +2422,12 @@ wlr-output-management-unstable-v1 protocol.") (add-after 'create-asdf-configuration 'build-program (lambda* (#:key outputs #:allow-other-keys) (build-program - (string-append (assoc-ref outputs "out") "/bin/stumpwm") + (string-append #$output "/bin/stumpwm") outputs #:entry-program '((stumpwm:stumpwm) 0)))) (add-after 'build-program 'create-desktop-file (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) + (let* ((out #$output) (xsessions (string-append out "/share/xsessions"))) (mkdir-p xsessions) (call-with-output-file @@ -2461,7 +2444,7 @@ wlr-output-management-unstable-v1 protocol.") out)))))) (add-after 'install 'install-manual (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) + (let* ((out #$output) (info (string-append out "/share/info"))) (invoke "./autogen.sh") (invoke "sh" "./configure" "SHELL=sh") @@ -2469,8 +2452,7 @@ wlr-output-management-unstable-v1 protocol.") (install-file "stumpwm.info" info)))) (add-after 'install-manual 'remove-temporary-cache (lambda* (#:key outputs #:allow-other-keys) - (delete-file-recursively (string-append (assoc-ref outputs "lib") - "/.cache"))))))) + (delete-file-recursively (string-append #$output "/.cache"))))))) (synopsis "Window manager written in Common Lisp") (description "Stumpwm is a window manager written entirely in Common Lisp. @@ -2490,10 +2472,8 @@ productive, customizable lisp based systems.") (package (inherit stumpwm) (name "stumpwm-with-slynk") - (outputs '("out")) (inputs - `(("stumpwm" ,stumpwm "lib") - ("slynk" ,sbcl-slynk))) + (list sbcl-slynk stumpwm)) (arguments (substitute-keyword-arguments (package-arguments stumpwm) ((#:phases phases) @@ -2508,8 +2488,7 @@ productive, customizable lisp based systems.") #:dependencies '("stumpwm" "slynk") #:dependency-prefixes (map (lambda (input) (assoc-ref inputs input)) - '("stumpwm" "slynk"))) - #t))) + '("stumpwm" "sbcl-slynk")))))) (delete 'copy-source) (delete 'build) (delete 'check) @@ -2533,7 +2512,7 @@ productive, customizable lisp based systems.") (base32 "1g8h2vd5qsmaiz6ixlx9ykrv6a08izmkf0js18fvljvznpyhsznz")))) (build-system asdf-build-system/sbcl) (inputs - `(("stumpwm" ,stumpwm "lib"))) + (list stumpwm)) (home-page "https://github.com/stumpwm/stumpwm-contrib") (synopsis "StumpWM extra modules") (description "This package provides extra modules for StumpWM.") @@ -2578,7 +2557,7 @@ productive, customizable lisp based systems.") (sha256 (base32 "0djcrr16bx40l7b60d4j507vk5l42fdgmjpgrnk86z1ba8wlqim8")))) - (inputs (list pamixer `(,stumpwm "lib"))) + (inputs (list pamixer stumpwm)) (build-system asdf-build-system/sbcl) (arguments (list #:asd-systems ''("pamixer") @@ -2620,8 +2599,7 @@ mouse control mode for StumpWM.") (inherit stumpwm-contrib) (name "sbcl-stumpwm-ttf-fonts") (inputs - `(("stumpwm" ,stumpwm "lib") - ("clx-truetype" ,sbcl-clx-truetype))) + (list sbcl-clx-truetype stumpwm)) (arguments '(#:asd-systems '("ttf-fonts") #:tests? #f @@ -2733,9 +2711,7 @@ between windows.") (modify-phases %standard-phases (add-after 'unpack 'chdir (lambda _ (chdir "modeline/stumptray") #t))))) (inputs - `(("stumpwm" ,stumpwm "lib") - ("xembed" ,sbcl-clx-xembed) - ("alexandria" ,sbcl-alexandria))) + (list sbcl-alexandria sbcl-clx-xembed stumpwm)) (home-page "https://github.com/stumpwm/stumpwm-contrib/tree/master/modeline/stumptray") (synopsis "Modeline support for stumptray connectivity") @@ -2810,9 +2786,7 @@ layouts in StumpWM.") (add-after 'unpack 'chdir (lambda _ (chdir "modeline/disk") #t))))) (inputs - `(("stumpwm" ,stumpwm "lib") - ("cl-diskspace" ,sbcl-cl-diskspace) - ("cl-mount-info" ,sbcl-cl-mount-info))) + (list sbcl-cl-diskspace sbcl-cl-mount-info stumpwm)) (home-page "https://github.com/stumpwm/stumpwm-contrib") (synopsis "StumpWM modeline support to show disk usage") (description "StumpWM modeline support to show disk usage") @@ -2860,8 +2834,7 @@ one in Emacs.") (inherit stumpwm-contrib) (name "sbcl-stumpwm-screenshot") (inputs - `(("stumpwm" ,stumpwm "lib") - ("zpng" ,sbcl-zpng))) + (list sbcl-zpng stumpwm)) (arguments '(#:asd-systems '("screenshot") #:tests? #f @@ -2910,7 +2883,7 @@ modeline.") (list sbcl-bordeaux-threads sbcl-dbus sbcl-xml-emitter - (list stumpwm "lib"))) + stumpwm)) (arguments '(#:asd-systems '("notify") #:phases @@ -2930,8 +2903,7 @@ by default.") (name "sbcl-stumpwm-battery-portable") (build-system asdf-build-system/sbcl) (inputs - (list sbcl-cl-ppcre - (list stumpwm "lib"))) + (list sbcl-cl-ppcre stumpwm)) (arguments '(#:asd-systems '("battery-portable") #:phases |