From 2abd76e8afe64ef4f4041ff02e9b22debb9f0483 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 27 Jul 2018 11:20:09 +0200 Subject: gnu: guile: Update to 2.2.4. * gnu/packages/guile.scm (guile-2.2): Update to 2.2.4. (guile-2.2.4): Remove. * gnu/packages/package-management.scm (guix)[inputs]: Switch to GUILE-2.2. * guix/self.scm (guile-for-build): Likewise. --- gnu/packages/package-management.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b7e3b320f6..58b8ca235c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -264,9 +264,7 @@ ("sqlite" ,sqlite) ("libgcrypt" ,libgcrypt) - ;; Use 2.2.4 to avoid various thread-safety issues while building - ;; code in parallel. - ("guile" ,guile-2.2.4) + ("guile" ,guile-2.2) ;; Many tests rely on the 'guile-bootstrap' package, which is why we ;; have it here. -- cgit v1.2.3 From c1d80c7a9c87e1f3b03f6ec9eec94ce391674e3d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 25 Nov 2018 12:53:52 +0100 Subject: gnu: diffoscope: Fix test failure. * gnu/packages/package-management.scm (diffoscope)[arguments]: Remove failing Berkeley DB test. --- gnu/packages/package-management.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 471a08b799..be48aa0685 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -586,6 +586,12 @@ transactions from C or Python.") (lambda _ (substitute* "setup.py" (("'python-magic',") "")))) + ;; This test is broken because our `file` package has a + ;; bug in berkeley-db file type detection. + (add-after 'unpack 'remove-berkeley-test + (lambda _ + (delete-file "tests/comparators/test_berkeley_db.py") + #t)) (add-after 'unpack 'embed-tool-references (lambda* (#:key inputs #:allow-other-keys) (substitute* "diffoscope/comparators/utils/compare.py" -- cgit v1.2.3 From 07fdf96140da4531ffdc4ed7b18ebde9ad012737 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 25 Nov 2018 12:55:07 +0100 Subject: gnu: diffoscope: Update to 106. * gnu/packages/package-management.scm (diffoscope): Update to 106. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index be48aa0685..46b0aa26f0 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -569,13 +569,13 @@ transactions from C or Python.") (define-public diffoscope (package (name "diffoscope") - (version "105") + (version "106") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "0bqkwvrvlvybqfi73qv1k5xic2qzw5lv20imqadf1wc4l8vc0vq3")))) + "0qrfp7nha2n2s9h5ibcf7rqji1amh4cqbcf80m6anim6p3ik26da")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3