From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id YJelDRXPe2LjiwAAbAwnHQ (envelope-from ) for ; Wed, 11 May 2022 16:58:29 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id oEq9DBXPe2KnNgAAG6o9tA (envelope-from ) for ; Wed, 11 May 2022 16:58:29 +0200 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 DA7C51387E for ; Wed, 11 May 2022 16:58:28 +0200 (CEST) Received: from localhost ([::1]:54048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nonnH-000359-W3 for larch@yhetil.org; Wed, 11 May 2022 10:58:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nonmt-00033b-AO for guix-patches@gnu.org; Wed, 11 May 2022 10:58:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44195) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nonms-0002ts-Ih for guix-patches@gnu.org; Wed, 11 May 2022 10:58:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nonms-0007cs-Fy for guix-patches@gnu.org; Wed, 11 May 2022 10:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55369] [PATCH 1/2] gnu: zfs: Use new package style. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 May 2022 14:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55369 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brian Cully , 55369@debbugs.gnu.org Cc: Brian Cully Received: via spool by 55369-submit@debbugs.gnu.org id=B55369.165228107729299 (code B ref 55369); Wed, 11 May 2022 14:58:02 +0000 Received: (at 55369) by debbugs.gnu.org; 11 May 2022 14:57:57 +0000 Received: from localhost ([127.0.0.1]:38092 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nonmn-0007cV-0F for submit@debbugs.gnu.org; Wed, 11 May 2022 10:57:57 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:53598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nonml-0007cL-4u for 55369@debbugs.gnu.org; Wed, 11 May 2022 10:57:55 -0400 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by michel.telenet-ops.be with bizsmtp id VSxt2700L4UW6Th06SxtX9; Wed, 11 May 2022 16:57:53 +0200 Message-ID: <2cbe4ede93a89125eab0b2836170ba6c0a8f6ee4.camel@telenet.be> From: Maxime Devos Date: Wed, 11 May 2022 16:57:53 +0200 In-Reply-To: <9c79808be27869958987782313cec824787b651f.1652276252.git.bjc@spork.org> References: <9c79808be27869958987782313cec824787b651f.1652276252.git.bjc@spork.org> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-9s9zraR1pghCM8B8IeQ8" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1652281073; bh=H9nIoEwu2vIYxtaIrq74hHrS7qXfQ9e6Kg3kRsriNQQ=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=m0Ktbpkv7OYcorynp2z1QKpZm4iuL8mIdJlqQaaTeRpRJk0gxoYTT6NMe6D8n1pxY hHADnMViUyWzlb7N1h9LTGw12YAASvmCHIs+l6Bo1J7P21Ai3O5Kz5gXKNzx1wuuSq HGH4S3WBB5+50PU3vysbIFPgq3FKLuaqdSuGuQ2QqHSVH8+7DE3XH61/HYrKrLKae5 nu/LF+/Kld2GKnDnXAykEuZ0qYhzSnWEF/SvlfQtt/wqhLlhW1bngZmGQwouVrG7PD U8hFjA+0/JZtnDNeewzM6UdpQz/F+WAtH91+lFcjVYDxqT/pnQumXVxkYkrACTaHl5 ZJ24MmOMVk6UQ== 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-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1652281109; 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: dkim-signature; bh=H9nIoEwu2vIYxtaIrq74hHrS7qXfQ9e6Kg3kRsriNQQ=; b=cR4jA7c5dmxWg95w5RecDQsmnmfqMbo/pZiruPsUS/bzp4HUbjGYbv7BGsLu8DWMiOYtvE lqAbzt6rOrlIe6+EQUSlUjxnHa8cGjL+sS27h3AiwARN6JR6uPoZZn+ot5WsezBIQQmbih tFhHDE5+AtH12mNkmhXlzAyi5rlGj+G/ygpPVcglaYU7N/U9ycdakDnXjcuc+97zWssT2O 3n2Tlc45OAcrdVdF8v2+uRpJYOfpzgkrpsH77TwSnfOe3N8oL1ECO1LCaK8taPQPj4lDUS TKldfoFHP6iM0dzuXFPUBXlsnSSxsWGIVE82hQAc2UNQYdrghhkvSK0CtTkrbg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1652281109; a=rsa-sha256; cv=none; b=B+h3S/vSDvctIi+tAJfwJ/WaWoidDBYd/vBRL1j+h8N5gVjB85R7TYDHadtLgTGNBbQgrn Ly6OmDymyz0tEDHMwWDnxuSs6x4lXRCgurkFaoHk3UUGjjcylHZnzzAZRBKFoxw0RfoWGq 834irUFnnM8XzGmG7DfViT7izhcllAvAvikqw7KE7s3kTXAP6tnNZe7vJQEo7pVa+Rng+F kCEuSbavehRfszKqCeOeFL60J1RdlFoRk+dGgeqU9djYKq7Pj30tH5GqAFu26XD0snq/yG Q6//xsgiR8FxGmUdhodjYXC7IOrJ3tTzsyE2tBib5J4Z8YA4RC/1ajiaS7/eeA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=m0Ktbpkv; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=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: 3.89 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=m0Ktbpkv; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=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: DA7C51387E X-Spam-Score: 3.89 X-Migadu-Scanner: scn1.migadu.com X-TUID: R9SF/iKi4F9J --=-9s9zraR1pghCM8B8IeQ8 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Brian Cully via Guix-patches via schreef op wo 11-05-2022 om 09:37 [- 0400]: > - (add-after 'unpack 'patch-source > - (lambda* (#:key inputs outputs #:allow-other-keys) > - (let ((out (assoc-ref outputs "out")) > - (src (assoc-ref outputs "src")) > - (util-linux (assoc-ref inputs "util-linux")) > - (nfs-utils (assoc-ref inputs "nfs-utils")) > - (kmod (assoc-ref inputs "kmod-runtime"))) [...] > + (add-after 'unpack 'patch-source > + (lambda _ [...] > + (substitute* "lib/libzfs/os/linux/libzfs_util_os.c" > + ;; Use path to /gnu/store/*-kmod in actual path that is = exec'ed. > + (("\"/sbin/modprobe\"") > + (string-append "\"" #$kmod "/bin/modprobe" "\"")) This breaks package transformations -- now the 'kmod' from (gnu packages linux) is hardcoded, it cannot be replaced by something else with --with-input or (package (inherit ...) (inputs (list custom-kmod ...)) or the like. (Currently no mechanism exists to rewrite G-exps.) Instead, do (lambda* (#:key inputs #:allow-other-keys) [...] (string-append "\"" (search-input-file inputs "bin/modprobe)) [...]) Greetings, Maxime. --=-9s9zraR1pghCM8B8IeQ8 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYnvO8RccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7jkLAQDWdFUmbbMTYQv3JFnGbG6HnYS3 oMRZdOkmv0l85a/NMAEA8gcQtb8ThXud0GbrFKX/6AydV6Z5pJKchrtn10c4mQw= =i/yi -----END PGP SIGNATURE----- --=-9s9zraR1pghCM8B8IeQ8--