me
/
guix
Archived
1
0
Fork 0

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

master
Efraim Flashner 2021-11-03 14:25:30 +02:00
commit 075df3d3e2
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
46 changed files with 883 additions and 596 deletions

View File

@ -1027,7 +1027,6 @@ dist_patch_DATA = \
%D%/packages/patches/elm-compiler-disable-reactor.patch \ %D%/packages/patches/elm-compiler-disable-reactor.patch \
%D%/packages/patches/elm-compiler-fix-map-key.patch \ %D%/packages/patches/elm-compiler-fix-map-key.patch \
%D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-exec-path.patch \
%D%/packages/patches/emacs-exwm-fix-fullscreen-states.patch \
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \
%D%/packages/patches/emacs-ignore-empty-xim-styles.patch \ %D%/packages/patches/emacs-ignore-empty-xim-styles.patch \
%D%/packages/patches/emacs-json-reformat-fix-tests.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \
@ -1287,7 +1286,6 @@ dist_patch_DATA = \
%D%/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch \ %D%/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch \
%D%/packages/patches/inkscape-poppler-0.76.patch \ %D%/packages/patches/inkscape-poppler-0.76.patch \
%D%/packages/patches/instead-use-games-path.patch \ %D%/packages/patches/instead-use-games-path.patch \
%D%/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch \
%D%/packages/patches/intel-xed-fix-nondeterminism.patch \ %D%/packages/patches/intel-xed-fix-nondeterminism.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/iputils-libcap-compat.patch \ %D%/packages/patches/iputils-libcap-compat.patch \

View File

@ -3985,7 +3985,7 @@ Python loading in HPC environments.")
(let ((real-name "inxi")) (let ((real-name "inxi"))
(package (package
(name "inxi-minimal") (name "inxi-minimal")
(version "3.3.07-1") (version "3.3.08-1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3994,7 +3994,7 @@ Python loading in HPC environments.")
(commit version))) (commit version)))
(file-name (git-file-name real-name version)) (file-name (git-file-name real-name version))
(sha256 (sha256
(base32 "1amf1sry7g99khp9ac8f3m4jfa8rn1jjxvrcg0j9wvv65px7zj0i")))) (base32 "0kgxyxfw4hkmp9s3nazdqqvbfb4jqwv59mnpaa7g4n63nrqjv06v"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(inputs (inputs
`(("bash" ,bash-minimal) `(("bash" ,bash-minimal)

View File

@ -4699,7 +4699,7 @@ library supports sample rates up to 96 kHz and up to eight channels (7.1
(define-public libopenshot-audio (define-public libopenshot-audio
(package (package
(name "libopenshot-audio") (name "libopenshot-audio")
(version "0.2.0") (version "0.2.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -4708,7 +4708,7 @@ library supports sample rates up to 96 kHz and up to eight channels (7.1
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"13if0m5mvlqly8gmbhschzb9papkgp3yqivklhb949dhy16m8zgf")))) "03dygh85riljk7dpn5a5a0d22a2kz45fs13gzwqgnbzzr1k17p2y"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)

View File

@ -4175,7 +4175,13 @@ c6e7d37. However, this package works only up to 128 bytes.")
#:cargo-development-inputs #:cargo-development-inputs
(("rust-criterion" ,rust-criterion-0.3) (("rust-criterion" ,rust-criterion-0.3)
("rust-rand" ,rust-rand-0.6) ("rust-rand" ,rust-rand-0.6)
("rust-structopt" ,rust-structopt-0.3)))) ("rust-structopt" ,rust-structopt-0.3))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-criterion-minor-version
(lambda* _
(substitute* "Cargo.toml"
(("0.3.2") "0.3.3")))))))
(home-page "https://github.com/marshallpierce/rust-base64") (home-page "https://github.com/marshallpierce/rust-base64")
(synopsis "Encodes and decodes base64 as bytes or utf8") (synopsis "Encodes and decodes base64 as bytes or utf8")
(description (description
@ -8182,8 +8188,29 @@ Python arrow.humanize.")
TimeZone trait for @code{rust-chrono}.") TimeZone trait for @code{rust-chrono}.")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public rust-chunked-transfer-1
(package
(name "rust-chunked-transfer")
(version "1.4.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "chunked_transfer" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0bkdlsrszfcscw3j6yhs7kj6jbp8id47jjk6h9k58px47na5gy7z"))))
(build-system cargo-build-system)
(arguments `(#:skip-build? #t))
(home-page "https://github.com/frewsxcv/rust-chunked-transfer")
(synopsis "Encoder and decoder for HTTP chunked transfer coding")
(description "This package provides an encoder and decoder for HTTP chunked
transfer coding.")
(license license:asl2.0)))
(define-public rust-chunked-transfer-0.3 (define-public rust-chunked-transfer-0.3
(package (package
(inherit rust-chunked-transfer-1)
(name "rust-chunked-transfer") (name "rust-chunked-transfer")
(version "0.3.1") (version "0.3.1")
(source (source
@ -8192,15 +8219,7 @@ TimeZone trait for @code{rust-chrono}.")
(uri (crate-uri "chunked_transfer" version)) (uri (crate-uri "chunked_transfer" version))
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 "11yghnd24w0i9p8g368c3pg7qh9nfz7kgri6pywja9pnmakj13a9")))) (base32 "11yghnd24w0i9p8g368c3pg7qh9nfz7kgri6pywja9pnmakj13a9"))))))
(build-system cargo-build-system)
(arguments `(#:skip-build? #t))
(home-page "https://github.com/frewsxcv/rust-chunked-transfer")
(synopsis "Encoder and decoder for HTTP chunked transfer coding")
(description
"This package provides an encoder and decoder for HTTP chunked transfer
coding.")
(license license:asl2.0)))
(define-public rust-ci-info-0.3 (define-public rust-ci-info-0.3
(package (package
@ -13021,8 +13040,35 @@ type.")
thread.") thread.")
(license license:mpl2.0))) (license license:mpl2.0)))
(define-public rust-deflate-0.9
(package
(name "rust-deflate")
(version "0.9.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "deflate" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0w0ww0hrq4bjnihxgbnrri4lj5c8yzg31fyzx36fd9pvvw2vz5az"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; not all test files included
#:cargo-inputs
(("rust-adler32" ,rust-adler32-1)
("rust-gzip-header" ,rust-gzip-header-0.3))
#:cargo-development-inputs
(("rust-miniz-oxide" ,rust-miniz-oxide-0.3))))
(home-page "https://github.com/image-rs/deflate-rs")
(synopsis "DEFLATE, zlib and gzip encoder written in rust")
(description "This package provides a DEFLATE, zlib and gzip encoder
written in rust.")
(license (list license:expat license:asl2.0))))
(define-public rust-deflate-0.8 (define-public rust-deflate-0.8
(package (package
(inherit rust-deflate-0.9)
(name "rust-deflate") (name "rust-deflate")
(version "0.8.6") (version "0.8.6")
(source (source
@ -13034,20 +13080,14 @@ thread.")
(sha256 (sha256
(base32 (base32
"0x6iqlayg129w63999kz97m279m0jj4x4sm6gkqlvmp73y70yxvk")))) "0x6iqlayg129w63999kz97m279m0jj4x4sm6gkqlvmp73y70yxvk"))))
(build-system cargo-build-system)
(arguments (arguments
`(#:tests? #f ; not all test files included `(#:tests? #f ; not all test files included
#:cargo-inputs #:cargo-inputs
(("rust-adler32" ,rust-adler32-1) (("rust-adler32" ,rust-adler32-1)
("rust-byteorder" ,rust-byteorder-1) ("rust-byteorder" ,rust-byteorder-1)
("rust-gzip-header" ,rust-gzip-header-0.3)) ("rust-gzip-header" ,rust-gzip-header-0.3))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-miniz-oxide" ,rust-miniz-oxide-0.3)))) (("rust-miniz-oxide" ,rust-miniz-oxide-0.3))))))
(home-page "https://github.com/image-rs/deflate-rs")
(synopsis "DEFLATE, zlib and gzip encoder written in rust")
(description
"This package provides a DEFLATE, zlib and gzip encoder written in rust.")
(license (list license:expat license:asl2.0))))
(define-public rust-deflate-0.7 (define-public rust-deflate-0.7
(package (package
@ -16654,6 +16694,28 @@ it.")
(("rust-libc" ,rust-libc-0.2) (("rust-libc" ,rust-libc-0.2)
("rust-winapi" ,rust-winapi-0.3)))))) ("rust-winapi" ,rust-winapi-0.3))))))
(define-public rust-fdlimit-0.1
(package
(name "rust-fdlimit")
(version "0.1.4")
(source
(origin
(method url-fetch)
(uri (crate-uri "fdlimit" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0g30d6gqkrwy8ylwdy7pqm443iq0p5dmnpz4ks41pirl7dclm98d"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-libc" ,rust-libc-0.2))))
(home-page "https://github.com/paritytech/fdlimit")
(synopsis "Utility crate for raising file descriptors limit")
(description "This package provides a Rust library to raise file
descriptors limit.")
(license license:asl2.0)))
(define-public rust-femme-2 (define-public rust-femme-2
(package (package
(name "rust-femme") (name "rust-femme")
@ -28322,8 +28384,50 @@ which defines a default trait implementation, and @code{trait_impl} which uses
a default trait implementation you've defined.") a default trait implementation you've defined.")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public rust-multipart-0.18
(package
(name "rust-multipart")
(version "0.18.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "multipart" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"10libwfbazqcyxcpgpcdf1a66jnzghwlmxlxnffg4rrqhqrwdph0"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-buf-redux" ,rust-buf-redux-0.8)
("rust-clippy" ,rust-clippy-0.0)
("rust-httparse" ,rust-httparse-1)
("rust-hyper" ,rust-hyper-0.10)
("rust-iron" ,rust-iron-0.6)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-log" ,rust-log-0.4)
("rust-mime" ,rust-mime-0.3)
("rust-mime-guess" ,rust-mime-guess-2)
("rust-nickel" ,rust-nickel-0.11)
("rust-quick-error" ,rust-quick-error-1)
("rust-rand" ,rust-rand-0.8)
("rust-rocket" ,rust-rocket-0.4)
("rust-safemem" ,rust-safemem-0.3)
("rust-tempfile" ,rust-tempfile-3)
("rust-tiny-http" ,rust-tiny-http-0.6)
("rust-twoway" ,rust-twoway-0.1))
#:cargo-development-inputs
(("rust-env-logger" ,rust-env-logger-0.5))))
(home-page "https://github.com/abonander/multipart")
(synopsis "Backend-agnostic extension for file uploads in HTTP libraries for Rust")
(description "This package provides a backend-agnostic extension for HTTP
libraries that provides support for POST multipart/form-data requests on both
client and server.")
(license (list license:expat license:asl2.0))))
(define-public rust-multipart-0.17 (define-public rust-multipart-0.17
(package (package
(inherit rust-multipart-0.18)
(name "rust-multipart") (name "rust-multipart")
(version "0.17.1") (version "0.17.1")
(source (source
@ -28333,7 +28437,6 @@ a default trait implementation you've defined.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 "1m3nrydgc56wjixsahipmvjgnxnw2cz7w8ryghsgahwjr3nswl6h")))) (base32 "1m3nrydgc56wjixsahipmvjgnxnw2cz7w8ryghsgahwjr3nswl6h"))))
(build-system cargo-build-system)
(arguments (arguments
`(#:skip-build? #t `(#:skip-build? #t
#:cargo-inputs #:cargo-inputs
@ -28353,15 +28456,9 @@ a default trait implementation you've defined.")
("rust-safemem" ,rust-safemem-0.3) ("rust-safemem" ,rust-safemem-0.3)
("rust-tempfile" ,rust-tempfile-3) ("rust-tempfile" ,rust-tempfile-3)
("rust-tiny-http" ,rust-tiny-http-0.6) ("rust-tiny-http" ,rust-tiny-http-0.6)
("rust-twoway" ,rust-twoway-0.1)))) ("rust-twoway" ,rust-twoway-0.1))
(home-page "https://github.com/abonander/multipart") #:cargo-development-inputs
(synopsis (("rust-env-logger" ,rust-env-logger-0.5))))))
"Backend-agnostic extension for file uploads in HTTP libraries for Rust")
(description
"This package provides a backend-agnostic extension for HTTP libraries
that provides support for POST multipart/form-data requests on both client and
server.")
(license (list license:expat license:asl2.0))))
(define-public rust-multiversion-0.6 (define-public rust-multiversion-0.6
(package (package
@ -30130,6 +30227,32 @@ with all line endings.")
"Cross-platform filesystem notification library") "Cross-platform filesystem notification library")
(license (list license:cc0 license:artistic2.0)))) (license (list license:cc0 license:artistic2.0))))
(define-public rust-noise-0.7
(package
(name "rust-noise")
(version "0.7.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "noise" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0hsbw9gpsz8w9msvyvddygagd9wj93hqpg5pxz388laxfkb1s1c2"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-image" ,rust-image-0.23)
("rust-rand" ,rust-rand-0.7)
("rust-rand-xorshift" ,rust-rand-xorshift-0.2))
#:cargo-development-inputs
(("rust-criterion" ,rust-criterion-0.3))))
(home-page "https://github.com/razaekel/noise-rs")
(synopsis "Procedural noise generation library")
(description "This package provides a Rust library to generate smoothly
varying noise for textural use and graphical display.")
(license (list license:asl2.0 license:expat))))
(define-public rust-notify-4 (define-public rust-notify-4
(package (package
(inherit rust-notify-5) (inherit rust-notify-5)
@ -31722,14 +31845,14 @@ system for OpenSSL.")
(define-public rust-openssl-sys-0.9 (define-public rust-openssl-sys-0.9
(package (package
(name "rust-openssl-sys") (name "rust-openssl-sys")
(version "0.9.64") (version "0.9.68")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (crate-uri "openssl-sys" version)) (uri (crate-uri "openssl-sys" version))
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 "1bsim2zk69q1dw6rixn48l1ci8bmz5kvbkgsks2ci079w0pzr7i0")) (base32 "0l2ikxygkza3s5q3lvng4mhisdp2vdrvzkhpwhkx8vgnscjiymqw"))
(patches (search-patches "rust-openssl-sys-no-vendor.patch")))) (patches (search-patches "rust-openssl-sys-no-vendor.patch"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
@ -50856,8 +50979,38 @@ closures after a delay or at a given timestamp.")
manipulation in Rust.") manipulation in Rust.")
(license license:expat))) (license license:expat)))
(define-public rust-tiny-http-0.8
(package
(name "rust-tiny-http")
(version "0.8.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "tiny-http" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0fcdwpb2ghk671qjjrk6048hs3yp7f681hxpr68gamk00181prcw"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-ascii" ,rust-ascii-1)
("rust-chrono" ,rust-chrono-0.4)
("rust-chunked-transfer" ,rust-chunked-transfer-1)
("rust-log" ,rust-log-0.4)
("rust-openssl" ,rust-openssl-0.10)
("rust-url" ,rust-url-2))
#:cargo-development-inputs
(("rust-fdlimit" ,rust-fdlimit-0.1)
("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
("rust-sha1" ,rust-sha1-0.6))))
(home-page "https://github.com/tiny-http/tiny-http")
(synopsis "Low level HTTP server library")
(description "This package provides a low level HTTP server library.")
(license (list license:expat license:asl2.0))))
(define-public rust-tiny-http-0.6 (define-public rust-tiny-http-0.6
(package (package
(inherit rust-tiny-http-0.8)
(name "rust-tiny-http") (name "rust-tiny-http")
(version "0.6.2") (version "0.6.2")
(source (source
@ -50867,7 +51020,6 @@ manipulation in Rust.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 "0la95daknfh8g951ddb2zdz6av2459rncp6h9dh02pf98h5glq8n")))) (base32 "0la95daknfh8g951ddb2zdz6av2459rncp6h9dh02pf98h5glq8n"))))
(build-system cargo-build-system)
(arguments (arguments
`(#:skip-build? #t `(#:skip-build? #t
#:cargo-inputs #:cargo-inputs
@ -50876,11 +51028,7 @@ manipulation in Rust.")
("rust-chunked-transfer" ,rust-chunked-transfer-0.3) ("rust-chunked-transfer" ,rust-chunked-transfer-0.3)
("rust-log" ,rust-log-0.4) ("rust-log" ,rust-log-0.4)
("rust-openssl" ,rust-openssl-0.10) ("rust-openssl" ,rust-openssl-0.10)
("rust-url" ,rust-url-1)))) ("rust-url" ,rust-url-1))))))
(home-page "https://github.com/tiny-http/tiny-http")
(synopsis "Low level HTTP server library")
(description "This package provides a low level HTTP server library.")
(license license:asl2.0)))
(define-public rust-tiny-keccak-2 (define-public rust-tiny-keccak-2
(package (package

View File

@ -150,9 +150,9 @@
("xxd" ,xxd))) ("xxd" ,xxd)))
(native-inputs `(("help2man" ,help2man) (native-inputs `(("help2man" ,help2man)
;; Below are modules used for tests. ;; Below are modules used for tests.
("binwalk" ,binwalk)
("python-pytest" ,python-pytest) ("python-pytest" ,python-pytest)
("python-chardet" ,python-chardet) ("python-chardet" ,python-chardet)
("python-binwalk" ,python-binwalk)
("python-black" ,python-black) ("python-black" ,python-black)
("python-h5py" ,python-h5py) ("python-h5py" ,python-h5py)
("python-pypdf2" ,python-pypdf2) ("python-pypdf2" ,python-pypdf2)

View File

@ -38,16 +38,16 @@
(define-public dunst (define-public dunst
(package (package
(name "dunst") (name "dunst")
(version "1.6.1") (version "1.7.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/dunst-project/dunst") (url "https://github.com/dunst-project/dunst")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0lga1kj2vjbj9g9rl93nivngjmk5fkxdxwal8w96x9whwk9jvdga")))) "0bc8f8h7qvxfx742jb8ggycw3z0il3pgln7lgkdjap2pxccyyrh5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target

View File

@ -2114,14 +2114,14 @@ incrementally confined in Isearch manner.")
(define emacs-emms-print-metadata (define emacs-emms-print-metadata
(package (package
(name "emacs-emms-print-metadata") (name "emacs-emms-print-metadata")
(version "7.7") (version "7.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"emms-" version ".tar")) "emms-" version ".tar"))
(sha256 (sha256
(base32 "0n9nx4wgjxkr8nsxcq8svg0x0qkqj7bsd2j0ihy4jzj29xmyxl0h")))) (base32 "1nlb9rrdlbcqghph30r9i9m1brbdha818czbms0zhzdisxb0smi0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags '("emms-print-metadata") `(#:make-flags '("emms-print-metadata")
@ -2514,8 +2514,8 @@ configuration language. It features:
(define-public emacs-link-hint (define-public emacs-link-hint
;; Last release was in 2015. ;; Last release was in 2015.
(let ((commit "9fbf196d155016d9b8471a99318ed67a086cf257") (let ((commit "83cd0489b16f013647d0507ef20905a0a91db433")
(revision "3")) (revision "4"))
(package (package
(name "emacs-link-hint") (name "emacs-link-hint")
(version (git-version "0.1" revision commit)) (version (git-version "0.1" revision commit))
@ -2528,7 +2528,7 @@ configuration language. It features:
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0v2g9gzf2v88ag59q1pf5vhd4qjnz3g4i6gzl27k6fi7pvlxdn39")))) "0kwaia6i0asr7yqcw1anzq6lf93357cc1fphkvp0llbmxizmkzb3"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-avy" ,emacs-avy))) `(("emacs-avy" ,emacs-avy)))
@ -3794,7 +3794,7 @@ a command.")
(define-public emacs-olivetti (define-public emacs-olivetti
(package (package
(name "emacs-olivetti") (name "emacs-olivetti")
(version "2.0.3") (version "2.0.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3803,7 +3803,7 @@ a command.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0qhv4ah9bn1mjvivgxp7z1gf91d0cdr2ma5cy5xaja97ispa4l3z")))) (base32 "0wc0rki4zvzdxs126g5c8d92h1vfn9slfkdx831rr9d0jx93wc7s"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/rnkn/olivetti") (home-page "https://github.com/rnkn/olivetti")
(synopsis "Emacs minor mode for a nice writing environment") (synopsis "Emacs minor mode for a nice writing environment")
@ -4330,17 +4330,16 @@ Expectations, but it can be used in other contexts.")
(define-public emacs-ecukes (define-public emacs-ecukes
(package (package
(name "emacs-ecukes") (name "emacs-ecukes")
(version "0.6.17") (version "0.6.18")
(home-page "https://github.com/ecukes/ecukes")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url home-page) (url "https://github.com/ecukes/ecukes")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1isscwz4h3nx62lwfrj899lp2yc27zk1ndgr441d848495ccmshn")))) (base32 "182qgddfv8nd89y1l55rs5vm5i61ayc8cxbplb8zx0alnid9xrw1"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:include (cons* "^feature/" "^reporters/" "^templates/" %default-include))) `(#:include (cons* "^feature/" "^reporters/" "^templates/" %default-include)))
@ -4351,6 +4350,7 @@ Expectations, but it can be used in other contexts.")
("emacs-espuds" ,emacs-espuds) ("emacs-espuds" ,emacs-espuds)
("emacs-f" ,emacs-f) ("emacs-f" ,emacs-f)
("emacs-s" ,emacs-s))) ("emacs-s" ,emacs-s)))
(home-page "https://github.com/ecukes/ecukes")
(synopsis "Cucumber for Emacs") (synopsis "Cucumber for Emacs")
(description (description
"This package provides Ecukes, a Cucumber-inspired integration testing "This package provides Ecukes, a Cucumber-inspired integration testing
@ -8203,40 +8203,43 @@ them easier to distinguish from other, less important buffers.")
(license license:expat))) (license license:expat)))
(define-public emacs-embark (define-public emacs-embark
(package ;; XXX: Upstream did not tag last release. Commit hash below matches
(name "emacs-embark") ;; version bump.
(version "0.12") (let ((commit "bc3e4654329563ab28a96003610634c3a5e5a484"))
(source (package
(origin (name "emacs-embark")
(method git-fetch) (version "0.13")
(uri (git-reference (source
(url "https://github.com/oantolin/embark") (origin
(commit version))) (method git-fetch)
(sha256 (uri (git-reference
(base32 "16z7g6ynj4d64wsg49skhwypn5j6awlpsawbz61djsmpzlzjnv36")) (url "https://github.com/oantolin/embark")
(file-name (git-file-name name version)))) (commit commit)))
(build-system emacs-build-system) (sha256
(propagated-inputs (base32 "1x6m6gc32z7kv9nkr8mwhi9mimbwhd37qyxpwj33hml9ygi8s7r6"))
`(("emacs-avy" ,emacs-avy) (file-name (git-file-name name version))))
("emacs-consult" ,emacs-consult))) (build-system emacs-build-system)
(home-page "https://github.com/oantolin/embark") (propagated-inputs
(synopsis "Emacs mini-buffer actions rooted in keymaps") `(("emacs-avy" ,emacs-avy)
(description ("emacs-consult" ,emacs-consult)))
"This package provides a sort of right-click contextual menu for Emacs (home-page "https://github.com/oantolin/embark")
(synopsis "Emacs mini-buffer actions rooted in keymaps")
(description
"This package provides a sort of right-click contextual menu for Emacs
offering you relevant @emph{actions} to use on a @emph{target} determined by offering you relevant @emph{actions} to use on a @emph{target} determined by
the context. the context.
In the minibuffer, the target is the current best completion candidate. In In the minibuffer, the target is the current best completion candidate. In
the @code{*Completions*} buffer the target is the completion at point. the @code{*Completions*} buffer the target is the completion at point. In
n a regular buffer, the target is the region if active, or else the file, a regular buffer, the target is the region if active, or else the file, symbol
symbol or URL at point. or URL at point.
The type of actions offered depend on the type of the target. For files you The type of actions offered depend on the type of the target. For files you
get offered actions like deleting, copying, renaming, visiting in another get offered actions like deleting, copying, renaming, visiting in another
window, running a shell command on the file, etc. For buffers the actions window, running a shell command on the file, etc. For buffers the actions
include switching to or killing the buffer. For package names the actions include switching to or killing the buffer. For package names the actions
include installing, removing or visiting the homepage.") include installing, removing or visiting the homepage.")
(license license:gpl3+))) (license license:gpl3+))))
(define-public emacs-prescient (define-public emacs-prescient
(package (package
@ -12295,8 +12298,12 @@ programming and reproducible research.")
;; XXX: ob-sclang.el is packaged separately to avoid the dependency on ;; XXX: ob-sclang.el is packaged separately to avoid the dependency on
;; SuperCollider and qtwebengine. This will be unnecessary in 0.4+ ;; SuperCollider and qtwebengine. This will be unnecessary in 0.4+
;; release as the file is going to be removed from the repository. ;; release as the file is going to be removed from the repository.
;; XXX: org-contacts.el is now maintained in a separate repository and
;; will soon be removed from org-contrib
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet '(begin (delete-file "lisp/ob-sclang.el"))))) (snippet '(begin (delete-file "lisp/ob-sclang.el")
(delete-file "lisp/org-contacts.el")))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -12316,6 +12323,30 @@ receive little if no maintainance and there is no guaranty that they are
compatible with the Org stable version.") compatible with the Org stable version.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-org-contacts
;;; XXX: Upstream made no release yet.
(let ((commit "3d2f39f62aefb0a32d10607703e8b1d4f43821fa")
(revision "0"))
(package
(name "emacs-org-contacts")
(version (git-version "0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/stardiviner/org-contacts.el")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0a654406w8zd1hbp8ckc975jhl9mi14xzqizzwiki625dymiw5g5"))))
(build-system emacs-build-system)
(home-page "https://github.com/stardiviner/org-contacts.el")
(synopsis "Contacts management system for Org mode")
(description "Manage your contacts from Org mode. You can auto
complete email addresses, export contacts to a vCard file, put birthdays
in your Org Agenda, and more.")
(license license:gpl3+))))
(define-public emacs-org-pretty-table (define-public emacs-org-pretty-table
;; There is no release yet. ;; There is no release yet.
(let ((commit "1331c600b83d95b28730b1bfcb48369ac1cf12ef") (let ((commit "1331c600b83d95b28730b1bfcb48369ac1cf12ef")
@ -14046,7 +14077,7 @@ It should enable you to implement low-level X11 applications.")
(define-public emacs-exwm (define-public emacs-exwm
(package (package
(name "emacs-exwm") (name "emacs-exwm")
(version "0.24") (version "0.25")
(synopsis "Emacs X window manager") (synopsis "Emacs X window manager")
(source (source
(origin (origin
@ -14054,12 +14085,7 @@ It should enable you to implement low-level X11 applications.")
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"exwm-" version ".tar")) "exwm-" version ".tar"))
(sha256 (sha256
(base32 "0lj1a3cmbpf4h6x8k6x8cdm1qb51ca6filydnvi5zcda8zpl060s")) (base32 "0imd4v9ccvpsskmfnycz5fgabsvdjp1msg5v8rc7x0v26r3kr4x7"))))
(patches
;; Patch fixing fullscreen view. Applied upstream as
;; edb930005b0ba83051ca8a59b493e9a3c8ef580a. It can be removed in
;; next release.
(search-patches "emacs-exwm-fix-fullscreen-states.patch"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-xelb" ,emacs-xelb))) `(("emacs-xelb" ,emacs-xelb)))
@ -18951,7 +18977,7 @@ powerful Org contents.")
(define-public emacs-org-re-reveal (define-public emacs-org-re-reveal
(package (package
(name "emacs-org-re-reveal") (name "emacs-org-re-reveal")
(version "3.12.3") (version "3.12.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -18960,7 +18986,7 @@ powerful Org contents.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "08ai87b6nybg0l7y8falb53wwvdv8hr3jzj5q995x48ylw6r1582")))) (base32 "0j7394zcbzqfk33g2xdyb3fmw3brxy8v66vvf1j9nqlskfddh7bn"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-htmlize" ,emacs-htmlize) `(("emacs-htmlize" ,emacs-htmlize)
@ -21684,7 +21710,7 @@ docstring of the thing at point.")
(define-public emacs-rust-mode (define-public emacs-rust-mode
(package (package
(name "emacs-rust-mode") (name "emacs-rust-mode")
(version "1.0.0") (version "1.0.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -21693,7 +21719,7 @@ docstring of the thing at point.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "08gz7wq1las3bqqs8qhmhmncax4j6kjnyxpfzslby3b1dkclc7ig")))) (base32 "1chb3a97cwf1pkxn8cm3wc35gfh9k55l7khg7pklmx36isr3csjv"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:tests? #false ;FIXME: phase fail with status 127 `(#:tests? #false ;FIXME: phase fail with status 127
@ -21706,45 +21732,42 @@ source code.")
license:asl2.0)))) license:asl2.0))))
(define-public emacs-rustic (define-public emacs-rustic
;; XXX: Upstream does not tag releases. Version is extracted from main (package
;; file. (name "emacs-rustic")
(let ((commit "bbf129cd128105de51b6c242b2551094b8d8987d") (version "2.0")
(revision "0")) (source
(package (origin
(name "emacs-rustic") (method git-fetch)
(version (git-version "1.3" revision commit)) (uri (git-reference
(source (url "https://github.com/brotzeit/rustic")
(origin (commit version)))
(method git-fetch) (file-name (git-file-name name version))
(uri (git-reference (sha256
(url "https://github.com/brotzeit/rustic") (base32 "1x06lp0c656zm07n28lnkqp678y4f9zkd9n5m0lramndllrpk3x2"))))
(commit commit))) (build-system emacs-build-system)
(file-name (git-file-name name version)) (propagated-inputs
(sha256 `(("emacs-dash" ,emacs-dash)
(base32 "09dnlvi8kf683n6q3yp4gy9d4idiyg4x6rcij8d90cvygh8i30wd")))) ("emacs-f" ,emacs-f)
(build-system emacs-build-system) ("emacs-flycheck" ,emacs-flycheck)
(propagated-inputs ("emacs-lsp-mode" ,emacs-lsp-mode)
`(("emacs-dash" ,emacs-dash) ("emacs-markdown-mode" ,emacs-markdown-mode)
("emacs-f" ,emacs-f) ("emacs-project" ,emacs-project)
("emacs-flycheck" ,emacs-flycheck) ("emacs-rust-mode" ,emacs-rust-mode)
("emacs-lsp-mode" ,emacs-lsp-mode) ("emacs-s" ,emacs-s)
("emacs-markdown-mode" ,emacs-markdown-mode) ("emacs-spinner" ,emacs-spinner)
("emacs-project" ,emacs-project) ("emacs-xterm-color" ,emacs-xterm-color)))
("emacs-s" ,emacs-s) (arguments
("emacs-spinner" ,emacs-spinner) ;; Tests require rust, cargo, rustfmt, and various crates to be
("emacs-xterm-color" ,emacs-xterm-color))) ;; vendored.
(arguments `(#:tests? #f
;; Tests require rust, cargo, rustfmt, and various crates to be #:phases
;; vendored. (modify-phases %standard-phases
`(#:tests? #f (add-before 'check 'set-without-cask
#:phases (lambda _
(modify-phases %standard-phases (setenv "WITHOUT_CASK" "1"))))))
(add-before 'check 'set-without-cask (home-page "https://github.com/brotzeit/rustic")
(lambda _ (synopsis "Rust development environment for Emacs")
(setenv "WITHOUT_CASK" "1")))))) (description "Rustic is a fork of Rust mode.
(home-page "https://github.com/brotzeit/rustic")
(synopsis "Rust development environment for Emacs")
(description "Rustic is a fork of Rust mode.
In addition to its predecessor, it offers the following features: In addition to its predecessor, it offers the following features:
@itemize @itemize
@item Flycheck integration, @item Flycheck integration,
@ -21758,8 +21781,8 @@ In addition to its predecessor, it offers the following features:
@item optional Rust inline documentation, @item optional Rust inline documentation,
@item etc. @item etc.
@end itemize") @end itemize")
(license (list license:expat (license (list license:expat
license:asl2.0))))) license:asl2.0))))
(define-public emacs-ztree (define-public emacs-ztree
;; Upstream provides no tag, but the commit below matches latest release. ;; Upstream provides no tag, but the commit below matches latest release.
@ -23810,7 +23833,7 @@ processes for Emacs")
(define-public emacs-treemacs (define-public emacs-treemacs
(package (package
(name "emacs-treemacs") (name "emacs-treemacs")
(version "2.9.4") (version "2.9.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -23819,7 +23842,7 @@ processes for Emacs")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1g2fy2qkscqx01av92hpjbr6qld8s1gk59cdjbff8fm0vlx8xk2p")))) (base32 "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-ace-window" ,emacs-ace-window) `(("emacs-ace-window" ,emacs-ace-window)
@ -24161,16 +24184,16 @@ as Emacs Lisp.")
(define-public emacs-transient (define-public emacs-transient
(package (package
(name "emacs-transient") (name "emacs-transient")
(version "0.3.6") (version "0.3.7")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://github.com/magit/transient") (uri (git-reference
(commit (string-append "v" version)))) (url "https://github.com/magit/transient")
(file-name (git-file-name name version)) (commit (string-append "v" version))))
(sha256 (file-name (git-file-name name version))
(base32 (sha256
"10k9dzs8y6i0rfckclxm5n3maylmh95993n5dvrs8rbmlcpmihvy")))) (base32 "0c7wbd0j0b802bzdpdkrx2q7wm7b9s56rk554dnadkpywhmdiqwn"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:tests? #f ;no test suite `(#:tests? #f ;no test suite
@ -25308,14 +25331,14 @@ well as an option for visually flashing evaluated s-expressions.")
(define-public emacs-tramp (define-public emacs-tramp
(package (package
(name "emacs-tramp") (name "emacs-tramp")
(version "2.5.1.3") (version "2.5.1.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"tramp-" version ".tar")) "tramp-" version ".tar"))
(sha256 (sha256
(base32 "1qcwdavfrbw8yyfy5rbzbcfyqavqbz13jncahkqlgwbkqvmgh7y5")))) (base32 "0mk9r9hj43klah7mwldg4bw7fxcqvrbwv1gj6g90zdfsflqy7nh9"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:emacs ,emacs ;need D-Bus `(#:emacs ,emacs ;need D-Bus
@ -28732,7 +28755,7 @@ and Emacs lisp commands.")
(define-public emacs-extmap (define-public emacs-extmap
(package (package
(name "emacs-extmap") (name "emacs-extmap")
(version "1.2") (version "1.2.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -28741,11 +28764,11 @@ and Emacs lisp commands.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0dl630jl46jz5slpv28l8b745051ghp0g296x5180vl5v88v3hsl")))) (base32 "00415w4l9wfpw9v0a35dm1av2w1m6s36yr9f9286jg844x6l375f"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/doublep/extmap") (home-page "https://github.com/doublep/extmap")
(synopsis "Externally-stored constant mapping for Emacs Lisp") (synopsis "Externally-stored constant mapping for Emacs Lisp")
(description "A very simple package that lets you build a (description "Extmap is a very simple package that lets you build a
read-only, constant database that maps Emacs Lisp symbols to read-only, constant database that maps Emacs Lisp symbols to
arbitrary Emacs Lisp objects.") arbitrary Emacs Lisp objects.")
(license license:gpl3+))) (license license:gpl3+)))
@ -28873,6 +28896,26 @@ web feed files and correctly parse and format the elements to be
displayed for sharing.") displayed for sharing.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-orglink
(package
(name "emacs-orglink")
(version "1.1.6")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tarsius/orglink")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0ipy1p2cr5i0465hchqazmgn9jrgwzbyrb3prfgkl7z2m1gd7fcg"))))
(build-system emacs-build-system)
(home-page "https://github.com/tarsius/orglink")
(synopsis "Use Org mode links in other modes")
(description "This library implements support for some Org mode link types
in other major modes. Links can be opened and edited like in Org mode.")
(license license:gpl3+)))
(define-public emacs-scpaste (define-public emacs-scpaste
(let ((commit "cd4fa0aafecd839736e0b6cba68b4fc4d7045472") (let ((commit "cd4fa0aafecd839736e0b6cba68b4fc4d7045472")
(revision "0")) (revision "0"))

View File

@ -7502,7 +7502,7 @@ Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom.")
(define-public odamex (define-public odamex
(package (package
(name "odamex") (name "odamex")
(version "0.9.3") (version "0.9.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -7510,7 +7510,7 @@ Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom.")
"mirror://sourceforge/odamex/Odamex/" version "/" "mirror://sourceforge/odamex/Odamex/" version "/"
"odamex-src-" version ".tar.bz2")) "odamex-src-" version ".tar.bz2"))
(sha256 (sha256
(base32 "0vmw9ijb6n4wrxjxixakn7l6a6carnvs9wbbzb4vcq1brbzyrb0p")))) (base32 "1x0c9vnwn336inkfamh4na8xjyfjmzfxfn49j4snqymkypjqw6jq"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments `(#:tests? #f)) ; no tests (arguments `(#:tests? #f)) ; no tests
(native-inputs (native-inputs
@ -8022,6 +8022,65 @@ ncurses for text display.")
(home-page "http://frotz.sourceforge.net") (home-page "http://frotz.sourceforge.net")
(license license:gpl2+))) (license license:gpl2+)))
(define-public naev
(package
(name "naev")
(version "0.8.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/naev/naev")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "02rk2fv2nhx5xsi0cariisamab3dpncwps4q3i3ki0y27xpwxzfx"))))
(build-system meson-build-system)
(arguments
;; XXX: Do not add debugging symbols, which cause the build to fail.
`(#:configure-flags (list "--buildtype=release")
#:tests? #f)) ;sole test fails with a missing "/dev/dri" error
(native-inputs
`(("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)))
(inputs
`(("freetype" ,freetype)
("glpk" ,glpk)
("libpng" ,libpng)
("libvorbis" ,libvorbis)
("libwebp" ,libwebp)
("libxml2" ,libxml2)
("luajit" ,luajit)
("openal" ,openal)
("openblas" ,openblas)
("physfs" ,physfs)
("sdl" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer)))
("suitesparse" ,suitesparse)))
(home-page "https://naev.org/")
(synopsis "Game about space exploration, trade and combat")
(description
"Naev is a 2d action/rpg space game that combines elements from
the action, RPG and simulation genres. You pilot a spaceship from
a top-down perspective, and are more or less free to do what you want.
As the genre name implies, youre able to trade and engage in combat
at will. Beyond that, theres an ever-growing number of story-line
missions, equipment, and ships; even the galaxy itself grows larger
with each release. For the literacy-inclined, there are large amounts
of lore accompanying everything from planets to equipment.")
(license (list license:gpl3
license:public-domain
license:expat ;edtaa3func.c
license:bsd-2 ;distance_field.c
license:bsd-3 ;perlin.c
;; Assets.
license:silofl1.1
license:gpl2+
license:cc0
license:cc-by3.0
license:cc-by-sa3.0
license:cc-by4.0
license:cc-by-sa4.0))))
(define-public frotz-dumb-terminal (define-public frotz-dumb-terminal
(package (package
(name "frotz-dumb-terminal") (name "frotz-dumb-terminal")

View File

@ -710,8 +710,8 @@ in C/C++.")
;; XXXX: Workaround 'snippet' limitations. ;; XXXX: Workaround 'snippet' limitations.
(define computed-origin-method (@@ (guix packages) computed-origin-method)) (define computed-origin-method (@@ (guix packages) computed-origin-method))
(define %icecat-version "91.2.0-guix0-preview1") (define %icecat-version "91.3.0-guix0-preview1")
(define %icecat-build-id "20211006000000") ;must be of the form YYYYMMDDhhmmss (define %icecat-build-id "20211102000000") ;must be of the form YYYYMMDDhhmmss
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@ -733,11 +733,11 @@ in C/C++.")
"firefox-" upstream-firefox-version ".source.tar.xz")) "firefox-" upstream-firefox-version ".source.tar.xz"))
(sha256 (sha256
(base32 (base32
"1hs2bvzl0d4kfir3gq997kwxm90ygapqn6xlw47cihnh479wzwry")))) "0v79c435vfbhsx7pqyq4jm5rv8iysig69wwqhvys1n0jy54m72qj"))))
(upstream-icecat-base-version "91.2.0") ; maybe older than base-version (upstream-icecat-base-version "91.3.0") ; maybe older than base-version
;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version))
(gnuzilla-commit "1537880dac3087d3779543303f0df83432831166") (gnuzilla-commit "32631cac00953abbac61dc7ab1a0eafbdd59b53a")
(gnuzilla-source (gnuzilla-source
(origin (origin
(method git-fetch) (method git-fetch)
@ -749,7 +749,7 @@ in C/C++.")
(string-take gnuzilla-commit 8))) (string-take gnuzilla-commit 8)))
(sha256 (sha256
(base32 (base32
"16r42hp05qmiifw8ym89328w5b4flp3hngpjwbrzgq23q1qmixa9")))) "13ckga49h5azf0c6q3c6b6wcmahzyywryxgwmwr1dahsjgy0wwrw"))))
;; 'search-patch' returns either a valid file name or #f, so wrap it ;; 'search-patch' returns either a valid file name or #f, so wrap it
;; in 'assume-valid-file-name' to avoid 'local-file' warnings. ;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
@ -1158,6 +1158,7 @@ in C/C++.")
"/share/mime") "/share/mime")
,(string-append (assoc-ref inputs "font-dejavu") ,(string-append (assoc-ref inputs "font-dejavu")
"/share/fonts") "/share/fonts")
"/run/current-system/profile/share/fonts"
,@(append-map runpaths-of-input ,@(append-map runpaths-of-input
'("mesa" "ffmpeg")))))) '("mesa" "ffmpeg"))))))
(whitelist-string (string-join whitelist ",")) (whitelist-string (string-join whitelist ","))

View File

@ -932,14 +932,14 @@ basic geometries.")
(define-public pstoedit (define-public pstoedit
(package (package
(name "pstoedit") (name "pstoedit")
(version "3.75") (version "3.77")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/pstoedit/pstoedit/" (uri (string-append "mirror://sourceforge/pstoedit/pstoedit/"
version "/pstoedit-" version ".tar.gz")) version "/pstoedit-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1kv46g2wsvsvcngkavxl5gnw3l6g5xqnh4kmyx4b39a01d8xiddp")))) "02av76j75g5sq3bg353yl6dlllda9ihmmk4c8hvgiscix816nv4s"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

View File

@ -3145,6 +3145,16 @@ list of components. This module takes care of that for you.")
(ice-9 rdelim)) (ice-9 rdelim))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'remove-dotted-circle-from-combining-character
;; The test/string.scm files contain ◌̀, which is a dotted circle
;; (U+25cc) followed by an upper combining character (U+0300). The
;; old guile 3.0.2 reader incorrectly ignores the dotted circle,
;; and parses it as the combining character alone, but the new
;; guile reader does not.
;; See https://github.com/spk121/guile-gi/issues/112
(lambda* _
(substitute* "test/string.scm"
(("#\\\\◌̀") "#\\x0300"))))
(add-after 'unpack 'patch-references-to-extension (add-after 'unpack 'patch-references-to-extension
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((effective (read-line (let ((effective (read-line

View File

@ -1208,7 +1208,7 @@ environment.")
(define-public ghc-tasty-silver (define-public ghc-tasty-silver
(package (package
(name "ghc-tasty-silver") (name "ghc-tasty-silver")
(version "3.2.2") (version "3.2.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1217,7 +1217,7 @@ environment.")
version version
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 "0zsl6nna8ir215qyxhyh2czx4i16hzw1n1m8jw8ym02j6sp6iz13")))) (base32 "0nvh2k8iqqkanmp7lpwd3asimyarzisly8wavbdahcxryn0j4xb7"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-ansi-terminal" ,ghc-ansi-terminal) `(("ghc-ansi-terminal" ,ghc-ansi-terminal)
@ -1225,13 +1225,13 @@ environment.")
("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-optparse-applicative" ,ghc-optparse-applicative)
("ghc-process-extras" ,ghc-process-extras) ("ghc-process-extras" ,ghc-process-extras)
("ghc-regex-tdfa" ,ghc-regex-tdfa) ("ghc-regex-tdfa" ,ghc-regex-tdfa)
("ghc-semigroups" ,ghc-semigroups)
("ghc-tagged" ,ghc-tagged) ("ghc-tagged" ,ghc-tagged)
("ghc-tasty" ,ghc-tasty) ("ghc-tasty" ,ghc-tasty)
("ghc-temporary" ,ghc-temporary))) ("ghc-temporary" ,ghc-temporary)))
(native-inputs `(("ghc-tasty-hunit" ,ghc-tasty-hunit))) (native-inputs
(arguments `(("ghc-tasty-hunit" ,ghc-tasty-hunit)
`(#:cabal-revision ("ghc-silently" ,ghc-silently)))
("1" "0mgdk77xz38zc46qbxvss6vnp4yk328zbpw1l0c1n0f5gyf6sbav")))
(home-page "https://github.com/phile314/tasty-silver") (home-page "https://github.com/phile314/tasty-silver")
(synopsis "Fancy test runner, including support for golden tests") (synopsis "Fancy test runner, including support for golden tests")
(description (description

View File

@ -201,7 +201,7 @@ that hides the C implementation.")
(define-public ghc-cryptohash-md5 (define-public ghc-cryptohash-md5
(package (package
(name "ghc-cryptohash-md5") (name "ghc-cryptohash-md5")
(version "0.11.100.1") (version "0.11.101.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -210,17 +210,13 @@ that hides the C implementation.")
"cryptohash-md5-" version ".tar.gz")) "cryptohash-md5-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1y8q7s2bn4gdknw1wjikdnar2b5pgz3nv3220lxrlgpsf23x82vi")))) "018g13hkmq5782i24b4518hcd926fl6x6fh5hd7b9wlxwc5dn21v"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments
`(#:cabal-revision
("6" "191nvffcrlyvr5dq99bbdxxl2qx44bla9adkhklyknf7ipqdd4yj")
#:tests? #f)) ; tests require old version of ghc-hunit (0.9)
(native-inputs `(("ghc-base16-bytestring" ,ghc-base16-bytestring) (native-inputs `(("ghc-base16-bytestring" ,ghc-base16-bytestring)
("ghc-puremd5" ,ghc-puremd5) ("ghc-puremd5" ,ghc-puremd5)
("ghc-tasty" ,ghc-tasty) ("ghc-tasty" ,ghc-tasty)
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) ("ghc-tasty-hunit" ,ghc-tasty-hunit)
("ghc-hunit" ,ghc-hunit))) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)))
(home-page "https://github.com/hvr/cryptohash-md5") (home-page "https://github.com/hvr/cryptohash-md5")
(synopsis "MD5 implementation for Haskell") (synopsis "MD5 implementation for Haskell")
(description "This Haskell package provides implementation of MD5.") (description "This Haskell package provides implementation of MD5.")
@ -263,7 +259,7 @@ the C implementation.")
(define-public ghc-cryptohash-sha256 (define-public ghc-cryptohash-sha256
(package (package
(name "ghc-cryptohash-sha256") (name "ghc-cryptohash-sha256")
(version "0.11.102.0") (version "0.11.102.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -272,7 +268,7 @@ the C implementation.")
"cryptohash-sha256-" version ".tar.gz")) "cryptohash-sha256-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0685s4hfighzywvvn05cfff5bl2xz3wq0pfncv6zca4iba3ykmla")))) "1xkb7iqplbw4fy1122p79xf1zcb7k44rl0wmfj1q06l7cdqxr9vk"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments (arguments
`(#:cabal-revision `(#:cabal-revision
@ -409,7 +405,7 @@ Mail} (PEM) format.")
(define-public ghc-puremd5 (define-public ghc-puremd5
(package (package
(name "ghc-puremd5") (name "ghc-puremd5")
(version "2.1.3") (version "2.1.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -418,7 +414,7 @@ Mail} (PEM) format.")
"pureMD5-" version ".tar.gz")) "pureMD5-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0zdilz41cla2ck7mcw1a9702gyg2abq94mqahr4vci9sbs53bwxy")))) "0qwkvxwi9wh6knn69rg2hvc8ngmv1if77kmpcnp0xqr0l30fwavq"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs `(("ghc-cereal" ,ghc-cereal) (inputs `(("ghc-cereal" ,ghc-cereal)
("ghc-crypto-api" ,ghc-crypto-api) ("ghc-crypto-api" ,ghc-crypto-api)
@ -784,7 +780,7 @@ extensions.")
(define-public ghc-hsopenssl (define-public ghc-hsopenssl
(package (package
(name "ghc-hsopenssl") (name "ghc-hsopenssl")
(version "0.11.7.1") (version "0.11.7.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -792,7 +788,7 @@ extensions.")
"HsOpenSSL/HsOpenSSL-" version ".tar.gz")) "HsOpenSSL/HsOpenSSL-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1vkcs0crifjpgr1rxkbzkwyhl4zg84m5bfxkp095mgry557gqzm8")))) "0ysdfl8ck3nzhx597fa13dqf31jq5gzwajlak6r91jajks9w0dl5"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments (arguments
`(#:extra-directories ("openssl"))) `(#:extra-directories ("openssl")))

View File

@ -539,7 +539,7 @@ communication between web applications and web servers.")
(define-public ghc-wai-extra (define-public ghc-wai-extra
(package (package
(name "ghc-wai-extra") (name "ghc-wai-extra")
(version "3.1.6") (version "3.1.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -549,35 +549,32 @@ communication between web applications and web servers.")
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"03bbhmy8dc2ivhgbsrc39wk5kb9ci4p98pb2qcq2w92imy710cj6")))) "1avf7bjcsbs8l6klp5kkd0cd2dc5n0j0a2yf8813pnwfn5b7qyd4"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-ansi-terminal" ,ghc-ansi-terminal) `(("ghc-ansi-terminal" ,ghc-ansi-terminal)
("ghc-base64-bytestring" ,ghc-base64-bytestring) ("ghc-base64-bytestring" ,ghc-base64-bytestring)
("ghc-call-stack" ,ghc-call-stack)
("ghc-cookie" ,ghc-cookie) ("ghc-cookie" ,ghc-cookie)
("ghc-network" ,ghc-network) ("ghc-network" ,ghc-network)
("ghc-lifted-base" ,ghc-lifted-base)
("ghc-streaming-commons" ,ghc-streaming-commons) ("ghc-streaming-commons" ,ghc-streaming-commons)
("ghc-stringsearch" ,ghc-stringsearch)
("ghc-resourcet" ,ghc-resourcet) ("ghc-resourcet" ,ghc-resourcet)
("ghc-fast-logger" ,ghc-fast-logger) ("ghc-fast-logger" ,ghc-fast-logger)
("ghc-wai-logger" ,ghc-wai-logger) ("ghc-wai-logger" ,ghc-wai-logger)
("ghc-zlib" ,ghc-zlib)
("ghc-word8" ,ghc-word8) ("ghc-word8" ,ghc-word8)
("ghc-iproute" ,ghc-iproute) ("ghc-iproute" ,ghc-iproute)
("ghc-void" ,ghc-void)
("ghc-wai" ,ghc-wai) ("ghc-wai" ,ghc-wai)
("ghc-http-types" ,ghc-http-types) ("ghc-http-types" ,ghc-http-types)
("ghc-http2" ,ghc-http2) ("ghc-http2" ,ghc-http2)
("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-data-default-class" ,ghc-data-default-class) ("ghc-data-default-class" ,ghc-data-default-class)
("ghc-unix-compat" ,ghc-unix-compat)
("ghc-vault" ,ghc-vault) ("ghc-vault" ,ghc-vault)
("ghc-aeson" ,ghc-aeson))) ("ghc-aeson" ,ghc-aeson)))
(native-inputs (native-inputs
`(("hspec-discover" ,hspec-discover) `(("hspec-discover" ,hspec-discover)
("ghc-hspec" ,ghc-hspec) ("ghc-hspec" ,ghc-hspec)
("ghc-hunit" ,ghc-hunit))) ("ghc-hunit" ,ghc-hunit)
("ghc-zlib" ,ghc-zlib)))
(home-page "https://github.com/yesodweb/wai") (home-page "https://github.com/yesodweb/wai")
(synopsis "Some basic WAI handlers and middleware") (synopsis "Some basic WAI handlers and middleware")
(description "This library provides basic WAI handlers and middleware (description "This library provides basic WAI handlers and middleware
@ -724,7 +721,7 @@ limitation, automatic pruning, energy saving and replay resistance.")
(define-public ghc-warp-tls (define-public ghc-warp-tls
(package (package
(name "ghc-warp-tls") (name "ghc-warp-tls")
(version "3.3.1") (version "3.3.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -733,7 +730,7 @@ limitation, automatic pruning, energy saving and replay resistance.")
"warp-tls-" version ".tar.gz")) "warp-tls-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1k8f3r0l36mgwm69fikprv6pyjzj15702kq25dr9nc3sv5lcs162")))) "0b9viw26ymzq4q8snfddz3w59sqcf5ankxnw6f99iacxjhk6zs6m"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-cryptonite" ,ghc-cryptonite) `(("ghc-cryptonite" ,ghc-cryptonite)
@ -742,6 +739,7 @@ limitation, automatic pruning, energy saving and replay resistance.")
("ghc-streaming-commons" ,ghc-streaming-commons) ("ghc-streaming-commons" ,ghc-streaming-commons)
("ghc-tls" ,ghc-tls) ("ghc-tls" ,ghc-tls)
("ghc-tls-session-manager" ,ghc-tls-session-manager) ("ghc-tls-session-manager" ,ghc-tls-session-manager)
("ghc-unliftio" ,ghc-unliftio)
("ghc-wai" ,ghc-wai) ("ghc-wai" ,ghc-wai)
("ghc-warp" ,ghc-warp))) ("ghc-warp" ,ghc-warp)))
(home-page "https://github.com/yesodweb/wai") (home-page "https://github.com/yesodweb/wai")
@ -1057,7 +1055,7 @@ naming: in Greek mythology, Aeson was the father of Jason.)")
(define-public ghc-aeson-pretty (define-public ghc-aeson-pretty
(package (package
(name "ghc-aeson-pretty") (name "ghc-aeson-pretty")
(version "0.8.8") (version "0.8.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1065,7 +1063,7 @@ naming: in Greek mythology, Aeson was the father of Jason.)")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"09n7gs91y1fbw6gjszrd2na3isnvk3y5rsi90lzjrwywnqfadkl1")))) "021az9az6xik9c9s3rnar5fr1lgy2h3igibf5ixnc7ps3m2lzg2x"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-aeson" ,ghc-aeson) `(("ghc-aeson" ,ghc-aeson)
@ -1090,14 +1088,14 @@ essentially the opposite of pretty-printing.")
(define-public ghc-aeson-qq (define-public ghc-aeson-qq
(package (package
(name "ghc-aeson-qq") (name "ghc-aeson-qq")
(version "0.8.3") (version "0.8.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/" (uri (string-append "https://hackage.haskell.org/package/"
"aeson-qq/aeson-qq-" version ".tar.gz")) "aeson-qq/aeson-qq-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"10plwzz05qc8068av00jak8rcciw99cbxh3lkx522lmzi37jjccg")))) "0dpklq2xdhrkg1rdc7zfdjnzm6c3qxx2i1xskrqdxpqi84ffnlyh"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-base-compat" ,ghc-base-compat) `(("ghc-base-compat" ,ghc-base-compat)

View File

@ -212,7 +212,7 @@ for Haskell.")
(define-public ghc-aeson-compat (define-public ghc-aeson-compat
(package (package
(name "ghc-aeson-compat") (name "ghc-aeson-compat")
(version "0.3.9") (version "0.3.10")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -221,30 +221,25 @@ for Haskell.")
"aeson-compat-" version ".tar.gz")) "aeson-compat-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1j13gykv4ryvmr14w5blz0nnpdb4p0hpa27wahw3mhb1lwdr8hz0")))) "0ia3qfdpbrzhwwg4ywpdwca0z1m85k081pcz6jh1sx8qjsvcr71w"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments
`(#:cabal-revision
("7" "15aflmqs5y0yg2p4042yvnhxyp11ndlihs1dxj21bxfdzd1bbkrn")))
(inputs `(("ghc-base-compat" ,ghc-base-compat) (inputs `(("ghc-base-compat" ,ghc-base-compat)
("ghc-aeson" ,ghc-aeson) ("ghc-aeson" ,ghc-aeson)
("ghc-attoparsec" ,ghc-attoparsec) ("ghc-attoparsec" ,ghc-attoparsec)
("ghc-attoparsec" ,ghc-attoparsec-iso8601) ("ghc-attoparsec-iso8601" ,ghc-attoparsec-iso8601)
("ghc-exceptions" ,ghc-exceptions)
("ghc-hashable" ,ghc-hashable) ("ghc-hashable" ,ghc-hashable)
("ghc-scientific" ,ghc-scientific) ("ghc-scientific" ,ghc-scientific)
("ghc-time-locale-compat" ,ghc-time-locale-compat) ("ghc-time-locale-compat" ,ghc-time-locale-compat)
("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-vector" ,ghc-vector) ("ghc-vector" ,ghc-vector)
("ghc-tagged" ,ghc-tagged) ("ghc-tagged" ,ghc-tagged)))
("ghc-semigroups" ,ghc-semigroups)
("ghc-nats" ,ghc-nats)))
(native-inputs (native-inputs
`(("ghc-tasty" ,ghc-tasty) `(("ghc-tasty" ,ghc-tasty)
("ghc-tasty-hunit" ,ghc-tasty-hunit) ("ghc-tasty-hunit" ,ghc-tasty-hunit)
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)
("ghc-quickcheck" ,ghc-quickcheck) ("ghc-quickcheck" ,ghc-quickcheck)
("ghc-quickcheck-instances" ,ghc-quickcheck-instances))) ("ghc-quickcheck-instances" ,ghc-quickcheck-instances)
("ghc-base-orphans" ,ghc-base-orphans)))
(home-page "https://github.com/phadej/aeson-compat") (home-page "https://github.com/phadej/aeson-compat")
(synopsis "Compatibility layer for ghc-aeson") (synopsis "Compatibility layer for ghc-aeson")
(description "This Haskell package provides compatibility layer for (description "This Haskell package provides compatibility layer for
@ -506,7 +501,7 @@ similar operations (e.g. @code{Either}, @code{These}).")
(define-public ghc-async (define-public ghc-async
(package (package
(name "ghc-async") (name "ghc-async")
(version "2.2.3") (version "2.2.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -516,11 +511,12 @@ similar operations (e.g. @code{Either}, @code{These}).")
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0p4k6872pj0aykbnc19ilam1h8fgskxlwpyg5qisaivr0fhg6yj6")))) "09d7w3krfhnmf9dp6yffa9wykinhw541wibnjgnlyv77w1dzhka8"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-hashable" ,ghc-hashable) `(("ghc-hashable" ,ghc-hashable)))
("ghc-hunit" ,ghc-hunit) (native-inputs
`(("ghc-hunit" ,ghc-hunit)
("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework" ,ghc-test-framework)
("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit)))
(home-page "https://github.com/simonmar/async") (home-page "https://github.com/simonmar/async")
@ -1133,7 +1129,7 @@ functions.")
(define-public ghc-blaze-builder (define-public ghc-blaze-builder
(package (package
(name "ghc-blaze-builder") (name "ghc-blaze-builder")
(version "0.4.2.1") (version "0.4.2.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1143,11 +1139,18 @@ functions.")
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"01hbx82djckj2x74sk9kc79111djq7f2af3zl5i21y9zkjy8js3f")))) "0rxg6vjr0ji6g1nngrqpl4k1q9w66fwkhld9cqm5yfhx0a69kp1c"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments `(#:tests? #f)) ; FIXME: Missing test libraries.
(inputs (inputs
`(("ghc-utf8-string" ,ghc-utf8-string))) `(("ghc-bytestring-builder" ,ghc-bytestring-builder)
("ghc-semigroups" ,ghc-semigroups)))
(native-inputs
`(("ghc-hunit" ,ghc-hunit)
("ghc-quickcheck" ,ghc-quickcheck)
("ghc-test-framework" ,ghc-test-framework)
("ghc-test-framework-hunit" ,ghc-test-framework-hunit)
("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2)
("ghc-utf8-string" ,ghc-utf8-string)))
(home-page "https://github.com/lpsmith/blaze-builder") (home-page "https://github.com/lpsmith/blaze-builder")
(synopsis "Efficient buffered output") (synopsis "Efficient buffered output")
(description "This library provides an implementation of the older (description "This library provides an implementation of the older
@ -1367,7 +1370,7 @@ Compatibility package for older packages.")
(define-public ghc-bytestring-lexing (define-public ghc-bytestring-lexing
(package (package
(name "ghc-bytestring-lexing") (name "ghc-bytestring-lexing")
(version "0.5.0.2") (version "0.5.0.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1376,8 +1379,12 @@ Compatibility package for older packages.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0wrzniawhgpphc6yx1v972gyqxdbv0pizaz9bafahrshyb9svy81")))) "1p7i2haix4m11an3djaq65cnd293hzwqy4cd2i8jxzcl248pk6iy"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(native-inputs
`(("ghc-tasty" ,ghc-tasty)
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)
("ghc-tasty-smallcheck" ,ghc-tasty-smallcheck)))
(home-page "http://code.haskell.org/~wren/") (home-page "http://code.haskell.org/~wren/")
(synopsis "Parse and produce literals from strict or lazy bytestrings") (synopsis "Parse and produce literals from strict or lazy bytestrings")
(description (description
@ -1645,7 +1652,7 @@ very simple example of encoding CSV data:
(define-public ghc-cassava-megaparsec (define-public ghc-cassava-megaparsec
(package (package
(name "ghc-cassava-megaparsec") (name "ghc-cassava-megaparsec")
(version "2.0.2") (version "2.0.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1656,7 +1663,7 @@ very simple example of encoding CSV data:
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"03x1462agrfdagklp8c89b8p4z2hd8nbf6d3895sz770zjkawda7")))) "0pg9z38jmrylbj683b6pf7psipp7lrdq6mn1hbj8v2gj5lh8yf8n"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-cassava" ,ghc-cassava) `(("ghc-cassava" ,ghc-cassava)
@ -4059,7 +4066,7 @@ directly uses the type system, rather than out-of-band exceptions.")
(define-public ghc-esqueleto (define-public ghc-esqueleto
(package (package
(name "ghc-esqueleto") (name "ghc-esqueleto")
(version "3.5.2.2") (version "3.5.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -4067,7 +4074,7 @@ directly uses the type system, rather than out-of-band exceptions.")
"esqueleto/esqueleto-" version ".tar.gz")) "esqueleto/esqueleto-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"19m4lzxhjakf1zbsvwa0xmhcln1wb8ydbsnfyhiwhgvryrhvw9ga")))) "0z3cf49sha6q965qw2m08jfmb91ki2rsdpnr7l39lka5b4ffxjlz"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments (arguments
`(#:tests? #f)) ; TODO: Cannot connect to mysql server. `(#:tests? #f)) ; TODO: Cannot connect to mysql server.
@ -6063,7 +6070,7 @@ representations of current time.")
(define-public ghc-hpack (define-public ghc-hpack
(package (package
(name "ghc-hpack") (name "ghc-hpack")
(version "0.34.4") (version "0.34.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -6071,7 +6078,7 @@ representations of current time.")
"hpack-" version ".tar.gz")) "hpack-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1xszy00al5zzga64gh7nvgqc93242f61kqy8lb09jkm98a8fs4bl")))) "0gmm6jgi1sgyilphww6apq1x04grqznm7xhyb7g1rj5j7my40ws2"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-aeson" ,ghc-aeson) `(("ghc-aeson" ,ghc-aeson)
@ -6189,29 +6196,29 @@ handler built in.")
(define-public ghc-hslua (define-public ghc-hslua
(package (package
(name "ghc-hslua") (name "ghc-hslua")
(version "1.3.0.1") (version "1.3.0.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/" (uri (string-append "https://hackage.haskell.org/package/"
"hslua/hslua-" version ".tar.gz")) "hslua/hslua-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1mz8zk13dhgaf24hmmjqnn5hcln96iw73mcjwjilag8388wq72k7")))) "0p39xm0mmxzs5x6aim11qkb7npn0d9h7li2kwfhry0dijd1vm18i"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments (arguments
`(#:configure-flags '("-fsystem-lua") `(#:configure-flags '("-fsystem-lua")
#:extra-directories ("lua"))) #:extra-directories ("lua")))
(inputs (inputs
`(("lua" ,lua) `(("lua" ,lua)
("ghc-exceptions" ,ghc-exceptions) ("ghc-base-compat" ,ghc-base-compat)))
("ghc-fail" ,ghc-fail)))
(native-inputs (native-inputs
`(("ghc-tasty" ,ghc-tasty) `(("ghc-tasty" ,ghc-tasty)
("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure)
("ghc-tasty-hunit" ,ghc-tasty-hunit) ("ghc-tasty-hunit" ,ghc-tasty-hunit)
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)
("ghc-quickcheck" ,ghc-quickcheck) ("ghc-quickcheck" ,ghc-quickcheck)
("ghc-quickcheck-instances" ,ghc-quickcheck-instances))) ("ghc-quickcheck-instances" ,ghc-quickcheck-instances)
("ghc-fail" ,ghc-fail)
("ghc-semigroups" ,ghc-semigroups)))
(home-page "https://hackage.haskell.org/package/hslua") (home-page "https://hackage.haskell.org/package/hslua")
(synopsis "Lua language interpreter embedding in Haskell") (synopsis "Lua language interpreter embedding in Haskell")
(description (description
@ -6790,7 +6797,7 @@ removed. Both IPv4 and IPv6 are supported.")
(define-public ghc-ipynb (define-public ghc-ipynb
(package (package
(name "ghc-ipynb") (name "ghc-ipynb")
(version "0.1.0.1") (version "0.1.0.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -6798,7 +6805,7 @@ removed. Both IPv4 and IPv6 are supported.")
"ipynb/ipynb-" version ".tar.gz")) "ipynb/ipynb-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0lwpz0ip7r1rxkirqb6p48ql19fzamqkrnf3khx7bfl5wsxi6yrb")))) "0qky4l5aaiq7ypwbxh0mr7s572290fi596f18dg68qpyzc49a9kx"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-unordered-containers" ,ghc-unordered-containers) `(("ghc-unordered-containers" ,ghc-unordered-containers)
@ -6808,10 +6815,8 @@ removed. Both IPv4 and IPv6 are supported.")
(native-inputs (native-inputs
`(("ghc-tasty" ,ghc-tasty) `(("ghc-tasty" ,ghc-tasty)
("ghc-tasty-hunit" ,ghc-tasty-hunit) ("ghc-tasty-hunit" ,ghc-tasty-hunit)
("ghc-aeson-diff" ,ghc-aeson-diff)
("ghc-microlens-aeson" ,ghc-microlens-aeson) ("ghc-microlens-aeson" ,ghc-microlens-aeson)
("ghc-microlens" ,ghc-microlens) ("ghc-microlens" ,ghc-microlens)))
("ghc-vector" ,ghc-vector)))
(home-page "https://hackage.haskell.org/package/ipynb") (home-page "https://hackage.haskell.org/package/ipynb")
(synopsis "Data structure for working with Jupyter notebooks") (synopsis "Data structure for working with Jupyter notebooks")
(description "This library defines a data structure for representing (description "This library defines a data structure for representing
@ -6871,7 +6876,7 @@ Notation, JSON} is a lightweight data-interchange format.")
(define-public ghc-juicypixels (define-public ghc-juicypixels
(package (package
(name "ghc-juicypixels") (name "ghc-juicypixels")
(version "3.3.5") (version "3.3.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/" (uri (string-append "https://hackage.haskell.org/package/"
@ -6879,14 +6884,13 @@ Notation, JSON} is a lightweight data-interchange format.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0yj4jyf56r3c1r3v1lkx8i8ll0jl8g8y2yv87sa4hwgck52199gc")))) "1f8giivsqxma19ax78dr7j4gir12iyfqn2mlsd27zzl8dn7dy6w1"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(outputs '("out" "static" "doc")) (outputs '("out" "static" "doc"))
(inputs (inputs
`(("ghc-zlib" ,ghc-zlib) `(("ghc-zlib" ,ghc-zlib)
("ghc-vector" ,ghc-vector) ("ghc-vector" ,ghc-vector)
("ghc-primitive" ,ghc-primitive) ("ghc-primitive" ,ghc-primitive)))
("ghc-mmap" ,ghc-mmap)))
(home-page "https://github.com/Twinside/Juicy.Pixels") (home-page "https://github.com/Twinside/Juicy.Pixels")
(synopsis "Picture loading and serialization library") (synopsis "Picture loading and serialization library")
(description (description
@ -7578,7 +7582,7 @@ monadic incremental interface is provided as well.")
(define-public ghc-lzma-conduit (define-public ghc-lzma-conduit
(package (package
(name "ghc-lzma-conduit") (name "ghc-lzma-conduit")
(version "1.2.1") (version "1.2.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -7586,7 +7590,7 @@ monadic incremental interface is provided as well.")
"lzma-conduit-" version ".tar.gz")) "lzma-conduit-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0hm72da7xk9l3zxjh274yg444vf405djxqbkf3q3p2qhicmxlmg9")))) "1z6q16hzp2r5a4gdbg9akky5l9bfarzzhzswrgvh0v28ax400whb"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-conduit" ,ghc-conduit) `(("ghc-conduit" ,ghc-conduit)
@ -8295,7 +8299,7 @@ the @code{mtl-tf} package.")
(define-public ghc-mono-traversable (define-public ghc-mono-traversable
(package (package
(name "ghc-mono-traversable") (name "ghc-mono-traversable")
(version "1.0.15.1") (version "1.0.15.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -8304,7 +8308,7 @@ the @code{mtl-tf} package.")
"mono-traversable-" version ".tar.gz")) "mono-traversable-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1psxhfjmpv3y54wy8f8dwa43finlj7aw2mry67pg521gxmwmppy2")))) "1dvlp7r7r1lc3fxkwaz68f1nffg83240q8a989x24x1x67rj1clq"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(outputs '("out" "static" "doc")) (outputs '("out" "static" "doc"))
(inputs `(("ghc-unordered-containers" ,ghc-unordered-containers) (inputs `(("ghc-unordered-containers" ,ghc-unordered-containers)
@ -8315,7 +8319,6 @@ the @code{mtl-tf} package.")
(native-inputs `(("ghc-hspec" ,ghc-hspec) (native-inputs `(("ghc-hspec" ,ghc-hspec)
("ghc-hunit" ,ghc-hunit) ("ghc-hunit" ,ghc-hunit)
("ghc-quickcheck" ,ghc-quickcheck) ("ghc-quickcheck" ,ghc-quickcheck)
("ghc-semigroups" ,ghc-semigroups)
("ghc-foldl" ,ghc-foldl))) ("ghc-foldl" ,ghc-foldl)))
(home-page "https://github.com/snoyberg/mono-traversable") (home-page "https://github.com/snoyberg/mono-traversable")
(synopsis "Haskell classes for mapping, folding, and traversing monomorphic (synopsis "Haskell classes for mapping, folding, and traversing monomorphic
@ -8976,7 +8979,7 @@ found at runtime, a userError is thrown.")
(define-public ghc-operational (define-public ghc-operational
(package (package
(name "ghc-operational") (name "ghc-operational")
(version "0.2.3.5") (version "0.2.4.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -8984,7 +8987,7 @@ found at runtime, a userError is thrown.")
"operational-" version ".tar.gz")) "operational-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1x2abg2q9d26h1vzj40r6k7k3gqgappbs4g9d853vvg77837km4i")))) "1hwmwbsxzwv68b39rv4gn3da6irv8zm89gqrkc3rdsgwi5ziyn3i"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-random" ,ghc-random))) `(("ghc-random" ,ghc-random)))
@ -9135,7 +9138,7 @@ to other formats.")
(define-public ghc-emojis (define-public ghc-emojis
(package (package
(name "ghc-emojis") (name "ghc-emojis")
(version "0.1") (version "0.1.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -9143,7 +9146,7 @@ to other formats.")
"https://hackage.haskell.org/package/emojis/" "https://hackage.haskell.org/package/emojis/"
"emojis-" version ".tar.gz")) "emojis-" version ".tar.gz"))
(sha256 (sha256
(base32 "1c6zkj9gmk1y90gbdrn50hyp7mw1mggzhnr2khqd728ryipw60ss")))) (base32 "09x2xrppwypi369y7rzf3ln2g7c3g9qfckn2gydxpfzglcp9rziw"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(native-inputs (native-inputs
`(("ghc-hunit" ,ghc-hunit))) `(("ghc-hunit" ,ghc-hunit)))
@ -9262,7 +9265,7 @@ Implementations using both of these examples are provided.")
(define-public ghc-doclayout (define-public ghc-doclayout
(package (package
(name "ghc-doclayout") (name "ghc-doclayout")
(version "0.3.0.2") (version "0.3.1.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -9270,14 +9273,16 @@ Implementations using both of these examples are provided.")
"https://hackage.haskell.org/package/doclayout/" "https://hackage.haskell.org/package/doclayout/"
"doclayout-" version ".tar.gz")) "doclayout-" version ".tar.gz"))
(sha256 (sha256
(base32 "1hfqagf5rmdjjx3xzx153d769b2vwarmyx7k7cwh872cgasndb3q")))) (base32 "1p9kgjlf7y4p1symvkwndgs4lvyw2c45bsgld09y9r4aiqbhdrxp"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-safe" ,ghc-safe))) `(("ghc-safe" ,ghc-safe)
("ghc-emojis" ,ghc-emojis)))
(native-inputs (native-inputs
`(("ghc-tasty" ,ghc-tasty) `(("ghc-tasty" ,ghc-tasty)
("ghc-tasty-golden" ,ghc-tasty-golden) ("ghc-tasty-golden" ,ghc-tasty-golden)
("ghc-tasty-hunit" ,ghc-tasty-hunit))) ("ghc-tasty-hunit" ,ghc-tasty-hunit)
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)))
(home-page "https://github.com/jgm/doclayout") (home-page "https://github.com/jgm/doclayout")
(synopsis "Pretty-printing library for laying out text documents") (synopsis "Pretty-printing library for laying out text documents")
(description (description
@ -9508,7 +9513,7 @@ getDataFileName name = do
(define-public ghc-pandoc-types (define-public ghc-pandoc-types
(package (package
(name "ghc-pandoc-types") (name "ghc-pandoc-types")
(version "1.22") (version "1.22.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/" (uri (string-append "https://hackage.haskell.org/package/"
@ -9516,7 +9521,7 @@ getDataFileName name = do
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0kr5n9yw59513pw2rjc65qs55iq0prn16prk4781arqdh7g7a09q")))) "0z2j306jsiriwhib0201hsllwyck7qcvqci5c25frwsmknr3mls2"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -9540,13 +9545,13 @@ version = Version [~a] []
#t))))) #t)))))
(inputs (inputs
`(("ghc-syb" ,ghc-syb) `(("ghc-syb" ,ghc-syb)
("ghc-aeson" ,ghc-aeson) ("ghc-aeson" ,ghc-aeson)))
("ghc-string-qq" ,ghc-string-qq)))
(native-inputs (native-inputs
`(("ghc-quickcheck" ,ghc-quickcheck) `(("ghc-quickcheck" ,ghc-quickcheck)
("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework" ,ghc-test-framework)
("ghc-test-framework-hunit" ,ghc-test-framework-hunit) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit)
("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2)
("ghc-string-qq" ,ghc-string-qq)
("ghc-hunit" ,ghc-hunit))) ("ghc-hunit" ,ghc-hunit)))
(home-page "https://pandoc.org") (home-page "https://pandoc.org")
(synopsis "Types for representing a structured document") (synopsis "Types for representing a structured document")
@ -9829,7 +9834,7 @@ syntax and semantics as Perl 5.")
(define-public ghc-persistent (define-public ghc-persistent
(package (package
(name "ghc-persistent") (name "ghc-persistent")
(version "2.13.1.2") (version "2.13.2.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -9838,7 +9843,7 @@ syntax and semantics as Perl 5.")
"persistent-" version ".tar.gz")) "persistent-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"09si4h64i9drqr80a2sxpxhmsinacqx9bvsc3jah5zlm915q092y")))) "13lp9i94f57qhifdmr1vnsrra34526f7kqa1sybcaj2jh2v3q85k"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-aeson" ,ghc-aeson) `(("ghc-aeson" ,ghc-aeson)
@ -10199,16 +10204,16 @@ types.")
(define-public ghc-prettyprinter (define-public ghc-prettyprinter
(package (package
(name "ghc-prettyprinter") (name "ghc-prettyprinter")
(version "1.7.0") (version "1.7.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"mirror://hackage/package/prettyprinter/prettyprinter-" "https://hackage.haskell.org/package/prettyprinter/prettyprinter-"
version version
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 "19z04sn0kqxgwcyfn5igjmbxw13xsb3mdhdidkb3kzswib78f6sr")))) (base32 "0i8b3wjjpdvp5b857j065jwyrpgcnzgk75imrj7i3yhl668acvjy"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(native-inputs (native-inputs
`(("ghc-doctest" ,ghc-doctest) `(("ghc-doctest" ,ghc-doctest)
@ -10230,7 +10235,7 @@ clashes, @code{Text}-based, extensible.")
(define-public ghc-prettyprinter-ansi-terminal (define-public ghc-prettyprinter-ansi-terminal
(package (package
(name "ghc-prettyprinter-ansi-terminal") (name "ghc-prettyprinter-ansi-terminal")
(version "1.1.2") (version "1.1.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -10238,7 +10243,7 @@ clashes, @code{Text}-based, extensible.")
"https://hackage.haskell.org/package/prettyprinter-ansi-terminal/" "https://hackage.haskell.org/package/prettyprinter-ansi-terminal/"
"prettyprinter-ansi-terminal-" version ".tar.gz")) "prettyprinter-ansi-terminal-" version ".tar.gz"))
(sha256 (sha256
(base32 "168p5b7fzqs0g8ld26d3k78afgdx4r21dv0hw8ka2c08p4w76sz2")))) (base32 "1cqxbcmy9ykk4pssq5hp6h51g2h547zfz549awh0c1fni8q3jdw1"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-ansi-terminal" ,ghc-ansi-terminal) `(("ghc-ansi-terminal" ,ghc-ansi-terminal)
@ -11015,7 +11020,7 @@ expressions.")
(define-public ghc-regex-pcre-builtin (define-public ghc-regex-pcre-builtin
(package (package
(name "ghc-regex-pcre-builtin") (name "ghc-regex-pcre-builtin")
(version "0.95.2.3.8.43") (version "0.95.2.3.8.44")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/" (uri (string-append "https://hackage.haskell.org/package/"
@ -11023,7 +11028,7 @@ expressions.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"02c6vzxcy1zkqwy6w4dsc97xvvdwlh8xr7imrlx2qs2521rvswr7")))) "0pn55ssrwr05c9sa9jvp0knvzjksz04wn3pmzf5dz4xgbyjadkna"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-regex-base" ,ghc-regex-base))) `(("ghc-regex-base" ,ghc-regex-base)))
@ -11773,7 +11778,7 @@ class, forming lattice-like structure.")
(define-public ghc-semigroupoids (define-public ghc-semigroupoids
(package (package
(name "ghc-semigroupoids") (name "ghc-semigroupoids")
(version "5.3.5") (version "5.3.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -11783,7 +11788,7 @@ class, forming lattice-like structure.")
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1c66sc9w9724xhlly9wfjhghmnnw99z9al69264i2izk7vhihbsm")))) "0glhqc9x8i5z3bdg23xvl2lfns95msid3h3x0jksna7i6c8j869n"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(outputs '("out" "static" "doc")) (outputs '("out" "static" "doc"))
(inputs (inputs
@ -11793,13 +11798,10 @@ class, forming lattice-like structure.")
("ghc-comonad" ,ghc-comonad) ("ghc-comonad" ,ghc-comonad)
("ghc-contravariant" ,ghc-contravariant) ("ghc-contravariant" ,ghc-contravariant)
("ghc-distributive" ,ghc-distributive) ("ghc-distributive" ,ghc-distributive)
("ghc-generic-deriving" ,ghc-generic-deriving)
("ghc-hashable" ,ghc-hashable) ("ghc-hashable" ,ghc-hashable)
("ghc-semigroups" ,ghc-semigroups)
("ghc-tagged" ,ghc-tagged) ("ghc-tagged" ,ghc-tagged)
("ghc-unordered-containers" ,ghc-unordered-containers))) ("ghc-unordered-containers" ,ghc-unordered-containers)))
(native-inputs
`(("cabal-doctest" ,cabal-doctest)
("ghc-doctest" ,ghc-doctest)))
(home-page "https://github.com/ekmett/semigroupoids") (home-page "https://github.com/ekmett/semigroupoids")
(synopsis "Semigroupoids operations for Haskell") (synopsis "Semigroupoids operations for Haskell")
(description "This library provides a wide array of (semi)groupoids and (description "This library provides a wide array of (semi)groupoids and
@ -12467,7 +12469,7 @@ and regression and autocorrelation analysis.
(define-public ghc-stm-chans (define-public ghc-stm-chans
(package (package
(name "ghc-stm-chans") (name "ghc-stm-chans")
(version "3.0.0.4") (version "3.0.0.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -12476,7 +12478,7 @@ and regression and autocorrelation analysis.
"stm-chans-" version ".tar.gz")) "stm-chans-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13")))) "04hafqjq8ngvhcavkfx88a0zky8yc7i18q2n9ajav03kns1kwvpa"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(home-page "https://hackage.haskell.org/package/stm-chans") (home-page "https://hackage.haskell.org/package/stm-chans")
(synopsis "Additional types of channels for ghc-stm") (synopsis "Additional types of channels for ghc-stm")
@ -13196,23 +13198,24 @@ dependency.")
(define-public ghc-texmath (define-public ghc-texmath
(package (package
(name "ghc-texmath") (name "ghc-texmath")
(version "0.12.3.1") (version "0.12.3.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/" (uri (string-append "https://hackage.haskell.org/package/"
"texmath/texmath-" version ".tar.gz")) "texmath/texmath-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1qyiihb9h7w7074p495yd4s8dj9adz0dy865gyp822z69jvmkcki")))) "1d9r3na7hmkgr0j63fs50ssll506l1wyqhw0dpap7jk0rdz8pv6n"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-syb" ,ghc-syb) `(("ghc-syb" ,ghc-syb)
("ghc-network-uri" ,ghc-network-uri) ("ghc-network-uri" ,ghc-network-uri)
("ghc-split" ,ghc-split) ("ghc-split" ,ghc-split)
("ghc-temporary" ,ghc-temporary)
("ghc-utf8-string" ,ghc-utf8-string)
("ghc-xml" ,ghc-xml) ("ghc-xml" ,ghc-xml)
("ghc-pandoc-types" ,ghc-pandoc-types))) ("ghc-pandoc-types" ,ghc-pandoc-types)))
(native-inputs
`(("ghc-temporary" ,ghc-temporary)
("ghc-utf8-string" ,ghc-utf8-string)))
(home-page "https://github.com/jgm/texmath") (home-page "https://github.com/jgm/texmath")
(synopsis "Conversion between formats used to represent mathematics") (synopsis "Conversion between formats used to represent mathematics")
(description (description
@ -13729,7 +13732,7 @@ objects from the timezone-series package.")
(define-public ghc-tldr (define-public ghc-tldr
(package (package
(name "ghc-tldr") (name "ghc-tldr")
(version "0.9.1") (version "0.9.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -13739,10 +13742,11 @@ objects from the timezone-series package.")
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0xgj3mf51iv68fhgyrjvxfmzrbcwnk7siaynm213x0kgcyvkwbz0")))) "1yypb9zhsj9ks7bbw2sayqv3rn9y8z3w5p1xmsnwb4w99dqmvcx5"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-ansi-terminal" ,ghc-ansi-terminal) `(("ghc-ansi-terminal" ,ghc-ansi-terminal)
("ghc-attoparsec" ,ghc-attoparsec)
("ghc-cmark" ,ghc-cmark) ("ghc-cmark" ,ghc-cmark)
("ghc-http-conduit" ,ghc-http-conduit) ("ghc-http-conduit" ,ghc-http-conduit)
("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-optparse-applicative" ,ghc-optparse-applicative)
@ -13872,7 +13876,7 @@ but also need those types.")
(define-public ghc-tree-diff (define-public ghc-tree-diff
(package (package
(name "ghc-tree-diff") (name "ghc-tree-diff")
(version "0.2") (version "0.2.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -13882,7 +13886,7 @@ but also need those types.")
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1ny7mi0n8cyb65q9ihbnm2gxiyya888dw2c4y0hjy8k882wdhf0x")))) "0bybi4qp7nj9117yza5qqgw2f7s6rk3i7q642jqd7sdn3bx5cnap"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments (arguments
`(#:cabal-revision `(#:cabal-revision
@ -14042,7 +14046,7 @@ similar functionality.")
(define-public ghc-typed-process (define-public ghc-typed-process
(package (package
(name "ghc-typed-process") (name "ghc-typed-process")
(version "0.2.6.1") (version "0.2.6.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -14051,7 +14055,7 @@ similar functionality.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0w4c76qln49967nnhf7f1zj3gbdfqp2qgf5ym8svhqyhp5gh61ws")))) "071mw4yv4xr5n82si33qbcqcxvcr7h56zlyd8gmsfrsdnacbq47k"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-async" ,ghc-async) `(("ghc-async" ,ghc-async)
@ -14678,7 +14682,7 @@ representing a store for a single element.")
(define-public ghc-vector (define-public ghc-vector
(package (package
(name "ghc-vector") (name "ghc-vector")
(version "0.12.3.0") (version "0.12.3.1")
(outputs '("out" "static" "doc")) (outputs '("out" "static" "doc"))
(source (source
(origin (origin
@ -14689,7 +14693,7 @@ representing a store for a single element.")
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"00xp86yad3yv4ja4q07gkmmcf7iwpcnzkkaf91zkx9nxb981iy0m")))) "0dczbcisxhhix859dng5zhxkn3xvlnllsq60apqzvmyl5g056jpv"))))
(build-system haskell-build-system) (build-system haskell-build-system)
;; FIXME: To simplify upgrading all Haskell packages, we leave the tests ;; FIXME: To simplify upgrading all Haskell packages, we leave the tests
;; disabled for now. ;; disabled for now.
@ -14697,8 +14701,6 @@ representing a store for a single element.")
`(#:tests? #f)) `(#:tests? #f))
(inputs (inputs
`(("ghc-primitive" ,ghc-primitive) `(("ghc-primitive" ,ghc-primitive)
("ghc-random" ,ghc-random)
("ghc-quickcheck" ,ghc-quickcheck)
;; ("ghc-hunit" ,ghc-hunit) ;; ("ghc-hunit" ,ghc-hunit)
;; ("ghc-test-framework" ,ghc-test-framework) ;; ("ghc-test-framework" ,ghc-test-framework)
;; ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) ;; ("ghc-test-framework-hunit" ,ghc-test-framework-hunit)
@ -15129,14 +15131,14 @@ word expansion like a posix-shell.")
(define-public ghc-x11 (define-public ghc-x11
(package (package
(name "ghc-x11") (name "ghc-x11")
(version "1.10.1") (version "1.10.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/X11/" (uri (string-append "https://hackage.haskell.org/package/X11/"
"X11-" version ".tar.gz")) "X11-" version ".tar.gz"))
(sha256 (sha256
(base32 "13a0qf8rwn1s43wcl39f1pcq3h1kw1ddfq205j1ry0j3yafnazxg")))) (base32 "1ip207l97s8nw4daxp9s254agk8f0wibpf0prx0n695klqyn8bz1"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments (arguments
`(#:extra-directories `(#:extra-directories
@ -15146,7 +15148,7 @@ word expansion like a posix-shell.")
("libxrandr" ,libxrandr) ("libxrandr" ,libxrandr)
("libxinerama" ,libxinerama) ("libxinerama" ,libxinerama)
("libxscrnsaver" ,libxscrnsaver) ("libxscrnsaver" ,libxscrnsaver)
("ghc-data-default" ,ghc-data-default))) ("ghc-data-default-class" ,ghc-data-default-class)))
(home-page "https://github.com/haskell-pkg-janitors/X11") (home-page "https://github.com/haskell-pkg-janitors/X11")
(synopsis "Bindings to the X11 graphics library") (synopsis "Bindings to the X11 graphics library")
(description (description
@ -15302,14 +15304,14 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.")
(define-public ghc-yaml (define-public ghc-yaml
(package (package
(name "ghc-yaml") (name "ghc-yaml")
(version "0.11.5.0") (version "0.11.7.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/" (uri (string-append "https://hackage.haskell.org/package/"
"yaml/yaml-" version ".tar.gz")) "yaml/yaml-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1bfdsqckzql50j6ni4fa1470cvkmfiy4skb98cdwnj4rss5p93mj")))) "0s08kw0hqxixxripwjmz7b4yh9130dws3jaj460x8ds8q4b6khbx"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-conduit" ,ghc-conduit) `(("ghc-conduit" ,ghc-conduit)
@ -15319,17 +15321,16 @@ code via quasi-quoting built on top of @code{ghc-shakespeare}.")
("ghc-vector" ,ghc-vector) ("ghc-vector" ,ghc-vector)
("ghc-attoparsec" ,ghc-attoparsec) ("ghc-attoparsec" ,ghc-attoparsec)
("ghc-scientific" ,ghc-scientific) ("ghc-scientific" ,ghc-scientific)
("ghc-semigroups" ,ghc-semigroups) ("ghc-libyaml" ,ghc-libyaml)
("ghc-temporary" ,ghc-temporary) ("ghc-optparse-applicative" ,ghc-optparse-applicative)))
("ghc-enclosed-exceptions" ,ghc-enclosed-exceptions)
("ghc-base-compat" ,ghc-base-compat)
("ghc-libyaml" ,ghc-libyaml)))
(native-inputs (native-inputs
`(("ghc-hspec" ,ghc-hspec) `(("ghc-hspec" ,ghc-hspec)
("ghc-hunit" ,ghc-hunit) ("ghc-hunit" ,ghc-hunit)
("ghc-base-compat" ,ghc-base-compat)
("hspec-discover" ,hspec-discover) ("hspec-discover" ,hspec-discover)
("ghc-mockery" ,ghc-mockery) ("ghc-mockery" ,ghc-mockery)
("ghc-raw-strings-qq" ,ghc-raw-strings-qq))) ("ghc-raw-strings-qq" ,ghc-raw-strings-qq)
("ghc-temporary" ,ghc-temporary)))
(home-page "https://github.com/snoyberg/yaml/") (home-page "https://github.com/snoyberg/yaml/")
(synopsis "Parsing and rendering YAML documents") (synopsis "Parsing and rendering YAML documents")
(description (description
@ -15449,7 +15450,7 @@ provides access to the full zlib feature set.")
(define-public ghc-zstd (define-public ghc-zstd
(package (package
(name "ghc-zstd") (name "ghc-zstd")
(version "0.1.2.0") (version "0.1.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -15457,7 +15458,7 @@ provides access to the full zlib feature set.")
"zstd/zstd-" version ".tar.gz")) "zstd/zstd-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0vjw8r11k9kj6c63sfkwz8akq0g32g1bv6n6clvs4g2j12zq1xk8")))) "0vghl48cxcqy72sqk2gpi7rvy5ya36j13vndaxi6kck6bqivbhm0"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(native-inputs (native-inputs
`(("ghc-quickcheck" ,ghc-quickcheck) `(("ghc-quickcheck" ,ghc-quickcheck)
@ -15859,7 +15860,7 @@ entries. For more information about CSL, see @uref{https://citationstyles.org/}
(define-public ghc-commonmark (define-public ghc-commonmark
(package (package
(name "ghc-commonmark") (name "ghc-commonmark")
(version "0.2.1") (version "0.2.1.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -15868,7 +15869,7 @@ entries. For more information about CSL, see @uref{https://citationstyles.org/}
version version
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 "1vba7v1zaqh811v3j4x42g7mhwvxwgzm997kq1kzd0njby14fq5b")))) (base32 "105szy7l4ji255fwv0kbfcy3i3a3a4197zgj6s9jb12kwbn6n0c7"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs `(("ghc-unicode-transforms" ,ghc-unicode-transforms))) (inputs `(("ghc-unicode-transforms" ,ghc-unicode-transforms)))
(native-inputs (native-inputs
@ -15897,7 +15898,7 @@ varies linearly with input length.")
(define-public ghc-commonmark-extensions (define-public ghc-commonmark-extensions
(package (package
(name "ghc-commonmark-extensions") (name "ghc-commonmark-extensions")
(version "0.2.1.2") (version "0.2.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -15906,7 +15907,7 @@ varies linearly with input length.")
version version
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 "1ky0j7086a8mqpg26j2nkrc5wfwiw5cd3h3jqncpy59vmj1prkx4")))) (base32 "0jm6w84p2a2gyaljvnlvjjwrwnir1lss3ps53d0bd8mkvhixxrqr"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-network-uri" ,ghc-network-uri) `(("ghc-network-uri" ,ghc-network-uri)
@ -16155,7 +16156,7 @@ Haskell newer than 2.8.")
(define-public ghc-mysql (define-public ghc-mysql
(package (package
(name "ghc-mysql") (name "ghc-mysql")
(version "0.2.0.1") (version "0.2.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -16164,7 +16165,7 @@ Haskell newer than 2.8.")
version version
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 "16m8hv9yy2nf4jwgqg6n9z53n2pzskbc3gwbp2i3kgff8wsmf8sd")))) (base32 "051w428arxbix06a52dacqjpnkfx42zbazxsd3l9d857dsd0kl3g"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments `(#:tests? #f)) ; TODO: Fails to connect to server. (arguments `(#:tests? #f)) ; TODO: Fails to connect to server.
(inputs (inputs
@ -16218,7 +16219,7 @@ Haskell datatypes in text form using the @code{ghc-blaze-builder} library.")
(define-public ghc-mysql-simple (define-public ghc-mysql-simple
(package (package
(name "ghc-mysql-simple") (name "ghc-mysql-simple")
(version "0.4.6") (version "0.4.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -16227,7 +16228,7 @@ Haskell datatypes in text form using the @code{ghc-blaze-builder} library.")
version version
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 "1am8ck092s9cv4x1ambalil4mlazkp8w5qhjbl4nq0j2hpy73rby")))) (base32 "1mhmszpq64h8kxr20iaj1laq46wr2gaqc8xxq1k821i7jfxfld6j"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments `(#:tests? #f)) ; TODO: Fails to connect to server. (arguments `(#:tests? #f)) ; TODO: Fails to connect to server.
(inputs (inputs
@ -16238,6 +16239,7 @@ Haskell datatypes in text form using the @code{ghc-blaze-builder} library.")
("ghc-pcre-light" ,ghc-pcre-light) ("ghc-pcre-light" ,ghc-pcre-light)
("ghc-old-locale" ,ghc-old-locale) ("ghc-old-locale" ,ghc-old-locale)
("ghc-blaze-textual" ,ghc-blaze-textual) ("ghc-blaze-textual" ,ghc-blaze-textual)
("ghc-vector" ,ghc-vector)
("openssl" ,openssl) ("openssl" ,openssl)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs `(("ghc-hspec" ,ghc-hspec))) (native-inputs `(("ghc-hspec" ,ghc-hspec)))
@ -16455,7 +16457,7 @@ server and to receive the results of these queries.")
(define-public ghc-persistent-postgresql (define-public ghc-persistent-postgresql
(package (package
(name "ghc-persistent-postgresql") (name "ghc-persistent-postgresql")
(version "2.13.1.0") (version "2.13.2.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -16464,7 +16466,7 @@ server and to receive the results of these queries.")
version version
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 "05bj3b7kdwaba3szrrsmafxr6vcnvdhq20jk5xx348jnf2flkw0i")))) (base32 "07pnr8m0nk43jaz6l293lzx4ivyqgnw94fjypazzm008b4irh7ir"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments `(#:tests? #f)) ; TODO: Cannot import MaybeFieldDefsTest. (arguments `(#:tests? #f)) ; TODO: Cannot import MaybeFieldDefsTest.
(inputs (inputs

View File

@ -1347,7 +1347,7 @@ segmentation.")
(define-public labelme (define-public labelme
(package (package
(name "labelme") (name "labelme")
(version "4.5.9") (version "4.5.13")
(source (source
(origin (origin
;; PyPi tarball lacks tests. ;; PyPi tarball lacks tests.
@ -1357,7 +1357,7 @@ segmentation.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "12wn291516kdv0wqngz4l04j95g3rwc6cvkcb0gw8rrv4wgc7c66")))) (base32 "0cmi2xb4dgh7738l259rgwhn9l134f0vnaaqc2gflc5yr3lqhrv2"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases

View File

@ -809,14 +809,21 @@ with tiling window managers. Features include:
(define-public qiv (define-public qiv
(package (package
(name "qiv") (name "qiv")
(version "2.3.1") (version "2.3.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://spiegl.de/qiv/download/qiv-" (uri (string-append "http://spiegl.de/qiv/download/qiv-"
version ".tgz")) version ".tgz"))
(sha256 (sha256
(base32 "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7")))) (base32 "1mc0f2nnas4q0d7zc9r6g4z93i32xlx0p9hl4fn5zkyml24a1q28"))
(modules '((guix build utils)))
(snippet
'(begin
;; Fix a typo. This can probably be removed on the next update.
(substitute* "Makefile"
(("\\$\\(PREFIX\\)/man")
"$(PREFIX)/share/man"))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
@ -847,8 +854,7 @@ with tiling window managers. Features include:
;; There must be a running X server and make install doesn't start one. ;; There must be a running X server and make install doesn't start one.
;; Therefore we must do it. ;; Therefore we must do it.
(system "Xvfb :1 &") (system "Xvfb :1 &")
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1"))))
#t)))
#:tests? #f ; there is no check target #:tests? #f ; there is no check target
#:make-flags #:make-flags
(list (list

View File

@ -120,17 +120,15 @@ as the native format.")
(define-public inkscape-1.1 (define-public inkscape-1.1
(package (package
(name "inkscape") (name "inkscape")
(version "1.1") (version "1.1.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://media.inkscape.org/dl/" (uri (string-append "https://media.inkscape.org/dl/"
"resources/file/" "resources/file/"
"inkscape-" version ".tar.xz")) "inkscape-" version ".tar.xz"))
(patches (search-patches "inkscape-1.1-fix-build-witch-gcc7.5.patch"))
(sha256 (sha256
(base32 (base32 "1bvqg5xfs3m6r7qfdhmgzwhd1hx8wvg3nhvhmalwzcdm6ffhpjmf"))
"1rlm2wqg8bgdxkdvnadh49wfp0mrbrk7d8n4vdcjyw6z7z7firki"))
(modules '((guix build utils) (modules '((guix build utils)
(ice-9 format))) (ice-9 format)))
(snippet (snippet
@ -211,8 +209,7 @@ endif()~%~%"
;; Lift the requirement on the double-conversion library, as ;; Lift the requirement on the double-conversion library, as
;; it is only needed by lib2geom, which is now unbundled. ;; it is only needed by lib2geom, which is now unbundled.
(substitute* "CMakeScripts/DefineDependsandFlags.cmake" (substitute* "CMakeScripts/DefineDependsandFlags.cmake"
((".*find_package\\(DoubleConversion.*") "")) ((".*find_package\\(DoubleConversion.*") ""))))))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #t `(#:tests? #t
@ -227,8 +224,7 @@ endif()~%~%"
(add-after 'unpack 'patch-icon-cache-generator (add-after 'unpack 'patch-icon-cache-generator
(lambda _ (lambda _
(substitute* "share/icons/application/CMakeLists.txt" (substitute* "share/icons/application/CMakeLists.txt"
(("gtk-update-icon-cache") "true")) (("gtk-update-icon-cache") "true"))))
#t))
(add-after 'unpack 'disable-latex-export-tests (add-after 'unpack 'disable-latex-export-tests
;; FIXME: For some reason the test.pdf_tex file generated by the ;; FIXME: For some reason the test.pdf_tex file generated by the
;; "--export-latex" lacks "some text" in its content when run in ;; "--export-latex" lacks "some text" in its content when run in
@ -236,14 +232,12 @@ endif()~%~%"
(lambda _ (lambda _
(substitute* "testfiles/cli_tests/CMakeLists.txt" (substitute* "testfiles/cli_tests/CMakeLists.txt"
(("add_cli_test\\(export-latex") (("add_cli_test\\(export-latex")
"message(TEST_DISABLED: export-latex")) "message(TEST_DISABLED: export-latex"))))
#t))
(add-after 'unpack 'set-home (add-after 'unpack 'set-home
;; Mute Inkscape warnings during tests. ;; Mute Inkscape warnings during tests.
(lambda _ (lambda _
(setenv "HOME" (getcwd)) (setenv "HOME" (getcwd))
(format #t "ARGS is set to: ~a" (getenv "ARGS")) (format #t "ARGS is set to: ~a" (getenv "ARGS"))))
#t))
;; Move the check phase after the install phase, as when run in the ;; Move the check phase after the install phase, as when run in the
;; tests, Inkscape relies on files that are not yet installed, such ;; tests, Inkscape relies on files that are not yet installed, such
;; as the "share/inkscape/ui/units.xml" file. ;; as the "share/inkscape/ui/units.xml" file.
@ -259,8 +253,7 @@ endif()~%~%"
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/inkscape") (wrap-program (string-append out "/bin/inkscape")
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))) `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))))))))
#t)))))
(inputs (inputs
`(("aspell" ,aspell) `(("aspell" ,aspell)
("autotrace" ,autotrace) ("autotrace" ,autotrace)

View File

@ -422,7 +422,7 @@ highlighted.
(define-public kirc (define-public kirc
(package (package
(name "kirc") (name "kirc")
(version "0.2.7") (version "0.2.9")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -430,7 +430,7 @@ highlighted.
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0phx00lr7ya8rx1hskv1wdwbq2vlihiqhnplqdvk1r3m23is7al9")))) (base32 "0ahmfxhgcvnlgmxxbv9vga5x6krab1n7qq55ygj7hj3x7s7ra419"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests

View File

@ -2173,14 +2173,15 @@ new Date();"))
(define-public openjdk11 (define-public openjdk11
(package (package
(name "openjdk") (name "openjdk")
(version "11.28") (version "11.0.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri "http://hg.openjdk.java.net/jdk/jdk/archive/76072a077ee1.tar.bz2") (uri (string-append "https://openjdk-sources.osci.io/openjdk11/openjdk-"
version "-ga.tar.xz"))
(file-name (string-append name "-" version ".tar.bz2")) (file-name (string-append name "-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0v705w1s9lrqalzahir78pk397rkk9gfvzq821yv8h3xha0bqi6w")) "0xavz7msaadprq65p5bhp6sxcyp12p0zlbhb3aaz0cvp21c9pdm9"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
@ -2422,6 +2423,7 @@ new Date();"))
("libpng" ,libpng) ("libpng" ,libpng)
("libx11" ,libx11) ("libx11" ,libx11)
("libxext" ,libxext) ("libxext" ,libxext)
("libxrandr" ,libxrandr)
("libxrender" ,libxrender) ("libxrender" ,libxrender)
("libxt" ,libxt) ("libxt" ,libxt)
("libxtst" ,libxtst))) ("libxtst" ,libxtst)))

View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2019 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2016, 2017, 2019 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -100,7 +101,7 @@ restrictions that stem from limitations of the standard RCX firmware.")
(define-public leocad (define-public leocad
(package (package
(name "leocad") (name "leocad")
(version "19.07.1") (version "21.06")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -109,7 +110,7 @@ restrictions that stem from limitations of the standard RCX firmware.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"02kv1m18g6s4dady9jv4sjivfkrp192bmdw2a3d9lzlp60zks0p2")))) "1ifbxngkbmg6d8vv08amxbnfvlyjdwzykrjp98lbwvgb0b843ygq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("qttools" ,qttools))) ; for lrelease `(("qttools" ,qttools))) ; for lrelease

View File

@ -59,7 +59,7 @@ text editors.")
(define-public lesspipe (define-public lesspipe
(package (package
(name "lesspipe") (name "lesspipe")
(version "1.89") (version "1.90")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -68,7 +68,7 @@ text editors.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0lxf0m4bgwhpwmwa5q2vklk31yhiaz049kpm4n2hqiyb5mlpa94a")))) "17gv4nr9fxrk3png477pgiimdz8minp9scmqg2nxa96jfz4sk4li"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests
@ -79,8 +79,7 @@ text editors.")
(delete-file "Makefile") ; force generating (delete-file "Makefile") ; force generating
(invoke "./configure" (invoke "./configure"
(string-append "--prefix=" out) (string-append "--prefix=" out)
"--yes") "--yes"))))
#t)))
(add-before 'install 'patch-tput-and-file (add-before 'install 'patch-tput-and-file
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "lesspipe.sh" (substitute* "lesspipe.sh"

View File

@ -6,7 +6,7 @@
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Vagrant Cascadian <vagrant@debian.org> ;;; Copyright © 2018 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Christopher Howard <christopher@librehacker.com> ;;; Copyright © 2020 Christopher Howard <christopher@librehacker.com>
@ -493,14 +493,14 @@ over USB.")
(define-public libmtp (define-public libmtp
(package (package
(name "libmtp") (name "libmtp")
(version "1.1.18") (version "1.1.19")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/libmtp/libmtp/" version (uri (string-append "mirror://sourceforge/libmtp/libmtp/" version
"/libmtp-" version ".tar.gz")) "/libmtp-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1w41l93yi0dmw218daiw36rylkc8rammxx37csh1ij24q18gx03j")))) "0a1jlf5b2c2vylkvdd3cxjs20a96jlbrdyx7rwai5rzmcdpszd6y"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))

View File

@ -2786,7 +2786,7 @@ that the Ethernet protocol is much simpler than the IP protocol.")
(define-public iproute (define-public iproute
(package (package
(name "iproute2") (name "iproute2")
(version "5.13.0") (version "5.15.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -2794,7 +2794,7 @@ that the Ethernet protocol is much simpler than the IP protocol.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0dhvdybfm33q9lz73sfnc24pxy2r42xywzb1gdgydjfafhvyb8kj")))) "1zwin8sjnnwf2a9rjwzb3q8lkhcpy06s29sh05f5gxd7z6jy9qrq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`( ;; There is a test suite, but it wants network namespaces and sudo. `( ;; There is a test suite, but it wants network namespaces and sudo.
@ -6524,7 +6524,7 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.")
(define-public mcelog (define-public mcelog
(package (package
(name "mcelog") (name "mcelog")
(version "176") (version "179")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -6533,14 +6533,13 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1mlwn6ck9qiwqa2vg5wg1gvfva3jv7ygjr7p7bam0qszajs5pirk")) (base32 "0fz9j0p8jyp4m09wshl8cdhdvrdidf29bjp9hgwvv6xvg8lma06g"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
;; The checkout lacks a .git directory, breaking git describe. ;; The checkout lacks a .git directory, breaking git describe.
(substitute* "Makefile" (substitute* "Makefile"
(("\"unknown\"") (string-append "\"v" ,version "\""))) (("\"unknown\"") (string-append "\"v" ,version "\"")))))))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
@ -7296,14 +7295,14 @@ available in the kernel Linux.")
(define-public cpuid (define-public cpuid
(package (package
(name "cpuid") (name "cpuid")
(version "20201006") (version "20211031")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.etallen.com/cpuid/cpuid-" (uri (string-append "http://www.etallen.com/cpuid/cpuid-"
version ".src.tar.gz")) version ".src.tar.gz"))
(sha256 (sha256
(base32 (base32
"19jnkh57f979b78ak5mpxmdvnkgc33r55cw9shgd2hc380b3zi8k")))) "13sxb2ar4gypiv0l87lr7hf3qjccwgsg1r92adv9jvrfxcv36pbn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
@ -7318,12 +7317,11 @@ available in the kernel Linux.")
;; Make the compressed manpages writable so that the ;; Make the compressed manpages writable so that the
;; reset-gzip-timestamps phase does not error out. ;; reset-gzip-timestamps phase does not error out.
(substitute* "Makefile" (substitute* "Makefile"
(("-m 444") "-m 644")) (("-m 444") "-m 644")))))))
#t)))))
(inputs `(("perl" ,perl))) (inputs `(("perl" ,perl)))
(supported-systems '("i686-linux" "x86_64-linux")) (supported-systems '("i686-linux" "x86_64-linux"))
(home-page "http://www.etallen.com/cpuid.html") (home-page "http://www.etallen.com/cpuid.html")
(synopsis "Linux tool to dump x86 CPUID information about the CPU(s)") (synopsis "Dump x86 CPUID processor information")
(description "cpuid dumps detailed information about the CPU(s) gathered (description "cpuid dumps detailed information about the CPU(s) gathered
from the CPUID instruction, and also determines the exact model of CPU(s). It from the CPUID instruction, and also determines the exact model of CPU(s). It
supports Intel, AMD, and VIA CPUs, as well as older Transmeta, Cyrix, UMC, supports Intel, AMD, and VIA CPUs, as well as older Transmeta, Cyrix, UMC,
@ -7361,7 +7359,7 @@ the MTP device as a file system.")
(define-public procenv (define-public procenv
(package (package
(name "procenv") (name "procenv")
(version "0.58") (version "0.60")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -7370,7 +7368,7 @@ the MTP device as a file system.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "137n630qzml4yraqzp2fij8nzn8341nf8d58yzfhk8ddlzi60sfm")))) (base32 "00d7q0h4qjc8lg435lq77lp2fx6ikm5piq90m81mr1dqqna1g6pz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)

View File

@ -2139,11 +2139,11 @@ processes that doesn't run under Emacs. Lisp processes created by
(sbcl-package->ecl-package sbcl-slime-swank)) (sbcl-package->ecl-package sbcl-slime-swank))
(define-public sbcl-mgl-pax (define-public sbcl-mgl-pax
(let ((commit "4ada6eb26364e71addb169ce58e4ba83bc7a8eaa") (let ((commit "a7f904784ae59bbeeeb15a14348cda46ed9bdeb3")
(revision "2")) (revision "0"))
(package (package
(name "sbcl-mgl-pax") (name "sbcl-mgl-pax")
(version (git-version "0.0.3" revision commit)) (version (git-version "0.0.4" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2151,17 +2151,22 @@ processes that doesn't run under Emacs. Lisp processes created by
(url "https://github.com/melisgl/mgl-pax") (url "https://github.com/melisgl/mgl-pax")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 "1s38crgvmd9hgqwsscqpj6m6c10a074zjgg8k5sl15yih1wkpssm")) (base32 "119pb3485m6hqsqsaqpaq2x8xh5lrbqapw7zaqyq425n75vd1mc8"))
(file-name (git-file-name "mgl-pax" version)))) (file-name (git-file-name "mgl-pax" version))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(inputs (inputs
`(("3bmd" ,sbcl-3bmd) `(("3bmd" ,sbcl-3bmd)
("babel" ,sbcl-babel) ("alexandria" ,sbcl-alexandria)
("cl-fad" ,sbcl-cl-fad) ("colorize" ,sbcl-colorize)
("ironclad" ,sbcl-ironclad) ("md5" ,sbcl-md5)
("named-readtables" ,sbcl-named-readtables) ("named-readtables" ,sbcl-named-readtables)
("pythonic-string-reader" ,sbcl-pythonic-string-reader) ("pythonic-string-reader" ,sbcl-pythonic-string-reader)
("swank" ,sbcl-slime-swank))) ("swank" ,sbcl-slime-swank)))
(arguments
`(#:asd-systems '("mgl-pax"
"mgl-pax/navigate"
"mgl-pax/document"
"mgl-pax/transcribe")))
(synopsis "Exploratory programming environment and documentation generator") (synopsis "Exploratory programming environment and documentation generator")
(description (description
"PAX provides an extremely poor man's Explorable Programming "PAX provides an extremely poor man's Explorable Programming
@ -2467,7 +2472,7 @@ values from a string in Common Lisp.")
(origin (origin
(method hg-fetch) (method hg-fetch)
(uri (hg-reference (uri (hg-reference
(url "https://bitbucket.org/vityok/cl-string-match/") (url "https://github.com/vityok/cl-string-match")
(changeset changeset))) (changeset changeset)))
(sha256 (sha256
(base32 (base32
@ -2489,13 +2494,20 @@ values from a string in Common Lisp.")
;; For testing: ;; For testing:
`(("lisp-unit" ,sbcl-lisp-unit))) `(("lisp-unit" ,sbcl-lisp-unit)))
(arguments (arguments
`(#:tests? #f)) `(#:tests? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-dependency
(lambda _
(substitute* "cl-string-match.asd"
((":mgl-pax")
":mgl-pax/document")))))))
(synopsis "Set of utilities to manipulate strings in Common Lisp") (synopsis "Set of utilities to manipulate strings in Common Lisp")
(description (description
"@command{cl-strings} is a small, portable, dependency-free set of "@command{cl-strings} is a small, portable, dependency-free set of
utilities that make it even easier to manipulate text in Common Lisp. It has utilities that make it even easier to manipulate text in Common Lisp. It has
100% test coverage and works at least on sbcl, ecl, ccl, abcl and clisp.") 100% test coverage and works at least on sbcl, ecl, ccl, abcl and clisp.")
(home-page "https://bitbucket.org/vityok/cl-string-match/") (home-page "https://github.com/vityok/cl-string-match")
(license license:bsd-3)))) (license license:bsd-3))))
(define-public cl-string-match (define-public cl-string-match
@ -3936,8 +3948,8 @@ defined in RFC 2616.")
(define-public sbcl-cl-who (define-public sbcl-cl-who
(let ((version "1.1.4") (let ((version "1.1.4")
(commit "2c08caa4bafba720409af9171feeba3f32e86d32") (commit "0d3826475133271ee8c590937136c1bc41b8cbe0")
(revision "1")) (revision "2"))
(package (package
(name "sbcl-cl-who") (name "sbcl-cl-who")
(version (git-version version revision commit)) (version (git-version version revision commit))
@ -3947,10 +3959,10 @@ defined in RFC 2616.")
(uri (git-reference (uri (git-reference
(url "https://github.com/edicl/cl-who") (url "https://github.com/edicl/cl-who")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name "cl-who" version))
(sha256 (sha256
(base32 (base32
"0yjb6sr3yazm288m318kqvj9xk8rm9n1lpimgf65ymqv0i5agxsb")))) "0sc8nji9q1df04lhsiwsjy1a35996bibl31w5hp5sh8q6sa122dy"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(native-inputs (native-inputs
`(("sbcl-flexi-streams" ,sbcl-flexi-streams))) `(("sbcl-flexi-streams" ,sbcl-flexi-streams)))
@ -4010,17 +4022,17 @@ the format used by the popular compression tool bzip2.")
(define-public sbcl-drakma (define-public sbcl-drakma
(package (package
(name "sbcl-drakma") (name "sbcl-drakma")
(version "2.0.7") (version "2.0.8")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/edicl/drakma") (url "https://github.com/edicl/drakma")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name "cl-drakma" version))
(sha256 (sha256
(base32 (base32
"1441idnyif9xzx3ln1p3fg36k2v9h4wasjqrzc8y52j61420qpci")))) "1wf2zivfvhsh6zvd6wcwfd67bm8s8a1p2fismszc8xb819dqk9yl"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(inputs (inputs
`(("sbcl-puri" ,sbcl-puri) `(("sbcl-puri" ,sbcl-puri)

View File

@ -522,7 +522,7 @@ to run without any changes.")
(define-public fetchmail (define-public fetchmail
(package (package
(name "fetchmail") (name "fetchmail")
(version "6.4.22") (version "6.4.23")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -530,7 +530,7 @@ to run without any changes.")
(version-major+minor version) "/" (version-major+minor version) "/"
"fetchmail-" version ".tar.xz")) "fetchmail-" version ".tar.xz"))
(sha256 (sha256
(base32 "111cc6zfmb53f2a844iiyp3j2symcg8xd4m2kwb04mj3b6yihs6c")))) (base32 "001394gxji89hfh6jcdrmv9ndimdsz7bndd55i516c8lfc9mwyjz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("openssl" ,openssl))) `(("openssl" ,openssl)))
@ -604,7 +604,7 @@ operating systems.")
(define-public neomutt (define-public neomutt
(package (package
(name "neomutt") (name "neomutt")
(version "20211015") (version "20211029")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -613,7 +613,7 @@ operating systems.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "06rjx81ahrwcl1zhpdgqngr99l0cx1i4fwaaxd6rsn9zsj3ixdir")))) (base32 "1ad05k98z9r317k2hhxbgdic00iha5r0k0f8224anz60i9kc78w5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("cyrus-sasl" ,cyrus-sasl) `(("cyrus-sasl" ,cyrus-sasl)
@ -705,8 +705,7 @@ operating systems.")
(copy-recursively (assoc-ref inputs "neomutt-test-files") "tests") (copy-recursively (assoc-ref inputs "neomutt-test-files") "tests")
(with-directory-excursion "tests" (with-directory-excursion "tests"
(setenv "NEOMUTT_TEST_DIR" (getcwd)) ; must be absolute (setenv "NEOMUTT_TEST_DIR" (getcwd)) ; must be absolute
(invoke "bash" "setup.sh") (invoke "bash" "setup.sh")))))))
#t))))))
(home-page "https://neomutt.org/") (home-page "https://neomutt.org/")
(synopsis "Command-line mail reader based on Mutt") (synopsis "Command-line mail reader based on Mutt")
(description (description
@ -1170,15 +1169,15 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
(define-public mu (define-public mu
(package (package
(name "mu") (name "mu")
(version "1.6.6") (version "1.6.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/djcb/mu/releases/" (uri (string-append "https://github.com/djcb/mu/releases/"
"download/" version "/" "download/" version "-signed/"
"mu-" version ".tar.xz")) "mu-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1da3ykqnba3axggxyzsh3kjhy0rbdfdh9pnwprbzww56y8h3vka2")))) "0n5gvdz6vn6y69f5gx0gndjdl328qjbvi2q048qynhk99w5476cd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
@ -1234,7 +1233,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
(synopsis "Quickly find emails") (synopsis "Quickly find emails")
(description (description
"Mu is a tool for dealing with e-mail messages stored in the "Mu is a tool for dealing with e-mail messages stored in the
Maildir-format. Mu's purpose in life is to help you to quickly find the Maildir format. Mu's purpose in life is to help you to quickly find the
messages you need; in addition, it allows you to view messages, extract messages you need; in addition, it allows you to view messages, extract
attachments, create new maildirs, and so on.") attachments, create new maildirs, and so on.")
(license license:gpl3+))) (license license:gpl3+)))
@ -1735,14 +1734,14 @@ addons which can add many functionalities to the base client.")
(define-public msmtp (define-public msmtp
(package (package
(name "msmtp") (name "msmtp")
(version "1.8.16") (version "1.8.18")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://marlam.de/msmtp/releases/" (uri (string-append "https://marlam.de/msmtp/releases/"
"/msmtp-" version ".tar.xz")) "/msmtp-" version ".tar.xz"))
(sha256 (sha256
(base32 "1n271yr83grpki9szdirnk6wb5rcc319f0gmfabyw3fzyf4msjy0")))) (base32 "19b0anfrkg4lqp4h13qi2rqgwvipp1ga0id237nwbp7b6ypn5z0l"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("libsecret" ,libsecret) `(("libsecret" ,libsecret)
@ -1772,8 +1771,7 @@ addons which can add many functionalities to the base client.")
;; Don't rely on netcat being in the PATH to test for a ;; Don't rely on netcat being in the PATH to test for a
;; connection, instead look up and ping debian.org. ;; connection, instead look up and ping debian.org.
(substitute* (string-append bin "/msmtpq") (substitute* (string-append bin "/msmtpq")
(("EMAIL_CONN_TEST=n") "EMAIL_CONN_TEST=p")) (("EMAIL_CONN_TEST=n") "EMAIL_CONN_TEST=p"))))))))
#t))))))
(synopsis (synopsis
"Simple and easy to use SMTP client with decent sendmail compatibility") "Simple and easy to use SMTP client with decent sendmail compatibility")
(description (description
@ -2821,14 +2819,14 @@ easily (one at a time).")
(define-public mpop (define-public mpop
(package (package
(name "mpop") (name "mpop")
(version "1.4.14") (version "1.4.16")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://marlam.de/mpop/releases/" (uri (string-append "https://marlam.de/mpop/releases/"
"mpop-" version ".tar.xz")) "mpop-" version ".tar.xz"))
(sha256 (sha256
(base32 "046wbglvry54id9wik6c020fs09piv3gig3z0nh5nmyhsxjw4i18")))) (base32 "1yc7lsdy9gvlslvljqg34kvcaf4wvrwlvj6h5awkzlp6x9qva3l7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("gnutls" ,gnutls))) `(("gnutls" ,gnutls)))
@ -2848,15 +2846,14 @@ Names} and SOCKS proxies.")
(define-public mhonarc (define-public mhonarc
(package (package
(name "mhonarc") (name "mhonarc")
(version "2.6.19") (version "2.6.24")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/authors/id/E/EH/EHOOD/MHonArc-" (uri (string-append "mirror://cpan/authors/id/L/LD/LDIDRY/MHonArc-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "0cszh619i8bfjpyxhfgph20v8lic5zpirr990xdbg7759qvwfza5"))))
"0ll3v93yji334zqp6xfzfxc0127pmjcznmai1l5q6dzawrs2igzq"))))
(build-system perl-build-system) (build-system perl-build-system)
(home-page "https://www.mhonarc.org/") (home-page "https://www.mhonarc.org/")
(synopsis "Create HTML archives of mail/news messages") (synopsis "Create HTML archives of mail/news messages")

View File

@ -239,7 +239,7 @@ Its design goals are simplicity and stability.")
(define-public libgnt (define-public libgnt
(package (package
(name "libgnt") (name "libgnt")
(version "2.14.1") (version "2.14.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -247,7 +247,7 @@ Its design goals are simplicity and stability.")
(string-append "mirror://sourceforge/pidgin/libgnt/" (string-append "mirror://sourceforge/pidgin/libgnt/"
version "/libgnt-" version ".tar.xz")) version "/libgnt-" version ".tar.xz"))
(sha256 (sha256
(base32 "1n2bxg0ignn53c08cp69pj4sdg53kwlqn23rincyjmpr327fdhsy")))) (base32 "08v14fjcx2wx6c573wllq015l6zc8qkpz8rrl6qhp7crf9zlbxap"))))
(build-system meson-build-system) (build-system meson-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
@ -260,16 +260,14 @@ Its design goals are simplicity and stability.")
(("'/usr'") (("'/usr'")
(string-append "'" (string-append "'"
(assoc-ref inputs "ncurses") (assoc-ref inputs "ncurses")
"'"))) "'")))))
#t))
(add-before 'configure 'patch-docbook-xml (add-before 'configure 'patch-docbook-xml
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion "doc" (with-directory-excursion "doc"
(substitute* "libgnt-docs.xml" (substitute* "libgnt-docs.xml"
(("http://www.oasis-open.org/docbook/xml/4.1.2/") (("http://www.oasis-open.org/docbook/xml/4.1.2/")
(string-append (assoc-ref inputs "docbook-xml") (string-append (assoc-ref inputs "docbook-xml")
"/xml/dtd/docbook/")))) "/xml/dtd/docbook/"))))))
#t))
(add-after 'install 'move-doc (add-after 'install 'move-doc
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -277,8 +275,7 @@ Its design goals are simplicity and stability.")
(mkdir-p (string-append doc "/share")) (mkdir-p (string-append doc "/share"))
(rename-file (rename-file
(string-append out "/share/gtk-doc") (string-append out "/share/gtk-doc")
(string-append doc "/share/gtk-doc")) (string-append doc "/share/gtk-doc"))))))))
#t))))))
(native-inputs (native-inputs
`(("docbook-xml" ,docbook-xml-4.1.2) `(("docbook-xml" ,docbook-xml-4.1.2)
("glib:bin" ,glib "bin") ("glib:bin" ,glib "bin")
@ -1330,14 +1327,14 @@ default.")
(define-public prosody (define-public prosody
(package (package
(name "prosody") (name "prosody")
(version "0.11.9") (version "0.11.10")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://prosody.im/downloads/source/" (uri (string-append "https://prosody.im/downloads/source/"
"prosody-" version ".tar.gz")) "prosody-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"02gzvsaq0l5lx608sfh7hfz14s6yfsr4sr4kzcsqd1cxljp35h6c")))) "1q84s9cq7cgzd295qxa2iy0r3vd3v3chbck62bdx3pd6skk19my6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ;tests require "busted" `(#:tests? #f ;tests require "busted"
@ -1353,16 +1350,14 @@ default.")
;; The configure script aborts when it encounters unexpected ;; The configure script aborts when it encounters unexpected
;; arguments. Make it more tolerant. ;; arguments. Make it more tolerant.
(substitute* "configure" (substitute* "configure"
(("exit 1") "")) (("exit 1") ""))))
#t))
(add-after 'unpack 'fix-makefile (add-after 'unpack 'fix-makefile
(lambda _ (lambda _
(substitute* "GNUmakefile" (substitute* "GNUmakefile"
;; prosodyctl needs to read the configuration file. ;; prosodyctl needs to read the configuration file.
(("^INSTALLEDCONFIG =.*") "INSTALLEDCONFIG = /etc/prosody\n") (("^INSTALLEDCONFIG =.*") "INSTALLEDCONFIG = /etc/prosody\n")
;; prosodyctl needs a place to put auto-generated certificates. ;; prosodyctl needs a place to put auto-generated certificates.
(("^INSTALLEDDATA =.*") "INSTALLEDDATA = /var/lib/prosody\n")) (("^INSTALLEDDATA =.*") "INSTALLEDDATA = /var/lib/prosody\n"))))
#t))
(add-after 'install 'wrap-programs (add-after 'install 'wrap-programs
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure all executables in "bin" find the required Lua ;; Make sure all executables in "bin" find the required Lua
@ -1398,8 +1393,7 @@ default.")
`("LUA_PATH" ";" = (,lua-path)) `("LUA_PATH" ";" = (,lua-path))
`("LUA_CPATH" ";" = (,lua-cpath)) `("LUA_CPATH" ";" = (,lua-cpath))
`("PATH" ":" prefix ,path))) `("PATH" ":" prefix ,path)))
(find-files bin ".*")) (find-files bin ".*"))))))))
#t))))))
(inputs (inputs
`(("libidn" ,libidn) `(("libidn" ,libidn)
("openssl" ,openssl) ("openssl" ,openssl)

View File

@ -23,6 +23,7 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix utils)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages docbook)) #:use-module (gnu packages docbook))
@ -30,7 +31,7 @@
(define-public moreutils (define-public moreutils
(package (package
(name "moreutils") (name "moreutils")
(version "0.65") (version "0.66")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -38,7 +39,7 @@
"https://git.joeyh.name/index.cgi/moreutils.git/snapshot/" "https://git.joeyh.name/index.cgi/moreutils.git/snapshot/"
name "-" version ".tar.gz")) name "-" version ".tar.gz"))
(sha256 (sha256
(base32 "10c8b4bwnli4gxwvgmgkc5kin1ksrxsnxmigs7y4rrh4aaszdjb0")))) (base32 "0k91dvqy3jb070bkmhkdxhi05fr7hqlwpv1nrx329wmgi80rw1yw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; For building the manual pages. ;; For building the manual pages.
(native-inputs (native-inputs
@ -58,8 +59,7 @@
(let* ((out (assoc-ref outputs "out"))) (let* ((out (assoc-ref outputs "out")))
(wrap-program (wrap-program
(string-append out "/bin/ts") (string-append out "/bin/ts")
`("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))) `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB")))))))
#t))
(delete 'configure)) ; no configure script (delete 'configure)) ; no configure script
#:make-flags #:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")) (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
@ -67,7 +67,7 @@
(assoc-ref %build-inputs "docbook-xsl") "/xml/xsl/" (assoc-ref %build-inputs "docbook-xsl") "/xml/xsl/"
,(package-name docbook-xsl) "-" ,(package-name docbook-xsl) "-"
,(package-version docbook-xsl)) ,(package-version docbook-xsl))
"CC=gcc"))) (string-append "CC=" ,(cc-for-target)))))
(home-page "https://joeyh.name/code/moreutils/") (home-page "https://joeyh.name/code/moreutils/")
(synopsis "Miscellaneous general-purpose command-line tools") (synopsis "Miscellaneous general-purpose command-line tools")
(description (description

View File

@ -3357,14 +3357,14 @@ from the command line.")
(define-public qtractor (define-public qtractor
(package (package
(name "qtractor") (name "qtractor")
(version "0.9.23") (version "0.9.24")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://downloads.sourceforge.net/qtractor/" (uri (string-append "https://downloads.sourceforge.net/qtractor/"
"qtractor-" version ".tar.gz")) "qtractor-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1d2d884x5kfa41skwyh0ihyx5jgc9467617gmfjm379qcgnxq00s")))) "0bkr3ahpz54ssrvgkg3dw1jxp3hh7ayxr51jy3csm327is9gnd31"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f)) ; no "check" target `(#:tests? #f)) ; no "check" target

View File

@ -2269,14 +2269,14 @@ libproxy only have to specify which proxy to use.")
(define-public proxychains-ng (define-public proxychains-ng
(package (package
(name "proxychains-ng") (name "proxychains-ng")
(version "4.14") (version "4.15")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://ftp.barfooze.de/pub/sabotage/tarballs/" (uri (string-append "http://ftp.barfooze.de/pub/sabotage/tarballs/"
"proxychains-ng-" version ".tar.xz")) "proxychains-ng-" version ".tar.xz"))
(sha256 (sha256
(base32 "1bmhfbl1bzc87vl0xwr1wh5xvslfyc41nl2hqzhbj258p0sy004x")))) (base32 "10ch6rmbw2lwrq1bc9w4glxkws7hvsy5ihasvzf3yg053xzsn1rj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; there are no tests `(#:tests? #f ; there are no tests
@ -2289,12 +2289,10 @@ libproxy only have to specify which proxy to use.")
(substitute* "configure" (substitute* "configure"
(("\\*\\) break ;;" line) (("\\*\\) break ;;" line)
(string-append "[A-Z]*) shift ;;\n" (string-append "[A-Z]*) shift ;;\n"
line))) line)))))
#t))
(add-before 'configure 'set-up-environment (add-before 'configure 'set-up-environment
(lambda _ (lambda _
(setenv "CC" "gcc") (setenv "CC" ,(cc-for-target)))))))
#t)))))
(synopsis "Redirect any TCP connection through a proxy or proxy chain") (synopsis "Redirect any TCP connection through a proxy or proxy chain")
(description "Proxychains-ng is a preloader which hooks calls to sockets (description "Proxychains-ng is a preloader which hooks calls to sockets
in dynamically linked programs and redirects them through one or more SOCKS or in dynamically linked programs and redirects them through one or more SOCKS or
@ -2503,7 +2501,7 @@ procedure calls (RPCs).")
(define-public openvswitch (define-public openvswitch
(package (package
(name "openvswitch") (name "openvswitch")
(version "2.16.0") (version "2.16.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -2511,11 +2509,12 @@ procedure calls (RPCs).")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0sldyib85v5lh3qp9af0jgvf304pwdmjd0y7rknfwliykgjvgqsm")))) "1x0k0pw6jykrfgb8rq56bp2ghxd433d55pmr8mxy9gbzw1nc1vbi"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
'("--enable-shared" '("--enable-shared"
"--disable-static" ; XXX still installs libopenvswitchavx512.a
"--localstatedir=/var" "--localstatedir=/var"
"--with-dbdir=/var/lib/openvswitch") "--with-dbdir=/var/lib/openvswitch")
#:phases #:phases
@ -4216,32 +4215,34 @@ on hub/switched networks. It is based on @acronym{ARP} packets, it will send
(define-public putty (define-public putty
(package (package
(name "putty") (name "putty")
(version "0.75") (version "0.76")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.putty.be/" version (uri (list (string-append "https://the.earth.li/~sgtatham/putty/"
"/putty-" version ".tar.gz")) version "/putty-" version ".tar.gz")
(string-append "http://www.putty.be/" version
"/putty-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32 "0gvi8phabszqksj2by5jrjmshm7bpirhgavz0dqyz1xaimxdjz2l"))))
"1xgrr1fbirw79zafspg2b6crzfmlfw910y79md4r7gnxgq1kn5yk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'chdir (add-before 'configure 'chdir
(lambda _ (lambda _
(chdir "unix") (chdir "unix"))))))
#t)))))
(inputs (inputs
`(("gtk+" ,gtk+))) `(("gtk+" ,gtk+)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("python" ,python))) ; for tests ("python" ,python))) ; for tests
(synopsis "Graphical @acronym{SSH} and telnet client") (synopsis "Graphical @acronym{SSH, Secure SHell} and telnet client")
(description "Putty is a terminal client. It supports @acronym{SSH}, (description "PuTTY is a graphical text terminal client. It supports
telnet, and raw socket connections with good terminal emulation. It supports @acronym{SSH, Secure SHell}, telnet, and raw socket connections with good
public key authentication and Kerberos single-sign-on. It also includes terminal emulation. It can authenticate with public keys and Kerberos
command-line @acronym{SFTP} and @acronym{SCP} implementations.") single-sign-on. It also includes command-line @acronym{SFTP, Secure File
Transfer Protocol} and older @acronym{SCP, Secure Copy Protocol}
implementations.")
(home-page "https://www.chiark.greenend.org.uk/~sgtatham/putty/") (home-page "https://www.chiark.greenend.org.uk/~sgtatham/putty/")
(license license:expat))) (license license:expat)))

View File

@ -1,39 +0,0 @@
From edb930005b0ba83051ca8a59b493e9a3c8ef580a Mon Sep 17 00:00:00 2001
From: Chris Feng <chris.w.feng@gmail.com>
Date: Sun, 14 Jun 2020 00:00:00 +0000
Subject: [PATCH] Fix fullscreen states
* exwm-layout.el (exwm-layout-set-fullscreen,
exwm-layout-unset-fullscreen): Use `exwm--id' for interactive use.
(exwm-layout-unset-fullscreen): Mandatorily clear fullscreen states.
---
exwm-layout.el | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/exwm-layout.el b/exwm-layout.el
index 170c2be..79d0c95 100644
--- a/exwm-layout.el
+++ b/exwm-layout.el
@@ -205,7 +205,7 @@
:border-width 0
:stack-mode xcb:StackMode:Above))
(cl-pushnew xcb:Atom:_NET_WM_STATE_FULLSCREEN exwm--ewmh-state)
- (exwm-layout--set-ewmh-state id)
+ (exwm-layout--set-ewmh-state exwm--id)
(xcb:flush exwm--connection)
(set-window-dedicated-p (get-buffer-window) t)
(exwm-input--release-keyboard exwm--id)))
@@ -233,7 +233,9 @@
(let ((window (get-buffer-window nil t)))
(when window
(exwm-layout--show exwm--id window))))
- (exwm-layout--set-ewmh-state id)
+ (setq exwm--ewmh-state
+ (delq xcb:Atom:_NET_WM_STATE_FULLSCREEN exwm--ewmh-state))
+ (exwm-layout--set-ewmh-state exwm--id)
(xcb:flush exwm--connection)
(set-window-dedicated-p (get-buffer-window) nil)
(when (eq 'line-mode exwm--selected-input-mode)
--
2.26.2

View File

@ -1,24 +0,0 @@
From 0ae15d7e89b984f72780ff7afa8e57dd6ae7765a Mon Sep 17 00:00:00 2001
From: "Boris A. Dekshteyn" <boris.dekshteyn@gmail.com>
Date: Mon, 14 Jun 2021 23:52:16 +1200
Subject: [PATCH] Fix build witch GCC@7.5.
---
src/object/sp-use-reference.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/object/sp-use-reference.h b/src/object/sp-use-reference.h
index 5958632059..f07c2a3721 100644
--- a/src/object/sp-use-reference.h
+++ b/src/object/sp-use-reference.h
@@ -14,6 +14,7 @@
#include "sp-item.h"
#include "uri-references.h"
+#include "display/curve.h"
#include <memory>
--
2.32.0

View File

@ -2,6 +2,8 @@ https://sources.debian.org/data/main/r/rust-openssl-sys/0.9.53-1/debian/patches/
"MIT" licensed according to debian/copyright file "MIT" licensed according to debian/copyright file
slightly modified to only change the vendored openssl-src dependency slightly modified to only change the vendored openssl-src dependency
Starting from rust-openssl-sys@0.9.69 Cargo.toml starts searching for openssl-3.0.
--- a/Cargo.toml --- a/Cargo.toml
+++ b/Cargo.toml +++ b/Cargo.toml
@@ -31,14 +31,11 @@ @@ -31,14 +31,11 @@

View File

@ -284,14 +284,14 @@ please install the @code{flyer-composer-gui} package.")))
(define-public poppler-data (define-public poppler-data
(package (package
(name "poppler-data") (name "poppler-data")
(version "0.4.10") (version "0.4.11")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://poppler.freedesktop.org/poppler-data" (uri (string-append "https://poppler.freedesktop.org/poppler-data"
"-" version ".tar.gz")) "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0c3vjs3p7rjc4yfacnhd865r27czmzwcr4j2z4jldi68dvvcwbvf")))) "137h4m48gc4v0srnr0gkwaqna6kfdqpy5886if5gjfmh3g6hbv1c"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no test suite '(#:tests? #f ; no test suite
@ -1104,13 +1104,13 @@ the PDF pages.")
(define-public img2pdf (define-public img2pdf
(package (package
(name "img2pdf") (name "img2pdf")
(version "0.4.2") (version "0.4.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "img2pdf" version)) (uri (pypi-uri "img2pdf" version))
(sha256 (sha256
(base32 "18kr8j31rrcfs3fiav552d23hv2lbv48ag5hpx9kw4fn0djmikxa")))) (base32 "17z0bn8kihiyqjd1m5jr80m7ry06l1qn0l8v918xg5gs7q2calcf"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-pikepdf" ,python-pikepdf) `(("python-pikepdf" ,python-pikepdf)

View File

@ -283,7 +283,7 @@ sound server.")
(define-public pavucontrol (define-public pavucontrol
(package (package
(name "pavucontrol") (name "pavucontrol")
(version "4.0") (version "5.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -292,11 +292,12 @@ sound server.")
".tar.xz")) ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1qhlkl3g8d7h72xjskii3g1l7la2cavwp69909pzmbi2jyn5pi4g")))) "0yjfiwpaydh5s8v3l78dhwhbsmcl1xsq3p8rvz80m9zinp1p4ayf"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(inputs (inputs
`(("adwaita-icon-theme" ,adwaita-icon-theme) ;hard-coded theme `(("adwaita-icon-theme" ,adwaita-icon-theme) ;hard-coded theme
("gtkmm" ,gtkmm-3) ("gtkmm" ,gtkmm-3)
("json-glib" ,json-glib)
("libcanberra" ,libcanberra) ("libcanberra" ,libcanberra)
("pulseaudio" ,pulseaudio))) ("pulseaudio" ,pulseaudio)))
(native-inputs (native-inputs
@ -433,7 +434,7 @@ install one or more of the following packages alongside pulseaudio-dlna:
(define-public pamixer (define-public pamixer
(package (package
(name "pamixer") (name "pamixer")
(version "1.4") (version "1.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -442,19 +443,18 @@ install one or more of the following packages alongside pulseaudio-dlna:
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1i14550n8paijwwnhksv5izgfqm3s5q2773bdfp6vyqybkll55f7")))) (base32 "1d5arjbsh3q9z693pi2rq553ai9b18iz36ss7q8ff29m0hf62lzd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; There is no test suite. `(#:tests? #f ; no test suite
#:make-flags #:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))) (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) ; There's no configure phase. (delete 'configure) ; no configure script
(add-before 'install 'mkdir-bin (add-before 'install 'mkdir-bin
(lambda _ (lambda _
(mkdir-p (string-append (assoc-ref %outputs "out") "/bin")) (mkdir-p (string-append (assoc-ref %outputs "out") "/bin")))))))
#t)))))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("pulseaudio" ,pulseaudio))) ("pulseaudio" ,pulseaudio)))

View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 John Soo <jsoo1@asu.edu> ;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
;;; Copyright © 2020 Bonface Munyoki Kilyungi <bonfacemunyoki@gmail.com> ;;; Copyright © 2020 Bonface Munyoki Kilyungi <bonfacemunyoki@gmail.com>
;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -33,7 +34,7 @@
(define-public purescript (define-public purescript
(package (package
(name "purescript") (name "purescript")
(version "0.14.4") (version "0.14.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -42,8 +43,7 @@
version version
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 (base32 "06f318hdah076vkviw1ryyg2p0gpbabsp8lbm5x03f2qv92n9j1n"))))
"0qda90yycv2yyjdpfqvmsnxbyxpx55b53cfp9rgnbhbrskr0w2vk"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-glob" ,ghc-glob) `(("ghc-glob" ,ghc-glob)

View File

@ -5266,18 +5266,19 @@ Some things HTTP Core does do:
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda _ (lambda* (#:key tests? #:allow-other-keys)
(invoke "pytest" "-vv" "-k" (when tests?
;; These tests try to open an outgoing connection. (invoke "pytest" "-vv" "-k"
(string-append ;; These tests try to open an outgoing connection.
"not test_connect_timeout" (string-append
" and not test_that_send_cause_async_client_to_be_not_" "not test_connect_timeout"
"closed" " and not test_that_send_cause_async_client_to_be_not_"
" and not test_that_async_client_caused_warning_when_" "closed"
"being_deleted" " and not test_that_async_client_caused_warning_when_"
" and not test_that_send_cause_client_to_be_not_closed" "being_deleted"
" and not test_async_proxy_close" " and not test_that_send_cause_client_to_be_not_closed"
" and not test_sync_proxy_close"))))))) " and not test_async_proxy_close"
" and not test_sync_proxy_close"))))))))
(native-inputs (native-inputs
`(("python-autoflake" ,python-autoflake) `(("python-autoflake" ,python-autoflake)
("python-black" ,python-black) ("python-black" ,python-black)

View File

@ -16491,10 +16491,10 @@ binary or text.")
`(("python2-enum34" ,python2-enum34) `(("python2-enum34" ,python2-enum34)
,@(package-propagated-inputs base)))))) ,@(package-propagated-inputs base))))))
(define-public python-binwalk (define-public binwalk
(package (package
(name "python-binwalk") (name "binwalk")
(version "2.2.0") (version "2.3.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -16503,8 +16503,7 @@ binary or text.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "01dalxw07c42ka4fqpixcacvy42h04ya909lzpmsblr9s2xdgwcm"))))
"1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -16521,6 +16520,9 @@ binary or text.")
extracting firmware images") extracting firmware images")
(license license:expat))) (license license:expat)))
(define-public python-binwalk
(deprecated-package "python-binwalk" binwalk))
(define-public python-nltk (define-public python-nltk
(package (package
(name "python-nltk") (name "python-nltk")

View File

@ -396,14 +396,14 @@ many event types, including timers, signals, and the classic file descriptor eve
(define-public ldb (define-public ldb
(package (package
(name "ldb") (name "ldb")
(version "2.4.0") (version "2.4.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.samba.org/ftp/ldb/ldb-" (uri (string-append "https://www.samba.org/ftp/ldb/ldb-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"10rd1z2llqz8xdx6m7yyxb9a118gx2xxwri18bhkkab9n1w55rvn")) "13yd7lavbx8bxwnmzl0j7xnl2gl4wmnn0q9g7n3y7bvbnhm07hb9"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -412,8 +412,7 @@ many event types, including timers, signals, and the classic file descriptor eve
(unless (or (string-prefix? "third_party/waf" file) (unless (or (string-prefix? "third_party/waf" file)
(string-suffix? "wscript" file)) (string-suffix? "wscript" file))
(delete-file file))) (delete-file file)))
(find-files "third_party")) (find-files "third_party"))))))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(;; LMDB is only supported on 64-bit systems, yet the test suite '(;; LMDB is only supported on 64-bit systems, yet the test suite

View File

@ -803,14 +803,14 @@ interactive POSIX shell targeted at resource-constrained systems.")
(define-public mksh (define-public mksh
(package (package
(name "mksh") (name "mksh")
(version "58") (version "59c")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R" (uri (string-append "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R"
version ".tgz")) version ".tgz"))
(sha256 (sha256
(base32 "1337zjvzh14yncg9igdry904a3ns52l8rnm1kcq262w7f5xyp2v0")))) (base32 "01n5ggw33bw4jv4d3148wlw9n4aj7vdn3ffnc66c9w9pldjidbkp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; tests require access to /dev/tty `(#:tests? #f ; tests require access to /dev/tty
@ -829,8 +829,7 @@ interactive POSIX shell targeted at resource-constrained systems.")
(install-file "mksh" bin) (install-file "mksh" bin)
(with-directory-excursion bin (with-directory-excursion bin
(symlink "mksh" "ksh")) (symlink "mksh" "ksh"))
(install-file "mksh.1" man) (install-file "mksh.1" man)))))))
#t))))))
(home-page "https://www.mirbsd.org/mksh.htm") (home-page "https://www.mirbsd.org/mksh.htm")
(synopsis "Korn Shell from MirBSD") (synopsis "Korn Shell from MirBSD")
(description "mksh is an actively developed free implementation of the (description "mksh is an actively developed free implementation of the
@ -842,14 +841,14 @@ Shell (pdksh).")
(define-public oil (define-public oil
(package (package
(name "oil") (name "oil")
(version "0.9.2") (version "0.9.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.oilshell.org/download/oil-" (uri (string-append "https://www.oilshell.org/download/oil-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0mqf2wmc1p6xr2l54pxv97d0s23wqm1mwwgyzn06aafr93dy3vkg")))) (base32 "1js5i25wgvz7avsrfygxy96axanc97yvlc69arp0ja9vkcrxv5px"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:strip-binaries? #f ; strip breaks the binary `(#:strip-binaries? #f ; strip breaks the binary

View File

@ -738,7 +738,7 @@ eye-candy, customizable, and reasonably lightweight.")
(define-public foot (define-public foot
(package (package
(name "foot") (name "foot")
(version "1.6.3") (version "1.9.2")
(home-page "https://codeberg.org/dnkl/foot") (home-page "https://codeberg.org/dnkl/foot")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -746,7 +746,7 @@ eye-candy, customizable, and reasonably lightweight.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0rm7w29wf3gipf69qf7s42qw8857z74gsigrpz9g6vvd1x58f03m")))) "15h01ijx87i60bdgjjap1ymwlxggsxc6iziykh3bahj8432s1836"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(;; Using a "release" build is recommended both for performance, and `(;; Using a "release" build is recommended both for performance, and

View File

@ -1076,7 +1076,7 @@ H.264 (MPEG-4 AVC) video streams.")
(define-public pipe-viewer (define-public pipe-viewer
(package (package
(name "pipe-viewer") (name "pipe-viewer")
(version "0.1.4") (version "0.1.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1086,7 +1086,7 @@ H.264 (MPEG-4 AVC) video streams.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0d8b3gcr9dndw8qlwfrm0wgp4vjmn8fwd151kmzz7kkw57f5jfch")))) (base32 "075xc5kvnmyqqj7zijvdrvbkna931h7xf8f8z0ick7yx5fy3pn5j"))))
(build-system perl-build-system) (build-system perl-build-system)
(arguments (arguments
`(#:imported-modules `(#:imported-modules
@ -1704,17 +1704,6 @@ convert and stream audio and video. It includes the libavcodec
audio/video codec library.") audio/video codec library.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public ffmpeg-4.3
(package/inherit ffmpeg
(version "4.3.2")
(source (origin
(method url-fetch)
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
version ".tar.xz"))
(sha256
(base32
"1nyd9jlcy0pqnwzi29a7sg50hq37vb0g3f9l16y3q8yh3m7ydr26"))))))
(define-public ffmpeg-3.4 (define-public ffmpeg-3.4
(package (package
(inherit ffmpeg) (inherit ffmpeg)
@ -2098,7 +2087,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
(define-public mpv (define-public mpv
(package (package
(name "mpv") (name "mpv")
(version "0.33.1") (version "0.34.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2106,8 +2095,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "0kqckrgvpx42gdmnc644lpwbimwf1am256xd670w2b8sbrjv3bm9"))))
"06rw1f55zcsj78ql8w70j9ljp2qb1pv594xj7q9cmq7i92a7hq45"))))
(build-system waf-build-system) (build-system waf-build-system)
(native-inputs (native-inputs
`(("perl" ,perl) ; for zsh completion file `(("perl" ,perl) ; for zsh completion file
@ -2151,19 +2139,17 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
("wayland" ,wayland) ("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols) ("wayland-protocols" ,wayland-protocols)
("libxkbcommon" ,libxkbcommon) ("libxkbcommon" ,libxkbcommon)
("youtube-dl" ,youtube-dl) ("yt-dlp" ,yt-dlp)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after (add-after 'unpack 'patch-paths
'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys)
(lambda* (#:key inputs #:allow-other-keys) (let ((ytdl (assoc-ref inputs "yt-dlp")))
(let ((ytdl (assoc-ref inputs "youtube-dl"))) (substitute* "player/lua/ytdl_hook.lua"
(substitute* "player/lua/ytdl_hook.lua" (("\"yt-dlp\",")
(("\"youtube-dl\",") (string-append "\"" ytdl "/bin/yt-dlp\","))))))
(string-append "\"" ytdl "/bin/youtube-dl\",")))
#t)))
(add-before 'configure 'build-reproducibly (add-before 'configure 'build-reproducibly
(lambda _ (lambda _
;; Somewhere in the build system library dependencies are enumerated ;; Somewhere in the build system library dependencies are enumerated
@ -4661,7 +4647,7 @@ create smoother and stable videos.")
(define-public libopenshot (define-public libopenshot
(package (package
(name "libopenshot") (name "libopenshot")
(version "0.2.5") (version "0.2.7")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -4670,11 +4656,11 @@ create smoother and stable videos.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1mxjkgjmjzgf628y3rscc6rqf55hxgjpmvwxlncfk1216i5xskwp")) "0i9bsn8gklm1mvj60l3d3xrxdgy8svpxjfqcwsr308j5zjn30pv8"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet '(begin (snippet '(begin
;; Allow overriding of the python installation dir ;; Allow overriding of the python installation dir
(substitute* "src/bindings/python/CMakeLists.txt" (substitute* "bindings/python/CMakeLists.txt"
(("(SET\\(PYTHON_MODULE_PATH.*)\\)" _ set) (("(SET\\(PYTHON_MODULE_PATH.*)\\)" _ set)
(string-append set " CACHE PATH " (string-append set " CACHE PATH "
"\"Python bindings directory\")"))) "\"Python bindings directory\")")))
@ -4686,11 +4672,12 @@ create smoother and stable videos.")
("python" ,python) ("python" ,python)
("swig" ,swig) ("swig" ,swig)
("unittest++" ,unittest-cpp))) ("unittest++" ,unittest-cpp)))
(inputs
`(("alsa-lib" ,alsa-lib)
("zlib" ,zlib)))
(propagated-inputs ;all referenced in installed headers (propagated-inputs ;all referenced in installed headers
`(("cppzmq" ,cppzmq) `(("cppzmq" ,cppzmq)
;; libopenshot doesn't yet build with ffmpeg 4.4 (see: ("ffmpeg" ,ffmpeg)
;; https://github.com/OpenShot/libopenshot/issues/676).
("ffmpeg" ,ffmpeg-4.3)
("imagemagick" ,imagemagick) ("imagemagick" ,imagemagick)
("jsoncpp" ,jsoncpp) ("jsoncpp" ,jsoncpp)
("libopenshot-audio" ,libopenshot-audio) ("libopenshot-audio" ,libopenshot-audio)
@ -4724,7 +4711,7 @@ API. It includes bindings for Python, Ruby, and other languages.")
(define-public openshot (define-public openshot
(package (package
(name "openshot") (name "openshot")
(version "2.5.1") (version "2.6.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -4733,7 +4720,7 @@ API. It includes bindings for Python, Ruby, and other languages.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0qc5i0ay6j2wab1whl41sjb71cj02pg6y79drf7asrprq8b2rmfq")) "0pa8iwl217503bjlqg2zlrw5lxyq5hvxrf5apxrh3843hj1w1myv"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -4758,9 +4745,10 @@ API. It includes bindings for Python, Ruby, and other languages.")
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(delete 'build) ;install phase does all the work (delete 'build) ;install phase does all the work
(replace 'check (replace 'check
(lambda _ (lambda* (#:key tests? #:allow-other-keys)
(setenv "QT_QPA_PLATFORM" "offscreen") (when tests?
(invoke "python" "src/tests/query_tests.py"))) (setenv "QT_QPA_PLATFORM" "offscreen")
(invoke "python" "src/tests/query_tests.py"))))
(add-after 'unpack 'patch-font-location (add-after 'unpack 'patch-font-location
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((font (assoc-ref inputs "font-dejavu"))) (let ((font (assoc-ref inputs "font-dejavu")))
@ -4769,6 +4757,12 @@ API. It includes bindings for Python, Ruby, and other languages.")
(("fonts") "share/fonts/truetype") (("fonts") "share/fonts/truetype")
(("[A-Za-z_-]+.ttf") "DejaVuSans.ttf"))) (("[A-Za-z_-]+.ttf") "DejaVuSans.ttf")))
#t)) #t))
;; https://github.com/OpenShot/openshot-qt/issues/4502
(add-before 'ensure-no-mtimes-pre-1980 'fix-symbolic-link
(lambda _
(delete-file "images/Humanity/actions/custom/razor_line_with_razor.png")
(symlink "../../../../src/timeline/media/images/razor_line_with_razor.png"
"images/Humanity/actions/custom/razor_line_with_razor.png")))
(add-before 'install 'set-tmp-home (add-before 'install 'set-tmp-home
(lambda _ (lambda _
;; src/classes/info.py "needs" to create several ;; src/classes/info.py "needs" to create several

View File

@ -11,6 +11,7 @@
;;; Copyright © 2020, 2021 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2020, 2021 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Tissevert <tissevert+guix@marvid.fr> ;;; Copyright © 2021 Tissevert <tissevert+guix@marvid.fr>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -43,6 +44,7 @@
#:use-module (gnu packages attr) #:use-module (gnu packages attr)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages code)
#:use-module (gnu packages enlightenment) #:use-module (gnu packages enlightenment)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages gawk) #:use-module (gnu packages gawk)
@ -390,8 +392,8 @@ trouble using them, because you do not have to remember each snippet name.")
(license license:expat)))) (license license:expat))))
(define-public vim-scheme (define-public vim-scheme
(let ((commit "99af6befee8bc7d289a523064336474ae063cee3") (let ((commit "e22fc8e199ef52f2efacd08e71c3add90d83b375")
(revision "2")) (revision "3"))
(package (package
(name "vim-scheme") (name "vim-scheme")
(version (git-version "0.0.0" revision commit)) (version (git-version "0.0.0" revision commit))
@ -399,12 +401,12 @@ trouble using them, because you do not have to remember each snippet name.")
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "http://git.foldling.org/vim-scheme.git") (url "https://git.foldling.org/vim-scheme.git")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0w9hnsxg92f1wd83rra0ss07zla7p2r44whr9rqs70hc0xm8ygd6")))) "04h946vr4f8wxap3wzqs69y2v8n50g2zbk22jsg2kxr4c01z5cbw"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
'(#:install-plan '(#:install-plan
@ -415,7 +417,7 @@ trouble using them, because you do not have to remember each snippet name.")
(description (description
"@code{vim-scheme} provides Scheme support for Vim (R7RS and CHICKEN).") "@code{vim-scheme} provides Scheme support for Vim (R7RS and CHICKEN).")
(home-page "https://foldling.org/git/vim-scheme.git/") (home-page "https://foldling.org/git/vim-scheme.git/")
(license license:public-domain)))) (license license:unlicense))))
(define-public vim-luna (define-public vim-luna
(let ((commit "633619953dcf8577168e255230f96b05f28d6371") (let ((commit "633619953dcf8577168e255230f96b05f28d6371")
@ -1217,3 +1219,78 @@ text object. The signs are always up to date and the plugin never saves your
buffer.") buffer.")
(home-page "https://github.com/airblade/vim-gitgutter") (home-page "https://github.com/airblade/vim-gitgutter")
(license license:expat)))) (license license:expat))))
(define-public vim-characterize
(package
(name "vim-characterize")
(version "1.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tpope/vim-characterize")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0ppsbsd696ih40d9f76mdl9sd9y7p2pvm65qmvq4b2zhkv4xbpxz"))))
(build-system copy-build-system)
(arguments
'(#:install-plan
'(("autoload" "share/vim/vimfiles/")
("doc" "share/vim/vimfiles/")
("plugin" "share/vim/vimfiles/"))))
(home-page "https://github.com/tpope/vim-characterize")
(synopsis "Vim plugin for showing Unicode character metadata")
(description
"In Vim, pressing @code{ga} on a character reveals its representation in
decimal, octal, and hex. Characterize.vim modernizes this with the following
additions:
@itemize
@item Unicode character names: @code{U+00A9 COPYRIGHT SYMBOL}
@item Vim digraphs (type after @code{<C-K>} to insert the character):
@code{Co}, @code{cO}
@item Emoji codes: @code{:copyright:}
@item HTML entities: @code{&copy;}
@end itemize")
(license license:vim)))
(define-public vim-tagbar
(package
(name "vim-tagbar")
(version "3.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/preservim/tagbar")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1fqfs8msmr6d4kpvxqp14sdjvp5fj52q5w5kz71myzcd4kqzmirp"))))
(build-system copy-build-system)
(arguments
'(#:install-plan
'(("autoload" "share/vim/vimfiles/")
("doc" "share/vim/vimfiles/")
("plugin" "share/vim/vimfiles/")
("syntax" "share/vim/vimfiles/"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'link-univerisal-ctags
(lambda* (#:key inputs #:allow-other-keys)
(let ((ctags (assoc-ref inputs "universal-ctags")))
(substitute* "autoload/tagbar.vim"
(("(.*)universal-ctags']" all leader)
(string-append all "\n"
leader ctags "/bin/ctags']")))))))))
(inputs
`(("universal-ctags" ,universal-ctags)))
(home-page "https://github.com/preservim/tagbar")
(synopsis "Vim plugin that displays tags in a window, ordered by scope")
(description
"Tagbar is a Vim plugin that provides an easy way to browse the tags of
the current file and get an overview of its structure. It does this by creating
a sidebar that displays the ctags-generated tags of the current file, ordered
by their scope. This means that for example methods in C++ are displayed under
the class they are defined in.")
(license license:vim)))

View File

@ -2,7 +2,7 @@
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 20152021 Mark H Weaver <mhw@netris.org>
;;; Copyright © 20182021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 20182021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
@ -40,6 +40,7 @@
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
@ -51,6 +52,7 @@
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages libreoffice) #:use-module (gnu packages libreoffice)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
@ -226,14 +228,14 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.")
(define-public webkitgtk (define-public webkitgtk
(package (package
(name "webkitgtk") (name "webkitgtk")
(version "2.32.4") (version "2.34.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/" (uri (string-append "https://www.webkitgtk.org/releases/"
"webkitgtk-" version ".tar.xz")) "webkitgtk-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1zfkfyhm4i7901pp32wcwcfxax69qgq5k44x0glwaywdg4zjvkh0")) "1vix0w24m7mq82rzxrk8xvcrkli44gimzs282xs29q2xf0b16g24"))
(patches (search-patches "webkitgtk-share-store.patch" (patches (search-patches "webkitgtk-share-store.patch"
"webkitgtk-bind-all-fonts.patch")))) "webkitgtk-bind-all-fonts.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
@ -252,6 +254,9 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.")
"-DLIB_INSTALL_DIR=" "-DLIB_INSTALL_DIR="
(assoc-ref %outputs "out") "/lib") (assoc-ref %outputs "out") "/lib")
;; XXX TODO: Use libsoup@3.
"-DUSE_SOUP2=ON"
;; XXX Adding GStreamer GL support would apparently ;; XXX Adding GStreamer GL support would apparently
;; require adding gst-plugins-bad to the inputs, ;; require adding gst-plugins-bad to the inputs,
;; which might entail a security risk as a result of ;; which might entail a security risk as a result of
@ -290,6 +295,11 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.")
(("libWPEBackend-fdo-([\\.0-9]+)\\.so" all version) (("libWPEBackend-fdo-([\\.0-9]+)\\.so" all version)
(string-append wpebackend-fdo "/lib/" all))) (string-append wpebackend-fdo "/lib/" all)))
#t))) #t)))
(add-before 'configure 'prepare-build-environment
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CC" "clang")
(setenv "CXX" "clang++")
#t))
(add-after 'install 'move-doc-files (add-after 'install 'move-doc-files
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
@ -299,7 +309,8 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.")
(string-append doc "/share/gtk-doc")) (string-append doc "/share/gtk-doc"))
#t)))))) #t))))))
(native-inputs (native-inputs
`(("bison" ,bison) `(("clang" ,clang-11)
("bison" ,bison)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection) ("gobject-introspection" ,gobject-introspection)
@ -323,6 +334,7 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.")
("harfbuzz" ,harfbuzz) ("harfbuzz" ,harfbuzz)
("hyphen" ,hyphen) ("hyphen" ,hyphen)
("icu4c" ,icu4c) ("icu4c" ,icu4c)
("lcms" ,lcms)
("libgcrypt" ,libgcrypt) ("libgcrypt" ,libgcrypt)
("libjpeg" ,libjpeg-turbo) ("libjpeg" ,libjpeg-turbo)
("libnotify" ,libnotify) ("libnotify" ,libnotify)

View File

@ -359,10 +359,7 @@ DELIMITER interposed LS. Support 'infix and 'suffix GRAMMAR values."
(G_ "The GRAMMAR value must be 'infix or 'suffix, but ~a provided.") (G_ "The GRAMMAR value must be 'infix or 'suffix, but ~a provided.")
grammar))) grammar)))
(fold-right (lambda (e acc) (fold-right (lambda (e acc)
(cons #~(begin (cons e
(use-modules (ice-9 rdelim))
(with-fluids ((%default-port-encoding "UTF-8"))
(with-input-from-file #$e read-string)))
(if (and (null? acc) (eq? grammar 'infix)) (if (and (null? acc) (eq? grammar 'infix))
acc acc
(cons delimiter acc)))) (cons delimiter acc))))
@ -387,7 +384,16 @@ the list result in @code{#t} when applying PRED? on them."
(define (text-config? config) (define (text-config? config)
(list-of file-like?)) (list-of file-like?))
(define (serialize-text-config field-name val) (define (serialize-text-config field-name val)
#~(string-append #$@(interpose val "\n" 'suffix))) #~(string-append
#$@(interpose
(map
(lambda (e)
#~(begin
(use-modules (ice-9 rdelim))
(with-fluids ((%default-port-encoding "UTF-8"))
(with-input-from-file #$e read-string))))
val)
"\n" 'suffix)))
(define ((generic-serialize-alist-entry serialize-field) entry) (define ((generic-serialize-alist-entry serialize-field) entry)
"Apply the SERIALIZE-FIELD procedure on the field and value of ENTRY." "Apply the SERIALIZE-FIELD procedure on the field and value of ENTRY."

View File

@ -48,7 +48,7 @@
(make-parameter "https://www.stackage.org")) (make-parameter "https://www.stackage.org"))
;; Latest LTS version compatible with current GHC. ;; Latest LTS version compatible with current GHC.
(define %default-lts-version "18.10") (define %default-lts-version "18.14")
(define-json-mapping <stackage-lts> make-stackage-lts (define-json-mapping <stackage-lts> make-stackage-lts
stackage-lts? stackage-lts?