From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id IBfuB8WX22DqiAAAgWs5BA (envelope-from ) for ; Tue, 29 Jun 2021 23:59:33 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 8EasA8WX22AGfQAA1q6Kng (envelope-from ) for ; Tue, 29 Jun 2021 21:59:33 +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 913CE9934 for ; Tue, 29 Jun 2021 23:59:32 +0200 (CEST) Received: from localhost ([::1]:34600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyLlT-0002m3-LY for larch@yhetil.org; Tue, 29 Jun 2021 17:59:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyLl0-0002MK-Qp for guix-patches@gnu.org; Tue, 29 Jun 2021 17:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44307) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyLl0-0007bh-JX for guix-patches@gnu.org; Tue, 29 Jun 2021 17:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lyLl0-0003Xo-Ja for guix-patches@gnu.org; Tue, 29 Jun 2021 17:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49280] [PATCH 3/4] gnu: racket-next: Unbundle racket-next-minimal. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Jun 2021 21:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49280 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49280@debbugs.gnu.org Cc: Philip McGrath Received: via spool by 49280-submit@debbugs.gnu.org id=B49280.162500389313541 (code B ref 49280); Tue, 29 Jun 2021 21:59:02 +0000 Received: (at 49280) by debbugs.gnu.org; 29 Jun 2021 21:58:13 +0000 Received: from localhost ([127.0.0.1]:55848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyLkC-0003WG-Pq for submit@debbugs.gnu.org; Tue, 29 Jun 2021 17:58:13 -0400 Received: from mail-qk1-f175.google.com ([209.85.222.175]:46695) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyLk9-0003Vm-9p for 49280@debbugs.gnu.org; Tue, 29 Jun 2021 17:58:10 -0400 Received: by mail-qk1-f175.google.com with SMTP id 19so270959qky.13 for <49280@debbugs.gnu.org>; Tue, 29 Jun 2021 14:58:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IdMXqcY4irBQmjsXrAWEILFEReRTthOkRQS35Rw9i1g=; b=VaEdUjmqvesLB5+vqr1R+vnKabITECC0+ROWV6GHY1TXuKNarMAheSg82qoOFPPmVs XmSY7Pn5SH+yKhjxZbha/PG6ToZmwvRk0vrUOV74RQs4zkPTY/9+I9HIZcoAQ9WCenOl CBGx3HtpDpcmlX3dND8g5csSjnUMEEzf37/yyZDMv/hSzY+YrylAFFhShfxMMCCcEqFt 67nhOUGD9WAnP02pYSGXMKGGvaKuGkexFL0KlZwPJsLwVUCbt+9qXOptT/uRmzqZXDyB azuoxGLUJVYsh6pI/8ccQzwH6jCEVJeKNT14eWCwl/eKnGOIk81+zvafZBOitOPAgcEQ QCDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IdMXqcY4irBQmjsXrAWEILFEReRTthOkRQS35Rw9i1g=; b=GyQLUWgyylX7f34Vh8r82wVGKzeefqRDpcv0vY7hlehs5dsP4MLC51ON/1pVeyS2PA YkDpm/cfFaTB/aQGNu+GUqRutii4zoZExbFlYqtnp+tR9AI5pw1PSIpihYJTtl56UgHE LJpcvdreVzP72cyvPLPL1LZ30NcSEQj+sLX5zh7m8JPRCwtPhCcT6CoKDvk0aTUCUsWm wSDVmhvX19t0GQHr42s/pPHjmOx6U1JB/8kGSDoK/r8GEySnxahBqZsKPkM5CZxK8p7n XUL4gcEUF/LabaX/h8+lGhW7X92ZLEMU0HhVkmjh7dEO2prPpXEfkZHzLxL1ZdZmOeS4 LgAg== X-Gm-Message-State: AOAM532wJbk2d4sNH9pgpX/Xhn8ZN+NpXXLcLgCf2sM2expYElIZLqXe EKGGyBZaAi2Ekx4/ypdayHrTIqS6mIuGCDchxyg= X-Google-Smtp-Source: ABdhPJzWRxiRLRQjz9w54FLsxKh8Q46V1Wmuqo0Lj9jAPV+zwStEijIeGgVsFeH1igujvufGHKghdg== X-Received: by 2002:a05:620a:6d5:: with SMTP id 21mr16847686qky.138.1625003883650; Tue, 29 Jun 2021 14:58:03 -0700 (PDT) Received: from localhost (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242]) by smtp.gmail.com with ESMTPSA id o21sm12850175qkp.51.2021.06.29.14.58.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 29 Jun 2021 14:58:03 -0700 (PDT) From: Philip McGrath Date: Tue, 29 Jun 2021 17:57:41 -0400 Message-Id: <20210629215742.3112654-3-philip@philipmcgrath.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210629215742.3112654-1-philip@philipmcgrath.com> References: <20210629215255.3110238-1-philip@philipmcgrath.com> <20210629215742.3112654-1-philip@philipmcgrath.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1625003972; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=IdMXqcY4irBQmjsXrAWEILFEReRTthOkRQS35Rw9i1g=; b=ad8v+V/od+cC+M664l0/tRO4g8KcJXFOYh6XmeJWexmLBiZxZ6RVEvGL1bwpmQ6rL+rvlE YhzuHu2t7NSaD59kiQw6Otl858/sp/C8WY9UxPHNatjTnGLXl7opbyc8JtghVcOU4xrRqw V2tHYnamUVrYNNlclEKxasLml6pVuqmHQQnO5kSOerq1HkOOaADlJpfTpzVj4219fA2s3M N0u6yKFU3JF5KJPADo2lMn0vHBDUfptYJKCAxb2G6G5tQvhjtOjUS2362F9jPoL3oWQjgr zv0lKIY9tTF6eg/xyUu9+HFnzxHuNY21ckLeQag85cOjnXM9mv+xqGXK4gO/Ww== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1625003972; a=rsa-sha256; cv=none; b=XSsLJc0HAQpOlN35+d6HXdGk0ELPOcLv+Ttr3HTU8vSl6esginOTeQHRVdHhYq/c78eKkh 6QtJ5gurmThK4P4Fvm1pWodBW4EeyVi1ZF5jTVAXHFXyN1z0yaGGxHmxxUZY+ti77rFA78 txa2SyACZXxD+mqDBJM6XBOCsZH5gp7jyebqzkEtbe+5x716DtSmdYrZtpdU2bSB1Taz3l Nkmwlt1nuuN+ATB4HRdTSI/7BYs9EVbgbCyP4FJBB4J5qqJeBGEwtggAt5hBIIvJKa11D4 XNSQEgcplybS0leRMQztQJnRXjVvZBndEcjQDSKO/dEblh/h8/jHGE8qNiruhA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=VaEdUjmq; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.58 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=VaEdUjmq; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 913CE9934 X-Spam-Score: 3.58 X-Migadu-Scanner: scn1.migadu.com X-TUID: PtHJtiyVlB5/ This takes advantage of improvements since the Racket 8.1 release in support for layered and tethered installation. * gnu/packages/racket.scm (extend-layer): New private variable. This is a script for configuring a new config-tethered layer chaining to an existing Racket installation. * gnu/packages/racket.scm (racket-next)[source](snippet): Unbundle `racket-next-minimal`. [inputs]: Stop inheriting from `racket`. Remove inputs that properly beling to `racket-next-minimal`. [native-inputs]: Add `racket-next-minimal` and `extend-layer`. [arguments]: Stop inheriting from `racket`. Add phase 'unpack-packages to move the sources and links file into place. Replace 'configure phase using `extend-layer`. Replace 'build phase using `raco setup`. Delete 'install phase. --- gnu/packages/racket.scm | 202 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 201 insertions(+), 1 deletion(-) diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 363f19825b..cf0240be5c 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -272,4 +272,204 @@ languages such as Typed Racket, R5RS and R6RS Scheme, Algol 60, and Datalog."))) (base32 "0ysvzgm0lx4b1p4k9balvcbvh2kapbfx91c9ls80ba062cd8y5qv")) (uri (string-append %pre-release-installers - "racket-src.tgz")))))) + "racket-src.tgz")) + (snippet + (with-imported-modules '((guix build utils) + (ice-9 match) + (ice-9 regex)) + #~(begin + (use-modules (guix build utils) + (ice-9 match) + (ice-9 regex)) + ;; unbundle minimal Racket + (for-each delete-file-recursively + '("collects" + "doc" + "etc" + "README" + "src")) + ;; unbundle package sources included elsewhere + (define (substitute/delete file pattern) + (substitute + file + (list (cons pattern + (lambda (line matches) + ;; must match exactly once + (match matches + ((m) + (string-append (match:prefix m) + (match:suffix m))))))))) + (define (unbundle-pkg pkg) + (define quoted-pkg (regexp-quote pkg)) + (with-directory-excursion "share" + (substitute/delete + "links.rktd" + (string-append + "[(][^()]+[(]#\"pkgs\" #\"" + quoted-pkg + "\"[)][)]")) + (with-directory-excursion "pkgs" + (substitute/delete + "pkgs.rktd" + (string-append + "[(]\"" + quoted-pkg + "\" \\. #s[(]" + "(pkg-info|[(]sc-pkg-info pkg-info 3[)])" + " [(][^()]+[)] [^()]+[)][)]")) + (delete-file-recursively pkg)))) + (unbundle-pkg "racket-lib")))))) + (inputs + `(("cairo" ,cairo) + ("fontconfig" ,fontconfig) + ("glib" ,glib) + ("glu" ,glu) + ("gmp" ,gmp) + ("gtk+" ,gtk+) ; propagates gdk-pixbuf+svg + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libx11" ,libx11) + ("mesa" ,mesa) + ("mpfr" ,mpfr) + ("pango" ,pango) + ("unixodbc" ,unixodbc) + ("libedit" ,libedit))) + (native-inputs + `(("racket" ,racket-next-minimal) + ("extend-layer" ,extend-layer))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'unpack-packages + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) + (let ((racket (assoc-ref (or native-inputs inputs) "racket")) + (prefix (assoc-ref outputs "out"))) + (mkdir-p (string-append prefix "/share/racket/pkgs")) + (copy-recursively + "share/links.rktd" + (string-append prefix "/share/racket/links.rktd")) + (copy-recursively + "share/pkgs" + (string-append prefix "/share/racket/pkgs")) + #t))) + (replace 'configure + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) + (let ((racket (assoc-ref (or native-inputs inputs) "racket")) + (prefix (assoc-ref outputs "out"))) + (apply invoke + (string-append racket "/bin/racket") + (assoc-ref inputs "extend-layer") + racket + prefix + (map + (lambda (lib) + (string-append (assoc-ref inputs lib) "/lib")) + '("cairo" + "fontconfig" + "glib" + "glu" + "gmp" + "gtk+" + "libjpeg" + "libpng" + "libx11" + "mesa" + "mpfr" + "pango" + "unixodbc" + "libedit"))) + #t))) + (replace 'build + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) + (invoke (string-append (assoc-ref (or native-inputs inputs) + "racket") + "/bin/racket") + "--config" + (string-append (assoc-ref outputs "out") + "/etc/racket") + "-l" + "raco" + "setup") + #t)) + ;; we still don't have these: + (delete 'install)) + #:tests? #f)))) + +(define extend-layer + (scheme-file + "extend-layer.rkt" + `(module + extend-layer racket/base + (require racket/cmdline + racket/match + racket/file + racket/list + racket/pretty) + (define config-file-pth + "etc/racket/config.rktd") + (define (build-path-string . args) + (path->string (apply build-path args))) + (define rx:racket + ;; Guile's reader doesn't support #rx"racket" + (regexp "racket")) + (command-line + #:args (parent-layer prefix . lib-dir*) + (let* ([config + (for/fold + ([config (file->value (build-path parent-layer + config-file-pth))]) + ([spec (in-list + '((lib-dir lib-search-dirs "lib/racket") + (share-dir share-search-dirs "share/racket") + (links-file + links-search-files + "share/racket/links.rktd") + (pkgs-dir pkgs-search-dirs "share/racket/pkgs") + (bin-dir bin-search-dirs "bin") + (man-dir man-search-dirs "share/man") + (doc-dir doc-search-dirs "share/doc/racket") + (include-dir + include-search-dirs + "include/racket")))]) + (match-define (list main-key search-key pth) spec) + (hash-set* + config + main-key + (build-path-string prefix pth) + search-key + (list* #f + (hash-ref config + main-key + (build-path-string parent-layer pth)) + (filter values (hash-ref config search-key null)))))] + [config + (hash-set config + 'apps-dir + (build-path-string prefix "share/applications"))] + [config + ;; place new foreign lib-search-dirs before old + ;; foreign dirs, but after Racket layers + (let-values + ([(rkt extra) + (partition (lambda (pth) + (or (not pth) + (regexp-match? rx:racket pth))) + (hash-ref config 'lib-search-dirs))]) + (hash-set config + 'lib-search-dirs + (append rkt + lib-dir* + extra)))] + [bin-dir + (hash-ref config 'bin-dir)] + [config + (hash-set* config + 'config-tethered-console-bin-dir bin-dir + 'config-tethered-gui-bin-dir bin-dir)] + [new-config-pth + (build-path prefix config-file-pth)]) + (make-parent-directory* new-config-pth) + (call-with-output-file* + new-config-pth + (lambda (out) + (pretty-write config out)))))))) -- 2.30.2