[bug#35221,1/2] Update bordeaux-threads update to 0.8.6 and add log4cl

Message ID rpnniaFFYw0HOebPrTpNwmRyy79869FfLkAxX7Lu891hHptmW-fqtW7iDHgpmRo_jesFD_0uosEALNS8pwbXWxMyn5IQj_xIWVv2UikVN2E=@protonmail.com
State Accepted
Headers show
Series [bug#35221,1/2] Update bordeaux-threads update to 0.8.6 and add log4cl | expand

Checks

Context Check Description
cbaines/applying patch fail Apply failed

Commit Message

JesseJohnGildersleve April 10, 2019, 6:27 p.m. UTC
This update will be eventually needed to build a future version of the next browser (I am packaging the git version). This package is required for the package sbclc-log4cl.

From c4d33e29cefbab083eb19aeb44a2fd47841da21c Mon Sep 17 00:00:00 2001
From: frozenpigs <purpjuice@protonmail.com>
Date: Wed, 10 Apr 2019 18:48:12 +0100
Subject: [PATCH] gnu: bordeaux-threads update to 0.8.6

---
 gnu/packages/lisp.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--
2.21.0

Comments

JesseJohnGildersleve April 10, 2019, 6:30 p.m. UTC | #1
Was meant to be [PATCH 2/2]


Sent with ProtonMail Secure Email.

‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Wednesday, April 10, 2019 7:29 PM, JesseJohnGildersleve <JesseJohnGildersleve@protonmail.com> wrote:

> From 5ea316ec3873737bd1a99591d4127dc48d8b471a Mon Sep 17 00:00:00 2001
> From: frozenpigs purpjuice@protonmail.com
>
> Date: Wed, 10 Apr 2019 19:25:50 +0100
> Subject: [PATCH] gnu: Add sbcl-log4cl, cl-log4cl and ecl-log4cl
>
> ------------------------------------------------------------------------------------------------------
>
> gnu/packages/lisp.scm | 28 ++++++++++++++++++++++++++++
> 1 file changed, 28 insertions(+)
>
> diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
> index e0f3e0ae40..2a51a98240 100644
> --- a/gnu/packages/lisp.scm
> +++ b/gnu/packages/lisp.scm
> @@ -5239,3 +5239,31 @@ Python's WSGI and Ruby's Rack.")
>
> (define-public cl-clack
> (sbcl-package->cl-source-package sbcl-clack))
>
> -
>
> +(define-public sbcl-log4cl
>
> -   (package
> -   (name "sbcl-log4cl")
> -   (build-system asdf-build-system/sbcl)
> -   (source
> -       (origin
>
>
> -         (method git-fetch)
>
>
> -         (uri (git-reference
>
>
> -                        (url "https://github.com/sharplispers/log4cl")
>
>
> -                        (commit "611e094458504b938d49de904eab141285328c7c")))
>
>
> -         (sha256
>
>
> -          (base32
>
>
> -           "08jly0s0g26b56hhpfizxsb4j0yvbh946sd205gr42dkzv8l7dsc"))))
>
>
> -   (arguments
> -       `(#:tests? #f))
>
>
> -   (inputs `(("bordeaux-threads" ,sbcl-bordeaux-threads)))
> -   (version "1.1.2")
> -   (synopsis "Common Lisp logging framework, modeled after Log4J")
> -   (home-page "https://github.com/7max/log4cl")
> -   (description "Common Lisp logging framework, modeled after Log4J")
> -   (license license:expat)))
> -
>
> +(define-public cl-log4cl
>
> -   (sbcl-package->cl-source-package sbcl-log4cl))
>
> -
>
> +(define-public ecl-log4cl
>
> -   (sbcl-package->ecl-package sbcl-log4cl))
>
> --
> 2.21.0

Patch

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 5a30e7c1dd..e0f3e0ae40 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -13,6 +13,7 @@ 
 ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2019 Katherine Cox-Buday <cox.katherine.e@gmail.com>
+;;; Copyright © 2019 Jesse Gildersleve <jessejohngildersleve@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -714,18 +715,18 @@  interactive development model in mind.")
   (sbcl-package->ecl-package sbcl-fiveam))

 (define-public sbcl-bordeaux-threads
-  (let ((commit "354abb0ae9f1d9324001e1a8abab3128d7420e0e")
+  (let ((commit "5dce49fbc829f4d136a734f5ef4f5d599660984f")
         (revision "1"))
     (package
       (name "sbcl-bordeaux-threads")
-      (version (git-version "0.8.5" revision commit))
+      (version (git-version "0.8.6" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
                       (url "https://github.com/sionescu/bordeaux-threads.git")
                       (commit commit)))
                 (sha256
-                 (base32 "1hcfp21l6av1xj6z7r77sp6h4mwf9vvx4s745803sysq2qy2mwnq"))
+                 (base32 "1gkh9rz7zw57n3110ikcf4835950wr4hgp8l79id5ai6nd86x7wv"))
                 (file-name
                  (git-file-name "bordeaux-threads" version))))
       (inputs `(("alexandria" ,sbcl-alexandria)))