From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id CAyaC9MOYWeAswAAe85BDQ:P1 (envelope-from ) for ; Tue, 17 Dec 2024 05:40:35 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id CAyaC9MOYWeAswAAe85BDQ (envelope-from ) for ; Tue, 17 Dec 2024 06:40:35 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Uyqeuu9n; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=jD21bDny; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734414035; a=rsa-sha256; cv=none; b=PQSXBIWEe2ORmPg4LHZH6mSbV3b9GkJvB0u35yGSuGsLlIAiZeYR1+3sN8ffIbaswm2CgY ltdy6P+3o3RPBL6I0XQ/hm/BjdHRVLRiuhPHW+J6e9jsvuHB8Q+mi/mdvm7WDbOwEviUve 3rQ9Km0K4sSpUXUea4xi1FRHst6OOkyLoiYjaHflsFChuH3ri0N/o1G5My0+il5aV4pU0U q1sr3T0IcDmF8Oz+9u4KchMQASogh8PUnNU1xdMfo93iNF/IcFP7xAXPwgqsmAldXiCBmq GTuvUH+xur+pTOZq46jAzLZfmWBx08CJofE4knxAZvAneVj6ipSed4wCdUKnTQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Uyqeuu9n; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=jD21bDny; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734414035; 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=sZXb9hLqGWHxuACn3y9RCFtgLnYA2GcI75ukVdvsw94=; b=sW+SWM3zFFmBVyBIxmIaijWDKwUqZ5nsq2Iz6jzKNwgIkdThnamPX1yKVTDxZareTOZF4S 9RdrH/FOZPcJRx9DPpl2mtueJQ5Ia8EEqCdf2JeQau3IYgPJjxTuDe3HGoxX8lFjJIw/rA 4Y4DFUA5iIUBSSriP1/hWsf/jiB6aBrmwQOX0AakTFoF8TnPuZS+U+QM6VOfSrNZjBzdQW /uej6+BJbTr0ZNdt0VYKtdI0P8hyompoXKwEZsnRdAIzz0uhciDiR7G1NzDpnKZFOu0/gC HoQY4ljKPt4aKVHFBHu9DwMlkziRTkg8Xuf9pvPuGMyPLXFTDpMMIMalunM3Aw== 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 AB42A670C5 for ; Tue, 17 Dec 2024 06:40:34 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNQJR-0001JB-0K; Tue, 17 Dec 2024 00:40:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tNQJO-0001Hs-Vf for bug-guix@gnu.org; Tue, 17 Dec 2024 00:40:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tNQJO-0007jf-Hv for bug-guix@gnu.org; Tue, 17 Dec 2024 00:40:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=sZXb9hLqGWHxuACn3y9RCFtgLnYA2GcI75ukVdvsw94=; b=Uyqeuu9nro13EXtm5X7bce4BKdf6+HKXWbUK4w6SdDhWWvH+dLjj6EEsHNlri9ztm+jcUvZJ6ImkURXhda8rYapwXQjGzkHOLWQOOcfpcZP2GDCDrfDR/E2byeKc017S5fvmeyaYawppaMMeNaObm9bdmS3INGGi+/6jCOwukxULdOTXI49pCXhyRKyKAr5A1ddMxvNWcUNworjkSI4Nm/QHSAiwBhW0/LYgk3Rgy1qzd01SkRDXqjQdHqqe0rhtRZjz1Y/bF5zZOYbW3z8un7GZ1tlodfB0xved0b/nv3v/7L72Tal+pGmoceOTpNmYZbPS8E3gMQw/HYLLhW3BDg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tNQJN-00024L-Rm; Tue, 17 Dec 2024 00:40:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#74845: [PATCH] gnu: racket: Ensure package launchers reference config directory. References: <87ttb8b7sa.fsf@gmail.com> In-Reply-To: <87ttb8b7sa.fsf@gmail.com> Resent-From: "Suhail Singh" Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, bug-guix@gnu.org Resent-Date: Tue, 17 Dec 2024 05:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74845 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 74845@debbugs.gnu.org Cc: Philip McGrath X-Debbugs-Original-Xcc: Philip McGrath Received: via spool by 74845-submit@debbugs.gnu.org id=B74845.17344139537870 (code B ref 74845); Tue, 17 Dec 2024 05:40:01 +0000 Received: (at 74845) by debbugs.gnu.org; 17 Dec 2024 05:39:13 +0000 Received: from localhost ([127.0.0.1]:57194 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNQIa-00022r-OD for submit@debbugs.gnu.org; Tue, 17 Dec 2024 00:39:13 -0500 Received: from mail-qk1-f195.google.com ([209.85.222.195]:42032) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNQIX-00022Z-7P for 74845@debbugs.gnu.org; Tue, 17 Dec 2024 00:39:10 -0500 Received: by mail-qk1-f195.google.com with SMTP id af79cd13be357-7b6ed0de64aso441609485a.0 for <74845@debbugs.gnu.org>; Mon, 16 Dec 2024 21:39:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734413882; x=1735018682; darn=debbugs.gnu.org; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=sZXb9hLqGWHxuACn3y9RCFtgLnYA2GcI75ukVdvsw94=; b=jD21bDnyuUk4Qzf7K+mFttAcq+DJqLnb3OicS6vlKwLnWj/tp8ltoRGo3fyjz+vJVR tzN81BNM1zF9w3AzsJLwVjqBCmPBX6TA//BR6AW3OEwedudyNFGnXIEEEwwK2ZnL5cuB ticW3sjAzMn+kA6vbBY4Uzwz3xBhiJZLSXGGaMPY5hKER39DsnVyBlqyPPWoKFTWSIgX YBM+CZbv63GnH+Z3zTH9NM/nWnlM2pomH29LEfi2QvpqYoq6vILvWylwE9AhMA+ieaCR N6r5kQ/G78qpbRWUGiP8Y+6XS3pm864wOAk7o1G1ALNJ5YN1lQ9FVBELMzktDWfHqwMZ 7dHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734413882; x=1735018682; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=sZXb9hLqGWHxuACn3y9RCFtgLnYA2GcI75ukVdvsw94=; b=IsQ7Lz5PnUUbUHbefzRnbFXXmksp1eMPsk+f8+w3WlyHHc9brvj0NXC0Fsobwn1FXs InZk6S+9Uan6iIGaHSZ8pD4NMPWXwTqXKfKKtQCmguPvmu2yqSVVY63vPrGujsVlgE1A 8IiKFzCkzTeGbSzCpayawKysDD7yhpj3jhYTNI0cmfKoIeFjaZhclFET0cF2MG9BqnGS hjurXu/O5NllHMPflwFMt+hYMiIbo6jQ6cW2WaGIpMac+gli5leB9SGvu0GFItyhP7ck H61kDJV+FWYl0q/JqgO6obZHZqN2yXoEaaEWLtVCbPxkGKAya4vXAfcDmuZq0nypD980 hweA== X-Gm-Message-State: AOJu0YyL7BP0ev4yn2fJA7a+V5Jf0sozcjhDOGxkwtCXUlEoYXz+BJuV 57RdO7P2gcAZC+0uCn8rEJ6SE1GkwdZ8XrUClUJxZ4ctMwmOipojCEufrfRe X-Gm-Gg: ASbGncvuT9lk4fnDN8ho3ZnEcT+w9EGQcb89qg292DaimpGniotns4U5lIh6LDHAY0H 9b7kHCJuXahXb4xfOu15wwCpQg3xT+9fRNrlw/P88uq2+8QGZmofgN/eq87Dcy1JNZ3tJCiCfYq n5NN0pFI0QK4fD8sKgCKqPhOWrWZKUhBWPEbw3UVOpYdxUYTWqHesgDKA4EWqgDhmp8lSoQERXp LGFu0NpUMH+bt3Sh7Fj291ao6RkNBXaUx51ngtvSwlkahJ63NqI X-Google-Smtp-Source: AGHT+IHYggn/YEzpPHBPq/QDb2MTBw4THSrg870AjUkpLaFch0Zx5/ZmXctG/B3t+nZzy0Rk7xsPZA== X-Received: by 2002:a05:620a:454e:b0:7b1:44ee:644d with SMTP id af79cd13be357-7b8595bc28dmr377978985a.10.1734413882167; Mon, 16 Dec 2024 21:38:02 -0800 (PST) Received: from gnus ([70.26.179.129]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b7048ca246sm286687685a.114.2024.12.16.21.38.00 for <74845@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2024 21:38:01 -0800 (PST) From: "Suhail Singh" Date: Mon, 16 Dec 2024 15:25:48 -0500 Message-Id: <1e53d03ab96410d841ed154d1c866e07b2973f84.1734413825.git.suhail@bayesians.ca> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 3.09 X-Spam-Score: 3.09 X-Migadu-Queue-Id: AB42A670C5 X-Migadu-Scanner: mx12.migadu.com X-TUID: hn4uCHBDiR0M * gnu/packages/patches/racket-launcher-config-dir.patch: New file. With this patch, packages installed at runtime via raco have configuration directory correctly set. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/racket.scm (%racket-origin): Use it. Change-Id: Ibba2d73b72a66e58a3c51dad8cf4fbf0c8969c4e --- gnu/local.mk | 1 + .../patches/racket-launcher-config-dir.patch | 33 +++++++++++++++++++ gnu/packages/racket.scm | 1 + 3 files changed, 35 insertions(+) create mode 100644 gnu/packages/patches/racket-launcher-config-dir.patch diff --git a/gnu/local.mk b/gnu/local.mk index ffb8eb6d29..774cc97a83 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2124,6 +2124,7 @@ dist_patch_DATA = \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ %D%/packages/patches/rtags-separate-rct.patch \ %D%/packages/patches/racket-chez-scheme-bin-sh.patch \ + %D%/packages/patches/racket-launcher-config-dir.patch \ %D%/packages/patches/racket-rktio-bin-sh.patch \ %D%/packages/patches/remake-impure-dirs.patch \ %D%/packages/patches/restartd-update-robust.patch \ diff --git a/gnu/packages/patches/racket-launcher-config-dir.patch b/gnu/packages/patches/racket-launcher-config-dir.patch new file mode 100644 index 0000000000..575e3b6151 --- /dev/null +++ b/gnu/packages/patches/racket-launcher-config-dir.patch @@ -0,0 +1,33 @@ +From 6b3aed3d71ea9481762de7bd42395704176b6625 Mon Sep 17 00:00:00 2001 +From: Suhail +Date: Mon, 16 Dec 2024 15:07:55 -0500 +Subject: [PATCH v2] racket: raco: Ensure launchers of packages include config + directory. + +--- + racket/collects/launcher/launcher.rkt | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/racket/collects/launcher/launcher.rkt b/racket/collects/launcher/launcher.rkt +index 0faacec4ce..2c77d55caf 100644 +--- a/racket/collects/launcher/launcher.rkt ++++ b/racket/collects/launcher/launcher.rkt +@@ -405,7 +405,14 @@ + [x-flags? (and (eq? kind 'mred) + (eq? (cross-system-type) 'unix) + (not (script-variant? variant)))] +- [flags (let ([m (assq 'wm-class aux)]) ++ [flags (let ([m (assq 'wm-class aux)] ++ [flags (if (or (member "-G" flags) ++ (member "--config" flags)) ++ flags ++ (list* "-G" ++ (format "~a" ++ (find-system-path 'config-dir)) ++ flags))]) + (if m + (list* "-J" (cdr m) flags) + flags))] +-- +2.47.1 + diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 1016915b47..75f333c468 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -214,6 +214,7 @@ (define %racket-origin (base32 "0hg113fnd4nkvisf0ia9b367h02xfww9kysnb6fc6iac059lpard")) (file-name (git-file-name "racket" %racket-version)) (patches (search-patches "racket-chez-scheme-bin-sh.patch" + "racket-launcher-config-dir.patch" "racket-rktio-bin-sh.patch")) (modules '((guix build utils))) (snippet base-commit: 2e8a8b3ddb4ca31b918d63ff2957c6da1424a2a9