diff options
| author | Marius Bakke <marius@gnu.org> | 2021-08-12 00:30:27 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-08-12 00:30:27 +0200 |
| commit | c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7 (patch) | |
| tree | 47bd773d2f434384b54e56916c1a287dd8e51511 /gnu/packages/lisp.scm | |
| parent | ffa01e68859bb7a6daa9fcffdc8d77ca35db4bc0 (diff) | |
| parent | 4eb0a5146ae5a195a29c79f586fcc1e58f7fa69b (diff) | |
| download | guix-patches-c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7.tar guix-patches-c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7.tar.gz | |
Merge branch 'master' into core-updates-frozen
Conflicts:
gnu/packages/algebra.scm
gnu/packages/games.scm
gnu/packages/golang.scm
gnu/packages/kerberos.scm
gnu/packages/mail.scm
gnu/packages/python.scm
gnu/packages/ruby.scm
gnu/packages/scheme.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
Diffstat (limited to 'gnu/packages/lisp.scm')
| -rw-r--r-- | gnu/packages/lisp.scm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 58cc421ad7..b01ded87ad 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -903,7 +903,7 @@ the HTML documentation of TXR.") (define-public txr (package (name "txr") - (version "266") + (version "268") (source (origin (method git-fetch) @@ -912,7 +912,7 @@ the HTML documentation of TXR.") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1k9mj3zaxdsylgnb8g6cq0cmp6420x7fp3nnsqdmds4gh8ib95wn")))) + (base32 "0q97qddbgk9356gx4xp8iip4pwj3ln03dvjfgrny76f3wmmiwsw6")))) (build-system gnu-build-system) (native-inputs ;; Required to build the documentation. @@ -957,10 +957,7 @@ the HTML documentation of TXR.") (lambda _ (substitute* (list "tests/017/realpath.tl" "tests/017/realpath.expected") - (("/usr/bin") "/")) - (substitute* "tests/018/path-test.tl" - (("/bin") (dirname (which "sh")))) - #t)) + (("/usr/bin") "/")))) (replace 'configure ;; ./configure is a hand-written script that can't handle standard ;; autotools arguments like CONFIG_SHELL. |