From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id +DT8MP34lGEaSgAAgWs5BA (envelope-from ) for ; Wed, 17 Nov 2021 13:43:41 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id yH2hLP34lGFKVQAAbx9fmQ (envelope-from ) for ; Wed, 17 Nov 2021 12:43:41 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 62D45144A9 for ; Wed, 17 Nov 2021 13:43:41 +0100 (CET) Received: from localhost ([::1]:35094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnKHr-0005i4-8A for larch@yhetil.org; Wed, 17 Nov 2021 07:43:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnKFL-0004ZD-0j for guix-patches@gnu.org; Wed, 17 Nov 2021 07:41:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48852) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mnKFK-0005Gr-JU for guix-patches@gnu.org; Wed, 17 Nov 2021 07:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mnKFK-0007WC-ID for guix-patches@gnu.org; Wed, 17 Nov 2021 07:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51914] Acknowledgement ([PATCH 0/2] Fix asdf-build-system on non-package inputs) Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Nov 2021 12:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51914 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Guillaume Le Vaillant Cc: 51914@debbugs.gnu.org Received: via spool by 51914-submit@debbugs.gnu.org id=B51914.163715285128865 (code B ref 51914); Wed, 17 Nov 2021 12:41:02 +0000 Received: (at 51914) by debbugs.gnu.org; 17 Nov 2021 12:40:51 +0000 Received: from localhost ([127.0.0.1]:60398 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnKF8-0007VV-QM for submit@debbugs.gnu.org; Wed, 17 Nov 2021 07:40:51 -0500 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:50445) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnKF6-0007VA-4y for 51914@debbugs.gnu.org; Wed, 17 Nov 2021 07:40:49 -0500 Received: (Authenticated sender: mail@ambrevar.xyz) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 534511BF20A; Wed, 17 Nov 2021 12:40:40 +0000 (UTC) From: Pierre Neidhardt In-Reply-To: <87mtm3ujgm.fsf@kitej> References: <20211117082905.29499-1-mail@ambrevar.xyz> <87ilwrrxb1.fsf@ambrevar.xyz> <87mtm3ujgm.fsf@kitej> Date: Wed, 17 Nov 2021 13:40:40 +0100 Message-ID: <87tugbq7jr.fsf@ambrevar.xyz> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1637153021; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=Pu/PTt70P/j5ISUPK8hTIlBD2mTLaJMiZ4I03O6BCZA=; b=M14vWOPzdzrar3xHZdsdPx4ROo0JzPtZDNA8K/QbbcOHaYX+r7m4ckDSULtttS6mt+4liM aP0PVEokfxi76INQ0E4G6yWNlrmQEHbcvhpjg05Zf6dFXBz6DSwmb2Hiz8rMlEG10jw0N3 hfMqFeC3h+qXqprm2dii8mPv5SET0Nlf2+Gh8oamerh7nsxdZ4c/TgqIZpJOSQMvA+ScMj UHVPTBWsSaRPxA8I2ybuw7t5yH3/K8fdXomHQ0rnkEdN0k9DDXIHHGO7uDcrpK9bBERyJD z2F0Z92QxgPERLCEoe8H6q01rd6Vs99atoqJlSM8R2i5/c7HH6fgbYeH2r1ZLQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637153021; a=rsa-sha256; cv=none; b=Yf1eQU1CxAPfmgV9oGqU4V3AHjl1PgSh6hM3KBgJ6fLIbPEdCQgjMCrskitpPNJpsQarDT 1JJvBsabv4CcncfwPDhNuW+hhkBRp02EvvqSmPU0pcV/ELqQnjy5LEF+qSJq3iXcxBtnlY uKax+3EnKm5E2Fm4g1PrlicPGVqYLhBtg87l+qoFUKsWYGifqOea0zIWXD24S26HgAfgBC +AKRsYtYY5syOf6RJ2y2E8OzrLl8OZlNjPaxZF/PPHEPQHvWnHfppa5/EU5P6bqvKc6ieu h1vQaq5vcwkEAj3fQRa16r4OZM5pUB/wZllZSGLyEdx+W4eR0PXD9sxf3JcAiA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -5.05 Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 62D45144A9 X-Spam-Score: -5.05 X-Migadu-Scanner: scn0.migadu.com X-TUID: X2tikt1DRz5d --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Thank you both for the feedback. See v2 attached. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFGBAEBCAAwFiEEUPM+LlsMPZAEJKvom9z0l6S7zH8FAmGU+EgSHG1haWxAYW1i cmV2YXIueHl6AAoJEJvc9Jeku8x/UPQH/i4J0RU0FcoMP6Sz3xrd0X6S9bUGIXWE //466Q8v8qB3z1/yBRiJrH78+/rZJdLEuHXdeK57BSmgz1/+IpDf/n809dTCI/LF qCfK23VSEtSiX8bgk2GmxoJ3v10zifamb0zs8p/EVA2oViFVM7MkEFp5TANWB0Vf oS2b4QK+qykF8/6y1ZhGrGRHROwMeR+HRIbjleD4hCNzDd9ci+o5ZzqN838AU/Xn YOIJOu6/dmwfXiuxehCDJOM2I7UaTvYVsgJ1MLd9r7zIE/zOraC5hMjRNHyVHmeX iLWHx29Mb1ZZ4kq2e/W3U+TID5NKnvZOWzCF0wlglnALsT2t4+QL4K0= =Cyqg -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-build-system-asdf-Don-t-fail-in-sbcl-package-cl-sour.patch >From 7386f42a115b29a1603ca6f3887f29fbb927c2bb Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 17 Nov 2021 09:09:42 +0100 Subject: [v2 1/2] build-system/asdf: Don't fail in sbcl-package->cl-source-package on non-package inputs. Inputs can be non-packages, for instance (origin ...). sbcl-package->cl-source-package used to fail if such inputs were present in the parent sbcl-* package. * guix/build-system/asdf.scm (package-with-build-system): Fix 'has-from-build-system?' function. --- guix/build-system/asdf.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index b4e40ee8c2..4edf6857b5 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -162,7 +162,8 @@ (define (transform-package-name name) name)) (define (has-from-build-system? pkg) - (eq? from-build-system (package-build-system pkg))) + (and (package? pkg) + (eq? from-build-system (package-build-system pkg)))) (define (find-input-package pkg) (let* ((name (package-name pkg)) -- 2.32.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-Add-cl-https-everywhere.patch >From ba935720720aeeaa0f885d04c9879cee43d44c43 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 16 Nov 2021 11:53:02 +0100 Subject: [v2 2/2] gnu: Add cl-https-everywhere. * gnu/packages/lisp-xyz.scm (cl-https-everywhere, sbcl-cl-https-everywhere): New variables. --- gnu/packages/lisp-xyz.scm | 82 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4b17c173c9..f9907e84f6 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19264,3 +19264,85 @@ (define-public sbcl-vernacular (define-public cl-vernacular (sbcl-package->cl-source-package sbcl-vernacular)) + +(define-public sbcl-cl-https-everywhere + ;; No release. + ;; Don't forget to update the https-everywhere input. + (let ((commit "cbcc73b985a5b1c0ce0d4ec38bc982a0538d4bd8")) + (package + (name "sbcl-cl-https-everywhere") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ruricolist/cl-https-everywhere/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1wcvx1icwym1ncd6wl1wxzkyyndrm796caalbklvjd4a2cbl3xxi")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("global-vars" ,sbcl-global-vars) + ("parenscript" ,sbcl-parenscript) + ("cl-markdown" ,sbcl-cl-markdown) + ("cl-tld" ,sbcl-cl-tld) + ("fxml" ,sbcl-fxml) + ("overlord" ,sbcl-overlord) + ("ppcre" ,sbcl-cl-ppcre) + ("serapeum" ,sbcl-serapeum) + ("trivial-gray-streams" ,sbcl-trivial-gray-streams) + ("vernacular" ,sbcl-vernacular))) + (native-inputs + `(("fiveam" ,sbcl-fiveam) + ("https-everywhere" + ,(let ((version "2021.7.13")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/EFForg/https-everywhere") + (commit version))) + (file-name (git-file-name "https-everywhere" version)) + (sha256 + (base32 + "1k5gj29imhxf47sv3d8rxyrgr6k65scp2fm040va3nfshayslzia"))))))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'link-https-everywhere-repo + (lambda* (#:key inputs #:allow-other-keys) + (let ((https-everywhere (assoc-ref inputs "https-everywhere"))) + (symlink https-everywhere "https-everywhere")))) + (add-after 'unpack 'fix-overlord-build + ;; Upstream bugs? See + ;; https://github.com/ruricolist/cl-https-everywhere/issues/1. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (rulesets.xml (string-append out "/share/common-lisp/" (%lisp-type) + "/cl-https-everywhere/rulesets.xml"))) + (substitute* "build.lisp" + (("\\(depends-on https-everywhere-version\\)") "") + ;; Don't rebuild the rulesets just because the timestamp is epoch. + (("\\(vernacular:require-default :cl-https-everywhere/rulesets-file \"rulesets.xml\"\\)") + (format #f "(if (uiop:file-exists-p ~s) + (compile-rulesets ~s) + (vernacular:require-default :cl-https-everywhere/rulesets-file \"rulesets.xml\"))" + rulesets.xml + rulesets.xml)) + (("\\(uiop:parse-unix-namestring \"https-everywhere/src/chrome/content/rules/\\*\\.xml\")") + "\"https-everywhere/src/chrome/content/rules/*.xml\"") + (("\\(out temp :external-format :utf-8\\)") + "(out temp :external-format :utf-8 :if-exists :supersede)"))) + #t))))) + (home-page "https://github.com/ruricolist/cl-https-everywhere/") + (synopsis "Use HTTPS Everywhere rules from Lisp") + (description + "CL-HTTPS-EVERYWHERE parses HTTPS Everywhere rulesets and makes them +available for use in Lisp programs.") + (license (list license:expat + ;; For the ruleset + license:gpl2+))))) + +(define-public cl-https-everywhere + (sbcl-package->cl-source-package sbcl-cl-https-everywhere)) -- 2.32.0 --=-=-=--