From patchwork Tue Jul 21 06:38:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jesse Gibbons X-Patchwork-Id: 23279 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 D4C1427BBE3; Tue, 21 Jul 2020 07:39:07 +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 8FE0127BBE1 for ; Tue, 21 Jul 2020 07:39:07 +0100 (BST) Received: from localhost ([::1]:41912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxlvf-0005ld-4k for patchwork@mira.cbaines.net; Tue, 21 Jul 2020 02:39:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxlva-0005lV-Cn for guix-patches@gnu.org; Tue, 21 Jul 2020 02:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54254) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jxlva-0005sh-39 for guix-patches@gnu.org; Tue, 21 Jul 2020 02:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jxlvZ-00045C-Vy for guix-patches@gnu.org; Tue, 21 Jul 2020 02:39:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42461] [PATCH 2/2] gnu: jupyter-guile-kernel: Fix build. 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 06:39:01 +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.159531349415633 (code B ref 42461); Tue, 21 Jul 2020 06:39:01 +0000 Received: (at 42461) by debbugs.gnu.org; 21 Jul 2020 06:38:14 +0000 Received: from localhost ([127.0.0.1]:37565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jxluo-000444-IH for submit@debbugs.gnu.org; Tue, 21 Jul 2020 02:38:14 -0400 Received: from mail-pg1-f182.google.com ([209.85.215.182]:43273) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jxlum-00043o-4W for 42461@debbugs.gnu.org; Tue, 21 Jul 2020 02:38:13 -0400 Received: by mail-pg1-f182.google.com with SMTP id w2so11468091pgg.10 for <42461@debbugs.gnu.org>; Mon, 20 Jul 2020 23:38:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:message-id:date:user-agent:mime-version :content-transfer-encoding:content-language; bh=utjCC4MBEKgEw6IvOhQKFYSGL7i8V9yN1bcWsRj/5ng=; b=McpbPTad3ERLau6qRDsGwrXv32r0EgmHOvnFyOLZVG+7Bu5TSP5r3uljk6mMEANuDF bHSkclq1HodsTXP96/zecexWO/i4thL2P2P/FtSw77mBjVpRELLyf8kJW+RBHHBPCJlc c/IT8/Xe8JarXXgl+G99zjppeebaPNYRy2HKpNjQ3rIx0Y+IYEkWEPefdWuAsviQjVHq A24jF3FIQVmozTTv6v+SvsxyVKqUrfbG2dphl5adqGHtx//LUstnqZ1SGbeaXElfN4Dy injoXx5HfwH/g+oLoyjAUkEG/5sdA7QiQaz6Q3Sg+c8DrhZiggYsOs7VIg5D+YVvtOnn s/Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:message-id:date:user-agent :mime-version:content-transfer-encoding:content-language; bh=utjCC4MBEKgEw6IvOhQKFYSGL7i8V9yN1bcWsRj/5ng=; b=NZGCTL7EqmPKgLIBhf6w7GBxI2hvs9PCbZpPzIZEhPpvWPEol7M0TFzGpHTO553QJ7 ltE/OuSqfGRp+SYLSjGsC6P7IL0Tzur+2I6uZNk7b5p7WFLYC7j3sCiRS1/Ife3x7NoX kxYT/JQtGE3LYbsBST4k2qWudRNV27vEkER8KBInKFCTRyPXccJmyXFt+VzlY4QktHMq qkGUdQgSDpqfIYO0lrYtX9Q5Paw2dsNBfY0QSBYE2yRXfyzojj1TFaXZz1N5dvrwBRkr TyoZBlFotfnuCkgXgEDIFi4QslFFSMHbPs9QJEWtHseKuy4H1eeI6KxjrcAcQDtcjcv7 FKvg== X-Gm-Message-State: AOAM530/Sbykz7fc6PhemN3tUp0ozIgosc++CP/otyvhsGTfIaZKSm2/ oPlXRvHf55atgp1ih6bJHX6ZbaC4 X-Google-Smtp-Source: ABdhPJwTf4OM2sy3MxqSDcJRF5LkwzqLy3cnmD7VrNQRVRGKNkruybfkwr4Mr8QqzKOhOZllLPkXvQ== X-Received: by 2002:aa7:9685:: with SMTP id f5mr23587178pfk.223.1595313485772; Mon, 20 Jul 2020 23:38:05 -0700 (PDT) Received: from [192.168.1.25] ([38.141.58.134]) by smtp.gmail.com with ESMTPSA id 22sm18630511pfh.157.2020.07.20.23.38.04 for <42461@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 20 Jul 2020 23:38:05 -0700 (PDT) From: Jesse Gibbons Message-ID: Date: Tue, 21 Jul 2020 00:38:03 -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 * 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(-) (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 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.")