me
/
guix
Archived
1
0
Fork 0
Code

Merge branch 'master' into staging

master
Marius Bakke 2022-07-27 12:33:53 +02:00
parent 7aad4a99f7 25d59733a5
commit 6611cabd1c
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
48 changed files with 1447 additions and 750 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
doc/guix.texi
View File

@ -5276,8 +5276,7 @@ but also the package modules from your own repository. The result in
modules: modules:
@example @example
$ guix pull --list-generations $ guix describe
@dots{}
Generation 19 Aug 27 2018 16:20:48 Generation 19 Aug 27 2018 16:20:48
guix d894ab8 guix d894ab8
repository URL: https://git.savannah.gnu.org/git/guix.git repository URL: https://git.savannah.gnu.org/git/guix.git
@ -5287,16 +5286,13 @@ Generation 19 Aug 27 2018 16:20:48
repository URL: https://example.org/variant-packages.git repository URL: https://example.org/variant-packages.git
branch: master branch: master
commit: dd3df5e2c8818760a8fc0bd699e55d3b69fef2bb commit: dd3df5e2c8818760a8fc0bd699e55d3b69fef2bb
11 new packages: variant-gimp, variant-emacs-with-cool-features, @dots{}
4 packages upgraded: emacs-racket-mode@@0.0.2-2.1b78827, @dots{}
@end example @end example
@noindent @noindent
The output of @command{guix pull} above shows that Generation@tie{}19 includes The output of @command{guix describe} above shows that we're now running
both Guix and packages from the @code{variant-personal-packages} channel. Among Generation@tie{}19 and that it includes
the new and upgraded packages that are listed, some like @code{variant-gimp} and both Guix and packages from the @code{variant-personal-packages} channel
@code{variant-emacs-with-cool-features} might come from (@pxref{Invoking guix describe}).
@code{variant-packages}, while others come from the Guix default channel.
@node Using a Custom Guix Channel @node Using a Custom Guix Channel
@section Using a Custom Guix Channel @section Using a Custom Guix Channel
@ -5326,10 +5322,11 @@ addressed below (@pxref{Channel Authentication}).
@cindex pinning, channels @cindex pinning, channels
@cindex replicating Guix @cindex replicating Guix
@cindex reproducibility, of Guix @cindex reproducibility, of Guix
The @command{guix pull --list-generations} output above shows precisely which The @command{guix describe} command shows precisely which commits were
commits were used to build this instance of Guix. We can thus replicate it, used to build the instance of Guix we're using (@pxref{Invoking guix
say, on another machine, by providing a channel specification in describe}). We can replicate this instance on another machine or at a
@file{~/.config/guix/channels.scm} that is ``pinned'' to these commits: different point in time by providing a channel specification ``pinned''
to these commits that looks like this:
@lisp @lisp
;; Deploy specific commits of my channels of interest. ;; Deploy specific commits of my channels of interest.
@ -5343,18 +5340,36 @@ say, on another machine, by providing a channel specification in
(commit "dd3df5e2c8818760a8fc0bd699e55d3b69fef2bb"))) (commit "dd3df5e2c8818760a8fc0bd699e55d3b69fef2bb")))
@end lisp @end lisp
The @command{guix describe --format=channels} command can even generate this To obtain this pinned channel specification, the easiest way is to run
list of channels directly (@pxref{Invoking guix describe}). The resulting @command{guix describe} and to save its output in the @code{channels}
file can be used with the @option{-C} option of @command{guix pull} format in a file, like so:
(@pxref{Invoking guix pull}) or @command{guix time-machine}
(@pxref{Invoking guix time-machine}).
At this point the two machines run the @emph{exact same Guix}, with access to @example
the @emph{exact same packages}. The output of @command{guix build gimp} on guix describe -f channels > channels.scm
one machine will be exactly the same, bit for bit, as the output of the same @end example
command on the other machine. It also means both machines have access to all
the source code of Guix and, transitively, to all the source code of every The resulting @file{channels.scm} file can be passed to the @option{-C}
package it defines. option of @command{guix pull} (@pxref{Invoking guix pull}) or
@command{guix time-machine} (@pxref{Invoking guix time-machine}), as in
this example:
@example
guix time-machine -C channels.scm -- shell python -- python3
@end example
Given the @file{channels.scm} file, the command above will always fetch
the @emph{exact same Guix instance}, then use that instance to run the
exact same Python (@pxref{Invoking guix shell}). On any machine, at any
time, it ends up running the exact same binaries, bit for bit.
@cindex lock files
Pinned channels address a problem similar to ``lock files'' as
implemented by some deployment tools---they let you pin and reproduce a
set of packages. In the case of Guix though, you are effectively
pinning the entire package set as defined at the given channel commits;
in fact, you are pinning all of Guix, including its core modules and
command-line tools. You're also getting strong guarantees that you are,
indeed, obtaining the exact same software.
This gives you super powers, allowing you to track the provenance of binary This gives you super powers, allowing you to track the provenance of binary
artifacts with very fine grain, and to reproduce software environments at artifacts with very fine grain, and to reproduce software environments at

7
gnu/local.mk
View File

@ -1018,8 +1018,7 @@ dist_patch_DATA = \
%D%/packages/patches/ecl-16-libffi.patch \ %D%/packages/patches/ecl-16-libffi.patch \
%D%/packages/patches/efibootmgr-remove-extra-decl.patch \ %D%/packages/patches/efibootmgr-remove-extra-decl.patch \
%D%/packages/patches/efivar-211.patch \ %D%/packages/patches/efivar-211.patch \
%D%/packages/patches/eigen-remove-openmp-error-counting.patch \ %D%/packages/patches/eigen-fix-strict-aliasing-bug.patch \
%D%/packages/patches/eigen-stabilise-sparseqr-test.patch \
%D%/packages/patches/einstein-build.patch \ %D%/packages/patches/einstein-build.patch \
%D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \
%D%/packages/patches/elixir-path-length.patch \ %D%/packages/patches/elixir-path-length.patch \
@ -1632,8 +1631,8 @@ dist_patch_DATA = \
%D%/packages/patches/perl-www-curl-fix-struct-void.patch \ %D%/packages/patches/perl-www-curl-fix-struct-void.patch \
%D%/packages/patches/perl-www-curl-remove-symbol.patch \ %D%/packages/patches/perl-www-curl-remove-symbol.patch \
%D%/packages/patches/phoronix-test-suite-fsdg.patch \ %D%/packages/patches/phoronix-test-suite-fsdg.patch \
%D%/packages/patches/php-bug-74093-test.patch \ %D%/packages/patches/php-bug-74093-test.patch \
%D%/packages/patches/php-openssl_x509_checkpurpose_basic.patch \ %D%/packages/patches/php-curl-compat.patch \
%D%/packages/patches/picard-fix-id3-rename-test.patch \ %D%/packages/patches/picard-fix-id3-rename-test.patch \
%D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/picprog-non-intel-support.patch \
%D%/packages/patches/pidgin-add-search-path.patch \ %D%/packages/patches/pidgin-add-search-path.patch \

19
gnu/packages/algebra.scm
View File

@ -986,20 +986,17 @@ extends it by a set of algebraic capabilities.")
(define-public eigen (define-public eigen
(package (package
(name "eigen") (name "eigen")
(version "3.3.8") (version "3.4.0")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (list (uri (git-reference
(string-append "https://bitbucket.org/eigen/eigen/get/" (url "https://gitlab.com/libeigen/eigen.git")
version ".tar.bz2") (commit version)))
(string-append "mirror://debian/pool/main/e/eigen3/eigen3_"
version ".orig.tar.bz2")))
(sha256 (sha256
(base32 (base32
"1vxrsncfnkyq6gwxpsannpryp12mk7lc8f42ybvz3saf7icwc582")) "0k1c4qnymwwvm68rv6s0cyk08xbw65ixvwqccsh36c2axcqk3znp"))
(file-name (string-append name "-" version ".tar.bz2")) (file-name (git-file-name name version))
(patches (search-patches "eigen-remove-openmp-error-counting.patch" (patches (search-patches "eigen-fix-strict-aliasing-bug.patch"))
"eigen-stabilise-sparseqr-test.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; There are 3 test failures in the "unsupported" directory, ;; There are 3 test failures in the "unsupported" directory,

4
gnu/packages/astronomy.scm
View File

@ -426,7 +426,7 @@ astronomical image-processing packages like Drizzle, Swarp or SExtractor.")
(define-public gnuastro (define-public gnuastro
(package (package
(name "gnuastro") (name "gnuastro")
(version "0.17") (version "0.18")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -434,7 +434,7 @@ astronomical image-processing packages like Drizzle, Swarp or SExtractor.")
version ".tar.lz")) version ".tar.lz"))
(sha256 (sha256
(base32 (base32
"1gq37axs9l556pxxmnh47h088gbmp7sk3xjg59qzk2bsycg3dkgh")))) "1y9ig2kkwiwl0rmp9ip9n83fyjjpg2cc2pxzvdzr8rysq5az357y"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--disable-static"))) '(#:configure-flags '("--disable-static")))

14
gnu/packages/audio.scm
View File

@ -4352,7 +4352,7 @@ code, used in @code{libtoxcore}.")
(define-public gsm (define-public gsm
(package (package
(name "gsm") (name "gsm")
(version "1.0.19") (version "1.0.20")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -4360,8 +4360,7 @@ code, used in @code{libtoxcore}.")
(string-append "http://www.quut.com/" name "/" name (string-append "http://www.quut.com/" name "/" name
"-" version ".tar.gz")) "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "1gwhmqs24c14gc9qr91iqb2jkbr3qqy4dvf27yf8j7mq322w65b3"))))
"1xkha9ss5g5qnfaybi8il0mcvp8knwg9plgh8404vh58d0pna0s9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "tst" `(#:test-target "tst"
@ -4374,8 +4373,7 @@ code, used in @code{libtoxcore}.")
;; mediastreamer. ;; mediastreamer.
(substitute* "Makefile" (substitute* "Makefile"
(("^CCFLAGS.*" all) (("^CCFLAGS.*" all)
(string-append all "CCFLAGS += -fPIC\n"))) (string-append all "CCFLAGS += -fPIC\n")))))
#t))
(add-before 'install 'pre-install (add-before 'install 'pre-install
(lambda _ (lambda _
(let ((out (assoc-ref %outputs "out"))) (let ((out (assoc-ref %outputs "out")))
@ -4384,8 +4382,7 @@ code, used in @code{libtoxcore}.")
(mkdir-p (string-append out "/man/man1")) (mkdir-p (string-append out "/man/man1"))
(mkdir-p (string-append out "/man/man3")) (mkdir-p (string-append out "/man/man3"))
(mkdir-p (string-append out "/bin")) (mkdir-p (string-append out "/bin"))
(mkdir-p (string-append out "/lib"))) (mkdir-p (string-append out "/lib")))))
#t))
(add-after 'install 'post-install (add-after 'install 'post-install
(lambda _ (lambda _
(let ((out (assoc-ref %outputs "out"))) (let ((out (assoc-ref %outputs "out")))
@ -4393,8 +4390,7 @@ code, used in @code{libtoxcore}.")
(string-append out "/include")) (string-append out "/include"))
(mkdir-p (string-append out "/include/gsm")) (mkdir-p (string-append out "/include/gsm"))
(copy-recursively "inc" (copy-recursively "inc"
(string-append out "/include/gsm"))) (string-append out "/include/gsm")))))
#t))
(delete 'configure)))) ; no configure script (delete 'configure)))) ; no configure script
(synopsis "GSM 06.10 lossy speech compression library") (synopsis "GSM 06.10 lossy speech compression library")
(description "This C library provides an encoder and a decoder for the GSM (description "This C library provides an encoder and a decoder for the GSM

187
gnu/packages/clojure.scm
View File

@ -43,36 +43,44 @@
;; The libraries below are needed to run the tests. ;; The libraries below are needed to run the tests.
(libraries (libraries
`(("core-specs-alpha-src" `(("core-specs-alpha-src"
,(lib "core.specs.alpha/archive/core.specs.alpha-" ,(lib "core.specs.alpha/archive/v"
"0.1.24" "0.2.62"
"0v2a0svf1ar2y42ajxwsjr7zmm5j7pp2zwrd2jh3k7xzd1p9x1fv")) "0v6nhghsigpzm8y7dykfm318q5dvk5l8sykmn1hr0qgs1jsjqh9j"))
("data-generators-src" ("data-generators-src"
,(lib "data.generators/archive/data.generators-" ,(lib "data.generators/archive/data.generators-"
"0.1.2" "1.0.0"
"0kki093jp4ckwxzfnw8ylflrfqs8b1i1wi9iapmwcsy328dmgzp1")) "0s3hf1njvs68b8igasikvzagzqxl0gbri7w2qhzsypkhfh60v2cp"))
("java-classpath-src"
,(lib "java.classpath/archive/java.classpath-"
"1.0.0"
"178zajjsc9phk5l61r8w9hcpk0wgc9a811pl7kjgvn7rg4l7fh7j"))
("spec-alpha-src" ("spec-alpha-src"
,(lib "spec.alpha/archive/spec.alpha-" ,(lib "spec.alpha/archive/v"
"0.1.143" "0.3.218"
"00alf0347licdn773w2jarpllyrbl52qz4d8mw61anjksacxylzz")) "0h5nd9xlind1a2vmllr2yfhnirgj2pm5dndgqzrly78l5iwcc3wa"))
("test-check-src" ("test-check-src"
,(lib "test.check/archive/test.check-" ,(lib "test.check/archive/v"
"0.9.0" "1.1.1"
"0p0mnyhr442bzkz0s4k5ra3i6l5lc7kp6ajaqkkyh4c2k5yck1md")) "0kx8l79mhpnn94rpsgc7nac7gb222g7a47mzrycj8crfc54wf0c1"))
("test-generative-src" ("test-generative-src"
,(lib "test.generative/archive/test.generative-" ,(lib "test.generative/archive/test.generative-"
"0.5.2" "1.0.0"
"1pjafy1i7yblc7ixmcpfq1lfbyf3jaljvkgrajn70sws9xs7a9f8")) "0yy2vc38s4j5n94jdcjx1v7l2gdq0lywam31id1jh07sx37lv5il"))
("tools-namespace-src" ("tools-namespace-src"
,(lib "tools.namespace/archive/tools.namespace-" ,(lib "tools.namespace/archive/tools.namespace-"
"0.2.11" "1.0.0"
"10baak8v0hnwz2hr33bavshm7y49mmn9zsyyms1dwjz45p5ymhy0")))) "1ifpk93m33rj2xm1qnnninlsdvm1liqmsp9igr63pjjwwwjw1cnn"))
("tools-reader-src"
,(lib "tools.reader/archive/tools.reader-"
"1.3.2"
"1n4dhg61iyypnjbxmihhqjb7lfpc0lzfvlk4jd8w0yr6za414f3a"))))
(library-names (match libraries (library-names (match libraries
(((library-name _) ...) (((library-name _) ...)
library-name)))) library-name))))
(package (package
(name "clojure") (name "clojure")
(version "1.10.0") (version "1.11.1")
(source (let ((name+version (string-append name "-" version))) (source (let ((name+version (string-append name "-" version)))
(origin (origin
(method git-fetch) (method git-fetch)
@ -81,18 +89,23 @@
(commit name+version))) (commit name+version)))
(file-name (string-append name+version "-checkout")) (file-name (string-append name+version "-checkout"))
(sha256 (sha256
(base32 "1kcyv2836acs27vi75hvf3r773ahv2nlh9b3j9xa9m9sdanz1h83"))))) (base32 "1xbab21rm9zvhmw1i2h5lqm7612vrdkxprq0rgb2i3sbgsxcdsn4")))))
(build-system ant-build-system) (build-system ant-build-system)
(inputs (inputs
`(("jre" ,icedtea))) `(("jre" ,icedtea)))
(arguments (arguments
`(#:imported-modules ((guix build clojure-utils) `(#:imported-modules ((guix build clojure-utils)
(guix build clojure-build-system)
(guix build guile-build-system) (guix build guile-build-system)
,@%ant-build-system-modules) ,@%ant-build-system-modules)
#:modules ((guix build ant-build-system) #:modules ((guix build ant-build-system)
((guix build clojure-build-system) #:prefix clj:)
(guix build clojure-utils) (guix build clojure-utils)
(guix build java-utils) (guix build java-utils)
(guix build utils) (guix build utils)
(guix build syscalls)
(ice-9 match)
(ice-9 regex)
(srfi srfi-26)) (srfi srfi-26))
#:test-target "test" #:test-target "test"
#:phases #:phases
@ -106,22 +119,60 @@
"--extract" "--extract"
"--verbose" "--verbose"
"--file" (assoc-ref inputs name) "--file" (assoc-ref inputs name)
"--strip-components=1")) "--strip-components=1")))
(copy-recursively (string-append name "/src/main/clojure/")
"src/clj/"))
(for-each extract-library ',library-names) (for-each extract-library ',library-names)
(copy-recursively "core-specs-alpha-src/src/main/clojure"
"src/clj/")
(copy-recursively "spec-alpha-src/src/main/clojure"
"src/clj/")
#t)) #t))
(add-after 'unpack-library-sources 'fix-manifest-classpath (add-after 'unpack-library-sources 'fix-manifest-classpath
(lambda _ (lambda _
(substitute* "build.xml" (substitute* "build.xml"
(("<attribute name=\"Class-Path\" value=\".\"/>") "")) (("<attribute name=\"Class-Path\" value=\".\"/>") ""))
#t)) #t))
(add-after 'unpack-library-sources 'clojure-spec-skip-macros
;; Disable spec macro instrumentation when compiling clojure.spec
;; See: https://clojure.atlassian.net/browse/CLJ-2254
(lambda _
(substitute* "build.xml"
(("<sysproperty key=\"java.awt.headless\" value=\"true\"/>")
,(string-join
'("<sysproperty key=\"java.awt.headless\" value=\"true\"/>"
"<sysproperty key=\"clojure.spec.skip-macros\" value=\"true\"/>\n")
"\n")))
#t))
(add-after 'unpack-library-sources 'clojure-spec-compile
;; Compile and include clojure.spec.alpha & clojure.core.specs.alpha
(lambda _
(substitute* "build.xml"
(("<arg value=\"clojure.math\"/>")
,(string-join
'("<arg value=\"clojure.math\"/>"
"<arg value=\"clojure.spec.alpha\"/>"
"<arg value=\"clojure.spec.gen.alpha\"/>"
"<arg value=\"clojure.spec.test.alpha\"/>"
"<arg value=\"clojure.core.specs.alpha\"/>"))))
#t))
(add-before 'build 'maven-classpath-properties
(lambda _
(define (make-classpath libraries)
(string-join (map (lambda (library)
(string-append library "/src/main/clojure"))
libraries) ":"))
(with-output-to-file "maven-classpath.properties"
(lambda ()
(let ((classpath (make-classpath ',library-names)))
(display (string-append "maven.compile.classpath=" classpath "\n"))
(display (string-append "maven.test.classpath=" classpath "\n")))))
#t))
(add-after 'build 'build-javadoc ant-build-javadoc) (add-after 'build 'build-javadoc ant-build-javadoc)
(replace 'install (install-jars "./")) (replace 'install (install-jars "./"))
(add-after 'install-license-files 'install-doc (add-after 'install-license-files 'install-doc
(cut install-doc #:doc-dirs '("doc/clojure/") <...>)) (cut install-doc #:doc-dirs '("doc/clojure/") <...>))
(add-after 'install-doc 'install-javadoc (add-after 'install-doc 'install-javadoc
(install-javadoc "target/javadoc/"))))) (install-javadoc "target/javadoc/"))
(add-after 'reset-gzip-timestamps 'reset-class-timestamps clj:reset-class-timestamps))))
(native-inputs libraries) (native-inputs libraries)
(home-page "https://clojure.org/") (home-page "https://clojure.org/")
(synopsis "Lisp dialect running on the JVM") (synopsis "Lisp dialect running on the JVM")
@ -153,14 +204,14 @@ designs.")
(define-public clojure-tools (define-public clojure-tools
(package (package
(name "clojure-tools") (name "clojure-tools")
(version "1.10.3.1040") (version "1.11.1.1149")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.clojure.org/install/clojure-tools-" (uri (string-append "https://download.clojure.org/install/clojure-tools-"
version version
".tar.gz")) ".tar.gz"))
(sha256 (base32 "0xvr9nmk9q789vp32zmmzj4macv8v7y9ivnfd6lf7i8vxgg6hvgv")) (sha256 (base32 "196wl87br8zg3npfwpr5c1q0knxd1810vzgb0b6h195hyjf6i210"))
;; Remove AOT compiled JAR. The other JAR only contains uncompiled ;; Remove AOT compiled JAR. The other JAR only contains uncompiled
;; Clojure source code. ;; Clojure source code.
(snippet (snippet
@ -224,7 +275,15 @@ Clojure repl, use Clojure and Java libraries, and start Clojure programs.")
(arguments (arguments
'(#:source-dirs '("src/main/clojure/") '(#:source-dirs '("src/main/clojure/")
#:test-dirs '("src/test/clojure/") #:test-dirs '("src/test/clojure/")
#:doc-dirs '())) #:doc-dirs '()
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-import
(lambda _
(substitute*
"src/main/clojure/clojure/algo/generic/math_functions.clj"
(("clojure.algo.generic.math-functions")
"clojure.algo.generic.math-functions\n(:refer-clojure :exclude [abs])")))))))
(synopsis "Generic versions of common functions") (synopsis "Generic versions of common functions")
(description (description
"Generic versions of commonly used functions, implemented as multimethods "Generic versions of commonly used functions, implemented as multimethods
@ -261,31 +320,29 @@ defining and using monads and useful monadic functions.")
(license license:epl1.0))) (license license:epl1.0)))
(define-public clojure-core-match (define-public clojure-core-match
(let ((commit "1837ffbd4a150e8f3953b2d9ed5cf4a4ad3720a7") (package
(revision "1")) ; this is the 1st commit buildable with clojure 1.9 (name "clojure-core-match")
(package (version "1.0.0")
(name "clojure-core-match") (source (origin
(version (git-version "0.3.0-alpha5" revision commit)) (method git-fetch)
(source (origin (uri (git-reference
(method git-fetch) (url "https://github.com/clojure/core.match")
(uri (git-reference (commit (string-append "core.match-" version))))
(url "https://github.com/clojure/core.match") (file-name (git-file-name name version))
(commit commit))) (sha256
(file-name (git-file-name name version)) (base32
(sha256 "0ajpxjv4yc282cm0jw8819fay2j6jqp9nfy69k7vll09q7vqsd22"))))
(base32 (build-system clojure-build-system)
"04bdlp5dgkrqzrz0lw3mfwmygj2218qnm1cz3dkb9wy4m0238s4d")))) (arguments
(build-system clojure-build-system) '(#:source-dirs '("src/main/clojure")
(arguments #:test-dirs '("src/test/clojure")
'(#:source-dirs '("src/main/clojure") #:doc-dirs '()))
#:test-dirs '("src/test/clojure") (synopsis "Optimized pattern matching for Clojure")
#:doc-dirs '())) (description
(synopsis "Optimized pattern matching for Clojure") "An optimized pattern matching library for Clojure.
(description
"An optimized pattern matching library for Clojure.
It supports Clojure 1.5.1 and later as well as ClojureScript.") It supports Clojure 1.5.1 and later as well as ClojureScript.")
(home-page "https://github.com/clojure/core.match") (home-page "https://github.com/clojure/core.match")
(license license:epl1.0)))) (license license:epl1.0)))
(define-public clojure-data-codec (define-public clojure-data-codec
(package (package
@ -354,8 +411,7 @@ lazy - should allow parsing and emitting of large XML documents")
(license license:epl1.0))) (license license:epl1.0)))
(define-public clojure-instaparse (define-public clojure-instaparse
(let ((commit "dcfffad5b065e750f0f5835f017cdd8188b8ca2e") (let ((version "1.4.12"))
(version "1.4.9")) ; upstream forget to tag this release
(package (package
(name "clojure-instaparse") (name "clojure-instaparse")
(version version) (version version)
@ -363,14 +419,27 @@ lazy - should allow parsing and emitting of large XML documents")
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/Engelberg/instaparse") (url "https://github.com/Engelberg/instaparse")
(commit commit))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"002mrgin4z3dqy88r1lak7smd0m7x8d22vmliw0m6w6mh5pa17lk")))) "1xdiwsv1dc8mvrmvgs4xdqk3z6ddsammc6brhcb771yhimx8jjcr"))))
(build-system clojure-build-system) (build-system clojure-build-system)
(arguments (arguments
'(#:doc-dirs '("docs/"))) '(;; Disabled AOT, because of failing test: No implementation of
;; method: :conj-flat of protocol:
;; #'instaparse.auto-flatten-seq/ConjFlat found for class:
;; instaparse.auto_flatten_seq.AutoFlattenSeq
#:aot-exclude '(#:all)
#:doc-dirs '("docs/")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-import
(lambda _
(substitute*
"test/instaparse/defparser_test.cljc"
(("AssertionError")
"Exception")))))))
(synopsis "No grammar left behind") (synopsis "No grammar left behind")
(description (description
"Instaparse aims to be the simplest way to build parsers in Clojure. "Instaparse aims to be the simplest way to build parsers in Clojure.
@ -458,7 +527,7 @@ concise, powerful tests.")
(define-public clojure-tools-cli (define-public clojure-tools-cli
(package (package
(name "clojure-tools-cli") (name "clojure-tools-cli")
(version "0.4.2") (version "1.0.206")
(home-page "https://github.com/clojure/tools.cli") (home-page "https://github.com/clojure/tools.cli")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -467,7 +536,7 @@ concise, powerful tests.")
(commit (string-append "tools.cli-" version)))) (commit (string-append "tools.cli-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1yqlm8lwbcjm0dp032z7vzc4bdlmc4jixznvf4adsqhvqw85hvj2")))) (base32 "1hvk5zacl3fr8lfcbfgckaicqjx697j0kzw2x5hwj8j5xlr8ri2r"))))
(build-system clojure-build-system) (build-system clojure-build-system)
(arguments (arguments
'(#:source-dirs '("src/main/clojure/") '(#:source-dirs '("src/main/clojure/")
@ -482,7 +551,7 @@ work with command-line arguments.")
(define-public clojure-tools-deps-alpha (define-public clojure-tools-deps-alpha
(package (package
(name "clojure-tools-deps-alpha") (name "clojure-tools-deps-alpha")
(version "0.12.1104") (version "0.14.1212")
(home-page "https://github.com/clojure/tools.deps.alpha") (home-page "https://github.com/clojure/tools.deps.alpha")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -492,7 +561,7 @@ work with command-line arguments.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"174m83n5m3arai2vbg434zjibbsr3r4pp7lz3adja8lxq7g21r80")))) "0r8qfihii6cf95kl86x6zfldnm7wlkgda2qmq3340j1x03v244dd"))))
(build-system clojure-build-system) (build-system clojure-build-system)
(arguments (arguments
`(#:source-dirs '("src/main/clojure" "src/main/resources") `(#:source-dirs '("src/main/clojure" "src/main/resources")
@ -544,7 +613,7 @@ dependency graph expansion and the creation of classpaths.")
(define-public clojure-tools-gitlibs (define-public clojure-tools-gitlibs
(package (package
(name "clojure-tools-gitlibs") (name "clojure-tools-gitlibs")
(version "2.4.172") (version "2.4.181")
(home-page "https://github.com/clojure/tools.gitlibs") (home-page "https://github.com/clojure/tools.gitlibs")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -554,7 +623,7 @@ dependency graph expansion and the creation of classpaths.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"19d83wigmigy66f5i61a3ishg7zrlv8jngj8m9brsh9v38a0fwdr")))) "1d8c79f33axghadwqa955yjfsxa6fgl8jq4nfll2zrp6sjw0597k"))))
(build-system clojure-build-system) (build-system clojure-build-system)
(arguments (arguments
'(#:source-dirs '("src/main/clojure") '(#:source-dirs '("src/main/clojure")

8
gnu/packages/cpp.scm
View File

@ -1474,7 +1474,7 @@ output randomness while retaining speed, simplicity, and conciseness.")
(define-public libconfini (define-public libconfini
(package (package
(name "libconfini") (name "libconfini")
(version "1.16.3") (version "1.16.4")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1483,10 +1483,12 @@ output randomness while retaining speed, simplicity, and conciseness.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"01g8ai2z4fwshk06k824j6ib8nfb3cwxs5kqpqjvv4k5ayzm892h")))) "002lmf1b2phmc6s348k00yx5shrcc7psn3pgqvraxvr6n8g747jx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:configure-flags
(list "--disable-static")
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'bootstrap (replace 'bootstrap
(lambda _ (invoke "sh" "bootstrap" "--noconfigure")))))) (lambda _ (invoke "sh" "bootstrap" "--noconfigure"))))))

31
gnu/packages/crates-graphics.scm
View File

@ -2087,8 +2087,31 @@ interactive applications.")
images in AVIF format.") images in AVIF format.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public rust-raw-window-handle-0.4
(package
(name "rust-raw-window-handle")
(version "0.4.3")
(source
(origin
(method url-fetch)
(uri (crate-uri "raw-window-handle" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0hgvrqbr2b62zhq4ryv08h92mwis9v8f7j9pwcgxzlp7nswvw05q"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-cty" ,rust-cty-0.2))))
(home-page "https://github.com/rust-windowing/raw-window-handle")
(synopsis "Interoperability library for Rust Windowing applications")
(description
"Interoperability library for Rust Windowing applications.")
(license license:expat)))
(define-public rust-raw-window-handle-0.3 (define-public rust-raw-window-handle-0.3
(package (package
(inherit rust-raw-window-handle-0.4)
(name "rust-raw-window-handle") (name "rust-raw-window-handle")
(version "0.3.3") (version "0.3.3")
(source (source
@ -2100,14 +2123,8 @@ images in AVIF format.")
(sha256 (sha256
(base32 (base32
"04c2wir7qq3g2b143yav52a1g5ack8ffqx2bpmrn9bc0dix1li0a")))) "04c2wir7qq3g2b143yav52a1g5ack8ffqx2bpmrn9bc0dix1li0a"))))
(build-system cargo-build-system)
(arguments (arguments
`(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2))))))
(home-page "https://github.com/rust-windowing/raw-window-handle")
(synopsis "Interoperability library for Rust Windowing applications")
(description
"Interoperability library for Rust Windowing applications.")
(license license:expat)))
(define-public rust-resize-0.3 (define-public rust-resize-0.3
(package (package

843
gnu/packages/crates-io.scm
View File

File diff suppressed because it is too large Load Diff

6
gnu/packages/datamash.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016-2020, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -35,7 +35,7 @@
(define-public datamash (define-public datamash
(package (package
(name "datamash") (name "datamash")
(version "1.7") (version "1.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -43,7 +43,7 @@
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1cxdlhgz3wzjqlq8bgwad93fgqymk2abbldfzw1ffnhcp4mmjjjp")))) "1zgn55gvf60w2rs5f7vx7vdp50j89ki7mmjvm81xs5pngs67xnbs"))))
(native-inputs (native-inputs
(list which ;for tests (list which ;for tests
perl)) ;for help2man perl)) ;for help2man

4
gnu/packages/disk.scm
View File

@ -1401,7 +1401,7 @@ wrapper for disk usage querying and visualisation.")
(define-public qdirstat (define-public qdirstat
(package (package
(name "qdirstat") (name "qdirstat")
(version "1.8") (version "1.8.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1410,7 +1410,7 @@ wrapper for disk usage querying and visualisation.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"079rmy3j0442y5gjh6la6w1j6jaw83wklamrf19yxi20zsm99xs7")))) "04vpdlwk01kgmc4r5rnrmrgd4sf2kfh1rjzb2rjkfxdd4pbghsy9"))))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases

4
gnu/packages/dns.scm
View File

@ -333,14 +333,14 @@ and BOOTP/TFTP for network booting of diskless machines.")
;; When updating, check whether isc-dhcp's bundled copy should be as well. ;; When updating, check whether isc-dhcp's bundled copy should be as well.
;; The BIND release notes are available here: ;; The BIND release notes are available here:
;; https://www.isc.org/bind/ ;; https://www.isc.org/bind/
(version "9.16.30") (version "9.16.31")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://ftp.isc.org/isc/bind9/" version (uri (string-append "https://ftp.isc.org/isc/bind9/" version
"/bind-" version ".tar.xz")) "/bind-" version ".tar.xz"))
(sha256 (sha256
(base32 "1nv02apqpqk7mi1330jgsacpplhgnkx6mba5nmbsx1x72gqc77q0")) (base32 "1yvwdvcyy996p50j7nr4b010w16jjj5czw15g87wf1dn6xncp8lc"))
(patches (patches
(search-patches "bind-re-add-attr-constructor-priority.patch")))) (search-patches "bind-re-add-attr-constructor-priority.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)

4
gnu/packages/emacs-xyz.scm
View File

@ -5758,7 +5758,7 @@ keywords and smart indentation.")
(define-public emacs-robot-log (define-public emacs-robot-log
(package (package
(name "emacs-robot-log") (name "emacs-robot-log")
(version "0.1.3") (version "0.1.4")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -5767,7 +5767,7 @@ keywords and smart indentation.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0pv0kljx2n2n7ql6rfw1x63mbd1k2qwbq3zkw452lb8jmnp7dr3y")))) "1l9yxryrhvylh2x17cczd8v8978w1nv8173d4l9hv0cr26kp5b68"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(native-inputs (list python-robotframework)) (native-inputs (list python-robotframework))
(arguments (list #:tests? #t)) (arguments (list #:tests? #t))

4
gnu/packages/engineering.scm
View File

@ -2791,13 +2791,13 @@ program that can perform mesh processing tasks in batch mode, without a GUI.")
(define-public poke (define-public poke
(package (package
(name "poke") (name "poke")
(version "2.3") (version "2.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/poke/poke-" version (uri (string-append "mirror://gnu/poke/poke-" version
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 "0rn7ph7fvbwasf7jhai122sniqjkw81p0kvbxjlv6z6s2q8wz41n")) (base32 "0ivfzslpdy0n9wcdjyascnqczppaxcq0x4x6hblqqwy62xcjh7l4"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

8
gnu/packages/file-systems.scm
View File

@ -1478,13 +1478,13 @@ compatible directories.")
(define-public python-dropbox (define-public python-dropbox
(package (package
(name "python-dropbox") (name "python-dropbox")
(version "11.25.0") (version "11.33.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "dropbox" version)) (uri (pypi-uri "dropbox" version))
(sha256 (sha256
(base32 "0vq9c2hp2amsxr2ys2mlgqp6a8hxmvrcwav70ri7wjzalfs32gj6")))) (base32 "1hd9gprvcr6h0p8fxhynf97qf6799whfpsmr73g619392598nqvw"))))
(build-system python-build-system) (build-system python-build-system)
(arguments '(#:tests? #f)) ; Tests require a network connection. (arguments '(#:tests? #f)) ; Tests require a network connection.
(native-inputs (native-inputs
@ -1500,7 +1500,7 @@ Dropbox API v2.")
(define-public dbxfs (define-public dbxfs
(package (package
(name "dbxfs") (name "dbxfs")
(version "1.0.51") (version "1.0.63")
(source (source
(origin (origin
;; Release tarball contains files not in git repository. ;; Release tarball contains files not in git repository.
@ -1511,7 +1511,7 @@ Dropbox API v2.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0bidb1gg5lqa1561f20qnj7gy323q65qwzfrb8h8gs6dsl3g6yfg")) "1vzfhw3z2r0rb6s0qdzirh3pl7rv1z8xmxa0z5h7h1wqhpl05ai7"))
(patches (search-patches "dbxfs-remove-sentry-sdk.patch")))) (patches (search-patches "dbxfs-remove-sentry-sdk.patch"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments

15
gnu/packages/fontutils.scm
View File

@ -6,7 +6,7 @@
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org> ;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017, 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2020–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
@ -460,7 +460,18 @@ implementing the pen protocol for manipulating glyphs.")
(arguments (arguments
(substitute-keyword-arguments (package-arguments python-fontpens-bootstrap) (substitute-keyword-arguments (package-arguments python-fontpens-bootstrap)
((#:tests? _ #f) ((#:tests? _ #f)
#t))) #t)
((#:phases phases #~%standard-phases)
#~(modify-phases #$phases
(add-after 'unpack 'drop-flaky-docstring
;; XXX This assertion fails on certain (Intel?) machines, but not
;; others (AMD?), so we can't patch in a ‘correct’ value. Just
;; drop it until the proper fix lands upstream. Reported there
;; as <https://github.com/robotools/fontPens/issues/41>.
(lambda _
(substitute* "Lib/fontPens/penTools.py"
((".*\\(\\(0, 0), \\(50, 20), \\(100, 40)).*") "")
((".*107\\.70329614269009.*") ""))))))))
(native-inputs (native-inputs
(modify-inputs (package-native-inputs python-fontpens-bootstrap) (modify-inputs (package-native-inputs python-fontpens-bootstrap)
(append python-fontparts-bootstrap (append python-fontparts-bootstrap

2
gnu/packages/freedesktop.scm
View File

@ -1550,6 +1550,8 @@ broadband (2G/3G/4G) devices and connections. Whether built-in devices, USB
dongles, bluetooth-paired telephones, or professional RS232/USB devices with dongles, bluetooth-paired telephones, or professional RS232/USB devices with
external power supplies, ModemManager is able to prepare and configure the external power supplies, ModemManager is able to prepare and configure the
modems and setup connections with them.") modems and setup connections with them.")
(properties
'((upstream-name . "ModemManager")))
(license license:gpl2+))) (license license:gpl2+)))
(define-public telepathy-logger (define-public telepathy-logger

6
gnu/packages/gnome.scm
View File

@ -21,7 +21,7 @@
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017, 2018 nee <nee-git@hidamari.blue> ;;; Copyright © 2017, 2018 nee <nee-git@hidamari.blue>
@ -1846,7 +1846,7 @@ either on a local, or remote machine via a number of methods.")
(define-public gnome-commander (define-public gnome-commander
(package (package
(name "gnome-commander") (name "gnome-commander")
(version "1.14.2") (version "1.14.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1854,7 +1854,7 @@ either on a local, or remote machine via a number of methods.")
(version-major+minor version) "/" (version-major+minor version) "/"
"gnome-commander-" version ".tar.xz")) "gnome-commander-" version ".tar.xz"))
(sha256 (sha256
(base32 "1s8fdwp0z1smzkwrsvssp9g3yak6z4cdk0qx0c4qmwca9z9fyy0k")))) (base32 "0yzx9slg632iflw9p96nlh9i50dhacq7hrzpkj8b48mr1zkxrn3q"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
(list desktop-file-utils (list desktop-file-utils

12
gnu/packages/gnuzilla.scm
View File

@ -366,8 +366,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.11.0-guix0-preview1") (define %icecat-version "91.12.0-guix0-preview1")
(define %icecat-build-id "20220628000000") ;must be of the form YYYYMMDDhhmmss (define %icecat-build-id "20220726000000") ;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'
@ -389,11 +389,11 @@ in C/C++.")
"firefox-" upstream-firefox-version ".source.tar.xz")) "firefox-" upstream-firefox-version ".source.tar.xz"))
(sha256 (sha256
(base32 (base32
"1905595fsydd8q4bqxsp5gb4h9s47qjj90wjrqv4ky8yxs9bx6z5")))) "0p1bhc1qla4a7iqk0fc6sj224ld6wplpmj4yw6nfx1b8hbqqy2vc"))))
(upstream-icecat-base-version "91.11.0") ; maybe older than base-version (upstream-icecat-base-version "91.12.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 "65a61287a5142a9403ec00d973cb5e5d658a3c71") (gnuzilla-commit "298024d727053a1609df4003fb4438836d5181f4")
(gnuzilla-source (gnuzilla-source
(origin (origin
(method git-fetch) (method git-fetch)
@ -405,7 +405,7 @@ in C/C++.")
(string-take gnuzilla-commit 8))) (string-take gnuzilla-commit 8)))
(sha256 (sha256
(base32 (base32
"02mg7vg0bv5lxkdg86z18mf43rx7sh5i2w69lnirr8zqcrr5yd48")))) "1lgz6knklxbrqr1vaj9d0y0997f4f6v44a8cng8ihkmn7aa7lvwg"))))
;; '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.

13
gnu/packages/image.scm
View File

@ -11,7 +11,7 @@
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017, 2020, 2021 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2016, 2017, 2020, 2021, 2022 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017,2019,2020 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017,2019,2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
@ -55,6 +55,7 @@
#:use-module (gnu packages assembly) #:use-module (gnu packages assembly)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages cmake) #:use-module (gnu packages cmake)
@ -2380,7 +2381,7 @@ Wacom-style graphics tablets.")
(define-public phockup (define-public phockup
(package (package
(name "phockup") (name "phockup")
(version "1.7.1") (version "1.9.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2390,7 +2391,7 @@ Wacom-style graphics tablets.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0nqd89g4ppwc96gxyh9npain7ipnzj66p6n3irsvhrpi4k54h388")))) "1xs2h3nj19wsfffl87akinx14drk5nn2svjwyj0csv10apk0q4pp"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
`(#:install-plan '(("src" "share/phockup/") `(#:install-plan '(("src" "share/phockup/")
@ -2400,8 +2401,8 @@ Wacom-style graphics tablets.")
(add-after 'unpack 'configure (add-after 'unpack 'configure
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* (list "src/dependency.py" "src/exif.py") (substitute* (list "src/dependency.py" "src/exif.py")
(("exiftool") (("'exiftool'")
(search-input-file inputs "/bin/exiftool"))))) (string-append "'" (search-input-file inputs "/bin/exiftool") "'")))))
(add-before 'install 'check (add-before 'install 'check
(lambda _ (lambda _
(invoke "pytest"))) (invoke "pytest")))
@ -2419,7 +2420,7 @@ Wacom-style graphics tablets.")
,(search-path-as-string->list ,(search-path-as-string->list
(getenv "GUIX_PYTHONPATH")))))))))) (getenv "GUIX_PYTHONPATH"))))))))))
(inputs (inputs
(list perl-image-exiftool python python-tqdm)) (list bash-minimal perl-image-exiftool python python-tqdm))
(native-inputs (native-inputs
(list python-pytest python-pytest-mock)) (list python-pytest python-pytest-mock))
(home-page "https://github.com/ivandokov/phockup") (home-page "https://github.com/ivandokov/phockup")

15
gnu/packages/libusb.scm
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, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020–2022 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>
@ -28,6 +28,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages libusb) (define-module (gnu packages libusb)
#:use-module (guix gexp)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
@ -471,14 +472,14 @@ over USB.")
(define-public libmtp (define-public libmtp
(package (package
(name "libmtp") (name "libmtp")
(version "1.1.19") (version "1.1.20")
(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
"0a1jlf5b2c2vylkvdd3cxjs20a96jlbrdyx7rwai5rzmcdpszd6y")))) "1l2npk3b5v9cxhs2g01w3b13mxvin881cr085r0cyi2p5yn1s6f9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
@ -488,11 +489,9 @@ over USB.")
;; libmtp.pc refers to all these. ;; libmtp.pc refers to all these.
(list libusb)) (list libusb))
(arguments (arguments
`(#:configure-flags (list #:configure-flags
(list "--disable-static" #~(list "--disable-static"
(string-append "--with-udev=" (string-append "--with-udev=" #$output "/lib/udev"))))
(assoc-ref %outputs "out")
"/lib/udev"))))
(home-page "http://libmtp.sourceforge.net/") (home-page "http://libmtp.sourceforge.net/")
(synopsis "Library implementing the Media Transfer Protocol") (synopsis "Library implementing the Media Transfer Protocol")
(description "Libmtp implements an MTP (Media Transfer Protocol) (description "Libmtp implements an MTP (Media Transfer Protocol)

32
gnu/packages/linux.scm
View File

@ -352,7 +352,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The current "stable" kernels. That is, the most recently released major ;; The current "stable" kernels. That is, the most recently released major
;; versions that are still supported upstream. ;; versions that are still supported upstream.
(define-public linux-libre-5.18-version "5.18.12") (define-public linux-libre-5.18-version "5.18.14")
(define-public linux-libre-5.18-gnu-revision "gnu") (define-public linux-libre-5.18-gnu-revision "gnu")
(define deblob-scripts-5.18 (define deblob-scripts-5.18
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0vjpn8iw9yg39sr6jfhzyvivf159h9zfgnjamwa283zfll0h0a53"))) (base32 "0vjpn8iw9yg39sr6jfhzyvivf159h9zfgnjamwa283zfll0h0a53")))
(define-public linux-libre-5.18-pristine-source (define-public linux-libre-5.18-pristine-source
(let ((version linux-libre-5.18-version) (let ((version linux-libre-5.18-version)
(hash (base32 "09wmgfrnv1df6jg9v3svwhvnxl0j6h4f240p903xlmgj884lvds0"))) (hash (base32 "1bsnk2rskdkimciij5q3hjs00lc7ks1h1qh9kc4s7lrk252lczg1")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
@ -371,7 +371,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The "longterm" kernels — the older releases with long-term upstream support. ;; The "longterm" kernels — the older releases with long-term upstream support.
;; Here are the support timelines: ;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html> ;; <https://www.kernel.org/category/releases.html>
(define-public linux-libre-5.15-version "5.15.55") (define-public linux-libre-5.15-version "5.15.57")
(define-public linux-libre-5.15-gnu-revision "gnu") (define-public linux-libre-5.15-gnu-revision "gnu")
(define deblob-scripts-5.15 (define deblob-scripts-5.15
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -381,12 +381,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "129qlhwdv2mfb85gbvq03kkbdfp73b444rryr4rrbvi0jmq4cp24"))) (base32 "129qlhwdv2mfb85gbvq03kkbdfp73b444rryr4rrbvi0jmq4cp24")))
(define-public linux-libre-5.15-pristine-source (define-public linux-libre-5.15-pristine-source
(let ((version linux-libre-5.15-version) (let ((version linux-libre-5.15-version)
(hash (base32 "1k7x7fp675wglfd357n7hjidnm3j8zj3gcymyazg6fkcid8bvxhy"))) (hash (base32 "1zgh43pgn8fsyxzksfw6llxqw6fc8qassfn9a18k2xn83xd0kqv2")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.15))) deblob-scripts-5.15)))
(define-public linux-libre-5.10-version "5.10.131") (define-public linux-libre-5.10-version "5.10.133")
(define-public linux-libre-5.10-gnu-revision "gnu1") (define-public linux-libre-5.10-gnu-revision "gnu1")
(define deblob-scripts-5.10 (define deblob-scripts-5.10
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -396,12 +396,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1981axxswghza3iadp94q54y8w30h9w9vyq4cbjiiv9alvbv0pb8"))) (base32 "1981axxswghza3iadp94q54y8w30h9w9vyq4cbjiiv9alvbv0pb8")))
(define-public linux-libre-5.10-pristine-source (define-public linux-libre-5.10-pristine-source
(let ((version linux-libre-5.10-version) (let ((version linux-libre-5.10-version)
(hash (base32 "1ki11mvl3dky7iih90znr47vr66dxnlwrqwg2jkk1hqn5i243i4b"))) (hash (base32 "03i84g3pfh24f10zsdyyqyv9fhy01ah9lk02y48hqwnabdylqp1v")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.10))) deblob-scripts-5.10)))
(define-public linux-libre-5.4-version "5.4.206") (define-public linux-libre-5.4-version "5.4.207")
(define-public linux-libre-5.4-gnu-revision "gnu1") (define-public linux-libre-5.4-gnu-revision "gnu1")
(define deblob-scripts-5.4 (define deblob-scripts-5.4
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -411,12 +411,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1vnjbdyssa7dwyjl9kg35alwvf7yh597cl74yr1wy2gk5bc9paw6"))) (base32 "1vnjbdyssa7dwyjl9kg35alwvf7yh597cl74yr1wy2gk5bc9paw6")))
(define-public linux-libre-5.4-pristine-source (define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version) (let ((version linux-libre-5.4-version)
(hash (base32 "1asvc7y1f938icspxx39n6y6r0w9mp0k9vik84rsx1hzzv0db41c"))) (hash (base32 "1wwpd26qhv6i00p0yxjisns6qiz9bfrxvn1xb4ylwr8ls7zyx78v")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.4))) deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.252") (define-public linux-libre-4.19-version "4.19.253")
(define-public linux-libre-4.19-gnu-revision "gnu1") (define-public linux-libre-4.19-gnu-revision "gnu1")
(define deblob-scripts-4.19 (define deblob-scripts-4.19
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -426,12 +426,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im")))
(define-public linux-libre-4.19-pristine-source (define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version) (let ((version linux-libre-4.19-version)
(hash (base32 "0ac7k6x9h8gqi37n8d4fyi52h4cmzyy8f5vfv1aiihww4kvzca7v"))) (hash (base32 "1jc2j0wskgr1bdzpz6sn2bvafpviiin6mwr93yykcczzfjijr8yz")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.19))) deblob-scripts-4.19)))
(define-public linux-libre-4.14-version "4.14.288") (define-public linux-libre-4.14-version "4.14.289")
(define-public linux-libre-4.14-gnu-revision "gnu1") (define-public linux-libre-4.14-gnu-revision "gnu1")
(define deblob-scripts-4.14 (define deblob-scripts-4.14
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -441,12 +441,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im")))
(define-public linux-libre-4.14-pristine-source (define-public linux-libre-4.14-pristine-source
(let ((version linux-libre-4.14-version) (let ((version linux-libre-4.14-version)
(hash (base32 "0yyzxyz66mfngx3ll3pl43413xb67iyxddzh3lpzqcfg7d0rxfwz"))) (hash (base32 "1v24mv49skgijcbafgai0glrzwiv2j1hndkz7v6ygc18jxh5fqg6")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.14))) deblob-scripts-4.14)))
(define-public linux-libre-4.9-version "4.9.323") (define-public linux-libre-4.9-version "4.9.324")
(define-public linux-libre-4.9-gnu-revision "gnu1") (define-public linux-libre-4.9-gnu-revision "gnu1")
(define deblob-scripts-4.9 (define deblob-scripts-4.9
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -456,7 +456,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0bib3641dbcqdkx3anna3caxnsg3nw9cnmhcklq0s93g3m57041h"))) (base32 "0bib3641dbcqdkx3anna3caxnsg3nw9cnmhcklq0s93g3m57041h")))
(define-public linux-libre-4.9-pristine-source (define-public linux-libre-4.9-pristine-source
(let ((version linux-libre-4.9-version) (let ((version linux-libre-4.9-version)
(hash (base32 "1h96ai9w5q2axhliw85aymdsg8py9y6gl8big5r2gwkbls6h7pa3"))) (hash (base32 "0g51vfp0g3py82l3q66p7nvl03h6l1nlny18gangji75a3c39yh4")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.9))) deblob-scripts-4.9)))
@ -3229,7 +3229,7 @@ processes currently causing I/O.")
(define-public iotop (define-public iotop
(package (package
(name "iotop") (name "iotop")
(version "1.21") (version "1.22")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3238,7 +3238,7 @@ processes currently causing I/O.")
(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 "03wdnkfl51dapilg6r9vjga1xrl9lxlypfz07k50nscvbq8v8fb7")))) (base32 "04a77qir35s1bwvd39qddx2kfizdbf5jxlnz8zmy1cnrigbwcy1h"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:make-flags (list #:make-flags

89
gnu/packages/lisp-xyz.scm
View File

@ -95,6 +95,7 @@
#:use-module (gnu packages mpi) #:use-module (gnu packages mpi)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages networking) #:use-module (gnu packages networking)
#:use-module (gnu packages package-management)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
@ -22779,3 +22780,91 @@ binding @code{*debugger-hook*} is not enough -- most notably, for
(arguments (arguments
;; Tests fail on ECL: https://github.com/phoe/trivial-custom-debugger/issues/3 ;; Tests fail on ECL: https://github.com/phoe/trivial-custom-debugger/issues/3
'(#:tests? #f)))) '(#:tests? #f))))
(define-public sbcl-ospm
(package
(name "sbcl-ospm")
(version "0.0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/atlas-engineer/ospm")
(commit version)))
(file-name (git-file-name "cl-ospm" version))
(sha256
(base32 "1b64ar6x08bcig4brlsim445favjf1zhyj6qz018cildp3xs4miz"))))
(build-system asdf-build-system/sbcl)
(inputs
(list sbcl-alexandria
sbcl-calispel
sbcl-hu.dwim.defclass-star
sbcl-local-time
sbcl-moptilities
sbcl-named-readtables
sbcl-serapeum
sbcl-trivia))
(native-inputs
;; FIXME: Tests have execution errors because of Guix being run in a container.
(list sbcl-lisp-unit2 guix))
(home-page "https://github.com/atlas-engineer/ospm")
(synopsis "System package manager in Common Lisp")
(description
"This library is a universal interface to the operating system package manager.
It has extensive support for Guix, among others:
@itemize
@item package listing and searching;
@item package installation and uninstallation;
@item package file listing;
@item profile listing;
@item manifest listing and installation;
@item generation listing, switching and deletion.
@end itemize\n")
(license license:bsd-3)))
(define-public cl-ospm
(let ((pkg (sbcl-package->cl-source-package sbcl-ospm)))
(package
(inherit pkg)
(inputs
(cons (list "osicat" cl-osicat)
(package-inputs pkg))))))
(define-public sbcl-ndebug
(package
(name "sbcl-ndebug")
(version "0.1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/atlas-engineer/ndebug")
(commit version)))
(file-name (git-file-name "ndebug" version))
(sha256
(base32 "0wdp0wqk6clq3hh9yqmgdm55x50b5m7ly9004j2c8k5zz1rgi4rr"))))
(build-system asdf-build-system/sbcl)
(inputs
(list
sbcl-dissect
sbcl-lparallel
sbcl-slime-swank
sbcl-trivial-custom-debugger))
(native-inputs
(list sbcl-lisp-unit2))
(home-page "https://github.com/atlas-engineer/ndebug/")
(synopsis "Toolkit to build UI-aware Common Lisp debugger hooks")
(description
"NDebug provides a small set of utilities to make graphical (or, rather
non-REPL-resident) Common Lisp applications easier to integrate with the
standard Lisp debugger (@code{*debugger-hook*}, namely) and
implementation-specific debugger hooks (via @code{trivial-custom-debugger}),
especially in a multi-threaded context.")
(license license:bsd-3)))
(define-public cl-ndebug
(sbcl-package->cl-source-package sbcl-ndebug))
(define-public ecl-ndebug
(sbcl-package->ecl-package sbcl-ndebug))

46
gnu/packages/messaging.scm
View File

@ -583,7 +583,7 @@ end-to-end encryption.")
(define-public axc (define-public axc
(package (package
(name "axc") (name "axc")
(version "0.3.6") (version "0.3.7")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -593,12 +593,13 @@ end-to-end encryption.")
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
;; Submodules ;; Empty directories meant to hold submodules that we provide as
;; proper inputs below.
(delete-file-recursively "lib"))) (delete-file-recursively "lib")))
(file-name (file-name
(git-file-name name version)) (git-file-name name version))
(sha256 (sha256
(base32 "05sv7l6lk0xk4wb2bspc2sdpygrb1f0szzi82a1kyfm0fjz887b3")))) (base32 "0b02b9flri374f8aw6xfz7mm9s57rb7393r8mdphv7kcsf76i7i5"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
@ -2080,39 +2081,38 @@ support, and more.")
(define-public freetalk (define-public freetalk
(package (package
(name "freetalk") (name "freetalk")
(version "4.1") (version "4.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/freetalk/freetalk-" (uri (string-append "mirror://gnu/freetalk/freetalk-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1rmrn7a1bb7vm26yaklrvx008a9qhwc32s57dwrlf40lv9gffwny")))) "105mw7pg2mcp85r82cs4rv77nwvbw8025047364jzbq6lwllynxv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list #:phases
(list "CFLAGS=-fcommon") #~(modify-phases %standard-phases
#:phases (add-after 'install 'wrap-program
(modify-phases %standard-phases (lambda* (#:key inputs outputs #:allow-other-keys)
;; For 'system' commands in Scheme code. (let ((out (assoc-ref outputs "out")))
(add-after 'install 'wrap-program (wrap-program (string-append out "/bin/freetalk")
(lambda* (#:key inputs outputs #:allow-other-keys) `("PATH" ":" suffix
(let* ((out (assoc-ref outputs "out")) ,(map (lambda (command)
(bash (assoc-ref inputs "bash")) (dirname
(coreutils (assoc-ref inputs "coreutils")) (search-input-file
(less (assoc-ref inputs "less"))) inputs (string-append "bin/" command))))
(wrap-program (string-append out "/bin/freetalk") ;; This list is not exhaustive: we assume that,
`("PATH" ":" prefix ;; e.g., cat is packaged with other coreutils.
,(map (lambda (dir) (list "bash" ; src/{commands,util}.c et al
(string-append dir "/bin")) "cat" ; extensions/first-time-run.sh
(list bash coreutils less)))) "less")))))))))) ; extensions/history.scm.
#t))))))
(native-inputs (native-inputs
(list autoconf automake pkg-config texinfo)) (list autoconf automake pkg-config texinfo))
(inputs (inputs
(list bash (list bash
glib glib
guile-2.0 guile-3.0
less less
loudmouth loudmouth
readline)) readline))

35
gnu/packages/music.scm
View File

@ -3287,33 +3287,34 @@ from the command line.")
(define-public qtractor (define-public qtractor
(package (package
(name "qtractor") (name "qtractor")
(version "0.9.26") (version "0.9.27")
(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
"02r4dhhbn3dzhqi5cnm2vwimqk10bdlpy233n4a3590qg4krnqkd")))) "11131hb6n13n51rr319jhaa9jjxl9q8n9vkxq3si7gcxlli6pdbs"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f)) ; no "check" target `(#:tests? #f)) ; no "check" target
(inputs (inputs
`(("qt" ,qtbase-5) (list alsa-lib
("qtx11extras" ,qtx11extras) jack-1
("alsa-lib" ,alsa-lib) ladspa
("jack" ,jack-1) liblo
("libsndfile" ,libsndfile) libmad
("ladspa" ,ladspa) libsamplerate
("lv2" ,lv2) libsndfile
("lilv" ,lilv) libvorbis
("suil" ,suil) lilv
("libsamplerate" ,libsamplerate) lv2
("libvorbis" ,libvorbis) qtbase-5
("libmad" ,libmad) qtsvg
("rubberband" ,rubberband) qtx11extras
("liblo" ,liblo) rubberband
("zlib" ,zlib))) suil
zlib))
(native-inputs (native-inputs
(list pkg-config qttools)) (list pkg-config qttools))
(home-page "https://qtractor.org/") (home-page "https://qtractor.org/")

12
gnu/packages/networking.scm
View File

@ -906,14 +906,14 @@ residing in IPv4-only networks, even when they are behind a NAT device.")
(define-public ndisc6 (define-public ndisc6
(package (package
(name "ndisc6") (name "ndisc6")
(version "1.0.5") (version "1.0.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.remlab.net/files/ndisc6/ndisc6-" (uri (string-append "https://www.remlab.net/files/ndisc6/ndisc6-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0lgkbnnll8nrr7h63ywd42sg8fiv6jhhymd7rnml8a3yqjgjz4rn")))) "1yrw8maj1646d498ax8xi0jmzk80idrc5x0913x5rwg1kc7224x7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://www.remlab.net/ndisc6/") (home-page "https://www.remlab.net/ndisc6/")
(synopsis "IPv6 diagnostic tools") (synopsis "IPv6 diagnostic tools")
@ -3506,8 +3506,8 @@ and targeted primarily for asynchronous processing of HTTP-requests.")
;; on, introducing nondeterminism (see: ;; on, introducing nondeterminism (see:
;; https://github.com/savoirfairelinux/opendht/issues/626). ;; https://github.com/savoirfairelinux/opendht/issues/626).
(substitute* "tests/Makefile.am" (substitute* "tests/Makefile.am"
(("tests/dhtrunnertester.(h|cpp)$" all) (("\\bdhtrunnertester\\.(h|cpp)\\b")
(string-append "# " all))))) ""))))
(add-after 'unpack 'fix-python-installation-prefix (add-after 'unpack 'fix-python-installation-prefix
;; Specify the installation prefix for the compiled Python module ;; Specify the installation prefix for the compiled Python module
;; that would otherwise attempt to installs itself to Python's own ;; that would otherwise attempt to installs itself to Python's own
@ -4111,14 +4111,14 @@ stamps.")
(define-public nbd (define-public nbd
(package (package
(name "nbd") (name "nbd")
(version "3.23") (version "3.24")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/nbd/nbd/" version (uri (string-append "mirror://sourceforge/nbd/nbd/" version
"/nbd-" version ".tar.xz")) "/nbd-" version ".tar.xz"))
(sha256 (sha256
(base32 "1d2phi0m9x32p9zddv9fpkhj1rbhlvq93wsn9niy7i3aavn71x6y")))) (base32 "036ib2d5722sx9nn7jydqfpl5ici5if2z7g8xrskzcx74dniaxv8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list glib)) (list glib))

63
gnu/packages/patches/dbxfs-remove-sentry-sdk.patch
View File

@ -1,38 +1,48 @@
sentry-sdk provides a link to sentry.io, a service which monitors applications deployed in the wild. sentry-sdk provides a link to sentry.io, a service which monitors applications deployed in the wild.
Defaults to true. Best to just remove the option. Defaults to true. Best to just remove the option.
---
dbxfs/main.py | 16 ----------------
setup.py | 1 -
2 files changed, 17 deletions(-)
diff --git a/dbxfs/main.py b/dbxfs/main.py diff --git a/dbxfs/main.py b/dbxfs/main.py
index 5a6cea1..5d00818 100755 index 458e82a..784dd2a 100755
--- a/dbxfs/main.py --- a/dbxfs/main.py
+++ b/dbxfs/main.py +++ b/dbxfs/main.py
@@ -40,8 +40,6 @@ import userspacefs @@ -43,8 +43,6 @@ import userspacefs
import keyring import keyring
from keyring.errors import KeyringError from keyring.errors import KeyringError
-import sentry_sdk -import sentry_sdk
- -
from block_tracing import block_tracing, BLOCK_TRACING_INHERITS from block_tracing import block_tracing
from dbxfs.dbxfs import FileSystem as DropboxFileSystem from dbxfs.dbxfs import FileSystem as DropboxFileSystem
@@ -299,12 +297,6 @@ def _main(argv=None): @@ -127,16 +125,6 @@ def on_new_process(proc_args):
config['keyring_user'] = keyring_user level = [logging.WARNING, logging.INFO, logging.DEBUG][min(2, verbose)]
save_config = True logging.basicConfig(level=level, handlers=[logging_stream], format=format_)
- if not config.get("asked_send_error_reports", False): - if int(proc_args.get('send_error_reports', '0')):
- if yes_no_input("Would you like to help us improve %s by providing anonymous error reports?" % (APP_NAME,), default_yes=True): - version = proc_args['version']
- config['send_error_reports'] = True - try:
- config['asked_send_error_reports'] = True - sentry_sdk.init("https://b4b13ebd300849bd92260507a594e618@sentry.io/1293235",
- release='%s@%s' % (APP_NAME, version),
- with_locals=False)
- sentry_sdk.set_user(dict(id=proc_args['sentry_user']))
- except Exception:
- log.warning("Failed to initialize sentry", exc_info=True)
-
def create_fs(fs_args):
refresh_token = fs_args.get('refresh_token')
access_token = fs_args.get('access_token')
@@ -527,10 +515,6 @@ deprecated, this functionality will be removed in the future.
config['asked_send_error_reports'] = True
save_config = True
- if config.get("send_error_reports", False) and not isinstance(config.get("sentry_user", None), str):
- config['sentry_user'] = uuid.uuid4().hex
- save_config = True - save_config = True
- -
if save_access_token and yes_no_input("Do you want \"%s\" to be the default mount point?" % (mount_point,), default_yes=True): if save_refresh_token and yes_no_input("Do you want \"%s\" to be the default mount point?" % (mount_point,), default_yes=True):
config['mount_point'] = mount_point config['mount_point'] = mount_point
save_config = True save_config = True
@@ -315,14 +307,6 @@ def _main(argv=None): @@ -541,15 +525,6 @@ deprecated, this functionality will be removed in the future.
log.info("Starting %s...", APP_NAME) log.info("Starting %s...", APP_NAME)
@ -41,24 +51,31 @@ index 5a6cea1..5d00818 100755
- sentry_sdk.init("https://b4b13ebd300849bd92260507a594e618@sentry.io/1293235", - sentry_sdk.init("https://b4b13ebd300849bd92260507a594e618@sentry.io/1293235",
- release='%s@%s' % (APP_NAME, version), - release='%s@%s' % (APP_NAME, version),
- with_locals=False) - with_locals=False)
- sentry_sdk.set_user(dict(id=config['sentry_user']))
- except Exception: - except Exception:
- log.warning("Failed to initialize sentry", exc_info=True) - log.warning("Failed to initialize sentry", exc_info=True)
- -
if cache_folder is None: if cache_folder is None:
cache_folder = os.path.join(appdirs.user_cache_dir(APP_NAME), "file_cache") cache_folder = os.path.join(appdirs.user_cache_dir(APP_NAME), "file_cache")
try: try:
@@ -602,8 +577,6 @@ deprecated, this functionality will be removed in the future.
proc_args['verbose'] = str(args.verbose)
proc_args['version'] = version
proc_args['send_error_reports'] = str(int(config.get('send_error_reports', False)))
- if config.get('send_error_reports', False):
- proc_args['sentry_user'] = config['sentry_user']
return userspacefs.simple_main(mount_point, display_name,
('dbxfs.main.create_fs', fs_args),
diff --git a/setup.py b/setup.py diff --git a/setup.py b/setup.py
index 89e25c6..f940d47 100644 index ae696e9..869d0db 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -43,7 +43,6 @@ setup( @@ -47,7 +47,6 @@ setup(
"privy>=6.0,<7", "privy>=6.0,<7",
"keyring>=15.1.0", "keyring>=15.1.0",
"keyrings.alt>=3.1,<5", "keyrings.alt>=3.1,<5",
- "sentry_sdk>=0.3,<1", - "sentry_sdk>=1.0,<2",
], ],
extras_require={ extras_require={
'safefs': ["safefs"], 'safefs': ["safefs"],
--
2.28.0

73
gnu/packages/patches/eigen-fix-strict-aliasing-bug.patch 100644
View File

@ -0,0 +1,73 @@
From f046e326d9e30772725d8fb26dc33328e418d9d3 Mon Sep 17 00:00:00 2001
From: Antonio Sanchez <cantonios@google.com>
Date: Fri, 17 Sep 2021 12:49:01 -0700
Subject: [PATCH] Fix strict aliasing bug causing product_small failure.
Packet loading is skipped due to aliasing violation, leading to nullopt matrix
multiplication.
Fixes #2327.
(cherry picked from commit 3c724c44cff3f9e2e9e35351abff0b5c022b320d)
---
Eigen/src/Core/arch/AVX/Complex.h | 4 +++-
Eigen/src/Core/arch/AVX512/Complex.h | 4 +++-
Eigen/src/Core/arch/SSE/Complex.h | 11 +++--------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/Eigen/src/Core/arch/AVX/Complex.h b/Eigen/src/Core/arch/AVX/Complex.h
index ab7bd6c65..e9096c0a1 100644
--- a/Eigen/src/Core/arch/AVX/Complex.h
+++ b/Eigen/src/Core/arch/AVX/Complex.h
@@ -99,7 +99,9 @@ template<> EIGEN_STRONG_INLINE Packet4cf ploadu<Packet4cf>(const std::complex<fl
template<> EIGEN_STRONG_INLINE Packet4cf pset1<Packet4cf>(const std::complex<float>& from)
{
- return Packet4cf(_mm256_castpd_ps(_mm256_broadcast_sd((const double*)(const void*)&from)));
+ const float re = std::real(from);
+ const float im = std::imag(from);
+ return Packet4cf(_mm256_set_ps(im, re, im, re, im, re, im, re));
}
template<> EIGEN_STRONG_INLINE Packet4cf ploaddup<Packet4cf>(const std::complex<float>* from)
diff --git a/Eigen/src/Core/arch/AVX512/Complex.h b/Eigen/src/Core/arch/AVX512/Complex.h
index 49c72b3f1..074253859 100644
--- a/Eigen/src/Core/arch/AVX512/Complex.h
+++ b/Eigen/src/Core/arch/AVX512/Complex.h
@@ -97,7 +97,9 @@ template<> EIGEN_STRONG_INLINE Packet8cf ploadu<Packet8cf>(const std::complex<fl
template<> EIGEN_STRONG_INLINE Packet8cf pset1<Packet8cf>(const std::complex<float>& from)
{
- return Packet8cf(_mm512_castpd_ps(pload1<Packet8d>((const double*)(const void*)&from)));
+ const float re = std::real(from);
+ const float im = std::imag(from);
+ return Packet8cf(_mm512_set_ps(im, re, im, re, im, re, im, re, im, re, im, re, im, re, im, re));
}
template<> EIGEN_STRONG_INLINE Packet8cf ploaddup<Packet8cf>(const std::complex<float>* from)
diff --git a/Eigen/src/Core/arch/SSE/Complex.h b/Eigen/src/Core/arch/SSE/Complex.h
index 8fe22da46..215bfd7bb 100644
--- a/Eigen/src/Core/arch/SSE/Complex.h
+++ b/Eigen/src/Core/arch/SSE/Complex.h
@@ -106,14 +106,9 @@ template<> EIGEN_STRONG_INLINE Packet2cf ploadu<Packet2cf>(const std::complex<fl
template<> EIGEN_STRONG_INLINE Packet2cf pset1<Packet2cf>(const std::complex<float>& from)
{
- Packet2cf res;
-#ifdef EIGEN_VECTORIZE_SSE3
- res.v = _mm_castpd_ps(_mm_loaddup_pd(reinterpret_cast<double const*>(&from)));
-#else
- res.v = _mm_castpd_ps(_mm_load_sd(reinterpret_cast<double const*>(&from)));
- res.v = _mm_movelh_ps(res.v, res.v);
-#endif
- return res;
+ const float re = std::real(from);
+ const float im = std::imag(from);
+ return Packet2cf(_mm_set_ps(im, re, im, re));
}
template<> EIGEN_STRONG_INLINE Packet2cf ploaddup<Packet2cf>(const std::complex<float>* from) { return pset1<Packet2cf>(*from); }
--
2.37.0

64
gnu/packages/patches/eigen-remove-openmp-error-counting.patch
View File

@ -1,64 +0,0 @@
From ef3cc72cb65e2d500459c178c63e349bacfa834f Mon Sep 17 00:00:00 2001
From: Luke Peterson <hazelnusse@gmail.com>
Date: Thu, 8 Oct 2020 12:16:53 -0700
Subject: [PATCH] Remove error counting in OpenMP parallelize_gemm
This resolves a compilation error associated with
Eigen::eigen_assert_exception. It also eliminates the counting of
exceptions that may occur in the OpenMP parallel section. If an
unhandled exception occurs in this section, the behavior is non-conforming
according to the OpenMP specification.
---
Eigen/src/Core/products/Parallelizer.h | 14 +++++---------
test/CMakeLists.txt | 2 +-
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/Eigen/src/Core/products/Parallelizer.h b/Eigen/src/Core/products/Parallelizer.h
index 67b2442b5..a3cc05b77 100644
--- a/Eigen/src/Core/products/Parallelizer.h
+++ b/Eigen/src/Core/products/Parallelizer.h
@@ -132,8 +132,7 @@ void parallelize_gemm(const Functor& func, Index rows, Index cols, Index depth,
ei_declare_aligned_stack_constructed_variable(GemmParallelInfo<Index>,info,threads,0);
- int errorCount = 0;
- #pragma omp parallel num_threads(threads) reduction(+: errorCount)
+ #pragma omp parallel num_threads(threads)
{
Index i = omp_get_thread_num();
// Note that the actual number of threads might be lower than the number of request ones.
@@ -152,14 +151,11 @@ void parallelize_gemm(const Functor& func, Index rows, Index cols, Index depth,
info[i].lhs_start = r0;
info[i].lhs_length = actualBlockRows;
- EIGEN_TRY {
- if(transpose) func(c0, actualBlockCols, 0, rows, info);
- else func(0, rows, c0, actualBlockCols, info);
- } EIGEN_CATCH(...) {
- ++errorCount;
- }
+ if(transpose)
+ func(c0, actualBlockCols, 0, rows, info);
+ else
+ func(0, rows, c0, actualBlockCols, info);
}
- if (errorCount) EIGEN_THROW_X(Eigen::eigen_assert_exception());
#endif
}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0747aa6cb..b02577780 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -163,7 +163,7 @@ ei_add_test(constructor)
ei_add_test(linearstructure)
ei_add_test(integer_types)
ei_add_test(unalignedcount)
-if(NOT EIGEN_TEST_NO_EXCEPTIONS)
+if(NOT EIGEN_TEST_NO_EXCEPTIONS AND NOT EIGEN_TEST_OPENMP)
ei_add_test(exceptions)
endif()
ei_add_test(redux)
--
GitLab

74
gnu/packages/patches/eigen-stabilise-sparseqr-test.patch
View File

@ -1,74 +0,0 @@
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 16 Mar 2020 22:51:37 +0000
Subject: gnu: eigen: Stabilise sparseqr test.
Taken verbatim from this[0] upstream commit.
[0]: https://gitlab.com/libeigen/eigen/-/commit/3b5deeb546d4017b24846f5b0dc3296a50a039fe
From 3b5deeb546d4017b24846f5b0dc3296a50a039fe Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Tue, 19 Feb 2019 22:57:51 +0100
Subject: [PATCH] bug #899: make sparseqr unit test more stable by 1) trying
with larger threshold and 2) relax rank computation for rank-deficient
problems.
---
test/sparseqr.cpp | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/test/sparseqr.cpp b/test/sparseqr.cpp
index 3ffe62314..3576cc626 100644
--- a/test/sparseqr.cpp
+++ b/test/sparseqr.cpp
@@ -43,6 +43,7 @@ int generate_sparse_rectangular_problem(MatrixType& A, DenseMat& dA, int maxRows
template<typename Scalar> void test_sparseqr_scalar()
{
+ typedef typename NumTraits<Scalar>::Real RealScalar;
typedef SparseMatrix<Scalar,ColMajor> MatrixType;
typedef Matrix<Scalar,Dynamic,Dynamic> DenseMat;
typedef Matrix<Scalar,Dynamic,1> DenseVector;
@@ -91,14 +92,34 @@ template<typename Scalar> void test_sparseqr_scalar()
exit(0);
return;
}
-
- VERIFY_IS_APPROX(A * x, b);
-
- //Compare with a dense QR solver
+
+ // Compare with a dense QR solver
ColPivHouseholderQR<DenseMat> dqr(dA);
refX = dqr.solve(b);
- VERIFY_IS_EQUAL(dqr.rank(), solver.rank());
+ bool rank_deficient = A.cols()>A.rows() || dqr.rank()<A.cols();
+ if(rank_deficient)
+ {
+ // rank deficient problem -> we might have to increase the threshold
+ // to get a correct solution.
+ RealScalar th = RealScalar(20)*dA.colwise().norm().maxCoeff()*(A.rows()+A.cols()) * NumTraits<RealScalar>::epsilon();
+ for(Index k=0; (k<16) && !test_isApprox(A*x,b); ++k)
+ {
+ th *= RealScalar(10);
+ solver.setPivotThreshold(th);
+ solver.compute(A);
+ x = solver.solve(b);
+ }
+ }
+
+ VERIFY_IS_APPROX(A * x, b);
+
+ // For rank deficient problem, the estimated rank might
+ // be slightly off, so let's only raise a warning in such cases.
+ if(rank_deficient) ++g_test_level;
+ VERIFY_IS_EQUAL(solver.rank(), dqr.rank());
+ if(rank_deficient) --g_test_level;
+
if(solver.rank()==A.cols()) // full rank
VERIFY_IS_APPROX(x, refX);
// else
--
2.24.1

17
gnu/packages/patches/php-curl-compat.patch 100644
View File

@ -0,0 +1,17 @@
Fix test result with cURL 7.83 and later.
Taken from upstream:
https://github.com/php/php-src/commit/a4179e4c92b6365d39e09cb9cd63c476848013af
diff --git a/ext/curl/tests/curl_basic_007.phpt b/ext/curl/tests/curl_basic_007.phpt
index 3b53658d6a7e..3834e4674f82 100644
--- a/ext/curl/tests/curl_basic_007.phpt
+++ b/ext/curl/tests/curl_basic_007.phpt
@@ -20,5 +20,5 @@ curl_close($ch);
?>
--EXPECTF--
-string(%d) "No URL set!%w"
+string(%d) "No URL set%A"
int(3)

108
gnu/packages/patches/php-openssl_x509_checkpurpose_basic.patch
View File

@ -1,108 +0,0 @@
From 98175fc7f1623873ceb2e9a017a319d19bfb3912 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Sun, 12 Dec 2021 13:41:37 +0100
Subject: [PATCH] Fix openssl_x509_checkpurpose_basic.phpt
This test fails because san-cert.pem and san-ca.pem have expired. We
fix that by using the CertificateGenerator to generate temporary certs
during the test run. Since san-cert.pem and san-ca.pem have been
identical, we only generate one certificate.
Closes GH-7763.
---
.../openssl_x509_checkpurpose_basic.phpt | 10 +++++-
ext/openssl/tests/san-ca.pem | 15 ---------
ext/openssl/tests/san-cert.pem | 31 -------------------
3 files changed, 9 insertions(+), 47 deletions(-)
delete mode 100644 ext/openssl/tests/san-ca.pem
delete mode 100644 ext/openssl/tests/san-cert.pem
diff --git a/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt b/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt
index 99b4f0bdff31..35629bd93626 100644
--- a/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt
+++ b/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt
@@ -8,10 +8,14 @@ if (OPENSSL_VERSION_NUMBER < 0x10000000) die("skip Output requires OpenSSL 1.0")
?>
--FILE--
<?php
+include 'CertificateGenerator.inc';
+$certificateGenerator = new CertificateGenerator();
+$certificateGenerator->saveCaCert(__DIR__ . "/san-cert.pem");
+
$cert = "file://" . __DIR__ . "/cert.crt";
$bert = "file://" . __DIR__ . "/bug41033.pem";
$sert = "file://" . __DIR__ . "/san-cert.pem";
-$cpca = __DIR__ . "/san-ca.pem";
+$cpca = __DIR__ . "/san-cert.pem";
$utfl = __DIR__ . "/sni_server_uk.pem";
$rcrt = openssl_x509_read($cert);
@@ -84,6 +88,10 @@ var_dump(openssl_x509_checkpurpose($sert, X509_PURPOSE_SMIME_ENCRYPT, array($cpc
var_dump(openssl_x509_checkpurpose($sert, X509_PURPOSE_CRL_SIGN, array($cpca), $utfl));
var_dump(openssl_x509_checkpurpose($sert, X509_PURPOSE_ANY, array($cpca), $utfl));
?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . "/san-cert.pem");
+?>
--EXPECT--
bool(false)
bool(false)
diff --git a/ext/openssl/tests/san-ca.pem b/ext/openssl/tests/san-ca.pem
deleted file mode 100644
index 88682ba2dcf6..000000000000
--- a/ext/openssl/tests/san-ca.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICYTCCAcqgAwIBAgIJAIaqxtY5dwjtMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIEwJNTjEUMBIGA1UEBxMLTWlubmVhcG9saXMxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDAeFw0xMzA5MjQwODA1NTFaFw0y
-MTEyMTEwODA1NTFaMFMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTjEUMBIGA1UE
-BxMLTWlubmVhcG9saXMxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRl
-ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsFGqfbU/8D+KjroQl4XMyt9m
-dcSP7iZtqphOu9nVZxYAAqfaqj8FnC/pwYV3TU6ZHndLTQAllwYT3sQBQPPGmZQ9
-clSIMEL003t3pi4ZVXkttG6Vvr+Z9PBcHhlKLQ7WMHnn4qctllWXTSoyTQpkETF3
-Fc3mrG5G37BhoUno7NECAwEAAaM9MDswOQYDVR0RBDIwMIILZXhhbXBsZS5vcmeC
-D3d3dy5leGFtcGxlLm9yZ4IQdGVzdC5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQUF
-AAOBgQBf/FZhzheIcQJ+dyTk8xQ/nJLvpmBhbd1LNtfwk/MsC9UHsz4QXs9sBw1k
-rH0FjoqgM6avj7zKHJFTj6q7Rd+OX5V4HynYPhX67sWbN3KWEHffL98nGGd/bo3X
-pSjNk5vnyKYiwdUUe11Ac9csh0HcSBbhOYjy0T/i9AlQcKbuCg==
------END CERTIFICATE-----
diff --git a/ext/openssl/tests/san-cert.pem b/ext/openssl/tests/san-cert.pem
deleted file mode 100644
index 923d490e72fd..000000000000
--- a/ext/openssl/tests/san-cert.pem
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICYTCCAcqgAwIBAgIJAIaqxtY5dwjtMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIEwJNTjEUMBIGA1UEBxMLTWlubmVhcG9saXMxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDAeFw0xMzA5MjQwODA1NTFaFw0y
-MTEyMTEwODA1NTFaMFMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTjEUMBIGA1UE
-BxMLTWlubmVhcG9saXMxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRl
-ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsFGqfbU/8D+KjroQl4XMyt9m
-dcSP7iZtqphOu9nVZxYAAqfaqj8FnC/pwYV3TU6ZHndLTQAllwYT3sQBQPPGmZQ9
-clSIMEL003t3pi4ZVXkttG6Vvr+Z9PBcHhlKLQ7WMHnn4qctllWXTSoyTQpkETF3
-Fc3mrG5G37BhoUno7NECAwEAAaM9MDswOQYDVR0RBDIwMIILZXhhbXBsZS5vcmeC
-D3d3dy5leGFtcGxlLm9yZ4IQdGVzdC5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQUF
-AAOBgQBf/FZhzheIcQJ+dyTk8xQ/nJLvpmBhbd1LNtfwk/MsC9UHsz4QXs9sBw1k
-rH0FjoqgM6avj7zKHJFTj6q7Rd+OX5V4HynYPhX67sWbN3KWEHffL98nGGd/bo3X
-pSjNk5vnyKYiwdUUe11Ac9csh0HcSBbhOYjy0T/i9AlQcKbuCg==
------END CERTIFICATE-----
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALBRqn21P/A/io66
-EJeFzMrfZnXEj+4mbaqYTrvZ1WcWAAKn2qo/BZwv6cGFd01OmR53S00AJZcGE97E
-AUDzxpmUPXJUiDBC9NN7d6YuGVV5LbRulb6/mfTwXB4ZSi0O1jB55+KnLZZVl00q
-Mk0KZBExdxXN5qxuRt+wYaFJ6OzRAgMBAAECgYB11e5iWvqjPmQEZRdnnJU0VD8u
-n7ItT+Nk6qtb4gY8Abj6DWIW+01th5vqqJ8FvGyartFVYa69kuM+srG/zevAZWeu
-fGZtwiwZR4DRSyRcPp4rnNiksK3dkAZA6UewmRDPv8uyHJlXc5i+Ft1ILJ5Q5jgn
-UkC4z3EJP5Se9KZywQJBAOO4lRq42wLsYr2SDrQDSs4leie3FKc2bgvjF7Djosh1
-ZYbf55F5b9w1zgnccmni2HkqOnyFu4SKarmXyCsYxrkCQQDGNvnUh7/zZswrdWZ/
-PMp9zVDTh/5Oc2B4ByNLw1ERDwYhjchKgPRlQvn4cp3Pwf3UYPQ/8XGXzzEJey3A
-r0rZAkBf/tDEOgcBPXsGZQrTscuYCU5sbY5ESvqrAilbhSp7DJom+D5bIfEYyIm5
-uHd20Yzlzvpmwc1huyPwZt6X5FLpAkATDReoGMAXSesXxjnqwtIHk2NQYYLM0YQV
-JUJ8NrKk/Bevw+vbVVeoH+7ctU97t36JGiR/vNoZKD3jVmaIXZDJAkEA4wJbwzIo
-L32mu9VmZa7wjmfkraQEmXTPaA5D9lNC0AwRTgkj+x2Qe1vawNblNK9PPLBDdplQ
-L//53ADq/wv5rA==
------END PRIVATE KEY-----

23
gnu/packages/pdf.scm
View File

@ -660,26 +660,26 @@ interaction.")
(define-public podofo (define-public podofo
(package (package
(name "podofo") (name "podofo")
(version "0.9.7") (version "0.9.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/podofo/podofo/" version (uri (string-append "mirror://sourceforge/podofo/podofo/" version
"/podofo-" version ".tar.gz")) "/podofo-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1f0yvkx6nf99fp741w2y706d8bs9824x1z2gqm3rdy5fv8bfgwkw")))) "0m2icjy35jd0900g0fyfrmf0zsldv1chfc1q0zcqlaqrbzhhgrjx"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list cppunit pkg-config)) (list cppunit pkg-config))
(inputs (inputs
`(("libjpeg" ,libjpeg-turbo) (list fontconfig
("libtiff" ,libtiff) freetype
("fontconfig" ,fontconfig) libjpeg-turbo
("freetype" ,freetype) libpng
("libpng" ,libpng) libtiff
("lua" ,lua-5.1) lua-5.1
("openssl" ,openssl) openssl
("zlib" ,zlib))) zlib))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list "-DPODOFO_BUILD_SHARED=ON") (list "-DPODOFO_BUILD_SHARED=ON")
@ -690,8 +690,7 @@ interaction.")
(let ((freetype (assoc-ref inputs "freetype"))) (let ((freetype (assoc-ref inputs "freetype")))
;; Look for freetype include files in the correct place. ;; Look for freetype include files in the correct place.
(substitute* "cmake/modules/FindFREETYPE.cmake" (substitute* "cmake/modules/FindFREETYPE.cmake"
(("/usr/local") freetype))) (("/usr/local") freetype))))))))
#t)))))
(home-page "http://podofo.sourceforge.net") (home-page "http://podofo.sourceforge.net")
(synopsis "Tools to work with the PDF file format") (synopsis "Tools to work with the PDF file format")
(description (description

4
gnu/packages/perl.scm
View File

@ -2147,14 +2147,14 @@ CPAN::Meta object are present.")
(define-public perl-cpanel-json-xs (define-public perl-cpanel-json-xs
(package (package
(name "perl-cpanel-json-xs") (name "perl-cpanel-json-xs")
(version "4.26") (version "4.30")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/" (uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/"
"Cpanel-JSON-XS-" version ".tar.gz")) "Cpanel-JSON-XS-" version ".tar.gz"))
(sha256 (sha256
(base32 "0c07jfh6pq0f3hlhg0cqmznna7rlcflgrqv17mbkz9gnvg4x3szv")))) (base32 "1d5xwk3j3pvc2s439vjrnhwcx44wkskda9mrwv3ix2c6pp7slpsn"))))
(build-system perl-build-system) (build-system perl-build-system)
(propagated-inputs (propagated-inputs
(list perl-common-sense)) (list perl-common-sense))

9
gnu/packages/php.scm
View File

@ -61,7 +61,7 @@
(define-public php (define-public php
(package (package
(name "php") (name "php")
(version "7.4.26") (version "7.4.30")
(home-page "https://secure.php.net/") (home-page "https://secure.php.net/")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -69,10 +69,9 @@
"php-" version ".tar.xz")) "php-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1y0f1xgfi8cks6npdhrycg8r9g3q0pikqgf5h4xafpy8znmb61g3")) "03d7icwys4ikl45q3rgsxv1m3i7kfxhykpx75nn7jzn6697s6wpa"))
(patches (patches (search-patches "php-bug-74093-test.patch"
(search-patches "php-bug-74093-test.patch" "php-curl-compat.patch"))
"php-openssl_x509_checkpurpose_basic.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(with-directory-excursion "ext" '(with-directory-excursion "ext"

4
gnu/packages/python-xyz.scm
View File

@ -22003,14 +22003,14 @@ package updates.")
(define-public python-userspacefs (define-public python-userspacefs
(package (package
(name "python-userspacefs") (name "python-userspacefs")
(version "2.0.4") (version "2.0.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "userspacefs" version)) (uri (pypi-uri "userspacefs" version))
(sha256 (sha256
(base32 (base32
"06f2gsiypas270nqfjir4wwjlpkjp097pm6zchc7k20ggg32gv1k")))) "0v0qkdwfc61s2yiq7d7amin93x5biypfmi9pfhf8yj1rdpx5yvsx"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
(list python-fusepyng)) (list python-fusepyng))

15
gnu/packages/shells.scm
View File

@ -360,25 +360,18 @@ has a small feature set similar to a traditional Bourne shell.")
(define-public es (define-public es
(package (package
(name "es") (name "es")
(version "0.9.1") (version "0.9.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch/tarbomb)
(uri (string-append "https://github.com/wryun/es-shell/releases/" (uri (string-append "https://github.com/wryun/es-shell/releases/"
"download/v" version "/es-" version ".tar.gz")) "download/v" version "/es-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "1pgmqhsk14wyvl489sxdy7kdl2gwrsq1xvkip0z90kh888mlh9n9"))
"1fplzxc6lncz2lv2fyr2ig23rgg5j96rm2bbl1rs28mik771zd5h"))
(file-name (string-append name "-" version ".tar.gz")))) (file-name (string-append name "-" version ".tar.gz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" (list #:test-target "test"))
#:phases
(modify-phases %standard-phases
(add-before 'configure 're-enter-rootdir
;; The tarball has no folder.
(lambda _
(chdir ".."))))))
(inputs (inputs
(list readline)) (list readline))
(native-inputs (native-inputs

6
gnu/packages/toolkits.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -32,7 +32,7 @@
(define-public imgui (define-public imgui
(package (package
(name "imgui") (name "imgui")
(version "1.87") (version "1.88")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -41,7 +41,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"10qil22s5qak3as41787iz273sibpq1bq66bakgn7yvhj5fym6hz")) "13cw4hx55y5z678r558hv7znfz666wh0w849c5padnj4nkpbihdi"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove bundled fonts. ;; Remove bundled fonts.

6
gnu/packages/version-control.scm
View File

@ -221,14 +221,14 @@ Python 3.3 and later, rather than on Python 2.")
(define-public git (define-public git
(package (package
(name "git") (name "git")
(version "2.37.0") (version "2.37.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kernel.org/software/scm/git/git-" (uri (string-append "mirror://kernel.org/software/scm/git/git-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"07s1jmsc1d4dlmr3qpibfzj14gy1gm049zp2vp1lw36h3dqs2zwz")))) "001m3gnal902hv22gp1m44c6247357pb80db0svms74gidmjq5n8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("native-perl" ,perl) `(("native-perl" ,perl)
@ -248,7 +248,7 @@ Python 3.3 and later, rather than on Python 2.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1q68mnbpznapxxyjpysjx5lz8m6y25frxl5yshgx139c0xcr64c0")))) "098yz8kzvzmmrkyiv8j79s5nryws302pnq6jcbrqbidrziwcxkjd"))))
;; For subtree documentation. ;; For subtree documentation.
("asciidoc" ,asciidoc) ("asciidoc" ,asciidoc)
("docbook-xsl" ,docbook-xsl) ("docbook-xsl" ,docbook-xsl)

14
gnu/packages/video.scm
View File

@ -1559,14 +1559,14 @@ operate properly.")
(define-public ffmpeg-5 (define-public ffmpeg-5
(package (package
(name "ffmpeg") (name "ffmpeg")
(version "5.0.1") (version "5.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-" (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0yq0jcdc4qm5znrzylj3dsicrkk2n3n8bv28vr0a506fb7iglbpg")))) "00wbd5skv6ba5yqq4ca505ncckhvpzwflcsall7madg2bsmnmssm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(append (append
@ -5384,7 +5384,7 @@ brightness, contrast, and frame rate.")
(define-public get-iplayer (define-public get-iplayer
(package (package
(name "get-iplayer") (name "get-iplayer")
(version "3.27") (version "3.30")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -5393,7 +5393,7 @@ brightness, contrast, and frame rate.")
(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 "077y31gg020wjpx5pcivqgkqawcjxh5kjnvq97x2gd7i3wwc30qi")))) (base32 "1kzsdq1mhm5h83bbdbhh3jhpfvq4f13ly22mfd6vvmhj8mq084pi"))))
(build-system perl-build-system) (build-system perl-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
@ -5408,8 +5408,7 @@ brightness, contrast, and frame rate.")
(man (string-append out "/share/man/man1"))) (man (string-append out "/share/man/man1")))
(install-file "get_iplayer" bin) (install-file "get_iplayer" bin)
(install-file "get_iplayer.cgi" bin) (install-file "get_iplayer.cgi" bin)
(install-file "get_iplayer.1" man)) (install-file "get_iplayer.1" man))))
#t))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -5420,8 +5419,7 @@ brightness, contrast, and frame rate.")
prefix (,(string-append perllib ":" (getenv "PERL5LIB"))))) prefix (,(string-append perllib ":" (getenv "PERL5LIB")))))
(wrap-program (string-append out "/bin/get_iplayer.cgi") (wrap-program (string-append out "/bin/get_iplayer.cgi")
`("PERL5LIB" ":" `("PERL5LIB" ":"
prefix (,(string-append perllib ":" (getenv "PERL5LIB"))))) prefix (,(string-append perllib ":" (getenv "PERL5LIB")))))))))))
#t))))))
(inputs (inputs
(list perl-mojolicious perl-lwp-protocol-https perl-xml-libxml)) (list perl-mojolicious perl-lwp-protocol-https perl-xml-libxml))
(home-page "https://github.com/get-iplayer/get_iplayer") (home-page "https://github.com/get-iplayer/get_iplayer")

4
gnu/packages/virtualization.scm
View File

@ -2334,14 +2334,14 @@ administrators and developers in managing the database.")
(define-public osinfo-db (define-public osinfo-db
(package (package
(name "osinfo-db") (name "osinfo-db")
(version "20211216") (version "20220516")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://releases.pagure.org/libosinfo/osinfo-db-" (uri (string-append "https://releases.pagure.org/libosinfo/osinfo-db-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"10hhpciqk4lzsj66zkdvghd1i5zh6hg1fn9as4qhwcr1wnqfgv09")))) "0vfsdk3c6n6y04c5rf92m31zvl969kaniyx2fqywbp69mzc6j3yn"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(arguments (arguments
`(#:modules ((guix build utils)) `(#:modules ((guix build utils))

9
gnu/packages/vpn.scm
View File

@ -22,6 +22,7 @@
;;; Copyright © 2022 Lu hui <luhux76@gmail.com> ;;; Copyright © 2022 Lu hui <luhux76@gmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ <me@jeandudey.tech> ;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -676,13 +677,13 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer
(define-public openconnect (define-public openconnect
(package (package
(name "openconnect") (name "openconnect")
(version "8.10") (version "9.01")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "ftp://ftp.infradead.org/pub/openconnect/" (uri (string-append "ftp://ftp.infradead.org/pub/openconnect/"
"openconnect-" version ".tar.gz")) "openconnect-" version ".tar.gz"))
(sha256 (sha256
(base32 "1cdsx4nsrwawbsisfkldfc9i4qn60g03vxb13nzppr2br9p4rrih")))) (base32 "1iz4j00031a5ircrx30lkiwf58yl9kc827m4ssck4yg963wgmmxk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
(list libxml2 gnutls zlib)) (list libxml2 gnutls zlib))
@ -769,7 +770,7 @@ and probably others.")
(define-public openfortivpn (define-public openfortivpn
(package (package
(name "openfortivpn") (name "openfortivpn")
(version "1.15.0") (version "1.17.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -778,7 +779,7 @@ and probably others.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1qsfgpxg553s8rc9cyrc4k96z0pislxsdxb9wyhp8fdprkak2mw2")))) "0an58f0qcyxdx3d5zb5m8vi45a0251b950b5lh16572n8z2g6s2l"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list autoconf automake pkg-config)) (list autoconf automake pkg-config))

2
gnu/packages/web.scm
View File

@ -2871,7 +2871,7 @@ application classes.")
"08jvibq4v8xjj0c3cr93h0w8w0c88ajwjn37xjy7ygxl9krlffp6")))) "08jvibq4v8xjj0c3cr93h0w8w0c88ajwjn37xjy7ygxl9krlffp6"))))
(build-system perl-build-system) (build-system perl-build-system)
(native-inputs (native-inputs
(list perl-module-install perl-test-www-mechanize-catalyst)) (list perl-module-install perl-pod-parser perl-test-www-mechanize-catalyst))
(propagated-inputs (propagated-inputs
(list perl-catalyst-runtime perl-moose perl-namespace-autoclean (list perl-catalyst-runtime perl-moose perl-namespace-autoclean
starman)) starman))

42
gnu/packages/xdisorg.scm
View File

@ -161,6 +161,48 @@ specified window, otherwise it outputs the title of the active window. With
outputs when titles change.") outputs when titles change.")
(license license:unlicense))) (license license:unlicense)))
(define-public xvkbd
(package
(name "xvkbd")
(version "4.1")
(source
(origin
(method url-fetch)
(uri (string-append "http://t-sato.in.coocan.jp/xvkbd/xvkbd-"
version ".tar.gz"))
(sha256
(base32 "1x5yldv9y99cw5hzzs73ygdn1z80zns9hz0baa355r711zghfbcm"))))
(build-system gnu-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'remove-bugs
;; Both variables are inexplicably but explicitly set to
;; $(pkg-config --variable=VARIABLE xt) instead of our own.
(lambda _
(substitute* "Makefile.in"
(("^(appdefaultdir|datarootdir) = .*" _ variable)
(string-append variable " = @" variable "@\n"))))))))
(native-inputs
(list pkg-config))
(inputs
(list libxaw libxmu libxtst))
(home-page "http://t-sato.in.coocan.jp/xvkbd/")
(synopsis "Virtual computer keyboard for the X Window System")
(description
"The @acronym{xvkbd, X virtual keyboard} displays a drawing of a computer
keyboard in a window on the screen. Clicking on its keys sends the
corresponding keystroke(s) to other X clients, as if typed on a physical
keyboard.
This is useful for systems without keyboard hardware but with a pointing device,
such as kiosk terminals or handheld devices with touch screens.
A limited number of keyboard layouts are available, as is dictionary completion.
You can also use xvkbd to send a series of predetermined keystrokes from the
command line, without displaying a keyboard at all.")
(license license:gpl2+)))
(define-public arandr (define-public arandr
(package (package
(name "arandr") (name "arandr")

58
guix/build/clojure-build-system.scm
View File

@ -22,11 +22,15 @@
ant-build)) ant-build))
#:use-module (guix build clojure-utils) #:use-module (guix build clojure-utils)
#:use-module (guix build java-utils) #:use-module (guix build java-utils)
#:use-module (guix build syscalls)
#:use-module (guix build utils) #:use-module (guix build utils)
#:use-module (ice-9 match)
#:use-module (ice-9 regex)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:export (%standard-phases #:export (%standard-phases
clojure-build)) clojure-build
reset-class-timestamps))
;; Commentary: ;; Commentary:
;; ;;
@ -108,6 +112,55 @@ priority over TEST-INCLUDE."
jar-names))) jar-names)))
#t) #t)
(define (regular-jar-file? file stat)
"Predicate returning true if FILE is ending on '.jar'
and STAT indicates it is a regular file."
(and (string-suffix? ".jar" file)
(eq? 'regular (stat:type stat))))
;; XXX: The only difference compared to 'strip-jar-timestamps' in
;; ant-build-system.scm is the date. TODO: Adjust and factorize.
(define* (reset-class-timestamps #:key outputs #:allow-other-keys)
"Unpack all jar archives, reset the timestamp of all contained class files,
and repack them. This is necessary to ensure that archives are reproducible."
(define (repack-archive jar)
(format #t "resetting class timestamps and repacking ~a\n" jar)
;; Note: .class files need to be strictly newer than source files,
;; otherwise the Clojure compiler will recompile sources.
(let* ((early-1980 315619200) ; 1980-01-02 UTC
(dir (mkdtemp! "jar-contents.XXXXXX"))
(manifest (string-append dir "/META-INF/MANIFEST.MF")))
(with-directory-excursion dir
(invoke "jar" "xf" jar))
(delete-file jar)
(for-each (lambda (file)
(let ((s (lstat file)))
(unless (eq? (stat:type s) 'symlink)
(when (string-match "^(.*)\\.class$" file)
(utime file early-1980 early-1980)))))
(find-files dir #:directories? #t))
;; The jar tool will always set the timestamp on the manifest file
;; and the containing directory to the current time, even when we
;; reuse an existing manifest file. To avoid this we use "zip"
;; instead of "jar". It is important that the manifest appears
;; first.
(with-directory-excursion dir
(let* ((files (find-files "." ".*" #:directories? #t))
;; To ensure that the reference scanner can detect all
;; store references in the jars we disable compression
;; with the "-0" option.
(command (if (file-exists? manifest)
`("zip" "-0" "-X" ,jar ,manifest ,@files)
`("zip" "-0" "-X" ,jar ,@files))))
(apply invoke command)))
(utime jar 0 0)))
(for-each (match-lambda
((output . directory)
(for-each repack-archive
(find-files directory regular-jar-file?))))
outputs))
(define-with-docs install (define-with-docs install
"Standard 'install' phase for clojure-build-system." "Standard 'install' phase for clojure-build-system."
(install-jars "./")) (install-jars "./"))
@ -119,7 +172,8 @@ priority over TEST-INCLUDE."
(replace 'build build) (replace 'build build)
(replace 'check check) (replace 'check check)
(replace 'install install) (replace 'install install)
(add-after 'install-license-files 'install-doc install-doc))) (add-after 'install-license-files 'install-doc install-doc)
(add-after 'reset-gzip-timestamps 'reset-class-timestamps reset-class-timestamps)))
(define* (clojure-build #:key (define* (clojure-build #:key
inputs inputs

84
guix/download.scm
View File

@ -269,49 +269,55 @@
(kde (kde
"https://download.kde.org/" "https://download.kde.org/"
"https://download.kde.org/Attic/" ; for when it gets archived. "https://download.kde.org/Attic/" ; for when it gets archived.
;; Mirrors from http://files.kde.org/extra/mirrors.html ;; I could not find the classic static mirror list anymore. Instead,
;; add ‘.mirrorlist’ to the end of a recent download.kde.org tarball URL.
;; Europe ;; Europe
"http://mirror.easyname.at/kde" "https://mirrors.xtom.de/kde/"
"http://mirror.karneval.cz/pub/kde" "https://mirror.lyrahosting.com/pub/kde/"
"http://ftp.fi.muni.cz/pub/kde/" "https://mirrors.xtom.nl/kde/"
"http://mirror.oss.maxcdn.com/kde/" "https://mirror.hs-esslingen.de/Mirrors/ftp.kde.org/pub/kde/"
"http://ftp5.gwdg.de/pub/linux/kde/" "https://mirror.kumi.systems/kde/ftp/"
"http://ftp-stud.fht-esslingen.de/Mirrors/ftp.kde.org/pub/kde/" "https://mirrors.ircam.fr/pub/KDE/"
"http://mirror.klaus-uwe.me/kde/ftp/" "https://ftp.gwdg.de/pub/linux/kde/"
"http://kde.beta.mirror.ga/" "https://mirrors.gethosted.online/kde/pub/kde/"
"http://kde.alpha.mirror.ga/" "https://fr2.rpmfind.net/linux/KDE/"
"http://mirror.netcologne.de/kde" "https://mirror.faigner.de/kde/ftp/"
"http://vesta.informatik.rwth-aachen.de/ftp/pub/mirror/kde/" "https://www.mirrorservice.org/sites/download.kde.org/"
"http://ftp.rz.uni-wuerzburg.de/pub/unix/kde/" "https://mirrors.ukfast.co.uk/sites/kde.org/ftp/"
"http://mirrors.dotsrc.org/kde/" "https://mirrors.dotsrc.org/kde/"
"http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/"
"http://kde-mirror.freenux.org/"
"http://mirrors.ircam.fr/pub/KDE/"
"http://www-ftp.lip6.fr/pub/X11/kde/"
"http://fr2.rpmfind.net/linux/KDE/"
"http://kde.mirror.anlx.net/" "http://kde.mirror.anlx.net/"
"http://www.mirrorservice.org/sites/ftp.kde.org/pub/kde/" "https://mirror.karneval.cz/pub/kde/"
"http://ftp.heanet.ie/mirrors/ftp.kde.org/" "https://ftp.fi.muni.cz/pub/kde/"
"http://ftp.nluug.nl/pub/windowing/kde/" "https://www-ftp.lip6.fr/pub/X11/kde/"
"http://ftp.surfnet.nl/windowing/kde/" "https://ftp.icm.edu.pl/pub/unix/kde/"
"http://ftp.icm.edu.pl/pub/unix/kde/" "https://kde.mirror.garr.it/kde/ftp/"
"http://ftp.pbone.net/pub/kde/" "https://ftp.acc.umu.se/mirror/kde.org/ftp/"
"http://piotrkosoft.net/pub/mirrors/ftp.kde.org/" "https://mirrors.up.pt/pub/kde/"
"http://mirrors.fe.up.pt/pub/kde/" "https://mirrors.nav.ro/kde/"
"http://ftp.iasi.roedu.net/pub/mirrors/ftp.kde.org/" "https://mirrors.xtom.ee/kde/"
"http://ftp.acc.umu.se/mirror/kde.org/ftp/" "https://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/"
"http://kde.ip-connect.vn.ua/" "https://kde.ip-connect.vn.ua/"
"https://mirrors.netix.net/kde/"
"https://ftp.cc.uoc.gr/mirrors/kde/"
;; North America ;; North America
"http://mirror.its.dal.ca/kde/" "https://mirror.its.dal.ca/kde/"
"http://mirror.csclub.uwaterloo.ca/kde/" "https://nnenix.mm.fcix.net/kdeftp/"
"http://mirror.cc.columbia.edu/pub/software/kde/" "https://mirrors.mit.edu/kde/"
"http://kde.mirrors.hoobly.com/" "https://mirror.csclub.uwaterloo.ca/kde/"
"http://ftp.ussg.iu.edu/kde/" "https://mirror.fcix.net/kdeftp/"
"http://mirrors.mit.edu/kde/" "https://mirrors.ocf.berkeley.edu/kde/"
"http://kde.mirrors.tds.net/pub/kde/" "https://mirrors.xtom.com/kde/"
;; South America
"https://kde.c3sl.ufpr.br/"
;; Asia
"https://mirrors.bfsu.edu.cn/kde/"
"https://ftp-srv2.kddi-research.jp/pub/X11/kde/"
"https://mirrors.xtom.jp/kde/"
"https://mirrors.xtom.hk/kde/"
;; Africa
"http://mirror.retentionrange.co.bw/kde/"
;; Oceania ;; Oceania
"http://ftp.kddlabs.co.jp/pub/X11/kde/" "https://mirrors.xtom.au/kde/")
"http://kde.mirror.uber.com.au/")
(openbsd (openbsd
"https://ftp.openbsd.org/pub/OpenBSD/" "https://ftp.openbsd.org/pub/OpenBSD/"
;; Anycast CDN redirecting to your friendly local mirror. ;; Anycast CDN redirecting to your friendly local mirror.

32
guix/scripts/deploy.scm
View File

@ -76,6 +76,9 @@ Perform the deployment specified by FILE.\n"))
(lambda args (lambda args
(show-version-and-exit "guix deploy"))) (show-version-and-exit "guix deploy")))
(option '(#\n "dry-run") #f #f
(lambda (opt name arg result)
(alist-cons 'dry-run? #t result)))
(option '(#\x "execute") #f #f (option '(#\x "execute") #f #f
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'execute-command? #t result))) (alist-cons 'execute-command? #t result)))
@ -110,14 +113,20 @@ Perform the deployment specified by FILE.\n"))
environment-modules)))) environment-modules))))
(load* file module))) (load* file module)))
(define (show-what-to-deploy machines) (define* (show-what-to-deploy machines #:key (dry-run? #f))
"Show the list of machines to deploy, MACHINES." "Show the list of machines to deploy, MACHINES."
(let ((count (length machines))) (let ((count (length machines)))
(format (current-error-port) (if dry-run?
(N_ "The following ~d machine will be deployed:~%" (format (current-error-port)
"The following ~d machines will be deployed:~%" (N_ "The following ~d machine would be deployed:~%"
"The following ~d machines would be deployed:~%"
count)
count) count)
count) (format (current-error-port)
(N_ "The following ~d machine will be deployed:~%"
"The following ~d machines will be deployed:~%"
count)
count))
(display (indented-string (display (indented-string
(fill-paragraph (string-join (map machine-display-name machines) (fill-paragraph (string-join (map machine-display-name machines)
", ") ", ")
@ -241,6 +250,7 @@ otherwise."
#:argument-handler handle-argument)) #:argument-handler handle-argument))
(file (assq-ref opts 'file)) (file (assq-ref opts 'file))
(machines (and file (load-source-file file))) (machines (and file (load-source-file file)))
(dry-run? (assoc-ref opts 'dry-run?))
(execute-command? (assoc-ref opts 'execute-command?))) (execute-command? (assoc-ref opts 'execute-command?)))
(unless file (unless file
(leave (G_ "missing deployment file argument~%"))) (leave (G_ "missing deployment file argument~%")))
@ -254,7 +264,8 @@ otherwise."
(with-build-handler (build-notifier #:use-substitutes? (with-build-handler (build-notifier #:use-substitutes?
(assoc-ref opts 'substitutes?) (assoc-ref opts 'substitutes?)
#:verbosity #:verbosity
(assoc-ref opts 'verbosity)) (assoc-ref opts 'verbosity)
#:dry-run? dry-run?)
(parameterize ((%graft? (assq-ref opts 'graft?))) (parameterize ((%graft? (assq-ref opts 'graft?)))
(if execute-command? (if execute-command?
(match command (match command
@ -270,7 +281,8 @@ otherwise."
(_ (_
(leave (G_ "'-x' specified but no command given~%")))) (leave (G_ "'-x' specified but no command given~%"))))
(begin (begin
(show-what-to-deploy machines) (show-what-to-deploy machines #:dry-run? dry-run?)
(map/accumulate-builds store (unless dry-run?
(cut deploy-machine* store <>) (map/accumulate-builds store
machines)))))))))) (cut deploy-machine* store <>)
machines)))))))))))

3
tests/texlive.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -184,6 +184,7 @@ completely compatible with Plain TeX.")
"tex/texsis/config/") "tex/texsis/config/")
('base32 (? string? hash)) ('base32 (? string? hash))
#:trivial? #t)) #:trivial? #t))
('version . any)
('propagated-inputs ('propagated-inputs
('list 'texlive-cm ('list 'texlive-cm
'texlive-hyphen-base 'texlive-hyphen-base