diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-09 12:22:14 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-09 12:22:14 +0200 |
| commit | 94ca5b4357af8f8921f0cb0873a7cf316f13aa69 (patch) | |
| tree | 6ef30120737f26f298f7f17d86597b0b729517e0 /gnu/packages/version-control.scm | |
| parent | 6750c114e3e988249f4069d0180316c6d0192350 (diff) | |
| parent | db61bdd7f52270a35bd0a3a88650d98276dab20b (diff) | |
| download | guix-94ca5b4357af8f8921f0cb0873a7cf316f13aa69.tar.gz guix-94ca5b4357af8f8921f0cb0873a7cf316f13aa69.zip | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/version-control.scm')
| -rw-r--r-- | gnu/packages/version-control.scm | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 699a091642..86dcea908c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2377,6 +2377,15 @@ reviewing large, complex patch files.") (substitute* "tests/prt/all-512.sh" (("/bin/sh") (which "sh"))) + (for-each + (lambda (file) + (substitute* file (("egrep") "grep -E"))) + '("tests/common/test-common" + "tests/admin/comment.sh" + "tests/cdc/2comment.sh" + "tests/cdc/4order.sh" + "tests/get/subst.sh")) + ;; XXX: This test has no hope of passing until there is a "nogroup" ;; entry (or at least some group to which the guix builder does ;; not belong) in the /etc/group file of the build environment. @@ -2872,14 +2881,14 @@ specific files and directories.") (define-public src (package (name "src") - (version "1.31") + (version "1.32") (source (origin (method url-fetch) (uri (string-append "http://www.catb.org/~esr/src/src-" version ".tar.gz")) (sha256 (base32 - "1p8f5xc6k4jrli3iimi64ng11c246qqwsw9bqrrqkrmhvqdh4kcv")))) + "0r9i399kkagpwj08nwf1f7c6lr50xjzzgmzwyjjy6ppgcc53a809")))) (build-system gnu-build-system) (arguments '(#:make-flags |