From patchwork Tue Jul 21 18:57:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jesse Gibbons X-Patchwork-Id: 23302 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3CCB327BBE3; Tue, 21 Jul 2020 19:58:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9C08427BBE1 for ; Tue, 21 Jul 2020 19:58:09 +0100 (BST) Received: from localhost ([::1]:40008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxxSr-000752-3A for patchwork@mira.cbaines.net; Tue, 21 Jul 2020 14:58:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxxSk-00074S-OY for guix-patches@gnu.org; Tue, 21 Jul 2020 14:58:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57122) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jxxSk-0003Cy-F5 for guix-patches@gnu.org; Tue, 21 Jul 2020 14:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jxxSk-0006SV-FD for guix-patches@gnu.org; Tue, 21 Jul 2020 14:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42461] gnu: fix guile-based Jupyter kernels References: <83f2feae-c20f-023c-5c49-1bd5ed280d04@gmail.com> In-Reply-To: <83f2feae-c20f-023c-5c49-1bd5ed280d04@gmail.com> Resent-From: Jesse Gibbons Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Jul 2020 18:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42461@debbugs.gnu.org Received: via spool by 42461-submit@debbugs.gnu.org id=B42461.159535785124761 (code B ref 42461); Tue, 21 Jul 2020 18:58:02 +0000 Received: (at 42461) by debbugs.gnu.org; 21 Jul 2020 18:57:31 +0000 Received: from localhost ([127.0.0.1]:40430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jxxSE-0006RJ-Mw for submit@debbugs.gnu.org; Tue, 21 Jul 2020 14:57:31 -0400 Received: from mail-pl1-f171.google.com ([209.85.214.171]:44990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jxxSD-0006Qt-Eb for 42461@debbugs.gnu.org; Tue, 21 Jul 2020 14:57:29 -0400 Received: by mail-pl1-f171.google.com with SMTP id w17so10639473ply.11 for <42461@debbugs.gnu.org>; Tue, 21 Jul 2020 11:57:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=9Sr98pU9VWjEpp1S29o/TJM//Q+7FMb5KoycNf74C14=; b=kKbK2AsWzdBpf8WXIgVCeBvEA1n/JS4MAQnJR62je3yAGS8HdUYBQE9cIHPJ6YcdsG S3fJpwmTayOxbXo7kYPxEswYgHDnmZJCFtiia5z/W08WEnRvhI2AAfovEXNjoONXHkLH HEgACRBCU3G2rqbL2WKpje1ga27ksKcpjiKX87KL3n9Vj9VtJwEmnOC+k/LiyAVl+n8B +6VaYiGdA8+lKDaa7CYcWyxefbQmc4HyiL175nYBZ0rms4LpuVri/UGaEahoFChBIZ3L 6xF9HZt+cFRd7EW8AaP/8H2EMn6tV2LMJaGai6/ZUCD0/nrelyXAyOH8jt/4764lWQYt ApIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=9Sr98pU9VWjEpp1S29o/TJM//Q+7FMb5KoycNf74C14=; b=EYip5cBCB/p9Bn/iyve0Qeqa19LxBz9mxEQEybwsWBMuzsLRS1T0281yNrFZrNljjL /JRExv9R8NxhmkQ60BGsg4AT29LTR8mdtscxpE9xZc3I2QJeZKkEYpE1SPrAAKPjUXqM Jx1q1HBerCyy1PHsBO3+NbHmdD0dkBbg+lXZDvTnbVdKpNCJ5aBL+19ZlsxBl+FvFnF8 4LDPzv4A9SXQ3wbU1ENS5hn7GFGwfeYLNkd/0Uot6VLV2aTMBW0rxp41kodo/nXWfDZi jam4z2UZqztFfAfH1Jfs/KC0AGgGbbXGUJgZUF40c8ocairmCpR9ID1eehqN5gJe9EvJ m1Jg== X-Gm-Message-State: AOAM532GCLMCx62jpMpSsoZL8NTfM7JDiwMzbE72Q+zqjPcFAUFCVZdY U7ReWnOhI52A/q5l5tWAgRv3xo6j X-Google-Smtp-Source: ABdhPJxlMhHjXFAcrtRrglkCV9HRTiIExygZDg2Do5K9AO2cmzO1CkoKaG3gorY1QQ+aO1hC+bpPKA== X-Received: by 2002:a17:902:d909:: with SMTP id c9mr22824433plz.225.1595357843407; Tue, 21 Jul 2020 11:57:23 -0700 (PDT) Received: from [192.168.1.25] ([38.141.58.134]) by smtp.gmail.com with ESMTPSA id w2sm3922813pjt.19.2020.07.21.11.57.22 for <42461@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 21 Jul 2020 11:57:22 -0700 (PDT) From: Jesse Gibbons Message-ID: <60024c57-4ff1-d15f-6152-f3850e7f24d0@gmail.com> Date: Tue, 21 Jul 2020 12:57:21 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Icedove/68.10.0 MIME-Version: 1.0 Content-Language: en-US X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches I guess my patches got mangled... attached are the patches that fix the guile-based Jupyter kernels. From 9f995d253eb58f8ffe9129ed2c0999be2888185a Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Fri, 17 Jul 2020 08:56:47 -0600 Subject: [PATCH 2/2] gnu: jupyter-guile-kernel: Fix build. * gnu/packages/guile-xyz.scm: jupyter-guile-kernel: Update commit. Update revision. Re-indent package definition (using indent.el) [phases]: Replace /home with /usr/local [inputs]: Update guile. Update guile-json. --- gnu/packages/guile-xyz.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 59266a045b..3d51479751 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2020 Julien Lepiler ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Masaya Tojo +;;; Copyright © 2020 Jesse Gibbons ;;; ;;; This file is part of GNU Guix. ;;; @@ -935,8 +936,8 @@ messaging library.") (deprecated-package "guile3.0-simple-zmq" guile-simple-zmq)) (define-public jupyter-guile-kernel - (let ((commit "a7db9245a886e104138474df46c3e88b95cff629") - (revision "1")) + (let ((commit "f25fb90b95529b17a006a807bd04e6aee12ea304") + (revision "2")) (package (name "jupyter-guile-kernel") (version (git-version "0.0.0" revision commit)) @@ -949,7 +950,7 @@ messaging library.") (file-name (git-file-name name version)) (sha256 (base32 - "0aj04853bqm47ivfcmrgpb7w3wkis847kc7qrwsa5zcn9h38qh2f")))) + "0zr1fasdb2yv9kn21yll993y9higqss4jnfs030ndhjb93raa9sr")))) (build-system guile-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -984,7 +985,7 @@ messaging library.") ;; Fix hard-coded file name in the kernel. (substitute* (string-append dir "/kernel.json") - (("/home/.*/guile-jupyter-kernel.scm") + (("/usr/local/.*/guile-jupyter-kernel.scm") (string-append out "/share/guile/site/" (target-guile-effective-version) "/guile-jupyter-kernel.scm")) @@ -1005,17 +1006,17 @@ messaging library.") effective "/site-ccache\"")) deps))) - (string-append "--no-auto-compile\"" - (string-join -L ", \"-L\", " - 'prefix) - (string-join -C ", \"-C\", " - 'prefix) - ", \"-s")))) + (string-append "--no-auto-compile\"" + (string-join -L ", \"-L\", " + 'prefix) + (string-join -C ", \"-C\", " + 'prefix) + ", \"-s")))) #t)))))) (inputs `(("openssl" ,openssl) - ("guile" ,guile-2.2) - ("guile-json" ,guile-json-1) + ("guile" ,guile-3.0) + ("guile-json" ,guile-json-3) ("guile-simple-zmq" ,guile-simple-zmq))) (synopsis "Guile kernel for the Jupyter Notebook") (description -- 2.27.0