From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 30 01:31:30 2018 Received: (at submit) by debbugs.gnu.org; 30 Aug 2018 05:31:30 +0000 Received: from localhost ([127.0.0.1]:37785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fvFYH-0006xQ-UY for submit@debbugs.gnu.org; Thu, 30 Aug 2018 01:31:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fvFYF-0006xC-Sr for submit@debbugs.gnu.org; Thu, 30 Aug 2018 01:31:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fvFY9-0003Ro-Ky for submit@debbugs.gnu.org; Thu, 30 Aug 2018 01:31:22 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:41991) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fvFY9-0003Rd-Gz for submit@debbugs.gnu.org; Thu, 30 Aug 2018 01:31:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fvFY6-0004j4-AN for guix-patches@gnu.org; Thu, 30 Aug 2018 01:31:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fvFVE-0002DO-O4 for guix-patches@gnu.org; Thu, 30 Aug 2018 01:28:23 -0400 Received: from mailchk-m05.uwaterloo.ca ([129.97.128.237]:52140) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fvFVE-0002D9-HI for guix-patches@gnu.org; Thu, 30 Aug 2018 01:28:20 -0400 Received: from localhost (CPEac202e023313-CMac202e023310.cpe.net.cable.rogers.com [99.254.144.176]) (authenticated bits=0) by mailchk-m05.uwaterloo.ca (8.14.7/8.14.7) with ESMTP id w7U5SFo3023135 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 30 Aug 2018 01:28:16 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 mailchk-m05.uwaterloo.ca w7U5SFo3023135 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uwaterloo.ca; s=default; t=1535606897; bh=9yWH4tTiGmpf1wtaXWlpIn1LERimLnchx3fPs7j6gQ0=; h=Date:From:To:Subject:From; b=nvJAjjCDUtifLnyQehL67Y2NZdcRGuTvTYd51DAlnEJ70MP2miDeZ5uYByinJcpsV QY+9NeTej+px9Z5QDUT31kKWLbtJd4yhapSlbVvUatTAAIDa/zl75wRF2c0YM4W0q3 DNuC9FCyhplfjKZnSN3fOTcHjLbOwFuhWcEIl08k= Date: Thu, 30 Aug 2018 01:28:13 -0400 From: Andy Patterson To: guix-patches@gnu.org Subject: [PATCH 0/5] Fix slynk on sbcl. Message-ID: <20180830012813.7830cfc6@uwaterloo.ca> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-UUID: cd257d29-fd6b-4dcf-aeb7-ae7c2dcc3320 X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.2 (mailchk-m05.uwaterloo.ca [129.97.128.141]); Thu, 30 Aug 2018 01:28:17 -0400 (EDT) X-Miltered: at mailchk-m05 with ID 5B87806F.003 by Joe's j-chkmail (http://j-chkmail.ensmp.fr)! X-Virus-Scanned: clamav-milter 0.100.1 at mailchk-m05 X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hey all, Here are some changes to the asdf build system and the slynk package with the aim of fixing slynk's build on sbcl. Let me know what you think. Thanks, -- Andy From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 30 01:36:57 2018 Received: (at 32582) by debbugs.gnu.org; 30 Aug 2018 05:36:57 +0000 Received: from localhost ([127.0.0.1]:37793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fvFdZ-00075l-JA for submit@debbugs.gnu.org; Thu, 30 Aug 2018 01:36:57 -0400 Received: from minos.uwaterloo.ca ([129.97.128.78]:52040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fvFdX-00075F-Ov for 32582@debbugs.gnu.org; Thu, 30 Aug 2018 01:36:56 -0400 Received: from localhost.localdomain (CPEac202e023313-CMac202e023310.cpe.net.cable.rogers.com [99.254.144.176]) (authenticated bits=0) by minos.uwaterloo.ca (8.14.4/8.14.4) with ESMTP id w7U5ahRN016275 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Thu, 30 Aug 2018 01:36:49 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 minos.uwaterloo.ca w7U5ahRN016275 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uwaterloo.ca; s=default; t=1535607410; bh=eeO98WHaw9puvWYGwQ1T/QwK4m5mlJvdYpfudyJ4JAg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wSPjrbwN7EQrKhWJeJkvyPX5fhV7O5b1ch795byRQSISjd9TC7MnRVM3ph+QEtY0U xEtobndaqE33kPLotBov8uVnGWLTGcFNdHwMiuX9YjR15sKp02NQ2gU/Yej6YFmZmy HX+8FFIBe0yypcG565CxRYsni6Uxxea389THv05k= From: Andy Patterson To: 32582@debbugs.gnu.org Subject: [PATCH 1/5] build-system/asdf: Handle all asdf dependency specifications. Date: Thu, 30 Aug 2018 01:36:28 -0400 Message-Id: <20180830053632.26414-1-ajpatter@uwaterloo.ca> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180830012813.7830cfc6@uwaterloo.ca> References: <20180830012813.7830cfc6@uwaterloo.ca> X-UUID: bd545fd1-5475-49d2-8889-3e185cc17392 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 32582 Cc: Andy Patterson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Add support for dependencies of the form (:version ), (:feature ) and (:require ), as defined by . * guix/build/lisp-utils.scm (normalize-dependency): New variable. (make-asd-file)[dependencies]: Use it to generate dependencies with normalized names. [dependency-name]: New variable. [registry]: Use it to flatten the normalized dependencies. --- guix/build/lisp-utils.scm | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/guix/build/lisp-utils.scm b/guix/build/lisp-utils.scm index 21cb620d5..3a7afab43 100644 --- a/guix/build/lisp-utils.scm +++ b/guix/build/lisp-utils.scm @@ -81,6 +81,20 @@ "Replace invalid characters in STR with a hyphen." (string-join (string-tokenize str valid-char-set) "-")) +(define (normalize-dependency dependency) + "Normalize the name of DEPENDENCY. Handles dependency definitions of the +dependency-def form described by +." + (match dependency + ((':version name rest ...) + `(:version ,(normalize-string name) ,@rest)) + ((':feature feature-specification dependency-specification) + `(:feature + ,feature-specification + ,(normalize-dependency dependency-specification))) + ((? string? name) (normalize-string name)) + (require-specification require-specification))) + (define (inputs->asd-file-map inputs) "Produce a hash table of the form (system . asd-file), where system is the name of an ASD system, and asd-file is the full path to its definition." @@ -273,16 +287,24 @@ system to find its dependencies, as described by GENERATE-DEPENDENCY-LINKS." (system-dependencies system system-asd-file))) (if (eq? 'NIL deps) '() - (map normalize-string deps)))) + (map normalize-dependency deps)))) (define lisp-input-map (inputs->asd-file-map inputs)) + (define dependency-name + (match-lambda + ((':version name _ ...) name) + ((':feature _ dependency-specification) + (dependency-name dependency-specification)) + ((? string? name) name) + (_ #f))) + (define registry (filter-map hash-get-handle (make-list (length dependencies) lisp-input-map) - dependencies)) + (map dependency-name dependencies))) (call-with-output-file asd-file (lambda (port) -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 30 01:36:58 2018 Received: (at 32582) by debbugs.gnu.org; 30 Aug 2018 05:36:58 +0000 Received: from localhost ([127.0.0.1]:37796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fvFdZ-00075o-SG for submit@debbugs.gnu.org; Thu, 30 Aug 2018 01:36:58 -0400 Received: from minos.uwaterloo.ca ([129.97.128.78]:52058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fvFdY-00075G-6I for 32582@debbugs.gnu.org; Thu, 30 Aug 2018 01:36:56 -0400 Received: from localhost.localdomain (CPEac202e023313-CMac202e023310.cpe.net.cable.rogers.com [99.254.144.176]) (authenticated bits=0) by minos.uwaterloo.ca (8.14.4/8.14.4) with ESMTP id w7U5ahRO016275 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Thu, 30 Aug 2018 01:36:50 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 minos.uwaterloo.ca w7U5ahRO016275 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uwaterloo.ca; s=default; t=1535607410; bh=ewHuWFpd3ZDTTVTvGpiaEWKlJuYeLOXOTVgV8P+TVn8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j9/yseWPsziYZzMQqdcWxsOwTUDn6+NcBSFfOJ/ZC856KjNvZqw2023h1f+A4rptT VvpHXVbaGvKCU4zBzDKifokc80a4udOdD/Gh1OPzfZnuFIPU3W2QTpZrOjU+2XVgNP 6MWP56ym8Z7Fy7mDTfPvFhfXgQ3N0i3yvD+/tStw= From: Andy Patterson To: 32582@debbugs.gnu.org Subject: [PATCH 2/5] build-system/asdf: Log lisp system invocations. Date: Thu, 30 Aug 2018 01:36:29 -0400 Message-Id: <20180830053632.26414-2-ajpatter@uwaterloo.ca> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180830012813.7830cfc6@uwaterloo.ca> References: <20180830012813.7830cfc6@uwaterloo.ca> X-UUID: d243ffcd-91ce-47bc-ade6-f2c1b3ffe66a X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 32582 Cc: Andy Patterson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * guix/build/lisp-system.scm: (lisp-eval-program): Log the arguments to system*. --- guix/build/lisp-utils.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/guix/build/lisp-utils.scm b/guix/build/lisp-utils.scm index 3a7afab43..9cf479dac 100644 --- a/guix/build/lisp-utils.scm +++ b/guix/build/lisp-utils.scm @@ -119,9 +119,10 @@ name of an ASD system, and asd-file is the full path to its definition." (define (lisp-eval-program program) "Evaluate PROGRAM with a given LISP implementation." - (unless (zero? (apply system* - (lisp-invocation program))) - (error "lisp-eval-program failed!" (%lisp) program))) + (define invocation (lisp-invocation program)) + (format #t "Invoking ~a: ~{~s ~}~%" (%lisp-type) invocation) + (unless (zero? (apply system* invocation)) + (error "lisp-eval-program failed!" invocation))) (define (spread-statements program argument-name) "Return a list with the statements from PROGRAM spread between -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 30 01:36:58 2018 Received: (at 32582) by debbugs.gnu.org; 30 Aug 2018 05:36:58 +0000 Received: from localhost ([127.0.0.1]:37798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fvFda-000760-34 for submit@debbugs.gnu.org; Thu, 30 Aug 2018 01:36:58 -0400 Received: from minos.uwaterloo.ca ([129.97.128.78]:52074) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fvFdY-00075I-Sx for 32582@debbugs.gnu.org; Thu, 30 Aug 2018 01:36:57 -0400 Received: from localhost.localdomain (CPEac202e023313-CMac202e023310.cpe.net.cable.rogers.com [99.254.144.176]) (authenticated bits=0) by minos.uwaterloo.ca (8.14.4/8.14.4) with ESMTP id w7U5ahRP016275 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Thu, 30 Aug 2018 01:36:51 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 minos.uwaterloo.ca w7U5ahRP016275 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uwaterloo.ca; s=default; t=1535607411; bh=4oAX/hQf7pA2a54/VUuqzbLnngXdkOpS1OA/jO6rfFI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dsVBl/s02o4jxrFxsjiR0TrQV+AVp37Nm6N3NYtgX1kWy6C1kiaEvg/wRrZCZoL6g xIqghfTMA4zYeJ/2UDTgN/A0nB+xcVMgK2VdEEjoMBtRWRcFF1ufIWw7zspjQDzVD3 qxwl8IRR3DHCmjEFZEynHoho15d/e5/Wd7BYD7q0= From: Andy Patterson To: 32582@debbugs.gnu.org Subject: [PATCH 3/5] build-system/asdf: Use invoke. Date: Thu, 30 Aug 2018 01:36:30 -0400 Message-Id: <20180830053632.26414-3-ajpatter@uwaterloo.ca> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180830012813.7830cfc6@uwaterloo.ca> References: <20180830012813.7830cfc6@uwaterloo.ca> X-UUID: 83878099-01bc-4f84-b7e1-8826d22adbc6 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 32582 Cc: Andy Patterson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * guix/build/lisp-utils.scm (lisp-eval-program): Replace system* and error handling with invoke. --- guix/build/lisp-utils.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/guix/build/lisp-utils.scm b/guix/build/lisp-utils.scm index 9cf479dac..7c0a68ca9 100644 --- a/guix/build/lisp-utils.scm +++ b/guix/build/lisp-utils.scm @@ -121,8 +121,7 @@ name of an ASD system, and asd-file is the full path to its definition." "Evaluate PROGRAM with a given LISP implementation." (define invocation (lisp-invocation program)) (format #t "Invoking ~a: ~{~s ~}~%" (%lisp-type) invocation) - (unless (zero? (apply system* invocation)) - (error "lisp-eval-program failed!" invocation))) + (apply invoke invocation)) (define (spread-statements program argument-name) "Return a list with the statements from PROGRAM spread between -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 30 01:37:04 2018 Received: (at 32582) by debbugs.gnu.org; 30 Aug 2018 05:37:04 +0000 Received: from localhost ([127.0.0.1]:37804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fvFdg-000770-9b for submit@debbugs.gnu.org; Thu, 30 Aug 2018 01:37:04 -0400 Received: from minos.uwaterloo.ca ([129.97.128.78]:52088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fvFdZ-00075K-J4 for 32582@debbugs.gnu.org; Thu, 30 Aug 2018 01:36:57 -0400 Received: from localhost.localdomain (CPEac202e023313-CMac202e023310.cpe.net.cable.rogers.com [99.254.144.176]) (authenticated bits=0) by minos.uwaterloo.ca (8.14.4/8.14.4) with ESMTP id w7U5ahRQ016275 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Thu, 30 Aug 2018 01:36:51 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 minos.uwaterloo.ca w7U5ahRQ016275 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uwaterloo.ca; s=default; t=1535607412; bh=/jLM8wr90xjXxQoVJwQa33xl4iAV3YeA+/VwoOVVb14=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rcAfIarq6ZaveGJtWjx5/ikASHxxscpywbKniszDooONTcNG4WAxcByMpBvkQDQMq 6mCXZBgWg2kkXlmN3UL4wJnT9JMNV+JOMce3iCY/ZBrIqGXvz11Uh7HlR9QkiW9Ghk 5eHCfJWt+GTB4wG7Yrk9ryKX5AAg51h2ezqqn1us= From: Andy Patterson To: 32582@debbugs.gnu.org Subject: [PATCH 4/5] build-system/asdf: Adopt asdf conventions. Date: Thu, 30 Aug 2018 01:36:31 -0400 Message-Id: <20180830053632.26414-4-ajpatter@uwaterloo.ca> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180830012813.7830cfc6@uwaterloo.ca> References: <20180830012813.7830cfc6@uwaterloo.ca> X-UUID: 1190c5bd-9243-47dd-88db-2133d397558c X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 32582 Cc: Andy Patterson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) The asdf documentation specifies that asdf:load-asd should be preferred to calling load on a system definition file. * guix/build/lisp-utils.scm (compile-system): Replace load with asdf:load-asd. (system-dependencies): Likewise. (test-system): Likewise. --- guix/build/lisp-utils.scm | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/guix/build/lisp-utils.scm b/guix/build/lisp-utils.scm index 7c0a68ca9..6470cfec9 100644 --- a/guix/build/lisp-utils.scm +++ b/guix/build/lisp-utils.scm @@ -152,8 +152,7 @@ with PROGRAM." first." (lisp-eval-program `((require :asdf) - (let ((*package* (find-package :asdf))) - (load ,asd-file)) + (asdf:load-asd (truename ,asd-file) :name ,(normalize-string system)) (asdf:operate 'asdf:compile-bundle-op ,system)))) (define (system-dependencies system asd-file) @@ -162,8 +161,7 @@ asdf:system-depends-on. First load the system's ASD-FILE." (define deps-file ".deps.sexp") (define program `((require :asdf) - (let ((*package* (find-package :asdf))) - (load ,asd-file)) + (asdf:load-asd (truename ,asd-file) :name ,(normalize-string system)) (with-open-file (stream ,deps-file :direction :output) (format stream @@ -203,19 +201,18 @@ asdf:system-depends-on. First load the system's ASD-FILE." Also load TEST-ASD-FILE if necessary." (lisp-eval-program `((require :asdf) - (let ((*package* (find-package :asdf))) - (load ,asd-file) - ,@(if test-asd-file - `((load ,test-asd-file)) - ;; Try some likely files. - (map (lambda (file) - `(when (uiop:file-exists-p ,file) - (load ,file))) - (list - (string-append system "-tests.asd") - (string-append system "-test.asd") - "tests.asd" - "test.asd")))) + (asdf:load-asd (truename ,asd-file) :name ,(normalize-string system)) + ,@(if test-asd-file + `((asdf:load-asd (truename ,test-asd-file))) + ;; Try some likely files. + (map (lambda (file) + `(when (uiop:file-exists-p ,file) + (asdf:load-asd (truename ,file)))) + (list + (string-append system "-tests.asd") + (string-append system "-test.asd") + "tests.asd" + "test.asd"))) (asdf:test-system ,system)))) (define (string->lisp-keyword . strings) -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 30 01:37:05 2018 Received: (at 32582) by debbugs.gnu.org; 30 Aug 2018 05:37:05 +0000 Received: from localhost ([127.0.0.1]:37806 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fvFdg-000774-P6 for submit@debbugs.gnu.org; Thu, 30 Aug 2018 01:37:05 -0400 Received: from minos.uwaterloo.ca ([129.97.128.78]:52118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fvFda-00075L-Av for 32582@debbugs.gnu.org; Thu, 30 Aug 2018 01:36:58 -0400 Received: from localhost.localdomain (CPEac202e023313-CMac202e023310.cpe.net.cable.rogers.com [99.254.144.176]) (authenticated bits=0) by minos.uwaterloo.ca (8.14.4/8.14.4) with ESMTP id w7U5ahRR016275 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Thu, 30 Aug 2018 01:36:52 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 minos.uwaterloo.ca w7U5ahRR016275 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uwaterloo.ca; s=default; t=1535607412; bh=yvEXE5VCtVAPBGvmZo3zY7AoSbUVBkrot6e2UThQPB8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mVKfM5+cXa7+c/TEchpiwUQEWylFX0E225l8JsGTiWkkDIbz34FZuAOAaV9oVCOqc yYR2iJ7bbyJwvYh/rglP/H3eToW2S0qsux5wvppF3m0OLTVc1MBmqkpPPBS0sR10Kt S2TJEVk76Gk+wmOTU3spHcusARxzmlgt03sSVi7A= From: Andy Patterson To: 32582@debbugs.gnu.org Subject: [PATCH 5/5] gnu: sbcl-slynk: Fix the build. Date: Thu, 30 Aug 2018 01:36:32 -0400 Message-Id: <20180830053632.26414-5-ajpatter@uwaterloo.ca> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180830012813.7830cfc6@uwaterloo.ca> References: <20180830012813.7830cfc6@uwaterloo.ca> X-UUID: 4a9713fa-4a83-47c3-9f05-e8be6c4cf293 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 32582 Cc: Andy Patterson X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/lisp.scm (sbcl-slynk-boot0): Update to commit cbf84c36c4eca8b032e3fd16177a7bc02df3ec4c. [origin]: Replace slynk/util references with the built system name slynk-util. Remove compile-time invocations of slynk-require. (sbcl-slynk-util): Inherit from sbcl-slynk-boot0. [inputs]: Add sbcl-slynk-boot0. [arguments]: Set an appropriate asd-file and asd-system-name. (sbcl-slynk-arglists)[arguments]: Set an appropriate asdf-system-name. (sbcl-slynk-fancy-inspector)[arguments]: Likewise. (sbcl-slynk-package-fu)[arguments]: Likewise. (sbcl-slynk-mrepl)[arguments]: Likewise. (sbcl-slynk-trace-dialog)[arguments]: Likewise. (sbcl-slynk-profiler)[arguments]: Likewise. (sbcl-slynk-indentation)[arguments]: Likewise. (sbcl-slynk-retro)[arguments]: Likewise. --- gnu/packages/lisp.scm | 68 ++++++++++++++++++++++++++++++++----------- 1 file changed, 51 insertions(+), 17 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 720ac070c..c4a92a220 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1009,8 +1009,8 @@ productive, customizable lisp based systems.") ;; we expose the union of these as `sbcl-slynk'. The following variable ;; describes the base module. (define sbcl-slynk-boot0 - (let ((revision "1") - (commit "5706cd45d484a4f25795abe8e643509d31968aa2")) + (let ((revision "2") + (commit "cbf84c36c4eca8b032e3fd16177a7bc02df3ec4c")) (package (name "sbcl-slynk-boot0") (version (string-append "1.0.0-beta-" revision "." (string-take commit 7))) @@ -1022,7 +1022,7 @@ productive, customizable lisp based systems.") (url "https://github.com/joaotavora/sly.git") (commit commit))) (sha256 - (base32 "0h4gg3sndl2bf6jdnx9nrf14p9hhi43hagrl0f4v4l11hczl8w81")) + (base32 "13dyhsravn591p7g6is01mp2ynzjnnj7pwgi57r6xqmd4611y9vh")) (file-name (string-append "slynk-" version "-checkout")) (modules '((guix build utils) (ice-9 ftw))) @@ -1033,14 +1033,19 @@ productive, customizable lisp based systems.") (substitute* "slynk/slynk.asd" (("\\.\\./contrib") "contrib") - (("\\(defsystem :slynk-util") - "(defsystem :slynk-util :depends-on (:slynk)")) + (("\\(defsystem :slynk/util") + "(defsystem :slynk/util :depends-on (:slynk)") + ((":depends-on \\(:slynk :slynk/util\\)") + ":depends-on (:slynk :slynk-util)")) (substitute* "contrib/slynk-trace-dialog.lisp" (("\\(slynk::reset-inspector\\)") ; Causes problems on load "nil")) (substitute* "contrib/slynk-profiler.lisp" (("slynk:to-line") "slynk-pprint-to-line")) + (substitute* "contrib/slynk-fancy-inspector.lisp" + (("slynk/util") "slynk-util") + ((":compile-toplevel :load-toplevel") "")) (rename-file "contrib" "slynk/contrib") ;; Move slynk's contents into the base directory for easier ;; access @@ -1080,15 +1085,20 @@ multiple inspectors with independent history.") (arguments (substitute-keyword-arguments (package-arguments sbcl-slynk-boot0) ((#:asd-file _ "") "slynk.asd") - ((#:asd-system-name _ #f) #f))))) + ((#:asd-system-name _ #f) "slynk/arglists"))))) (define ecl-slynk-arglists (sbcl-package->ecl-package sbcl-slynk-arglists)) (define sbcl-slynk-util (package - (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-util"))) + (inherit sbcl-slynk-boot0) + (name "sbcl-slynk-util") + (inputs `(("slynk" ,sbcl-slynk-boot0))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-boot0) + ((#:asd-file _ "") "slynk.asd") + ((#:asd-system-name _ #f) "slynk/util"))))) (define ecl-slynk-util (sbcl-package->ecl-package sbcl-slynk-util)) @@ -1098,7 +1108,10 @@ multiple inspectors with independent history.") (inherit sbcl-slynk-arglists) (name "sbcl-slynk-fancy-inspector") (inputs `(("slynk-util" ,sbcl-slynk-util) - ,@(package-inputs sbcl-slynk-arglists))))) + ,@(package-inputs sbcl-slynk-arglists))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/fancy-inspector"))))) (define ecl-slynk-fancy-inspector (sbcl-package->ecl-package sbcl-slynk-fancy-inspector)) @@ -1106,15 +1119,21 @@ multiple inspectors with independent history.") (define sbcl-slynk-package-fu (package (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-package-fu"))) + (name "sbcl-slynk-package-fu") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/package-fu"))))) (define ecl-slynk-package-fu (sbcl-package->ecl-package sbcl-slynk-package-fu)) (define sbcl-slynk-mrepl (package - (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-mrepl"))) + (inherit sbcl-slynk-fancy-inspector) + (name "sbcl-slynk-mrepl") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/mrepl"))))) (define ecl-slynk-mrepl (sbcl-package->ecl-package sbcl-slynk-mrepl)) @@ -1122,7 +1141,10 @@ multiple inspectors with independent history.") (define sbcl-slynk-trace-dialog (package (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-trace-dialog"))) + (name "sbcl-slynk-trace-dialog") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/trace-dialog"))))) (define ecl-slynk-trace-dialog (sbcl-package->ecl-package sbcl-slynk-trace-dialog)) @@ -1130,7 +1152,10 @@ multiple inspectors with independent history.") (define sbcl-slynk-profiler (package (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-profiler"))) + (name "sbcl-slynk-profiler") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/profiler"))))) (define ecl-slynk-profiler (sbcl-package->ecl-package sbcl-slynk-profiler)) @@ -1138,7 +1163,10 @@ multiple inspectors with independent history.") (define sbcl-slynk-stickers (package (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-stickers"))) + (name "sbcl-slynk-stickers") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/stickers"))))) (define ecl-slynk-stickers (sbcl-package->ecl-package sbcl-slynk-stickers)) @@ -1146,7 +1174,10 @@ multiple inspectors with independent history.") (define sbcl-slynk-indentation (package (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-indentation"))) + (name "sbcl-slynk-indentation") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/indentation"))))) (define ecl-slynk-indentation (sbcl-package->ecl-package sbcl-slynk-indentation)) @@ -1154,7 +1185,10 @@ multiple inspectors with independent history.") (define sbcl-slynk-retro (package (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-retro"))) + (name "sbcl-slynk-retro") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/retro"))))) (define ecl-slynk-retro (sbcl-package->ecl-package sbcl-slynk-retro)) -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 19 01:14:57 2018 Received: (at 32582) by debbugs.gnu.org; 19 Sep 2018 05:14:57 +0000 Received: from localhost ([127.0.0.1]:45022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g2UpD-0002Qj-TF for submit@debbugs.gnu.org; Wed, 19 Sep 2018 01:14:57 -0400 Received: from mailchk-m06.uwaterloo.ca ([129.97.128.242]:56350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g2UpB-0002QQ-B6 for 32582@debbugs.gnu.org; Wed, 19 Sep 2018 01:14:53 -0400 Received: from localhost (CPEac202e023313-CMac202e023310.cpe.net.cable.rogers.com [99.254.144.176]) (authenticated bits=0) by mailchk-m06.uwaterloo.ca (8.14.7/8.14.7) with ESMTP id w8J5Ej2i018057 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for <32582@debbugs.gnu.org>; Wed, 19 Sep 2018 01:14:46 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 mailchk-m06.uwaterloo.ca w8J5Ej2i018057 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uwaterloo.ca; s=default; t=1537334087; bh=9Jbcf2M3InjQgpS7fnGcg5XhZ0yWkUAn5I62bdlsCQg=; h=Date:From:To:Subject:In-Reply-To:References:From; b=PQR5TmoIMxMzfJnPo+4QswP5ss15GJbfHUpmn56cdN91d5NwFRl1jhar3+BITc066 cMw46cr97KGebfzKrPKX9KLcY+YFQiNKKxWy+cp912uKTIu9GY7FGQn6A2DRvh/lsr UUhzhNBuysbL3n+6+DB7a8+gM0FvhPHR4MTIaIfY= Date: Wed, 19 Sep 2018 01:14:45 -0400 From: Andy Patterson To: 32582@debbugs.gnu.org Subject: Re: [bug#32582] [PATCH 0/5] Fix slynk on sbcl. Message-ID: <20180919011445.12acdc63@uwaterloo.ca> In-Reply-To: <20180830012813.7830cfc6@uwaterloo.ca> References: <20180830012813.7830cfc6@uwaterloo.ca> X-Mailer: Claws Mail 3.17.1 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-7.0 required=5.0 tests=ALL_TRUSTED autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mailchk-m01.uwaterloo.ca X-UUID: 6a4a9b30-e3f5-4fcb-a5dc-ae29d04ceb4e X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.2 (mailchk-m06.uwaterloo.ca [129.97.128.141]); Wed, 19 Sep 2018 01:14:47 -0400 (EDT) X-Miltered: at mailchk-m06 with ID 5BA1DB45.000 by Joe's j-chkmail (http://j-chkmail.ensmp.fr)! X-Virus-Scanned: clamav-milter 0.100.1 at mailchk-m06 X-Virus-Status: Clean X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 32582 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, On Thu, 30 Aug 2018 01:28:13 -0400 Andy Patterson wrote: > Hey all, > > Here are some changes to the asdf build system and the slynk package > with the aim of fixing slynk's build on sbcl. Ping =). Thanks in advance, -- Andy From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 19 12:26:40 2018 Received: (at 32582-done) by debbugs.gnu.org; 19 Sep 2018 16:26:40 +0000 Received: from localhost ([127.0.0.1]:45894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g2fJI-0006Qu-Ki for submit@debbugs.gnu.org; Wed, 19 Sep 2018 12:26:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54570) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g2fJH-0006Qd-8E for 32582-done@debbugs.gnu.org; Wed, 19 Sep 2018 12:26:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g2fJ9-0006jb-C1 for 32582-done@debbugs.gnu.org; Wed, 19 Sep 2018 12:26:33 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:45327) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g2fJ9-0006jS-6q; Wed, 19 Sep 2018 12:26:31 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=56450 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1g2fJ8-0006wp-TE; Wed, 19 Sep 2018 12:26:31 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Andy Patterson Subject: Re: [bug#32582] [PATCH 0/5] Fix slynk on sbcl. References: <20180830012813.7830cfc6@uwaterloo.ca> <20180919011445.12acdc63@uwaterloo.ca> Date: Wed, 19 Sep 2018 18:26:29 +0200 In-Reply-To: <20180919011445.12acdc63@uwaterloo.ca> (Andy Patterson's message of "Wed, 19 Sep 2018 01:14:45 -0400") Message-ID: <87h8ilh2ru.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 32582-done Cc: 32582-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Hi Andy, Andy Patterson skribis: > Hi, > > On Thu, 30 Aug 2018 01:28:13 -0400 > Andy Patterson wrote: > >> Hey all, >>=20 >> Here are some changes to the asdf build system and the slynk package >> with the aim of fixing slynk's build on sbcl. > > > Ping =3D). Oops, it was about to fall through the cracks. :-) It LGTM so I=E2=80=99ve pushed all 5 patches. Thank you, and sorry for the delay! Ludo=E2=80=99. From unknown Mon Jun 23 07:52:01 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 18 Oct 2018 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator