diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 11:29:02 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 11:43:21 -0400 |
commit | 4920f6e634eeecb37b501bdc024dfe0aab849ed0 (patch) | |
tree | c7dd5859715071cb602133b67449a29488027f70 /gnu/packages/lisp.scm | |
parent | 513091dbd2eeba138b558f5f9bb1ee6e68eee01d (diff) | |
parent | 3d297a0017210f1dd135592efb10846840a8af88 (diff) | |
download | guix-4920f6e634eeecb37b501bdc024dfe0aab849ed0.tar.gz |
Merge branch 'staging' into core-updates
Conflicts resolved in: gnu/local.mk gnu/packages/cmake.scm gnu/packages/glib.scm gnu/packages/gnome.scm gnu/packages/gtk.scm gnu/packages/sdl.scm pango-next, vala-next and librsvg-bootstrap were removed in the process.
Diffstat (limited to 'gnu/packages/lisp.scm')
-rw-r--r-- | gnu/packages/lisp.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index e9c623dda3..77706c88ae 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -988,7 +988,7 @@ the HTML documentation of TXR.") (define-public txr (package (name "txr") - (version "280") + (version "281") (source (origin (method git-fetch) @@ -997,7 +997,7 @@ the HTML documentation of TXR.") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ni2yb9dggldgizfp13mvrw5vzk13pg74dpk2lyn9dijqvs293s4")))) + (base32 "18sncprahl41hcy9l6mc4vwlaiamkwrs805974g4vci4waccb37k")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -1236,7 +1236,7 @@ including a built-in database engine and a GUI system.") (define-public janet (package (name "janet") - (version "1.24.0") + (version "1.24.1") (source (origin (method git-fetch) @@ -1245,7 +1245,7 @@ including a built-in database engine and a GUI system.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "07kyjzbj5g197008n9qwpdnagylzlv8x4zbsf2d233mpskv3dixi")))) + (base32 "1zaf2z2x5mgfp2nwj3q6pmcj558mw1772a09xn8b8na0cahxlrmq")))) (build-system gnu-build-system) (arguments (list #:make-flags |