From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id AA5EF6Tj4mHKJgEAgWs5BA (envelope-from ) for ; Sat, 15 Jan 2022 16:09:24 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id GJspFKTj4mFxJgEAauVa8A (envelope-from ) for ; Sat, 15 Jan 2022 16:09:24 +0100 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 B99722B5F4 for ; Sat, 15 Jan 2022 16:09:23 +0100 (CET) Received: from localhost ([::1]:45784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n8kgE-0001nt-SN for larch@yhetil.org; Sat, 15 Jan 2022 10:09:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8kfu-0001nb-WE for guix-patches@gnu.org; Sat, 15 Jan 2022 10:09:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48586) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n8kfu-0003Ns-NG for guix-patches@gnu.org; Sat, 15 Jan 2022 10:09:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n8kfu-0004T7-Df for guix-patches@gnu.org; Sat, 15 Jan 2022 10:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#48463] gnu: Add j. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Jan 2022 15:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48463 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: elaexuotee@wilsonb.com Cc: Maxime Devos , 48463@debbugs.gnu.org Received: via spool by 48463-submit@debbugs.gnu.org id=B48463.164225930617115 (code B ref 48463); Sat, 15 Jan 2022 15:09:02 +0000 Received: (at 48463) by debbugs.gnu.org; 15 Jan 2022 15:08:26 +0000 Received: from localhost ([127.0.0.1]:41486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8kfK-0004Rz-Ft for submit@debbugs.gnu.org; Sat, 15 Jan 2022 10:08:26 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:35599) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8kfH-0004RU-3n for 48463@debbugs.gnu.org; Sat, 15 Jan 2022 10:08:25 -0500 Received: by mail-wm1-f67.google.com with SMTP id q9-20020a7bce89000000b00349e697f2fbso12854620wmj.0 for <48463@debbugs.gnu.org>; Sat, 15 Jan 2022 07:08:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=islX97OJwrM6m7on2gRO/1jrcbn22Amy5og/OjHQWsQ=; b=Tjm3M6/3FjM4gmslw/5O6IRRca+uObGft9ps1+LdObelg9fz5RdoMYBYoa/cC+Hnwd K0yGjexf19jV5ANhPn4JbQK3JPudlKQWbEBoErZbDpLW0B/mqJQ15qS29sIzmg1GSEGg +k4hxjUuiDF/gT1jJniVSG1KirqlcDXj9GwEVsJTTDpZqVIegy7Y1ZaE2SPoDqFh+xub Z1qOY03W0uGmZmUAzLBZwLnY3CeBusIQKtDil21s3Un5I0yUjmvuBPUhJpiqOkGp731J Hdx2m50HQI1pXTTt9rgqy1SQbGRVv/qyFCVB1zYud2EclOrflgYTFFw89R4olmAZwN+N dVfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=islX97OJwrM6m7on2gRO/1jrcbn22Amy5og/OjHQWsQ=; b=JAJ8q/ibGdlcdl0INhRE99Dvc45LhnRqWR7cgud40n2MK2plPPit1c+Q4IdVtSkVxO PSr0Cd/5L+SlQGpZy0ido09bM10JIQXOrNfMNt5IGfOoXhDyEpcXGrWVE+jNqS33s7P4 GDuhpPTpM4GRNRpot2J216bViKVeo+rbgwrCBcU8bZ7wYzsyPTTZt848k1HlPFJU369u uMJ1h5BOUVxgPkB7bzO2+bVsVy4SMRYQ1YB1u1866rCGfkKtXWmjVBHsJ0Q8MxKa1mhA Te6/DloacrQVZC4pBOW1Qo+QkZgdUAfHvTD3hRNdveEAE1hkOiD5DmHaZkP+kw7lYcBt Zx5w== X-Gm-Message-State: AOAM533hb0oNka/lT1YEBKOhgTbQPA3lgBMjzg7RHe47ph9fz+GdQIkD 4lCjcjVcAoev2xGSjWVSnTI= X-Google-Smtp-Source: ABdhPJzbbyNIW4mbQexSnyXR30EdSwEFIU9AYDGoiOFzEu0FeVL3ZReJBHnXK4Yrs7bxGeNUlKUgQw== X-Received: by 2002:a5d:64aa:: with SMTP id m10mr1591643wrp.295.1642259297083; Sat, 15 Jan 2022 07:08:17 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id l4sm10115356wry.85.2022.01.15.07.08.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jan 2022 07:08:16 -0800 (PST) Message-ID: <83aba994536bec60f79900d551d4801c967742bd.camel@gmail.com> From: Liliana Marie Prikler Date: Sat, 15 Jan 2022 16:08:13 +0100 In-Reply-To: <24ZUUMG4QYSHN.2OS7YAMCKREUA@wilsonb.com> References: <3LOAUDT0FLL4U.2SOD925YP915T@wilsonb.com> <8b853d0585505ce29c9afc638b644fa34805e6c0.camel@student.tugraz.at> <293L8YPQS4CLB.3VK1B1A36XNAY@wilsonb.com> <5d30160bd2a4592459cd407f99cbd3edadb1db1b.camel@student.tugraz.at> <27DCD25Y68ZWJ.2HRC4G65PWIA7@wilsonb.com> <94f4625dcb0479d873cf60449631527e841fd457.camel@gmail.com> <2JQJMV0O718S1.31FZE8GKCTLPF@wilsonb.com> <90704c2259f576a14fb1268219e8c0dc2b3bf289.camel@telenet.be> <2P322C327XW0Q.21O5A4IFGMNDI@wilsonb.com> <72aff035c93f9f91afa54ef5b51c7381b0b02ccb.camel@gmail.com> <3MMTDZQJQ8IR6.334ZWY8AD0487@wilsonb.com> <62d37956f16c08bc4ce26e44da16dce704ddd0f8.camel@gmail.com> <24ZUUMG4QYSHN.2OS7YAMCKREUA@wilsonb.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 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 X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1642259363; 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: 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=islX97OJwrM6m7on2gRO/1jrcbn22Amy5og/OjHQWsQ=; b=ZASN0N9O6vxlDAym9P1jr9k3i7hQgjEMgQXvVsZ3/2zg5suKsfBhqrZMdQad4DL7Q5zTko cgnVN7LmaW1cr5LoOqN5pn2v8r4Ola6U9bPONffyvFVjfcYNKwojcwrRNOI4K1fJCAeMdC n9Y3EQkSkrTnuOBuPbjQ8Sezpat80mhvdMuwApDLdbAlx99t5KStAxIMF416d2O8EbI/Vw ITUJCOqh1uwlz02zZL8HBclp37s5etxCC/GFrj8OxOsD3/7cbKIPDGrUPp0rhdg5sUdXb+ toSdJIOUhciMfpJviPGhtPUlFohGICaMoNZDiNCGf2ZAt4ZbaU/SosYICcU9mQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1642259363; a=rsa-sha256; cv=none; b=q/SqSQDWVbXRH35OMkHj4NT1l/RrfwkZpRmwIhJvIywnn7x+To9lIaN7btbqC5xdZIBu1U AK/Pk+PJ9MjAPx1gnR4lpUwzG/NQpWdaipM3C5NPU4TZagEeVUgPLgCUFeyoHoS1Jffl2o 4ANs/v4tJ5FWBXEfbIaiAoQ8V+U+14b8ELCUrpLVX630uk0BostqxMYaisf6M8XHoaghwm aLwRLF80yC40xUtfvf6hBJsqdSEWgEtZLu5YbIfrnm5S+EaOpeS1tdaqqE47O2/M9c/ov3 0m3llJiXU2WwEU2LxqKTGc0egEvUuuDzZop418F/+lg7EwME/ekYrt5q6LGKMw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="Tjm3M6/3"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (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: -2.03 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="Tjm3M6/3"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (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: B99722B5F4 X-Spam-Score: -2.03 X-Migadu-Scanner: scn1.migadu.com X-TUID: DA9iZ8iJsOaI Hi, Am Samstag, dem 15.01.2022 um 23:05 +0900 schrieb elaexuotee@wilsonb.com: > Thanks for staying on top of this patch review. > > Liliana Marie Prikler wrote: > > Hi, > > > > Note, that the current version still ignores commit.  I've attached > > a proof of concept patch, which fixes that, plus some other minor > > things, but it now uses a pair for version.  Also it's untested, so > > treat with care. > > Oh! I see. You're wanting the version string to have optional > REVISION and COMMIT parts, like `git-version'. That makes a lot of > sense. > > There was a small issue with `jversion->string' in your patch, which > produces MAJOR-REVISION-COMMIT if no MINOR value is provided. I want > to make sure that users can always have specifications like > "jsoftware-j@MAJOR" in their profile manifest, but guix doesn't treat > hyphen as a version separator. > > I just changed the logic to always keep a dot after MAJOR, and then > use hyphens after that. I'm not quite sure if I agree with that decision, but you're right that @MAJOR ought to be supported. How about enforcing that MINOR exists if REVISION and COMMIT are used and setting it to "0" if there hasn't been an "a" beta or release yet? > > > > > Good idea. Upstream's build scripts condition a *lot* of > > > behaviour on he j64avx environment variable, so it might not be > > > straightforward, but I will put this on the to-do list of future > > > improvements. > > > > > > (Note, the code block quoted here got much simplified in the > > > current patch.) > > Reading /proc/cpuinfo is not nice.  Please use (guix cpu), which > > also provides you the flags that you need. > > Oh nice. A new, shiny module! This is exactly what I was looking for > when originally writing the script. Updated. LGTM. > + (native-inputs `(("clang-toolchain" ,clang-toolchain))) > + (inputs (cons* `("libedit" ,libedit) > + `("libomp" ,libomp) > + `("ijconsole" ,(ijconsole)) > + extra-inputs)) My variant already had these translated to the new style. If you're not using old style on purpose – and I don't think you do – you might want to make your life easier by dropping these labels and going with plain (list)s. > + (call-with-output-file "jlibrary/bin/profilex.ijs" > + (lambda (port) > + (display > + (string-join > + (list > + "share=. '/share/j',~ ({.~ _2 { I.@:=&'/') > BINPATH" > + "system=. share,'/system'" > + "tools=. share,'/tools'" > + ;; Upstream defaults to spamming $HOME with > unhidden > + ;; userdata directories. Set this to be > + ;; $HOME/.config/j/ instead > + "'jtype jversion'=. (3&{,{.) <;._2 ,&'/' > 9!:14''" > + "jversion=. ({.~ i.&'-') jversion" > + "user=. home,'/.config/j/',jversion" > + "addons=. user,'/addons'" > + "break=. user,'/break'" > + "config=. user,'/config'" > + "install=. user,'/install'" > + "snap=. user,'/snap'" > + "temp=. user,'/temp'" > + "\n") > + "\n") > + port))) You might want to use an aux-file for that. Name it jsoftware/profile.ijs if it's just a plain file (which I assume). I recently pushed a commit towards renpy which replaces a large format block by fetching an auxiliary file and substitute*, which you can take as reference if you're unsure. Note that renpy still uses old-style inputs, so the assoc-ref makes sense in that case; however, you should be able to also express this pattern in terms of search-input-file somehow (or otherwise express it as gexp). Cheers