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 ms0.migadu.com with LMTPS id ONb/HvDR42HbYQEAgWs5BA (envelope-from ) for ; Sun, 16 Jan 2022 09:06:08 +0100 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 yAu1F/DR42EHBwAAG6o9tA (envelope-from ) for ; Sun, 16 Jan 2022 09:06:08 +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 E48D71428F for ; Sun, 16 Jan 2022 09:06:07 +0100 (CET) Received: from localhost ([::1]:39386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n90YA-0005To-T9 for larch@yhetil.org; Sun, 16 Jan 2022 03:06:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n90X9-0005Tc-Aa for guix-patches@gnu.org; Sun, 16 Jan 2022 03:05:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n90X8-0007N1-MS for guix-patches@gnu.org; Sun, 16 Jan 2022 03:05:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n90X8-0007Ix-Ik for guix-patches@gnu.org; Sun, 16 Jan 2022 03:05: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: Sun, 16 Jan 2022 08:05: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.164232027128032 (code B ref 48463); Sun, 16 Jan 2022 08:05:02 +0000 Received: (at 48463) by debbugs.gnu.org; 16 Jan 2022 08:04:31 +0000 Received: from localhost ([127.0.0.1]:42412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n90Wd-0007I4-AN for submit@debbugs.gnu.org; Sun, 16 Jan 2022 03:04:31 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:39818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n90WM-0007HX-Tt for 48463@debbugs.gnu.org; Sun, 16 Jan 2022 03:04:29 -0500 Received: by mail-wm1-f68.google.com with SMTP id d18-20020a05600c251200b0034974323cfaso16580709wma.4 for <48463@debbugs.gnu.org>; Sun, 16 Jan 2022 00:04:14 -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=vxBFgIvkYYNrAMqu8X5GLdW9fjhwwQ+E/nc9BnDn9Oc=; b=l25V799OioNwIBkJ50DhRJc1/Viuto7c7481s2PRSqatu8bO+Zl7d/O1GY763W5RFT h3vBHR3vc/gHZ2BLgslhV/dxHB0nnwT6z+IWVXRYEr+flj8RyxrBLL0UNKHAOBCwHtHG D3t54INz1kmtywdhjOLeX8ME5ScqTdf7F4D5zaejqC+/9mrrhkqXCuJCBN+bw9Z4JnVw td0eyhWKSDUvAAokl7MsMvz2tdwSE8K7VaPaSr9LMo0tIrJsJIhOIRYjkvN+CVqQL2LD Z16B3sYhwLeBUhRhXNF1KedJ0I4aTk1qqfyXIJVbf/myp5g9eqkGIzYWWN/YLhhLmRNW BgJg== 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=vxBFgIvkYYNrAMqu8X5GLdW9fjhwwQ+E/nc9BnDn9Oc=; b=JF+Gpomo9Pth4FcyQRZK9KMkzRMtSBsKvnQ1pdKiYqbQrXKzbHOUoxsSfpajKh0En8 8BWAixjUepqorXn1lEUxz7auhvXt2ZMYJumSshHDQ0/khqQQ8cloBgI6JHDPM0Osa5q/ BHjmu/ijz7ZLfQapGBuUe1Ydugn+roLuUJK2EudWFFcXL4pyNGjq/0a+AAYlRuPCKq9G IhemdIsIMCCK/DiWfErYp902V5BiRhEgq9dpy0WMDv8WESBTDn1icYJFJakyDUeTMzd/ mlpER6Jl6vANBPY30mD/aJ4xRTrtzHhk3Med0Gtz/q/VtwWf6GpBilKwvGMiqsQbGU2a y/YA== X-Gm-Message-State: AOAM53211BXPslQvr8lFcbyx4nX9ngiuVPdivz5fzCtiSjdj018BCh2E qAqvVyJelr5RsUOi97XOReI= X-Google-Smtp-Source: ABdhPJwThAOSdFOKLBWIec0RC+2vi43xjKtI+fTvFO47usYaW4XWBpqG7nqzhAPaZK4/gW2uFEGIOQ== X-Received: by 2002:a7b:cf2b:: with SMTP id m11mr22015721wmg.153.1642320248845; Sun, 16 Jan 2022 00:04:08 -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 c4sm5298910wma.1.2022.01.16.00.04.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Jan 2022 00:04:08 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Sun, 16 Jan 2022 09:04:06 +0100 In-Reply-To: <25Z6NGGGNJYD1.3S7A1QLFX7I9Y@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> <83aba994536bec60f79900d551d4801c967742bd.camel@gmail.com> <25Z6NGGGNJYD1.3S7A1QLFX7I9Y@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=1642320368; 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=vxBFgIvkYYNrAMqu8X5GLdW9fjhwwQ+E/nc9BnDn9Oc=; b=GOk+dBUpHcHroNAZh1oStIB5x2x6Xo/7TZDlg9rTlmuFvKkynnhMNrf+7NEPZkSrSUA9ag vsH2wXb7QlHlisd3nGeTSz7Hsvi+mqjleAWQA7fKMMjCsV9Z9fZysiR2dUT8CvNdnyAzxC JA7UcKc20bnSLSjqdIvv1GfsZwItlXmPmeRny5m/rmPIQK7gstxDTyP3Z3LM/rbEXkh48B +xUAuAqE6GbANIeVxwWvXKonTM1bZrM8lnePfp3+Ufbt5iTco4ypvv8wv7+NwdGRIdiG8c SyBFm/zBLq937z/1UItRSDMtYz6hQr+EEAK76P3LqGNb6iWAr2lGFf2J4BM1Rg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1642320368; a=rsa-sha256; cv=none; b=bwmTRS5MkHu6rGiNwOjLVaixAR8fib13ppiviwRJH+DHlXzoTxcT2tBi1zlByUCbD/jCxV gR8CtKc7BKfN2hrd1HjwbaT8/ngG86mZheFe4OK5AbsnUnmFf6OZ+uToRAFljIraylD2mw TgkiIs5ZYRcMstbkzHygMyKM+w0x5eRmadXzOZLN2gJSSwx9uT3p4zXpKN7rco0xd/9YLw QeaSNHk6P/G7cQLwnug0dvJ3Mlq4jNs52TalgqLZN/Gpwqo55ljl+3Va5F2uou28zcD1x4 m9rrdsj/S2I9TznAYpSLTitIHubx0HW87w5+szyoLNs8hEdd8RmVox19NgbQLA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=l25V799O; 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.82 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=l25V799O; 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: E48D71428F X-Spam-Score: -2.82 X-Migadu-Scanner: scn0.migadu.com X-TUID: xbhYd0iUOCHh Am Sonntag, dem 16.01.2022 um 14:29 +0900 schrieb elaexuotee@wilsonb.com: > Good day. > > > > > > 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? > > Interesting idea. How about just always forcing a MINOR part, setting > to "0" if upstream doesn't have one? That'd declare regular releases as MAJOR.0 in the version field, which I'm not sure if we want that. In the case of random commits I'm less reserved, as they don't correspond to releases anyway. > > > > > +   (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. > > Yeah, I had trouble getting that to work nicely with the ijconsole > input. See below for more details. > > > 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). > > Oooh. Neat. That makes adding and testing changes their much nicer. > > Note, I wasn't able to find a nice way to get this working together > with the new inputs syntax, since `search-input-files' only searches > under input paths which are directories. > > The ijconsole and profilex input are regular files, so it raises a > search-error. One workaronud is to put ijconsole and profilex > together under a file-union input, but I found that almost worse than > just using old-style syntax. > > If you have a better idea, I am all ears. You could define that file-union right after ijconsole. If you want to golf even more, you could define ijconsole inside that file-union, i.e. (define jsoftware-aux-files (file-union "jsoftware-aux-files" `(("profile.ijs" ,(search-aux-file ...) ("ijconsole" ,(program-file ...)))) I'm not quite sure if you want to use jsoftware-aux-files directly as input or whether it's wiser to stuff it into another union like (file-union "jsoftware-aux-input" `(("aux" ,jsoftware-aux-files))). search-input-file will probably do the right thing regardless. The new style should also still work with assoc-ref, it'd just be weirder to look at. Lastly, you could code up a (search-file-input) just in case; I'm not sure if we have one already. Cheers