From unknown Fri Jun 20 07:09:42 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#65924 <65924@debbugs.gnu.org> To: bug#65924 <65924@debbugs.gnu.org> Subject: Status: git searches coreutils and util-linux commands in PATH Reply-To: bug#65924 <65924@debbugs.gnu.org> Date: Fri, 20 Jun 2025 14:09:42 +0000 retitle 65924 git searches coreutils and util-linux commands in PATH reassign 65924 guix submitter 65924 Maxim Cournoyer severity 65924 important thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 13 14:00:39 2023 Received: (at submit) by debbugs.gnu.org; 13 Sep 2023 18:00:39 +0000 Received: from localhost ([127.0.0.1]:35975 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgUAI-0002bW-EY for submit@debbugs.gnu.org; Wed, 13 Sep 2023 14:00:39 -0400 Received: from lists.gnu.org ([2001:470:142::17]:45398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgUAG-0002Pa-0A for submit@debbugs.gnu.org; Wed, 13 Sep 2023 14:00:36 -0400 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 1qgUA5-0003MW-Aa for bug-guix@gnu.org; Wed, 13 Sep 2023 14:00:25 -0400 Received: from mail-qv1-xf32.google.com ([2607:f8b0:4864:20::f32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qgU9u-00070Q-W0 for bug-guix@gnu.org; Wed, 13 Sep 2023 14:00:24 -0400 Received: by mail-qv1-xf32.google.com with SMTP id 6a1803df08f44-655e10e4e4aso616996d6.2 for ; Wed, 13 Sep 2023 11:00:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694628011; x=1695232811; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=yAQ6rNXep3eHHmrtPFnpVYTLhSpSGGWzgS0TMjOtmgU=; b=P3Kmmx1HsCMNuNJ5SNYjjFp/BQNiXBe2dutQVumoRJdwLjQc628KbZHaaL5RKbMCTy qAK38BSvsaR52yib7Qw0LPBRmInRDXwJAOFgTBAkQGdOcfIjjmFhebZXX4CByX8Ine8c SCQkJkXn9B14eNGW4b/YIhGVFKERCj89rlFIP0zI0ETW7JzYDhcSupLVly+R14zWYuEY oDGQpawMwmoxYvRcp7hiXV+XM4l8Xut9Bu2Nqsk7W3dawTjHRGPM9x9gQ5De1kARwxJ5 KuM9MgZOf15Cg+jBJtNhOVh04cMHTyvFKvC1P74fh3FTEOxn94yrRitA25PHa2ZCQZSK de3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694628011; x=1695232811; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yAQ6rNXep3eHHmrtPFnpVYTLhSpSGGWzgS0TMjOtmgU=; b=aIga8ugNYpljczP12oDnAzyfjTOmqKGnkjg/uEGZ6drGUUnRHi012jAXV01slfUOUU zvmHUUXC6WHLhA+2O959OY6f8ETmcKThd0u1gcrjo94M/Zx8TVE0v7YrQ4LN0z7uk9S6 9d2oNZxxFoSxfciRCVDtE6Bp9iPFbbJngoHM90Lg2e9UFwOeIFWea5FeHHLhTo4F2RIY qcH7Ua4nTBGlsvvqdjlDIz+BmoQvcppGJrHNN5ZFWuKvY2H75OunYzDK2MsTPnvI0yK6 5eQlgocI2Lkfec7Wi8P9B4UZTCARKshYA1FxTS5zVTk/cnJyS+ivq45nDtQS+3+JWRa4 HdKw== X-Gm-Message-State: AOJu0YyDyEUPvvkffm6UTI3lnlbSQ/TYjREnUMQNoSUrlNxC6cbo8CQQ W8x4EDFCwydNcPv4tJ1HxS9TyqiAj0A= X-Google-Smtp-Source: AGHT+IH8E0HQUfqTMaWrD7UmXwIyCm5H0lYJXrIIri02W2si28hwHmXGw5TZCP0THiO6GqbIZP6sCg== X-Received: by 2002:a05:6214:29ee:b0:64f:8213:197d with SMTP id jv14-20020a05621429ee00b0064f8213197dmr3939900qvb.33.1694628011462; Wed, 13 Sep 2023 11:00:11 -0700 (PDT) Received: from hurd (dsl-149-165.b2b2c.ca. [66.158.149.165]) by smtp.gmail.com with ESMTPSA id b14-20020a0cb3ce000000b0062def68f75csm4621085qvf.124.2023.09.13.11.00.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 11:00:11 -0700 (PDT) From: Maxim Cournoyer To: bug-guix Subject: git searches coreutils and util-linux commands in PATH Date: Wed, 13 Sep 2023 14:00:09 -0400 Message-ID: <87fs3iuf6e.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2607:f8b0:4864:20::f32; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf32.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hello, Attempting to use git-minimal in a --pure environment, I stumbled upon: --8<---------------cut here---------------start------------->8--- /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-su= bmodule: line 7: basename: command not found /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-su= bmodule: line 7: sed: command not found /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-sh= -setup: line 77: basename: command not found /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-sh= -setup: line 77: sed: command not found /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-sh= -setup: line 292: uname: command not found /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-su= bmodule: line 613: sed: command not found /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-su= bmodule: line 613: cmd_: command not found =E2=98=92 git clone exited 127 --8<---------------cut here---------------end--------------->8--- The 'git' command should be wrapped to include these in its PATH. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 13 18:52:32 2023 Received: (at 65924) by debbugs.gnu.org; 13 Sep 2023 22:52:33 +0000 Received: from localhost ([127.0.0.1]:36299 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgYim-0005M8-IA for submit@debbugs.gnu.org; Wed, 13 Sep 2023 18:52:32 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:41292) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgYig-0005LX-Ni for 65924@debbugs.gnu.org; Wed, 13 Sep 2023 18:52:27 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-401e6ce2d9fso806815e9.1 for <65924@debbugs.gnu.org>; Wed, 13 Sep 2023 15:52:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694645535; x=1695250335; darn=debbugs.gnu.org; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=W7CT9iGP7O1XVudfI6IeClflo5pCahFrcHT2pkyn/AE=; b=RjWlM4l7Jb50Ixx/RhFMx8QfksDzh7YU1VUpH69/whJA9hISj0DLoPclrvpd3Uj6XR 23V/WkaONfuxpppL0Po+4C86hEMYWnXssQrsfSsENo7RJ2TyWCjT93NqXywZBA4765Ph FJsY1HA1R2o4/fv/1Zl34+feCP+qg6KkQeG6+5mCpr11iCcfogn3sScGzwt/Q7sA0iNN hixvPhfStSv1nY+0SKeVWHtr/o0cCF0Mi451Mw+PM1ZSsHtucwMlUVNUIDIWPYzqLmAy KUXnxn0/GMd6gPfTBaDj40zcmTP9SnDmRv8uzaPseKnxKzpeWJPf41GKxH9UDu5qSwaj /ofA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694645535; x=1695250335; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=W7CT9iGP7O1XVudfI6IeClflo5pCahFrcHT2pkyn/AE=; b=YHwlmRDjd2ZsGKWxFTWyS3IrEKOmLoRe9uV7E/WXB1jz9cd423io6eRGbm3pNz2eaB KfEyA1FYAD8mVoyj0YU4bkT7Ko8euKqSOgGiyEcIZNzMvnAB5VDqD3vzCFdxQxTkNcRI 5ddT6Z/NlOpx7PDz0WBbraWaVokWmTaX9zI6PncyEwdVHKNqgVJNdix8PD1k72sBTaIg bpPXV8mU7KLIA4ysoqR5A0bSZi9rTEDRkTK+yUwfYEIWeJUAnd/G53yWxFZv7w6iCKkt 2GDp83hDWc9wOKFnabZEAWLhdtAm7xc+eMaFrJB14lrzyIhHIur6OogP4qEge26W+wKc nKig== X-Gm-Message-State: AOJu0YyTfCgk8L0z+ii16HYERKB8y5RH0xFjkJcBawsgm59dMPMRuo+c cRv90yS13YU2UcmobXH3nFEGu1JD2tQ= X-Google-Smtp-Source: AGHT+IHzrVC7hd5/Kk0/hKDvo6RpamBuIx6mYdbDpVOnK+5CfdvBwalAyCbqbjiYtWlyCI1xtIg9JA== X-Received: by 2002:a05:600c:3587:b0:3ff:c342:f296 with SMTP id p7-20020a05600c358700b003ffc342f296mr3251032wmq.1.1694645535162; Wed, 13 Sep 2023 15:52:15 -0700 (PDT) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id s24-20020a7bc398000000b003feee8d8011sm3186382wmj.41.2023.09.13.15.52.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 15:52:14 -0700 (PDT) From: Simon Tournier To: Maxim Cournoyer , 65924@debbugs.gnu.org Subject: Re: bug#65924: git searches coreutils and util-linux commands in PATH In-Reply-To: <87fs3iuf6e.fsf@gmail.com> References: <87fs3iuf6e.fsf@gmail.com> Date: Thu, 14 Sep 2023 00:27:54 +0200 Message-ID: <86v8cdwvx1.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxim, On Wed, 13 Sep 2023 at 14:00, Maxim Cournoyer wrote: > The 'git' command should be wrapped to include these in its PATH. --8<---------------cut here---------------start------------->8--- $ guix size git-minimal [...] total: 147.8 MiB $ guix size git-minimal util-linux coreutils [...] total: 195.4 MiB --8<---------------cut here---------------end--------------->8--- It increases the size by 33% which is not nothing. :-) Is it only the subcommand git-submodule which is broken? Probably not. --8<---------------cut here---------------start------------->8--- $ find $(guix build git-minimal --no-grafts) -type f -exec grep -H git-sh-setup {} \; | cut -f1 -d':' | xargs -I {} basename {} grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/bin/scalar: binary file matches grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/bin/git: binary file matches grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/scalar: binary file matches grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/git: binary file matches git-submodule git-filter-branch git-merge-resolve git-mergetool git-merge-octopus git-merge-one-file git-web--browse git-web--browse git-quiltimport --8<---------------cut here---------------end--------------->8--- The question could be: is worth to add 33% for these commands? Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 13 23:15:06 2023 Received: (at 65924) by debbugs.gnu.org; 14 Sep 2023 03:15:06 +0000 Received: from localhost ([127.0.0.1]:36430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgcos-0006DN-C3 for submit@debbugs.gnu.org; Wed, 13 Sep 2023 23:15:06 -0400 Received: from mail-qk1-x72e.google.com ([2607:f8b0:4864:20::72e]:46266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgcoq-0006Cc-99 for 65924@debbugs.gnu.org; Wed, 13 Sep 2023 23:15:04 -0400 Received: by mail-qk1-x72e.google.com with SMTP id af79cd13be357-76ef8b91a72so34579885a.0 for <65924@debbugs.gnu.org>; Wed, 13 Sep 2023 20:14:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694661292; x=1695266092; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=xTqc0kwACM5nvHJC6gBlCGVAGtty/lQ3Rl6VdrwzoLI=; b=iCHY6fQ1Md5sIrKYw/G9Ku2aS8DbRcI7V0r8TxktR9qLiQWyUDYT/oLKSRJOLh6gtc Pv9ER2IoxSSvv+TLGQGhFyefKeLvCmHn4wB257nSdQyTZDAyzdEO80L9Hl3/JAMFKeyk WepXbsIo2Yq3uo7e4VBMnjkoPYgvdjhmdlEijwoObEd3TSTQ0ZHbhky9Cp131PDuhUE/ Or4VeMRtcnImZ3ZKLc+vDtJAQ1zL+f+ET2JwLwbcEd3ylwyhlJRCXo5gcGUwYJskVC6k TUcenSfYPCy7Q+gYijRz0ifOfGxpSHc40z3NRaNXZ3NoQ2lVs4V6jApG9FhsJFdEf6uB BXCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694661292; x=1695266092; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=xTqc0kwACM5nvHJC6gBlCGVAGtty/lQ3Rl6VdrwzoLI=; b=GT+Bp5VpER5DIoHHMiKgZKQl0ZEUp3HBZZqGHcWmIT8M94rByJpTaXFKDMIKwMT0QD gdHsEYFQbBtOnyF4h93lmsVsxipR97VqYLKUgPYmJOau4nwqhYyxtrVlH0DaYMu2x+Cq hJWPHbB4ryH0ZGspKhUdJtH+2f2jfr6sf7zKknRdQzXwNd0krDMCp0dPoSe4qHd3kLo8 YiM8fuYZhVA2SE9pjr0fYiAeT+xuvjEuUWRlt0GRE1BsbcWlGvTSB021ov03K40mVF+J uQtF1ZrnQALh7P0kwY3KcqFc3KYdNkOpPL/9VYFuAFyiww/LqRVZq1CBXK8xIsVJA+Lr aYeQ== X-Gm-Message-State: AOJu0Yw7DDRhU1qmJO2tHdd1vffVVjVbnT1+syp7ZQasWvxGG1wdvPtP o+I3QnELTj4GUkcZE1RBEa8jhr4tW1w= X-Google-Smtp-Source: AGHT+IEsT47gWS4C9nGdZAjm2ta1WL1mmYGX8IpbuusVbexpqmcWiD8/6fV3nBrKNv2mj5p1oqC9Og== X-Received: by 2002:a05:620a:4103:b0:767:f49c:1d67 with SMTP id j3-20020a05620a410300b00767f49c1d67mr4851582qko.1.1694661292191; Wed, 13 Sep 2023 20:14:52 -0700 (PDT) Received: from hurd (dsl-149-165.b2b2c.ca. [66.158.149.165]) by smtp.gmail.com with ESMTPSA id a27-20020a05620a125b00b0076f16a00693sm190733qkl.47.2023.09.13.20.14.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 20:14:51 -0700 (PDT) From: Maxim Cournoyer To: Simon Tournier Subject: Re: bug#65924: git searches coreutils and util-linux commands in PATH References: <87fs3iuf6e.fsf@gmail.com> <86v8cdwvx1.fsf@gmail.com> Date: Wed, 13 Sep 2023 23:14:50 -0400 In-Reply-To: <86v8cdwvx1.fsf@gmail.com> (Simon Tournier's message of "Thu, 14 Sep 2023 00:27:54 +0200") Message-ID: <87y1h9tphx.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Simon Tournier writes: > Hi Maxim, > > On Wed, 13 Sep 2023 at 14:00, Maxim Cournoyer wrote: > >> The 'git' command should be wrapped to include these in its PATH. > > $ guix size git-minimal > [...] > total: 147.8 MiB > > $ guix size git-minimal util-linux coreutils > [...] > total: 195.4 MiB > > > It increases the size by 33% which is not nothing. :-) > > Is it only the subcommand git-submodule which is broken? Probably not. > > $ find $(guix build git-minimal --no-grafts) -type f -exec grep -H git-sh-setup {} \; | cut -f1 -d':' | xargs -I {} basename {} > grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/bin/scalar: binary file matches > grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/bin/git: binary file matches > grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/scalar: binary file matches > grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/git: binary file matches > git-submodule > git-filter-branch > git-merge-resolve > git-mergetool > git-merge-octopus > git-merge-one-file > git-web--browse > git-web--browse > git-quiltimport > > The question could be: is worth to add 33% for these commands? I'm not sure where uname is needed; we'd have to check. util-linux is where most of the weigh increase is at. 'git submodule' is part of git-minimal; it should work without external tools, ideally. References are also found in bin/git in your search, which suggests perhaps the size of git-minimal is a "lie" (the core package is not fully functional). -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 14 02:13:16 2023 Received: (at 65924) by debbugs.gnu.org; 14 Sep 2023 06:13:16 +0000 Received: from localhost ([127.0.0.1]:36623 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgfbI-0005AO-5G for submit@debbugs.gnu.org; Thu, 14 Sep 2023 02:13:16 -0400 Received: from mail-lj1-x233.google.com ([2a00:1450:4864:20::233]:38044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qgfbF-0005AA-Lp for 65924@debbugs.gnu.org; Thu, 14 Sep 2023 02:13:14 -0400 Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2bfcb39037dso571071fa.0 for <65924@debbugs.gnu.org>; Wed, 13 Sep 2023 23:13:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694671982; x=1695276782; darn=debbugs.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=INZI4iLKDSVYF8sd4nkMz5BPvfcCbLjgY8JrQJ7orNs=; b=WJ3K5K+NpY5sD93wMqnpt7vqHA+4YUBNxu4anb64WkLnaLtkdzSOucx1vy8ew1IGqn dfjdtH3IlaPTeGCTSZ9MBvSgwm0A9J0Si2HdmRIa4HNoIcgtkzNKheZhXWejG4GWiaQi qmimOSVil2HtNPNLSL/6jcVFun5bQOD+c+6xyif/zuWmMWO3huEzN229ng8Ow1PNtC/M pb3mEvHDXVSVUNsu2gULwmmPSvC4iStJupYXYKQ0xcI3Ep/6rWf+NxZe4Cebaz543Za5 Y9Twklp2qo8jCvu0YK99WhebJn4ZimO6qUmULsVNsOBpErauCyTE91vzxCyy0/NjYLUA GaBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694671982; x=1695276782; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=INZI4iLKDSVYF8sd4nkMz5BPvfcCbLjgY8JrQJ7orNs=; b=K3Ge76CsRSSNMMaJxB+xzYVckgYi72RUmgGNTHR7vhY8k0MRVG1/juNTRuuIVDqgGn vjgKyCW7Bflj0wQdhA76p/wQz8kVjArJcZR7+CU6X8WgrGk/0FGNpgGSsyCrCoAUpBHQ legBzG+pEBdA9K4Vm6AqUaxGVJlk0BLwlMSl0FH1jD5IiPn1QOnLYmnUSaEjA9zwbhMh ukVNX7fWTUz9SIRFJewmj7EoABFw68Zt7vMu++JnSUPDp7mAbyAKWaTaSpdErcsXKoOk LVFxpJXTbVDcg+ndJ5wziuP4auxl8ikdoewyP9T2uN3CpBnGa7Pkwgmc8QankVwBIGl7 4zwQ== X-Gm-Message-State: AOJu0YwnhdmeZ2ATE9t7cxJ3VOTeS0trWwqU+gfWQ93ChQEoVh3bBtBu vNI9Nf9s8wmXIjjdZKOgYYWrUYmg+A/Qbl87wPI/+0P+Qq4= X-Google-Smtp-Source: AGHT+IHxFMp5fiMzMk5IbhRy0rGgnSGM3/bDjfCF1pMNGCG6Qu0qS9pfiAFLfs62UOCapceLFdgGoTtpG85qSlKXTOg= X-Received: by 2002:a2e:a7cd:0:b0:2bf:7908:ae73 with SMTP id x13-20020a2ea7cd000000b002bf7908ae73mr5317847ljp.2.1694671981722; Wed, 13 Sep 2023 23:13:01 -0700 (PDT) MIME-Version: 1.0 References: <87fs3iuf6e.fsf@gmail.com> <86v8cdwvx1.fsf@gmail.com> <87y1h9tphx.fsf@gmail.com> In-Reply-To: <87y1h9tphx.fsf@gmail.com> From: Simon Tournier Date: Thu, 14 Sep 2023 08:12:41 +0200 Message-ID: Subject: Re: bug#65924: git searches coreutils and util-linux commands in PATH To: Maxim Cournoyer Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, On Thu, 14 Sept 2023 at 05:14, Maxim Cournoyer wrote: > > $ guix size git-minimal > > [...] > > total: 147.8 MiB > > > > $ guix size git-minimal util-linux coreutils > > [...] > > total: 195.4 MiB > > > > It increases the size by 33% which is not nothing. :-) [...] > > The question could be: is worth to add 33% for these commands? [...] > References are also found in bin/git in your search, which suggests > perhaps the size of git-minimal is a "lie" (the core package is not > fully functional). Only coreutils is about 165.1 MiB so 12% which is better than 33% but not nothing either; especially if git-mininal becomes an hard dependency of Guix (as proposed in e.g. patch##65866 [1]). Another fix could be that git-minimal does not provide the "git submodule" subcommand for example; or other ones. I have not considered that yet and I am not plainly proposing that; somehow I would like to avoid to have a git-minimal that would not be really "minimal" for features that are not minimalist :-) Cheers, simon 1: [bug#65866] [PATCH 0/8] Add built-in builder for Git checkouts Ludovic Court=C3=A8s Mon, 11 Sep 2023 16:23:42 +0200 id:cover.1694441830.git.ludo@gnu.org https://issues.guix.gnu.org//65866 https://issues.guix.gnu.org/msgid/cover.1694441830.git.ludo@gnu.org https://yhetil.org/guix/cover.1694441830.git.ludo@gnu.org From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 12:06:41 2023 Received: (at control) by debbugs.gnu.org; 4 Oct 2023 16:06:41 +0000 Received: from localhost ([127.0.0.1]:45155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo4OX-0001Qt-F6 for submit@debbugs.gnu.org; Wed, 04 Oct 2023 12:06:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo4OW-0001Qb-KG for control@debbugs.gnu.org; Wed, 04 Oct 2023 12:06:41 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qo4O9-0000as-Ko for control@debbugs.gnu.org; Wed, 04 Oct 2023 12:06:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:Subject:From:To:Date:in-reply-to: references; bh=u9UwtMP2zzQ0Z/s/98jKNUIyeqRp4kMqliowVoMAb5A=; b=JlRaCaKrDIP6fV rmNJZPiKUIqkC/LTulUar1MXpZMLkTfWHR9ANOlzPUbhilqSdIAf8+VfTu2R5OLx7W+ks3RbMM8H9 ZBhZfu9o/yKX17vZ1IoLTxXnlOETdOqoE/s4d/ke7SBuQG4+apcZ+2KplfGSFAl3976+vmdSeOR6+ iYIxFeVMAPCbswUlE0VcZ5H3NmRgFis8PMCZfXKi57ImrZ1dejDrZwhUp/GgFbnS/GcoLESOabG/k 8XDqXNNdbGzqRKVPllFHkKi05y0VuD+kVNIIIkegX4vl2NgVSN73gFP9aUEaY0sSSQgVY97WtS92h DtQ+IQMY/qvA+Cbjl24A==; Date: Wed, 04 Oct 2023 18:06:15 +0200 Message-Id: <87jzs2bceg.fsf@gnu.org> To: control@debbugs.gnu.org From: =?utf-8?Q?Ludovic_Court=C3=A8s?= Subject: control message for bug #65924 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) severity 65924 important quit From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 12:06:58 2023 Received: (at control) by debbugs.gnu.org; 4 Oct 2023 16:06:58 +0000 Received: from localhost ([127.0.0.1]:45161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo4On-0001Rj-VQ for submit@debbugs.gnu.org; Wed, 04 Oct 2023 12:06:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52432) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo4Om-0001RQ-Ph for control@debbugs.gnu.org; Wed, 04 Oct 2023 12:06:57 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qo4OP-0000cX-Py for control@debbugs.gnu.org; Wed, 04 Oct 2023 12:06:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:Subject:From:To:Date:in-reply-to: references; bh=zi3uxx8sLodvCIsvQGhS9mlSnjo36E0HOcc6BiSM9fM=; b=p8gYiJfP62Fb0q oMhRzL+vQekvLh8un1C7/Ck1qyhTV4avt5suwsJUCwBuWhBrohdxsA7yroL7Jxq6rJ7nPfon6Y0MO B7ixzGG9h53Fble3ckKsbMtl/z4XIdeJKS5v9GGsKy4SR9ZWBn0hhYo3BKf/CaYP41Nb0nFh1LmlD crZuStMghyAU1h4efufQx4GLCCKISOjBoBxizNkSj5x0ab8v5jrXQE84s4q8mCP6wj7v8PiLmAaSw aZhjTQRCykMFWfK/ualez3QTZZBYsxSoKxcwjBEkjKAJE/x3uYjd/wxtX7xkGNdIwnCIIpyF8nHjq n7KvK8CfkGkIPZeK0ctQ==; Date: Wed, 04 Oct 2023 18:06:32 +0200 Message-Id: <87il7mbcdz.fsf@gnu.org> To: control@debbugs.gnu.org From: =?utf-8?Q?Ludovic_Court=C3=A8s?= Subject: control message for bug #65924 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) merge 65924 66305 quit From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 12:13:41 2023 Received: (at control) by debbugs.gnu.org; 4 Oct 2023 16:13:41 +0000 Received: from localhost ([127.0.0.1]:45169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo4VI-0001ml-Rk for submit@debbugs.gnu.org; Wed, 04 Oct 2023 12:13:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo4VH-0001mE-09 for control@debbugs.gnu.org; Wed, 04 Oct 2023 12:13:39 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qo4Ut-0001YN-Ek for control@debbugs.gnu.org; Wed, 04 Oct 2023 12:13:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:Subject:From:To:Date:in-reply-to: references; bh=1iKSDMx0iYvWVkWkveWK+2WIvxyACa4O5QOaQzEbxl8=; b=PK3t9ybym7bpP7 oijxIzvNjVnGugh+sTX0rfC5dVVWQRDflL6Q9eJwtz4cphw7nsGPhklyQE19Ye/3dazL6ZwrW3Kwj tw6XEm2OxmglhQ79ySqUwU7P+paUxyKH3hr1ofkfOX1hig9o3PP6ruMjbtl2sc/X/MkwkzXN6QD7h dgTM+RH5SnPQd7VYWsJOqV5gUQnCG7S/q+4J+APDwkoTtlWG2QxhWsfdbh82cztw3Nz6Td9mT15Nr yL5kX3gzij9Hdmfobe3m4aJXTxFNGxalCVaQZGu+UPrNdaeG9XY4+gSaqkgJ1PO3HELX8jlww1g5a QG3UGtrGqEoqBpZ214jg==; Date: Wed, 04 Oct 2023 18:13:05 +0200 Message-Id: <87bkdebc32.fsf@gnu.org> To: control@debbugs.gnu.org From: =?utf-8?Q?Ludovic_Court=C3=A8s?= Subject: control message for bug #65924 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) unmerge 65924 quit From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 12:15:19 2023 Received: (at 65924) by debbugs.gnu.org; 4 Oct 2023 16:15:19 +0000 Received: from localhost ([127.0.0.1]:45174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo4Wt-0002sM-7f for submit@debbugs.gnu.org; Wed, 04 Oct 2023 12:15:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo4Wr-0002T5-Lm for 65924@debbugs.gnu.org; Wed, 04 Oct 2023 12:15:17 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qo4WT-0001mG-JH; Wed, 04 Oct 2023 12:14:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=yc/Low5DCcSw1HLSW8tFVCsphPBGz7Dt1euuYMeUeUE=; b=ZgDRaG3A1FNYgpZ19oKL tn9xgGEI/AF0NJ+mDpDUIHzxC0u9p26L15yj4qfAR2hOkRH4OpEHPRFTFUl6Qbzy14awXR+bqp0Jw HgQMHHw1tPn4UHrsGoK6FpS9EVX7LMueCaqlo3K033iYX+skQVlIGSoMPkVMtv5hzmpufmPYi3qvN vEEBc4sQILSG9Fusosvf79emUmYhBrEA1ZHK+VYPnyGBKBEoYRWcuIPtdcK3tlHMsuBQImz/txuxu vBltEDHb5FKKR+//emsJ79sCZI/bnWdrecW1KI7kdphLaa0sEN7DbzDYe16l7CqlAbw2WUCRfP8qY X5zmrNsyxEgC4w==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Maxim Cournoyer Subject: Re: bug#65924: git searches coreutils and util-linux commands in PATH In-Reply-To: <87fs3iuf6e.fsf@gmail.com> (Maxim Cournoyer's message of "Wed, 13 Sep 2023 14:00:09 -0400") References: <87fs3iuf6e.fsf@gmail.com> Date: Wed, 04 Oct 2023 18:14:27 +0200 Message-ID: <877co2bc0s.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Maxim Cournoyer skribis: > Attempting to use git-minimal in a --pure environment, I stumbled upon: > > /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-= submodule: line 7: basename: command not found > /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-= submodule: line 7: sed: command not found > /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-= sh-setup: line 77: basename: command not found > /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-= sh-setup: line 77: sed: command not found > /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-= sh-setup: line 292: uname: command not found > /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-= submodule: line 613: sed: command not found > /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-= submodule: line 613: cmd_: command not found > =E2=98=92 git clone exited 127 > > The 'git' command should be wrapped to include these in its PATH. I think we should add coreutils-minimal and sed (or gash-utils?) to the =E2=80=98git-submodule=E2=80=99 wrapper that already exists. Closure size is a concern, as Simon notes. Longer-term we should make coreutils-minimal more minimal, perhaps by stripping it of l10n data. But first: let=E2=80=99s fix this so we can address . Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 13:57:42 2023 Received: (at 65924) by debbugs.gnu.org; 4 Oct 2023 17:57:42 +0000 Received: from localhost ([127.0.0.1]:45276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo67y-0001uT-1Y for submit@debbugs.gnu.org; Wed, 04 Oct 2023 13:57:42 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:39219) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo67u-0001tj-8B for 65924@debbugs.gnu.org; Wed, 04 Oct 2023 13:57:38 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-406553f6976so147815e9.1 for <65924@debbugs.gnu.org>; Wed, 04 Oct 2023 10:57:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696442235; x=1697047035; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=8KqnjQeYeN+PosspYetjCDy1bt6DvZ8c5tHfa5EgEs8=; b=hCmcT7qN7ckLe9vwEtzGrZeqempadcIWnO5DVD7/fn0TImLliupqm2xSHZ7PkpMsi0 mOZ72uhL+Qq1cc2J4bbZtwTOMQxjlk0pQX6f4gqw2HgepeiAxq2VndDu7bTqkfdu3dJL 8KZDnANbeXC8JCOl8gvkCZcWdJTJheSIqTuz7VSNE7BoPb3wiPszJa02wy8qR1kO/Q+A 9iw2ISlqd7/iBB2Wws9KHV3AMw+nqwBxqQ+G3/xioLubBOJhO2GRrOYGGl+jAGIY4iSv loxYY837BiI3y+R5V5PLgLCgOoycQxWYpajtEpneJhbHkagph9PZGlnOT/UQLyycowcr fFKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696442235; x=1697047035; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8KqnjQeYeN+PosspYetjCDy1bt6DvZ8c5tHfa5EgEs8=; b=Tva3NKn9KgSvx8cXBjK2rlS/CyBLbW7IVIAdvdgQ2XAcX9mBikop27frlYsQsGSCh6 vKs1GkHzPAT+J8VBRGxSp/lr7YopwxXsb6Uqk6VJ178eEnym6OALX2yrCwSd/d0Uj5Di FuJk8xkdyluiqZhqBKUfdOqPMIUlTmjCeiILFuX2ZcLQHeqSi5AfGzMKAq16LY9NrlG5 U1wGQlW2nh0Y/OAX076/kPgBJoJ1SZlwK6ir3kx8Co1KrHRw6bECJTXA0yyr/SKA1NQX JSIAsS8IvoyUkFTiEvG9SwWb5KCaRQBxFGT8VXyI+Vh/fr7edUszOPkpYr9C9N8+djaS hqZQ== X-Gm-Message-State: AOJu0Yz7Fqb6LyNPw8iAQ9+mu/ECzOqzwqkSjCu9M1rE76PVjyBX0D+Z AAuWr69fOYh1Ys3Lw9dnoegZbq2b6hg= X-Google-Smtp-Source: AGHT+IH4mOtwPzPtnDo4XRUaBT2D//hEnRJPu0Q6BeYLLbwDnktHXv5aGidTL2HJKH/bfS2tX+0PTQ== X-Received: by 2002:a05:600c:5114:b0:405:4127:f471 with SMTP id o20-20020a05600c511400b004054127f471mr3036437wms.1.1696442234857; Wed, 04 Oct 2023 10:57:14 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id t24-20020a7bc3d8000000b004042dbb8925sm2056341wmj.38.2023.10.04.10.57.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 10:57:14 -0700 (PDT) From: Simon Tournier To: Ludovic =?utf-8?Q?Court=C3=A8s?= , Maxim Cournoyer Subject: Re: bug#65924: git searches coreutils and util-linux commands in PATH In-Reply-To: <877co2bc0s.fsf@gnu.org> References: <87fs3iuf6e.fsf@gmail.com> <877co2bc0s.fsf@gnu.org> Date: Wed, 04 Oct 2023 18:52:00 +0200 Message-ID: <87bkde1gb3.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, On Wed, 04 Oct 2023 at 18:14, Ludovic Court=C3=A8s wrote: > I think we should add coreutils-minimal and sed (or gash-utils?) to the > =E2=80=98git-submodule=E2=80=99 wrapper that already exists. Yes, for now it is seems the way forward for fixing the current #66305. It is an increase of git-minimal about ~12%. > Closure size is a concern, as Simon notes. Longer-term we should make > coreutils-minimal more minimal, perhaps by stripping it of l10n data. About gash-utils, well currently broken so=E2=80=A6 https://ci.guix.gnu.org/build/2072492/details And it would drag Guile in the picture, no? And =E2=80=99sed=E2=80=99 seem= s an order more minimalist than Guile, no? For sure, more git-minimal is, happier people will be. Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 04 23:42:13 2023 Received: (at 65924) by debbugs.gnu.org; 5 Oct 2023 03:42:13 +0000 Received: from localhost ([127.0.0.1]:45659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoFFc-00072H-Tn for submit@debbugs.gnu.org; Wed, 04 Oct 2023 23:42:13 -0400 Received: from mail-qk1-x733.google.com ([2607:f8b0:4864:20::733]:61677) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoFFZ-000723-W5 for 65924@debbugs.gnu.org; Wed, 04 Oct 2023 23:42:10 -0400 Received: by mail-qk1-x733.google.com with SMTP id af79cd13be357-7743448d88eso33060085a.2 for <65924@debbugs.gnu.org>; Wed, 04 Oct 2023 20:41:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696477306; x=1697082106; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=AP35Fh1WdMEDjkqusdWITdcC3x8wrWCu8zuGnkb2Lpw=; b=jsrv3EJrO0ktcqUfF7gvZ6Xy32HsVZwrFKSyrk/EAktTImrvgFKqkSL7oUiVZ8OEWL ZEtcVLGW0X9KDLgKwlDtYds0b6j9oo8VmKvOWt1rdUYSQYMc6bakxkI4l+X5EZKni/86 aAsLf4cgX+d0/ASPNfch5pNV4vxLtfb8ZypiEdWF+VWTpFelwaKrPeAzZ/wyh4PL166H xg/LCt1CKJp7TpsuLniaXqfK9+0FBZPBC/CggJ23nvnoaUKhC2tdiw95y2CPjmGxJbjU KbOq765LY65rXK8aYZvfM8g3nG40hbP0llSJWZuZSKtsmICtVPoDGEsQEtBHhTlAMaeP lnrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696477306; x=1697082106; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=AP35Fh1WdMEDjkqusdWITdcC3x8wrWCu8zuGnkb2Lpw=; b=ghmMU7hoGDTne9i0tOPKJRZmTHicM2ImmghP/GeRIgEy1k7BFIVuGSqGVMKSf9lpq1 26aPvL5b4XpD/u2tN9OBmwYh84bpbu8YHpE15+0Rndo/etA2IDRVJfODzjgHV9zjELkA ukE1onbbqXkmORNyWzI5n7yaupllvs44w/ZYl3NUEcmd6GcRRg6odx4VQ5Qw6UwCq72a pRGmq/Z9+Wm6ww2TaaB0Sxd9lKIGQQY1rAYzPd8xAvbQKFFZSY1cRI77zZ8CQlBeqoh6 +kYU1O5tASCA6DfeAuw+EpIUod5Xd/kBjQ+fMhXT6BifySnDYNbQv2oWvrbMJHa9RBKZ tvcQ== X-Gm-Message-State: AOJu0YxXO0OCkzotO1nX9YUBnX9q4eq+NIp6rDzN1dtQ7Xno1MXObPrp Fev+9kch3ZRy/rCM7V7vYqRTKPqS7I2z0g== X-Google-Smtp-Source: AGHT+IE3ygBtgg5KRPLHlJcQskaUFzlE8t9wS0krIbBxVPcQK59pAKdyoD6LLsYVPm1RwmgxSq8dmw== X-Received: by 2002:a05:620a:2a0f:b0:775:cdb3:c7f9 with SMTP id o15-20020a05620a2a0f00b00775cdb3c7f9mr3760780qkp.53.1696477306090; Wed, 04 Oct 2023 20:41:46 -0700 (PDT) Received: from hurd (dsl-141-24.b2b2c.ca. [66.158.141.24]) by smtp.gmail.com with ESMTPSA id h1-20020a05620a10a100b007759e9b0eb8sm200295qkk.99.2023.10.04.20.41.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 20:41:45 -0700 (PDT) From: Maxim Cournoyer To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#65924: git searches coreutils and util-linux commands in PATH References: <87fs3iuf6e.fsf@gmail.com> <877co2bc0s.fsf@gnu.org> Date: Wed, 04 Oct 2023 23:41:43 -0400 In-Reply-To: <877co2bc0s.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Wed, 04 Oct 2023 18:14:27 +0200") Message-ID: <87r0m920so.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Ludovic, Ludovic Court=C3=A8s writes: > Hi, > > Maxim Cournoyer skribis: > >> Attempting to use git-minimal in a --pure environment, I stumbled upon: >> >> /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git= -submodule: >> line 7: basename: command not found >> /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git= -submodule: >> line 7: sed: command not found >> /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git= -sh-setup: >> line 77: basename: command not found >> /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git= -sh-setup: >> line 77: sed: command not found >> /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git= -sh-setup: >> line 292: uname: command not found >> /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git= -submodule: >> line 613: sed: command not found >> /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git= -submodule: >> line 613: cmd_: command not found >> =E2=98=92 git clone exited 127 >> >> The 'git' command should be wrapped to include these in its PATH. > > I think we should add coreutils-minimal and sed (or gash-utils?) to the > =E2=80=98git-submodule=E2=80=99 wrapper that already exists. That should work for the use case at hand, but we should scan the source for occurrences of the tools to see if other git commands need to be wrapped as well. This doesn't also cover 'uname' from my report, which should be looked into as well (when is it needed? is it a fatal error if it's missing? etc.) --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 06 04:18:55 2023 Received: (at 65924) by debbugs.gnu.org; 6 Oct 2023 08:18:56 +0000 Received: from localhost ([127.0.0.1]:49093 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qog2x-0006kX-CX for submit@debbugs.gnu.org; Fri, 06 Oct 2023 04:18:55 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:40258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qog2q-0006js-Em for 65924@debbugs.gnu.org; Fri, 06 Oct 2023 04:18:52 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4053e6e8ca7so5178705e9.1 for <65924@debbugs.gnu.org>; Fri, 06 Oct 2023 01:18:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696580304; x=1697185104; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=hL1j/52nj9viEGq2zBHji8CiKFb+V+44lb59n1U5LnI=; b=JVDL7waXbJeJeHSCxlB2BrD9QfuLm8hW1r5LfvPTPkomsAgZOZnYO8cMolo6dpoxHF seUY4VbrjCz1vslhWBXaBgvoY8fwaqLx/TyGeUrKo5citEWXj4kvdfj37ntMD66U24re +PVrO9s+m402D5D6+hQ9ePxptpajeyB9Jq7Aci2k7QV2su7e9MAe+/pcPZZ0HAMabud9 JiH4q1Mlhmvl1oPm82I5P4zamvCxsCtKDLoj+8654bWIOcB55infn+fyc4qf/V1uCJLH Bu9z3o06PFuprI68TGTpTMvtI/bOW4MtpfIaTfKdJnlL/P3MpxdS8Lplhy41Ot2T1i9M 8WxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696580304; x=1697185104; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hL1j/52nj9viEGq2zBHji8CiKFb+V+44lb59n1U5LnI=; b=Zl/sSXWOkrNtvwYQw74ZJB5EJAvZ7qw2oyoJI51DAfhpfmOtxwfDvLTASsmXNN7lZd n0xZeq2CICeln+E+5D5DUGGJBXjaHZ7llhmVpRYRKzWsajgqnRD4qv8KigpLTmhbUtiZ AcC2Wc6F9wgFqUTzGrZrm3NylTyBVKFtvZg10ls1sVMQ6mbH1gyubpntXODI6+PhTOH1 kxCg7VvgemIlx6moHhm7r+Eieuw2fW5QWHqkAQFmSMHgtyVTef3TudLBtL0KDb+ErzXc Hrp5cG+iWf7kZ6Jt0at4l0Te6BOd64ufpYlVYIA2N3TXlOgWZjMcR7XM+vZM0n6dAyfS yEjg== X-Gm-Message-State: AOJu0YwV0rsfQZjEY8Ct1XFstPwmVCTDeRxdz//ee583tY71XAatj/4w PIdce0N2WFbWhGXHUjgELtLzCgNUcZ4= X-Google-Smtp-Source: AGHT+IG9LJoCKCWmJI0D1eFleAs+ZKv0L+EA7bkQPPfjN3eeY4hjKseJ0saVZyc2NLg4kFGYMoVmRQ== X-Received: by 2002:a05:600c:214f:b0:406:513d:738f with SMTP id v15-20020a05600c214f00b00406513d738fmr6943106wml.2.1696580303655; Fri, 06 Oct 2023 01:18:23 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id y6-20020a1c4b06000000b00405588aa40asm3174357wma.24.2023.10.06.01.18.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 01:18:23 -0700 (PDT) From: Simon Tournier To: Maxim Cournoyer , Ludovic =?utf-8?Q?Court?= =?utf-8?Q?=C3=A8s?= Subject: Re: bug#65924: git searches coreutils and util-linux commands in PATH In-Reply-To: <87r0m920so.fsf@gmail.com> References: <87fs3iuf6e.fsf@gmail.com> <877co2bc0s.fsf@gnu.org> <87r0m920so.fsf@gmail.com> Date: Thu, 05 Oct 2023 18:21:36 +0200 Message-ID: <87pm1tujjj.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.8 (/) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) Hi, On Wed, 04 Oct 2023 at 23:41, Maxim Cournoyer w= rote: >> I think we should add coreutils-minimal and sed (or gash-utils?) to the >> =E2=80=98git-submodule=E2=80=99 wrapper that already exists. > > That should work for the use case at hand, but we should scan the source > for occurrences of the tools to see if other git commands need to be > wrapped as well. This doesn't also cover 'uname' from my report, which > should be looked into as well (when is it needed? is it a fatal error if > it's missing? etc.) Well, =E2=80=99git-submodule=E2=80=99 is just a shell script. It depends o= n: + basename + sed + git-sh-setup which depends on: + basename + sed + uname And all these other subcommands match =E2=80=99git-sh-setup=E2=80=99: Binary: + bin/git + bin/scalar + libexec/git-core/git + libexec/git-core/scalar Scripts: + libexec/git-core/git-filter-branch + libexec/git-core/git-merge-octopus + libexec/git-core/git-merge-one-file + libexec/git-core/git-merge-resolve + libexec/git-core/git-mergetool + libexec/git-core/git-quiltimport + libexec/git-core/git-submodule + libexec/git-core/git-web--browse + libexec/git-core/git-web--browse For instance, libexec/git-core/git-mergetools/emerge or libexec/git-core/git-mergetools/tortoisemerge depends on =E2=80=99basename= =E2=80=99. This =E2=80=99git-sh-setup=E2=80=99 is dragged into the picture by the file =E2=80=99command-list.h=E2=80=99 which basically provides some help. See b= elow. Last, I think =E2=80=99git-sh-setup=E2=80=99 fails if =E2=80=99uname=E2=80= =99 is missing. Cheers, simon --8<---------------cut here---------------start------------->8--- # From Git checkout $ cat git-submodule | grep -n -E '(basename|sed|uname)' 7:dashless=3D$(basename "$0" | sed -e 's/-/ /') 569:# parsed here as well, for backward compatibility. 613:"cmd_$(echo $command | sed -e s/-/_/g)" "$@" $ cat git-sh-setup | grep -n -E '(basename|sed|uname)' 77: dashless=3D$(basename -- "$0" | sed -e 's/-/ /') 181: die "$(eval_gettext "fatal: \$program_name cannot be used without a w= orking tree.")" 188: die "$(eval_gettext "fatal: \$program_name cannot be used without a w= orking tree.")" 230:# Generate a sed script to parse identities from a commit. 264:# Create a pick-script as above and feed it to sed. Stdout is suitable = for 267: LANG=3DC LC_ALL=3DC sed -ne "$(pick_ident_script "$@")" 292:case $(uname -s) in $ find $(guix build git-minimal --no-grafts) -type f -exec grep -nH git-sh-= setup {} \; | sort grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/bin/gi= t: binary file matches grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/bin/sc= alar: binary file matches grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexe= c/git-core/git: binary file matches grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexe= c/git-core/scalar: binary file matches /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-= core/git-filter-branch:109:. git-sh-setup /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-= core/git-merge-octopus:8:. git-sh-setup /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-= core/git-merge-one-file:26:. git-sh-setup /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-= core/git-merge-resolve:8:. git-sh-setup /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-= core/git-mergetool:17:. git-sh-setup /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-= core/git-quiltimport:14:. git-sh-setup /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-= core/git-submodule:22:. git-sh-setup /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-= core/git-web--browse:22:# the vanilla git-sh-setup should not be used. /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-= core/git-web--browse:24:. git-sh-setup $ find . -type f -name "*.[ch]" -exec grep -nH git-sh-setup {} \; ./command-list.h:171: { "git-sh-setup", N_("Common Git shell script setup c= ode"), 0 | CAT_purehelpers }, $ find . -type f -name "*.o" -exec grep -nH git-sh-setup {} \; grep: ./help.o: binary file matches $ grep git-sh-setup git grep: git: binary file matches $ grep -B 5 -A 10 -n uname $(guix build git-minimal --no-grafts)/libexec/gi= t-core/git-sh-setup 287- expr $sz0 \< $sz1 \* 2 >/dev/null || : >"$1" 288-} 289- 290- 291-# Platform specific tweaks to work around some commands 292:case $(uname -s) in 293-*MINGW*) 294- # Windows has its own (incompatible) sort and find 295- sort () { 296- /usr/bin/sort "$@" 297- } 298- find () { 299- /usr/bin/find "$@" 300- } 301- # git sees Windows-style pwd 302- pwd () { --8<---------------cut here---------------end--------------->8--- From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 07 23:19:52 2023 Received: (at 65924) by debbugs.gnu.org; 8 Oct 2023 03:19:52 +0000 Received: from localhost ([127.0.0.1]:56092 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpKKe-0001XS-3Y for submit@debbugs.gnu.org; Sat, 07 Oct 2023 23:19:52 -0400 Received: from mail-qv1-xf33.google.com ([2607:f8b0:4864:20::f33]:50252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpKKc-0001XF-3I for 65924@debbugs.gnu.org; Sat, 07 Oct 2023 23:19:50 -0400 Received: by mail-qv1-xf33.google.com with SMTP id 6a1803df08f44-65d0da28fa8so20799676d6.0 for <65924@debbugs.gnu.org>; Sat, 07 Oct 2023 20:19:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696735164; x=1697339964; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=aeOLKoGAcCJ/VJa6llOsOLLi0qZLD+2M77shnS4QL8w=; b=Q5AOeG0AbVlxfcgSnlTK86JCcvTdmb+pIvQY6cWxTjzzjzci7D3hbEIqXdkPcpvYc4 nYCjseu0W1cirWgvJWaQg6XfyFpDkXAudnRz+neAddN9lVdyRydWH842JF7vFfuaJx// M3n+65oc2/uUcaqYIgGqu7y2UPoo6wBiEVCBvBm7AB5HYb+YHTnS8tfyP9QfyjOt1Bl7 zknBX0asUM5H/HIdh5yLccL+eRmHWGFT7Ed6eny06P/e858zf0kLAdwxk7hnKkoYupkB RB2QXTeG3Ll1Q3JW++9bKnpK9FK5vbnwjSNkMDsNqhXAPE6BA9Acs6t19CAMM0raEqE2 HexQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696735164; x=1697339964; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=aeOLKoGAcCJ/VJa6llOsOLLi0qZLD+2M77shnS4QL8w=; b=ebbNJwRJC6FoyqRym8vmR+u8OcycfsC6dcTppZ2HCRrtssCp/gxKxwBJrjXtE2CVb0 yX132/lUxX1XYo0my78TGxl4elbzKqDGJdENX7KYf6uo0iufcNP2jLYEqd2bZQ5+6V77 3B6zp7d6+ZLRsDY1O3TmqUn5c+xqQq3ZNJ2KMbSD9l8lfduQhE/bdPM2tyNYX0hT/4PM RSYJcYhSmMse6KxHHzjUYVhCDBiQFNvjoOW9TzQbipZm5Is9aW7xzZuIfm39khQh8tA/ 6/mG+avRVK4tvFu2UgOIH6tPWwLKpJCZrAg9tUdG7t6I7VdtjszOLPKDsd5WUgwZ4GE9 6YKA== X-Gm-Message-State: AOJu0YzUkgZGH8l7z+qeDUH3Z0Uz16mncmaogmas9seeF0lpnkR3DOzY K7Pk41Vx1Iv6dIur1aEq3BOx7Kygmic= X-Google-Smtp-Source: AGHT+IGU7ykgxVsUj5bk0hig6OB4596OZpp1a4BE/vxh09F6qP5fOjJEAHcP1NGmz3iXezAdv/SlyA== X-Received: by 2002:a0c:dd90:0:b0:63d:657:4cb9 with SMTP id v16-20020a0cdd90000000b0063d06574cb9mr12818982qvk.42.1696735164523; Sat, 07 Oct 2023 20:19:24 -0700 (PDT) Received: from localhost.localdomain (dsl-158-21.b2b2c.ca. [66.158.158.21]) by smtp.gmail.com with ESMTPSA id o10-20020a0cf4ca000000b0065b129ec0e8sm2748304qvm.57.2023.10.07.20.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Oct 2023 20:19:23 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 0/3] Fix 'git submodule' in pure environments. Date: Sat, 7 Oct 2023 23:18:46 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , Simon Tournier , Ludovic Courtès Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Can be tested with something like: $ ./pre-inst-env guix shell -CN nss-certs git-minimal -- \ git clone --recursive https://git.jami.net/savoirfairelinux/jami-client-qt.git /tmp/jami Maxim Cournoyer (3): gnu: git: Remove labels and use gexps. gnu: git: Invert inheritance relationship. gnu: git-minimal: Add coreutils and sed to PATH. gnu/packages/version-control.scm | 884 ++++++++++++++++--------------- 1 file changed, 466 insertions(+), 418 deletions(-) base-commit: c2b224658ccb52b4541c79016cec55a47aef32fc -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 07 23:20:21 2023 Received: (at 65924) by debbugs.gnu.org; 8 Oct 2023 03:20:21 +0000 Received: from localhost ([127.0.0.1]:56097 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpKL5-0001YY-GE for submit@debbugs.gnu.org; Sat, 07 Oct 2023 23:20:21 -0400 Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]:62718) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpKL0-0001YH-CM for 65924@debbugs.gnu.org; Sat, 07 Oct 2023 23:20:18 -0400 Received: by mail-qv1-xf30.google.com with SMTP id 6a1803df08f44-66b024d26e2so12642606d6.0 for <65924@debbugs.gnu.org>; Sat, 07 Oct 2023 20:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696735189; x=1697339989; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YkFIbHwHJdjNoqs31ZCH2JoTHStLNwgNddUMWDELWJQ=; b=D7hsdNgik7k9OFkqpfQ8/SE3hKx7TW0xc2A5qoA4ruJ9m4F6MRCXxknMhBGJoDBBBl Gznkv2xJs8AJtHcnQCKR0vlB6abHVvRmVJTEnwUT/ZE9QmFEd1XUZEBo/bRkznnuSEtf NEIkfii95dfmVDz1XH5xps1fyEVB6jvNI31bHrjEavAg+qQRjiqMaW6mU1vSfJXZ2Tvo y6yHsuv7hox4bk4R5cGb2S7Ewrtwz/5iX8kzIsYOtXw97C5byzBjNeKcpemJKiq4MLZR G4ol2q9bC0qJab5eaaX2uMmzPBiOMESn2RAwbs/zUHhW8GOk+z3SamOdy7Ip3kBV7Pq5 3w/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696735189; x=1697339989; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YkFIbHwHJdjNoqs31ZCH2JoTHStLNwgNddUMWDELWJQ=; b=jiR50Q/pu6NL/cBDEIRhVuYmFigoJM5S+w/+gZaHlqafI3yZgQKVgR4YWMXPe8qE2z Wkr313uQaWJMrBpkCP4FXKzboMeuCf/ltJiNl3gdvyKKIPM3gHGH6kO65yvXcXs3kwGM J+T0n5poWuliN8oSBMouXOMYt9ecxHW89+Va77ZbXKnJgijgsAZpnQ3YsrXB7u6bKGKr 32LuNW8A6+mqYzJdQgkHerT9rZ5QzkhTs5QITXZnnHcKFy7+NZZq6FnB34XP/1xk8Hle vYl9KssNd/9M0nHcGpGiwT9uwvNNdxBvnwtHSE6+7VUu4QeFJrdpsV7NTJZ9Wr0kTItS 8lTA== X-Gm-Message-State: AOJu0Yy5WT6Yy6XQ0kj+Bez+LPDAKv+OaBueAXIq5rcbGqPx/8P9pHnH yysEtOfyuLeL3Di31/xH9y+GBnaYOR0= X-Google-Smtp-Source: AGHT+IHB8xGDvbIYxnSOqc86AQ+76iEm0XuWXYJIuzCPgc4A3F9W88p2xiSrrG4qLNEG06LEGIqd6w== X-Received: by 2002:a0c:aadc:0:b0:65b:92c:3eee with SMTP id g28-20020a0caadc000000b0065b092c3eeemr15084689qvb.15.1696735188417; Sat, 07 Oct 2023 20:19:48 -0700 (PDT) Received: from localhost.localdomain (dsl-158-21.b2b2c.ca. [66.158.158.21]) by smtp.gmail.com with ESMTPSA id o10-20020a0cf4ca000000b0065b129ec0e8sm2748304qvm.57.2023.10.07.20.19.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Oct 2023 20:19:48 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 1/3] gnu: git: Remove labels and use gexps. Date: Sat, 7 Oct 2023 23:18:49 -0400 Message-ID: <1090d01a7ba277090c84cf66bc7bfaf22521f0e3.1696734901.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , Simon Tournier , Ludovic Courtès Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/version-control.scm (git) [native-inputs, inputs]: Remove labels. [arguments]: Use gexps. Use gexp variables input searching procedures where it makes sense. --- gnu/packages/version-control.scm | 706 ++++++++++++++++--------------- 1 file changed, 360 insertions(+), 346 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d9c53af71c..7a3c17efd8 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -230,358 +230,373 @@ (define git-cross-configure-flags (define-public git (package - (name "git") - (version "2.41.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://kernel.org/software/scm/git/git-" - version ".tar.xz")) - (sha256 - (base32 - "0h40arw08xbpi2cbf7pvc947v963rjxz3inb2ar81zjc8byvlj77")))) - (build-system gnu-build-system) - (native-inputs - `(("native-perl" ,perl) - ;; Add bash-minimal explicitly to ensure it comes before bash-for-tests, - ;; see . - ("bash" ,bash-minimal) - ("bash-for-tests" ,bash) - ("gettext" ,gettext-minimal) - ;; To build the man pages from the git sources, we would need a dependency - ;; on a full XML tool chain, and building it actually takes ages. So we - ;; use this lazy approach and use released tarball. - ("git-manpages" - ,(origin - (method url-fetch) - (uri (string-append - "mirror://kernel.org/software/scm/git/git-manpages-" - version ".tar.xz")) - (sha256 - (base32 - "0xsqakgy0s60zpa13ilj6zj420kdh8pf4v3nrp1nziwj8ja4qymw")))) - ;; For subtree documentation. - ("asciidoc" ,asciidoc) - ("docbook2x" ,docbook2x) - ("docbook-xsl" ,docbook-xsl) - ("libxslt" ,libxslt) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo) - ("xmlto" ,xmlto))) - (inputs - `(("curl" ,curl) - ("expat" ,expat) - ("openssl" ,openssl) - ("perl" ,perl) - ("python" ,python) ; for git-p4 - ("zlib" ,zlib) - - ;; For PCRE support in git grep (USE_LIBPCRE2). - ("pcre" ,pcre2) - - ;; For 'gitweb.cgi'. - ("perl-cgi" ,perl-cgi) - - ;; For 'git-svn'. - ("subversion" ,subversion) - ("perl-term-readkey" ,perl-term-readkey) - - ;; For 'git-send-email'. - ("perl-authen-sasl" ,perl-authen-sasl) - ("perl-net-smtp-ssl" ,perl-net-smtp-ssl) - ("perl-io-socket-ssl" ,perl-io-socket-ssl) - - ;; For 'git gui', 'gitk', and 'git citool'. - ("tcl" ,tcl) - ("tk" ,tk) - - ;; For 'git-credential-libsecret' - ("glib" ,glib) - ("libsecret" ,libsecret))) - (outputs '("out" ; the core - "send-email" ; for git-send-email - "svn" ; git-svn - "credential-netrc" ; git-credential-netrc - "credential-libsecret" ; git-credential-libsecret - "subtree" ; git-subtree - "gui")) ; gitk, git gui - (arguments - `(#:make-flags `("V=1" ;more verbose compilation + (name "git") + (version "2.41.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kernel.org/software/scm/git/git-" + version ".tar.xz")) + (sha256 + (base32 + "0h40arw08xbpi2cbf7pvc947v963rjxz3inb2ar81zjc8byvlj77")))) + (build-system gnu-build-system) + (native-inputs + (list perl + ;; Add bash-minimal explicitly to ensure it comes before bash-for-tests, + ;; see . + bash-minimal + bash + gettext-minimal + ;; For subtree documentation. + asciidoc + docbook2x + docbook-xsl + libxslt + pkg-config + texinfo + xmlto)) + (inputs + (list curl + expat + openssl + perl + python ;for git-p4 + zlib - ,(string-append "SHELL_PATH=" - (assoc-ref %build-inputs "bash") - "/bin/sh") + ;; For PCRE support in git grep (USE_LIBPCRE2). + pcre2 - ;; Tests require a bash with completion support. - ,(string-append "TEST_SHELL_PATH=" - (assoc-ref %build-inputs "bash-for-tests") - "/bin/bash") + ;; For 'gitweb.cgi'. + perl-cgi - "USE_LIBPCRE2=yes" + ;; For 'git-svn'. + subversion + perl-term-readkey + + ;; For 'git-send-email'. + perl-authen-sasl + perl-net-smtp-ssl + perl-io-socket-ssl + + ;; For 'git gui', 'gitk', and 'git citool'. + tcl + tk + + ;; For 'git-credential-libsecret' + glib + libsecret)) + (outputs '("out" ;the core + "send-email" ;for git-send-email + "svn" ;git-svn + "credential-netrc" ;git-credential-netrc + "credential-libsecret" ;git-credential-libsecret + "subtree" ;git-subtree + "gui")) ;gitk, git gui + (arguments + (list + #:make-flags + #~(list "V=1" ;more verbose compilation + (string-append "SHELL_PATH=" + #$(this-package-native-input "bash-minimal") + "/bin/sh") - ;; By default 'make install' creates hard links for - ;; things in 'libexec/git-core', which leads to huge - ;; nars; see . - "NO_INSTALL_HARDLINKS=indeed") + ;; Tests require a bash with completion support. + (string-append "TEST_SHELL_PATH=" + #$(this-package-native-input "bash") + "/bin/bash") - ;; Make sure the full bash does not end up in the final closure. - #:disallowed-references (,bash) + "USE_LIBPCRE2=yes" - #:test-target "test" + ;; By default 'make install' creates hard links for + ;; things in 'libexec/git-core', which leads to huge + ;; nars; see . + "NO_INSTALL_HARDLINKS=indeed") + + ;; Make sure the full bash does not end up in the final closure. + #:disallowed-references (list bash) - ;; The explicit --with-tcltk forces the build system to hardcode the - ;; absolute file name to 'wish'. - #:configure-flags (list (string-append "--with-tcltk=" - (assoc-ref %build-inputs "tk") - "/bin/wish8.6") ; XXX - ,@(if (%current-target-system) - git-cross-configure-flags - '())) + #:test-target "test" - #:modules ((srfi srfi-1) + ;; The explicit --with-tcltk forces the build system to hardcode the + ;; absolute file name to 'wish'. + #:configure-flags + #~(list (string-append "--with-tcltk=" + (search-input-file %build-inputs + "bin/wish8.6")) + #$@(if (%current-target-system) + git-cross-configure-flags + #~())) + + #:modules `((srfi srfi-1) (srfi srfi-26) ((guix build gnu-build-system) #:prefix gnu:) ,@%gnu-build-system-modules) - #:phases - (modify-phases %standard-phases - ,@(if (%current-target-system) - ;; The git build system assumes build == host - `((add-after 'unpack 'use-host-uname_S - (lambda _ - (substitute* "config.mak.uname" - (("uname_S := .*" all) - (if (equal? ,(%current-target-system) "i586-pc-gnu") - "uname_S := GNU\n" - all)))))) - ;; We do not have bash-for-tests when cross-compiling. - `((add-after 'unpack 'modify-PATH - (lambda* (#:key inputs #:allow-other-keys) - (let ((path (string-split (getenv "PATH") #\:)) - (bash-full (assoc-ref inputs "bash-for-tests"))) - ;; Drop the test bash from PATH so that (which "sh") and - ;; similar does the right thing. - (setenv "PATH" (string-join - (remove (cut string-prefix? bash-full <>) path) - ":"))))))) - ;; Add cross curl-config script to PATH when cross-compiling. - ,@(if (%current-target-system) - '((add-before 'configure 'add-cross-curl-config - (lambda* (#:key inputs #:allow-other-keys) - (setenv "PATH" - (string-append (assoc-ref inputs "curl") "/bin:" - (getenv "PATH")))))) - '()) - (add-after 'configure 'patch-makefiles - (lambda _ - (substitute* "Makefile" - (("/usr/bin/perl") (which "perl")) - (("/usr/bin/python") (which "python3"))))) - (add-after 'configure 'add-PM.stamp - (lambda _ - ;; Add the "PM.stamp" to avoid "no rule to make target". - (call-with-output-file "perl/PM.stamp" (const #t)))) - (add-after 'build 'build-subtree - (lambda* (#:key inputs #:allow-other-keys) - (with-directory-excursion "contrib/subtree" - (substitute* "Makefile" - ;; Apparently `xmlto' does not bother to looks up the stylesheets - ;; specified in the XML, unlike the above substitution. Instead it - ;; uses a hard-coded URL. Work around it here, but if this is - ;; common perhaps we should hardcode this path in xmlto itself. - (("\\$\\(XMLTO\\) -m \\$\\(MANPAGE_XSL\\)") - (string-append "$(XMLTO) -x " - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl)) - "/manpages/docbook.xsl -m $(MANPAGE_XSL)"))) - (invoke "make") - (invoke "make" "install") - (invoke "make" "install-doc") - (substitute* "git-subtree" - (("/bin/sh") (which "sh")))))) - (add-before 'check 'patch-tests - (lambda _ - (let ((store-directory (%store-directory))) - ;; These files contain some funny bytes that Guile is unable - ;; to decode for shebang patching. Just delete them. - (for-each delete-file '("t/t4201-shortlog.sh" - "t/t7813-grep-icase-iso.sh")) - ;; Many tests contain inline shell scripts (hooks etc). - (substitute* (find-files "t" "\\.sh$") - (("#!/bin/sh") (string-append "#!" (which "sh")))) - ;; Un-do shebang patching here to prevent checksum mismatch. - (substitute* '("t/t4034/perl/pre" "t/t4034/perl/post") - (("^#!.*/bin/perl") "#!/usr/bin/perl")) - (substitute* "t/t5003-archive-zip.sh" - (("cp /bin/sh") (string-append "cp " (which "sh")))) - (substitute* "t/t6030-bisect-porcelain.sh" - (("\"/bin/sh\"") (string-append "\"" (which "sh") "\""))) - ;; FIXME: This test runs `git commit` with a bogus EDITOR - ;; and empty commit message, but does not fail the way it's - ;; expected to. The test passes when invoked interactively. - (substitute* "t/t7508-status.sh" - (("\tcommit_template_commented") "\ttrue")) - ;; More checksum mismatches due to odd shebangs. - (substitute* "t/t9100-git-svn-basic.sh" - (((string-append "\"#!" store-directory ".*/bin/sh")) "\"#!/bin/sh") ) - (substitute* "t/t9300-fast-import.sh" - (((string-append "\t#!" store-directory ".*/bin/sh")) "\t#!/bin/sh") - (((string-append "'#!" store-directory ".*/bin/sh")) "'#!/bin/sh")) - ;; FIXME: Some hooks fail with "basename: command not found". - ;; See 't/trash directory.t9164.../svn-hook.log'. - (delete-file "t/t9164-git-svn-dcommit-concurrent.sh") - - ;; XXX: These tests fail intermittently for unknown reasons: - ;; . - (for-each delete-file - '("t/t9128-git-svn-cmd-branch.sh" - "t/t9167-git-svn-cmd-branch-subproject.sh" - "t/t9141-git-svn-multiple-branches.sh"))))) - (add-after 'install 'install-info-manual - (lambda* (#:key parallel-build? #:allow-other-keys) - (define job-count (if parallel-build? - (number->string (parallel-job-count)) - "1")) - (invoke "make" "-C" "Documentation" "install-info" - "-j" job-count - ;; The Makefile refer to 'docbook2x-texi', but our binary - ;; is named 'docbook2texi'. - "DOCBOOK2X_TEXI=docbook2texi" "PERL_PATH=perl"))) - (add-after 'install 'install-shell-completion - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (completions (string-append out "/etc/bash_completion.d"))) - ;; TODO: Install the tcsh and zsh completions in the right place. - (mkdir-p completions) - (copy-file "contrib/completion/git-completion.bash" - (string-append completions "/git"))))) - (add-after 'install 'install-credential-netrc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((netrc (assoc-ref outputs "credential-netrc"))) - (install-file "contrib/credential/netrc/git-credential-netrc.perl" - (string-append netrc "/bin")) - (rename-file (string-append netrc "/bin/git-credential-netrc.perl") - (string-append netrc "/bin/git-credential-netrc")) - ;; Previously, Git.pm was automatically found by netrc. - ;; Perl 5.26 changed how it locates modules so that @INC no - ;; longer includes the current working directory (the Perl - ;; community calls this "dotless @INC"). - (wrap-program (string-append netrc "/bin/git-credential-netrc") - `("PERL5LIB" ":" prefix - (,(string-append (assoc-ref outputs "out") "/share/perl5"))))))) - (add-after 'install 'install-credential-libsecret - (lambda* (#:key outputs #:allow-other-keys) - (let* ((libsecret (assoc-ref outputs "credential-libsecret"))) - (with-directory-excursion "contrib/credential/libsecret" - ((assoc-ref gnu:%standard-phases 'build)) - (install-file "git-credential-libsecret" - (string-append libsecret "/bin")))))) - (add-after 'install 'install-subtree - (lambda* (#:key outputs #:allow-other-keys) - (let ((subtree (assoc-ref outputs "subtree"))) - (install-file "contrib/subtree/git-subtree" - (string-append subtree "/bin")) - (install-file "contrib/subtree/git-subtree.1" - (string-append subtree "/share/man/man1"))))) - (add-after 'install 'restore-sample-hooks-shebang - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dir (string-append out "/share/git-core/templates/hooks"))) - (for-each (lambda (file) - (format #t "restoring shebang on `~a'~%" file) - (substitute* file - (("^#!.*/bin/sh") "#!/bin/sh"))) - (find-files dir ".*"))))) - (add-after 'install 'split - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Split the binaries to the various outputs. - (let* ((out (assoc-ref outputs "out")) - (se (assoc-ref outputs "send-email")) - (svn (assoc-ref outputs "svn")) - (gui (assoc-ref outputs "gui")) - (gitk (string-append out "/bin/gitk")) - (gitk* (string-append gui "/bin/gitk")) - (git-gui (string-append out "/libexec/git-core/git-gui")) - (git-gui* (string-append gui "/libexec/git-core/git-gui")) - (git-cit (string-append out "/libexec/git-core/git-citool")) - (git-cit* (string-append gui "/libexec/git-core/git-citool")) - (git-se (string-append out "/libexec/git-core/git-send-email")) - (git-se* (string-append se "/libexec/git-core/git-send-email")) - (git-svn (string-append out "/libexec/git-core/git-svn")) - (git-svn* (string-append svn "/libexec/git-core/git-svn")) - (git-sm (string-append out - "/libexec/git-core/git-submodule"))) - (mkdir-p (string-append gui "/bin")) - (mkdir-p (string-append gui "/libexec/git-core")) - (mkdir-p (string-append se "/libexec/git-core")) - (mkdir-p (string-append svn "/libexec/git-core")) - - (for-each (lambda (old new) - (copy-file old new) - (delete-file old) - (chmod new #o555)) - (list gitk git-gui git-cit git-se git-svn) - (list gitk* git-gui* git-cit* git-se* git-svn*)) - - ;; Tell 'git-svn' where Subversion and perl-term-readkey are. - (wrap-program git-svn* - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "subversion") - "/bin"))) - `("PERL5LIB" ":" prefix - ,(map (lambda (i) (string-append (assoc-ref inputs i) - "/lib/perl5/site_perl")) - '("subversion" "perl-term-readkey"))) - - ;; XXX: The .so for SVN/Core.pm lacks a RUNPATH, so - ;; help it find 'libsvn_client-1.so'. - `("LD_LIBRARY_PATH" ":" prefix - (,(string-append (assoc-ref inputs "subversion") - "/lib")))) - - ;; Tell 'git-send-email' where perl modules are. - (wrap-program git-se* - `("PERL5LIB" ":" prefix - ,(map (lambda (o) (string-append o "/lib/perl5/site_perl")) - (list - ,@(transitive-input-references - 'inputs - (map (lambda (l) - (assoc l (package-inputs this-package))) - '("perl-authen-sasl" - "perl-net-smtp-ssl" - "perl-io-socket-ssl"))))))) - - ;; Tell 'gitweb.cgi' where perl modules are. - (wrap-program (string-append out "/share/gitweb/gitweb.cgi") - `("PERL5LIB" ":" prefix - ,(map (lambda (o) (string-append o "/lib/perl5/site_perl")) - (list - ,@(transitive-input-references - 'inputs - (map (lambda (l) - (assoc l (package-inputs this-package))) - '("perl-cgi"))))))) - - ;; Tell 'git-submodule' where Perl is. - (wrap-program git-sm - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "perl") - "/bin"))))))) - (add-after 'split 'install-man-pages - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man (string-append out "/share/man")) - (manpages (assoc-ref inputs "git-manpages"))) - (mkdir-p man) - (with-directory-excursion man - (invoke "tar" "xvf" manpages))))) - ,@(if (system-hurd?) - '((add-after 'unpack 'delete-tests/hurd - (lambda _ - (delete-file "t/t0052-simple-ipc.sh") - (delete-file "t/t5562-http-backend-content-length.sh") - (delete-file "t/t9902-completion.sh")))) - '())))) + #:phases + #~(modify-phases %standard-phases + #$@(if (%current-target-system) + ;; The git build system assumes build == host + #~((add-after 'unpack 'use-host-uname_S + (lambda _ + (substitute* "config.mak.uname" + (("uname_S := .*" all) + (if (equal? #$(%current-target-system) "i586-pc-gnu") + "uname_S := GNU\n" + all)))))) + ;; We do not have a full bash when cross-compiling. + #~((add-after 'unpack 'modify-PATH + (lambda* (#:key inputs #:allow-other-keys) + (let ((path (string-split (getenv "PATH") #\:)) + (bash-full #$(this-package-native-input "bash"))) + ;; Drop the test bash from PATH so that (which "sh") + ;; and similar does the right thing. + (setenv "PATH" + (string-join + (remove (cut string-prefix? bash-full <>) + path) + ":"))))))) + ;; Add cross curl-config script to PATH when cross-compiling. + #$@(if (%current-target-system) + #~((add-before 'configure 'add-cross-curl-config + (lambda* (#:key inputs #:allow-other-keys) + (setenv "PATH" + (string-append + (dirname (search-input-file + inputs "bin/curl-config")) + ":" (getenv "PATH")))))) + #~()) + (add-after 'configure 'patch-makefiles + (lambda _ + (substitute* "Makefile" + (("/usr/bin/perl") (which "perl")) + (("/usr/bin/python") (which "python3"))))) + (add-after 'configure 'add-PM.stamp + (lambda _ + ;; Add the "PM.stamp" to avoid "no rule to make target". + (call-with-output-file "perl/PM.stamp" (const #t)))) + (add-after 'build 'build-subtree + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (with-directory-excursion "contrib/subtree" + (substitute* "Makefile" + ;; Apparently `xmlto' does not bother to looks up the + ;; stylesheets specified in the XML, unlike the above + ;; substitution. Instead it uses a hard-coded URL. Work + ;; around it here, but if this is common perhaps we should + ;; hardcode this path in xmlto itself. + (("\\$\\(XMLTO\\) -m \\$\\(MANPAGE_XSL\\)") + (string-append "$(XMLTO) -x " + (search-input-directory + (or native-inputs inputs) + (string-append + "xml/xsl/docbook-xsl-" + #$(package-version docbook-xsl))) + "/manpages/docbook.xsl -m $(MANPAGE_XSL)"))) + (invoke "make") + (invoke "make" "install") + (invoke "make" "install-doc") + (substitute* "git-subtree" + (("/bin/sh") (which "sh")))))) + (add-before 'check 'patch-tests + (lambda _ + (let ((store-directory (%store-directory))) + ;; These files contain some funny bytes that Guile is unable + ;; to decode for shebang patching. Just delete them. + (for-each delete-file '("t/t4201-shortlog.sh" + "t/t7813-grep-icase-iso.sh")) + ;; Many tests contain inline shell scripts (hooks etc). + (substitute* (find-files "t" "\\.sh$") + (("#!/bin/sh") (string-append "#!" (which "sh")))) + ;; Un-do shebang patching here to prevent checksum mismatch. + (substitute* '("t/t4034/perl/pre" "t/t4034/perl/post") + (("^#!.*/bin/perl") "#!/usr/bin/perl")) + (substitute* "t/t5003-archive-zip.sh" + (("cp /bin/sh") (string-append "cp " (which "sh")))) + (substitute* "t/t6030-bisect-porcelain.sh" + (("\"/bin/sh\"") (string-append "\"" (which "sh") "\""))) + ;; FIXME: This test runs `git commit` with a bogus EDITOR + ;; and empty commit message, but does not fail the way it's + ;; expected to. The test passes when invoked interactively. + (substitute* "t/t7508-status.sh" + (("\tcommit_template_commented") "\ttrue")) + ;; More checksum mismatches due to odd shebangs. + (substitute* "t/t9100-git-svn-basic.sh" + (((string-append "\"#!" store-directory ".*/bin/sh")) + "\"#!/bin/sh") ) + (substitute* "t/t9300-fast-import.sh" + (((string-append "\t#!" store-directory ".*/bin/sh")) + "\t#!/bin/sh") + (((string-append "'#!" store-directory ".*/bin/sh")) + "'#!/bin/sh")) + ;; FIXME: Some hooks fail with "basename: command not found". + ;; See 't/trash directory.t9164.../svn-hook.log'. + (delete-file "t/t9164-git-svn-dcommit-concurrent.sh") + + ;; XXX: These tests fail intermittently for unknown reasons: + ;; . + (for-each delete-file + '("t/t9128-git-svn-cmd-branch.sh" + "t/t9167-git-svn-cmd-branch-subproject.sh" + "t/t9141-git-svn-multiple-branches.sh"))))) + (add-after 'install 'install-info-manual + (lambda* (#:key parallel-build? #:allow-other-keys) + (define job-count (if parallel-build? + (number->string (parallel-job-count)) + "1")) + (invoke "make" "-C" "Documentation" "install-info" + "-j" job-count + ;; The Makefile refer to 'docbook2x-texi', but our binary + ;; is named 'docbook2texi'. + "DOCBOOK2X_TEXI=docbook2texi" "PERL_PATH=perl"))) + (add-after 'install 'install-shell-completion + (lambda _ + (let ((completions (string-append #$output + "/etc/bash_completion.d"))) + ;; TODO: Install the tcsh and zsh completions in the right + ;; place. + (mkdir-p completions) + (copy-file "contrib/completion/git-completion.bash" + (string-append completions "/git"))))) + (add-after 'install 'install-credential-netrc + (lambda _ + (install-file "contrib/credential/netrc/git-credential-netrc.perl" + (string-append #$output:credential-netrc "/bin")) + (rename-file (string-append #$output:credential-netrc + "/bin/git-credential-netrc.perl") + (string-append #$output:credential-netrc + "/bin/git-credential-netrc")) + ;; Previously, Git.pm was automatically found by netrc. + ;; Perl 5.26 changed how it locates modules so that @INC no + ;; longer includes the current working directory (the Perl + ;; community calls this "dotless @INC"). + (wrap-program (string-append #$output:credential-netrc + "/bin/git-credential-netrc") + `("PERL5LIB" ":" prefix + (,(string-append #$output "/share/perl5")))))) + (add-after 'install 'install-credential-libsecret + (lambda _ + (with-directory-excursion "contrib/credential/libsecret" + ((assoc-ref gnu:%standard-phases 'build)) + (install-file "git-credential-libsecret" + (string-append #$output:credential-libsecret + "/bin"))))) + (add-after 'install 'install-subtree + (lambda _ + (install-file "contrib/subtree/git-subtree" + (string-append #$output:subtree "/bin")) + (install-file "contrib/subtree/git-subtree.1" + (string-append #$output:subtree + "/share/man/man1")))) + (add-after 'install 'restore-sample-hooks-shebang + (lambda _ + (let* ((dir (string-append #$output + "/share/git-core/templates/hooks"))) + (for-each (lambda (file) + (format #t "restoring shebang on `~a'~%" file) + (substitute* file + (("^#!.*/bin/sh") "#!/bin/sh"))) + (find-files dir ".*"))))) + (add-after 'install 'split + (lambda* (#:key inputs #:allow-other-keys) + ;; Split the binaries to the various outputs. + (let* ((out #$output) + (se #$output:send-email) + (svn #$output:svn) + (gui #$output:gui) + (gitk (string-append out "/bin/gitk")) + (gitk* (string-append gui "/bin/gitk")) + (git-gui (string-append + out "/libexec/git-core/git-gui")) + (git-gui* (string-append gui "/libexec/git-core/git-gui")) + (git-cit (string-append + out "/libexec/git-core/git-citool")) + (git-cit* (string-append + gui "/libexec/git-core/git-citool")) + (git-se (string-append + out "/libexec/git-core/git-send-email")) + (git-se* (string-append + se "/libexec/git-core/git-send-email")) + (git-svn (string-append out "/libexec/git-core/git-svn")) + (git-svn* (string-append svn "/libexec/git-core/git-svn")) + (git-sm (string-append + out "/libexec/git-core/git-submodule"))) + (mkdir-p (string-append gui "/bin")) + (mkdir-p (string-append gui "/libexec/git-core")) + (mkdir-p (string-append se "/libexec/git-core")) + (mkdir-p (string-append svn "/libexec/git-core")) + + (for-each (lambda (old new) + (copy-file old new) + (delete-file old) + (chmod new #o555)) + (list gitk git-gui git-cit git-se git-svn) + (list gitk* git-gui* git-cit* git-se* git-svn*)) + + ;; Tell 'git-svn' where Subversion and perl-term-readkey are. + + ;; FIXME: Old school 'assoc-ref' is used to retrieve + ;; subversion here, as #$(this-package-input "subversion") + ;; causes a dependency cycle for unknown reasons. + (wrap-program git-svn* + `("PATH" ":" prefix + (,(dirname (search-input-file inputs "bin/perl")))) + `("PERL5LIB" ":" prefix + ,(search-path-as-list + '("lib/perl5/site_perl") + (list (assoc-ref inputs "subversion") + #$(this-package-input "perl-term-readkey")))) + + ;; XXX: The .so for SVN/Core.pm lacks a RUNPATH, so + ;; help it find 'libsvn_client-1.so'. + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append (assoc-ref inputs "subversion") + "/lib")))) + + ;; Tell 'git-send-email' where perl modules are. + (wrap-program git-se* + `("PERL5LIB" ":" prefix + ,(search-path-as-list + '("lib/perl5/site_perl") + '#$(delete-duplicates + (append-map + (compose last package-transitive-propagated-inputs) + (list (this-package-input "perl-authen-sasl") + (this-package-input "perl-net-smtp-ssl") + (this-package-input "perl-io-socket-ssl"))))))) + ;; Tell 'gitweb.cgi' where perl modules are. + (wrap-program (string-append out "/share/gitweb/gitweb.cgi") + `("PERL5LIB" ":" prefix + ,(search-path-as-list + '("lib/perl5/site_perl") + '#$(delete-duplicates + (append-map + (compose last package-transitive-propagated-inputs) + (list (this-package-input "perl-cgi"))))))) + + ;; Tell 'git-submodule' where Perl is. + (wrap-program git-sm + `("PATH" ":" prefix + (,(dirname (search-input-file inputs "bin/perl")))))))) + (add-after 'split 'install-man-pages + (lambda _ + (let ((man (string-append #$output "/share/man"))) + (mkdir-p man) + (with-directory-excursion man + (invoke + "tar" "xvf" + #$(origin + (method url-fetch) + (uri (string-append + "mirror://kernel.org/software/scm/git/" + "git-manpages-" version ".tar.xz")) + (sha256 + (base32 + "0xsqakgy0s60zpa13ilj6zj420kdh8pf4v3nrp1nziwj8ja4qymw")))))))) + #$@(if (system-hurd?) + #~((add-after 'unpack 'delete-tests/hurd + (lambda _ + (delete-file "t/t0052-simple-ipc.sh") + (delete-file "t/t5562-http-backend-content-length.sh") + (delete-file "t/t9902-completion.sh")))) + #~())))) (native-search-paths ;; For HTTPS access, Git needs a single-file certificate bundle, specified @@ -641,9 +656,8 @@ (define-public git-minimal (delete 'install-credential-libsecret) (add-after 'install 'remove-unusable-perl-commands (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (libexec (string-append out "/libexec"))) + (let ((bin (string-append #$output "/bin")) + (libexec (string-append #$output "/libexec"))) (for-each (lambda (file) (delete-file (string-append libexec "/git-core/" file))) @@ -663,11 +677,11 @@ (define-public git-minimal ;; These templates typically depend on Perl. Remove them. (delete-file-recursively - (string-append out "/share/git-core/templates/hooks")) + (string-append #$output "/share/git-core/templates/hooks")) ;; Gitweb depends on Perl as well. (delete-file-recursively - (string-append out "/share/gitweb"))))))) + (string-append #$output "/share/gitweb"))))))) ((#:make-flags flags) #~(delete "USE_LIBPCRE2=yes" #$flags)) ((#:configure-flags flags) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 07 23:20:31 2023 Received: (at 65924) by debbugs.gnu.org; 8 Oct 2023 03:20:31 +0000 Received: from localhost ([127.0.0.1]:56100 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpKLF-0001Z7-Hj for submit@debbugs.gnu.org; Sat, 07 Oct 2023 23:20:31 -0400 Received: from mail-qk1-x731.google.com ([2607:f8b0:4864:20::731]:55612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpKLC-0001Yp-Vy for 65924@debbugs.gnu.org; Sat, 07 Oct 2023 23:20:28 -0400 Received: by mail-qk1-x731.google.com with SMTP id af79cd13be357-774105e8c37so229494985a.3 for <65924@debbugs.gnu.org>; Sat, 07 Oct 2023 20:20:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696735201; x=1697340001; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iQxnZuOHgXTSLLLBl1i/BqmNpx3T4E9rV0VdEFXzfM0=; b=ObJjR+B1fnfeyT6tiuwDYuD3RbbT5GwYg7rYuVsxnfNv8PKkNdGFQ5qliMSuETSEmp 0diO2tc4mZjJ5ZY0oSmcjY3SkMJCHda73EEB59rzUbsnKqjvPVVBS0907UWNxUoC3764 UZppol4rh5rzRPEk0XNYEQL5Yvz6vEQ/j3104uWkbm1gRG8AbM/qtUoATl1B3L0HcFPd 7ThJjfNMQm6VSka8n4636xr86U6UMmJEbpS4HfbsTKGoyiZAgm2eQpnKbPbNyHlIh2IV RBSEE8Q6z2vzatXKAf4GZnEf5EJljAmnkNWI9L6QFfhWcJmw9xSwikKiRTl3pfHmyiaH F41g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696735201; x=1697340001; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iQxnZuOHgXTSLLLBl1i/BqmNpx3T4E9rV0VdEFXzfM0=; b=jrsvAMjUQn7Ec6ML2c47VdMDuFbnp2JmF6ZQOIBbTtX8n9WD+5/epnyRHmQst70PDO biByRejmtGiYUnBGzmVJY8peoPhR4642h9haoQPeIM7fKSGUyY99neZtj312/6lozi/+ 7SsB5DAZEhLvBEycMXj08JLYvQH2VS57ntg1DizT1DekZ3jhYQBUGtMRfHvd5lPELYd9 ax7mcYlVNsP+XWbfdlRezbMGt2A+RvWz13aYicbXaFii2dJHuBJTtldopwZHlgb/yIvE Y96kO4Eu2WzOV0GMoVqlYP4ltC3qP0mlpyV3hG4J8dqZzy932xdUUlN3RWSiiC1KXfX+ 9U5w== X-Gm-Message-State: AOJu0YzdflGRcoaTZJChq9o2oKvWVjAvRHPOitc2/Ei8vVq069YPKxkk tUOm6+qXCefIG6c7kgPQ8stycIA6W38= X-Google-Smtp-Source: AGHT+IGbN6kdVh0N+pubd4QB8ooxsevEYwGABJ7Xy/pIfwyv4znjI+/aRwhaiFVblVD/IlzuTu0rKg== X-Received: by 2002:a05:620a:24cf:b0:775:c0b9:2a9d with SMTP id m15-20020a05620a24cf00b00775c0b92a9dmr14186714qkn.57.1696735201274; Sat, 07 Oct 2023 20:20:01 -0700 (PDT) Received: from localhost.localdomain (dsl-158-21.b2b2c.ca. [66.158.158.21]) by smtp.gmail.com with ESMTPSA id o10-20020a0cf4ca000000b0065b129ec0e8sm2748304qvm.57.2023.10.07.20.20.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Oct 2023 20:20:00 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 2/3] gnu: git: Invert inheritance relationship. Date: Sat, 7 Oct 2023 23:18:50 -0400 Message-ID: <9f9ecf37a04d6a3d788d247d8fb46f7bd6fabad5.1696734901.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , Simon Tournier , Ludovic Courtès Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) It's simpler to add features on top of a minimal variant than to remove them, and helps avoiding mistakenly changing git-minimal, which has many dependents. * gnu/packages/version-control.scm (git-minimal): Move above git and severe inheritance. Remove input label. Repatriate most fields from... (git): ... here. Define as package/inherit to inherit from git-minimal. Extend minimal values instead of overriding them whole. --- gnu/packages/version-control.scm | 603 +++++++++++++++---------------- 1 file changed, 292 insertions(+), 311 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 7a3c17efd8..bc647d1538 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -224,13 +224,16 @@ (define-public bazaar (deprecated-package "bazaar" breezy)) (define git-cross-configure-flags - '("ac_cv_fread_reads_directories=yes" - "ac_cv_snprintf_returns_bogus=no" - "ac_cv_iconv_omits_bom=no")) + #~(list "ac_cv_fread_reads_directories=yes" + "ac_cv_snprintf_returns_bogus=no" + "ac_cv_iconv_omits_bom=no")) -(define-public git +;; The size of the closure of 'git-minimal' is two thirds that of 'git'. +;; Its test suite runs slightly faster and most importantly it doesn't +;; depend on packages that are expensive to build such as Subversion. +(define-public git-minimal (package - (name "git") + (name "git-minimal") (version "2.41.0") (source (origin (method url-fetch) @@ -240,60 +243,19 @@ (define-public git (base32 "0h40arw08xbpi2cbf7pvc947v963rjxz3inb2ar81zjc8byvlj77")))) (build-system gnu-build-system) - (native-inputs - (list perl - ;; Add bash-minimal explicitly to ensure it comes before bash-for-tests, - ;; see . - bash-minimal - bash - gettext-minimal - ;; For subtree documentation. - asciidoc - docbook2x - docbook-xsl - libxslt - pkg-config - texinfo - xmlto)) - (inputs - (list curl - expat - openssl - perl - python ;for git-p4 - zlib - - ;; For PCRE support in git grep (USE_LIBPCRE2). - pcre2 - - ;; For 'gitweb.cgi'. - perl-cgi - - ;; For 'git-svn'. - subversion - perl-term-readkey - - ;; For 'git-send-email'. - perl-authen-sasl - perl-net-smtp-ssl - perl-io-socket-ssl - - ;; For 'git gui', 'gitk', and 'git citool'. - tcl - tk - - ;; For 'git-credential-libsecret' - glib - libsecret)) - (outputs '("out" ;the core - "send-email" ;for git-send-email - "svn" ;git-svn - "credential-netrc" ;git-credential-netrc - "credential-libsecret" ;git-credential-libsecret - "subtree" ;git-subtree - "gui")) ;gitk, git gui (arguments (list + #:modules `((srfi srfi-1) + (srfi srfi-26) + ((guix build gnu-build-system) #:prefix gnu:) + ,@%gnu-build-system-modules) + ;; Make sure the full bash does not end up in the final closure. + #:disallowed-references (list bash perl) + #:test-target "test" + #:configure-flags + (if (%current-target-system) + git-cross-configure-flags + #~(list)) #:make-flags #~(list "V=1" ;more verbose compilation (string-append "SHELL_PATH=" @@ -305,32 +267,10 @@ (define-public git #$(this-package-native-input "bash") "/bin/bash") - "USE_LIBPCRE2=yes" - ;; By default 'make install' creates hard links for ;; things in 'libexec/git-core', which leads to huge ;; nars; see . "NO_INSTALL_HARDLINKS=indeed") - - ;; Make sure the full bash does not end up in the final closure. - #:disallowed-references (list bash) - - #:test-target "test" - - ;; The explicit --with-tcltk forces the build system to hardcode the - ;; absolute file name to 'wish'. - #:configure-flags - #~(list (string-append "--with-tcltk=" - (search-input-file %build-inputs - "bin/wish8.6")) - #$@(if (%current-target-system) - git-cross-configure-flags - #~())) - - #:modules `((srfi srfi-1) - (srfi srfi-26) - ((guix build gnu-build-system) #:prefix gnu:) - ,@%gnu-build-system-modules) #:phases #~(modify-phases %standard-phases #$@(if (%current-target-system) @@ -354,6 +294,13 @@ (define-public git (remove (cut string-prefix? bash-full <>) path) ":"))))))) + #$@(if (system-hurd?) + #~((add-after 'unpack 'delete-tests/hurd + (lambda _ + (delete-file "t/t0052-simple-ipc.sh") + (delete-file "t/t5562-http-backend-content-length.sh") + (delete-file "t/t9902-completion.sh")))) + #~()) ;; Add cross curl-config script to PATH when cross-compiling. #$@(if (%current-target-system) #~((add-before 'configure 'add-cross-curl-config @@ -367,34 +314,11 @@ (define-public git (add-after 'configure 'patch-makefiles (lambda _ (substitute* "Makefile" - (("/usr/bin/perl") (which "perl")) - (("/usr/bin/python") (which "python3"))))) + (("/usr/bin/perl") (which "perl"))))) (add-after 'configure 'add-PM.stamp (lambda _ ;; Add the "PM.stamp" to avoid "no rule to make target". (call-with-output-file "perl/PM.stamp" (const #t)))) - (add-after 'build 'build-subtree - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (with-directory-excursion "contrib/subtree" - (substitute* "Makefile" - ;; Apparently `xmlto' does not bother to looks up the - ;; stylesheets specified in the XML, unlike the above - ;; substitution. Instead it uses a hard-coded URL. Work - ;; around it here, but if this is common perhaps we should - ;; hardcode this path in xmlto itself. - (("\\$\\(XMLTO\\) -m \\$\\(MANPAGE_XSL\\)") - (string-append "$(XMLTO) -x " - (search-input-directory - (or native-inputs inputs) - (string-append - "xml/xsl/docbook-xsl-" - #$(package-version docbook-xsl))) - "/manpages/docbook.xsl -m $(MANPAGE_XSL)"))) - (invoke "make") - (invoke "make" "install") - (invoke "make" "install-doc") - (substitute* "git-subtree" - (("/bin/sh") (which "sh")))))) (add-before 'check 'patch-tests (lambda _ (let ((store-directory (%store-directory))) @@ -436,16 +360,6 @@ (define-public git '("t/t9128-git-svn-cmd-branch.sh" "t/t9167-git-svn-cmd-branch-subproject.sh" "t/t9141-git-svn-multiple-branches.sh"))))) - (add-after 'install 'install-info-manual - (lambda* (#:key parallel-build? #:allow-other-keys) - (define job-count (if parallel-build? - (number->string (parallel-job-count)) - "1")) - (invoke "make" "-C" "Documentation" "install-info" - "-j" job-count - ;; The Makefile refer to 'docbook2x-texi', but our binary - ;; is named 'docbook2texi'. - "DOCBOOK2X_TEXI=docbook2texi" "PERL_PATH=perl"))) (add-after 'install 'install-shell-completion (lambda _ (let ((completions (string-append #$output @@ -455,36 +369,34 @@ (define-public git (mkdir-p completions) (copy-file "contrib/completion/git-completion.bash" (string-append completions "/git"))))) - (add-after 'install 'install-credential-netrc - (lambda _ - (install-file "contrib/credential/netrc/git-credential-netrc.perl" - (string-append #$output:credential-netrc "/bin")) - (rename-file (string-append #$output:credential-netrc - "/bin/git-credential-netrc.perl") - (string-append #$output:credential-netrc - "/bin/git-credential-netrc")) - ;; Previously, Git.pm was automatically found by netrc. - ;; Perl 5.26 changed how it locates modules so that @INC no - ;; longer includes the current working directory (the Perl - ;; community calls this "dotless @INC"). - (wrap-program (string-append #$output:credential-netrc - "/bin/git-credential-netrc") - `("PERL5LIB" ":" prefix - (,(string-append #$output "/share/perl5")))))) - (add-after 'install 'install-credential-libsecret + (add-after 'install 'remove-unusable-perl-commands (lambda _ - (with-directory-excursion "contrib/credential/libsecret" - ((assoc-ref gnu:%standard-phases 'build)) - (install-file "git-credential-libsecret" - (string-append #$output:credential-libsecret - "/bin"))))) - (add-after 'install 'install-subtree - (lambda _ - (install-file "contrib/subtree/git-subtree" - (string-append #$output:subtree "/bin")) - (install-file "contrib/subtree/git-subtree.1" - (string-append #$output:subtree - "/share/man/man1")))) + (let ((bin (string-append #$output "/bin")) + (libexec (string-append #$output "/libexec"))) + (for-each (lambda (file) + (delete-file (string-append libexec + "/git-core/" file))) + '("git-svn" "git-cvsimport" "git-archimport" + "git-cvsserver" "git-request-pull" + + ;; git-add--interactive was removed in Git 2.40 but + ;; this phase is inherited by older versions. + #$@(if (version>=? (package-version this-package) + "2.40.1") + #~() + #~("git-add--interactive")) + + "git-cvsexportcommit" + "git-instaweb" "git-send-email")) + (delete-file (string-append bin "/git-cvsserver")) + + ;; These templates typically depend on Perl. Remove them. + (delete-file-recursively + (string-append #$output "/share/git-core/templates/hooks")) + + ;; Gitweb depends on Perl as well. + (delete-file-recursively + (string-append #$output "/share/gitweb"))))) (add-after 'install 'restore-sample-hooks-shebang (lambda _ (let* ((dir (string-append #$output @@ -493,111 +405,20 @@ (define-public git (format #t "restoring shebang on `~a'~%" file) (substitute* file (("^#!.*/bin/sh") "#!/bin/sh"))) - (find-files dir ".*"))))) - (add-after 'install 'split - (lambda* (#:key inputs #:allow-other-keys) - ;; Split the binaries to the various outputs. - (let* ((out #$output) - (se #$output:send-email) - (svn #$output:svn) - (gui #$output:gui) - (gitk (string-append out "/bin/gitk")) - (gitk* (string-append gui "/bin/gitk")) - (git-gui (string-append - out "/libexec/git-core/git-gui")) - (git-gui* (string-append gui "/libexec/git-core/git-gui")) - (git-cit (string-append - out "/libexec/git-core/git-citool")) - (git-cit* (string-append - gui "/libexec/git-core/git-citool")) - (git-se (string-append - out "/libexec/git-core/git-send-email")) - (git-se* (string-append - se "/libexec/git-core/git-send-email")) - (git-svn (string-append out "/libexec/git-core/git-svn")) - (git-svn* (string-append svn "/libexec/git-core/git-svn")) - (git-sm (string-append - out "/libexec/git-core/git-submodule"))) - (mkdir-p (string-append gui "/bin")) - (mkdir-p (string-append gui "/libexec/git-core")) - (mkdir-p (string-append se "/libexec/git-core")) - (mkdir-p (string-append svn "/libexec/git-core")) - - (for-each (lambda (old new) - (copy-file old new) - (delete-file old) - (chmod new #o555)) - (list gitk git-gui git-cit git-se git-svn) - (list gitk* git-gui* git-cit* git-se* git-svn*)) - - ;; Tell 'git-svn' where Subversion and perl-term-readkey are. - - ;; FIXME: Old school 'assoc-ref' is used to retrieve - ;; subversion here, as #$(this-package-input "subversion") - ;; causes a dependency cycle for unknown reasons. - (wrap-program git-svn* - `("PATH" ":" prefix - (,(dirname (search-input-file inputs "bin/perl")))) - `("PERL5LIB" ":" prefix - ,(search-path-as-list - '("lib/perl5/site_perl") - (list (assoc-ref inputs "subversion") - #$(this-package-input "perl-term-readkey")))) - - ;; XXX: The .so for SVN/Core.pm lacks a RUNPATH, so - ;; help it find 'libsvn_client-1.so'. - `("LD_LIBRARY_PATH" ":" prefix - (,(string-append (assoc-ref inputs "subversion") - "/lib")))) - - ;; Tell 'git-send-email' where perl modules are. - (wrap-program git-se* - `("PERL5LIB" ":" prefix - ,(search-path-as-list - '("lib/perl5/site_perl") - '#$(delete-duplicates - (append-map - (compose last package-transitive-propagated-inputs) - (list (this-package-input "perl-authen-sasl") - (this-package-input "perl-net-smtp-ssl") - (this-package-input "perl-io-socket-ssl"))))))) - ;; Tell 'gitweb.cgi' where perl modules are. - (wrap-program (string-append out "/share/gitweb/gitweb.cgi") - `("PERL5LIB" ":" prefix - ,(search-path-as-list - '("lib/perl5/site_perl") - '#$(delete-duplicates - (append-map - (compose last package-transitive-propagated-inputs) - (list (this-package-input "perl-cgi"))))))) - - ;; Tell 'git-submodule' where Perl is. - (wrap-program git-sm - `("PATH" ":" prefix - (,(dirname (search-input-file inputs "bin/perl")))))))) - (add-after 'split 'install-man-pages - (lambda _ - (let ((man (string-append #$output "/share/man"))) - (mkdir-p man) - (with-directory-excursion man - (invoke - "tar" "xvf" - #$(origin - (method url-fetch) - (uri (string-append - "mirror://kernel.org/software/scm/git/" - "git-manpages-" version ".tar.xz")) - (sha256 - (base32 - "0xsqakgy0s60zpa13ilj6zj420kdh8pf4v3nrp1nziwj8ja4qymw")))))))) - #$@(if (system-hurd?) - #~((add-after 'unpack 'delete-tests/hurd - (lambda _ - (delete-file "t/t0052-simple-ipc.sh") - (delete-file "t/t5562-http-backend-content-length.sh") - (delete-file "t/t9902-completion.sh")))) - #~())))) - + (find-files dir ".*")))))))) + (native-inputs + ;; Add bash-minimal explicitly to ensure it comes before bash-for-tests, + ;; see . + (list bash-minimal + bash + gettext-minimal + perl)) + (inputs + (list curl ;for HTTP(S) access + expat ;for 'git push' over HTTP(S) + openssl + perl + zlib)) (native-search-paths ;; For HTTPS access, Git needs a single-file certificate bundle, specified ;; with $GIT_SSL_CAINFO. @@ -610,7 +431,6 @@ (define-public git (variable "GIT_EXEC_PATH") (separator #f) ;single entry (files '("libexec/git-core"))))) - (synopsis "Distributed version control system") (description "Git is a free distributed version control system designed to handle @@ -632,76 +452,237 @@ (define-public git (license license:gpl2) (home-page "https://git-scm.com/"))) -(define-public git-minimal - ;; The size of the closure of 'git-minimal' is two thirds that of 'git'. - ;; Its test suite runs slightly faster and most importantly it doesn't - ;; depend on packages that are expensive to build such as Subversion. - (package - (inherit git) - (name "git-minimal") +(define-public git + (package/inherit git-minimal + (name "git") + (outputs '("out" ;the core + "send-email" ;for git-send-email + "svn" ;git-svn + "credential-netrc" ;git-credential-netrc + "credential-libsecret" ;git-credential-libsecret + "subtree" ;git-subtree + "gui")) ;gitk, git gui (arguments - (substitute-keyword-arguments (package-arguments git) - ((#:phases phases) + (substitute-keyword-arguments (package-arguments git-minimal) + ((#:disallowed-references disallowed-refs ''()) + (delete perl disallowed-refs)) + ((#:make-flags flags #~'()) + #~(cons "USE_LIBPCRE2=yes" #$flags)) + ((#:configure-flags flags #~'()) + ;; The explicit --with-tcltk forces the build system to hardcode the + ;; absolute file name to 'wish'. + #~(cons (string-append "--with-tcltk=" + (search-input-file %build-inputs + "bin/wish8.6")) + #$flags)) + ((#:phases phases '%standard-phases) #~(modify-phases #$phases + (delete 'remove-unusable-perl-commands) (replace 'patch-makefiles (lambda _ (substitute* "Makefile" - (("/usr/bin/perl") (which "perl"))))) - (delete 'build-subtree) - (delete 'split) - (delete 'install-man-pages) - (delete 'install-info-manual) - (delete 'install-subtree) - (delete 'install-credential-netrc) - (delete 'install-credential-libsecret) - (add-after 'install 'remove-unusable-perl-commands - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append #$output "/bin")) - (libexec (string-append #$output "/libexec"))) - (for-each (lambda (file) - (delete-file (string-append libexec - "/git-core/" file))) - '("git-svn" "git-cvsimport" "git-archimport" - "git-cvsserver" "git-request-pull" - - ;; git-add--interactive was removed in Git 2.40 but - ;; this phase is inherited by older versions. - #$@(if (version>=? (package-version this-package) - "2.40.1") - #~() - #~("git-add--interactive")) - - "git-cvsexportcommit" - "git-instaweb" "git-send-email")) - (delete-file (string-append bin "/git-cvsserver")) - - ;; These templates typically depend on Perl. Remove them. - (delete-file-recursively - (string-append #$output "/share/git-core/templates/hooks")) - - ;; Gitweb depends on Perl as well. - (delete-file-recursively - (string-append #$output "/share/gitweb"))))))) - ((#:make-flags flags) - #~(delete "USE_LIBPCRE2=yes" #$flags)) - ((#:configure-flags flags) - #~(list #$@(if (%current-target-system) - git-cross-configure-flags - '()))) - ((#:disallowed-references lst '()) - `(,perl ,@lst)))) - (outputs '("out")) + (("/usr/bin/perl") (which "perl")) + (("/usr/bin/python") (which "python3"))))) + (add-after 'build 'build-subtree + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (with-directory-excursion "contrib/subtree" + (substitute* "Makefile" + ;; Apparently `xmlto' does not bother to looks up the + ;; stylesheets specified in the XML, unlike the above + ;; substitution. Instead it uses a hard-coded URL. Work + ;; around it here, but if this is common perhaps we should + ;; hardcode this path in xmlto itself. + (("\\$\\(XMLTO\\) -m \\$\\(MANPAGE_XSL\\)") + (string-append "$(XMLTO) -x " + (search-input-directory + (or native-inputs inputs) + (string-append + "xml/xsl/docbook-xsl-" + #$(package-version docbook-xsl))) + "/manpages/docbook.xsl -m $(MANPAGE_XSL)"))) + (invoke "make") + (invoke "make" "install") + (invoke "make" "install-doc") + (substitute* "git-subtree" + (("/bin/sh") (which "sh")))))) + (add-after 'install 'install-info-manual + (lambda* (#:key parallel-build? #:allow-other-keys) + (define job-count (if parallel-build? + (number->string (parallel-job-count)) + "1")) + (invoke "make" "-C" "Documentation" "install-info" + "-j" job-count + ;; The Makefile refer to 'docbook2x-texi', but our + ;; binary is named 'docbook2texi'. + "DOCBOOK2X_TEXI=docbook2texi" "PERL_PATH=perl"))) + (add-after 'install 'install-credential-netrc + (lambda _ + (install-file + "contrib/credential/netrc/git-credential-netrc.perl" + (string-append #$output:credential-netrc "/bin")) + (rename-file (string-append #$output:credential-netrc + "/bin/git-credential-netrc.perl") + (string-append #$output:credential-netrc + "/bin/git-credential-netrc")) + ;; Previously, Git.pm was automatically found by netrc. + ;; Perl 5.26 changed how it locates modules so that @INC no + ;; longer includes the current working directory (the Perl + ;; community calls this "dotless @INC"). + (wrap-program (string-append #$output:credential-netrc + "/bin/git-credential-netrc") + `("PERL5LIB" ":" prefix + (,(string-append #$output "/share/perl5")))))) + (add-after 'install 'install-credential-libsecret + (lambda _ + (with-directory-excursion "contrib/credential/libsecret" + ((assoc-ref gnu:%standard-phases 'build)) + (install-file "git-credential-libsecret" + (string-append #$output:credential-libsecret + "/bin"))))) + (add-after 'install 'install-subtree + (lambda _ + (install-file "contrib/subtree/git-subtree" + (string-append #$output:subtree "/bin")) + (install-file "contrib/subtree/git-subtree.1" + (string-append #$output:subtree + "/share/man/man1")))) + (add-after 'install 'split + (lambda* (#:key inputs #:allow-other-keys) + ;; Split the binaries to the various outputs. + (let* ((out #$output) + (se #$output:send-email) + (svn #$output:svn) + (gui #$output:gui) + (gitk (string-append out "/bin/gitk")) + (gitk* (string-append gui "/bin/gitk")) + (git-gui (string-append + out "/libexec/git-core/git-gui")) + (git-gui* (string-append + gui "/libexec/git-core/git-gui")) + (git-cit (string-append + out "/libexec/git-core/git-citool")) + (git-cit* (string-append + gui "/libexec/git-core/git-citool")) + (git-se (string-append + out "/libexec/git-core/git-send-email")) + (git-se* (string-append + se "/libexec/git-core/git-send-email")) + (git-svn (string-append + out "/libexec/git-core/git-svn")) + (git-svn* (string-append + svn "/libexec/git-core/git-svn")) + (git-sm (string-append + out "/libexec/git-core/git-submodule"))) + (mkdir-p (string-append gui "/bin")) + (mkdir-p (string-append gui "/libexec/git-core")) + (mkdir-p (string-append se "/libexec/git-core")) + (mkdir-p (string-append svn "/libexec/git-core")) + + (for-each (lambda (old new) + (copy-file old new) + (delete-file old) + (chmod new #o555)) + (list gitk git-gui git-cit git-se git-svn) + (list gitk* git-gui* git-cit* git-se* git-svn*)) + + ;; Tell 'git-svn' where Subversion and perl-term-readkey are. + + ;; FIXME: Old school 'assoc-ref' is used to retrieve + ;; subversion here, as #$(this-package-input "subversion") + ;; causes a dependency cycle for unknown reasons. + (wrap-program git-svn* + `("PATH" ":" prefix + (,(dirname (search-input-file inputs "bin/perl")))) + `("PERL5LIB" ":" prefix + ,(search-path-as-list + '("lib/perl5/site_perl") + (list (assoc-ref inputs "subversion") + #$(this-package-input "perl-term-readkey")))) + + ;; XXX: The .so for SVN/Core.pm lacks a RUNPATH, so + ;; help it find 'libsvn_client-1.so'. + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append (assoc-ref inputs "subversion") + "/lib")))) + + ;; Tell 'git-send-email' where perl modules are. + (wrap-program git-se* + `("PERL5LIB" ":" prefix + ,(search-path-as-list + '("lib/perl5/site_perl") + '#$(delete-duplicates + (append-map + (compose last package-transitive-propagated-inputs) + (list (this-package-input "perl-authen-sasl") + (this-package-input "perl-net-smtp-ssl") + (this-package-input + "perl-io-socket-ssl"))))))) + ;; Tell 'gitweb.cgi' where perl modules are. + (wrap-program (string-append out "/share/gitweb/gitweb.cgi") + `("PERL5LIB" ":" prefix + ,(search-path-as-list + '("lib/perl5/site_perl") + '#$(delete-duplicates + (append-map + (compose last package-transitive-propagated-inputs) + (list (this-package-input "perl-cgi"))))))) + + ;; Tell 'git-submodule' where Perl is. + (wrap-program git-sm + `("PATH" ":" prefix + (,(dirname (search-input-file inputs "bin/perl")))))))) + (add-after 'split 'install-man-pages + (lambda _ + (let ((man (string-append #$output "/share/man"))) + (mkdir-p man) + (with-directory-excursion man + (invoke + "tar" "xvf" + #$(origin + (method url-fetch) + (uri (string-append + "mirror://kernel.org/software/scm/git/" + "git-manpages-" (package-version this-package) + ".tar.xz")) + (sha256 + (base32 + "0xsqakgy0s60zpa13ilj6zj420kdh8pf4v3nrp1nziwj8ja4qymw")))))))))))) (native-inputs - `(("bash" ,bash-minimal) - ("bash-for-tests" ,bash) - ("native-perl" ,perl) - ("gettext" ,gettext-minimal))) + (modify-inputs (package-native-inputs git-minimal) + ;; For subtree documentation. + (append asciidoc + docbook2x + docbook-xsl + libxslt + pkg-config + texinfo + xmlto))) (inputs - (list curl ;for HTTP(S) access - expat ;for 'git push' over HTTP(S) - openssl - perl - zlib)))) + (modify-inputs (package-inputs git-minimal) + (append python ;for git-p4 + + ;; For PCRE support in git grep (USE_LIBPCRE2). + pcre2 + + ;; For 'gitweb.cgi'. + perl-cgi + + ;; For 'git-svn'. + subversion + perl-term-readkey + + ;; For 'git-send-email'. + perl-authen-sasl + perl-net-smtp-ssl + perl-io-socket-ssl + + ;; For 'git gui', 'gitk', and 'git citool'. + tcl + tk + + ;; For 'git-credential-libsecret' + glib + libsecret))))) ;;; The symbol git-minimal/fixed should be used when git-minimal needs fixes ;;; (security or else) and this deprecation could be removed. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 07 23:20:32 2023 Received: (at 65924) by debbugs.gnu.org; 8 Oct 2023 03:20:32 +0000 Received: from localhost ([127.0.0.1]:56103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpKLH-0001ZN-PX for submit@debbugs.gnu.org; Sat, 07 Oct 2023 23:20:32 -0400 Received: from mail-qv1-xf31.google.com ([2607:f8b0:4864:20::f31]:53283) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpKLF-0001Ys-OR for 65924@debbugs.gnu.org; Sat, 07 Oct 2023 23:20:30 -0400 Received: by mail-qv1-xf31.google.com with SMTP id 6a1803df08f44-65b162328edso19232566d6.2 for <65924@debbugs.gnu.org>; Sat, 07 Oct 2023 20:20:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696735204; x=1697340004; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=n6RVx8SfYnDNLLPQ68dVAB5VBitrazXDTz+Y8wCBnh4=; b=cAuWAQKnalTNEKUfyePRStobYh4aGNF62GB9Cnu1uOx4/9T9184qLHseADaKpcutgS Lw1gUYR5/+EYtTzfgHLgXzKCupVdkylksR3eCBsaUTWoduJhpyf9vmLywOLNduR8QcMO +jrjv2bFZRrTuHmC0fER7Bl7AlxL0/tZEwuNSDNunxvBfq3xhwG9jmnOfKbYSUshsLQA JoCV4AwKxfYU/RA+iXsZpi3ck+08e3rqLF88LU0LMAd3hqyRJ2S08Jjpn8RMYXy65ve6 VIVu5Qeqa0LKMuhgJOPpYWdXQ+4iLnMkwHpgAuLCupNtwBohuHHGYf8t2yaTUmUHnDQi 0AzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696735204; x=1697340004; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n6RVx8SfYnDNLLPQ68dVAB5VBitrazXDTz+Y8wCBnh4=; b=cXdVkQfi5R2+A8TtpHpDhc1iM1j3ly5euAVDVwxqDMVn8/g+TQ7lAfsZishOlnPz/S /dcaEKIggdJwK+BWhrFQkDMBQDzIcCkHmqJbWVsx7hDNmOJdlUo6OLYkE8R1CNrzuG2S OmCer/Zn8oJp7rmLEuTmBmI4BpVAXYPwQWRsmjnalbuAvUB23V2tPudebNDnV8cc+V7k sgLDlDZ3ogmv73tZBwpz9QnKXxBi+0E5g4xlWdrE+Kek+yBt2pjbEM/yFMukHQ01p7ac J4N0cq++c/F3YE+o1JL6SuGsKQJEBuSQ4eWCRJEh8jyu8HNcjdeTrqcyc3dpQiiwwVbs hcMA== X-Gm-Message-State: AOJu0YyvtWWfIpD2S0uVdk3Fg/uRE3wfVFEHwJA7+DGBi3KXx3tBGGAd k9z3+2Lk2z5q0BWY8b3CH9K6MAMCsHA= X-Google-Smtp-Source: AGHT+IEPmYxWhuWnKfqd4vspGC/okqyNvfqxx20N5gbJYMIArcY6G+Q8iFZI8ybCS8OVPz0huGkKBg== X-Received: by 2002:a05:6214:1545:b0:655:d82d:2fd0 with SMTP id t5-20020a056214154500b00655d82d2fd0mr12620451qvw.21.1696735204093; Sat, 07 Oct 2023 20:20:04 -0700 (PDT) Received: from localhost.localdomain (dsl-158-21.b2b2c.ca. [66.158.158.21]) by smtp.gmail.com with ESMTPSA id o10-20020a0cf4ca000000b0065b129ec0e8sm2748304qvm.57.2023.10.07.20.20.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Oct 2023 20:20:03 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 3/3] gnu: git-minimal: Add coreutils and sed to PATH. Date: Sat, 7 Oct 2023 23:18:51 -0400 Message-ID: <9e15a3ab5f8d4f44b834e1fc90464312c60fac9e.1696734901.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , Simon Tournier , Ludovic Courtès Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Fixes . * gnu/packages/version-control.scm (git-minimal) [arguments] : New field. : Augment with (ice-9 match), (ice-9 textual-ports) and (guix search-paths). : Add patch-commands phase. [inputs]: Add coreutils-minimal and sed. --- gnu/packages/version-control.scm | 57 ++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index bc647d1538..b0997db5da 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -82,6 +82,7 @@ (define-module (gnu packages version-control) #:use-module (guix build-system python) #:use-module (guix build-system qt) #:use-module (guix build-system trivial) + #:use-module (guix modules) #:use-module (gnu packages apr) #:use-module (gnu packages autotools) #:use-module (gnu packages documentation) @@ -245,9 +246,14 @@ (define-public git-minimal (build-system gnu-build-system) (arguments (list - #:modules `((srfi srfi-1) + #:imported-modules `(,@%gnu-build-system-modules + ,@(source-module-closure '((guix search-paths)))) + #:modules `((ice-9 match) + (ice-9 textual-ports) + (srfi srfi-1) (srfi srfi-26) ((guix build gnu-build-system) #:prefix gnu:) + (guix search-paths) ,@%gnu-build-system-modules) ;; Make sure the full bash does not end up in the final closure. #:disallowed-references (list bash perl) @@ -311,6 +317,51 @@ (define-public git-minimal inputs "bin/curl-config")) ":" (getenv "PATH")))))) #~()) + (add-after 'unpack 'patch-commands + (lambda* (#:key inputs #:allow-other-keys) + (define (prepend-string-to-file text file) + "Prepend TEXT to FILE." + (let ((content (call-with-input-file file + (cut get-string-all <>)))) + (call-with-output-file file + (lambda (port) + (display text port) + (display content port))))) + + (define PATH-variable-definition + (let ((value + (match (evaluate-search-paths + (list $PATH) + (list #$(this-package-input "coreutils-minimal") + #$(this-package-input "sed"))) + (((spec . value)) + value)))) + (string-append + (search-path-definition $PATH value + #:kind 'prefix) "\n\n"))) + + ;; Ensure that coreutils (for basename) and sed are on PATH + ;; for any script that sources the 'git-sh-setup.sh' file. + (prepend-string-to-file PATH-variable-definition + "git-sh-setup.sh") + + ;; Avoid depending on util-linux; it's only used to detect + ;; whether the system is MinGW, which we can detect at build + ;; time. + (substitute* "git-sh-setup.sh" + (("\\$\\(uname -s)") + (if #$(target-mingw?) + "MINGW" + "GNU"))) ;matched against '*' + + ;; git-submodule sources 'git-sh-setup.sh', but not before + ;; invoking the basename and sed commands... patch them to their + ;; absolute location. + (substitute* "git-submodule.sh" + (("\\$\\(basename") + (string-append "$(" (search-input-file inputs "bin/basename"))) + (("sed -e") + (string-append (search-input-file inputs "bin/sed") " -e"))))) (add-after 'configure 'patch-makefiles (lambda _ (substitute* "Makefile" @@ -414,10 +465,12 @@ (define-public git-minimal gettext-minimal perl)) (inputs - (list curl ;for HTTP(S) access + (list coreutils-minimal + curl ;for HTTP(S) access expat ;for 'git push' over HTTP(S) openssl perl + sed zlib)) (native-search-paths ;; For HTTPS access, Git needs a single-file certificate bundle, specified -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 08 03:04:04 2023 Received: (at 65924) by debbugs.gnu.org; 8 Oct 2023 07:04:04 +0000 Received: from localhost ([127.0.0.1]:56194 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpNpb-00089a-Q0 for submit@debbugs.gnu.org; Sun, 08 Oct 2023 03:04:04 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:49496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpNpa-000896-I9 for 65924@debbugs.gnu.org; Sun, 08 Oct 2023 03:04:03 -0400 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-9b2cee55056so641211066b.3 for <65924@debbugs.gnu.org>; Sun, 08 Oct 2023 00:03:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696748617; x=1697353417; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=2jAy48w36fMR4DjFKv18lKb0NPEoWyJKTdXI4MV7Osg=; b=QDdKxO2IN7FUNcrZxe9KEsNQxdtxcTC2s04ZN/E7uUv2f+LB2RDOoBhPCM8Vun7cqV YuA49cqtEZyn5LQHyTbENi4T/5dK8AB+6vvVtpMBLnCOtMCQXM5ljRz2G1WIRxfSpS8i YVZB6nVJoqASIdttdC8QjF/X3YD3yEI9M2OMeyn8W56AUAWSYpKmQhnNepyt7Qi+4xVR Sxnlu+qQHjZOybIyDvT+X/BBbgKDeyGN0spqaB24IuyG88rhsBtnC1D0LasH+bV/nU3z YrNe/GcvwxkQHDmcCRqMFMYPwkOFA+Yam5vdo44LupzyBV2twuVu648MCULNQTL72r8A 8b1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696748617; x=1697353417; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2jAy48w36fMR4DjFKv18lKb0NPEoWyJKTdXI4MV7Osg=; b=brBUe1g7VpmtASRki46KBgxf6Joa+NwnWNoVNcCxeY4Q3EocZ7ZrwoRJW2tVhwAi+H VVjSZ5dRf3OuO/wATMYsZYc74+c4DBhBoCmrRpQS0teZD/eiqPCoFU6iK1i0srwszMqZ kTm7HWHs1ekYfm95gzHKyxeqfs9OAbayliRsnexaLfnL8K2mRjDPnh4pLhcD9UByszN5 OjAuYX7iCQKxlOHEWvOjfS/Yt5XHuFCN8ecdcBw4+lAlLod09IS8fEd9TZmH224nFlv2 XdVw6elgr0NIP7cZ3B1X/whPB6wCoRJ5cn81zB8p6zANb9JvR12PNgDugCbl8pbbk3L7 QTgg== X-Gm-Message-State: AOJu0YxJmMEsCpOS1UmrWivQBEi++0rh2m6QNLKW6qKEA34JLAhW84Zm xYlKcgc2ToB+7+g6B12vhew= X-Google-Smtp-Source: AGHT+IE85D6IlSJPAvDhG4hCM47n1bANT3TeG/SgcZ+1MgIq4BUk0TtgsHd0nw5QsAKsV6vofjM88A== X-Received: by 2002:a17:906:768e:b0:9b2:f38d:c44b with SMTP id o14-20020a170906768e00b009b2f38dc44bmr10629594ejm.24.1696748616565; Sun, 08 Oct 2023 00:03:36 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id o12-20020a17090637cc00b0099bc80d5575sm5092730ejc.200.2023.10.08.00.03.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 00:03:35 -0700 (PDT) Message-ID: <442bb34f6ba81b7134c6cbf06d0045debc42bf68.camel@gmail.com> Subject: Re: [PATCH core-updates 2/3] gnu: git: Invert inheritance relationship. From: Liliana Marie Prikler To: Maxim Cournoyer , 65924@debbugs.gnu.org Date: Sun, 08 Oct 2023 09:03:34 +0200 In-Reply-To: <9f9ecf37a04d6a3d788d247d8fb46f7bd6fabad5.1696734901.git.maxim.cournoyer@gmail.com> References: <9f9ecf37a04d6a3d788d247d8fb46f7bd6fabad5.1696734901.git.maxim.cournoyer@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 07.10.2023 um 23:18 -0400 schrieb Maxim Cournoyer: > It's simpler to add features on top of a minimal variant than to > remove them, and helps avoiding mistakenly changing git-minimal, > which has many dependents. >=20 > * gnu/packages/version-control.scm (git-minimal): Move above git and > severe inheritance.=C2=A0 Remove input label.=C2=A0 Repatriate most field= s > from... > (git): ... here.=C2=A0 Define as package/inherit to inherit from git- > minimal. > Extend minimal values instead of overriding them whole. > --- Having done the same to Emacs recently, I fully agree with this move. From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 08 03:09:41 2023 Received: (at 65924) by debbugs.gnu.org; 8 Oct 2023 07:09:41 +0000 Received: from localhost ([127.0.0.1]:56198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpNv3-0008HV-Hl for submit@debbugs.gnu.org; Sun, 08 Oct 2023 03:09:41 -0400 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:50295) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpNv1-0008HJ-P3 for 65924@debbugs.gnu.org; Sun, 08 Oct 2023 03:09:40 -0400 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-9b1ebc80d0aso601767666b.0 for <65924@debbugs.gnu.org>; Sun, 08 Oct 2023 00:09:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696748954; x=1697353754; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=22ZIvgM05vNehYMkzF1dUaV4dEkXv5W/D4hkFU3YfeE=; b=FnMQZ75vnthHMuMdn3D7tVQJvFbizwIb7X6dNN0hJJpNyeaQyu7cb3moBRMa3Sx/bI G9a+EckP/RwucY2X/O61QudvHmRGO8L88B+ckzTfznLTc+UKdPTayG9eKejorhly24OF IaWg4x4hSQ7W/7HAYuvAf8myRRcexj/wLvn9ADWASgaCcLfGGvntorYiVRsoU71q3o29 US0Js/+Y3pj/uQLyyqGZKFuq3zek6NebpEGCFupWjgutRBH9QPsYBvR04F7cQORoEchr yetoMU3dSWZDVOOHs6Gx1GL4wehbhIkD1fVrA02bMbCQtyzSIuRjiDg7SkE5WwvBH071 XZjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696748954; x=1697353754; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=22ZIvgM05vNehYMkzF1dUaV4dEkXv5W/D4hkFU3YfeE=; b=cLr6gC7kGuvgmEIxws1vbofWk8ySv6xGuzyD2apRC5vrboPQhH3PRocrUoSrT5psal VHDh9AGfihvnZgX2me3RQt/XvMc+6e211Ftu6qSYuoDZn40U/21Pdv/hsBAdg8havgFS retkWlQk3aJoGtHJW+uUQyexLT3kLHRzNkZltMVCoapvsNjJBRfT91xm+CGp3P5nXCAG lRV/BgOUeeE1UOrEcZTzSRT+0RMfzjKCAuUxyKQGs4uJw7ordVTIZYbU3Zth/19Utdze CQBONVvHmug3jADVdy9ckI5rSXHaEpezQiBa+3REIt2cFys715ix6U364vAWub0Mhrfa ge4w== X-Gm-Message-State: AOJu0Yw6avZDzmQR+1DZjXOOHIqizV+Mc8/jZx+y4A3FGDfxjz4XIiJm 2OZmmDMplapEpOd1l1cRgdAw0V3hlgrhpQ== X-Google-Smtp-Source: AGHT+IGKVWxf+o9FFHyb5A/M6j3hzbDQYT25vQwODsDxtQ6hocVu1G2St7eAowmwOTB4VPtgA4t3Pw== X-Received: by 2002:a17:906:1dd:b0:9b6:582e:be6a with SMTP id 29-20020a17090601dd00b009b6582ebe6amr10114204ejj.33.1696748953781; Sun, 08 Oct 2023 00:09:13 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id t25-20020a1709063e5900b0098f33157e7dsm5126403eji.82.2023.10.08.00.09.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 00:09:12 -0700 (PDT) Message-ID: Subject: Re: [PATCH core-updates 1/3] gnu: git: Remove labels and use gexps. From: Liliana Marie Prikler To: Maxim Cournoyer , 65924@debbugs.gnu.org Date: Sun, 08 Oct 2023 09:09:11 +0200 In-Reply-To: <1090d01a7ba277090c84cf66bc7bfaf22521f0e3.1696734901.git.maxim.cournoyer@gmail.com> References: <1090d01a7ba277090c84cf66bc7bfaf22521f0e3.1696734901.git.maxim.cournoyer@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 07.10.2023 um 23:18 -0400 schrieb Maxim Cournoyer: > * gnu/packages/version-control.scm (git) > [native-inputs, inputs]: Remove labels. > [arguments]: Use gexps.=C2=A0 Use gexp variables input searching > procedures where it makes sense. > --- Heads-up, the additional completions I'm installing in 66171 will cause a merge conflict here (they need to go to core-updates due to git being git and git-minimal still changes accordingly on master). IIUC it should be easier to apply your changes first and then mine. IMHO, completions shouldn't go to git-minimal, but reading 2/3 (i.e. reading without applying) I'm not quite sure where they end up atm. Cheers From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 10:22:09 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 14:22:09 +0000 Received: from localhost ([127.0.0.1]:60647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpr94-0004em-8V for submit@debbugs.gnu.org; Mon, 09 Oct 2023 10:22:09 -0400 Received: from mail-qk1-x72e.google.com ([2607:f8b0:4864:20::72e]:50414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpr8z-0004eG-8K for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 10:22:05 -0400 Received: by mail-qk1-x72e.google.com with SMTP id af79cd13be357-7741bffd123so335296185a.0 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 07:21:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696861294; x=1697466094; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BLMsdmIvkW05ce3bw3mY8YwowREmjsY9OwJvzhEZItg=; b=F0GdPXPemk7vhptGc/9YxigSMbMZJgcwO4bhXQHMcTPECrm+sMQ8y0zzS7FE3mG8da WaYM9vRTsRASi2+MTCSN6HbPWiIxKGkv9AivwHgn5RYrwqzq86cO4w/hGyPLnOV0NgkQ hvsQlmcjj6K+k6MBs332i+6oE+yzFKjOH54BZ4u/BWSG9xdCiUjvTSXzZz11qGriiAxn CSgec+ABIDfxg2Owh2GNVLbgFH8IO5vkccyOAkfx/LTlm/nwfIR3i9KGji4zJnvqtMTS k7D5G8O3zZbBdskOXWRA6c/lpVMizmLS4HaN/g/hBjvfyFaldfYljK8CWGmJKn0L8u8V mGiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696861294; x=1697466094; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=BLMsdmIvkW05ce3bw3mY8YwowREmjsY9OwJvzhEZItg=; b=cRhdBtw4dc9G9REvMrCwiAiwB3jSr9fQk1zap7AWfJ2b9iGrhXBBVhwubpJZ+UqsDQ 4BXlV6MIfcCnZfQXON/VeI3M1sW6o5vdV71QyaLzhdBFLQmk+NoPX4XSPPrzKGBWITmr IgsA3exSmgouU1V5/RUZTdhb445Oda0FelnzxnIHLZ0jqyvur4NTr4mfhSDfPsNWnV0p jwk4+SIqT1F5RrqKh2lujxjPj2lE6lp+CKyvBkExlTfQUL0hZOJuIFUHZ0dEY7a5jIky 7V2K9M5Z+5sBr/KtbAvgCiJ/lWEMb/PqXAMk++bJbFWvaHdqC5VYJz0IBrakN2kMLqAY PoUg== X-Gm-Message-State: AOJu0Ywc6oMyHvGIg+c0eNor4IL/s9yJi5p1cqCQnZwLkpM33GIqaXk2 KQo2cYQa5pe8reEFBIpB7SB0I8LSVmE= X-Google-Smtp-Source: AGHT+IEq61oP4Xgo+U6JRnyA4u4zKDCJtQM4VTdkr+SUNg59MJU1qERr1REl3CfuiHOx0Din8xqtIw== X-Received: by 2002:a0c:f5d0:0:b0:656:1fd2:3794 with SMTP id q16-20020a0cf5d0000000b006561fd23794mr15646099qvm.41.1696861294384; Mon, 09 Oct 2023 07:21:34 -0700 (PDT) Received: from hurd (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id d19-20020a0ce453000000b00655d6d31470sm3890953qvm.43.2023.10.09.07.21.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 07:21:33 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: bug#65924: git searches coreutils and util-linux commands in PATH In-Reply-To: <442bb34f6ba81b7134c6cbf06d0045debc42bf68.camel@gmail.com> (Liliana Marie Prikler's message of "Sun, 08 Oct 2023 09:03:34 +0200") References: <9f9ecf37a04d6a3d788d247d8fb46f7bd6fabad5.1696734901.git.maxim.cournoyer@gmail.com> <442bb34f6ba81b7134c6cbf06d0045debc42bf68.camel@gmail.com> Date: Mon, 09 Oct 2023 10:21:33 -0400 Message-ID: <87il7fdggi.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Liliana :-) Liliana Marie Prikler writes: > Am Samstag, dem 07.10.2023 um 23:18 -0400 schrieb Maxim Cournoyer: >> It's simpler to add features on top of a minimal variant than to >> remove them, and helps avoiding mistakenly changing git-minimal, >> which has many dependents. >>=20 >> * gnu/packages/version-control.scm (git-minimal): Move above git and >> severe inheritance.=C2=A0 Remove input label.=C2=A0 Repatriate most fiel= ds >> from... >> (git): ... here.=C2=A0 Define as package/inherit to inherit from git- >> minimal. >> Extend minimal values instead of overriding them whole. >> --- > Having done the same to Emacs recently, I fully agree with this move. Great; does this mean a LGTM on your side for this one? Please be explicit :-). --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:32:54 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:32:54 +0000 Received: from localhost ([127.0.0.1]:60779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptBe-0003HK-3k for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:32:54 -0400 Received: from mail-qk1-x731.google.com ([2607:f8b0:4864:20::731]:62819) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptBb-0003H3-Qr for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:32:52 -0400 Received: by mail-qk1-x731.google.com with SMTP id af79cd13be357-77063481352so466756885a.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:32:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869145; x=1697473945; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=lzafy3RKtOXklNA+qwP1B6t5t9BEorAtvWT8VfEPc9g=; b=dlYS4lmrNFGBwJ67vXuTJAQrh0zz4NFSQs+b2i2HBoHj6uK6EoEjhflLlYFH996U4L pF5242n5vt/bBk6/2qPEFxQSPNn9mk9y7nZj4WI4SrQhXvmoKNOEiHqmtoRgGLGLJltr Eh/PAnYkqTPVgmeqEOiUE94T0iMftbh354F3rMrt/9eW7cTxxbd4PrHRLWbiHhG1wpcj S+LKtAv7Usug5uWGrMWMUI/jW3+lG4MN5USswPrW6MuSfXq/G8qkMh1CGg9ifO+vCTpe S3KOyIKs1a+I2meWxfVs+6eWeCIU7B+ZZU3wyk2F3BmlGsG/1TfA4f6p5cDVXO20UwKY OUQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869145; x=1697473945; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=lzafy3RKtOXklNA+qwP1B6t5t9BEorAtvWT8VfEPc9g=; b=pav4E5cdhUgfoyVQ5Eb7XSO3SMvnfuNtaNQmg57/hyr66tjVKv8/FSo8FgD+clQ2m7 7vIZJjOgoZGcBa3F/knIoZPmVSN7M8fKP/WM2VIC3PPmjShtxUTV9Q8ENy5LvgisoP1G yS/QEt1gNAUsHH+ggVK79HAyEXqnQmXofi9km/thJBhtUZxB7H7hDf9yDElVn2tzYk3a 6RpUI8A3k9VM5soyA3Ar5GV985a0Q/Xo6gL8JoF8s5VXijTNHZHzGx0AUAfVMF1Iwsz1 2UU+HredwzeL1HWtxCIGATFi7T5xSh+DMaybgDkdUQkHmw6rYsjGlgFNio0KF7f7vcq1 Tliw== X-Gm-Message-State: AOJu0YzqW44CkSDrjOlUgrB2xDTWfhjfLDJjvzASFz6wG5M2JenxFw1G /6oqkIz9sFsi/99wQMfQag08TnZEmPA= X-Google-Smtp-Source: AGHT+IGjF+9zYRl2WRjxspBQ4Toqtr186TUUDijCMMFevkL79+SqntVApsdTzgNpbXQLQjvWTQYXNA== X-Received: by 2002:a05:620a:2802:b0:774:364c:4e36 with SMTP id f2-20020a05620a280200b00774364c4e36mr16367708qkp.37.1696869145036; Mon, 09 Oct 2023 09:32:25 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id z7-20020a05620a100700b0076f19b9e96fsm3645769qkj.107.2023.10.09.09.32.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:32:24 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules. Date: Mon, 9 Oct 2023 12:28:38 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-CC: Liliana Marie Prikler , Bruno Victal X-Debbugs-Cc: Maxim Cournoyer , Simon Tournier , Ludovic Courtès , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This series introduces default variable bindings for the default gnu-build-system IMPORTED-MODULES and MODULES values. The lack of a %default-gnu-modules caused enough confusion, as made apparent by this series. Maxim Cournoyer (65): build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-modules. gnu: acl: Remove labels and trailing #t. gnu: acl: Import the correct set of modules. gnu: dirvish: Import the correct set of modules. gnu: fio: Import the correct set of modules. gnu: ccwl: Import the correct set of modules. gnu: boost: Import the correct set of modules. gnu: gcc-final: Import the correct set of modules. gnu: epson-inkjet-printer-escpr: Import the correct set of modules. gnu: splix: Import the correct set of modules. gnu: guile-curl: Import the correct set of modules. gnu: dpkg: Import the correct set of modules. gnu: dezyne: Import the correct set of modules. gnu: fastcap: Import the correct set of modules. gnu: fasthenry: Import the correct set of modules. gnu: seabios-qemu: Import the correct set of modules. gnu: font-amiri: Import the correct set of modules. gnu: xdg-utils: Import the correct set of modules. gnu: tsukundere: Import the correct set of modules. gnu: gcc-4.9: Import the correct set of modules. gnu: make-libstdc++: Import the correct set of modules. gnu: custom-gcc: Import the correct set of modules. gnu: gdb: Import the correct set of modules. gnu: genimage: Import the correct set of modules. gnu: gimp: Import the correct set of modules. gnu: pinentry-rofi: Import the correct set of modules. gnu: mozjs: Import the correct set of modules. gnu: icecat-minimal: Import the correct set of modules. gnu: icedove-minimal: Import the correct set of modules. gnu: python-graph-tool: Import the correct set of modules. gnu: artanis: Import the correct set of modules. gnu: guilescript: Import the correct set of modules. gnu: guile-dsv: Import the correct set of modules. gnu: guile-di: Import the correct set of modules. gnu: guile-hall: Import the correct set of modules. gnu: haunt: Import the correct set of modules. gnu: guile-studio: Import the correct set of modules. gnu: guile-libyaml: Import the correct set of modules. gnu: guile-gitlab: Import the correct set of modules. gnu: guile-smc: Import the correct set of modules. gnu: rime-data: Import the correct set of modules. gnu: jbigkit: Import the correct set of modules. gnu: uftrace: Import the correct set of modules. gnu: mdadm-static: Import the correct set of modules. gnu: ecryptfs-utils: Import the correct set of modules. gnu: ghmm: Import the correct set of modules. gnu: %gcc-static: Import the correct set of modules. gnu: mumps: Import the correct set of modules. gnu: hypre: Import the correct set of modules. gnu: lingeling: Import the correct set of modules. gnu: guix-build-coordinator: Import the correct set of modules. gnu: nar-herder: Import the correct set of modules. gnu: python-sip-4: Import the correct set of modules. gnu: ratpoison: Import the correct set of modules. gnu: stklos: Import the correct set of modules. gnu: python-sepolgen: Import the correct set of modules. gnu: boxes: Import the correct set of modules. gnu: simh: Import the correct set of modules. gnu: stb: Import the correct set of modules. gnu: info-reader: Import the correct set of modules. gnu: git: Import the correct set of modules. gnu: ffmpeg-3.4: Import the correct set of modules. gnu: qemu: Import the correct set of modules. gnu: ganeti: Import the correct set of modules. gnu: criu: Import the correct set of modules. gnu/packages/acl.scm | 15 ++++-------- gnu/packages/axoloti.scm | 4 +-- gnu/packages/backup.scm | 5 ++-- gnu/packages/base.scm | 2 +- gnu/packages/benchmark.scm | 2 +- gnu/packages/bioinformatics.scm | 4 +-- gnu/packages/boost.scm | 4 +-- gnu/packages/bootloaders.scm | 6 ++--- gnu/packages/bqn.scm | 2 +- gnu/packages/commencement.scm | 8 +++--- gnu/packages/cpp.scm | 2 +- gnu/packages/cross-base.scm | 2 +- gnu/packages/cups.scm | 6 ++--- gnu/packages/curl.scm | 4 +-- gnu/packages/debian.scm | 2 +- gnu/packages/dezyne.scm | 2 +- gnu/packages/dictionaries.scm | 2 +- gnu/packages/djvu.scm | 4 +-- gnu/packages/docker.scm | 2 +- gnu/packages/emacs-xyz.scm | 20 +++++++-------- gnu/packages/emulators.scm | 2 +- gnu/packages/engineering.scm | 4 +-- gnu/packages/esolangs.scm | 2 +- gnu/packages/firmware.scm | 2 +- gnu/packages/fonts.scm | 4 +-- gnu/packages/freedesktop.scm | 2 +- gnu/packages/game-development.scm | 4 +-- gnu/packages/gcc.scm | 6 ++--- gnu/packages/gdb.scm | 2 +- gnu/packages/genimage.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/gimp.scm | 2 +- gnu/packages/gnome.scm | 2 +- gnu/packages/gnucash.scm | 2 +- gnu/packages/gnupg.scm | 2 +- gnu/packages/gnuzilla.scm | 6 ++--- gnu/packages/graph.scm | 4 +-- gnu/packages/guile-xyz.scm | 38 ++++++++++++++--------------- gnu/packages/ibus.scm | 2 +- gnu/packages/image.scm | 2 +- gnu/packages/instrumentation.scm | 2 +- gnu/packages/java.scm | 4 +-- gnu/packages/language.scm | 2 +- gnu/packages/linux.scm | 6 ++--- gnu/packages/machine-learning.scm | 4 +-- gnu/packages/mail.scm | 6 ++--- gnu/packages/make-bootstrap.scm | 2 +- gnu/packages/maths.scm | 8 +++--- gnu/packages/messaging.scm | 2 +- gnu/packages/mpd.scm | 2 +- gnu/packages/mpi.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/networking.scm | 2 +- gnu/packages/ocaml.scm | 2 +- gnu/packages/openldap.scm | 2 +- gnu/packages/package-management.scm | 8 +++--- gnu/packages/password-utils.scm | 2 +- gnu/packages/plotutils.scm | 4 +-- gnu/packages/qt.scm | 6 ++--- gnu/packages/racket.scm | 2 +- gnu/packages/ratpoison.scm | 2 +- gnu/packages/scheme.scm | 2 +- gnu/packages/selinux.scm | 2 +- gnu/packages/shellutils.scm | 2 +- gnu/packages/simh.scm | 2 +- gnu/packages/speech.scm | 2 +- gnu/packages/stb.scm | 2 +- gnu/packages/telegram.scm | 4 +-- gnu/packages/texinfo.scm | 2 +- gnu/packages/text-editors.scm | 2 +- gnu/packages/version-control.scm | 4 +-- gnu/packages/video.scm | 2 +- gnu/packages/virtualization.scm | 8 +++--- gnu/packages/web-browsers.scm | 2 +- gnu/packages/web.scm | 2 +- gnu/packages/xdisorg.scm | 2 +- gnu/packages/xorg.scm | 2 +- guix/build-system/agda.scm | 2 +- guix/build-system/android-ndk.scm | 2 +- guix/build-system/ant.scm | 2 +- guix/build-system/asdf.scm | 2 +- guix/build-system/cargo.scm | 2 +- guix/build-system/chicken.scm | 2 +- guix/build-system/cmake.scm | 2 +- guix/build-system/copy.scm | 2 +- guix/build-system/dub.scm | 2 +- guix/build-system/elm.scm | 2 +- guix/build-system/emacs.scm | 2 +- guix/build-system/font.scm | 2 +- guix/build-system/glib-or-gtk.scm | 2 +- guix/build-system/gnu.scm | 13 +++++----- guix/build-system/go.scm | 2 +- guix/build-system/guile.scm | 2 +- guix/build-system/haskell.scm | 2 +- guix/build-system/julia.scm | 2 +- guix/build-system/linux-module.scm | 2 +- guix/build-system/maven.scm | 2 +- guix/build-system/minify.scm | 2 +- guix/build-system/node.scm | 2 +- guix/build-system/ocaml.scm | 2 +- guix/build-system/perl.scm | 2 +- guix/build-system/python.scm | 2 +- guix/build-system/r.scm | 2 +- guix/build-system/rakudo.scm | 2 +- guix/build-system/rebar.scm | 2 +- guix/build-system/renpy.scm | 2 +- guix/build-system/ruby.scm | 2 +- guix/build-system/scons.scm | 2 +- guix/build-system/texlive.scm | 2 +- guix/build-system/waf.scm | 2 +- tests/modules.scm | 8 +++--- 111 files changed, 192 insertions(+), 197 deletions(-) base-commit: dc455b6dfb28cf4ca7b1ab5deabeb0adf0ea2d20 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:33:03 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:33:03 +0000 Received: from localhost ([127.0.0.1]:60783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptBj-0003He-ML for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:03 -0400 Received: from mail-qk1-x72b.google.com ([2607:f8b0:4864:20::72b]:59405) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptBi-0003HI-1E for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:32:58 -0400 Received: by mail-qk1-x72b.google.com with SMTP id af79cd13be357-777252c396bso467985a.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:32:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869151; x=1697473951; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=X5GWP55gg3JXfcSzpohm/0JjtUuayMNEjM0BF06R/Ng=; b=csdi7g42USH0ukyjXj53VJ2pXqJXXuemWWYNwEe5x+0LMxaYtd8BgN35JNLx4S84XU CVdSiw11zVNOKm9krqDDfhrFqctJoePg8Bf3zIbAx8Wp2irtpCkxa8bOe2aK0roLpVAe Bn+MJPMuF8YD/7WnI+gt/RXsPJ+HF0Up2S3SHObMv3THRciihdZavrWnuWz7gDqVxqEU jhUSRFG4RgphO25/A7n4LYtlXGKk+sIA7Txd4TfUnkdCPjnZKtlyWf20un2DW2iCDBKb xq0I7A0wjZppYelLNsGtfGz+HEfKA6EWsJmJYV2kInYb32ubrhsSwHUNamL3ij60vw+7 h5Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869151; x=1697473951; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X5GWP55gg3JXfcSzpohm/0JjtUuayMNEjM0BF06R/Ng=; b=mLhPHXlj/2cbp9d4Q5Ux830/AEpo9izK/0w6qCBoXlC80yymXxe0DsbG+AlL8H64Tp baTXyEnXIKzDqINDbB/a3KZ0x2XeF3ZLobw6U7ZlVz7moVttAYmQ9E67Motk78TibyWS TLPxneU5OhLPD/DjqCcsxJbThJ/vZF0WYoC3WCu/3k/d7J/lFdwM30D4vLc8F13qeMN2 +GoqGZrzxANoYBxRwl+9SRojX9A82BFsWkIAW6RqlFaZOnQBF1X3TWxEJAu4uqKNxFb0 nSKWA+e8ri7WOJSyLtXIqr/NsigMtRxHnIPnRKuZC0QMazWUZfBV4YjScVluQskGrnwU Nydw== X-Gm-Message-State: AOJu0YxpJg0YW7JxzcyLursdcPEJYh7UnFG17khPsY2Pt95kk1GTXE7P aF5jMhfMBa4H7bM8AYZWdjz5imgDaOU= X-Google-Smtp-Source: AGHT+IF2DsVbIBS0kK3SqstlVlw5K5ZlKl5+ino52YyA+KBG+ZpAGz+KMC6d0RZM/JejOkxyoN7g5A== X-Received: by 2002:a05:620a:2408:b0:777:3c2:31da with SMTP id d8-20020a05620a240800b0077703c231damr6779257qkn.5.1696869151573; Mon, 09 Oct 2023 09:32:31 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id z7-20020a05620a100700b0076f19b9e96fsm3645769qkj.107.2023.10.09.09.32.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:32:31 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 02/65] gnu: acl: Remove labels and trailing #t. Date: Mon, 9 Oct 2023 12:28:40 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , Simon Tournier , Ludovic Courtès , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/acl.scm (acl): Remove labels and trailing #t. Change-Id: I01b3d697da78ae1294b76d1073dbfd0ffe37fe31 --- gnu/packages/acl.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index 3e97332243..6d78847680 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -66,13 +66,11 @@ (define-public acl (ftw "." (lambda (file stat flag) (unless (<= early-1980 (stat:mtime stat)) (utime file early-1980 early-1980)) - #t)) - #t))) + #t))))) (add-after 'build 'patch-exec-bin-sh (lambda _ (substitute* "test/run" - (("/bin/sh") (which "sh"))) - #t)) + (("/bin/sh") (which "sh"))))) (add-before 'check 'patch-tests (lambda _ ;; The coreutils do not have an ACL bit to remove from their @@ -84,12 +82,9 @@ (define-public acl (substitute* "Makefile.in" ((".*test/misc\\.test.*") "") ((".*test/cp\\.test.*") "") - ((".*test/setfacl-X\\.test.*") "")) - #t))))) + ((".*test/setfacl-X\\.test.*") ""))))))) (inputs (list attr)) - (native-inputs - `(("gettext" ,gettext-minimal) - ("perl" ,perl))) + (native-inputs (list gettext-minimal perl)) (home-page "https://savannah.nongnu.org/projects/acl") (synopsis "Library and tools for manipulating access control lists") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:33:07 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:33:07 +0000 Received: from localhost ([127.0.0.1]:60788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptBn-0003IR-E8 for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:07 -0400 Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]:41989) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptBg-0003HB-Rq for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:00 -0400 Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-77574c2cffdso395054285a.0 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:32:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869150; x=1697473950; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=foVBjrDZ9PSCtvzfBGiSh/GcMzUCDrYZ3JqNlPnDtHo=; b=SAl43ZVGfSnYz4si5zpWAm+947kZgr6fGZB8RhSlbtosEkpnsrCkn0D/yeH+iXyNP6 4kAhdhDUs9ZXUpRSFrQEnYevNjSza44p9lBHd0CUXYvFBvgH3ryoqXi5lYK0xRVQvLmL jrn16y6TfIYWHnH+MLwbDP5ym0zYxeZ6xdB4Hrv6vl/G/G9nwIXubt3EVsoXRvEjvCo7 CJY0WP663A/PgQ+NgchXVIK+lZHfO/cOuZo7qvdZmIFwgPTP/PPdLaZfXS8DbOxTZHEp wwE03C/LTeyfyYX3mwRGjm6MqJX1OXsmAe7j/g/vFX/nAJdo4f+GtfJlIFjoH8nzxquF rwig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869150; x=1697473950; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=foVBjrDZ9PSCtvzfBGiSh/GcMzUCDrYZ3JqNlPnDtHo=; b=rMUo4/PuYj3bm9FgPgzq2pSlHmyTucOO+pRoS1THcYBHougKqwSUPQ39S/gOrvJb6X eReCSllbC8ofVn8NN1KuwQK2HAa1uHh/kpo5jQz/5Tp+t3BYFclQxf7RT7cHU4lNg42P ub9lcbi1DwaNCrK/nZFTJm8/CmldNFYmXM78q0xtknD05I838BlzcsITSLLlDSwJUx4Q RqQf/SmGbvite8zsA5DTMH6lHtc33nUE/SHYCbemPOQ+sljD6akBXaY3gQm4D1e4VIu3 q4VIUOrNzdHR/5vsfrqRJNTzplKCfhTlsV3riIjBMS+8fPzXn9R2hH7/DK6okiTJoVoD bj5g== X-Gm-Message-State: AOJu0YwGsEFIqTfINZF5r7OYZWgNNR5j2SHVWGQf6QhuXAu+TBR+ZkF8 iQCyDNChzMsbYFdeB7CUooa5Vb6FRqY= X-Google-Smtp-Source: AGHT+IGuzYC5IIfB4Rj9lwQE+FRnc5vau6d1+IMJmlS+HmJM3BVmelTJnHr0U34S4a4BTeLxi2+eUA== X-Received: by 2002:a05:620a:2802:b0:774:364c:4e36 with SMTP id f2-20020a05620a280200b00774364c4e36mr16367999qkp.37.1696869148941; Mon, 09 Oct 2023 09:32:28 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id z7-20020a05620a100700b0076f19b9e96fsm3645769qkj.107.2023.10.09.09.32.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:32:28 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 01/65] build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-modules. Date: Mon, 9 Oct 2023 12:28:39 -0400 Message-ID: <7ab0ec82c69e636c35eb22ff22291f2ba40ea4c1.1696868939.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: =?UTF-8?Q?Maxim_Cournoyer_=3Cmaxim=2Ecournoyer=40gmail=2Ecom=3E=2C_Si?= =?UTF-8?Q?mon_Tournier_=3Czimon=2Etoutoune=40gmail=2Ecom=3E=2C_Ludovic_Court=C3=A8s_=3Cl?= =?UTF-8?Q?udo=40gnu=2Eorg=3E=2C_Liliana_Marie_Prikler_=3Cliliana=2Eprikler=40gmail=2Ec?= =?UTF-8?Q?om=3E=2C_Andreas_Enge_=3Candreas=40enge=2Efr=3E=2C_Andrew_Tropin_=3Candrew=40t?= =?UTF-8?Q?rop=2Ein=3E=2C_Bj=C3=B6rn_H=C3=B6fling_=3Cbjoern=2Ehoefling=40bjoernhoefling=2Ede=3E?= =?UTF-8?Q?=2C_Christopher_Baines_=3Cguix=40cbaines=2Enet=3E=2C_Efraim_Flashner_=3Cef?= =?UTF-8?Q?raim=40flashner=2Eco=2Eil=3E=2C_Eric_Bavier_=3Cbavier=40posteo=2Enet=3E=2C_Guill?= =?UTF-8?Q?aume_Le_Vaillant_=3Cglv=40posteo=2Enet=3E=2C_Jonathan_Brielmaier_=3Cjona?= =?UTF-8?Q?than=2Ebrielmaier=40web=2Ede=3E=2C_Julien_Lepiller_=3Cjulien=40lepiller=2Eeu?= =?UTF-8?Q?=3E=2C_Katherine_Cox=2DBuday_=3Ccox=2Ekatherine=2Ee=2Bguix=40gmail=2Ecom=3E=2C_Lar?= =?UTF-8?Q?s=2DDominik_Braun_=3Clars=406xq=2Enet=3E=2C_Leo_Famulari_=3Cleo=40famulari=2En?= =?UTF-8?Q?ame=3E=2C_Marius_Bakke_=3Cmarius=40gnu=2Eorg=3E=2C_Munyoki_Kilyungi_=3Cme=40bo?= =?UTF-8?Q?nfacemunyoki=2Ecom=3E=2C_Philip_McGrath_=3Cphilip=40philipmcgrath=2Ecom=3E?= =?UTF-8?Q?=2C_Raghav_Gururajan_=3Crg=40raghavgururajan=2Ename=3E=2C_Ricardo_Wurmus?= =?UTF-8?Q?_=3Crekado=40elephly=2Enet=3E=2C_Tobias_Geerinckx=2DRice_=3Cme=40tobias=2Egr=3E=2C?= =?UTF-8?Q?_Vagrant_Cascadian_=3Cvagrant=40debian=2Eorg=3E=2C_Zhu_Zihao_=3Call=5Fbut=5F?= =?UTF-8?Q?last=40163=2Ecom=3E=2C_jgart_=3Cjgart=40dismail=2Ede=3E=2C_pukkamustard_=3Cpukka?= =?UTF-8?Q?mustard=40posteo=2Enet=3E=2C_=E5=AE=8B=E6=96=87=E6=AD=A6_=3Ciyzsong=40envs=2Enet=3E?= Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Until now users would have to cargo cult or inspect the private %default-modules variable of (guix build-systems gnu) to discover which modules to include when extending the used modules via the #:modules argument. The renaming was automated via the command: $ git grep -l %gnu-build-system-modules | xargs sed 's/%gnu-build-system-modules/%default-gnu-imported-modules/' -i * guix/build-system/gnu.scm (%gnu-build-system-modules): Rename to... (%default-gnu-imported-modules): ... this. (%default-modules): Rename to... (%default-gnu-modules): ... this. Export. Change-Id: Idef307fff13cb76f3182d782b26e1cd3a5c757ee --- gnu/packages/acl.scm | 2 +- gnu/packages/axoloti.scm | 4 +-- gnu/packages/backup.scm | 2 +- gnu/packages/base.scm | 2 +- gnu/packages/benchmark.scm | 2 +- gnu/packages/bioinformatics.scm | 4 +-- gnu/packages/boost.scm | 4 +-- gnu/packages/bootloaders.scm | 6 ++--- gnu/packages/bqn.scm | 2 +- gnu/packages/commencement.scm | 8 +++--- gnu/packages/cpp.scm | 2 +- gnu/packages/cross-base.scm | 2 +- gnu/packages/cups.scm | 6 ++--- gnu/packages/curl.scm | 4 +-- gnu/packages/debian.scm | 2 +- gnu/packages/dezyne.scm | 2 +- gnu/packages/dictionaries.scm | 2 +- gnu/packages/djvu.scm | 4 +-- gnu/packages/docker.scm | 2 +- gnu/packages/emacs-xyz.scm | 20 +++++++-------- gnu/packages/emulators.scm | 2 +- gnu/packages/engineering.scm | 4 +-- gnu/packages/esolangs.scm | 2 +- gnu/packages/firmware.scm | 2 +- gnu/packages/fonts.scm | 4 +-- gnu/packages/freedesktop.scm | 2 +- gnu/packages/game-development.scm | 4 +-- gnu/packages/gcc.scm | 6 ++--- gnu/packages/gdb.scm | 2 +- gnu/packages/genimage.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/gimp.scm | 2 +- gnu/packages/gnome.scm | 2 +- gnu/packages/gnucash.scm | 2 +- gnu/packages/gnupg.scm | 2 +- gnu/packages/gnuzilla.scm | 6 ++--- gnu/packages/graph.scm | 4 +-- gnu/packages/guile-xyz.scm | 38 ++++++++++++++--------------- gnu/packages/ibus.scm | 2 +- gnu/packages/image.scm | 2 +- gnu/packages/instrumentation.scm | 2 +- gnu/packages/java.scm | 4 +-- gnu/packages/language.scm | 2 +- gnu/packages/linux.scm | 6 ++--- gnu/packages/machine-learning.scm | 4 +-- gnu/packages/mail.scm | 6 ++--- gnu/packages/make-bootstrap.scm | 2 +- gnu/packages/maths.scm | 8 +++--- gnu/packages/messaging.scm | 2 +- gnu/packages/mpd.scm | 2 +- gnu/packages/mpi.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/networking.scm | 2 +- gnu/packages/ocaml.scm | 2 +- gnu/packages/openldap.scm | 2 +- gnu/packages/package-management.scm | 8 +++--- gnu/packages/password-utils.scm | 2 +- gnu/packages/plotutils.scm | 4 +-- gnu/packages/qt.scm | 6 ++--- gnu/packages/racket.scm | 2 +- gnu/packages/ratpoison.scm | 2 +- gnu/packages/scheme.scm | 2 +- gnu/packages/selinux.scm | 2 +- gnu/packages/shellutils.scm | 2 +- gnu/packages/simh.scm | 2 +- gnu/packages/speech.scm | 2 +- gnu/packages/stb.scm | 2 +- gnu/packages/telegram.scm | 4 +-- gnu/packages/texinfo.scm | 2 +- gnu/packages/text-editors.scm | 2 +- gnu/packages/version-control.scm | 4 +-- gnu/packages/video.scm | 2 +- gnu/packages/virtualization.scm | 8 +++--- gnu/packages/web-browsers.scm | 2 +- gnu/packages/web.scm | 2 +- gnu/packages/xdisorg.scm | 2 +- gnu/packages/xorg.scm | 2 +- guix/build-system/agda.scm | 2 +- guix/build-system/android-ndk.scm | 2 +- guix/build-system/ant.scm | 2 +- guix/build-system/asdf.scm | 2 +- guix/build-system/cargo.scm | 2 +- guix/build-system/chicken.scm | 2 +- guix/build-system/cmake.scm | 2 +- guix/build-system/copy.scm | 2 +- guix/build-system/dub.scm | 2 +- guix/build-system/elm.scm | 2 +- guix/build-system/emacs.scm | 2 +- guix/build-system/font.scm | 2 +- guix/build-system/glib-or-gtk.scm | 2 +- guix/build-system/gnu.scm | 13 +++++----- guix/build-system/go.scm | 2 +- guix/build-system/guile.scm | 2 +- guix/build-system/haskell.scm | 2 +- guix/build-system/julia.scm | 2 +- guix/build-system/linux-module.scm | 2 +- guix/build-system/maven.scm | 2 +- guix/build-system/minify.scm | 2 +- guix/build-system/node.scm | 2 +- guix/build-system/ocaml.scm | 2 +- guix/build-system/perl.scm | 2 +- guix/build-system/python.scm | 2 +- guix/build-system/r.scm | 2 +- guix/build-system/rakudo.scm | 2 +- guix/build-system/rebar.scm | 2 +- guix/build-system/renpy.scm | 2 +- guix/build-system/ruby.scm | 2 +- guix/build-system/scons.scm | 2 +- guix/build-system/texlive.scm | 2 +- guix/build-system/waf.scm | 2 +- tests/modules.scm | 8 +++--- 111 files changed, 187 insertions(+), 186 deletions(-) diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index eb20fdd549..3e97332243 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -52,7 +52,7 @@ (define-public acl (build-system gnu-build-system) (arguments `(#:modules ((ice-9 ftw) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags '("--disable-static") #:tests? ,(not (or (%current-target-system) (target-hurd?))) diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm index 7b36922860..83e5056b16 100644 --- a/gnu/packages/axoloti.scm +++ b/gnu/packages/axoloti.scm @@ -230,7 +230,7 @@ (define-public axoloti-patcher (sxml xpath) (sxml transform)) #:imported-modules ((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'make-git-checkout-writable @@ -387,7 +387,7 @@ (define-public axoloti-patcher-next (sxml xpath) (sxml transform)) #:imported-modules ((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'make-git-checkout-writable diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 12c4a45b9d..63b6055c5e 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -813,7 +813,7 @@ (define-public dirvish "1kbxa1irszp2zw8hd5qzqnrrzb4vxfivs1vn64yxnj0lak1jjzvb")))) (arguments `(#:modules ((ice-9 match) (ice-9 rdelim) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases ;; This mostly mirrors the steps taken in the install.sh that ships ;; with dirvish, but simplified because we aren't prompting interactively diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 571e612abb..34dc9a037f 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1294,7 +1294,7 @@ (define-public (make-glibc-locales glibc) ,@modules)) ((#:imported-modules modules '()) `((gnu build locale) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) ((#:phases phases) `(modify-phases ,phases (replace 'build diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 4d92457e59..89f65a5205 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -90,7 +90,7 @@ (define-public fio (build-system gnu-build-system) (arguments (list #:modules - `(,@%gnu-build-system-modules + `(,@%default-gnu-imported-modules (ice-9 textual-ports)) #:test-target "test" #:configure-flags diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index cb0bdf766e..27a3bff63e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -20421,9 +20421,9 @@ (define-public ccwl `(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings #:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'install 'wrap diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 98dccf7f16..e8fc1503de 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -113,9 +113,9 @@ (define-public boost (arguments (list #:imported-modules `((guix build python-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules `(((guix build python-build-system) #:select (python-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:tests? #f #:configure-flags #~(let ((icu (dirname (dirname (search-input-file diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 1124eca837..8869680b24 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -577,7 +577,7 @@ (define-public dtc (build-system gnu-build-system) (arguments (list - #:modules `(,@%gnu-build-system-modules (srfi srfi-26)) + #:modules `(,@%default-gnu-imported-modules (srfi srfi-26)) #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) ;; /bin/fdt{get,overlay,put} need help finding libfdt.so.1. @@ -942,7 +942,7 @@ (define*-public (make-u-boot-package board triplet ,@modules)) ((#:imported-modules imported-modules '()) `((guix build kconfig) - ,@%gnu-build-system-modules + ,@%default-gnu-imported-modules ,@imported-modules)) ((#:test-target _ "test") "test") @@ -1808,7 +1808,7 @@ (define-public ipxe (ice-9 regex) (rnrs bytevectors)) #:imported-modules `((guix base32) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:make-flags ;; XXX: 'BUILD_ID' is used to determine when another ROM in the ;; system contains identical code in order to save space within the diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index 4d03385d21..fd090ad433 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -52,7 +52,7 @@ (define-public dbqn (build-system gnu-build-system) (arguments (list - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build ant-build-system)) #:modules `((guix build gnu-build-system) ((guix build ant-build-system) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 80fdb5aed7..421f3fe050 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -145,7 +145,7 @@ (define bootar #:tests? #f #:guile ,%bootstrap-guile #:imported-modules ((guix build gnu-bootstrap) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (begin (use-modules (guix build gnu-bootstrap)) @@ -185,7 +185,7 @@ (define gash-boot #:tests? #f #:guile ,%bootstrap-guile #:imported-modules ((guix build gnu-bootstrap) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (begin (use-modules (guix build gnu-bootstrap)) @@ -214,7 +214,7 @@ (define gash-utils-boot #:tests? #f #:guile ,%bootstrap-guile #:imported-modules ((guix build gnu-bootstrap) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (begin (use-modules (guix build gnu-bootstrap)) @@ -3236,7 +3236,7 @@ (define gcc-final ;; Additional modules for the libstdc++ phase below. #:modules `((srfi srfi-1) (srfi srfi-26) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) (substitute-keyword-arguments (package-arguments gcc) ((#:make-flags flags) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 7d9eb2a264..d93f1ab205 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1842,7 +1842,7 @@ (define-public libxsd-frontend (arguments `(#:test-target "test" #:imported-modules ((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build copy-build-system) #:prefix copy:) (guix build gnu-build-system) (guix build utils)) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 14cb365099..46c70fd432 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -286,7 +286,7 @@ (define* (cross-gcc target (arguments `(#:implicit-inputs? #f #:imported-modules ((gnu build cross-toolchain) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules ((guix build gnu-build-system) (guix build utils) (gnu build cross-toolchain) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index c20b06b4db..e43215d726 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -561,7 +561,7 @@ (define-public hplip (arguments (list #:imported-modules `((guix build python-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules '((guix build gnu-build-system) (guix build utils) ((guix build python-build-system) #:prefix python:)) @@ -880,7 +880,7 @@ (define-public epson-inkjet-printer-escpr (arguments (list #:modules `((srfi srfi-26) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags #~(list "--disable-static" (string-append "--prefix=" #$output) @@ -941,7 +941,7 @@ (define-public splix (arguments `(#:modules ((srfi srfi-26) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:make-flags (list (string-append "CUPSDRV=" (assoc-ref %outputs "out") "/share/cups/drv") diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index cadf1ca361..5c8d88692e 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -238,9 +238,9 @@ (define-public guile-curl (arguments `(#:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags (list (string-append "--with-guilesitedir=" (assoc-ref %outputs "out") diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 6e40096199..7f41dc8128 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -355,7 +355,7 @@ (define-public dpkg (arguments (list #:modules `((srfi srfi-71) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-before 'bootstrap 'patch-version diff --git a/gnu/packages/dezyne.scm b/gnu/packages/dezyne.scm index db3523ac3e..dc2453b521 100644 --- a/gnu/packages/dezyne.scm +++ b/gnu/packages/dezyne.scm @@ -51,7 +51,7 @@ (define-public dezyne (arguments (list #:modules `((ice-9 popen) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-before 'configure 'setenv diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 06b5c4362c..55ff0398fd 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -280,7 +280,7 @@ (define-public translate-shell (assoc-ref emacs:%standard-phases 'enable-autoloads-compilation))) #:make-flags (list (string-append "PREFIX=" %output) "NETWORK_ACCESS=no test") - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:modules ((guix build gnu-build-system) diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm index 743fc7e284..084aba2398 100644 --- a/gnu/packages/djvu.scm +++ b/gnu/packages/djvu.scm @@ -309,7 +309,7 @@ (define-public didjvu `(#:modules ((guix build gnu-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) #:test-target "test" #:phases @@ -395,7 +395,7 @@ (define-public ocrodjvu #:modules '((guix build gnu-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build python-build-system)) #:test-target "test" #:phases diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 3b809feb67..08e85f7739 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -340,7 +340,7 @@ (define-public docker (guix build union) (guix build utils)) #:imported-modules - `(,@%gnu-build-system-modules + `(,@%default-gnu-imported-modules (guix build union) (guix build go-build-system)) #:phases diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cf1542955c..14395b0157 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2240,7 +2240,7 @@ (define-public emacs-shroud `(#:modules ((guix build gnu-build-system) ((guix build emacs-build-system) #:prefix emacs:) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:configure-flags (list (string-append "--with-lispdir=" @@ -2353,8 +2353,8 @@ (define-public emacs-haskell-mode #:modules `((ice-9 match) (srfi srfi-26) ((guix build emacs-build-system) #:prefix emacs:) - ,@%gnu-build-system-modules) - #:imported-modules `(,@%gnu-build-system-modules + ,@%default-gnu-imported-modules) + #:imported-modules `(,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:phases @@ -3139,7 +3139,7 @@ (define-public emacs-w3m ((guix build emacs-build-system) #:prefix emacs:) (guix build utils) (guix build emacs-utils)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:configure-flags @@ -3694,7 +3694,7 @@ (define-public emacs-eweouz ((guix build emacs-build-system) #:prefix emacs:) (guix build utils) (guix build emacs-utils)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:configure-flags @@ -4256,7 +4256,7 @@ (define-public emacs-howm #:modules ((guix build gnu-build-system) ((guix build emacs-build-system) #:prefix emacs:) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:phases @@ -5207,7 +5207,7 @@ (define-public emacs-pdf-tools ((guix build emacs-build-system) #:prefix emacs:) (guix build utils) (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:phases @@ -5415,7 +5415,7 @@ (define-public emacs-guix #:modules '((guix build gnu-build-system) ((guix build emacs-build-system) #:prefix emacs:) (guix build utils)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:configure-flags @@ -8466,7 +8466,7 @@ (define-public emacs-dvc #:modules `((guix build gnu-build-system) ((guix build emacs-build-system) #:prefix emacs:) (guix build utils)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:configure-flags @@ -35419,7 +35419,7 @@ (define-public emacs-ddskk `(#:modules ((guix build gnu-build-system) (guix build utils) (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-utils)) #:test-target "test" #:phases diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 0cb947c58a..8c0005c347 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -182,7 +182,7 @@ (define-public blastem #:tests? #f ; No check target and custom tests don't seem to build #:imported-modules ((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build copy-build-system) #:prefix copy:) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index a56f2ecff1..365434fa2f 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -589,7 +589,7 @@ (define-public fastcap #:parallel-build? #f #:tests? #f ;; no tests-suite #:modules ((srfi srfi-1) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'build 'make-doc @@ -686,7 +686,7 @@ (define-public fasthenry #:parallel-build? #f #:tests? #f ;; no tests-suite #:modules ((srfi srfi-1) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (delete 'configure) diff --git a/gnu/packages/esolangs.scm b/gnu/packages/esolangs.scm index 0651dda1b0..796f8d3f23 100644 --- a/gnu/packages/esolangs.scm +++ b/gnu/packages/esolangs.scm @@ -135,7 +135,7 @@ (define-public shakespeare-spl "shakespeare-spl-fix-grammar.patch")))) (build-system copy-build-system) (arguments - `(#:imported-modules (,@%gnu-build-system-modules + `(#:imported-modules (,@%default-gnu-imported-modules (guix build copy-build-system)) #:modules ((guix build copy-build-system) ((guix build gnu-build-system) #:prefix gnu:) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 8be3f4e5cc..7734b3ef51 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -647,7 +647,7 @@ (define-public seabios-qemu (supported-systems %supported-systems) (arguments (substitute-keyword-arguments (package-arguments seabios) - ((#:modules modules %gnu-build-system-modules) + ((#:modules modules %default-gnu-imported-modules) `((ice-9 match) (ice-9 threads) ,@modules)) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 0c380adaa8..f50c8e6a1d 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -855,9 +855,9 @@ (define-public font-amiri (build-system gnu-build-system) (arguments (list - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build font-build-system)) - #:modules `(,@%gnu-build-system-modules + #:modules `(,@%default-gnu-imported-modules ((guix build font-build-system) #:prefix font:)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-source diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e4f8b16755..e05720ab16 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -498,7 +498,7 @@ (define-public xdg-utils (list #:tests? #f ;no check target #:modules `((srfi srfi-26) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-hardcoded-paths diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index eb1d74d1e1..9d956359bd 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -649,9 +649,9 @@ (define-public tsukundere (srfi srfi-1) ((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-command diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 5c6ef8ccbf..ffc7166349 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -448,7 +448,7 @@ (define-public gcc-4.9 ;; For native builds of GCC 4.9 and GCC 5, the C++ include path needs ;; to be adjusted so it does not interfere with GCC's own build processes. (substitute-keyword-arguments (package-arguments parent) - ((#:modules modules %gnu-build-system-modules) + ((#:modules modules %default-gnu-imported-modules) `((srfi srfi-1) ,@modules)) ((#:phases phases) @@ -901,7 +901,7 @@ (define-public (make-libstdc++ gcc) #:out-of-source? #t #:modules `((srfi srfi-1) (srfi srfi-26) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases #$@(if (version>=? (package-version gcc) "11") @@ -1042,7 +1042,7 @@ (define* (custom-gcc gcc name languages (properties (alist-delete 'hidden? (package-properties gcc))) (arguments (substitute-keyword-arguments (package-arguments gcc) - ((#:modules modules %gnu-build-system-modules) + ((#:modules modules %default-gnu-imported-modules) `(,@modules (srfi srfi-1) (srfi srfi-26) diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index d3881ed9d7..eb90a01c53 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -64,7 +64,7 @@ (define-public gdb/pinned `(#:tests? #f ;FIXME: 217 unexpected failures #:out-of-source? #t #:modules ((srfi srfi-1) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm index 4a9d24fe78..94a85ce2e4 100644 --- a/gnu/packages/genimage.scm +++ b/gnu/packages/genimage.scm @@ -61,7 +61,7 @@ (define-public genimage (arguments `(#:modules ((ice-9 match) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'guixify diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 3c238cd62a..da473d6f97 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2545,7 +2545,7 @@ (define-public grass #:modules ((guix build gnu-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index b1ff08d652..54fbcdcee8 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -304,7 +304,7 @@ (define-public gimp (list #:modules `((ice-9 popen) (ice-9 rdelim) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'remove-gcc-reference diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 908b5782b5..2bcc3421d1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11531,7 +11531,7 @@ (define-public soundconverter (arguments `(#:imported-modules ((guix build python-build-system) (guix build glib-or-gtk-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules ((guix build glib-or-gtk-build-system) (guix build utils) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index f750b975eb..703710c532 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -81,7 +81,7 @@ (define-public gnucash #:test-target "check" #:configure-flags #~(list "-DWITH_PYTHON=ON") #:make-flags #~(list "GUILE_AUTO_COMPILE=0") - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build cmake-build-system) (guix build glib-or-gtk-build-system)) #:modules '((guix build cmake-build-system) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index a5b8587a14..80ffe2d1b8 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -930,7 +930,7 @@ (define-public pinentry-rofi `(#:modules ((ice-9 match) (ice-9 ftw) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ac96d7fb1f..3a3e477d7f 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -117,7 +117,7 @@ (define-public mozjs (list #:imported-modules %cargo-utils-modules ;for `generate-all-checksums' #:modules `((guix build cargo-utils) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:test-target "check-jstests" #:configure-flags #~(list @@ -876,7 +876,7 @@ (define-public icecat-minimal (rnrs io ports) (guix elf) (guix build gremlin) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'apply-guix-specific-patches @@ -1625,7 +1625,7 @@ (define-public icedove-minimal #:modules `((guix build utils) ;find-files (sxml simple) (ice-9 regex) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-after 'patch-source-shebangs 'patch-cargo-checksums diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 45a591b9f3..9b558ae2cc 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -636,9 +636,9 @@ (define-public python-graph-tool "0wmvzx509lvigja6cfxh45r4b7wns64vmik0x4rz4y4fnxrhw2m2")))) (build-system gnu-build-system) (arguments - `(#:imported-modules (,@%gnu-build-system-modules + `(#:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) - #:modules (,@%gnu-build-system-modules + #:modules (,@%default-gnu-imported-modules ((guix build python-build-system) #:select (site-packages))) #:configure-flags (list (string-append "--with-boost=" diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 0adcb5b4f4..212741b5c5 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -195,9 +195,9 @@ (define-public artanis (arguments `(#:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:make-flags ;; TODO: The documentation must be built with the `docs' target. (let* ((out (assoc-ref %outputs "out")) @@ -284,9 +284,9 @@ (define-public guilescript `(#:make-flags '("GUILE_AUTO_COMPILE=0") #:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'install 'wrap-guilescript (lambda* (#:key outputs #:allow-other-keys) @@ -753,9 +753,9 @@ (define-public guile-dsv (arguments `(#:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) @@ -1799,9 +1799,9 @@ (define-public guile-dbi (arguments `(#:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags (list (string-append "--with-guile-site-dir=" %output "/share/guile/site/" @@ -1983,7 +1983,7 @@ (define-public guile-hall `(#:modules ((ice-9 match) (ice-9 ftw) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases @@ -2143,7 +2143,7 @@ (define-public guile-wisp (guix build emacs-utils) (ice-9 rdelim) (ice-9 popen)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:phases @@ -2537,7 +2537,7 @@ (define-public guile-ncurses #:select (target-guile-effective-version)) (guix build utils)) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags (list "--with-ncursesw" ; Unicode support "--with-gnu-filesystem-hierarchy") #:phases @@ -2813,7 +2813,7 @@ (define-public haunt (build-system gnu-build-system) (arguments `(#:modules ((ice-9 match) (ice-9 ftw) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:tests? #f ; test suite is non-deterministic :( #:phases (modify-phases %standard-phases (add-after 'install 'wrap-haunt @@ -3098,7 +3098,7 @@ (define-public guile-studio `(#:modules ((ice-9 match) (srfi srfi-1) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:tests? #f ; there are none #:make-flags (list (string-append "PICT_DIR=" @@ -5127,9 +5127,9 @@ (define-public guile-libyaml (arguments `(#:modules (((guix build guile-build-system) #:prefix guile:) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:tests? #false ; there are none #:phases (modify-phases %standard-phases @@ -5315,9 +5315,9 @@ (define-public guile-gitlab `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings #:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'install 'wrap-program @@ -5378,9 +5378,9 @@ (define-public guile-smc `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings #:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (delete 'strip) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 1e01bb0ea3..f2ca06a66e 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -519,7 +519,7 @@ (define-public rime-data (build-system gnu-build-system) (arguments `(#:modules ((ice-9 match) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:tests? #f ; no tests #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index bd3bcf964d..1967715bc4 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -882,7 +882,7 @@ (define-public jbigkit (outputs (list "out" "pbmtools")) (arguments `(#:modules ((srfi srfi-26) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 7fa7b2f7ba..45ce747f70 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -572,7 +572,7 @@ (define-public uftrace (list #:modules `((ice-9 match) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:make-flags #~(list (string-append "CC=" #$(cc-for-target))) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 30a59ec5a3..490492f68f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -715,7 +715,7 @@ (define-public icedtea-8 (arguments `(#:imported-modules ((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:disallowed-references ,(list (gexp-input icedtea-7 "jdk")) @@ -7874,7 +7874,7 @@ (define-public antlr2 (arguments `(#:tests? #f ; no test target #:imported-modules ((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build ant-build-system) #:prefix ant:) (guix build gnu-build-system) (guix build utils)) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index faf3114b84..1366d5a31c 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -969,7 +969,7 @@ (define-public skktools #:prefix emacs:) (guix build utils) (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5830368a64..bc0f3ca38a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -265,7 +265,7 @@ (define* (customize-linux #:key name (arguments (substitute-keyword-arguments (package-arguments linux) - ((#:imported-modules imported-modules %gnu-build-system-modules) + ((#:imported-modules imported-modules %default-gnu-imported-modules) `((guix build kconfig) ,@imported-modules)) ((#:modules modules) `((guix build kconfig) ,@modules)) @@ -5636,7 +5636,7 @@ (define-public mdadm-static (for-each delete-file-recursively directories) (remove-store-references "sbin/mdadm") (delete-file "sbin/mdmon"))))))) - ((#:modules modules %gnu-build-system-modules) + ((#:modules modules %default-gnu-imported-modules) `((ice-9 ftw) ,@modules)) ((#:strip-flags _ '()) ''("--strip-all")) ;strip a few extra KiB @@ -6994,7 +6994,7 @@ (define-public ecryptfs-utils (build-system gnu-build-system) (arguments `(#:configure-flags (list "--disable-pywrap") - #:modules (,@%gnu-build-system-modules + #:modules (,@%default-gnu-imported-modules (ice-9 binary-ports) (rnrs bytevectors) (srfi srfi-26)) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 16781b7aa1..17b0c35f6a 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -279,10 +279,10 @@ (define-public ghmm "07kdsngvr4n1qxpqzv1nlay7g41d6jzjppa8vzmrg220s8ing87z")))) (build-system gnu-build-system) (arguments - `(#:imported-modules (,@%gnu-build-system-modules + `(#:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) #:modules ((guix build python-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-dir diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 73026012a9..ec5750c7e2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1170,7 +1170,7 @@ (define-public emacs-mew #:modules '((guix build gnu-build-system) (guix build utils) (guix build emacs-utils)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build emacs-utils)) #:tests? #f #:configure-flags @@ -4099,7 +4099,7 @@ (define-public mumi #:select (target-guile-effective-version)) (guix build utils)) #:imported-modules `((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags '(list "--localstatedir=/var") @@ -4680,7 +4680,7 @@ (define-public crm114 ((guix build emacs-build-system) #:prefix emacs:) (guix build utils) (ice-9 string-fun)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:make-flags (list (string-append "prefix=" %output) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 7b40f395f3..45fc2ac002 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -472,7 +472,7 @@ (define %gcc-static (outputs '("out")) ; all in one (arguments (substitute-keyword-arguments (package-arguments gcc-7) - ((#:modules modules %gnu-build-system-modules) + ((#:modules modules %default-gnu-imported-modules) `((srfi srfi-1) (srfi srfi-26) (ice-9 regex) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 27ca2d5f18..62bbdc274a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3894,7 +3894,7 @@ (define-public mumps `(#:modules ((ice-9 match) (ice-9 popen) (srfi srfi-1) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (replace 'configure @@ -5883,7 +5883,7 @@ (define-public hypre (list openblas lapack)) (arguments `(#:modules ((srfi srfi-1) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags '("--enable-shared" "--disable-fortran" "--without-MPI" @@ -6385,7 +6385,7 @@ (define-public ocaml-z3 (build-system gnu-build-system) (arguments `(#:imported-modules ((guix build python-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build python-build-system) #:select (site-packages)) (guix build gnu-build-system) (guix build utils)) @@ -7888,7 +7888,7 @@ (define-public lingeling (arguments (list #:test-target "test" #:modules `((ice-9 match) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags #~(list "--aiger=.") #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 73f8e9eb6a..4a889f3fe7 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1356,7 +1356,7 @@ (define-public dino #:modules '((guix build cmake-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build cmake-build-system) (guix build glib-or-gtk-build-system)) #:phases diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 86f18e8d77..c2f08d32c2 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -377,7 +377,7 @@ (define-public sonata (guix build python-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system) (guix build glib-or-gtk-build-system)) #:phases diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index baf6ce11e0..eec13e450d 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -333,7 +333,7 @@ (define-public java-openmpi ((guix build ant-build-system) #:prefix ant:) (guix build utils)) #:imported-modules `((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) (substitute-keyword-arguments (package-arguments openmpi) ((#:configure-flags flags) #~(cons "--enable-mpi-java" #$flags)) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6b19e9dde4..27086a5b68 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3387,7 +3387,7 @@ (define-public jack-select `(#:modules ((guix build gnu-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 84585cdd0f..b2baa4d335 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3793,7 +3793,7 @@ (define-public opendht (arguments (list #:imported-modules `((guix build python-build-system) ;for site-packages - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules '(((guix build python-build-system) #:prefix python:) (guix build gnu-build-system) (guix build utils)) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8543505dbb..d2727ddf13 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1198,7 +1198,7 @@ (define-public emacs-tuareg (build-system gnu-build-system) (arguments (list - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:modules '((guix build gnu-build-system) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index bd244cea1e..3f441f56b4 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -232,7 +232,7 @@ (define-public 389-ds-base #:select (add-installed-pythonpath python-version)) (guix build utils)) #:imported-modules `((guix build python-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:disallowed-references (list httpd) #:configure-flags #~(list "--enable-cmocka" diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 266b6dc352..3bcb9a5867 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1529,9 +1529,9 @@ (define-public guix-build-coordinator (list #:modules `(((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules `((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-before 'build 'set-GUILE_AUTO_COMPILE @@ -1773,9 +1773,9 @@ (define-public nar-herder (list #:modules `(((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules `((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-before 'build 'set-GUILE_AUTO_COMPILE diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 9558da1dee..abbfdc7dfb 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -845,7 +845,7 @@ (define-public qtpass `(#:modules ((guix build gnu-build-system) (guix build qt-utils) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build qt-utils)) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 114cde6f1f..9b3bb4dfc8 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -146,7 +146,7 @@ (define-public guile-plotutils (build-system gnu-build-system) (arguments `(#:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) (guix build gnu-build-system) @@ -340,7 +340,7 @@ (define-public asymptote (guix build gnu-build-system) (guix build utils) (srfi srfi-26)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build emacs-utils)) #:configure-flags #~(list (string-append "--enable-gc=" #$(this-package-input "libgc")) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b7e394d663..c0abf7f391 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3524,10 +3524,10 @@ (define-public python-sip-4 (arguments `(#:tests? #f ; no check target #:imported-modules ((guix build python-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules ((srfi srfi-1) ((guix build python-build-system) #:select (python-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (replace 'configure @@ -3933,7 +3933,7 @@ (define-public qtsolutions `(#:tests? #f ; No target #:imported-modules ((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build copy-build-system) #:prefix copy:) (guix build gnu-build-system) diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 1e97f19dbb..8ebcc2946a 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -575,7 +575,7 @@ (define-public racket-minimal (guix build union) (ice-9 match)) #:imported-modules `((guix build union) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (delete 'unpack) diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm index 14933da5a8..b39b679b7e 100644 --- a/gnu/packages/ratpoison.scm +++ b/gnu/packages/ratpoison.scm @@ -48,7 +48,7 @@ (define-public ratpoison (arguments (list #:modules `((ice-9 format) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) ;; Specify the absolute location of xterm, as the user experience sucks ;; when no terminal is available (can't consult help with 'C-t ?', for ;; example). diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index ad06d7db06..eee39a55a5 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -1252,7 +1252,7 @@ (define-public stklos (arguments (list #:modules `((ice-9 ftw) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-before 'configure 'patch-sh-references diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index c45570744a..2405fccc8c 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -258,7 +258,7 @@ (define-public python-sepolgen (name "python-sepolgen") (arguments (substitute-keyword-arguments (package-arguments libsepol) - ((#:modules _ #~%gnu-build-system-modules) + ((#:modules _ #~%default-gnu-imported-modules) '((srfi srfi-1) (guix build gnu-build-system) (guix build utils))) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 671848fd27..29ea0e4dd9 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -122,7 +122,7 @@ (define-public boxes "/etc/boxes-config")) #:modules ((ice-9 match) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (delete 'configure) diff --git a/gnu/packages/simh.scm b/gnu/packages/simh.scm index 9f5c04d8fb..7be6d934de 100644 --- a/gnu/packages/simh.scm +++ b/gnu/packages/simh.scm @@ -53,7 +53,7 @@ (define-public simh #:make-flags #~(list (string-append "GCC=" #$(cc-for-target) " -fcommon")) #:modules `((ice-9 string-fun) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (delete 'configure) diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm index 9939d2f165..2ea8e4f64f 100644 --- a/gnu/packages/speech.scm +++ b/gnu/packages/speech.scm @@ -347,7 +347,7 @@ (define-public festival #:modules ((guix build gnu-build-system) (guix build utils) (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-utils)) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/stb.scm b/gnu/packages/stb.scm index 4ee1b4ebd2..1e2f6a1f15 100644 --- a/gnu/packages/stb.scm +++ b/gnu/packages/stb.scm @@ -47,7 +47,7 @@ (define stb `(#:modules ((ice-9 ftw) (ice-9 regex) (srfi srfi-26) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (delete 'configure) (delete 'build) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 4814c22b6c..3a3f9bbb02 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -616,7 +616,7 @@ (define-public tgl `(#:tests? #f ; No target #:imported-modules ((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build copy-build-system) #:prefix copy:) @@ -686,7 +686,7 @@ (define-public telegram-cli `(#:tests? #f ; No target #:imported-modules ((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build copy-build-system) #:prefix copy:) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index f45ae06810..2080f97f47 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -230,7 +230,7 @@ (define-public info-reader #:disallowed-references ,(assoc-ref (package-inputs texinfo) "perl") #:modules ((ice-9 ftw) (srfi srfi-1) - ,@%gnu-build-system-modules))) + ,@%default-gnu-imported-modules))) (synopsis "Standalone Info documentation reader") (inputs (modify-inputs (package-inputs texinfo) (prepend gzip))))) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 7696217829..6d792fa3d8 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -1146,7 +1146,7 @@ (define-public geany )) (arguments `(#:imported-modules ((guix build glib-or-gtk-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build gnu-build-system) (guix build utils)) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d9c53af71c..38efff4d7b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -340,7 +340,7 @@ (define-public git #:modules ((srfi srfi-1) (srfi srfi-26) ((guix build gnu-build-system) #:prefix gnu:) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases ,@(if (%current-target-system) @@ -1736,7 +1736,7 @@ (define-public gitile (build-system gnu-build-system) (arguments `(#:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:make-flags (list "GUILE_AUTO_COMPILE=0") #:phases (modify-phases %standard-phases diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index bb6ce0cbf1..90623edfc1 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1822,7 +1822,7 @@ (define-public ffmpeg-3.4 "1rijdvcx8xjqwh084qchwz91vcj8wsvb4diax0g8miywpir00ccw")))) (arguments (substitute-keyword-arguments (package-arguments ffmpeg-4) - ((#:modules modules %gnu-build-system-modules) + ((#:modules modules %default-gnu-imported-modules) `((srfi srfi-1) ,@modules)) ((#:configure-flags flags) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 779164c53f..5398c8116c 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -237,7 +237,7 @@ (define-public qemu (srfi srfi-26) (ice-9 ftw) (ice-9 match) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases ;; Since we removed the bundled firmwares above, many tests @@ -678,10 +678,10 @@ (define-public ganeti "ganeti-relax-dependencies.patch")))) (build-system gnu-build-system) (arguments - `(#:imported-modules (,@%gnu-build-system-modules + `(#:imported-modules (,@%default-gnu-imported-modules (guix build haskell-build-system) (guix build python-build-system)) - #:modules (,@%gnu-build-system-modules + #:modules (,@%default-gnu-imported-modules ((guix build haskell-build-system) #:prefix haskell:) ((guix build python-build-system) #:select (site-packages)) (srfi srfi-1) @@ -1753,7 +1753,7 @@ (define-public criu (search-input-file %build-inputs "/bin/xmlto"))) #:modules ((ice-9 ftw) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index a8ef7099f5..42a15b14f5 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -374,7 +374,7 @@ (define-public kristall `(#:modules ((guix build gnu-build-system) (guix build qt-utils) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build qt-utils)) #:make-flags (list (string-append "PREFIX=" %output)) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5d873e0884..4a536ba4c4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -222,7 +222,7 @@ (define-public qhttp `(#:tests? #f ; no target #:imported-modules ((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build copy-build-system) #:prefix copy:) (guix build gnu-build-system) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index db948a9318..c2409ff4b7 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1498,7 +1498,7 @@ (define-public redshift "1fi27b73x85qqar526dbd33av7mahca2ykaqwr7siqiw1qqcby6j")))) (build-system gnu-build-system) (arguments - `(#:imported-modules (,@%gnu-build-system-modules + `(#:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 4b3c96794d..22f78a87f7 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6283,7 +6283,7 @@ (define-public uim `(#:modules ((guix build gnu-build-system) (guix build utils) (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-utils)) #:configure-flags (list "--with-anthy-utf8" diff --git a/guix/build-system/agda.scm b/guix/build-system/agda.scm index 64983dff60..409d0cda9d 100644 --- a/guix/build-system/agda.scm +++ b/guix/build-system/agda.scm @@ -38,7 +38,7 @@ (define (default-agda) (define %agda-build-system-modules `((guix build agda-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define %default-modules '((guix build agda-build-system) diff --git a/guix/build-system/android-ndk.scm b/guix/build-system/android-ndk.scm index 047f884b19..23e14c7801 100644 --- a/guix/build-system/android-ndk.scm +++ b/guix/build-system/android-ndk.scm @@ -32,7 +32,7 @@ (define %android-ndk-build-system-modules ;; Build-side modules imported by default. `((guix build android-ndk-build-system) (guix build syscalls) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (android-ndk-build name inputs #:key diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index cfb033f6a5..c8beea010c 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -44,7 +44,7 @@ (define %ant-build-system-modules (guix build maven pom) (guix build java-utils) (guix build syscalls) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-jdk) "Return the default JDK package." diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index 2b17cee37b..26b5a5008a 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -56,7 +56,7 @@ (define %asdf-build-system-modules `((guix build asdf-build-system) (guix build lisp-utils) (guix build union) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define %asdf-build-modules ;; Used (visible) build-side modules diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 912400a191..e9d5421065 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -64,7 +64,7 @@ (define (default-rust) (define %cargo-utils-modules ;; Build-side modules imported by default. `((guix build cargo-utils) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define %cargo-build-system-modules ;; Build-side modules imported by default. diff --git a/guix/build-system/chicken.scm b/guix/build-system/chicken.scm index 9f518e66e6..e6fcfa7ee3 100644 --- a/guix/build-system/chicken.scm +++ b/guix/build-system/chicken.scm @@ -42,7 +42,7 @@ (define %chicken-build-system-modules ;; Build-side modules imported and used by default. `((guix build chicken-build-system) (guix build union) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-chicken) ;; Lazily resolve the binding to avoid a circular dependency. diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index aa187c9844..2bcc8ac046 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -42,7 +42,7 @@ (define-module (guix build-system cmake) (define %cmake-build-system-modules ;; Build-side modules imported by default. `((guix build cmake-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-cmake target) "Return the default CMake package." diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm index d58931b33c..1f2937e0f1 100644 --- a/guix/build-system/copy.scm +++ b/guix/build-system/copy.scm @@ -46,7 +46,7 @@ (define-module (guix build-system copy) (define %copy-build-system-modules ;; Build-side modules imported by default. `((guix build copy-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-glibc) "Return the default glibc package." diff --git a/guix/build-system/dub.scm b/guix/build-system/dub.scm index b4011cdb83..d53acd96e5 100644 --- a/guix/build-system/dub.scm +++ b/guix/build-system/dub.scm @@ -60,7 +60,7 @@ (define %dub-build-system-modules ;; Build-side modules imported by default. `((guix build dub-build-system) (guix build syscalls) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (dub-build name inputs #:key diff --git a/guix/build-system/elm.scm b/guix/build-system/elm.scm index f5321f811b..7405db3d98 100644 --- a/guix/build-system/elm.scm +++ b/guix/build-system/elm.scm @@ -88,7 +88,7 @@ (define %elm-build-system-modules `((guix build elm-build-system) (guix build json) (guix build union) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define %elm-default-modules ;; Modules in scope in the build-side environment. diff --git a/guix/build-system/emacs.scm b/guix/build-system/emacs.scm index ebf97a5344..03273d738b 100644 --- a/guix/build-system/emacs.scm +++ b/guix/build-system/emacs.scm @@ -46,7 +46,7 @@ (define %emacs-build-system-modules ;; Build-side modules imported by default. `((guix build emacs-build-system) (guix build emacs-utils) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-emacs) "Return the default Emacs package." diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm index c57c304f52..b18d4af625 100644 --- a/guix/build-system/font.scm +++ b/guix/build-system/font.scm @@ -40,7 +40,7 @@ (define-module (guix build-system font) (define %font-build-system-modules ;; Build-side modules imported by default. `((guix build font-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (lower name #:key source inputs native-inputs outputs system target diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm index 726d19efad..5d026ec5ab 100644 --- a/guix/build-system/glib-or-gtk.scm +++ b/guix/build-system/glib-or-gtk.scm @@ -72,7 +72,7 @@ (define %default-modules (define %glib-or-gtk-build-system-modules ;; Build-side modules imported and used by default. `((guix build glib-or-gtk-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-glib) "Return the default glib package from which we use diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index c1aa187c42..5099554b42 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -27,7 +27,8 @@ (define-module (guix build-system gnu) #:use-module (guix packages) #:use-module (srfi srfi-1) #:use-module (ice-9 match) - #:export (%gnu-build-system-modules + #:export (%default-gnu-imported-modules + %default-gnu-modules %strip-flags %strip-directories gnu-build @@ -48,14 +49,14 @@ (define-module (guix build-system gnu) ;; ;; Code: -(define %gnu-build-system-modules +(define %default-gnu-imported-modules ;; Build-side modules imported and used by default. '((guix build gnu-build-system) (guix build utils) (guix build gremlin) (guix elf))) -(define %default-modules +(define %default-gnu-modules ;; Modules in scope in the build-side environment. '((guix build gnu-build-system) (guix build utils))) @@ -240,7 +241,7 @@ (define* (dist-package p source #:key (phases '%dist-phases)) ((#:modules modules %default-modules) `((guix build gnu-dist) ,@modules)) - ((#:imported-modules modules %gnu-build-system-modules) + ((#:imported-modules modules %default-gnu-imported-modules) `((guix build gnu-dist) ,@modules)) ((#:phases _ #f) @@ -359,7 +360,7 @@ (define* (gnu-build name inputs (locale "en_US.utf8") (system (%current-system)) (build (nix-system->gnu-triplet system)) - (imported-modules %gnu-build-system-modules) + (imported-modules %default-gnu-imported-modules) (modules %default-modules) (substitutable? #t) allowed-references @@ -499,7 +500,7 @@ (define* (gnu-cross-build name (locale "en_US.utf8") (system (%current-system)) (build (nix-system->gnu-triplet system)) - (imported-modules %gnu-build-system-modules) + (imported-modules %default-gnu-imported-modules) (modules %default-modules) (substitutable? #t) allowed-references diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm index 0a9761aac7..b1d589e342 100644 --- a/guix/build-system/go.scm +++ b/guix/build-system/go.scm @@ -107,7 +107,7 @@ (define %go-build-system-modules ;; Build-side modules imported and used by default. `((guix build go-build-system) (guix build union) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-go) ;; Lazily resolve the binding to avoid a circular dependency. diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm index 1bd292e267..7ac232bfca 100644 --- a/guix/build-system/guile.scm +++ b/guix/build-system/guile.scm @@ -36,7 +36,7 @@ (define %scheme-file-regexp (define %guile-build-system-modules ;; Build-side modules imported by default. `((guix build guile-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (lower name #:key source inputs native-inputs outputs system target diff --git a/guix/build-system/haskell.scm b/guix/build-system/haskell.scm index f8568e33db..b0019dd014 100644 --- a/guix/build-system/haskell.scm +++ b/guix/build-system/haskell.scm @@ -55,7 +55,7 @@ (define (hackage-uri name version) (define %haskell-build-system-modules ;; Build-side modules imported by default. `((guix build haskell-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-haskell) "Return the default Haskell package." diff --git a/guix/build-system/julia.scm b/guix/build-system/julia.scm index b5521e38e4..e098749683 100644 --- a/guix/build-system/julia.scm +++ b/guix/build-system/julia.scm @@ -42,7 +42,7 @@ (define-module (guix build-system julia) (define %julia-build-system-modules ;; Build-side modules imported by default. `((guix build julia-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-julia) "Return the default Julia package." diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm index e46195b53c..d0654a923e 100644 --- a/guix/build-system/linux-module.scm +++ b/guix/build-system/linux-module.scm @@ -41,7 +41,7 @@ (define-module (guix build-system linux-module) (define %linux-module-build-system-modules ;; Build-side modules imported by default. `((guix build linux-module-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-linux) "Return the default Linux package." diff --git a/guix/build-system/maven.scm b/guix/build-system/maven.scm index 4bbeaed6a4..03e4e96b89 100644 --- a/guix/build-system/maven.scm +++ b/guix/build-system/maven.scm @@ -46,7 +46,7 @@ (define %maven-build-system-modules ;; Build-side modules imported by default. `((guix build maven-build-system) (guix build maven pom) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-maven) "Return the default maven package." diff --git a/guix/build-system/minify.scm b/guix/build-system/minify.scm index 787235deeb..21c17d1eb1 100644 --- a/guix/build-system/minify.scm +++ b/guix/build-system/minify.scm @@ -39,7 +39,7 @@ (define-module (guix build-system minify) (define %minify-build-system-modules ;; Build-side modules imported by default. `((guix build minify-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-uglify-js) "Return the default package to minify JavaScript source files." diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index 3f73390809..57fe5f6030 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -37,7 +37,7 @@ (define %node-build-system-modules ;; Build-side modules imported by default. `((guix build node-build-system) (guix build json) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-node) "Return the default Node package." diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm index 582d00b4cd..2f2e6dd62e 100644 --- a/guix/build-system/ocaml.scm +++ b/guix/build-system/ocaml.scm @@ -65,7 +65,7 @@ (define-module (guix build-system ocaml) (define %ocaml-build-system-modules ;; Build-side modules imported by default. `((guix build ocaml-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-ocaml) "Return the default OCaml package." diff --git a/guix/build-system/perl.scm b/guix/build-system/perl.scm index 7c6deb34bf..a8d954ea91 100644 --- a/guix/build-system/perl.scm +++ b/guix/build-system/perl.scm @@ -45,7 +45,7 @@ (define-module (guix build-system perl) (define %perl-build-system-modules ;; Build-side modules imported by default. `((guix build perl-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-perl) "Return the default Perl package." diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm index cca009fb28..b987aeef4e 100644 --- a/guix/build-system/python.scm +++ b/guix/build-system/python.scm @@ -59,7 +59,7 @@ (define* (pypi-uri name version #:optional (extension ".tar.gz")) (define %python-build-system-modules ;; Build-side modules imported by default. `((guix build python-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-python) "Return the default Python package." diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm index 657346bea3..93acb6ab49 100644 --- a/guix/build-system/r.scm +++ b/guix/build-system/r.scm @@ -68,7 +68,7 @@ (define* (bioconductor-uri name version #:optional type) (define %r-build-system-modules ;; Build-side modules imported by default. `((guix build r-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-r) "Return the default R package." diff --git a/guix/build-system/rakudo.scm b/guix/build-system/rakudo.scm index 3b30fdfd0e..ee13c50791 100644 --- a/guix/build-system/rakudo.scm +++ b/guix/build-system/rakudo.scm @@ -41,7 +41,7 @@ (define-module (guix build-system rakudo) (define %rakudo-build-system-modules ;; Build-side modules imported by default. `((guix build rakudo-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-rakudo) "Return the default Rakudo package." diff --git a/guix/build-system/rebar.scm b/guix/build-system/rebar.scm index de1294ec3f..7c7cc5870f 100644 --- a/guix/build-system/rebar.scm +++ b/guix/build-system/rebar.scm @@ -56,7 +56,7 @@ (define (hexpm-uri name version) (define %rebar-build-system-modules ;; Build-side modules imported by default. `((guix build rebar-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-rebar3) "Return the default Rebar3 package." diff --git a/guix/build-system/renpy.scm b/guix/build-system/renpy.scm index 3039e3c63b..015dd7c210 100644 --- a/guix/build-system/renpy.scm +++ b/guix/build-system/renpy.scm @@ -44,7 +44,7 @@ (define %renpy-build-system-modules `((guix build renpy-build-system) (guix build json) (guix build python-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (lower name #:key source inputs native-inputs outputs system target diff --git a/guix/build-system/ruby.scm b/guix/build-system/ruby.scm index a3793a9381..33aab5f719 100644 --- a/guix/build-system/ruby.scm +++ b/guix/build-system/ruby.scm @@ -39,7 +39,7 @@ (define (rubygems-uri name version) (define %ruby-build-system-modules ;; Build-side modules imported by default. `((guix build ruby-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-ruby) "Return the default Ruby package." diff --git a/guix/build-system/scons.scm b/guix/build-system/scons.scm index 046ddef740..e76c419b1e 100644 --- a/guix/build-system/scons.scm +++ b/guix/build-system/scons.scm @@ -39,7 +39,7 @@ (define-module (guix build-system scons) (define %scons-build-system-modules ;; Build-side modules imported by default. `((guix build scons-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-scons) "Return the default SCons package." diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm index 88372faa58..2baa35466b 100644 --- a/guix/build-system/texlive.scm +++ b/guix/build-system/texlive.scm @@ -78,7 +78,7 @@ (define %texlive-build-system-modules ;; Build-side modules imported by default. `((guix build texlive-build-system) (guix build union) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-texlive-bin) "Return the default texlive-bin package." diff --git a/guix/build-system/waf.scm b/guix/build-system/waf.scm index 91b3d0d100..5f24615514 100644 --- a/guix/build-system/waf.scm +++ b/guix/build-system/waf.scm @@ -42,7 +42,7 @@ (define-module (guix build-system waf) (define %waf-build-system-modules ;; Build-side modules imported by default. `((guix build waf-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (lower name #:key source inputs native-inputs outputs system target diff --git a/tests/modules.scm b/tests/modules.scm index e70d2d9e08..904f91e365 100644 --- a/tests/modules.scm +++ b/tests/modules.scm @@ -18,7 +18,7 @@ (define-module (test-modules) #:use-module (guix modules) - #:use-module ((guix build-system gnu) #:select (%gnu-build-system-modules)) + #:use-module ((guix build-system gnu) #:select (%default-gnu-imported-modules)) #:use-module ((guix utils) #:select (call-with-temporary-directory)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-34) @@ -30,9 +30,9 @@ (define-module (test-modules) (lset= equal? (live-module-closure '((guix build gnu-build-system))) (source-module-closure '((guix build gnu-build-system))) - %gnu-build-system-modules - (source-module-closure %gnu-build-system-modules) - (live-module-closure %gnu-build-system-modules))) + %default-gnu-imported-modules + (source-module-closure %default-gnu-imported-modules) + (live-module-closure %default-gnu-imported-modules))) (test-assert "closure of (gnu build install)" (lset= equal? -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:33:07 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:33:07 +0000 Received: from localhost ([127.0.0.1]:60792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptBr-0003In-9L for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:07 -0400 Received: from mail-qk1-x736.google.com ([2607:f8b0:4864:20::736]:50456) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptBk-0003HT-LU for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:01 -0400 Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-7741b18a06aso342649185a.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:32:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869154; x=1697473954; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DvMT2tItB2FEoCeBaZ3ZoYanEKsCQTJMiz1nMCF2ztI=; b=RUQbghmX0Fz/1EcvIeEqWlO7Kv2lhsWHOpc8gqxoVyVs/S6+Ra37ACNXV7VeZme/WK A6ATQcHYuENQgjFACTluDXWCyEoHrtn8hdLtdTWRAGaTWGiqV6XGqem0RWOCs3pfqtRn 1cE79jkiK19a8oKUC8EiOTUj5YfE+reQuyRvCYPDv0RBQpcunsG5rz/8f3yMlqNGKCdQ z7QcBK/Qx34LT2Gq9k92xhYswXlEBGcjmn78fqLJRojtzzzKMno+jbnLX+ozLBvSCnRD wYiTexzp1YkKghVXpH4uPqMPrP88nLjTJYpN0kwy0Q/ThQF8S3vGI9RYmHGMqOBCvC4U MFng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869154; x=1697473954; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DvMT2tItB2FEoCeBaZ3ZoYanEKsCQTJMiz1nMCF2ztI=; b=XJckwS9RQrcgPotUxvuyHGfE5UaTL/nGdr2JnD4vb8N9/VBkI7GbTNjf15kUJzK3l4 UbO5+pxqEtrEsTBhVLm12Ugk73Jlcu6zDKrcmVNfdy2crfrKzC31LlPIuH7uC+WhyV4i t7hAzh9jrfJhMte2bsQluUK6HhNTuAfSdHa0MNxBTnQMQF/OQ9LA4UYRg6UlzBhL65KU bDxSZMdvyZRv4yDGxIQ6IR3LsL6i5ZqfkAurUIgtHEp1UwHXbO+VHEd7SeeK9Vj13zSW ffSywxqwGO65f+mba58/2hngQfj/fBR4fYb3IpYrLMqQx7V5fkUByn6/AeOCcchrjMeR W2sA== X-Gm-Message-State: AOJu0YxfwjMKPEcTdxOy8fbWdzT46cENXyGadELvnj8j6qCDl9A6ltjt incw5CUEe/yJTLeqoNHKY+OG3UjtSzg= X-Google-Smtp-Source: AGHT+IFNl2DQ3fIxZo2eKUIR9ldnAzqM0siC9Nz1O9ttK0Og2p76rvThfqYz2iNDOWW/X4Haevav1Q== X-Received: by 2002:a05:620a:d93:b0:76d:2725:f36f with SMTP id q19-20020a05620a0d9300b0076d2725f36fmr17917121qkl.71.1696869154310; Mon, 09 Oct 2023 09:32:34 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id z7-20020a05620a100700b0076f19b9e96fsm3645769qkj.107.2023.10.09.09.32.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:32:34 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 03/65] gnu: acl: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:28:41 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , Simon Tournier , Ludovic Courtès , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/acl.scm (acl) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I9514a3d8d9ece9ca54ccb457bac415bb1fa99692 --- gnu/packages/acl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index 6d78847680..bc37572252 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -52,7 +52,7 @@ (define-public acl (build-system gnu-build-system) (arguments `(#:modules ((ice-9 ftw) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:configure-flags '("--disable-static") #:tests? ,(not (or (%current-target-system) (target-hurd?))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:33:08 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:33:08 +0000 Received: from localhost ([127.0.0.1]:60794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptBr-0003Iv-KR for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:07 -0400 Received: from mail-qk1-x732.google.com ([2607:f8b0:4864:20::732]:52493) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptBn-0003HW-D7 for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:04 -0400 Received: by mail-qk1-x732.google.com with SMTP id af79cd13be357-77410032cedso316635185a.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:32:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869157; x=1697473957; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yfzNPAxhpUZ6eDwkxm30sNXddp5ZPzs9DrvHMuQnBVc=; b=JYFfXZzL5vTafSumQvnodKPO0RsAcMiD002Fy0U9DQz1ONlT3RU6zvjsLyphuxkL2/ u27GZBqlqOCyNPn3Qe6tWZynb3r2FGefBWXmVRcVKu5aH/UFGAGexzWZdXb0w1odPBsR GLpn52EQqmVE2Q9XatbYlZn7YQsTUdtxz56viY14Riv84VNq25IIB89RVHvoUjz68Gog 34yNQb2+y59WJhVAdHaz3aK3OOh3Wf0pJmFHBwQEnE04gaiOLTSpGOm5zRo5kASNMviz a32bcu5Jyoz25yXjqfbkyIJVJbfBQCX4H+WpGySlp/oW5YA2ukW41E9CdSuaHqaBsQe0 6rBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869157; x=1697473957; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yfzNPAxhpUZ6eDwkxm30sNXddp5ZPzs9DrvHMuQnBVc=; b=MbU3wxD5j5wlJYX0UKI8Hn6jsDA3YqJOY5F7N5nTXcMXeMVij/dzTWCeOC7+MQeEKh r6RKidcsqQzel7cKeOjqDLk5fGjDxQ0WG+YkfauFGXjgFNl7rdc0V/oftmHExacARx+p 4ON6iviBSue00+ec8QhFawhK6yK35AZCt9hjuD9d4mGZjeru+GYBvelH/bKK5iLdnhBt THXxgdDJL2SlE6wnUSQaqELVDhsJILjUcxzG4bENca7NU94hst+NYoCL4EuVNjZVIfau HFPpWKm5MgkyPsGkpJjdn+ZFAL7SKcBavjrIN8E10J/JnIg2rtjcmlmaeptwAH169SzV QswQ== X-Gm-Message-State: AOJu0YwEat6Dmm5gxjq3DyGhm9QAE8emK/2QwCP5cwKOk+M/Vxhhy1fM 5CcjJVPFxVJuif3YEzbiAF+Hx3aTCZ0= X-Google-Smtp-Source: AGHT+IFznRwq6Pw+PaDoqZ7lC64aMhhK5Zibo6nz/ct5ntGqsRJuI7ZqkcP+b25l282/jEqGQ9Gujg== X-Received: by 2002:a05:620a:228b:b0:775:8ed7:b89 with SMTP id o11-20020a05620a228b00b007758ed70b89mr13793333qkh.37.1696869157006; Mon, 09 Oct 2023 09:32:37 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id z7-20020a05620a100700b0076f19b9e96fsm3645769qkj.107.2023.10.09.09.32.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:32:36 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 04/65] gnu: dirvish: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:28:42 -0400 Message-ID: <14a3ee4d4c1c954f6c2c2b16572d0387813d23b9.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , Simon Tournier , Ludovic Courtès , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/backup.scm (dirvish) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Delete trailing #t. Change-Id: I041a65441055a21f141bb7ea4a563e2624cd783c --- gnu/packages/backup.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 63b6055c5e..aa2eb11c64 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -813,7 +813,7 @@ (define-public dirvish "1kbxa1irszp2zw8hd5qzqnrrzb4vxfivs1vn64yxnj0lak1jjzvb")))) (arguments `(#:modules ((ice-9 match) (ice-9 rdelim) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases ;; This mostly mirrors the steps taken in the install.sh that ships ;; with dirvish, but simplified because we aren't prompting interactively @@ -889,8 +889,7 @@ (define-public dirvish ;; Write out executables (for-each write-pl executables) ;; Write out man pages - (for-each write-man man-pages) - #t)))))) + (for-each write-man man-pages))))))) (inputs (list perl rsync perl-libtime-period perl-libtime-parsedate)) (home-page "http://dirvish.org/") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:33:09 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:33:09 +0000 Received: from localhost ([127.0.0.1]:60796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptBt-0003J9-0B for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:09 -0400 Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]:46084) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptBq-0003Hq-73 for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:06 -0400 Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-7757523362fso314311085a.0 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869160; x=1697473960; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SPfGE7AjD51ixrfjeCwgsRm5nqVzZ46Gk6av+GGmpys=; b=mxBQpC4CnuU0eDKLdEjWhQop79zLxiI9R/JskteCT/I/6wz9gB+lYBPfeKK6l0zcM/ Cmc3W5lqWk1mQ6lvHeBeoCGDGWJysfTSoPN7LToC+qG2IVnj5DbtycZW0IWUvDPaPNOk 8fCyX2ZPxjjq0ZGnyABCF8LIsjY/fEzQAtDbYRa37VgEwVoORm+uRyh43PviJP3QopZz 70CLyAaE7Nme8mY2QRDHKt/HHOUQYqiB7iT1EbLiiK/miZmvJUs7EbT31gBXKOnVLoQX OBcJiqV6PtZYGwWkhg3A93aLRRW4GEM8R4RWvTpkxp2ZOap7zQl/VItXRqGYZeiNQhFJ p4IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869160; x=1697473960; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SPfGE7AjD51ixrfjeCwgsRm5nqVzZ46Gk6av+GGmpys=; b=CnRk+oezQxqJq/WZxfVEtwxhM8FWxQc0w2WyI0/npXRK6tyNfsceQocV1S9u/TIX+D JTKn+xZUhoSAP2dzu22xbMjEYdzu4y9B6/j7R7Z1HejFP+X5qDppvZoeC9c3nVNJj+FB fpYCpiN7OK02eudDpM+GiJGFsiSmLoADD4Mq5jdjYOllPVkElDIHUW9RTxIcgXWrld1G q8z6oY5xpcjuK+G60xfoeHy5nYLSP8PHuwkouMWzVRLOnnzk2t8RhQysqkAqRyMRuVzT SHIuBfG3kwEmcgT0bPOYbst4+DCuWVyXUPcIteO0cEp21viytMYKKnt7Pq0SdyCVPNSd ieeA== X-Gm-Message-State: AOJu0YyvrHKncBpmC0D1/s9s1C8il+Lxe/jlPtT8zJhCWpvnZ+JE61wQ mOvcJdWClKMbnMy3w03CCLy/WPho5bo= X-Google-Smtp-Source: AGHT+IHCDoZgsP+WkXfkE8hWOLMR4fhEFzRhNvdvdPpODXRyD9VnmnKXJcNNFik2yhLXsZnX4va4Jg== X-Received: by 2002:a05:620a:2584:b0:774:1012:8220 with SMTP id x4-20020a05620a258400b0077410128220mr19643781qko.23.1696869159845; Mon, 09 Oct 2023 09:32:39 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id z7-20020a05620a100700b0076f19b9e96fsm3645769qkj.107.2023.10.09.09.32.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:32:39 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 05/65] gnu: fio: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:28:43 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , Simon Tournier , Ludovic Courtès , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/benchmark.scm (fio) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I95d0115b139f9cd2c61c6b2f47ae7a266490245f --- gnu/packages/benchmark.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 89f65a5205..feb6786e71 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -90,7 +90,7 @@ (define-public fio (build-system gnu-build-system) (arguments (list #:modules - `(,@%default-gnu-imported-modules + `(,@%default-gnu-modules (ice-9 textual-ports)) #:test-target "test" #:configure-flags -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:33:11 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:33:11 +0000 Received: from localhost ([127.0.0.1]:60799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptBv-0003JO-Dx for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:11 -0400 Received: from mail-qk1-x72b.google.com ([2607:f8b0:4864:20::72b]:47150) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptBt-0003IY-8U for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:09 -0400 Received: by mail-qk1-x72b.google.com with SMTP id af79cd13be357-77433d61155so312619585a.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:32:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869163; x=1697473963; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DhMBAn5pPa/oyFlVyah4vt9JbB1Y3jTux8ky4WcKYzw=; b=NRDYD6nZ15NV4DmjbX47+qOcg4+Zd+bG4viFQ+Sequ8+O+brin8Pbkmx4g8ffF2tG+ JyvbhxQ7+C/H47puA25j8A4qH3tvulEjeJj2gPAiEsxiuKY0oqAPnJqPqMuaQzVbIFn+ 9LOAdUnQ9wGgl/Fa6eX02ckWLF2am5nbuukP+AkbfyS3MwG0QpdUD02Iovt3ZrDP0giR sw/hAVxC6YsSVt3wiERfCk2WY9jC199X/0bE48JgSu+R+FkMIjlUthcI16yu4wvpZG4h Wc/9qdkXDevDOCVTXjfn53hme45wBGtH+EVqm+lf1/RvOjyYsWA5AwcyLZj6f6t+ePZC lSOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869163; x=1697473963; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DhMBAn5pPa/oyFlVyah4vt9JbB1Y3jTux8ky4WcKYzw=; b=tTyifiaDMzOedd3OcZ17AEaSnu17MDAcjNYWgjKoA8qugZMte2s0InGnaQx2m1mb8K hJ1Z5kPfRiyICNt24+aJHnDEohZT3lnmd6Ekqxd+nXrd+UlHKpnnpKJN+VJMaYEH1qvv wVAREoINk45GvHhwApbzr0EaThJGkrEWbpU6LXHPzjFaVnM5g0gtcd2b8DAl2MUktRYH xzfsW2pcTpPsGElomZwx1shw8Dfd+GMoOY4KMSPxRT8tWlWBDLtmGwMm8W7aFOEDGXxW TodDJEVvi6PPwaby5DXO7hXSKixUFIGBtFIMkKpfnJFK0+pHXr0xLy2jOj/3rZzEOcq1 l8yA== X-Gm-Message-State: AOJu0YwDHtJbww7LCVsnnZFVDRV4IN3z69mY1i9HcNxVd3mGBVBtWehb lJpWLW3SWCybncfAnXqWsd5ZV7gI3bA= X-Google-Smtp-Source: AGHT+IEGxGhklIxe1pbXkBVcDEQOVbWj/cOD1fDdS+EPxqOXr0gsIEO+pp0N4WcVesY86cbg+vsv/Q== X-Received: by 2002:a05:620a:204d:b0:772:45f0:5018 with SMTP id d13-20020a05620a204d00b0077245f05018mr15369458qka.40.1696869162936; Mon, 09 Oct 2023 09:32:42 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id z7-20020a05620a100700b0076f19b9e96fsm3645769qkj.107.2023.10.09.09.32.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:32:42 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 06/65] gnu: ccwl: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:28:44 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , Simon Tournier , Ludovic Courtès , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/bioinformatics.scm (ccwl) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I9c96e847de537b11bc8396d6c0e7968a1a9f3e98 --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 27a3bff63e..2e85df174b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -20421,7 +20421,7 @@ (define-public ccwl `(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings #:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:imported-modules ((guix build guile-build-system) ,@%default-gnu-imported-modules) #:phases -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:33:15 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:33:15 +0000 Received: from localhost ([127.0.0.1]:60802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptBy-0003Je-MG for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:14 -0400 Received: from mail-qv1-xf2b.google.com ([2607:f8b0:4864:20::f2b]:51403) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptBw-0003It-Gy for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:13 -0400 Received: by mail-qv1-xf2b.google.com with SMTP id 6a1803df08f44-65d066995aeso28608276d6.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:32:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869166; x=1697473966; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vwPCHtv8LPhBBInqiF+RjvC7hRebRwHdpLW7TGUH7vE=; b=LPG99C+PZSu0jQKo8aIe3FvvJYtDy0gwS74Z1c7zLS4VXQf5RTghzqa2Fasxy9PrGv tRVp/rRRMSGxUdYIw26KnMZWTkvdM+jZh3cFDb04s3hq06hqNtvTPmhYCaCIM32kYusj V0XQbgQodNfY+D0ltuBjPdnMa8dgnnRuhm7lIklFRj0w+MqQdo8n+2QmLYga0o6vn1ay 9s3LK8eODMZAH5ljHbHiHTmBXPZA2zJS5WhVQzxZhXMunRuveYFlXMHppUqzPilmY/RE AzpbgVJYfQD62szAJDOK/PYVRZT2eK2D8j0DwJZBG+q0HybaGul0e5E1XeZt6Fcl3CH9 i7Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869166; x=1697473966; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vwPCHtv8LPhBBInqiF+RjvC7hRebRwHdpLW7TGUH7vE=; b=A0eFgk2vNjwFlX9DUkuqgGcPG7WFsDIcmcu/sPy+7+ckerMDCHmuDRrrJ83Igl6diX juwV+nPL+wdB/OQdgGk/yLfD6T5P4hwBBGkfQyXTUP9CRmB/T9k3pLE6lzcCZcRATTo4 AxtvFrGOUZF0kaR89kkE2XVL99HsEFBQX9lFxDgJg3H5uyxMjc6Vjnfbtp4J9KHUwvD3 ygr58uyt/jkGK2Ivv8KiokE2QZMqyL2friPO1GhTXElE6NlR+8Oymk/T4T4Kw0REpLvo 0qJ86djBQFjd/75BsKRB8PPOBiEDfP+7STAdN9koW93Gn/BoxE2eM7pKabJJ1ls05CD6 LQYA== X-Gm-Message-State: AOJu0YzaMVqmauuvFFGf7OpB5ApWcmbHK/cGZT/y0deqXzcE+7gXFxMb 5CjON1tcQ8c/RKZapcJnuSZ3Wsvy1iY= X-Google-Smtp-Source: AGHT+IFr+iszlN4L3hh7Oii1MWpM8jIeQ85p/2cg3JtSg/S01QUE7O0QFFWg5wglFwNd7Eb1B9N7dQ== X-Received: by 2002:a05:6214:420a:b0:65e:5777:10f6 with SMTP id nd10-20020a056214420a00b0065e577710f6mr16407818qvb.21.1696869165989; Mon, 09 Oct 2023 09:32:45 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id z7-20020a05620a100700b0076f19b9e96fsm3645769qkj.107.2023.10.09.09.32.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:32:45 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 07/65] gnu: boost: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:28:45 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , Simon Tournier , Ludovic Courtès , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/boost.scm (boost) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: Idb491a2b7cae3a52783a2c92b78b362de0adf49e --- gnu/packages/boost.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index e8fc1503de..0f2da3fb83 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -115,7 +115,7 @@ (define-public boost #:imported-modules `((guix build python-build-system) ,@%default-gnu-imported-modules) #:modules `(((guix build python-build-system) #:select (python-version)) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:tests? #f #:configure-flags #~(let ((icu (dirname (dirname (search-input-file -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:33:17 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:33:17 +0000 Received: from localhost ([127.0.0.1]:60805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptC1-0003Jv-0u for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:17 -0400 Received: from mail-qk1-x733.google.com ([2607:f8b0:4864:20::733]:51651) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptBy-0003JI-Rm for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:15 -0400 Received: by mail-qk1-x733.google.com with SMTP id af79cd13be357-77574c6cab0so342618385a.3 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:32:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869168; x=1697473968; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NjH39Cxoey0DQgyJ0pIkN4K/tiKNGyLsCkEWHWV6Q18=; b=BabcgH6Q4b5FLIyfhp7cF+dAbUhysB7vymy9aW6rSOWqSwZ71fw5X+YfRX7bkdpES5 IXH7S9GYNUVVC7qm18dTKizVkW677Wy+kGckckvhQWRfKKDLhLm4xpwW5y4nOf/YfbzZ hr14cZiXpwkI3MynxLacSiAQUi01CpvBYwa5Gtj28tH5T+umLTVpDycZuWij/hnwo16h X+3cBgbhf1KyTtTBEfUv7EBFUtBj/pBLGLLH+pGiBQa/ZVRwaIPfIQ+3ryKAOhhcPIXB T432CdyRP7/LGxyIywm+teq6y3AY+vFzbFxnY8azpFdSBOpYPmnTbW/wN53wdwwIvj6g qz2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869168; x=1697473968; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NjH39Cxoey0DQgyJ0pIkN4K/tiKNGyLsCkEWHWV6Q18=; b=tdyyD/OAa5jX5Hz49trpguXW/bLYKJESkiyFuG5qqWJcz7xB18JbG2ggCFORxgLcv2 RL7unPgmmWLlsE/sfhof/Jey7hZ2k6GEInKANztAAxyDl0m9GX3vlyKxg5pk8wQBjXGn 7vexao6iSnDbqAyQBzwja5JdnkCaGbDqEfO3711qj+1qKRmdYTpM35JRLKt1VXAiJ7pF nSnLY2r4YQ0bsfjwD3DQKBAxalGEakJP2yRGUnCfsTiLyMYp42TBKe0wfAsPR8lqILls UoC8or15Wxq/jGQwrvOzTLFfk3Jo5ExaLBYPKup6jYBaRU70ZBOfyqMFLqk7l/cAFw+O CPpA== X-Gm-Message-State: AOJu0Yw+5isRMd3apTqSEzpSr03y7IvLNJLZrauqKZFblsRupigdKnUC SYmgk2TJZrXE0G4d9sHC7DpL886pkXQ= X-Google-Smtp-Source: AGHT+IGKEJS0gN1/T8ZjhJ9T+WJnFBAjVCCral/LMyDRCDBEfEkoIURsBCHaaDJYZtreRz9IH66DBQ== X-Received: by 2002:a05:620a:1112:b0:774:fb6:124f with SMTP id o18-20020a05620a111200b007740fb6124fmr15843904qkk.29.1696869168457; Mon, 09 Oct 2023 09:32:48 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id z7-20020a05620a100700b0076f19b9e96fsm3645769qkj.107.2023.10.09.09.32.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:32:48 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 08/65] gnu: gcc-final: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:28:46 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , Simon Tournier , Ludovic Courtès , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/commencement.scm (gcc-final) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I581dd9cb1ee2cc1747982b4a34277b80fa1cc0f7 --- gnu/packages/commencement.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 421f3fe050..3a96e24a48 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3236,7 +3236,7 @@ (define gcc-final ;; Additional modules for the libstdc++ phase below. #:modules `((srfi srfi-1) (srfi srfi-26) - ,@%default-gnu-imported-modules) + ,@%default-imported-modules) (substitute-keyword-arguments (package-arguments gcc) ((#:make-flags flags) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:33:22 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:33:22 +0000 Received: from localhost ([127.0.0.1]:60809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptC6-0003KJ-A4 for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:22 -0400 Received: from mail-oa1-x2d.google.com ([2001:4860:4864:20::2d]:51644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptC4-0003Jk-Hq for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:20 -0400 Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-1dd54aca17cso3514165fac.3 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:32:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869174; x=1697473974; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mlx2ILEc9y+hP2u7GxDUvUfwiCnRivl/isN0ymd8IcQ=; b=BQ4Un8eigJ46YMV/g5b0OwnrkRFrGnkkAmTEKJ+E4Si8fPf5JFVGo9zXFTvfHvh1CJ ZbD8tBIWwKC/rLMVxs3HLadPzIIqsxbCDZVYUjuf2RVBIyuHa5sEdyB6jUeEplcY83Gl QrP7CYcE74NUGa8qM4jAZrhoAVCsO03kkRr5YTx1ldADObVwrZqN9SEtjj1FxjEoE7LT kvgez3mgRLMkS9GjOZwaR7lCGk1V9LdJYhgR+XZnPrnEv9vouIkTBQbpiLfivhthMIhN KMKaXX9q0xwOOGLTi0WASG9/ryqPCBcmiQ7a1S0f0Gj+9+lCFwo+gtCyIUjboDMvHYsk pfXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869174; x=1697473974; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mlx2ILEc9y+hP2u7GxDUvUfwiCnRivl/isN0ymd8IcQ=; b=ioc1N03z+U6XfUMcwnVvH5JmR8euPtQ00JvsYcbs4uDyUTks1QEyIRIbwTPqDKXbQu bO69IKCnQiIcDqEpE9apflv56dLyB1WLPm38DXaepGP35qim/onm5USUgvqoV4GloQYN jvAx9pS1R1PHkCVL1AbTD4e5PxEuyyHdrLXi9OwVJT/5l8WV09Aor2vXBCN3xYMlz4s7 5lYzw3fVOJrre05uXdGtclYSvDwLagKdKFOpoySubqfEEdZCIVGl138s68Blld0q0rHT W897XyRXMVRdIs1GhxMleXNa4Karpk8OVwem+oz/LV3dP2CuYMqyswBVuP19n1IEPEDH L+9A== X-Gm-Message-State: AOJu0Yzu3BUMgIo0Kf4OdRina4JTZ12J0p6Br72CJDyYUQIVn0FU9ytK wpSFOC8EnwfiuoMwnKh0tLmm1f4IHX4= X-Google-Smtp-Source: AGHT+IFBfH7qVIN/QboNmUKX+QUBM8LGi0efff+zdO+ICx2rhVKorMgS+YTmzVJShH+/Pyswn4viIA== X-Received: by 2002:a05:6870:8a2a:b0:1dc:f4de:46b8 with SMTP id p42-20020a0568708a2a00b001dcf4de46b8mr17761723oaq.59.1696869173791; Mon, 09 Oct 2023 09:32:53 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id z7-20020a05620a100700b0076f19b9e96fsm3645769qkj.107.2023.10.09.09.32.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:32:53 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 10/65] gnu: splix: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:28:48 -0400 Message-ID: <8edfa6417b85982ddd0642e08a6b05cb76b6c35f.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , Simon Tournier , Ludovic Courtès , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/cups.scm (splix) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: Id510a57db2bd6cabb3fcbd0d1dd6c55ed65b6219 --- gnu/packages/cups.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index af15372a00..12fd26e7ba 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -941,7 +941,7 @@ (define-public splix (arguments `(#:modules ((srfi srfi-26) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:make-flags (list (string-append "CUPSDRV=" (assoc-ref %outputs "out") "/share/cups/drv") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:33:23 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:33:24 +0000 Received: from localhost ([127.0.0.1]:60811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptC7-0003KU-JS for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:23 -0400 Received: from mail-oa1-x36.google.com ([2001:4860:4864:20::36]:53285) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptC1-0003JW-Lm for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:33:21 -0400 Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-1dd8304b980so3259125fac.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:32:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869171; x=1697473971; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8nSpByZAT6+IQigSyJbf7J4rGeD0kSLUq+c11qzZ4Vk=; b=cQgqA2bbsVgcKGzdy0vJ0YoAsm3ODml7QorQCiUqEfq+B09T129puL+0VdfeD9fpux O+GhzDyKlBmZduqPFwI1a8TE2JDbgjCzvvXnAAhVdU2Fs3zlndIxeoenCJvcJN1aQNSr MqejWlOILLqc1fRb57IWOrwFXt+GocgEuXx5xvNo8d1qONt80PAvoj6Fc4k7W5pEuQZ1 XwilC554aWCFjwAoCvdcvCQqycrvqbc3zjbhF+S1doQ+3UWv+9shylK8xCiQWqPP/CUh pV5sYVWPs2RNaZDxMKCt+Z/dxxBrKyGwtD06nV83q1Bh2kKXIzgJpcIKT/7BiqAwu7Ee r+tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869171; x=1697473971; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8nSpByZAT6+IQigSyJbf7J4rGeD0kSLUq+c11qzZ4Vk=; b=GgTz9fvE5EYF1uWyeWFBUwGMQvipU+/8MWcUb3UjZGhz5uhsC87uIVipNbIETAGuHv /wWcZMBJb0Ars9t9Z2LDyMax4ZBYnN4F4voUAjS5h4Jr15K2uc6bWdZbpSsRVM4nvqzP XgV9YaUqFU2cpX1VfW52qyee8y7zYXYIwKuDB6i+D5PX5eOTyC8vPciQy9+7KyyjK8AS hPukFs6CGSfBzxeBXLSaPBNV1hAw1jA/b3ilJqVF6nrWtynncW31ZGBE1TBh3nHzPKJs PWQ3oH3Ww+vRPw2FaZ3oKTF+F7mIR6RaB4nJSiYVuoU9TcCj8cIWDEwSTG7owfu7Bmhn KcNA== X-Gm-Message-State: AOJu0YwVgT01ELENCDNhmlO+L/0lR2vUGsBeaEUUtpEUu27p62t4Jo3X LZpnt0F+1kAumWwT6XPQLtKiTRQGgms= X-Google-Smtp-Source: AGHT+IHs94RNXEzyUd5wX9Ic3z5gkDHLjTyiFxJXFBs4VFfd9JG+5WpoEL0yiXyrMu0ULGmoLU8V4A== X-Received: by 2002:a05:6870:8456:b0:1d6:3d31:fb4b with SMTP id n22-20020a056870845600b001d63d31fb4bmr19457353oak.24.1696869170938; Mon, 09 Oct 2023 09:32:50 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id z7-20020a05620a100700b0076f19b9e96fsm3645769qkj.107.2023.10.09.09.32.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:32:50 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 09/65] gnu: epson-inkjet-printer-escpr: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:28:47 -0400 Message-ID: <893fe4fd658a3f40f32ab05af7574118fbb58d79.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , Simon Tournier , Ludovic Courtès , Liliana Marie Prikler Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/cups.scm (epson-inkjet-printer-escpr) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I1066d14e8000e0edf90f0d66886de0505018efb8 --- gnu/packages/cups.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index e43215d726..af15372a00 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -880,7 +880,7 @@ (define-public epson-inkjet-printer-escpr (arguments (list #:modules `((srfi srfi-26) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:configure-flags #~(list "--disable-static" (string-append "--prefix=" #$output) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:37:06 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:37:06 +0000 Received: from localhost ([127.0.0.1]:60881 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptFh-0003XC-Uw for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:37:06 -0400 Received: from mail-yb1-xb2e.google.com ([2607:f8b0:4864:20::b2e]:52694) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptFf-0003Wg-Qr for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:37:04 -0400 Received: by mail-yb1-xb2e.google.com with SMTP id 3f1490d57ef6-d81adf0d57fso4873633276.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:36:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869397; x=1697474197; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Gqq8Y69RouOcRPOLCr4OHhVZdTaXGgvEyhqcHmCy0Gk=; b=NboTXzo8STt8+0IFV3j2H5ND494zKSYvq344ijZJroMTIAlXrWu6iriUkAg4r6qEco d4u1FnhlSLhuNRc3MN0loUXuT+q5K5PTUfW2XgzprmBgUIGDPojfIUcNy2R2nXz/CLvQ m8CCDfTkQRFTc8jig1doafsko1gxUiVsiR+3dP6uefqnyezV9SgszlDWOXge8a3YLy5Z nVjOgnMUTiH4MJMR2mm+UT+PnU6HrDpyxLVfbsrA8nRw/yfdnbSRYBgg1meQgkNdX4Mn S9bZ+jRT7CuFhPR2a9j3v+UatRlEWRUXLKTHNuAzckzvIxotzJRcTX4XF7AtVus0KjUs bzVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869397; x=1697474197; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Gqq8Y69RouOcRPOLCr4OHhVZdTaXGgvEyhqcHmCy0Gk=; b=wkVtX4R04HSh6vjG+MrJFvfwlZJXKU+x+1y2HoWoqfbgal8IOXfny7+Ejw0dbykN/m 6sKY+cZPHumKQy4t0gzMqoG/BPnuHxXg3YFN9g1hp6rh9UlwcsjSbl625o7Lb1Co+yec xPugRrSHk+ctWnRrgWHuuIhk31NzV8BcyTk5ujzyWXMZQtTIb77/1/cDkS0Ay3LYdS3V dZdx0+PWnpmc/6NAd4ChkfH3fWeRynWtdUCWxq9/BbmepliqSH00X7jittk2JNN78YNB lrkwn2rLmLagOULtYXuVd4yIrM4AlkZU14407toUXVuF0lnSJkVAZO+NePWMYhH523J3 ADqQ== X-Gm-Message-State: AOJu0YzBrsSlOaAUJjYrbQygiNSDRT71CySbq7y1HFy5qxS1qr95tv4s P8tpyZcDkw8imwlAlhzM5aw= X-Google-Smtp-Source: AGHT+IHoab8dHzkxzHxMllzrqqzIcWL3VAngtx2LB/lx6kiaq33GqaxoHAC9m6wclAsfU5tUCEEa5A== X-Received: by 2002:a25:3292:0:b0:d9a:4c1f:b580 with SMTP id y140-20020a253292000000b00d9a4c1fb580mr192251yby.58.1696869397388; Mon, 09 Oct 2023 09:36:37 -0700 (PDT) Received: from hurd (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id s3-20020a0cb303000000b006585c7f64a3sm4029912qve.14.2023.10.09.09.36.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:36:37 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: Re: bug#65924: git searches coreutils and util-linux commands in PATH In-Reply-To: (Maxim Cournoyer's message of "Mon, 9 Oct 2023 12:28:38 -0400") References: <87fs3iuf6e.fsf@gmail.com> Date: Mon, 09 Oct 2023 12:36:36 -0400 Message-ID: <87lecbbvmz.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Ludovic =?utf-8?Q?Court?= =?utf-8?Q?=C3=A8s?= , Liliana Marie Prikler , Simon Tournier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Maxim Cournoyer writes: > This series introduces default variable bindings for the default > gnu-build-system IMPORTED-MODULES and MODULES values. The lack of a > %default-gnu-modules caused enough confusion, as made apparent by this series. > > Maxim Cournoyer (65): Nevermind the above mis-sent series; it should have been sent to a new issue. Apologies for the noise! Your review on 'git searches coreutils and util-linux commands in PATH' in this series is still needed, though :-) -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:02 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:03 +0000 Received: from localhost ([127.0.0.1]:60930 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIY-0003jW-8U for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:02 -0400 Received: from mail-qv1-xf2d.google.com ([2607:f8b0:4864:20::f2d]:56698) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIO-0003gk-87 for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:39:52 -0400 Received: by mail-qv1-xf2d.google.com with SMTP id 6a1803df08f44-65b0383f618so31114606d6.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869566; x=1697474366; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mrNyQxzZbISyTGA9HvE3hdjQqC6VZlNpP7RPMooC3k8=; b=RZxfKRKEO087I6LO3fIXYwDiuSnHKe94voXp14Azj71DJidB9fyiDbit+PFgxzx4Yd WkU37Cki422sX2wKv75V13bCb0vL7W2UXfzDRxauEIUeOamqCdEIqM0xEny9FICgsckj Gia9QT/nXNJYCFlANHYgteBDJLbk/LGmtidpR1mxQCYKzQiEnwv/nhcKXn3m/mdfYXrk ucodyDHZ3XRpm84HOVqvwtD86e8RxtHROgQ3zyDrYM5yMDD6mk2bHG+6t1K8dZSpje0s zMIarsp2fNtu4ZetEeERssuPjHP3d3n899hEgZ95D9t0Jykh09Mcvxppu8LhoIFQ8vg0 1osA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869566; x=1697474366; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mrNyQxzZbISyTGA9HvE3hdjQqC6VZlNpP7RPMooC3k8=; b=hlF2/xb28iXaHuCVlEcadPqKpHgGrsDNZSqrRE6gGh6+7/sJm//sM66KEJkckALx1z mKsOSByUHCeyi41VUfqDSzdN/IrgYnYWTtNkydjiQvz31KzNyP1Ai/C8SfZUUFQ5dnap 3MK9c7lCOcVhjy+s7ikfDhmqf95O9d2e2hMwyahiMAtI14Vg+gi4egOKIfppeuZhyYMF 7FV12q/Vaeh1l2NmDNWbDvNjzNtXTmmBvebK0FXUGyde0TEjdfZ19huP6REbsKozWY0w 6tJA5aOFSYNlyP/ZvU7kS57Io4p0+kM3JoYCceXyD8RB/Wk7TjLoRf0Fj7rdHt5xWj59 RPfA== X-Gm-Message-State: AOJu0YwDpSlyoLkNaArtTK45W3cSyGTCldmmX/bYUpQt2JL5tibIXqR0 fI0AKxK0uQ7w2iJhxd+s/GXo9QMqtPA= X-Google-Smtp-Source: AGHT+IEIXCTQADql19py0nRRd+EAuXEpUgJsLFHgZDSW9HzI1rvARVNRe20v50Ye5OQPnqN+ouCSUg== X-Received: by 2002:ad4:5004:0:b0:65b:2e81:e507 with SMTP id s4-20020ad45004000000b0065b2e81e507mr15736553qvo.4.1696869565814; Mon, 09 Oct 2023 09:39:25 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:25 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 11/65] gnu: guile-curl: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:40 -0400 Message-ID: <7b6eb9cc21eae4418717966b17a2591f5bd6d634.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/curl.scm (guile-curl) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I32afb143c4f747874d0e8dd1e53aee7481356ef1 --- gnu/packages/curl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 5c8d88692e..59bebe29db 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -238,7 +238,7 @@ (define-public guile-curl (arguments `(#:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:imported-modules ((guix build guile-build-system) ,@%default-gnu-imported-modules) #:configure-flags (list (string-append -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:03 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:03 +0000 Received: from localhost ([127.0.0.1]:60933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIY-0003ji-Sa for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:03 -0400 Received: from mail-qk1-x72d.google.com ([2607:f8b0:4864:20::72d]:53279) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIP-0003gt-AP for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:39:53 -0400 Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-77575233636so316567385a.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869567; x=1697474367; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=q/SxtJ+odQNeNz5DMYsyejtsnvBabfKCFYYfXR94iT8=; b=MLENOb9Y3X29kr0YL1jlfYoQMpsfgOUFwi8rpsbiPIpGdoQyblm62H7X5UWp9Lt4hr Voyeb8f34WnPnkMJ14ovEe7bfFUPfUoqn/JcAolVUYxsQpe/pq4dlWJZhsTjiYV2TnHo Qr9GAUfGvMWbugEBiXoSNI/BE5pp96NhKDQ9RYz3ef1Vqogjlwv3+TtDWCPj5gfZe+X0 ewqT+9s84DLMkijvquvwnINI9ViAzznumap3EVAMHPzVO/P/LDhmHYkNa33Xnv0D1jZA +0aJpcPzSMkfXc1mD5CeN4EVKhBabW3K8UglAMURJgrqPi8yuf2sSV5HkgfywyowB9u5 qP1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869567; x=1697474367; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=q/SxtJ+odQNeNz5DMYsyejtsnvBabfKCFYYfXR94iT8=; b=idJxaPC7l+/trTCpvXZ9phX8QFkrvWtKxwnV5o1f8MdMv/cyq8Z64XNANwNlMVF9Sp 8UvSgo1Vmf0Rn3ugYcVDnizoiPhUWZ4u4i6/lzlXO/q6AdCxBHp3/JWBjB/hgK7X5uNa h0NhKosveGcN9+IlujE8qWhrUU3DrSpuzyXtufMjEdKX/ZipB+XHC7/GRBxMFQlADxds Bd3AK+Oq/DX+zNpdxICDIpcCRW83VjiAk4xh4D57xUZ5MAmZLfojgO3nlGYTf2AFPf3S mRSkcCkibVwvUGRlpoY3tvTNeM/ErN1d906IJbDQJH+z/REehWcUSZn8VUGL6APtspu4 lSqg== X-Gm-Message-State: AOJu0YzaVwYfrkwACsRgRUTHq5kuaoQbK360u2NXRu7g8lV81Pk+9YcL lQQEWy48X/Y0xq9t+4qiEbolZszAMz8= X-Google-Smtp-Source: AGHT+IEbb27TBOpn2QBERoxYv3KSQqEBqknFBRZ8c/d7SdcDb3dzRidDqrwnY5itgiyam+QFLLGaJg== X-Received: by 2002:a0c:df81:0:b0:647:f1c9:b424 with SMTP id w1-20020a0cdf81000000b00647f1c9b424mr18677964qvl.60.1696869566934; Mon, 09 Oct 2023 09:39:26 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:26 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 12/65] gnu: dpkg: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:41 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/debian.scm (dpkg) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I5c5b087088abfe1ba14ba166d9a5071c20598058 --- gnu/packages/debian.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 7f41dc8128..3c7d3304f0 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -355,7 +355,7 @@ (define-public dpkg (arguments (list #:modules `((srfi srfi-71) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases #~(modify-phases %standard-phases (add-before 'bootstrap 'patch-version -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:04 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:04 +0000 Received: from localhost ([127.0.0.1]:60937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIZ-0003jy-Et for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:04 -0400 Received: from mail-qv1-xf2f.google.com ([2607:f8b0:4864:20::f2f]:50304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIQ-0003gw-9u for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:39:54 -0400 Received: by mail-qv1-xf2f.google.com with SMTP id 6a1803df08f44-65d0da28fa8so28738106d6.0 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869568; x=1697474368; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yOwAvVvQAiaNmhxP6mgvanApYaVGnZ7ToZUANAZ3K3M=; b=cFXOsfNZ7M6kwN/g93nTdk5GQHGZk1Qy7UPn9bvHHk6OuIntwGaZ28Fsi2BTfMZdjg XXHAh7cvV0wm7mW73TI1W4ZbiREfo2+A1iLnj5QyWe4i3ZVR29oTiCM32Y7IWA2WufXB k7et5cTdg5CYwHj70mILexkEBn0vKGxh2mdK6MuB5maRr/cVnVVs76/moLuBtCalyiV4 iCBEif439+rTgOAJGxFDpgjesf1wX+GxJWOt69JdGt82QSdPjhRHDHMxlqZe6h4/0xvN ZDlLmufQhfGMRHYgsVD3g2CMmA01VW0ktiinjDWwb6skZi/g0Bcw0Qelp+yXwy66RtgO poVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869568; x=1697474368; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yOwAvVvQAiaNmhxP6mgvanApYaVGnZ7ToZUANAZ3K3M=; b=aXPiFJTLSmXsB/6hLpKl+sJIQM2DO2i6lQQKpcTtiDuIwpHONsTilHxhvYxDCAzzDF NriXWOXiPPhKdJ0oQ65R0nrclN1c/2vHTo7HTvuYr7OsqRwpDpE/m44lCKlFub81obho m9p6sqoSA+sDfjoZINgJIrRMtyD5INOHL5Zae4YKuahYSe/KtgG+PD5984KIuSJNnah9 vfYxxHhTJv9iKKt5yw0NUu++cRENzxtKyeUbupdUczs0cHmjWFrO7W6dvjwMfx2hj+3l X4TpYJxAWVG42KG8E0/Us2SfBtTUH8ZvjxWf5BzPfHmlpYqUDBVTnLukAstHxc17WyQ9 +9rA== X-Gm-Message-State: AOJu0YzrAvSUxV+nnxAi+UorI3zb/wk5cPJ7s1nc7M7MyFWjj5V5NR7I CjyXINF1kwXSiz44xozorGB1SmNQ5TU= X-Google-Smtp-Source: AGHT+IEeoG3cHpjd05SOVkCUUTCsKCfpxc0yt5vTU6L94N1ekDAby84nyxqm59ACFaxtctYkseZwJg== X-Received: by 2002:a0c:8f0a:0:b0:656:3352:832f with SMTP id z10-20020a0c8f0a000000b006563352832fmr15435785qvd.32.1696869567981; Mon, 09 Oct 2023 09:39:27 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:27 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 13/65] gnu: dezyne: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:42 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/dezyne.scm (dezyne) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I958d326f2907b2a4e07d0897b0e008224c125dc9 --- gnu/packages/dezyne.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/dezyne.scm b/gnu/packages/dezyne.scm index dc2453b521..5e33f3d9b1 100644 --- a/gnu/packages/dezyne.scm +++ b/gnu/packages/dezyne.scm @@ -51,7 +51,7 @@ (define-public dezyne (arguments (list #:modules `((ice-9 popen) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases #~(modify-phases %standard-phases (add-before 'configure 'setenv -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:05 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:05 +0000 Received: from localhost ([127.0.0.1]:60940 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIa-0003kM-BS for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:04 -0400 Received: from mail-qv1-xf35.google.com ([2607:f8b0:4864:20::f35]:42410) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIS-0003hO-Im for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:39:57 -0400 Received: by mail-qv1-xf35.google.com with SMTP id 6a1803df08f44-65af8d30b33so39215266d6.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869570; x=1697474370; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=g2r8T74GUJOoX2ACz13ahyEBiEq2l5YSiN7pTnGcQ5Y=; b=Ltr9zlmSjLETnvwGDnChgh/ppHZwLHhL22X5wZ/WDoiVNC9bxWD8fswAcgz5jfzgpp H3ADiiV/hP8zSnkF3WkZiXpOaGObtpR6DYXooUNzKPJpwX16SBRCtI1CyGk/KEu7PRyX fhB3geU+BECG1+W+kLChgMBWWyWLoj21vNZT+dV/maE9bzLwESESNUUYgGlx3zhqfhpV PB0ONn0qpy+gMzMR7QpjgnsoFTj16aqQ0ImBOW1OnOKsaVxc9kdhXf5rtqwi3vuIl8Tj k1iVf4moh/isHEbXE0U3osWrVpvcRPtd3qAF2PC/dHzQW6v5+t00PfTNU32tJZM+1HyE MtRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869570; x=1697474370; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=g2r8T74GUJOoX2ACz13ahyEBiEq2l5YSiN7pTnGcQ5Y=; b=lrfVjFI1jAdNtC6lx5LZB49rryo5rdPqQkhRBvwTY44IIoyBS9oXPXSXsJwSIDDrHZ E215yi4lfNHwGCsukT6ldQogeI1u0TA5l0jSCOgZK2XbguqJot8m8b4xgcHxIvewhHyA xOUtAGNL8iCnOpOWvvjzcr4xqxMzGHWmEmpLufz8To6lWwmImjyYWhzfXq5lSWq8pQVA 1VydKjG7Q/3wP7NQmWWqva+tdu+rGyWWbManQel8rtKWP0Ne/Ub6VMqstmg8qQxKG69q ZjRXHOwjCcYJsxXZnlxjzjPanRZKQvpapYMcSOngrIDX3Dy17SpbeUV668nWvitZvcAF k8aA== X-Gm-Message-State: AOJu0YyCO2LdpxvcuRFfUKKi5/gVbuBfyNhv6/H3AXsUTZfOCG6hnPrd ndHfMA3e7rZF1mFywxPGMrVwjMG0fEA= X-Google-Smtp-Source: AGHT+IEB0xij1jOe4E5MuKQb/CIqlUTcEfCdLK0wD04j+8jWmYN9bgiADdALHzUt7kFr+Un8uAauYw== X-Received: by 2002:a0c:aa97:0:b0:656:e11:bd04 with SMTP id f23-20020a0caa97000000b006560e11bd04mr18709433qvb.7.1696869570133; Mon, 09 Oct 2023 09:39:30 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:29 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 15/65] gnu: fasthenry: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:44 -0400 Message-ID: <80e8ff808745973313a053da7db2b12e67f19f1d.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (fasthenry) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I8e49c7ae4d430a4f6531bfdcc7f36edacd2d0508 --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index fe29a8a366..94df543fd2 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -686,7 +686,7 @@ (define-public fasthenry #:parallel-build? #f #:tests? #f ;; no tests-suite #:modules ((srfi srfi-1) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases (modify-phases %standard-phases (delete 'configure) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:05 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:06 +0000 Received: from localhost ([127.0.0.1]:60943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIb-0003kU-1q for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:05 -0400 Received: from mail-ot1-x32a.google.com ([2607:f8b0:4864:20::32a]:50259) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIT-0003hS-NM for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:39:58 -0400 Received: by mail-ot1-x32a.google.com with SMTP id 46e09a7af769-6c665b2469dso3167031a34.0 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869571; x=1697474371; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XcIGSnng3oYv0IKqP01TKuiP2trhYMEYb/TZZ1bAyWc=; b=klrD5Q593umf+0WD4jgfnnjfgt4n0P0AlR/Wl83yVlX1KWLhxzs9pzxQ2BzVOSvhIv IpgZJqUusaq6Qgsc7QdwLABfiv27t1SqgXjHrsl2RFDrqWNlAITxnfCjmJlDu9ez/zD4 Bm8bfghtjSdCpOQ5eNDhuQe0qhTH0TKKhQIuL6IRsLivzltmPRpmYnXvZQFiTaQjkeBo sDmDBVTiFlJ68/mwK/hOrZRbfHytreQrzkzrIJRdZl9leIG6O9kXMVhNK30IqowZyW2X mUUuZkABC81k8tKRiezAgBClGB+iSXc1plRh6TXXIP+/CTVt2fWtsR4PF/IniPM3hpc2 cauw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869571; x=1697474371; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XcIGSnng3oYv0IKqP01TKuiP2trhYMEYb/TZZ1bAyWc=; b=u184VkAum0vm3Z7/ci+JKD5FRnD15AtaKoOX9ySxH4nZbEwYd+aOfPGB2lG4wwazT5 T0UGNIfG4tQMitRpP7FQnVZuRx63IC+pk0GgalxahrZu3WPtmpq/h2taO2x7fc+JWN3U wy29UHBt6x/uveVPi0DpedgOrpkp3nsX6IdX14BlC8fJv6Vd2OpgiLY6pBsGmRw4gwqR BdBS8ExGwGVNXZ5i4XCQ0OwqBLhqwsvD3GdfxeJ4u0+nD8sgvxOsPKCdQfy24xwWQknC EQYrbfRHazSv16wqR3i7dDNSfvLXuKeqZyg83E/+qcbl/zyeMk5MLxSTot5sbU26YoYS QqwA== X-Gm-Message-State: AOJu0YxZJ5NH0tQtDwLoZAeFPGXwYJJr5CYsR+Xr1xaU5qD60TlPIFB7 GbTZE7k4kiO+COBRBWEQHzfClvYYOVM= X-Google-Smtp-Source: AGHT+IEUlw5dc6ROdr8ZlOsItCijG9Ch5YhApOuastHHiiCpTTDP+Gi5mFCEGghuy4cDLmP802Wj+w== X-Received: by 2002:a05:6870:8919:b0:1d5:8d8b:dcc with SMTP id i25-20020a056870891900b001d58d8b0dccmr18172021oao.18.1696869571220; Mon, 09 Oct 2023 09:39:31 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:30 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 16/65] gnu: seabios-qemu: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:45 -0400 Message-ID: <31c8c47439142272f1ed73ba5175c2bd54eaae29.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (seabios-qemu) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I83e0768198c81020245b9281c678733803824236 --- gnu/packages/firmware.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 7734b3ef51..d853cd32cc 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -647,7 +647,7 @@ (define-public seabios-qemu (supported-systems %supported-systems) (arguments (substitute-keyword-arguments (package-arguments seabios) - ((#:modules modules %default-gnu-imported-modules) + ((#:modules modules %default-gnu-modules) `((ice-9 match) (ice-9 threads) ,@modules)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:06 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:06 +0000 Received: from localhost ([127.0.0.1]:60946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIb-0003kn-OY for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:06 -0400 Received: from mail-qv1-xf33.google.com ([2607:f8b0:4864:20::f33]:60806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIU-0003hf-Qx for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:39:59 -0400 Received: by mail-qv1-xf33.google.com with SMTP id 6a1803df08f44-65cff6a6878so27561356d6.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869572; x=1697474372; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s4UlK778L6YKi9pWfAIJ05Wz6PEy3ytPcUiJ31RTu3o=; b=Z7YJd2N518IR6UR1t0CSLdIi5kWxm8o90wj/4bHUTevp4KEgDDFm6d5+BDaV183LfK vj4fEfPPJZy9tDFmEKHd4BDN0txjOZcKkKzYWP4rzNg2un1N4d6Y0KEBVoXId6IR7E51 PJElr+hWQapOsEivD0Q3hutf2MTiaFn5xRFU8v1wIG60VAWhq+Bb75+ZqlZIhYXqVWu8 btfmj0irazLkFAebWsUd/UKCtjRie5ktfaYXBIFn2IioOW8Wmco/ckeAEInHC3+tZ1hL 4tzHVnN6e5mq/BZqsLg2i+xZSKMV5NFefyHvxZ+zXOUgQNeelNVeL/c88tCDrUbz2LOE yncQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869572; x=1697474372; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s4UlK778L6YKi9pWfAIJ05Wz6PEy3ytPcUiJ31RTu3o=; b=ZbfCsFw8eN9Tlt6fD3Np4RAi61+bA3LkxJ0iIH6xO+qNH8tmtDU6BUAIDyOdap0UsR thXmecllsbRSj2aqtHB7giyv/LF4jxQMiCsJxL0c3aVlvZNQ9rlM5HPZHIVO7HGBtdAC GvOjZ9dfuj80IReyPHV9URhK0HmY4UM0Ciw8zmcCrdKQxAWsBDnmsKpbgSopwejbK1oX L+2dFQTEPPMBwLbqsbIZ1CaE6QbpYawTW6y5cHNVo/9FQoiXN1XTWrEwOkLYULxefRAt jdBHkXylYo9GuVKvqsogtcVMiSePoG5DAIFlPjxbqqOgHPxmkY+gJYiNdlooBIBhSqqZ EH6Q== X-Gm-Message-State: AOJu0YxXbzOct8nWoH8LeW9+GAk3Qws0zqXyqZ9YiiygIE+X1HEQC6Ez fWa3jppfgVVP2sms+DSCJtYvqQWBXHU= X-Google-Smtp-Source: AGHT+IGpYfjOXZrGIhpXi/RmWY34iIUshmYCSiycHYqARtmGuVVG7Vlq8qC0B0QbN3VLeKKQe/0yhg== X-Received: by 2002:ad4:4531:0:b0:656:5467:4d52 with SMTP id l17-20020ad44531000000b0065654674d52mr16215212qvu.56.1696869572377; Mon, 09 Oct 2023 09:39:32 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:32 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 17/65] gnu: font-amiri: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:46 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Zhu Zihao , 宋文武 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/fonts.scm (font-amiri) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I12612a6257b626a0089798d9c1192cf2ef15d798 --- gnu/packages/fonts.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index f50c8e6a1d..1f5ac5b727 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -857,7 +857,7 @@ (define-public font-amiri (list #:imported-modules `(,@%default-gnu-imported-modules (guix build font-build-system)) - #:modules `(,@%default-gnu-imported-modules + #:modules `(,@%default-gnu-modules ((guix build font-build-system) #:prefix font:)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-source -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:07 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:07 +0000 Received: from localhost ([127.0.0.1]:60948 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIc-0003l2-C3 for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:07 -0400 Received: from mail-qk1-x72d.google.com ([2607:f8b0:4864:20::72d]:53683) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIV-0003i6-OY for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:00 -0400 Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-77433e7a876so315744885a.3 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869573; x=1697474373; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fQojiHoUJSEb4EtYOIy0FNkdZzfBwIAv9qUPJVIGzdE=; b=ccoXVcf3bmNCaMfjCdu/8YrnljJq3HKdE5alluLY6zyIAXDiWsSHgyuACQFflzI26f PkvqFTxelLcOWejvt3l33ifxKD7A1QQ3+CXBYHbv+GYyHoe6giS8+H0cZ+wfm+uz/+62 MXv3KKeICSfbwQprQl9PM3hqhbv8u+jkvUmWm18h6PjSiPUKUyf/FLNH+2VgMAYEpUpt l2oCFd00r+R+gZ/8AQQ8UIcM+wa0YvdZS02zGq6EIBNwzQ8ksNini2945v2GG46L7wv/ I/dB3tIIVAkpvnBO13Ihx+nyIkC6jHtOMfO94Ax424CLL9rgwfzsB8O0uPsbOD6Wnj8J mIUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869573; x=1697474373; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fQojiHoUJSEb4EtYOIy0FNkdZzfBwIAv9qUPJVIGzdE=; b=nbfTrO7Zq4UnVuXsDem1MsT0tAAyarkC+s4+/HfU8TxmL4x9xbjChPC9xAKrp1/7M/ Y4Xhq4K9yPAWD7G0y0a6YPHYgE6AMVO3+eq0nYsGLFGmMyjH5YK2YD5xWwwy3nekyaZ3 KVAghDzKz5RTPSx2Oy0gVE7FIfMcT6iP4WaQUbW3fOuFfSJcYh8dFjf1vvmf6ce2kzrZ 81RGqXWbv5Wcj5JovcQcmJcF8ahiX0HRfjeNuYNrsuqXYutBmHne6VNh3Wc4SPlSaU1W g+/V/gzDMnBM+KQ9wmBTK18y5syM4MM5woVnyiDwvLkUDDO50WwMXAFVY5BfFT9DHYDy fTIQ== X-Gm-Message-State: AOJu0Ywnu6VS5bv1JgM5Wvp1E6/gY/n3SdnLb+9aLD5anHxK2m122ZCU QhhcO2qKQdIa+/HiJ2NZdkuS9RQjgNM= X-Google-Smtp-Source: AGHT+IHmyxoO8AOAsAIYqIJRLVA0gRx/zrB37gkfpMJkZlKMPawMQjArI0kO7DqMsROpAMFNgXX3PA== X-Received: by 2002:a05:6214:5c06:b0:65b:2008:8a3e with SMTP id ly6-20020a0562145c0600b0065b20088a3emr16705457qvb.46.1696869573458; Mon, 09 Oct 2023 09:39:33 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:33 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 18/65] gnu: xdg-utils: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:47 -0400 Message-ID: <5541cdd181f9f64833ece9508f6b22267678381e.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/freedesktop.scm (xdg-utils) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: If3131a88423d49ab688f397f59b9c8d760ac2ebc --- gnu/packages/freedesktop.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e05720ab16..396865109c 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -498,7 +498,7 @@ (define-public xdg-utils (list #:tests? #f ;no check target #:modules `((srfi srfi-26) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-hardcoded-paths -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:07 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:07 +0000 Received: from localhost ([127.0.0.1]:60952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptId-0003lI-4x for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:07 -0400 Received: from mail-qv1-xf2f.google.com ([2607:f8b0:4864:20::f2f]:56700) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIR-0003hB-CA for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:01 -0400 Received: by mail-qv1-xf2f.google.com with SMTP id 6a1803df08f44-65b0383f618so31114886d6.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869569; x=1697474369; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+8S9ZFpDbdsUL4xglZFBaE7hZgjzjv3sSh0FsS5aaJg=; b=XgR6KuEDJTlfkgj/WrzvtYzYTCZf+5VdVltnzN/FEGGjrwbYEHhVUqVvNWHIraCPuO a2/AM+zefV7hDATSXHJKn+E4MuIW1XAT5HRELLufnhynyqiwxakOJVMO6ck2IwH3dEau pX1lEdR9U7SW2ab5/mHELiSc2Bi1UXBdTDU7sH+v2snpt/McadzVsUdPLE+NvlVwSPCC y8r4pqByO948CCcW5xTvewsl9bbxB8rGnH0ZEJ2R3LBmb2ycxqibu+qkrfiov//QPy1h 1fzuHK0No0/++nN5v0fzzaGkPjOjYZRHXwrRBw/wVk5XgbVrfmiioJ833iSG4HslxVrG hi7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869569; x=1697474369; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+8S9ZFpDbdsUL4xglZFBaE7hZgjzjv3sSh0FsS5aaJg=; b=aP/4Yoygg02zCpPuuZwB7gl+fD3tG5RU5s1H42uIObfPqjCYvdk26cQanK5D3ozf2l CaX5jYwpzm3W5Vtk4hCT9pW3hirjTlyGWg5QeiOHetg3A7usp7QiPCXm8R+sSob41Tmm +ui+V4t0VH/jUpb5d/fvJdnSe6G8eaaRphfGSr4mW+JvZl9Tn+ufagTN1PQVvWJXADBj lK7vIfli9wRMYhlS4Bc1s901wZmGk2WeZZPO9Q2d9l2IIshkqNkUhbQykP41AMSM9ZAV LVHT7PTiftK4Wz5sK5mQYgkkfTnGWSnCcBXPfor9kqMmds+DI1kHg7hrEc5WJnpTByGV MzEw== X-Gm-Message-State: AOJu0Yywj5m3Pazt0D66HHccAoJXihFJa6GFw/VG5C+3rfObbPp+JNvT fsHwjgXD/q8bX3Wb6EhIFA3n/veWCQM= X-Google-Smtp-Source: AGHT+IFY2NtOjW9jLovaCPERp1/figN17xpXWuWsKVuQ0z7oYtMpqzilSZYjCh93liu8RfEOuYnFPg== X-Received: by 2002:a0c:f442:0:b0:658:427d:e87b with SMTP id h2-20020a0cf442000000b00658427de87bmr5602456qvm.13.1696869569055; Mon, 09 Oct 2023 09:39:29 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:28 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 14/65] gnu: fastcap: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:43 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (fastcap) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: Ia1b6bbb2b4fa28ac22e129c83bc9ad2043ff755f --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 365434fa2f..fe29a8a366 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -589,7 +589,7 @@ (define-public fastcap #:parallel-build? #f #:tests? #f ;; no tests-suite #:modules ((srfi srfi-1) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases (modify-phases %standard-phases (add-after 'build 'make-doc -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:08 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:08 +0000 Received: from localhost ([127.0.0.1]:60955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptId-0003lb-On for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:08 -0400 Received: from mail-qv1-xf2e.google.com ([2607:f8b0:4864:20::f2e]:55467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIW-0003iR-Sr for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:01 -0400 Received: by mail-qv1-xf2e.google.com with SMTP id 6a1803df08f44-65b08bbd8b1so31221976d6.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869574; x=1697474374; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gUIHexfN+CGMKn0dTcc9qPORBuhXSFgSsvMS+m2/rFo=; b=fXI89vt03QDdhsW2jYY/BgcloZ3uvetgdKmSt/kAzl+vggFf3YXQnslU8C5twT6RbO k1GjwWKyVlop2azDhWi/1qJAxBaqaTViPJjeeOOA28meVxfx+0PJ+Ud53DDfbvTVeq+J LZshgYlmaaFNBeFWeVUKhpQg7u1bvrxhXnvnkkkjdo8vHPsr1TuFVxH5o9wFvsGg1gN5 udGLnPuVeibRCvLiyceYvns5r2k58F5SF2loCQ72qjWsKFy7k3kOM+hfGHQUh6g/sGZe R4C6mu8VJi3SRa4UebnE0dDkApU1kYshrpA8hGCb+lXJzFIYrhxF0sZkeg7nsa9Jfmx3 nRJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869574; x=1697474374; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gUIHexfN+CGMKn0dTcc9qPORBuhXSFgSsvMS+m2/rFo=; b=J6DGDCE1IVZfWJgJqbN4kiRfTBS2hGoQSO+gY7diemdBMY/czL6sK/e8dVNP0nacVn c2kdnk//3pBEgCoelh3zOBntv2R6bFkHh/PPGCUMiD/sXWUWGUdFlPXptlJU4zaN0HpB H9GP0n7R+j/k47SryXS9WusBDcvuc/Y6heoZll/UqDujxWOgRWrgH3w9O7XECXuispTi OPDmgACpB5XVrqw8+/VOnvABqiDVh+dx49shKPWTIQ5d1TYj7bYpcAopedCR0D+ZYDWR P41JMTKvS7evApYeymqyMgVGygAFXejayt19Fpq5GBd1atd1uW62pM5l8H+qjAxLdmZM 2K2g== X-Gm-Message-State: AOJu0YzKsZG1bUWBe8/BGQZeUd87pOfagGFUgzbRoGFJDieopJrHCcqj n8UWYoIDivi2Z0S5tdkC6iqfnlXc14o= X-Google-Smtp-Source: AGHT+IEAFekKVZiEIEszFP6okNT9ouiiStxjqI9TJkCfN7ehKrhAqIxWwPS58MvStsaR8KZHID6zFQ== X-Received: by 2002:a0c:e188:0:b0:66a:def1:86cb with SMTP id p8-20020a0ce188000000b0066adef186cbmr8590988qvl.1.1696869574528; Mon, 09 Oct 2023 09:39:34 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:34 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 19/65] gnu: tsukundere: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:48 -0400 Message-ID: <0323108fa621bf49738da7674e2e3c0665636797.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Liliana Marie Prikler , 宋文武 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/game-development.scm (tsukundere) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I57fcb0ef5ef418e5bc5f6c8466f2ff1c5ffc7b37 --- gnu/packages/game-development.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 9d956359bd..69b5380598 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -649,7 +649,7 @@ (define-public tsukundere (srfi srfi-1) ((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:imported-modules ((guix build guile-build-system) ,@%default-gnu-imported-modules) #:phases -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:23 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:23 +0000 Received: from localhost ([127.0.0.1]:60995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIo-0003ob-D8 for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:22 -0400 Received: from mail-qk1-x734.google.com ([2607:f8b0:4864:20::734]:52417) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIY-0003ii-6F for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:02 -0400 Received: by mail-qk1-x734.google.com with SMTP id af79cd13be357-7742da399a2so317660485a.0 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869576; x=1697474376; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c80jHAyGoE9TKjiKL/0B8pScqH1xSaW7a6nsQdAzshE=; b=HaLE706i7e4yYkfUymrkRyZy5WpecdL7UPn34k7ifiK6StsaFOFqEecgbx+U8ppubi +MYe5zDJ9mhty3So7bkFIKyR1uG9Z8sPQNXW8TYFMw34mdLWkEIfea+3NSwUTso2TeP7 386VoUnXv3EZqvn5ni0Bn1QxD9bCLFuM2Gc/0j81Jfo6Rgj5pJGINVtCBzuCcPxggQ0P dS+E/MQJGn8vuyt58j8pZXRc2fCVCccEtT71oINkJv4oEUulqFIQUAGVqWHe9Gvwthfr x3Lu3aTpVPhtXzCfr8erFii0Kz0TrluX6QbLBVMuHZX/f1zsdVmIVbyBOXsupUZWg/LT /4QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869576; x=1697474376; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c80jHAyGoE9TKjiKL/0B8pScqH1xSaW7a6nsQdAzshE=; b=pkUxwaxnmmTLc2jcLkwxH/bzuBoI0L/odSJBhQ4m0Q2UgaTI1YYw0hYPvJ43+KkGh3 AnMcG1S9nneh6zjKu70nLCMwipHoTWMyLxLg7Z42qKWQi5FbDSdZ6XZ33zg2NhepatgP 7yAlaF87taJEiNI/XsTGmek83+Gaa6cZ2wipOMchqRh0c7cE5FOnE7W9KIoc1Fj+17BT eqrK0rKEWEQmFgyBLCImdoaae2Q2UeFwUULLIf6O79u19UpJn21RuVp7kqrXoftQfzVM HC6SzMwK8GpnMpPYhoZJO81DvUSedDKAQGXIxX+QW/Da7m7ThJl7pbZqDPI7qid1Dy0U Gj2w== X-Gm-Message-State: AOJu0YzYarUapdUrDgDi8n3d5wIeFBoBAWVA0P7YCiyr3r6+Q0LEJZ9U EiOiRLSezibH1SPr8WTS6RuF6k88XbM= X-Google-Smtp-Source: AGHT+IFpmKRu7r/1zK8royfqxTelWKfXVpmtAWu9+AH/n4wSKZUKOmrO+C0FWkfuvf7x0jxEiNAv4w== X-Received: by 2002:a0c:c409:0:b0:64f:3699:90cd with SMTP id r9-20020a0cc409000000b0064f369990cdmr16312017qvi.42.1696869575846; Mon, 09 Oct 2023 09:39:35 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:35 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 20/65] gnu: gcc-4.9: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:49 -0400 Message-ID: <9d1ec0f366bb0a33c44ede2d540397ee05447d4f.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gcc.scm (gcc-4.9) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I8482661bd49a94adefc772fda0449023bdd5927e --- gnu/packages/gcc.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index ffc7166349..8fbb0a2915 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -448,7 +448,7 @@ (define-public gcc-4.9 ;; For native builds of GCC 4.9 and GCC 5, the C++ include path needs ;; to be adjusted so it does not interfere with GCC's own build processes. (substitute-keyword-arguments (package-arguments parent) - ((#:modules modules %default-gnu-imported-modules) + ((#:modules modules %default-gnu-modules) `((srfi srfi-1) ,@modules)) ((#:phases phases) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:24 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:24 +0000 Received: from localhost ([127.0.0.1]:32769 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIt-0003p0-0y for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:24 -0400 Received: from mail-qk1-x72b.google.com ([2607:f8b0:4864:20::72b]:46092) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIZ-0003ik-7s for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:03 -0400 Received: by mail-qk1-x72b.google.com with SMTP id af79cd13be357-7757523362fso314733085a.0 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869577; x=1697474377; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=buO+FrUzoE2V9bw2a4qZEmuUnmB1sfmvL4ro9DN43O8=; b=mPYVMIg8koysm+9j7r2haRImfDE/LDIwLhmBmWwiTzBbQTgLXFw1Dwwk0ddtwEm106 fjnSNQGfyk07vAjb6gWKyr7viQ8nLeNRxwVqSsZzzLzA9m2AGtq/FS4s1piO6piyO7st l8a007NU1HJUPFI8l5S6XfeJQT1UAUcyEVzxqvZwsRX2FX3L4iQZdRiXwsCJaIm7vEp6 yxl/SeoZ0KsHggW32xnd76h4vRigqsIWkFin0lvv5Lc5rFFMNbksZtB832JrRC9iH/cH UtlBCL5CdVaZ4HZExZVWy2dNVJtPDhv4K8YfBJiWRFCJZ9KUmhOAjuRGwTz9BK4F16DM hdkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869577; x=1697474377; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=buO+FrUzoE2V9bw2a4qZEmuUnmB1sfmvL4ro9DN43O8=; b=BT3NCNKLWVuZzSxiN2VnYoVh3cXuOH+V4KwoezX808K/fQPnlc3NxzA7vQC7lR5MOb H7NzcEwM4P4LzGB7WZY7pjsfPDsTz59F2DoS1W0G5fHtc+xvWTlAxK0Iz400Nb0jk8DY WigD2usW1wLp7qEoWKjih5iraV/UI8q81ALcGvYG2eLQZmoErr77IkWZP5wugfA5EtWs 93jUvYJl4/6MkYx0oXQ2ytFnn8dbRRePHIJ9brl0+v3ZIQ6xImSJPC8JJ0HPddP7ic9I AQwpo6vUldx2X9TyanUtlM+Brx3Qf00Rn0nnwp5zA/5FE8VrB3nlLxfxzj2QZRWOv7ZX 6HIg== X-Gm-Message-State: AOJu0YzfkTH1f8z7wUnFSXL2bn+rMTjFCsWvUVF3P6Gz+Onc19gVD5uY kNnujyZAgGZvW3zoNLMikBqI3yztHqQ= X-Google-Smtp-Source: AGHT+IHvffjELXzY2/44svhZXLSld4rJdbWzKEL3tMwyVfgp2bbKXt08KmhB66sPtMZl1LXNwXKIbg== X-Received: by 2002:a0c:e449:0:b0:66a:e91d:ba49 with SMTP id d9-20020a0ce449000000b0066ae91dba49mr10442446qvm.46.1696869576923; Mon, 09 Oct 2023 09:39:36 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:36 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 21/65] gnu: make-libstdc++: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:50 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gcc.scm (make-libstdc++) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I3fe29766f767765e966c189395f618b7779f1e0d --- gnu/packages/gcc.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 8fbb0a2915..fb8cd2d108 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -901,7 +901,7 @@ (define-public (make-libstdc++ gcc) #:out-of-source? #t #:modules `((srfi srfi-1) (srfi srfi-26) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases #~(modify-phases %standard-phases #$@(if (version>=? (package-version gcc) "11") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:25 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:25 +0000 Received: from localhost ([127.0.0.1]:32773 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIu-0003pQ-9U for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:24 -0400 Received: from mail-yb1-xb2d.google.com ([2607:f8b0:4864:20::b2d]:59733) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIa-0003ir-Co for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:05 -0400 Received: by mail-yb1-xb2d.google.com with SMTP id 3f1490d57ef6-d91a7999d50so5242498276.3 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869578; x=1697474378; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AY2A72ym190V/HHzAanT83K+9t5YapyE41nZ4EnmWOk=; b=BgAvzSf/XgYxhRwHwwO6ob85tlXyZ6OxOsx59AEUv65IE2qxfgkWcBMk7WCghylIa8 x5olcPMxQlYa0oWzM97/oq1lwEh2Fmcnj6sbsUWnzqEKgBRVNcGAtK9vw4lWj4bKN03o gIiitVFOgkXiO5IOMP+DllR6SuLb0vm59vfYrxj4qcmzUzgd9cY5KP+ALtWrii3g1K6i Y+hNiS3NM4TD5oVRnBk7PLPwICALbSWgCuIxResKtLzrp3pRfg4D7HuK1n73OrEAc0h1 XOyBvu4Ub++YY3qu1HtK6oFhsUH0ZpfoHMKU7YE1Q2pbx8IDZJcE2iyLMIADbLA3fqS2 OanA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869578; x=1697474378; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AY2A72ym190V/HHzAanT83K+9t5YapyE41nZ4EnmWOk=; b=LH889wHCGqwrqQ72fYpVTQQP2YgzLqm908TQHBR8oJpBvrqHrS1ML3OJeSEkfV+aEl mT2PW6lTyH9goSUZb6tQkUUDJ4BZpymku+LulmCePbPNWJGBzVT74N/zZgRt7mSAA3FY lsTKe1V4d4bs6osWFp2H0umya/gg8rFTzvTpLzoBv3qtRP1rXE6NCTSK+RGCnpRf4r+r +i6Yt5tTKlX3V4jZ8d4g+heFheIRL288aBl/pGKeQjGp2gMu1xS5CYXsUhYsGk/lNzoI fqr6XMA1JNwKx+7Ql4pe1o2tBXQIpyLczorgK8NKu9mYsRWy8GaetcpuiPssnFgeyT8m vBaA== X-Gm-Message-State: AOJu0Yx37Pw3utp1PHp20lce+GWuATCN2w9eofNpp9WgQviTvLsb0nTy 6JiMP0IW9Y06TWdd8DxxJz/5nPrcFI4= X-Google-Smtp-Source: AGHT+IFl1OECqKoMJE+8EpvOtTS+NJoPQUxzU1m7W9kcfWjhcX9BhmzqGztEazl4hdP1BEIQv83U3A== X-Received: by 2002:a25:21c2:0:b0:d00:cc5b:8a9f with SMTP id h185-20020a2521c2000000b00d00cc5b8a9fmr12216601ybh.16.1696869577984; Mon, 09 Oct 2023 09:39:37 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:37 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 22/65] gnu: custom-gcc: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:51 -0400 Message-ID: <9ad254e2822cc93cae3a8376a1194147b3aee71e.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gcc.scm (custom-gcc) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I133daad4e05d5daa98fadd5acf2d0f4606b6e056 --- gnu/packages/gcc.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index fb8cd2d108..5d7f78d38a 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1042,7 +1042,7 @@ (define* (custom-gcc gcc name languages (properties (alist-delete 'hidden? (package-properties gcc))) (arguments (substitute-keyword-arguments (package-arguments gcc) - ((#:modules modules %default-gnu-imported-modules) + ((#:modules modules %default-gnu-modules) `(,@modules (srfi srfi-1) (srfi srfi-26) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:25 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:25 +0000 Received: from localhost ([127.0.0.1]:32776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIv-0003pg-0a for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:25 -0400 Received: from mail-oa1-x33.google.com ([2001:4860:4864:20::33]:61801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIb-0003j3-HA for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:06 -0400 Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-1dd1db54d42so3285719fac.3 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869579; x=1697474379; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0mTP24zcgFlUJMqk07BQNIa75SyhCfGNgMLC8xE10Xg=; b=Z3z5Hwg86oyWdk0HU69uxXSa24oSpjMH2k+M9e2oWBjNkSO5RxBoTLE3tRxURzLOiP VK8cCCSZqqUvJaqT+ztNBRfEjMsE3Uviz3VeciVJzQ+nFCeePyIBhFURZa7oxYiTIf9N CwZ44WyvCxcVYWj6wBvZjoCmdRsBwG8+VVPUrUJdY7ZrYRyVdbT+jJ5yQA68EclrVBkK xX2pCnadC8wVxWHDcp2fFjMQ7/lsK2cXo/N1LPbvtSwtU2D/M5Za9uhY+SXzgxSW8HM5 mYCRKn2LOAEgFdpvnZ9oWpENkcKhuSV3u5O0OvTEwOkL8nIVJp8nbaM3DwhZyXikAF2h OZfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869579; x=1697474379; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0mTP24zcgFlUJMqk07BQNIa75SyhCfGNgMLC8xE10Xg=; b=XRH13oRuKKzepVH/96tQFA3KCIhbdjkdMpmyVZ5w2ur4oDiLMi5a3rGLXBZwi5lMnn j+BRiOwr6/Jr+ucb8NyhqrRci2a6wOz59EVnw3Y24DpNOkxt4usDXMTFOfkVPW0gqbvX J+XBIhpqnt+SK1nPOX6pZfRlrHf8IL/Q/0HfhKlabJ/w1LKljqhQlmra0BL4H/9GCGiY O2uBCrke+KtHn7qfiolRVeHJUfNeVNDwfb44L7ys6GpXOWH51umAZ2BKKZXkPrmJZPxH nkE+DXPENdOn0NiCgnaM+vfsxDOrafhEiTuYGbjWtCKlnC65vjxauT4O4Jwz7+Yon6dh 93GQ== X-Gm-Message-State: AOJu0Yx/MrfBWxcuYTldWYyv4F/vNWq8X+m45VFyZGPuTrnK5X7C4+Oj XSMQVDR0P9slfTAOi06vO23Pa2ffuUs= X-Google-Smtp-Source: AGHT+IH344j/Or75TVSMRzaNySDk8gpagEemFdubu+91Z1XRWbN6X4S2TOUcZwIpIAZq+FBL8c+01Q== X-Received: by 2002:a05:6870:818d:b0:1d5:8c26:74e5 with SMTP id k13-20020a056870818d00b001d58c2674e5mr18594068oae.10.1696869579143; Mon, 09 Oct 2023 09:39:39 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:38 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 23/65] gnu: gdb: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:52 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gdb.scm (gdb) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I0bf897af81c09ab7d00c1d06fb527633ed4c9bd8 --- gnu/packages/gdb.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index eb90a01c53..23cf2ba791 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -64,7 +64,7 @@ (define-public gdb/pinned `(#:tests? #f ;FIXME: 217 unexpected failures #:out-of-source? #t #:modules ((srfi srfi-1) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:25 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:26 +0000 Received: from localhost ([127.0.0.1]:32779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIv-0003pm-Ca for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:25 -0400 Received: from mail-qv1-xf32.google.com ([2607:f8b0:4864:20::f32]:56457) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIc-0003jM-Jn for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:07 -0400 Received: by mail-qv1-xf32.google.com with SMTP id 6a1803df08f44-664bd97692dso31226796d6.0 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869580; x=1697474380; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UxsThF7HREj/wI7L8TXX9UHcrWQly8AVlLVl0uRK390=; b=NBhWh/tcNl5PA7rkoy5x/yqSkyohwXUFZL3zcx2iPJqhbg8hHjDYlvqSLjCltK9Gx/ Er8yHmVrO1OjZiGmnePdOiwZdIkQFkpj+V17uInT7P/XURFNYluSW/Uy+kj0G3I4K+iL eceav1RG1SN/O9j+pupkGs6zkGRvYC6iMxqmAsWeXhg7cOnNe/vdeEcyMKqsyJ6Bow1e jnWVbcTRCYAKpLmshLBUeoi7N1OBvOa2DYNWGSBUzy9srvX/YF/PUBfRCVCQBasEk9SM CrMUgiOURlGBptDnLL3/zO/1ShyPBZxDL0TTyTmc2zEnZRqy6QyOXhr85iYKMVSWiAlF s7mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869580; x=1697474380; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UxsThF7HREj/wI7L8TXX9UHcrWQly8AVlLVl0uRK390=; b=AP+bXT6EQYr5apYwOGVpsGzyv8kxnRTr0dhGYpwz+Dmme5piKb98RiDvAoDXBFOQwh BQMwsJGOdfyEz3LmxGwEC5cr7zf2/DFl1Cek5OPJUObZuM8k7zsuq5UiS/rnBVqUluH+ slabN4+B+fy6fL2dyF6fLnqXscW/DBmuCBoOYyd+KCHKZJBcRDZ2LJTuyKOPEMgj4c0h RYqZw+CBhBnHLNnZJEtQXR4u76asOULaCHwDrw9GKATo4yL3SiGYAl0eRuV/F5c4IdSh 4mdX4DszZuVROFAZn88dtFxHheG/sgtXLUbI5M0kxq/j6Aj42EJhJyf9twBi4MIjwGSb J0/w== X-Gm-Message-State: AOJu0Yz5qDKr0hI4FD5WLedZ/OevaRHkqeDM9YLlNFGBkw1slKmswTv8 ObWbz5VGqjsqOpz2rWEzeSRsRdy4B90= X-Google-Smtp-Source: AGHT+IHJ33yKCOBmaJZYp3KZbb/xCQweW0D/TJkNMWf7HA/vrOAWHE5tepAzF/p4r8NIgZFHjApANg== X-Received: by 2002:a05:6214:2d4a:b0:658:9cd9:ec6b with SMTP id na10-20020a0562142d4a00b006589cd9ec6bmr15655385qvb.64.1696869580220; Mon, 09 Oct 2023 09:39:40 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:40 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 24/65] gnu: genimage: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:53 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/genimage.scm (genimage) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I65a2e2b371ae9b6f822ba54d09ba6741e403432b --- gnu/packages/genimage.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm index 94a85ce2e4..13f3dd67b0 100644 --- a/gnu/packages/genimage.scm +++ b/gnu/packages/genimage.scm @@ -61,7 +61,7 @@ (define-public genimage (arguments `(#:modules ((ice-9 match) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'guixify -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:26 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:26 +0000 Received: from localhost ([127.0.0.1]:32783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIv-0003q1-ST for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:26 -0400 Received: from mail-qv1-xf2b.google.com ([2607:f8b0:4864:20::f2b]:49645) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptId-0003jc-PE for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:08 -0400 Received: by mail-qv1-xf2b.google.com with SMTP id 6a1803df08f44-65af75a0209so24768806d6.3 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869581; x=1697474381; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LZppDmhwQswxdtc8dnMs3Ij8C/lE+eDUO6XZ7vpREnA=; b=j+0wSD0NRjf0bVMshg3TwJYyT7/8e4nQEP/ltEzdqJoE6oq5MfBAbT9in1raYrYIxA OzrP/UsOqdnDvBwMy8RMS16JSdolE1MOr7OSCcqwf5ek7ufQq7kcVBizipP23SJmGgbC SKKyym7fuOqRR8jEMYcVhjoSLV0pBv1Dg5zExlnxJM2+rkltnECaffzHQjRhwAldKt9l JXDwbpX6EwZ+Kt+CipQQ64yLuxOOcFZ60voPmNs7eL5uWUrj706F+SsajmqCdmDmTmiO c0YxwMfBXWeVvevLXW9Q4ydqU1Sy9ygrYWkKSVBkjodJsk8zrU/KFAO4YOK93xQQFuer Iclg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869581; x=1697474381; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LZppDmhwQswxdtc8dnMs3Ij8C/lE+eDUO6XZ7vpREnA=; b=SStKO9TxUdJB7Sz6Rm3IHXJfksdmZ50AjmPytuoWkO8JMHBhw4DG9FdVDgQi8wmhM8 8Yuk3xYKnMrz2ztW78NQDsUzcg8KDoT6Mio4i+A4RELVSQMvKJ2PX0cXipKStsZT1a+T pifSRbAwPH9oc6l9Yi/OmtL9bn/sWWiDWAzc0sRfogGcMuWsMrlnYpN2PcdeO+6vgm3x TLs6n8ZYU5WF+lUXmE5FHBdj0m1dMyCIs21FWC+KOhRiu4ShpR5JidMyM2lBAnzhR1qI /tduXFIr3NCXMgYzDeWD46DzdHAgoFdkCz7ax3+yGFqrJJZAO4TPErhBaVd8jPhqdHnh +KVA== X-Gm-Message-State: AOJu0YxdJududSr6IaorfUbmX/9xqjIDsLSw6OAyc9LYSehPLYNFEsxJ 4adHg+GkgaigtWud7grI6lUXWj6jLw8= X-Google-Smtp-Source: AGHT+IEmcpU/GyoDAQel+3BG3hhqljGQg9AFtebEqnfgRG85WraDOPw1jm1XrYGXwTtL6NYGvLsvuQ== X-Received: by 2002:a0c:df88:0:b0:655:d9d8:2c33 with SMTP id w8-20020a0cdf88000000b00655d9d82c33mr15754820qvl.53.1696869581332; Mon, 09 Oct 2023 09:39:41 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:41 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 25/65] gnu: gimp: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:54 -0400 Message-ID: <1376dbeeddc5a0d3794b231246d2bdf85bda48d2.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gimp.scm (gimp) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I6fbe2d8ee94c51673a527487ca6f83a6d17d1dd2 --- gnu/packages/gimp.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 54fbcdcee8..86422d6272 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -304,7 +304,7 @@ (define-public gimp (list #:modules `((ice-9 popen) (ice-9 rdelim) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'remove-gcc-reference -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:41 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:41 +0000 Received: from localhost ([127.0.0.1]:32785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIw-0003qD-Bi for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:41 -0400 Received: from mail-qk1-x736.google.com ([2607:f8b0:4864:20::736]:54592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIf-0003kD-3Z for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:09 -0400 Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-7740729ae12so313368485a.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869583; x=1697474383; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Yhr4SSd7hlnJO1mcVB1DMVCKhRNUxixupJnVF0AEXok=; b=SAwXn/r1qjCLILf3tAzfyO1euX0Y8eezZKRN4lATaOG39d3y2YMdIxB9SK+s9uDSPy 3uMff6+MxFowlyCSnThe6oVJTS7PTo3tp4cf8wJsCLxDcJNj9NCgM/rNwK57rOrr4D1u svUV0TXKq/chAxZmJYD9eYIDCPuLNYrH8wxKjj5T/GgRIR1gNA8u5woANGN+rrDqs/6z zjw2bMJS56iBWHXBQwZMwgc21wtzCpcn9l29QoZLukVOe3wrfJhur3Mi4ArhLgOA5kQR 6ZKZwPyRLViw/Tqhk0EPOGnSL2j+VCDsl5fNsuD/psBh8Vhi1Pqvv17XzUknp7NSKT8W V1+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869583; x=1697474383; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Yhr4SSd7hlnJO1mcVB1DMVCKhRNUxixupJnVF0AEXok=; b=iWDpKi4Tn2fdMcsL8XbLwjjM9y2pIBMQ6W1kKG02Pq3ckI5CXaUJ1VZ5cQoYiXAUsn 0cTuy6B+03keqq5Dt8X8RftvSGmAEh/skE9yxYnsPil2tCXB3CGi/hvobVErUpSHWrkd B64dLAuFgbn6nM3kfMIgPljlci/vKYUrTObTdNiQ/kL12BMKo3lqbO24fMoLwIN0yvOU Vqxc/cls9sDrJ9MG3v5KRTSJ5iOCbcg+KDOHc/rNZg1wkdPBZrrGjCo+om7S0cNHkAc5 m7GSna0+MYNyjg2EdxhloBB2RsELhnV+JvgHBTH/dblbrdvhwlzUowUWBEjgC6QnZyo8 iPLg== X-Gm-Message-State: AOJu0Yx1ZWBvnOM3d/xsnj58u7mErV/yUFnAD7WgAv8ipiBU9fM1e+DM m6wCRux0UaENF6pxg202wotPeHjB9TA= X-Google-Smtp-Source: AGHT+IE3og9Bm6dEglXV3fhLduSXT29ZdLqrloovVEEmJr4DusarT1Ao+noVAj0nO7Gedfq9GKRF1w== X-Received: by 2002:a0c:fd92:0:b0:65b:319b:b430 with SMTP id p18-20020a0cfd92000000b0065b319bb430mr15989799qvr.58.1696869582812; Mon, 09 Oct 2023 09:39:42 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:42 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 26/65] gnu: pinentry-rofi: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:55 -0400 Message-ID: <701e9409596dd7346a329f09053498ffd9b0a0ab.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnupg.scm (pinentry-rofi) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: Id9191cbe2fc870e58a637043d09c09dcd6cf63b0 --- gnu/packages/gnupg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 80ffe2d1b8..0950cd4115 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -930,7 +930,7 @@ (define-public pinentry-rofi `(#:modules ((ice-9 match) (ice-9 ftw) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases (modify-phases %standard-phases -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:42 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:42 +0000 Received: from localhost ([127.0.0.1]:32807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJB-0003sE-Hq for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:41 -0400 Received: from mail-qv1-xf32.google.com ([2607:f8b0:4864:20::f32]:50307) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIg-0003kh-Ed for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:10 -0400 Received: by mail-qv1-xf32.google.com with SMTP id 6a1803df08f44-65d0da28fa8so28739056d6.0 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869584; x=1697474384; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ydKrz12L9e9FfxZFwaIczQEm23CpO/5ELtc8V+HpOw0=; b=Nysuf1VejSdFBJIRmmwnpQAekLvoipNqjUeehqKqfK/3ETV8xsEziomEPn44Kr84Rt MupRZoPdx2L+iajT6MW7CfYqpSaWMOh19kO3UTJm3Zoyx5p9Y25NKzIJzvmnwhLyZYTy XDsdr2nnK+dK4xc8/2bNQJpY4TWBZ1nuKbab9Sa8t5lICFRXWngyUqSMI39P9gLeRSXi BN67M/xUMk7NmSk05Rw+q4Dz4Pzlc/QniIJFAk+0GR1Re14G+9QMSOvcIg2J/CeGwMXm I4JLxvYLLolu1HZdkuCOPr/HYpQLpSnaZeSyaA5CayRSW8WWrwFKC/gWgUgoRi1DsRgs f9zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869584; x=1697474384; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ydKrz12L9e9FfxZFwaIczQEm23CpO/5ELtc8V+HpOw0=; b=j4RC89iauEAaenb/q6y1r+BET5LoyKWxrlLHBgM3ZfJbT/QrqRxjnCp8IEgioiUyw3 +WNrKWF/PnD2R+iPhhmUTPhtqxdwoLX6mcvDKV+k0ye/0DRzR6K2xsVpN5Cqh0wO2czB xaXep3MuKQMUcCtkAwh9DkYvfyPVVxk5rEIOYypBiifnyFMgb7WWgzcEnX3eAjiy1pYg KtXwaBN1XgdWlo00d9ThaAn5vlCtZhSUARf9uLqSRjBNoONfXQ+WZbQQWgIyN16DDdob 46Uj0RqOGDL+y0fAtnFAbTxwTR6XUY9hnzBfFf76mLQqp5G+UF+4lvuXB41KysXgMgPZ CnUg== X-Gm-Message-State: AOJu0Yz68LrHOC7EQbOzjNAsfz2/nE0uXlbOXIsYoDw/e1gIa6D4idEI 2I4WjhM1WFg1eqAnbx6EY+kQao6TJeU= X-Google-Smtp-Source: AGHT+IEwuCTMnGM7U7u+7CSIDcVPzluAgreQ6GKpHFwrPV8yuuGuOAmoRJeBZjzMLKAxjJQ4q0rkLA== X-Received: by 2002:a0c:df88:0:b0:651:65f4:31fa with SMTP id w8-20020a0cdf88000000b0065165f431famr18289275qvl.39.1696869583973; Mon, 09 Oct 2023 09:39:43 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:43 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 27/65] gnu: mozjs: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:56 -0400 Message-ID: <70f60828c8f850513faf50eb902e2eb468763bbc.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Jonathan Brielmaier Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (mozjs) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I2e5f210a95aa04ffeb3046b9bd5738cac13ce377 --- gnu/packages/gnuzilla.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 3a3e477d7f..0e66605781 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -117,7 +117,7 @@ (define-public mozjs (list #:imported-modules %cargo-utils-modules ;for `generate-all-checksums' #:modules `((guix build cargo-utils) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:test-target "check-jstests" #:configure-flags #~(list -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:42 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:42 +0000 Received: from localhost ([127.0.0.1]:32809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJB-0003sP-Vq for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:42 -0400 Received: from mail-qk1-x735.google.com ([2607:f8b0:4864:20::735]:49253) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIh-0003kx-CP for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:11 -0400 Received: by mail-qk1-x735.google.com with SMTP id af79cd13be357-77432add7caso269230185a.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869585; x=1697474385; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=j3xzqjoPrUEWUuAJLEz9INdUbC0ScbojF2rEMcn6jhE=; b=nbRyGAaUcjHyEUL0gH4bm2VdyJ03ifsaavwNsOE+pDkWFjukNMVQDhtARVncC0FeSq gaDqg5a1JfgxM9FL51FQJsYv5dvnQDxyfF+yiLMwaNsyoKPr8BoVos5tucfMAj2vTTPv 7qK/oUZUFKy1UBPjrp98YpbJ4IAP4KP8M1lE6gPZosq+AFDdcj3ibbWNctbPu1N5I3+g FaM+gmg3bvRxFwFJCaHwXtEMv1ugsu8Qqaavx7whXxjg2tzjfTjRRfiV1IhVA5VMHVj/ WlY0M4BNezSAjuTnLi/521EVug/Uob55/gE1Ed7EN+5E68r0jJvSFGU815oaCdWj0yfD IKxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869585; x=1697474385; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j3xzqjoPrUEWUuAJLEz9INdUbC0ScbojF2rEMcn6jhE=; b=ZJwRD0oaeVRLRIdGO7dUKXjrJTeBIlCD12+OIvGNKh4EJ1j/9yOmaWpwSCwSHBa6ms suLetZTpKpH/zbdHok3t8HA4gC6sEbs8nsD672j4yt0qHsy4Efoh3DbdMMZ7OZ5EvtvK 6d1vRkAbdN4oQqI8hdgdnDNPPP7wPPPlj9G2PxwZH2TqHq2hqSg9IQDj3oJkGFaVNh8q 4RO72EDmta5Vz48TF7+jJeoE9ql9Z62nqH3n7QZotWRWWVi1EZ7Jnf4ldQAm77XTNNhj vFOC9tYfL2mN6kejnvqcrp03dlStj7PI8pm60H0mDXWdYxQ+jVtDNlMYqFZQ147yzbUD 5gmg== X-Gm-Message-State: AOJu0YzHlGeDVgG3uuhdAZ/4OnGjsDpgnIGFfYkuVVSKG5JSIk/D38j9 aPRPDO9/zGOOQroB5ZNPqbipWPoNgWY= X-Google-Smtp-Source: AGHT+IGCyn8kAkjd7U1FK5e/tHpU9n8eFU/9OgFAX6M2UEdsfa4njJWUSMHBmuzikh5QV01IZ3MgSw== X-Received: by 2002:a0c:b242:0:b0:65b:22cf:101e with SMTP id k2-20020a0cb242000000b0065b22cf101emr12517310qve.54.1696869584994; Mon, 09 Oct 2023 09:39:44 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:44 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 28/65] gnu: icecat-minimal: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:57 -0400 Message-ID: <31f1846956c4074e70b09661818d4d7028592b73.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Jonathan Brielmaier Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (icecat-minimal) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I178519f7f4199748294305b7094e17c7daec6622 --- gnu/packages/gnuzilla.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 0e66605781..b31ee58c84 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -876,7 +876,7 @@ (define-public icecat-minimal (rnrs io ports) (guix elf) (guix build gremlin) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'apply-guix-specific-patches -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:42 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:43 +0000 Received: from localhost ([127.0.0.1]:32811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJC-0003sX-Bi for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:42 -0400 Received: from mail-yb1-xb33.google.com ([2607:f8b0:4864:20::b33]:59739) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIi-0003lX-Lv for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:13 -0400 Received: by mail-yb1-xb33.google.com with SMTP id 3f1490d57ef6-d91a7999d50so5242617276.3 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869586; x=1697474386; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tcelgK2Rm21jl28M+03xSX9hR+/hhfzFigj8bkq34r0=; b=gzwfVGgJpyov/mJ8sbmiZjPAEYYO1czXq70GHM52w8rZcZs/AjI6gd2AyM3SjUANug /XAeL5uZndQNrJ3fM3igoH9gB4mvjAAI+IKlucvSykrPD7+i3CrUKIIaJJ8Tq/VTGJ44 6dS9jV7cBMdJFys7jVzcwMCVTuhuNbna0X8rBX0LLBsAV+OmAZ/nORGGxiqRi+gFT72t UlOgpEpwoC07K1iyXEU3pk+jyGuVxHwBasZoLQoGm1sQKdHxiEx4SUj9QpzD9ePisBKL QQOnrU9u3CJVse+bMjP5Y2qewgfCsH41r3diZzjuBXsbfSt7B8sph8TH4Li+fi9WeAu5 VgDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869586; x=1697474386; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tcelgK2Rm21jl28M+03xSX9hR+/hhfzFigj8bkq34r0=; b=L+zEnLXF5mWiI/BUOnBtT5z0BnfRvROGzh1gOlzfxaKaQNrvRtNQ3bGaBbfW90wO36 M7Hk5wAxrWZT2rkmU0rtnBWsF3GPAzszOAFfDk3LrciqIqh5p0FegpSvigqMyajQr7NK q+AW4H6kVDpCV7Q7yB3YiRMig5iJbXMzFhIet2nAPyy8WyEW/S1IM/iEi+oMFO7EWo0D wWz7jV+uJ28hMf9hx7UGCNLfkC0UqPl8NyxtNZVPziIju1Rz4O9RC8R81fYIib/e+gwv nHsdjJxZnUJMMCZ0qAWpH1G9nD6cnUTflaQJHR8DnnPcl11r/TY6xXt6oKHxVBwz1iCf ck1A== X-Gm-Message-State: AOJu0YwlQDZgp4p/VjOvqKboKVv8H9Om1aUcAxTw8jOsYupSzWvMjcRa f9YnfttJ3rSiCV0F96xKoADQYQVSFNA= X-Google-Smtp-Source: AGHT+IFLZN6uSt0Uu8tLrm+olw8/GHa8kucLpguBYO5fxKwbdZYmqppeKV6EkV+8uqCVtcFy4diRpA== X-Received: by 2002:a25:4903:0:b0:d81:9cdf:1795 with SMTP id w3-20020a254903000000b00d819cdf1795mr13383513yba.57.1696869586291; Mon, 09 Oct 2023 09:39:46 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:46 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 29/65] gnu: icedove-minimal: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:58 -0400 Message-ID: <35cfd4d5bd3a9f5b2e7b72301e7cd49761df9a5b.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Jonathan Brielmaier Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnuzilla.scm (icedove-minimal) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I63c3789c620b11acbbf8db23ef416fc02cfdc00e --- gnu/packages/gnuzilla.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index b31ee58c84..cba62a4050 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1625,7 +1625,7 @@ (define-public icedove-minimal #:modules `((guix build utils) ;find-files (sxml simple) (ice-9 regex) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases #~(modify-phases %standard-phases (add-after 'patch-source-shebangs 'patch-cargo-checksums -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:43 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:43 +0000 Received: from localhost ([127.0.0.1]:32814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJC-0003sf-Qg for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:43 -0400 Received: from mail-qk1-x72d.google.com ([2607:f8b0:4864:20::72d]:44203) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIl-0003mN-48 for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:15 -0400 Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-77386822cfbso322812985a.0 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869589; x=1697474389; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Wn0jQxVbzP0bDRTe1NLB23SQTzHjgC0PDJp/e7PgKas=; b=MWpUdz2fk4mBrmnSq+/pBRwwd0Cgmi2Zy3M04nTa9AQWoyJfUmgP5XiqIydU7BAcHg 8RevqvBvhrv3uWjP6TiqpFTfj78YxhP0pSlbTtMGAn/ENiyBqWJl1iz1lltU7LM0JUMy 7sV0D6NWgg+IFRQwAReiyFLzST8NMi8CjKpHCHfbn1p+ZyBZ2gb6BZdTbJhkfRLL19KV zwNgTAl5jbNebtzVNvEkGhuqaQmro1cZvUePY8lrGsEruS1+GAImmH8Ej07gt03Y0Xtl bRAu+vgAxILwN8eTkGxrhJHsxxr1jU2pH7ESiGnOmGvEyi/Ja0IuMY0gJiH2WKIUiA/J dJ0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869589; x=1697474389; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Wn0jQxVbzP0bDRTe1NLB23SQTzHjgC0PDJp/e7PgKas=; b=jD7DQWoAtXblykHUY8YxE9wxipxxoVQW3SMzMIu0yBIY5ctEbh3hN/Fjnxi9Wi0JeO g62rzq85UisFDIOWNweNQ8QbxDGEOXg8IQfWrIiLFa8vxXkB2yizrABEwnaj9KYhnTxy NhIzMg2paKmDzFXvCw7YRrsblttR2fhWxAxu0ySKPY5kviV58N9NzeuHhpn39H2BZdRT /jver0ROrtvkS1rOBcojOJ/nJh0gSRZHPsK5DR8mx6/ziif013B8pZtZ7r22/ZMfr25/ Kb39YsFMKhN0wwmzrUDFZ3sA9A3IdRQSD3mwv0mMb/jamtBdhRyIHjLlSQUzLynFOu3w OELw== X-Gm-Message-State: AOJu0YyaPzupGmbZBOSb/lO1UxRd+BNQnEutLCcAmkTttwUhvHenhJSj tAqudsl1zGms4dDLg9M5Lw4s9lSIgpQ= X-Google-Smtp-Source: AGHT+IFLWhxbQQ79M+YiVU7PNwWMHjKP8THuHEMpXkhLBolSiRNvofCMcE0p68hwSVyspQD3A7SdZg== X-Received: by 2002:a0c:8b91:0:b0:656:3fdc:771a with SMTP id r17-20020a0c8b91000000b006563fdc771amr15047659qva.11.1696869588809; Mon, 09 Oct 2023 09:39:48 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:48 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 31/65] gnu: artanis: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:00 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/guile-xyz.scm (artanis) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I477450215d69c84247c4d80612eb6ba9b4d7870b --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 212741b5c5..b5bce7aff1 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -195,7 +195,7 @@ (define-public artanis (arguments `(#:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:imported-modules ((guix build guile-build-system) ,@%default-gnu-imported-modules) #:make-flags -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:43 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:44 +0000 Received: from localhost ([127.0.0.1]:32816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJD-0003sx-HT for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:43 -0400 Received: from mail-oa1-x31.google.com ([2001:4860:4864:20::31]:47239) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIk-0003m0-0e for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:21 -0400 Received: by mail-oa1-x31.google.com with SMTP id 586e51a60fabf-1e113555a47so3227002fac.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869587; x=1697474387; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5bkUd5SaIk5pIanx+hIRtULjCIq67H8TbhilW4OuEmg=; b=kYz4oQb4UM2e+TlSdhq39GxIyctsmaQCT5jL1Fr+/GUHU+TVveXzfYI0HlmTMnrgKM 5oI/LZZlzKPMDZa/tKF4qHEbBiEiOB/+TTIQL/S1eoH1i0EOu8TiRjycDGRE5/itPIE8 YWYcxI3ajfHPK6LNqweUyvp+zZurON7utcmC03C08M1V+27TD5xFPo/wPMedaXizkq+1 2Szt8InLCKHOVWGM4gcz2KknEVOwGSgftz2t2xY4FHtnrVbefSPg2SYGCOCLhqMwQcBF XIwi7g+GKVS77tIkgrj4nCxl+rKTjGwkj5U7MJiRw7Z3SkurOJHpCe+1iAnVxZCOxTYF DUlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869587; x=1697474387; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5bkUd5SaIk5pIanx+hIRtULjCIq67H8TbhilW4OuEmg=; b=GR7Pj9LDPAMYxVyH7loAQU/icaU39KYLQk/JKtNdyQ7E677c5w4yeRnY1MZj8JVvuL 8SwLpuNcQDybyarS8BDxxFdKw5D3dzfA+pktkTzH0OqkMIHDiTozaYPk0vY5YKuvt+iZ AiVF10wqPLmMGBBevpL2jr04Bmlq3pVcBN1C7hy2FcZ1SeKOYC+l0spen3M+5s5PrMVP W0r8FTkPu5Q4mDoPHB1vsDmGiDe1DsJaUKlBxvsxZuNAAYY055Z2tk5Zpoa8cH4Zhe01 rQuBpkx0DajBoWsjr5GfKe7QdInccV6/jkG5/kAe2cC1QopuUuQ5GqfCjjj7VB9XgdtR 98FQ== X-Gm-Message-State: AOJu0YzyNnq9xSm3oTkjTOCnAB2SJu8mAdPolKGssiENeD/cgB1xnXHM 6lHIHBXhCSapgAeAxPw7x2jMfOTUEDs= X-Google-Smtp-Source: AGHT+IEEXMWFjPgHLRy027c4VmA1JZ6qR3rkwfzTjqInBkMuX4e4U2qxj5o6ixvMe8HiIjIrxqUZig== X-Received: by 2002:a05:6870:7024:b0:1bb:9907:451e with SMTP id u36-20020a056870702400b001bb9907451emr18608686oae.52.1696869587571; Mon, 09 Oct 2023 09:39:47 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:47 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 30/65] gnu: python-graph-tool: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:37:59 -0400 Message-ID: <599921e46f9996338c5da881a5f6b29c0aa1f593.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/graph.scm (python-graph-tool) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I9d0d70a386e1131250feb16ab23089c66f6dec8e --- gnu/packages/graph.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 9b558ae2cc..97ad8ed18c 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -638,7 +638,7 @@ (define-public python-graph-tool (arguments `(#:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) - #:modules (,@%default-gnu-imported-modules + #:modules (,@%default-gnu-modules ((guix build python-build-system) #:select (site-packages))) #:configure-flags (list (string-append "--with-boost=" -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:44 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:44 +0000 Received: from localhost ([127.0.0.1]:32819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJD-0003t0-S6 for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:44 -0400 Received: from mail-qk1-x72a.google.com ([2607:f8b0:4864:20::72a]:45298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIr-0003oR-31 for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:23 -0400 Received: by mail-qk1-x72a.google.com with SMTP id af79cd13be357-776f84c6cc7so223173985a.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869594; x=1697474394; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OEKiEgjKkeunOJqX41aAn3c+UJbu5CxYGXE8z6B+2DQ=; b=JDkoNxN0uKRLXq5JPhlZb1Ny8DPEKhKJitoipsY2u7OTBCwUgHXypBy8guyz3Ad1zO ingDawm2R1MQckfq7VUinTFVJ8Ig9epDZqwwKBFocbkQ9jmj8jmpyg2KMIxU2LRq/Zw0 o8cC+6SxnHJs0YDz6sDeIc2zMfzHiSJM7PiMVit4EYdX+HpzPv35nBl+mz9QIi5zFucH /G8yvUlEnKTkt20w21n+aks+SkEjZvFsRbS59U5OGQ/Raug/HwUfKBxX3L163lIxWxeK pka7+qnE3qcQwyryILC1NyiKB/4sOlIvBiTrb04/DqzNO37zAlDx+AaDy7jciz/ec1QN 6k1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869594; x=1697474394; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OEKiEgjKkeunOJqX41aAn3c+UJbu5CxYGXE8z6B+2DQ=; b=aGcjugaVNA1COjGGothONdFW9F0Mo7Uu8hpgGseW9ISxlyy9q1rlmCmywcS/XkRFPt l6d4R1xU6ZEXDR4gXV76EcRiT8T77yxR+QknepmPftpJrcxJhUE4ELGfwwG7HkzL1cp4 M3DgcnzdjgLHWPSV/FbgcvR0Z4Ky1E4yWxBycSvaBBWWkoUh7tUZMFixSSXFCtYAa3p8 8OqeTtk/QKJiS3NKmgrHTT+0b6nOrwMlyU7Ny3bzjJHexxQGoH3fsCvmPyjFn9BL84TX os0et+tnRpyMCXqr3FiClY1ZQwg1FlWyzSq73ZyBz6YLJzIvlqugBhWm1/7DaUcgGkU2 OeFg== X-Gm-Message-State: AOJu0YzyBXgxi+i3peO1yi53UGJmVbpvrfbW7zQZU12fRGnlxrx8JcE/ 5tK5kQOUTxbLN7XlWh51+SWZP4Ml3Xs= X-Google-Smtp-Source: AGHT+IHKMEAAH5nuuvS5mQfYx/LEjXo8QnUJiW+BMO3plwPyq7I22RFLGpAGuQXA7yHEzPFGqXsMdA== X-Received: by 2002:a0c:b298:0:b0:65b:1074:fa5a with SMTP id r24-20020a0cb298000000b0065b1074fa5amr16298438qve.65.1696869594678; Mon, 09 Oct 2023 09:39:54 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:54 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 36/65] gnu: haunt: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:05 -0400 Message-ID: <006edbe95ecb2e9d9a784daa3606b50ec13d3626.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/guile-xyz.scm (haunt) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I234344443de93e07e390ca8ae155718692926633 --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 0e6a4de52f..0f8d56a22d 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2813,7 +2813,7 @@ (define-public haunt (build-system gnu-build-system) (arguments `(#:modules ((ice-9 match) (ice-9 ftw) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:tests? #f ; test suite is non-deterministic :( #:phases (modify-phases %standard-phases (add-after 'install 'wrap-haunt -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:45 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:45 +0000 Received: from localhost ([127.0.0.1]:32821 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJE-0003tE-Cy for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:44 -0400 Received: from mail-qv1-xf35.google.com ([2607:f8b0:4864:20::f35]:61944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIs-0003oW-2Q for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:23 -0400 Received: by mail-qv1-xf35.google.com with SMTP id 6a1803df08f44-668d9c1f70fso27540616d6.3 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869596; x=1697474396; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NLaNKod8gFJ2sawJL00OYHYLksk+t32+2mtzEJkYVyo=; b=NKBnjAb4cUqF6tcL8MF8haQrtaTsHefnxTZ0SyUervsxW4yedcdNdORO0Gdc2b4w3d QJnYtbhbs8FIdEMe6mUGnt7yBD5+L7djfVMhkw2lVIJAiDj4go9iNSrHzlxo2vzEhKKx vKxlUnUoTEbnB3LBpOGZnJetPWfph0d8PmW0loMAzcPISCE+w5lzM4DGPYFgtTWw6NCG 5B3cg1eXwWSo4x5zm+s3bF0EZTE2ZPLrtOZqpWLH+Zky7M31kIAlupSAUHd2vdnXPYcA GIHGVxHwsYxQNLiOBYRNcEy50Gr5YQ/hmJ0O2lZUEqA5la1hi+UsVBQP4WRQwdclRWyo gu6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869596; x=1697474396; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NLaNKod8gFJ2sawJL00OYHYLksk+t32+2mtzEJkYVyo=; b=HyOQSUBKo6c+4uAe86I2xlVzWq1/oSPyjYr7JscEcQv68GnL6eXBymcnJH2LeSS8g1 ljKx+sWDJn3tJq5wQxy1qwHEd6f+HbN5+9VtEtTCIHyfilC+N6Rc+b7wGBlOSz4v67+w 811r5K3tv323WGbo/NCcobV8tmjDCdGuxKzN2xMI+7yk5h7TP+ebf7R3HYgpoXVluMew +X3qROt8eKnD5DVdTuGGb8IihLqgv/ilzjYxVxTCGCQro+v6eO+nVjTaPC2UP+GW56Fy iAS9ksXHvM8xrMEQaIF6d0NcECtTty48rX5JtWNxlEPshQw2TVAA8YGOWfQNlDUATSfu R7qA== X-Gm-Message-State: AOJu0YyY2u0kVVlar103KEap2t27SwqOO7pnJFzuyopIyFUKpDTtweNH 18HDMpn1+G1XzdN5H2ybngOYNZi/M4Q= X-Google-Smtp-Source: AGHT+IF/hn8XvE62ARbU7xBP2zD6aZENfuWJ7n9LRz+uAb9058LUzF+STv2OnxcBrfQ/faj65R6x7Q== X-Received: by 2002:a0c:f18f:0:b0:65b:2ab8:3822 with SMTP id m15-20020a0cf18f000000b0065b2ab83822mr16676285qvl.47.1696869595760; Mon, 09 Oct 2023 09:39:55 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:55 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 37/65] gnu: guile-studio: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:06 -0400 Message-ID: <0c17b0181b4e1b3b6f74d8f94f72b76428da99e8.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/guile-xyz.scm (guile-studio) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I0c2cee834ec38b583169916bd5f6bc2e7d9a57f2 --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 0f8d56a22d..60dda94be0 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3098,7 +3098,7 @@ (define-public guile-studio `(#:modules ((ice-9 match) (srfi srfi-1) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:tests? #f ; there are none #:make-flags (list (string-append "PICT_DIR=" -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:46 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:46 +0000 Received: from localhost ([127.0.0.1]:32824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJG-0003tO-2o for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:46 -0400 Received: from mail-qk1-x72b.google.com ([2607:f8b0:4864:20::72b]:54414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIm-0003ml-8w for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:24 -0400 Received: by mail-qk1-x72b.google.com with SMTP id af79cd13be357-7741c2fae49so313713385a.0 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869590; x=1697474390; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Z4lARaJkIILo3141UkMOBD6uWvdk8//hro/LHRRV6bQ=; b=NjMbHIZ7Ck/Uhz4xTr4WTrJBj8xwe0WaHMLk8hfWLbWT0PRdRFEjynzQLFfLnDco+N zfCETZrH4IeZh/HyWrBspBGg6l8xl3bZMbze8C+ygPcAOpHhSIu1KeNCwoLOpB2iNpJN bUGoeaawtfp+/5cZbwR3Fyb66mlBRTWbIPCF6NwaCsK0x1PLtHir9VsDz7wybu2rLHQO R8hrOZNgiNsQtmR6369c6wn6bCFWjT/c+/APj5ROkInDDZbcnaNX1OW/2VpMrbtHD91M Qy70bxx06cAlKjfc9EJ3JjZOyNlzTYLln8/3mwdKCjGB2uVtMVjpxlpzWLR58tei0Xcl OtuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869590; x=1697474390; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z4lARaJkIILo3141UkMOBD6uWvdk8//hro/LHRRV6bQ=; b=d6NQSQJH3W92j2n+V8WRTXssk/SLBFORCBhV8jfmzicN2Sd0rWc3/uqf1taZarDj2I nGkFUONr1HXXVs8v315aKG2xWETyXDBodzrTbjExlnHzkEmxN4YhRorP1V7cn1nUX+Xw /DTbtWAgwCrKOA8UZ+u2nGrJoGDWFkTGncbnworeSVi0dmEtTKOKxdBSpMWXE3pBhKVC S1v61kBh+REcZGRMhg9+wznG0CdMwU38rfbudSnNcj2rLswWWs4hexpRE/ptEkzaayEw gHUMDl23qMf/c+QGG0p0MjTRU4Rt3RaVbd0Q2iMBngE0IWOcYagEuINePxZu526VZMUe MyTA== X-Gm-Message-State: AOJu0YwPIrc5ojNZMkdWOtlI0Bh4KECJURDeVThhU2YS3RVaw4T1+kIZ P+gTX+PEmvFBot9oa1L6cSVT0d/iYa0= X-Google-Smtp-Source: AGHT+IHZdmoSUiKiuP9b0pF2RJ8gVXuS2FiBTriVAOyVZQ1HII6CsHqiqjZHxZDVasmRhrK19Np0pg== X-Received: by 2002:a0c:f08d:0:b0:64f:5b21:f162 with SMTP id g13-20020a0cf08d000000b0064f5b21f162mr15945449qvk.61.1696869589869; Mon, 09 Oct 2023 09:39:49 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:49 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 32/65] gnu: guilescript: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:01 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/guile-xyz.scm (guilescript) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I87d29358c50194d4f4564c7b18924a52c12d6020 --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index b5bce7aff1..2aa8370652 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -284,7 +284,7 @@ (define-public guilescript `(#:make-flags '("GUILE_AUTO_COMPILE=0") #:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:imported-modules ((guix build guile-build-system) ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:46 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:46 +0000 Received: from localhost ([127.0.0.1]:32827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJG-0003th-Db for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:46 -0400 Received: from mail-oa1-x29.google.com ([2001:4860:4864:20::29]:45300) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIt-0003oZ-7D for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:24 -0400 Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-1e58a522e41so2076679fac.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869597; x=1697474397; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4Rx2wisLl8WzN5tPeWHry9GQqNWJSQVyq/TiSBUq+8c=; b=dua906YRJpmwKWmnTZUpH/6HkRAFFvhDoRTwRK46RUnOj3mFFqc5YPYoAajIi74QUd ntabCOB1bEN+6FHTn41E2GeIW6GE9eFMiNTqtRAcz/u1RV/zzqT2HtqjHvuk3/i9cOVg lqEfBuDUTacDn8YYXyn6PyIQPvOqt8rlsUFcGWXTUXDKsSy9e2vR2TmhRl91ZBHt2yf2 c1yKKI5pklva8o7TxcoXevjCR943miTNRPq7+pzXK5mw8ctqnFjlCZioCuZqYl4myNvl MrcAF+n96cHrLzB/Ku3EXPK4nzctBadslHr2e26CgK0X5Oka4mp2Ghmk9FyIr2BnPhhZ OEfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869597; x=1697474397; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4Rx2wisLl8WzN5tPeWHry9GQqNWJSQVyq/TiSBUq+8c=; b=XEB9oRVYkR2qII7mXUHbZbhqnoiEgYESsJ2fMqugUuVrbNK9Fu2GPP1L/oak6Fee4h eISenvJjZ8s/kUnaUe+/74XGPT1HDU9h0kVdupuLNiLm4ilU5mH32zmofkQHu4+WDOaN bNbgRRWgx6ekWHz6nO8hykLAxkZTXSVtWkkmhvp1tY9/4uEk+/QBAAVMqKNF+phfLTHj bz8qxDTyXig1aglExde7xOQrY1d8O8RK4Fk3Wh1+51HwZ/hpBbAXisBFlIumja9uKwX8 Nj3Ljcj1re9gV2faTtgDPS29eYAMjsFw+otbDfVoiPut3J8bBrgAkkyNPlfR6HaLUxfy 11+w== X-Gm-Message-State: AOJu0YxalOKzApl2wGXmPODk+IABfE2psMJXZ7OhXSls3O2NjLbz2M2Z 5+w3ebTR/SRdvZR/sNXoQg5wByx0pWk= X-Google-Smtp-Source: AGHT+IE/GAmjc/zK4HAy8amGGr5MtOLkC96mc602bwJyrcPWs6pmsKG6cxyrzQ//wBXP1WxogCgKdQ== X-Received: by 2002:a05:6870:160f:b0:1da:ed0f:9c84 with SMTP id b15-20020a056870160f00b001daed0f9c84mr20083242oae.52.1696869596857; Mon, 09 Oct 2023 09:39:56 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:56 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 38/65] gnu: guile-libyaml: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:07 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/guile-xyz.scm (guile-libyaml) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I4046a3f189564c2694b31b71379c10cee004915f --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 60dda94be0..67d6601364 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -5127,7 +5127,7 @@ (define-public guile-libyaml (arguments `(#:modules (((guix build guile-build-system) #:prefix guile:) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:imported-modules ((guix build guile-build-system) ,@%default-gnu-imported-modules) #:tests? #false ; there are none -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:47 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:47 +0000 Received: from localhost ([127.0.0.1]:32829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJG-0003to-Ni for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:47 -0400 Received: from mail-qv1-xf2b.google.com ([2607:f8b0:4864:20::f2b]:61935) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIu-0003oe-Gt for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:25 -0400 Received: by mail-qv1-xf2b.google.com with SMTP id 6a1803df08f44-668d9c1f70fso27540816d6.3 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869598; x=1697474398; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cpPzRl7l8wyWiYgK0j/eAlK8LDXWAYCJXijqlzhx35I=; b=T82v7+QPUXUABfA/XgrhLoZ0yCXWBP/CIwtH2ZiqHnhRy53Ii/kl9lrMhIphipadn5 nBjSZxrc7PnGlOzVDCLGS8mKbaf/xOqBYrSAKDjrJh41dLQWy/zvIJX4z7H/S9tC1GL9 d0IGB8tHQUjmEUXw6NRVazksEvd3ieis3k9mWG86nYRl/wFO4Cw3Bk7fMUS62xPy50JI KDgl2LPqs5ozK29E1xj43ynCCVtXcIY95f4XMCmm1N8bO1W9T+24mxp26KuPzA/iVm8z AjElH0V+4WQlYO//cMjQKUll5JD2UwYE4csuSbLz+ohZkcdHcyToyMiDn657Am/Q1fDC yn/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869598; x=1697474398; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cpPzRl7l8wyWiYgK0j/eAlK8LDXWAYCJXijqlzhx35I=; b=ERBNaOjSW9WgxkWIQjKg4w1xZiKO/476n8bgtE8NQwyqDanRTzsQjz2irwjAC6t8zs wu2T0jJpCC3a+WRNzBuVE4pwPtR2cZosNd3ZwRAFvCVpqkYG4jw+S/RBZ9U8kSmefg3F z1/5uGWWhnKz72lN37bjX5kDPw0fpqm1G2oLv/7XOUq9Y9koOHnmiUWThyWC911Qxw63 MIHiqaILhHlrzirhHsQ188h6+xRVt1An+C8ZaYoV8/peIAc2Vd88LWDqQkIzYMU/scU3 0KuWCeNdBFaQyL9V4hkT8hIZQEUPELaUDDcN8q5+opRuVzaDWCH9Tww3nZDh9aZ11jhu NXYQ== X-Gm-Message-State: AOJu0Yz4RNSuwuNcu8aD3vPwc7GDUFb1+8HqRNwA3mBkVH3rMSDeKLu5 wBY6loQt5+BH0JsDTd09kJtVnzrXoDU= X-Google-Smtp-Source: AGHT+IG7sb3j5HufrLvsaHaDTYvKPuUExfqGfu8aYfxqr20Z2FXDucnQJs90GVV485FMjcB7b5rnqQ== X-Received: by 2002:a0c:e0c8:0:b0:656:4f7b:75ae with SMTP id x8-20020a0ce0c8000000b006564f7b75aemr16592219qvk.41.1696869598055; Mon, 09 Oct 2023 09:39:58 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:57 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 39/65] gnu: guile-gitlab: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:08 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/guile-xyz.scm (guile-gitlab) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: Icef920ffd3e7363a6a6c789a63498c5ab19396f5 --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 67d6601364..e207776899 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -5315,7 +5315,7 @@ (define-public guile-gitlab `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings #:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:imported-modules ((guix build guile-build-system) ,@%default-gnu-imported-modules) #:phases -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:47 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:47 +0000 Received: from localhost ([127.0.0.1]:32832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJH-0003tx-5R for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:47 -0400 Received: from mail-yb1-xb2b.google.com ([2607:f8b0:4864:20::b2b]:55425) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIv-0003og-J2 for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:26 -0400 Received: by mail-yb1-xb2b.google.com with SMTP id 3f1490d57ef6-d86a0c97ae6so5103899276.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869599; x=1697474399; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c7qYD3kxPQgnScnMzZFGi/2DS1adBDk73FG9ydfw7BA=; b=I2DBLbeqAn7wbIRgHLyLjla5nK8AOqoeMUyeZyg+Txj/azEl8KFgDaDDqvQ1RHxexP NzjGuS1aY4l20qJra039y8uD930GfdPcDUdZfzvQ4UsRTN9U8aGN+zFtsAbcEX/YWT3+ LFARl7mgNXrTGFAJFXcrphUyFSt9mAy1erRAhfLs87y8WH7YxSCPalYF5L+7f1zK4mqs NdsJWq7v0jesOc8MAjIVN0aZfihB7kEgdirkAdbO0bACuEH2y5DK7+fVCmmknvY1lS+8 UyMtLxwbSQhl4mqdjCHQrOkQS70MR/xPlvlbCm2Wkj5twc8sKK+8hXV3Sgb8tAvf8/73 VSaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869599; x=1697474399; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c7qYD3kxPQgnScnMzZFGi/2DS1adBDk73FG9ydfw7BA=; b=aZLfJezz3Ki+eM8bl/UWOB0y+6NnYMaeEYU1zswkAG8WEbf0tEbdHkKN87jwvOh2d8 8kpm2EIlYMZHcX95eIocpd3ammauD3XmS5a3aE6JwEHh5peUCQ5pgnaqEipD4W1Sun7u aC97YdWKb0TKEvGRGIyi8gjyK+Cwen5TcnJihnmINljsTtlvobMyIEJDK0wKmlE9rYHo L1+0R0l7N/POXk44odIdUTKyBJfV7g/TDoBLM5296co4A7S+Pq693R9QAOi4FYgJp36R V40MiVXvfB3lWyq3w8WbEm/Z4B7Fz13QYvx7dIlNjGdjIurjbbs6MxcDIEXfD83dtWbH Rstg== X-Gm-Message-State: AOJu0YzRA0DHqxWb5bC5bAlZ3aEU0r604H/lbiW9wjjWlI9OtTbu+z8W ZYs98MCvTSmAnc+vIXIBf3tBtR5zgR0= X-Google-Smtp-Source: AGHT+IEpqmPM3Y1H2eLUvnq9jDBGml7OGniD/kbofnQ3VEljgm1v0qRDpF8Mo4tmlk0nlHwbabDXtw== X-Received: by 2002:a25:ce13:0:b0:d0c:b780:4c13 with SMTP id x19-20020a25ce13000000b00d0cb7804c13mr15633432ybe.25.1696869599191; Mon, 09 Oct 2023 09:39:59 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:58 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 40/65] gnu: guile-smc: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:09 -0400 Message-ID: <13fa33c62de0cdaf080f6c52358efd9f1084c91d.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/guile-xyz.scm (guile-smc) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: Ifb649d6b1700556d5c4c263f8f90e023c8ab5d67 --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index e207776899..8acb81bd6c 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -5378,7 +5378,7 @@ (define-public guile-smc `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings #:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:imported-modules ((guix build guile-build-system) ,@%default-gnu-imported-modules) #:phases -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:48 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:48 +0000 Received: from localhost ([127.0.0.1]:32834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJH-0003uA-KE for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:48 -0400 Received: from mail-qv1-xf2c.google.com ([2607:f8b0:4864:20::f2c]:60800) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIn-0003nC-Cg for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:26 -0400 Received: by mail-qv1-xf2c.google.com with SMTP id 6a1803df08f44-65cff6a6878so27562606d6.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869591; x=1697474391; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LCfgbabXTZ+Hkwn4pKqAkzqvspZEKe8zA4Ch9q1u+UM=; b=HNkXYAiwBTBBCnLVrcW9JBjDx++y4NuH3cuP0AiCCx3koivoemLAyJYoP22eebwhUk 3FSnVBib+tM/RLiDKU0T+Etw/Z2gMnyjINV1T5VD7ulLrNsr1NbQtQG6HBSlgBDypFIR q0M5yxYpO1wP1niV/pFsr2DEfhzFziQDe7ShsDNVbqeRTg5C3IrnN1YCWW/+AkqHoyc8 KD3o03zK2j7crPHmyB4uX3DYRvVAsv1mIw8yo8lPDafQ3aH/vnReMDq3PNYtR4kykoMc HnmLSTzvtsNxQRHRN4IyfIyuVFKu6o1zLszNbSMh9QfeBmSPZsJQ1DzsT604x/KB81Ex dK8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869591; x=1697474391; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LCfgbabXTZ+Hkwn4pKqAkzqvspZEKe8zA4Ch9q1u+UM=; b=JWytP+YO07b2no8CTcP1auDLngWm6IHhIHBPp6alZ88kzxCt6Q0H+y0Ilj9exAbHqx oRIAGI/SRA2bLeeJZl28PQyfrxOb93Cs5BDagZMAUB0R3X5evmGyjxLByKv0LmZAXo8C /s3FIcBoU0TvFZjuWhjLoKGo0AsN621zE/kyrLTOKbbunGLS+1FG5CTbiamQyLu8RDBM LDTwhppijvzfxEXF6CaLcG6nUDfIgBV8kAEJJ3R+ILzL/ymt4biusnYJsqsPsim3x1fi 8CYDshCZa36d8MEag+KjiUXdD6WysMrLfrn1onjSfoHmR/5CHilmMEWHFi8VawM7n0Pr Y80A== X-Gm-Message-State: AOJu0Yx9lnQAKKIgfBxWfzJV2ttPeHp1wGtoIWtid0VOuJmui31rJPQK zp770yH4wtNOY8Cj351MYXBnfAc7VUU= X-Google-Smtp-Source: AGHT+IFQBSJ8uOwHAIjRE7I1DL4Z5VqZXqsQW7VaZ9ms5q13bF0c2Ka4/kBIXT9WVdvCKIOF0LoIYg== X-Received: by 2002:a0c:8bc9:0:b0:65a:e771:4f6a with SMTP id a9-20020a0c8bc9000000b0065ae7714f6amr16090147qvc.6.1696869591034; Mon, 09 Oct 2023 09:39:51 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:50 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 33/65] gnu: guile-dsv: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:02 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/guile-xyz.scm (guile-dsv) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I216f8f05596fd9e836c5ab6b05d22593ce9d1b5c --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 2aa8370652..fac0fce394 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -753,7 +753,7 @@ (define-public guile-dsv (arguments `(#:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:imported-modules ((guix build guile-build-system) ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:48 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:48 +0000 Received: from localhost ([127.0.0.1]:32837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJI-0003uL-2B for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:48 -0400 Received: from mail-qv1-xf29.google.com ([2607:f8b0:4864:20::f29]:47262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIp-0003o5-Pr for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:26 -0400 Received: by mail-qv1-xf29.google.com with SMTP id 6a1803df08f44-65b051a28b3so29426556d6.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869593; x=1697474393; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AzHfpsi1y/+jAtyToYrRs13/Yzv4oz1xw4cj5tiEZNQ=; b=Eumx+XiSklNbwOak272eWsAG0wJRRnML9m+WHsScADMy7tDdm2S3c2YLkXDoJ5zC98 1lF5L8yeGSvvICbWoBNwog0E76UafdCHvU/eVINQtaVXhkGnVINzWpSCToEroiRHJEhG nCdvmnezR8k7+0AztEnpa9Efrj6Y3R71V4QvrblVBGR9WcStNiwZ0nYvzdCjux1VYel8 c+Lxf3cs9dt18RfDIeQYk4NrSuxt+ldJtsJZ/ATfIYCqWWiQt8/yP/XMqgoEmo6fjWhw 6M1ldF5pbF0gPu/Dg+9ilm01DjspbHwn5Q+N0SrLD+y3z5g50J8h6EJv8GwNJf6Im3Ui D3JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869593; x=1697474393; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AzHfpsi1y/+jAtyToYrRs13/Yzv4oz1xw4cj5tiEZNQ=; b=R0eDG6IqLIQsVlr/5CYzbPTWiyMZUhlStzKvSDFizTm9QNk1/q8IcvJZ6FdkI3BQ90 SHLIFU9a68ZQzDWb1CP1oQEpsz9LbEkmAV56OwOSFZeXojceul5sbzHmVqwEJLMA0G5Y YF2wi+mXaXjqxhLcH0ahfMcCk9Ro5eflDbWJFNpSwdH7EuWOMFnkW/S+0CXyEAcipMav 0UOpWEK/ZKP2GL1+zp5piYzrtVGMSGGroa3loWBVkzIllbmYppGTL0xxA4kvJCZeC9Iz X1EiIsryrE9CYZ33z+teyhk8FqVexk0NlZTilk9EFHk8EuAqYgIKF9giq3SKP+cWwMhr H9Tg== X-Gm-Message-State: AOJu0Ywj48ZM3FAf/yzIthjhDE0U/dddanCMQD8yMhtGs0mq+BczCV7Q HfXugYbpdYNAxq7ToiX/UBNBwcEuYWY= X-Google-Smtp-Source: AGHT+IG0s+aMMZdzRpOovCS4PAtU4tELhuHi2aCLuAwoD1jJ0OcEo4z1DeeoGlOiokKKCgPFXLocJQ== X-Received: by 2002:a0c:e78b:0:b0:64f:6199:a8e with SMTP id x11-20020a0ce78b000000b0064f61990a8emr16984179qvn.23.1696869593420; Mon, 09 Oct 2023 09:39:53 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:53 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 35/65] gnu: guile-hall: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:04 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/guile-xyz.scm (guile-hall) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: Ifce9b013fbcff59031659bb727ec1c9cdd06ea40 --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index effde03cee..0e6a4de52f 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1983,7 +1983,7 @@ (define-public guile-hall `(#:modules ((ice-9 match) (ice-9 ftw) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases (modify-phases %standard-phases -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:49 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:49 +0000 Received: from localhost ([127.0.0.1]:32839 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJI-0003uX-LT for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:48 -0400 Received: from mail-yb1-xb30.google.com ([2607:f8b0:4864:20::b30]:47357) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIo-0003nf-Lg for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:26 -0400 Received: by mail-yb1-xb30.google.com with SMTP id 3f1490d57ef6-d865854ef96so4928193276.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869592; x=1697474392; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vx0zFQmC/EF5+VECx2MacGc0mi2Fl+gRgMXlPpwwl1M=; b=RDlT9yClUPp0M4YqYf/OoS0aknr1XVUkzm6D5JdQOQ0wcK4pUHLQFLM1FVpBaFOMCV /+0pjeulUgJS9hQND5TMMQFz8xVlRqCXfh6N9qcoqCMGauzYsOcHmrdPqa5cGqNYr8w0 4LNoETgw0oHzGUav/cmtDFoqXyVjaSmWXH8rPruOrxUwaY7OXY7irl5IiLrfeNsEodWi jHUVkZf2Lzof+UDK1zOJynXK7yLWLzPF38LAmd3ED+KZSWWo9U6WtfyK63SO+AsDHeUj WsdUVNWcbRndGW5WpiFg6TV7mfwUi9TZHjw8G9eQ8bBzvhksBfHLUN69wHLDmwDgJWWD EkSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869592; x=1697474392; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vx0zFQmC/EF5+VECx2MacGc0mi2Fl+gRgMXlPpwwl1M=; b=F5moaYjTGTDhPjKhBfhlAKzr6D8Ik7niwH2u9mqroONbi84WeormeJinJDvYfc0y5K yAUM5KHw6zK5k6erA8f+QyRKlVrTx0vj0g+1jNVaOhCJAhxeP1fjaMHTnwxcXO5vJ6VE m622QAYdHk/6K4xy2N3iwyh8uelfqDMu5xdvjwTgUaZa9PjMnWDqbxfvYY9/1CxpcEef xXT90ZITrb84sjU3b/MeQ/fmeNoEBtZz44J4g9c/NF4e1pFOe5SWFa5ERKQ58bqe5Lk1 gN+ghwqLb2ayLNvRf9CKTXKH5c6Rz5G0UIdVhYZRKcXtc8FJDoXtObjanaAcNyrlekXA aMHA== X-Gm-Message-State: AOJu0YzDZ543dwLeH1033Saa5ki/w6CiVSwJn7wlaCfgpAw3bWNoysuh dIbW329ewIbbmQJ4gHuoKVNCh5GQJ4g= X-Google-Smtp-Source: AGHT+IFxPHeewPmmRHuvu8VEZw+/AXWYk9lMm31ZNH9nZ3bZH+bwNVghMk9XbjQ4rxzIX3nBRq3qfg== X-Received: by 2002:a25:e68e:0:b0:d89:42d8:8b48 with SMTP id d136-20020a25e68e000000b00d8942d88b48mr14059941ybh.13.1696869592268; Mon, 09 Oct 2023 09:39:52 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:52 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 34/65] gnu: guile-di: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:03 -0400 Message-ID: <5a509bc15ff68fbd03113d735fc4450d216d3c50.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/guile-xyz.scm (guile-dbi) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: Ia7c27cc9c05e8818218e4e57b2e8c0c90210b109 --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index fac0fce394..effde03cee 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1799,7 +1799,7 @@ (define-public guile-dbi (arguments `(#:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:imported-modules ((guix build guile-build-system) ,@%default-gnu-imported-modules) #:configure-flags -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:49 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:49 +0000 Received: from localhost ([127.0.0.1]:32841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJI-0003ug-VN for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:49 -0400 Received: from mail-qv1-xf2f.google.com ([2607:f8b0:4864:20::f2f]:45264) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIx-0003oi-Jw for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:27 -0400 Received: by mail-qv1-xf2f.google.com with SMTP id 6a1803df08f44-66afd39c8edso18493906d6.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869600; x=1697474400; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9WHFoUrAdNBM7QTL88bExIPxwQijHXDUkWyJyqeYsUs=; b=DxxNXKWy8AQp3tFd4N0W/Ow6Xh4xF/aqQtDKWCaplKUGVXYU5sTGWgaDFwQ7KU7HqD ocwDd4334zEGyiUNn2uWi2tRHhdKcg48VG47ypuQV0ymw+IBTZ47UpC29jLmWzsRi6v/ ADRyvl6CJXIulZQCyBYxECPIUoXyreQlcIMUqRjcA8iQqUaH+OxqFwxz8VB61FBp9BNh ljUR+9C1egCEU8/SjZYfhC/qoboicu0+9M4laVeihf+e1GoALOxBLxMAwP/NKGQjCp1j b6rr5PWiEKlRGtaZi4ChoRKZjh0XKAYvFNE+Q6LryRhYQmXDP6zOIyndXD/QBjVMRLY8 Rjdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869600; x=1697474400; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9WHFoUrAdNBM7QTL88bExIPxwQijHXDUkWyJyqeYsUs=; b=YCU7aR38SLe2Tf+A/OpJC6IrVQUW4e2CMvTsLycltG1Y7lc1RNZ2BqvnLuXCMDpY5T mmOYOiez8x2lrf+NuYl/xUxwrb0F7i5YT3A9Ges9YxdtwrdkRdngwxZPvuD/3CSIH8nB 5eRZ62CGjJW+eiOtg3zFymEn8qPJAbz6J+J7UeqDMqnX8TtYF4/MOoxfFJ785LDqgJQF m+sv3f5ORvUzSKXgBE8iFanlJr4NP8SaLBPeYMymznE7GnPtiYNTu19oeiXLGU2keEm0 o+VkzZSScDoplfdHUzMZ+Ui0jve2Vhj9orz+UKs6WIr679mM7HzRkZl/18tNu7AZWF0e YyXg== X-Gm-Message-State: AOJu0YzPdKQlxmH/IQHpWDh7CjgxQfXvM0RAz3hE8SOL3EmsJByrTtUw tKQdzjTPX8laJ7Yo+BoAXsbudAk+ieU= X-Google-Smtp-Source: AGHT+IE27eReN4BOnEkDO8qCguVex85M2sFCBi+HmJSHOsM8tYHI/mGXBrsvL449s1OOxcTOiynniQ== X-Received: by 2002:a05:6214:5709:b0:655:6f63:17ee with SMTP id qn9-20020a056214570900b006556f6317eemr18983426qvb.61.1696869600263; Mon, 09 Oct 2023 09:40:00 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:00 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 41/65] gnu: rime-data: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:10 -0400 Message-ID: <4cd0f10d6217cf99ff278a4e5898b74472cb16af.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Zhu Zihao , 宋文武 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ibus.scm (rime-data) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: Ifb5a008b91908beb62566731f097c0616796b583 --- gnu/packages/ibus.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index f2ca06a66e..e3dfeada3c 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -519,7 +519,7 @@ (define-public rime-data (build-system gnu-build-system) (arguments `(#:modules ((ice-9 match) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:tests? #f ; no tests #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:49 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:50 +0000 Received: from localhost ([127.0.0.1]:32844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJJ-0003uo-HD for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:49 -0400 Received: from mail-qv1-xf2a.google.com ([2607:f8b0:4864:20::f2a]:45344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIx-0003ox-PC for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:28 -0400 Received: by mail-qv1-xf2a.google.com with SMTP id 6a1803df08f44-66437c96caeso27817606d6.3 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869601; x=1697474401; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mC2LzYPoSrRZgd4K52Juo/xdzcJRW5ntq09P0aUvUzk=; b=bN19sFjX4mrMV7Cc3h4BogUrjCVyMXquI38WEWfFnDv+eJW7AHdsubJySXy8k8pkvU uO66TlPCpZrlg8PaHniVZPOPzzIZHxy/+lP0QTbORnFcMri0fin9ju+Q9qAG+2Vobnr7 xTKzrlwFzZKw8+hz7PGuLV2CgPAaik55GrJySfARWyIZYYCpS7JUoXb0dTpGpjuZ5wEn O2KpeTdEhFd0hXOGNLPiPWA7IUiD7yUhWUS2uG3AJyHWmlKV+Fo1CLTO8Z9oJRlwIV7p 99UiH7bH3ImKRcg9np5PBKf7nr3JBHkAgwmbbqWsf0hLD1hEP9EbNvYzLfbeU+/vhaUp OOgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869601; x=1697474401; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mC2LzYPoSrRZgd4K52Juo/xdzcJRW5ntq09P0aUvUzk=; b=TayOh8pQ1m8l/WDJmbKbjuc6Z6rOZozypmMyOZOVMxTYYJ1nUAGkpSQd5mWX0OgzVa Z2Dhy7N9fWnLFUYlQuIJqqzu20SmNyPaoUMXBcw3NX7SjGApwhTC53uFFfvnv7W78BTZ xawA4KCtkSUmOSnhd6kvigjYIzUfMqvXglr65f+2o4vIXm+bzUI+7YFNNVPZnX4wHZiE ARQWMkYvr4YP5STti94Yk6B0X0Ao1FnO//JB52pBNpyBY/cFOcT7F7IYliMvCpLxKvWf Le76HFEBB1L7M2b9pmFsJw++cMZ3zPPcBPf5KKU5Xn/MvCpd6FAz389Ll1N4wEfXKAzB XQ9w== X-Gm-Message-State: AOJu0YztOmr8WPqPT9oKW4RZJXwR8cmYUbOY+l3z9NRVIsWRVmIF9jGQ 4X2ayQADwfZ+Gpm5pCqT5T7nXfciqH0= X-Google-Smtp-Source: AGHT+IHeUklhxvSMlbimqV4P7VXbGyhfKTzW01jMmyVUetYQ41Xz7hSNDM3qnrgUbLB3ntpD1G6MJA== X-Received: by 2002:a0c:f4cf:0:b0:64b:e135:a3b0 with SMTP id o15-20020a0cf4cf000000b0064be135a3b0mr15328997qvm.19.1696869601353; Mon, 09 Oct 2023 09:40:01 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:01 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 42/65] gnu: jbigkit: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:11 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/image.scm (jbigkit) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: Idbc9fc336409f73b784b111da61fc5bf957ecf52 --- gnu/packages/image.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 1967715bc4..f6e1e0cc01 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -882,7 +882,7 @@ (define-public jbigkit (outputs (list "out" "pbmtools")) (arguments `(#:modules ((srfi srfi-26) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:50 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:50 +0000 Received: from localhost ([127.0.0.1]:32846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJJ-0003v3-U7 for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:50 -0400 Received: from mail-qk1-x733.google.com ([2607:f8b0:4864:20::733]:54590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIz-0003pC-ST for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:30 -0400 Received: by mail-qk1-x733.google.com with SMTP id af79cd13be357-7740729ae12so313388285a.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869602; x=1697474402; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=G1m2nlHAhTSwu2Gh6FjXIxeau86D22+iBgncDDL0nOQ=; b=k98YCh3SMRSlmqW0BZtzrUo2THKtwSAJ+tk6bztOc/ClATjd1zUOPocH/Hes2o3wvl v1FoRisyqy884TVQkwn06yF4DZVWDQD8VQPN9A1qt4MHWq/DGUG3tzdsA7aHGc7mHEWk Mxy3kQIXfYAeCcRfT1JB3rfZlD4ciKJy1tDC1gSNHkKyn/LhF1dgrnVrvsB+JIyzChP1 SPY/L0mn6iDj8zIvWidFtNfEHGgUa6V2u9jvUkJ1lTF/H/sP4xAtqQcqB2lF9zP6gGoK v+2tf0YB6igUYJ5oWqpSa3KhcSZmvyU6yG6XjkIvD6vQ9IDqz7xZIWdKWFp4iidSaDLv yICQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869602; x=1697474402; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G1m2nlHAhTSwu2Gh6FjXIxeau86D22+iBgncDDL0nOQ=; b=KL55o9okTsC85Z7ZdU0d1Chncv1FRzCKlyN5+UM4F4SYX4Thp40HT5XRuIv9hqD/HS GsnLdsqmjlpWa2FLtWDHEBKkAAfmVSuBwktxeR0jeTYX60hfDv5Ua5SBD15mQpw1YZmq 1a2Ubi8b2TJ9lLZwZL9wWRlJQ5FZwf/ZrUZWeNEW5xA+KmCLvDvMGQ1BFgf41EOPWfI0 RVgf+YVoFt1Ke9n4t7YKT6IoRnlVv43IoSJ1BZ6V7GIDCpZp/qQKyKfr/7Qu243O3vtr ZxDD8NYfs/LLDc/ibcwOMofXoAm3N4H69zs/xGYzoYAEw8eEUfLbXZOdTvN/Qt6RmBjj 29Jg== X-Gm-Message-State: AOJu0YzpO7wBPoOkaZjLb46MJIl/D3zubjKPJKnEvvQifceQlW32IWZJ eaYlMiUopVIjnD41C0oDk/KjJxuutBs= X-Google-Smtp-Source: AGHT+IETyq8pXXDI4SMU3+Uud1Gxp5RdNbT096r8j9DfIlr0UdQyYJoWicbrKHE1jDVb1feC8AKYrw== X-Received: by 2002:a0c:e38d:0:b0:651:679b:d35f with SMTP id a13-20020a0ce38d000000b00651679bd35fmr14468388qvl.43.1696869602417; Mon, 09 Oct 2023 09:40:02 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:02 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 43/65] gnu: uftrace: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:12 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/instrumentation.scm (uftrace) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: Ic56ac45a2f8aa6a90cabe0810b08a02fdce2520a --- gnu/packages/instrumentation.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 45ce747f70..5404f7b714 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -572,7 +572,7 @@ (define-public uftrace (list #:modules `((ice-9 match) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:make-flags #~(list (string-append "CC=" #$(cc-for-target))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:50 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:50 +0000 Received: from localhost ([127.0.0.1]:32848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJK-0003v8-7S for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:50 -0400 Received: from mail-oi1-x22a.google.com ([2607:f8b0:4864:20::22a]:49461) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJ0-0003pe-70 for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:30 -0400 Received: by mail-oi1-x22a.google.com with SMTP id 5614622812f47-3af603da0f0so3265359b6e.3 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869603; x=1697474403; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y0JdXqm1nPDGvveztpXv7T8L5uT9p2hSRzIG455/078=; b=aFkerQXC+lSu1vhYBPgjELQjc0QuVJODTpwqApBb5fgBlSw80Fyp38o3WjYTPqRRs9 hk+zbfeUA4T7fl8cXBsoHZzIlNa4ylm3F//HF2kSUyOgo5l14j445NIxBeIWfpOGrVm3 IU9KxU9ryuH2j5XDruEGPa68w9hvxjS6JG29w2mj01C9gkNjv4CSMOqlQ+oFAZsMAsy0 7lsbi0GynvY3sMKaaOh4JM21x35V5/P+f2M/sOOLLK2XSWhLymKGOI0+5byaG8Ye8hLI XpwjAgjSZtrGfussGnxTMKSt7Cgpo6TSa0LUwbOuvuP7r1xAtxTixB6PKmqkNxx0CIgt 6smw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869603; x=1697474403; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y0JdXqm1nPDGvveztpXv7T8L5uT9p2hSRzIG455/078=; b=XCyXR7RXy67tXtmzxFkz974xriVKQFtVazm49UY89C4u0hJg08IaliYxQahpz3sgug +Er70J4e7ZMdVU1pyXys8MuJmfIsSrl/9k1wUGhot0rdmYtKTQXTuKbxlSeAMCzhd3mm V9GFgm8xuUhYPzat7+uPd7y4CN+QG9dQYRcHZG7l0UV71d3il3ZplRGkrfCYudrgFyAa tmchYO9hDcaxp4C3GMApNQ2P7LaWxnwH8pTHZBWxIgo6F72sRvtefWHqL9YHS5Ss/jK4 1W/uvIQi1j8P/3BoWKnEcvWAvl4/dw01fhTn9lRf6MyRvIYfHUadcA15FJsZQAhfnLT4 mqUQ== X-Gm-Message-State: AOJu0YyB/P9++oateMx6Pgz+c1pdP4ikyRZc6oZ6K9U6CMUXNbwoKPAo BY0OMisJnAivdTillRQP40coVBWaf8U= X-Google-Smtp-Source: AGHT+IHTBTmGOwJgBitFWQbShPKDS1qD9oigHZi9GAjOkIWPTb6wEtmsdqhxBAxCKpxBs+28braopQ== X-Received: by 2002:a05:6870:524:b0:1e1:371:c3da with SMTP id j36-20020a056870052400b001e10371c3damr17949993oao.20.1696869603671; Mon, 09 Oct 2023 09:40:03 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:03 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 44/65] gnu: mdadm-static: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:13 -0400 Message-ID: <936abc9f55d19303d641d4d28ee9deda66f0a8fb.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Leo Famulari , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/linux.scm (mdadm-static) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I785a8378bea7529488dc7b8851e83746e4debd96 --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bc0f3ca38a..3f705aaea9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5636,7 +5636,7 @@ (define-public mdadm-static (for-each delete-file-recursively directories) (remove-store-references "sbin/mdadm") (delete-file "sbin/mdmon"))))))) - ((#:modules modules %default-gnu-imported-modules) + ((#:modules modules %default-gnu-modules) `((ice-9 ftw) ,@modules)) ((#:strip-flags _ '()) ''("--strip-all")) ;strip a few extra KiB -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:51 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:51 +0000 Received: from localhost ([127.0.0.1]:32850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJK-0003vF-Oh for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:51 -0400 Received: from mail-yb1-xb30.google.com ([2607:f8b0:4864:20::b30]:45260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJ1-0003qO-Io for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:31 -0400 Received: by mail-yb1-xb30.google.com with SMTP id 3f1490d57ef6-d89ba259964so5108444276.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869605; x=1697474405; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Njnu/8b6OhKitaDCqapsLDBENBj92DoxCXm/vXAAzz4=; b=KPf/Ccpeo6nScWRScEsOziCSFlgw1Z4lo2QR1g1pWDDddefgmUJKZ9VAz7TjZA6gb4 2/C4vbL1B+D6DCkSxxBPFpzm+pAUwkgYKMcIQ0icTb/QeKAx7HcOJZ0q2G6GII54slZ9 2zYE0N08LSNwyvTtWElN7IbSKCWt4t03Yg5HcNMkdS6/4PAhhXt+K0ioBawmuf+LBvoN 06dNs4B+r7DGCBRamsxchgwJ+P57YaBNUKz5jGeluls03gSB8acv0pzoGK8XK8rIl5yG BB5E1CbGBVG/0WJyPOTWpZ7bBK3//sK58iwHpgaJVgxzqJyC0eXZdHt3O9ej75nCbewo XY6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869605; x=1697474405; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Njnu/8b6OhKitaDCqapsLDBENBj92DoxCXm/vXAAzz4=; b=gWDqjVKnrBcBw2EnjFp0WigBSvDeRurGtOCrrd12G49mU+Y5HaJgZuGgFdyiePFlTR F17XW0nHyl58EFnmKv2sSWOzLOSPRfs4588Iss56BL+4uQZeKSiP4WOburqRt+74WZLc bNnDjeDriku+UtBY5tFGTYcN0/3P04ysIiIdQ8yYkH485pgiOJN5B7XJPEZdHS1qaANm Kd64EDIE3DbGw7D2nFyuDGpbMkmiwg8MbGFRQ2a4PG86XIEKnvzmsm3GKRaaNRlgkTIp kTHMYgvvnPKJ0etCkDzBaYY3Iu1nHSzqAytW/R2FRNdQPEPHBEzzIDiFppYYPD2Df569 Xlfw== X-Gm-Message-State: AOJu0YxbB81G/q5lPNKTJGHZGdJj3B3KOA+/8ImqQPJ5C+v8WwZq7wJ6 oF2vCLrFu6Wluqog1USEQTRCOAd5h0U= X-Google-Smtp-Source: AGHT+IHeGEmOwarnRlGg2hwvdLItRmq7+I4wLqQw0I6fFPyqde/xi7W2h0C9H9FzOnZS+Ach7uNq/g== X-Received: by 2002:a25:b98d:0:b0:d89:3ed3:95a7 with SMTP id r13-20020a25b98d000000b00d893ed395a7mr15106590ybg.12.1696869604984; Mon, 09 Oct 2023 09:40:04 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:04 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 45/65] gnu: ecryptfs-utils: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:14 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Leo Famulari , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/linux.scm (ecryptfs-utils) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I02251b4b687f9308fb8ab446a66d3bf73bbdb3df --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3f705aaea9..1cb65a13f2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6994,7 +6994,7 @@ (define-public ecryptfs-utils (build-system gnu-build-system) (arguments `(#:configure-flags (list "--disable-pywrap") - #:modules (,@%default-gnu-imported-modules + #:modules (,@%default-gnu-modules (ice-9 binary-ports) (rnrs bytevectors) (srfi srfi-26)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:40:51 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:40:51 +0000 Received: from localhost ([127.0.0.1]:32853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJL-0003vO-74 for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:51 -0400 Received: from mail-qv1-xf34.google.com ([2607:f8b0:4864:20::f34]:59890) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJ2-0003qb-Ls for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:33 -0400 Received: by mail-qv1-xf34.google.com with SMTP id 6a1803df08f44-65afac36b2cso25009476d6.3 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869606; x=1697474406; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=E1XGmV97KanTWFRap917DQfD4lBmwPR4zmkd7q3d2/s=; b=DmrRHKSHEUvJEoLYmlKryF6TdXOj3E4aTJKIGpNw9S4W5CQdCzFIzYtqc+EeHJtoyv JMsWXgiFn43Z29h1OS5Mc9CE+D5RNaq5GIT/QCJMPGWPP1cMUem8ZfSkDiEnjlrUPFc5 VxJ5eyGIYOopEpTsf7yO5YAnyayDSSlu1h5yskaZtshJ5dqg8IP7ajPwvCKJdGl1iYHo bSCJfZuF0N/PAvu4jQ1PREjprveXcB2OL+gPUFCYoAt7O20iVNw5adW0/SoqeAncjUYt r7Xjs5zLcHfxljFKIORsZtgi48BhD2PAhPhO4qaP95wyJXRJAFU2IEjlti4+NqIAMDf0 v+zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869606; x=1697474406; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E1XGmV97KanTWFRap917DQfD4lBmwPR4zmkd7q3d2/s=; b=sj9cy5M8mMhA9I6xGQqFHrAqwTfWZ3PjrnLd+vD6gcOa+cAU+nr8cHQlB1RbpTK7+a p1dlgVyBNP8pGzcIMwnhbLGPbTd8xmjhfnTpd286wXVVb5JJpRX+guQoANGo3aLZWnFP gtI46X8ip1+CqL/eF8oEkfTpD5N1Fz//CkQ/KhLf9qUpGCOOmg6ZCjIRQ8qUUTPpB2S/ ikBtduZ6kK+0n4u9BP2POHJfwhMMTKA94XDxaTdqoPQ7/iNV+bgUINhMJJu3kNoJV4In ElvSwpioTriJ+mHiuF/4zhsMVyuffljP39fP4rsqTD0YmxM0zuZM+HRXlkH/oezCoy9Y JjWQ== X-Gm-Message-State: AOJu0Yy1blI7cqWqTE/ua+PmGQPhu6nOyfYZQK9MyrmKx5cxmMXSSQNY VD+UYTbQqgPanQpdi4RMTLRPnIFnuTo= X-Google-Smtp-Source: AGHT+IHEvr7Zj3mnzlBewcd/0zI9VnIomXDBHcWmhXqXPG440qw0NHjbZxn7Ty5AZ2AlnphU0ttJow== X-Received: by 2002:ad4:4450:0:b0:65d:56c:5177 with SMTP id l16-20020ad44450000000b0065d056c5177mr14197055qvt.57.1696869606274; Mon, 09 Oct 2023 09:40:06 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:06 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 46/65] gnu: ghmm: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:15 -0400 Message-ID: <740256224bd28e2eb255ed13ecb8b2b3842e2a99.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/machine-learning.scm (ghmm) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I317b9eb60afd63eeb4643556e94cb26a1162abb4 --- gnu/packages/machine-learning.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 17b0c35f6a..7a9605bb3b 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -282,7 +282,7 @@ (define-public ghmm `(#:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) #:modules ((guix build python-build-system) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-dir -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:06 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:07 +0000 Received: from localhost ([127.0.0.1]:32855 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJL-0003va-Px for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:06 -0400 Received: from mail-qv1-xf34.google.com ([2607:f8b0:4864:20::f34]:51421) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJ3-0003qo-MH for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:34 -0400 Received: by mail-qv1-xf34.google.com with SMTP id 6a1803df08f44-65d066995aeso28640596d6.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869607; x=1697474407; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mGBUoXi/03e92nYtD4sE+GaT2oDKG7nYNMjKDBZnfKo=; b=hVLyyo7icZtCmrLy/SPQECIvnO+Ih0WOEDGbp9QVZ0pc+74WGT6ucMoqMWgldIzX/u ir4Q1SAFfCnyTtW5Wb7CJSIq/a8HSNxGsthCtjDTujsXM9euBAXglpWiR/WZ6ttgl5Vc ZKS4VzFyi0QgbwONXbbnanNBTe+kqdWxeU76dI6fFCJ9B506H6akuylKb2d2fbNsCjZ+ cRFlvxr7kRDtC5jKuTilqXUtn3q1sV34l0HFmWOjkCyqsRxoIZ4uuTsA7V3Z2OwFq9b/ Bx6TOQePEla5D9QKwsgERwmQH9z2GEU0i6HYH5V4cpeTchlqqZpIH4CUCb/drObumBla Ds5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869607; x=1697474407; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mGBUoXi/03e92nYtD4sE+GaT2oDKG7nYNMjKDBZnfKo=; b=MnQYv6RRXwCXKzJ9A5ro6bNUdI45gz+828LoXXbZOwZ47dY43ZvggaeKCnvn3LqTHf JqoJxo0qjT1f+hzWniZO9lq6JaPxoYoupa/QWuyHHx7RM8DbFMuy3iAvzXfm6Ywlp+k+ 52z/TtNze7JFCR9NqlF1G01Vbsm9N8Ezl91RFNeJEVloLv5/MCibDa6Sv51yZlZXiMcg cfl+/IM73dwXgFZSbXKMLpVIT/NAhtHlv1JrxuVTtuQHPJw7ppFGv07LEBq56fZy4yIN MdtlOmiv48JwSX/l9HCwWLqrmEKWOLRZ3Bfl0HK8y4QN5BmfDCwK2q7rp0kS5oP7F95+ ngmg== X-Gm-Message-State: AOJu0YykQYWr9Jgu9w6hGYVNjcilkungq0Xh/hN0eoL+i/GKF9CbwxlL YSjfmR7bErcdKDckmnbvyF3ZLJ3nnes= X-Google-Smtp-Source: AGHT+IEr8XK8G2nwgpEfKXvwWp5MWVdCpAWRYgfMLIToOk5PoRb45qo/DhlH5XdVmoD0tr2gnWNp7g== X-Received: by 2002:a05:6214:5693:b0:65d:4840:6eb4 with SMTP id qm19-20020a056214569300b0065d48406eb4mr15493434qvb.6.1696869607381; Mon, 09 Oct 2023 09:40:07 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:07 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 47/65] gnu: %gcc-static: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:16 -0400 Message-ID: <692a055471ab6cf6c781f766965fbd50d122e164.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/make-bootstrap.scm (%gcc-static) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I44bf99a8f1a7836352478b6f7dadc27ffb81bb51 --- gnu/packages/make-bootstrap.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 45fc2ac002..1b6fdd902e 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -472,7 +472,7 @@ (define %gcc-static (outputs '("out")) ; all in one (arguments (substitute-keyword-arguments (package-arguments gcc-7) - ((#:modules modules %default-gnu-imported-modules) + ((#:modules modules %default-gnu-modules) `((srfi srfi-1) (srfi srfi-26) (ice-9 regex) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:07 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:07 +0000 Received: from localhost ([127.0.0.1]:32877 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJa-0003y9-Uc for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:07 -0400 Received: from mail-qk1-x736.google.com ([2607:f8b0:4864:20::736]:62841) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJ5-0003qs-9y for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:35 -0400 Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-77063481352so467338085a.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869609; x=1697474409; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=18mIEHTZ07mz23ZJ+x6IZw2Y5le1qph4GJIgOQ1Mma8=; b=Zk98OYqrW7NT1d1Cyh3MK1hzag0iYtGckbQyaRGoIP0Lz7dimqG253J6NRBQoZzTVk QXoVyuGeLA+e9NK/WkW4iLAm6BrzZAO4BhnF3PVnTEbIlpWSKV9goB3MRv1FzSYTUjxd 4RavBn4JuTDXgcvXUgCOakA3JCnVroE0UlQBcsGIL5qdWz307K6KC9LdQpWsiFqZFnB0 /lXz4kRwknLUpHiyOsDZXs7aPGH/1FPbJ8WCEx7i3SuH+NWHYtW8+AZYcqU3YykDLhkk xc8OqWh1vTntPiWkO9uHhHzyzrlu3mqZlTfdYRiU1TgXngDihy11hDcgGFv3RP9LRz9B 5FJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869609; x=1697474409; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=18mIEHTZ07mz23ZJ+x6IZw2Y5le1qph4GJIgOQ1Mma8=; b=p7l7FK+EtoUOyF+gmdRhyAmFNunt7h3K+4kuB0pGmztVMiwirEwMLB67ODeU/2k9ke /ajSj1irZoQltFyUoZ1YxboN66AZzqgcl1RVZvJLLQjZyF6sJe5FrxWXri5EjYo07VDO 7L0pAr2q0OkBE9CAdE4uY87gbWRqwmjANwb39FREEb7N37ic8wQat7PI0R4AOFU8aSU7 KCd/3lDzFeEnAN1G7KMHnMfra5jl0f0knr63lYBJ25sbZ76McWKxXKffrRDdipPdo0aX zUl4ZG2OJdIGNkQkV5v2tqGjUcHFX+TCvVZHyccspDc/AdXOepyXgIwLQkY7PF1GyU+Q 8iGw== X-Gm-Message-State: AOJu0YzGzSewjV9C5LE8TSp5n4pOo76qI5tjBobwnqTiR5A3uY46fb6g kPQoQtdQeyBW8iovzSJZaxwF7vLXBaA= X-Google-Smtp-Source: AGHT+IGt7FTk4AjOt7ys/Japz/PtU0+IdGBYZ4PqLKRzgGvfT0E2eVjVPamErOrGQM8J1yIqTCGSqA== X-Received: by 2002:a05:6214:20c4:b0:65b:1097:760 with SMTP id 4-20020a05621420c400b0065b10970760mr19933698qve.15.1696869608978; Mon, 09 Oct 2023 09:40:08 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:08 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 48/65] gnu: mumps: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:17 -0400 Message-ID: <06a386701d0066f68a37aad6b13e970e782056d5.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Efraim Flashner , Eric Bavier Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maths.scm (mumps) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I61e06ba8df29a833124940a1a4e55cb063c66e4b --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 62bbdc274a..2740bf7e5b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3894,7 +3894,7 @@ (define-public mumps `(#:modules ((ice-9 match) (ice-9 popen) (srfi srfi-1) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases (modify-phases %standard-phases (replace 'configure -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:07 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:07 +0000 Received: from localhost ([127.0.0.1]:32879 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJb-0003yI-AM for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:07 -0400 Received: from mail-qk1-x730.google.com ([2607:f8b0:4864:20::730]:44360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJ6-0003r5-Jh for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:36 -0400 Received: by mail-qk1-x730.google.com with SMTP id af79cd13be357-775810b032aso321564185a.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869610; x=1697474410; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NKntXY4oq/SVmYF1DNg39IewC7GfUcbucT0+fCO4Qw8=; b=gylDN9k3zx5u7OJOIqItbdZ4+gkp0tgsGwNtl0wPi9OuuKByt7kLl/X/rTrEa6kV5T PB94oK6Gu565qIBjy2jbXBmiADw/8prBRWhhjydkhgj1cqUayxChqEV2GMsfOo2/1x6f i/lG8JlEImIhKfzbXDRqNMuTjFPbp5M8RsRROubkZbVBEOCmHgXRG+pLEx3NmG2D84zx rGeX7KVYFyyp34OEPngpM8PuFm1BkWufHRo9NPh/fEN9z4sriQevkuSQ1yRSOo6uPcz5 0sKWCvcKDe42E1G8XBgT7UrCqM1LmZWYwDsCCCDAyeVBl+YaKs/oHcEEcKTFu3XcEa4h TokQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869610; x=1697474410; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NKntXY4oq/SVmYF1DNg39IewC7GfUcbucT0+fCO4Qw8=; b=bxr3oVGjUiFaM8y9PMsCkNCB1rWXzTK9Fos8drMb1fKq3RwHUlPU5vpX8UKhIMDsQ+ UQpcGgGXhBBnnqDTstjg1yqF28YBC7mraXGk8ynVBphjRPtQDcqb4/OBrLnfpeekRl/W oTQFRapbzyCCTOZMPZoyt+PRgY1vdMXdXNgBPKqmMdIL2NayrveEbe+IHlo2IHcAmdR/ Kxn/M4v8mnFjwdAHzNKg+QIl+ylX+r9izE9qsyOYj9XAxRbg2+LQga/XaRLteUrZfmCT CSgtoMKWddJABvWyNUR8h1GW5a0At9U4+z1VMOIGgeiPLeMpMlOFsJyJBYvyOHWcPG4M Pjjg== X-Gm-Message-State: AOJu0YzuD6gqaJ55nAjyaBY6G3MoHAmWCA2hno6QCKao5/3G90ir6KfJ yBIxb3TXPfO31v5gr1bdqlA1Q6JzAEw= X-Google-Smtp-Source: AGHT+IFZWhHb9WfzZcZU6KlWm2ZFRNCzRGK+LrhMM4HwLPYz2L7s/oJCWMCBXsx2baFph6P+F8Evuw== X-Received: by 2002:a05:6214:3d06:b0:656:5441:a13f with SMTP id ol6-20020a0562143d0600b006565441a13fmr16795756qvb.45.1696869610220; Mon, 09 Oct 2023 09:40:10 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:09 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 49/65] gnu: hypre: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:18 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Efraim Flashner , Eric Bavier Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maths.scm (hypre) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: Iad7958af53360f83e7b04c5b6f8e2ccc8e87e27c --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 2740bf7e5b..b00b250081 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5883,7 +5883,7 @@ (define-public hypre (list openblas lapack)) (arguments `(#:modules ((srfi srfi-1) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:configure-flags '("--enable-shared" "--disable-fortran" "--without-MPI" -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:08 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:08 +0000 Received: from localhost ([127.0.0.1]:32882 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJb-0003yZ-Rj for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:08 -0400 Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]:42407) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJ7-0003rI-Ly for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:37 -0400 Received: by mail-qv1-xf30.google.com with SMTP id 6a1803df08f44-65af8d30b33so39221146d6.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869611; x=1697474411; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0YL6mUE+kKej0DOxH5M8df61wD2Bhv+mRn1RYL/G7Mw=; b=B+Vy9iN43nyaTQt9f4orlxaDXy8x7v+l2jT7CTH4XnUwVTCcJu15u4XtEy4v3Px7GA IG/LrluPl5uQXnD2aHMGQv6WeDXU1FuRaSPjvChMNkkcPe5hBtKeob2jf8NQi5KoTafm iDGnh7GGz1mAgqsKLBjHujX32wvJILQ29/4srL0ouFwsu+tX0O9zy5TMPEL+pc3K8bji gYkESrzAu/evd3/rukdkbaUUJm20UkIttD8DXUOOE7+OCjUUeeqwcnMZO0+iS/aHDQAM 0i24OH4syhmbrYAYkP79Vz1GszFaFKHYa2/AlpdFnAjHJwCmcVgY7IkmHQCknbdnZizh Meyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869611; x=1697474411; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0YL6mUE+kKej0DOxH5M8df61wD2Bhv+mRn1RYL/G7Mw=; b=o+6LXlrw6NEjT3aAOw44lgewhSA6g50LdroXhQnMpg094ERv4oUFPx0EcQPTn6jbXg CwXwpUQdoSmgOciFC/uja3hxliUtOLbxAb4oMu8XFIb04oji9Tu145SpZQZrSS/GvYA1 EANxBLEB2mXbj7I+ki5zdFWOJH72WRzw2uJ9MwyqExSWm+M4mr2zYM1tC5LaX53gYwty CKiEoGrtGQN2ntNE0tuPRCGHTJO48YXuzYw1fKfTZAityBQdCDlBUYN+lVczN8KuZyq+ R8nz7QVcA17W7Ii/ue0TGX7+FRpkFqd3j32lqx0/YvYVx/LFFdUijwwX18yKlm0WsVbf 6pDg== X-Gm-Message-State: AOJu0YwHMlKOEyoKR86QSkOzLxKrpf+zUv1tdQTZ99q5gLFaSVK+uurr hXz8/LU/sLaczlZsq4HyY+Wrtp0bU2w= X-Google-Smtp-Source: AGHT+IEwYubMGZ6+tVvXbHr1RvNPWBF9nGxkXQqOB2QPuU8v3CI4NSh0TK9PRanFzq0FDhBuOZi0kA== X-Received: by 2002:a0c:e04b:0:b0:65b:896:1cb1 with SMTP id y11-20020a0ce04b000000b0065b08961cb1mr19620456qvk.17.1696869611350; Mon, 09 Oct 2023 09:40:11 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:11 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 50/65] gnu: lingeling: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:19 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Efraim Flashner , Eric Bavier Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maths.scm (lingeling) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I9293cf6798395d9c9cf3fde5adac5439d02884df --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b00b250081..8cd10a7ab3 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -7888,7 +7888,7 @@ (define-public lingeling (arguments (list #:test-target "test" #:modules `((ice-9 match) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:configure-flags #~(list "--aiger=.") #:phases #~(modify-phases %standard-phases -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:08 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:08 +0000 Received: from localhost ([127.0.0.1]:32885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJc-0003yk-6B for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:08 -0400 Received: from mail-qk1-x72c.google.com ([2607:f8b0:4864:20::72c]:55352) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJ8-0003rT-Ph for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:39 -0400 Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-77574dec71bso312779685a.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869612; x=1697474412; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=05A75haN/jwUFt9SOgr5P4guvFffNkiI9Udg8r6L9uc=; b=VKlSZ6Otp+3wbbWzyMCudSc+dhP3QqkzjFWdAqBBglQuBRZBMpefIIW+3A29EM+N47 a+Fvh/Uk1pYoqAHx/BqJfM4zo/FaOYR0H5yT0zrENyXaidTz8W0WWo6dH84xviRfJQ8m Xk/Wv4a0Tj7JdsmQD41pcxfG9mdE7OuZQGhQzE9izCykkJ+a87nflaXMES9BYhI2tat8 9wfZxRyr7v8uOOcI9zXOEflBU3TZTfgFafmHjd3nbArD96CptsQi92qNvJhTyzbgx3P6 lph3QqGZt2ytikFQNtmMizhyNDyftKiP/h98p9KUoKb/cBeEslLXp2iHezV7EgalJfGO blhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869612; x=1697474412; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=05A75haN/jwUFt9SOgr5P4guvFffNkiI9Udg8r6L9uc=; b=kc5doYswWGN3pCDOgPcCcMNQqxwhC/M8qWunW/oEgN96ZSgiFW2wrS10FtweIUcH5e nPwUyTXGZYo0PpNN1gc0Bb87CAJAJFI0HDThOC7/rxrioXqI5apm7SpNJ5TI7JbD35Vj sAI5r8se49H0bmw0PstYC0iU7wPfroxqeu58m0UYP5vVhBuMaqvw0MeI1xp54sg/K6K7 LsoKYcfoB0hWdQRa53QC7naHxfVmAfUjaEx8iHr0Ezo33e8F9Xsn9rRM3MWnovclw9se 5H1Mac6nkIvzMC4Vs1/cGdI0Vm5n0HqrS4nfQM0VlONxMJpWxu6K5oTrel2Ywp2ZBgq9 ONUQ== X-Gm-Message-State: AOJu0YyRP08uzu5RY/InJxXDhPUaqe1PxjpHwXOii7KOh7RL6iNhAGbQ KxO3+B2zkvRNiRVuSLQ2WRQCFNWwVkg= X-Google-Smtp-Source: AGHT+IFiuLrfTtngjAwRgqQR6NAc38tchPKdzof5W74cQs3V9+Q6pNWQhxTsmV/76ll5jP+UZLoyUw== X-Received: by 2002:a0c:fe82:0:b0:65b:d2f:9148 with SMTP id d2-20020a0cfe82000000b0065b0d2f9148mr15906920qvs.32.1696869612441; Mon, 09 Oct 2023 09:40:12 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:12 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 51/65] gnu: guix-build-coordinator: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:20 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/package-management.scm (guix-build-oordinator) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: Iceeb14b22359b626aa3b0712a3d701ed7211c4be --- gnu/packages/package-management.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3bcb9a5867..2dedee3b8c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1529,7 +1529,7 @@ (define-public guix-build-coordinator (list #:modules `(((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:imported-modules `((guix build guile-build-system) ,@%default-gnu-imported-modules) #:phases -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:09 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:09 +0000 Received: from localhost ([127.0.0.1]:32887 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJc-0003yw-Hz for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:08 -0400 Received: from mail-qv1-xf33.google.com ([2607:f8b0:4864:20::f33]:45268) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJ9-0003ra-SJ for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:40 -0400 Received: by mail-qv1-xf33.google.com with SMTP id 6a1803df08f44-66afd39c8edso18494976d6.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869613; x=1697474413; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=B8Lrhf6lWxnLpgdSytQ14Ysxob+3cmIGsjcblwYORTM=; b=aO1CQyNaLfSihNOudx8babpIpNxoQPfs/H7C7MEItraxDy/myx9PYnLXDwLjn7mP5B Epp8pxIzJgu2hJig41nBXL2YG6YH/U7piPqhZtSdJXThfPKlGeqZRqO2xW2rGEE1K43U EuAdCwQ+9MLC7ty5KJhn4tdVdANC3THSL2hsYcsJXIAmMJmzNW1TxqShXjQEs/JsBzGC xOcrptZdhpkPDE3rNShMWWR7sv00D86MNoEa4gCFAXDw10/YDlQ3iMKoIKpwwtnTEzQy 6TykXGzdQBr6yWQi5egEe/s0iusDeeVn09xgkEgl6hkcn+wtSaJPHZtaLTA/b4syxHJS qrPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869613; x=1697474413; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B8Lrhf6lWxnLpgdSytQ14Ysxob+3cmIGsjcblwYORTM=; b=KlQoDj15MINAGAx01dBnaRJLeD+waNOm3KhcuNExJaXPYja1gI42SCe1vbkncrPrNn 8ubkAXlc/zuWsrDiBs2EyNysSVrCCP4azvNJ7cHoYHdwIHKuZ8lf9B9KmBkftU5XjpfI GaidDW6GAZ9z2nr6n+821sX9xBczll2D1PyWTmNps2Q2K1owoUCUFL2yN221OvHyZj3q gK8mNqdhtJfRLRSAf0JFawGWPDZJ+W0wIMiUvjHeG259dy7kSaHDGfPvZT7lIX4pKwuU MdKAMtQj26k/CNWwVmgWoU1TJV6ywOT3EcpMoHHH7q7kEBvq311drr+mDhExpFqIACPq E+Lw== X-Gm-Message-State: AOJu0YyDj6DwpLQMdAUL/YHleJqbqPYp8luPdl5L/w19lttvOcecPbwK RCkwVgd4XwW0f1PLaJLBSsRje+GEcNk= X-Google-Smtp-Source: AGHT+IFs2+fbj9729wnhnJW+X1Mb4l5Zn5QvhN6pVtHqOOGcSZmQZCyZD1rtwuPuIrlfWLYOu2crPA== X-Received: by 2002:a0c:8b91:0:b0:656:3fdc:771a with SMTP id r17-20020a0c8b91000000b006563fdc771amr15048899qva.11.1696869613563; Mon, 09 Oct 2023 09:40:13 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:13 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 52/65] gnu: nar-herder: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:21 -0400 Message-ID: <348667bf6712abbd8a3a10ee2900c052bed3bd0b.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/package-management.scm (nar-herder) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: Ic93a7e15a5be6671bd08280a257cbfeacf2fcbe1 --- gnu/packages/package-management.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 2dedee3b8c..8ab5c72a64 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1773,7 +1773,7 @@ (define-public nar-herder (list #:modules `(((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:imported-modules `((guix build guile-build-system) ,@%default-gnu-imported-modules) #:phases -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:09 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:09 +0000 Received: from localhost ([127.0.0.1]:32890 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJd-0003zE-6S for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:09 -0400 Received: from mail-qk1-x732.google.com ([2607:f8b0:4864:20::732]:60423) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJC-0003ro-DO for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:42 -0400 Received: by mail-qk1-x732.google.com with SMTP id af79cd13be357-77575233633so326404685a.0 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869616; x=1697474416; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=spmjhnDF9b3qvlDhDJcpnzLKYQehn/xr6AjB24yTn2M=; b=dB/oordelztVO1Xsq9ieiM4JSkUaEvheo3/xPV4pVz/w6FFWmIWl2qTavTU+Ywtgfh k7HJUXnIU/tK7dS5ojKhWcfYkkZTwpb9/MnZQlgmIy1QH2eKqKsymun0LkhgAuGwucH2 sybDbEbfAJbNXJfrvLtcHJqrQ5FLdDTdkpOU5QXvpFeuTilzS+MMrK0Y+eVz3pnDnePQ /QWYxEvzC9w+NaDxD+YIAcLMtL2BnTqR0GvAsENpV7hC85Kt4cwMlUF83KeO9nihCidW mTUrbwVqy6JEpzxZjhkeX8luKwnVHXoywPa+uHr1r2/+TxexN+BvGwLRjdwrH46PlMOP F0xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869616; x=1697474416; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=spmjhnDF9b3qvlDhDJcpnzLKYQehn/xr6AjB24yTn2M=; b=vKfH55J7LzbYX52w0bWo28a3iLWBJTZq4jv7jjZ3z+ulqqJBW+xiI2toMiB8kli2t+ LFt5V9YWOKf0RR3Pki9VzVA/YBXwNPYWhwQTTZLAZM0+MlNaiENw5y3NImQ3St2u9YkU hFGVUah+mmydtPvl8uwjmmSMEtLqQ7gvZ+4IVfTeySVTppK1duve35t9Oi5Q3bTW8SSy /YrtJAADiwreekwnztURDDazjoLpx20gZOrLkzLha2/NMGmHemc8QJHJ3oPr7gQScC0E yGyORrZ7ySTlSuF3bh1UJfomM6gvC7ngoBfCZOmQ6k+lJQ1tzUZeqDLexlIq2Se0kitf BiPw== X-Gm-Message-State: AOJu0YwE73k8uPFSL9UGZoMlayCYI/aIYZcMbFePo7RgCAJVXy6BMSrj q9wFyo23imvNNbfBcPOU8XTQbDjEYO4= X-Google-Smtp-Source: AGHT+IGDkN1Av7vTJDv9YeKPBZN3VaYZOlUBr/BwdUSjfegQNhPAgWWa1CQRMwk+ZRiAeCHEjnkuCQ== X-Received: by 2002:a05:6214:2b87:b0:65d:9ba:1cc7 with SMTP id kr7-20020a0562142b8700b0065d09ba1cc7mr16122695qvb.36.1696869616013; Mon, 09 Oct 2023 09:40:16 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:15 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 54/65] gnu: ratpoison: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:23 -0400 Message-ID: <6f7d64ca6c9e3116ffbbeeffad0ecd1e462a43e9.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ratpoison.scm (ratpoison) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I75acbee62734233a0f037837ecf83fa0ec1bc8f5 --- gnu/packages/ratpoison.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm index b39b679b7e..6c8915f06e 100644 --- a/gnu/packages/ratpoison.scm +++ b/gnu/packages/ratpoison.scm @@ -48,7 +48,7 @@ (define-public ratpoison (arguments (list #:modules `((ice-9 format) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) ;; Specify the absolute location of xterm, as the user experience sucks ;; when no terminal is available (can't consult help with 'C-t ?', for ;; example). -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:10 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:10 +0000 Received: from localhost ([127.0.0.1]:32893 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJd-0003zP-Jy for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:10 -0400 Received: from mail-yb1-xb35.google.com ([2607:f8b0:4864:20::b35]:60720) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJD-0003rv-Nj for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:44 -0400 Received: by mail-yb1-xb35.google.com with SMTP id 3f1490d57ef6-d865db5b4c7so4886223276.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869617; x=1697474417; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RrH2KDeLo9oZg7L/SczBPzwzlo74C4OMq8Vwg/4uwL4=; b=DqIe0td36Iqi7W3xpUeK/qCPIHAZWFW8bmMHRctgkTBMXV/MAdDUTuOmtpc4EbSBq4 zZsS1QBKTMWyzPa1eqDgMk/MHRTsapiKBR0QTJGF5szxo/rs+RAgTY4aJooNuSTR+QTI PQTbWD7crNZ4H/bJzCY9fYq3pPWISypqlxkfoDfrnkygUbRYTZlcMZgb9nsS99ME5y3p UVmTq2AnluqqkJAHCJjorU3I9WTwqTNbm/RzFWCes6i3Ff89GboqahHWKcvlZHTWi4zc s/E9OyDqg5TRLu7dlcpSBjAbAMeCB62Q45V/yDok8FZvdrWJyyZrb0J0kN9TP5gapyFy 7clg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869617; x=1697474417; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RrH2KDeLo9oZg7L/SczBPzwzlo74C4OMq8Vwg/4uwL4=; b=uLA3ZzszQvM+DWNP6cD/xGF8AiAU7IcDS3jl+M+4BThEiAxVAyk1y1GDKPI0feW2+F kEzlwR1p1Egyi3xDM94mDxO1NsORfuxZS+xazV0dvVm7l2U0UXE8ku+MTzCPCJy7Qccw EI9ZGaXBGb0NpriB28WJaBeOatd/jAzymUeyOCJ//O4D3GmrK4BPZNiwgxJaXeZHdIJJ eTaceG7BeWkhB/r9TwoQ36hvbXiDblsD682X+sJ6EdLmQ3I/SIVLcKSyr/oV/4ZYdSDq L5MkeoRn3xqSTcfFN7rrY7bNok8ZYHYQ5EmoFBWA/CiucAdN/bm93Y7kCx297vsU2DxH +8Hg== X-Gm-Message-State: AOJu0Yyui+U1bRFCihT+Z8uzGFdNv2vjTqzWVSGR9nKiI2FTEQkP6JHr ee2RACziLXv50cI1JKWox8pGIkhoO/w= X-Google-Smtp-Source: AGHT+IEQW+O4MQ0BwJL/LYpPdFRM2j8YfwV5ZbFW3IMZxzCxfPKJwoKVfQtP/RuDRbqDZZs5n6NF0A== X-Received: by 2002:a25:a044:0:b0:d32:cd49:2469 with SMTP id x62-20020a25a044000000b00d32cd492469mr13338467ybh.24.1696869617196; Mon, 09 Oct 2023 09:40:17 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:16 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 55/65] gnu: stklos: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:24 -0400 Message-ID: <9c7d9240ded28859a6f3f895b48df8d9c3924b07.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/scheme.scm (stklos) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: Iee99f93cfa5c7fa80694c2ad2ce6f93ccc0c44bf --- gnu/packages/scheme.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index eee39a55a5..93fdb6d7c2 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -1252,7 +1252,7 @@ (define-public stklos (arguments (list #:modules `((ice-9 ftw) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases #~(modify-phases %standard-phases (add-before 'configure 'patch-sh-references -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:10 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:10 +0000 Received: from localhost ([127.0.0.1]:32897 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJe-0003zi-A3 for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:10 -0400 Received: from mail-qk1-x72e.google.com ([2607:f8b0:4864:20::72e]:58859) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJE-0003s2-Kl for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:45 -0400 Received: by mail-qk1-x72e.google.com with SMTP id af79cd13be357-77412b91c41so273182085a.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869618; x=1697474418; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yjMQOHwhp7V7vY24ciRAAQzBWxUAhDsYPOWifu82D6M=; b=kuyJzrgmlnMNWKhpplvbS3rvwLLh2PkLIlKkLGldqqmvQiGVtxckVy/rwFGQd1KbqH m7RvainpSXU6z5UTKWhhWYHXAlOYSRZgoNuTqJDlaHNaT1v6eQV3o1ZuuOR6sqbdJ3vT XD8NvhMAcvmWtm6T6c4kRNywVr2dwJHSDk8GpIrgylZP4q0VItX1QY7wXHT9MiYHxGOw eKolQ0XzP2dn9lSVmoD77gF8p8smwjIDmfY4mODKsjndHAha1d1fYqf51twh/jerIHJL 5GlPyKElFIR26TXJLDxA66g/rAB5CoFvV8iCzjfCfJQ8T0MH5B4H3rkdCYoMRW3tAckC O62A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869618; x=1697474418; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yjMQOHwhp7V7vY24ciRAAQzBWxUAhDsYPOWifu82D6M=; b=N/EVPNi0/YwkM6M3/T/wCkLBKccDYp0q4BG3YszBmcSaFB0qO5y2LDjxjGryUD9RM6 epxGZMrFSQpyKqtghIw5l7HB41izAQHFYy2wVtc7F8BXUqyjc+33FEJyzTO0tjIrXghj qndDfSN6SFfX/rTISNkeTI/CLI8eer1u0tvxCvjnaDt23v8rSqrgKuPRsxy8o6rIpWL1 SKn16U8IditDcvdhCv8Kib4qxTSQyS8oQfg35K42I0Tr9nXdexnzr/cc5OYJrdTFurJY g/Bw9vnFf30a5nyACOPyIsyXeo9V/UpMUu7ezVgS4HVrnFpexFpq+k37/bvheghaIQhZ K+gA== X-Gm-Message-State: AOJu0YxlTT6mqP7GMVkSnUBIGQcGBr/l12eGdEH0ah0fZlwEc/YR45ct nZV1LnWZ7bzlVSzDRwoULW6MP8Ca3hk= X-Google-Smtp-Source: AGHT+IGn7uc3fUj3lqXbsyYHvLFlv9oxaLxdTm95Qd2mKcnxWlIufiRG6yCd3NWoOu0zw+iwZ80QgA== X-Received: by 2002:a0c:b45e:0:b0:656:3c00:dc92 with SMTP id e30-20020a0cb45e000000b006563c00dc92mr13362685qvf.31.1696869618233; Mon, 09 Oct 2023 09:40:18 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:18 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 56/65] gnu: python-sepolgen: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:25 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/selinux.scm (python-sepolgen) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I1383ff8bb77d07fa4ee05f8d670af00458ec78cb --- gnu/packages/selinux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index 2405fccc8c..0d1a114cf5 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -258,7 +258,7 @@ (define-public python-sepolgen (name "python-sepolgen") (arguments (substitute-keyword-arguments (package-arguments libsepol) - ((#:modules _ #~%default-gnu-imported-modules) + ((#:modules _ #~%default-gnu-modules) '((srfi srfi-1) (guix build gnu-build-system) (guix build utils))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:11 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:11 +0000 Received: from localhost ([127.0.0.1]:32899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJe-0003zs-MY for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:11 -0400 Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]:52376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJF-0003s9-Kf for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:45 -0400 Received: by mail-qv1-xf30.google.com with SMTP id 6a1803df08f44-65af72cf9e7so26961916d6.0 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869619; x=1697474419; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9OAqRYnRYtWqPly76izaPJvGDAjvclkLR+zMAb0QiYc=; b=mkRbeltvz/mtCJXNVjqj7te3bpJ3UQQ7OoE/OvL/2Tjxgwom6vBjVdlCDOOefjqqXg LCrjZY451sFCwcGfA7xZFYY2w9K8v2Uc33cuedWImoytYbxFoc9rVF8fLsp5mCkUAJg5 2yruV+eMft6hMJFt0OhwBYeNxH+T+pm8Db2OXzaA70GGq3sIcPhIFHiZ5Z59Jh98bI9G hkNTz/jZFqyz08MZL+V/5eIXdBiSgsgfFMhPo81CcBvrstwMUxIWsU+vlYfXSn35qBdu eE80NB4sElOeIqTv+IxivAEujjxy17xS5cmYyFWn7NLC/1IuJTCVzqCm94md8xBjxjV8 O/Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869619; x=1697474419; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9OAqRYnRYtWqPly76izaPJvGDAjvclkLR+zMAb0QiYc=; b=NYO6sVFa5J/JNFesfihjuha80fSrX5A897UeL6hHEPXPZzQXPbwGo6DmCG9GI/kfgS tvBNHBgrnWSPELP6dTsSB2ui6KgZ5dJg8hKuDm0SHaUo+cyD6Eu+ONSuNFMV9VhfsTpR 8uizg3TaBrMi7HwRZKF0LjI0iujIq9R/sROPWtDkO1dEw314gpp4XwLe8ZTYnoY55oyW Gs0ySdESF9fhd4ySrMiMBr08GmW4rPHM0x9pailTD3pS8RxIedoO9bYoXr93i6eFbam8 N/mlaApdbVri/S+PE63Hc9vawbdl0kcqwhZxOdap8Aw49CJ5ZSLs+wfybwS1S490I3Wt o28w== X-Gm-Message-State: AOJu0Yw6sejuu3qRGSQYFwbdg4casIzSce6KjQKc5wg1KiDanNhDnTHv iphD9gcXYsfGPo7OwkaHM6trkV8ric4= X-Google-Smtp-Source: AGHT+IEjCvQJcnWD7N/80kLhC1vn53wlVhMrOXzHHSunrdyBjQLEUh8MM0LS40J8LqEg7CoglIwu6g== X-Received: by 2002:a0c:8c8e:0:b0:65b:765:254 with SMTP id p14-20020a0c8c8e000000b0065b07650254mr13542332qvb.4.1696869619320; Mon, 09 Oct 2023 09:40:19 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:19 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 57/65] gnu: boxes: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:26 -0400 Message-ID: <8208a78b94606e0f86c208625e4397dc37ae448e.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/shellutils.scm (boxes) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I5272366ead3929e0ce2311ca2a5e4c5138523927 --- gnu/packages/shellutils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 29ea0e4dd9..13c340b664 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -122,7 +122,7 @@ (define-public boxes "/etc/boxes-config")) #:modules ((ice-9 match) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases (modify-phases %standard-phases (delete 'configure) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:11 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:11 +0000 Received: from localhost ([127.0.0.1]:32902 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJf-000404-2u for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:11 -0400 Received: from mail-qk1-x731.google.com ([2607:f8b0:4864:20::731]:62837) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJG-0003sM-Q4 for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:47 -0400 Received: by mail-qk1-x731.google.com with SMTP id af79cd13be357-77063481352so467352285a.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869620; x=1697474420; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ESjn7O/HUG2xbYn7CfBUoKbduVWyg4uRIbWuyWvbzzA=; b=AH6+w9EtCDaDsYUWoaciTCZsyV7wEk4dCeHalXshchMjzmZt2jQBmOu2I3O/OTnKx/ lUy8ndMoPTVedOFgIhgCYNOBPZFcfB72/R/oJbcgXqhkyTNRlcTM8ggmIRIRssWQJgWD Su0pKl0D85cjRrndVI6PRRFJDD+ie+qJGAy+oOcdiPKpSbEmEx1kDA1I80xrTSneIo9z twR/9wieuBu5SMpaVxij7QzmQipv3V8Xy1YnteJuGRw0r3E09P7bf1LAYAUdy2sQP+zF +F9BsUSXn2k2eBcD5sPbmQhQevJIYSyrvKTMJMy+9GJNbhX1uWsi0NzU4pYCgcaczy4S gT5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869620; x=1697474420; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ESjn7O/HUG2xbYn7CfBUoKbduVWyg4uRIbWuyWvbzzA=; b=G3Ntn9t319o2Lad0UYNCgCctlp5OG8qKCx2BaROYRJb4l7JUoP6EP6bDRtBC2gtN5E zUA2V0tw8/LWRPJs3mckFgdGeVTRudpEXI8R5sipMVpvHIWQfzsDJzvcV4wGp0M+cm9l SCpZ8CgeW7exTMdaqaJT0UykdMQUi0In6n6Mx91C4i/6s2VPzHVNW/KNMOUMUKBPtwHN L7NRlsjgOKNytpkyEKisyMaZuPEGuiB0wC2qaxmYmNCh9v7oKBNmSh30hX8RGnPR6gfO ON8MTGZoCZDqCzZgGUp5+R9vulytGpBiFjzpNsi3nSkvDuYZcKNOIib+H1PftucHv659 PLhg== X-Gm-Message-State: AOJu0Yz51sMYPIt6cOuAFyV7d+hG2HnVtNTxuqGdWjuTFPi6/x/vDeh7 tEzbtVGCUj5+u8nZMRV/xCQyFROQKjs= X-Google-Smtp-Source: AGHT+IGOtPr/QRlJRvayYwlSAgvDl7Aqz+tgkZY9Y+Ac8HwkvgicAwdfalCFiC2IFT9vQeWNMmWVOg== X-Received: by 2002:a05:620a:4443:b0:773:aa77:91d5 with SMTP id w3-20020a05620a444300b00773aa7791d5mr18091219qkp.33.1696869620458; Mon, 09 Oct 2023 09:40:20 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:20 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 58/65] gnu: simh: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:27 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/simh.scm (simh) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I11a5cd3619ada3a280e990741b513f6c20a1713a --- gnu/packages/simh.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/simh.scm b/gnu/packages/simh.scm index 7be6d934de..b3ded715d8 100644 --- a/gnu/packages/simh.scm +++ b/gnu/packages/simh.scm @@ -53,7 +53,7 @@ (define-public simh #:make-flags #~(list (string-append "GCC=" #$(cc-for-target) " -fcommon")) #:modules `((ice-9 string-fun) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases #~(modify-phases %standard-phases (delete 'configure) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:11 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:12 +0000 Received: from localhost ([127.0.0.1]:32905 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJf-00040J-HJ for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:11 -0400 Received: from mail-qv1-xf29.google.com ([2607:f8b0:4864:20::f29]:58690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJH-0003sd-Qs for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:48 -0400 Received: by mail-qv1-xf29.google.com with SMTP id 6a1803df08f44-65b0ffbf36aso25027886d6.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869621; x=1697474421; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=30tNyF7l6ARDeeieuxZkLrtLDCSpzqVBWKGSC33XItc=; b=M9Y7y8HH70cyHs6akHidQY797Y8QWXT9l7fl0IphhZjnOP6pmu+Ls9riE5Fh13Xgkc 8HG3r5tBufORGPdiG55g3E3XkWLVYjp2B8rkjekR800FtKoRpGAIoRP7qiLGUNI5l6s6 jLx3FvRAPn1ZJUF6ifZc6dkku9PIRUd8vDeaj0wyHzZVaFKPAKalCu6DoOYKvFGiwA/r ko4sK25P/vJGGD5Bw0MGYrqINB6dwUL0+2xK//J5gqcxgr9zaphe5CGiFO5Rie/8v8FD v5YK3C12ygwOvqcnP5HQnQzYY9PAHCwyWPW/W+l81jhO35g3foBe7bDM8AygeN4K0f8c +A3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869621; x=1697474421; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=30tNyF7l6ARDeeieuxZkLrtLDCSpzqVBWKGSC33XItc=; b=KpD7JNXhn9DQCJs4uWdzSpCegtx75J4eZa5k5Oa4yrcDuEjyw2MwiBWCUVNz+0gk5B SK+bSc1ya1jRwzQv+mspbjcy72Ks3cyjCM8mtq8aGhssg0ZSw08j+UCb+xZ6B4rvrs/8 gA1Ys6fNbS7Kkn8lBZD5PvVugtdRb8wW4XiyIuqyX0TTVje4rJH/j2vCDzrMRf2MkgQj nvF0mJ5o7zeQZl1qUnY8sUQUxHmlLct1cqQOv/67eLgjTgFgfkCQ99ae22irMv1S1X62 nqAH+IhVOhj+hYsqU7iny0wn14WDVZ68JtdzWxwX5Me0/H0LKcA08OV5Kimhd37gmJln 9psQ== X-Gm-Message-State: AOJu0YwNVqxddeRHk2+COLDr0aoW7YtrWrxDJtFlkzPDcr40w5y61FOW vZ3SRYeGSAdW045nIVxR5gCOsVcB0hE= X-Google-Smtp-Source: AGHT+IGg2SXv5jE53ONRtvVTYvK0Ax1aaLF8Jq4edCkuxUZoXufyY78CeEJyk6AQSuv/ZNNlEul+6Q== X-Received: by 2002:a0c:f38f:0:b0:668:e6f7:3d4b with SMTP id i15-20020a0cf38f000000b00668e6f73d4bmr13132162qvk.36.1696869621518; Mon, 09 Oct 2023 09:40:21 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:21 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 59/65] gnu: stb: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:28 -0400 Message-ID: <1237eb64b580ee75f6e7c0b3994b6a1836c758db.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/stb.scm (stb) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I22000458e9b09aef9b645553f555dc0235a6ff1a --- gnu/packages/stb.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/stb.scm b/gnu/packages/stb.scm index 1e2f6a1f15..64c13225eb 100644 --- a/gnu/packages/stb.scm +++ b/gnu/packages/stb.scm @@ -47,7 +47,7 @@ (define stb `(#:modules ((ice-9 ftw) (ice-9 regex) (srfi srfi-26) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases (modify-phases %standard-phases (delete 'configure) (delete 'build) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:12 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:12 +0000 Received: from localhost ([127.0.0.1]:32909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJf-00040Z-Ul for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:12 -0400 Received: from mail-qv1-xf32.google.com ([2607:f8b0:4864:20::f32]:47271) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJJ-0003t6-29 for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:49 -0400 Received: by mail-qv1-xf32.google.com with SMTP id 6a1803df08f44-65b051a28b3so29429886d6.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869623; x=1697474423; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YPhKcOHqR3sgw+2ikj2Ya8Jj1mjHQJwNrWg9HnCQ1zk=; b=NhxhmgXH5nZLIgRDRkazquuE39PElfmUylXmx0fVUwgMXtP6CubuIBw1YhTlAKHetE Xmo7R9ovqGEjDVNPQiPo1HAaODmMmsJ+SESVcbBBMJkVu6CXZwkNvJJIlMyaftRAKrES ueQarGThU5ZFrUvr2KF+xelsY+NXI/yNuRlONwibzl4wgHYo3MY31FXMN0fKXsR6pBs6 +GqFQRu3aeZkp5gtxE6SJxNjE5S/dfrZRR/xTEHXzWjZoIFfee6+K6972kYKWR662Zgl XyKer1Aw37567sROpPdN0slTxf+5W4Qymm0zymnhwpV5PcWAFd5y9CHAmBUNaHXKc1VU BZzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869623; x=1697474423; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YPhKcOHqR3sgw+2ikj2Ya8Jj1mjHQJwNrWg9HnCQ1zk=; b=J/cvr5r6CE7P4070UFRbYpaXBzU9jhSz7mxxN5sUs9cRJTu/Xs/pTnL/4JH0fLivff uYj1mRM/SSaGpVARgBKJ/+DWt1a/O/6VXhA4yIanE8qAnKATWLUq4BZEyH90cPguckln 6NLjblvsIg80lIFs7uV33nRf9k2uQ42MiwmLphXc9GgRTkw0YFQldIM1XPQxqxx7MjNW akeECb/2RmpHV2zH2kZFrPBXMnXaFPgCKpbqr2LhdYuUCNWehHM8yIlhVzQKHe19ZO6a 2eNKEiBjcGSVVdM/058j4yXknNFwTqz3KCuVVrVlh6PtnCscE9fqf6qHsQsQ1ui0FMmD qgeA== X-Gm-Message-State: AOJu0YyFIrkhkhaEFRbsyGYWOvsbg5aqzGLT5dcbWrYSkVtDGY0Ox142 UQ2xPhYOIWEIvcFlQ0Zn0IUfbF+ssnU= X-Google-Smtp-Source: AGHT+IFbzGfqlnvxfsrFs+/Q4gAeor1NwSjX9n3BwZqKLNwYH/IYAuF1aQS6oS6+GUSxkx1XIwWq+g== X-Received: by 2002:a0c:f342:0:b0:65b:1744:55dc with SMTP id e2-20020a0cf342000000b0065b174455dcmr17621990qvm.37.1696869622741; Mon, 09 Oct 2023 09:40:22 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:22 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 60/65] gnu: info-reader: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:29 -0400 Message-ID: <683ee119b1ff627523ddd329c95297d2be400579.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/texinfo.scm (info-reader) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I30e38d2282e19801ce865c6ba59c9e6b915e9b39 --- gnu/packages/texinfo.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 2080f97f47..ab4583071e 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -230,7 +230,7 @@ (define-public info-reader #:disallowed-references ,(assoc-ref (package-inputs texinfo) "perl") #:modules ((ice-9 ftw) (srfi srfi-1) - ,@%default-gnu-imported-modules))) + ,@%default-gnu-modules))) (synopsis "Standalone Info documentation reader") (inputs (modify-inputs (package-inputs texinfo) (prepend gzip))))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:12 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:13 +0000 Received: from localhost ([127.0.0.1]:32912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJg-00040r-Ej for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:12 -0400 Received: from mail-yb1-xb33.google.com ([2607:f8b0:4864:20::b33]:53740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJB-0003rh-5m for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:41 -0400 Received: by mail-yb1-xb33.google.com with SMTP id 3f1490d57ef6-d9191f0d94cso4865197276.3 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869615; x=1697474415; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Qzfa04LI9tPqKl4OzrLiD5k8YvkAR2PerJ6Wq3qSF20=; b=O3Nf8gofFsLQ0vt92WqU3PpcoFn4HYTchCrVSXd5jWjgVWfehFnVG6IF6G4M1O/8GM 98QSETDsdILba8F0ANULUfTE6KxQoP3XN/xDfnr91P7ch3Y6DPKlCCcCnOcHm38D2NTs H1lKYcft0n7C8da408aAD7jpkKpeIHifHb4Sd3lyOwlKrk4+QkLDx6yVgHEZpxxiUkg8 Qm8hMVmoYvXTczfiY8caOwTuoDaZ2Tb2JJKvzkT5iJ0JicEDuo7hHFWPlwN7I59Ic88Z p/6N9CHa5vdlZyzYujuqLd2Xu+VHtMWWGuvr1wFmTQkCByXIAVfkEglozE3ChFtsC0hi qVxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869615; x=1697474415; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Qzfa04LI9tPqKl4OzrLiD5k8YvkAR2PerJ6Wq3qSF20=; b=VqkfSgVeh361fk8s4fMVNf08CUMGXS0R1Bb/USXj9X1YeEClMEgCJhhGFUrMy2gYnc OIEcDvMKG/drjqu0xCWx+prO6Z9VBvwTP+BlVXgM/AUGAWKq1CZLxeoQqgurq71lZ2ZA mlBaBOhn8CLmGUwFttfze4Ke2/vieep/b4MQutCTk2EFuZRJDHOpzl97M7tE6K54PuP0 6XpW8ZUB/8UOUY5wAg2903ACNvhyaUwt5GvFPhvZLjfPSMUzv5kM6Bh+hIEmw2blvRD4 eowKq5GPwi2CuRA5e/PLJnusv3mZ2AqEzizRPHQpv1w9C7zIwEupmp65zlzpwcHFkLt9 2GNQ== X-Gm-Message-State: AOJu0YzcHxEVOoFOgSobzJJPnNc/c2LVmxFvPkf2kQaYh/rwL0aqcXPv ujSQOic4j05jnVesfZ/9GXJ4eHRw6zg= X-Google-Smtp-Source: AGHT+IFvuJ0bpfK2SOnNizVXcLQMZD/nM1/PWjlF+Qa1j5r27jw/xWyeswAYtBWGCHDTKDfCpKjrTA== X-Received: by 2002:a25:2d08:0:b0:d78:ae6:e75a with SMTP id t8-20020a252d08000000b00d780ae6e75amr14837219ybt.60.1696869614819; Mon, 09 Oct 2023 09:40:14 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:14 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 53/65] gnu: python-sip-4: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:22 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Maxim Cournoyer , 宋文武 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/qt.scm (python-sip-4) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I069c93f3fb11f53f73e1d0301d45f104155695be --- gnu/packages/qt.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c0abf7f391..e6ce9f1774 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3527,7 +3527,7 @@ (define-public python-sip-4 ,@%default-gnu-imported-modules) #:modules ((srfi srfi-1) ((guix build python-build-system) #:select (python-version)) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases (modify-phases %standard-phases (replace 'configure -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:13 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:13 +0000 Received: from localhost ([127.0.0.1]:32915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJg-00040y-RM for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:13 -0400 Received: from mail-yw1-x112e.google.com ([2607:f8b0:4864:20::112e]:47454) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJK-0003tZ-O3 for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:51 -0400 Received: by mail-yw1-x112e.google.com with SMTP id 00721157ae682-5a7ba0828efso686707b3.3 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869624; x=1697474424; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QegFOgO9X3NaEoziDHYNgel9QLDgnqmAEyaH9Nx7Izo=; b=XiqlzjqITtFwvjrXSA6hZ7mf5HTrkQN8QmMI5VE1m6kpXU/PbQntQtfx06683z/gm6 bZA7jCUX3C2rqRbE0xSntqq3VlnMERq2U8btE3kHT2EieKUgH+7P6xJqaq6qTyaqIyeS 5HacMdru9OKC1Dat/NbH97E3pjzLlGstPVSzMsURn+57EKeGmupnoaBl2x9qmapDNeH6 giGxiPCpXRapcz84/xGo+PScve/5VFmLfYqbKO43B7Em52mglkNnqim5xAfKg76Ghs+f LsglTFaLqtJ6MMuNayKezva0kHNeApKGKN6KT8kRIRaoibyHL97InNnleyj/rGP9WoHk UdHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869624; x=1697474424; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QegFOgO9X3NaEoziDHYNgel9QLDgnqmAEyaH9Nx7Izo=; b=vdjKuCM+RwQERP6qt6AL5i+tRZ6JTaowbi+b4wr+RysHwBKU6DkApuQWAgZmvL2f3N /RPfc1G5KMI2GT2GoZZebvx9V5jeXqeLwgf/kvFBP0bGq5drJmrFO8iVafc6Gs0rKd/7 Av+Dx6DEjGSQ2dkUxUqpJUGsoZGKkDJ5DCw0oKM0p822aXuahW/xbfYipZaf5WX6jDEt 3nlc+61O0/IGpy8nSem8UsDww7G/Jm5audlbcS0fFtN4ffXVW7+YQXCfa+hlrf+rFJRy TpwKDtQ55NOPZuw9lRYistuvUTxZCN4lk+p/ViToCobwEaK7T9UcbLIHlyqfFf1YMZCt IPTg== X-Gm-Message-State: AOJu0YwTgePM4uphuA5D9M3Q2t9c+hIJhbn2GcBWl9Yd42zTSZ+PRbzX IiT9XpmGu4xGvfyM0NU3SaRazBNZWNE= X-Google-Smtp-Source: AGHT+IHhzTVZVxYF4pQGKqnZD5ayzu7lQDPh8FW0eSYYxACJZljH0X3gbnSNOlZ5FN00VdQm51zGmg== X-Received: by 2002:a5b:143:0:b0:d81:87d9:6ad0 with SMTP id c3-20020a5b0143000000b00d8187d96ad0mr14316039ybp.28.1696869624340; Mon, 09 Oct 2023 09:40:24 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:24 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 61/65] gnu: git: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:30 -0400 Message-ID: <77fec31656e96db3f125b8440298e6c52f2bb3e8.1696868940.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/version-control.scm (git) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I0e3c4990920c1d3de0d0afea41cb27723ac28da7 --- gnu/packages/version-control.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 38efff4d7b..266b92b4b2 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -340,7 +340,7 @@ (define-public git #:modules ((srfi srfi-1) (srfi srfi-26) ((guix build gnu-build-system) #:prefix gnu:) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases (modify-phases %standard-phases ,@(if (%current-target-system) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:13 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:14 +0000 Received: from localhost ([127.0.0.1]:32917 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJh-00041B-B9 for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:13 -0400 Received: from mail-yb1-xb2b.google.com ([2607:f8b0:4864:20::b2b]:53370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJL-0003ts-Qk for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:53 -0400 Received: by mail-yb1-xb2b.google.com with SMTP id 3f1490d57ef6-d9151fc5903so4865092276.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869625; x=1697474425; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xm35fWFWICQNogcHaW9gXIElaNYJeaxJ1d/GxxCVMXc=; b=S+4Dw/ZTlZLgbVhxdnIA3RVPOofq6hApy7Sq8MNfN7Yn7dJuPdGwrHaSgerd9Du8wZ b91ZxLaDtvVi2zG0oMPp/48TpQUZaXB9qGrQ2/ye/7b9tONNxyQwXLnukuRJZ6RtNNMu DEVW8aGp2LbvujPvtstBHrrwtUvrJIqChzajwmtqu21zme/WmlOLdq5lkiRcVWfe6r1F GiilBy1CxwwbW6wWiml2Cp0YlUEmkv81geECr/F+NZmrFYBYN6kE9urQVtfH1CToyFtp 7kq1g3zLl4uuu8/+KaBRhOv+U2+26PXBvl2vdd2e0W8gpyhYJyCPMc2bXLDPUChX1Fat vdmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869625; x=1697474425; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xm35fWFWICQNogcHaW9gXIElaNYJeaxJ1d/GxxCVMXc=; b=CB7iD65uduwEnhR9Dv1yJ5jkaIC+kRkpZLFDVYcC74ynD80lK4OhqKVfsVKmVbIMAi teowjB7kXQy0nm0JhjaBXP2hLTqL6QChxMnf0AKG927rZqsJJjjBCkVGF6R7vmNWL3AW 2An8z5ktDgL6bF/Kt5JKXfL+y9lSNT2GgvhnTGatq+xziuR7AsvloOpNo9NaqKEXcGTh TG1oGZt4PurT1OSw1MI1OJmJGXIvG+CicEtXszkUTANfsH+zrT3GN6AsRafNChAVapUr ia687xw6Rcq0jU37kPrCByp3SvKQIyEfj/OYQsHzFR/h8wBX4aQpR3RUjr8L+UozEA5o 0d8w== X-Gm-Message-State: AOJu0YzUe/u2TBuIxLxcGkM7AH1AqEoiTb51JMup02Mhvo1SobcIOw9S YC6f2K0ULJ/YHJHel4K5kC+iqJQLt24= X-Google-Smtp-Source: AGHT+IF9VCesKTr7UVfeE8XHIrE+uZH8k5GTKuHowvp+bHZiqIyEDqK8OkEPlxF5BAfCES9LG9Fb2A== X-Received: by 2002:a25:7055:0:b0:d16:f35b:a35f with SMTP id l82-20020a257055000000b00d16f35ba35fmr14930585ybc.40.1696869625418; Mon, 09 Oct 2023 09:40:25 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:25 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 62/65] gnu: ffmpeg-3.4: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:31 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/video.scm (ffmpeg-3.4) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I190d9fb3bc372e87ac7eec4c0b05fd3d0b4f5b12 --- gnu/packages/video.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 90623edfc1..076d67f34f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1822,7 +1822,7 @@ (define-public ffmpeg-3.4 "1rijdvcx8xjqwh084qchwz91vcj8wsvb4diax0g8miywpir00ccw")))) (arguments (substitute-keyword-arguments (package-arguments ffmpeg-4) - ((#:modules modules %default-gnu-imported-modules) + ((#:modules modules %default-gnu-modules) `((srfi srfi-1) ,@modules)) ((#:configure-flags flags) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:14 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:14 +0000 Received: from localhost ([127.0.0.1]:32920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJh-00041M-Qo for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:14 -0400 Received: from mail-ot1-x32e.google.com ([2607:f8b0:4864:20::32e]:47190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJN-0003uI-0A for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:53 -0400 Received: by mail-ot1-x32e.google.com with SMTP id 46e09a7af769-6c644a1845cso3227084a34.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869626; x=1697474426; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NUi5eB4/cSGkjOlm9xWMBnCCKsYBvYQnCrWMi3nD4/s=; b=asYTlouud+fh9Zzma3xO5w9Zoavm0thNx11WP57u0NF7x+CShwVonazAPXxXl6UtM4 mJRgk6RjU2WY0BY6k5adLVEhGQD+cISoU+mObcUXyFiWV8dHuNoWaqYg+tNuAK6TCrJ2 /ke3b9h1p0B+sdqo3P8PG61rTIbAIK7b4MyzyyAKZeV01LLABbpX6x/2uWxk7oP/asVT STS6754763iW3VuYhI2ZWuSeN/1QNcfm81R3256hKABMcMURQeSUsTKOJC4G7FgnP4yG b4XlNaBylgPmPVn9wBWCkcewWDAPvpFm442fHxHPKyX42OqLJ7BFcnBA/4Ta70Gr3BWk mZog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869626; x=1697474426; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NUi5eB4/cSGkjOlm9xWMBnCCKsYBvYQnCrWMi3nD4/s=; b=w9B4LYKTtl2hIcR0bKqZu4qipXrzffyGE+2ZE2M1VSV9EcvGxBK2sx0veCAMYiWcLM Z1WKIVBOtJjLIyy5JC+evkZByWycNBL9BIpWibP0A/j3gSeNgSaALXkYxLV4HNbgxcet HsKkMJOAq+P1IIS68sCit0F6L0QihlPEZQSGA8i9Tu2zKEW6QWTBlJd7vlEB/JmCYxXS VxWwWBTrvK5boSnGAJCxqpYwqCeeq3mKyFJkA6xHxVMxJsbZGymAWUrYYEBTL2uMJOyt GkzQw/8VzY9jdtcip5hc8EbWrU4MU/e96/hHB8rtUiz8gfJahw5lUa236OPwORWUzYH6 Iubw== X-Gm-Message-State: AOJu0YynRiW+PdRhXFgNyEcRjRjxCbW+PLCWFwCfSEqCYy7k7ATeuUrZ K1ZqGt6yG0G77Js6gplrSRPl0K46ois= X-Google-Smtp-Source: AGHT+IElgsRfOZbNCGCP6APokgOyLcLjvJ3PdkDaMxMUieiq+YjENvAFi7cgsRNDhHZ7D5iXQNGY1A== X-Received: by 2002:a05:6870:80cb:b0:1bf:dc25:a5aa with SMTP id r11-20020a05687080cb00b001bfdc25a5aamr18873934oab.39.1696869626499; Mon, 09 Oct 2023 09:40:26 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:26 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 63/65] gnu: qemu: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:32 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/virtualization.scm (qemu) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I0d7274af400d9d24046ac6ab0466482c2690f2e5 --- gnu/packages/virtualization.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 5398c8116c..f7bde3a344 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -237,7 +237,7 @@ (define-public qemu (srfi srfi-26) (ice-9 ftw) (ice-9 match) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases #~(modify-phases %standard-phases ;; Since we removed the bundled firmwares above, many tests -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:14 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:14 +0000 Received: from localhost ([127.0.0.1]:32924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJi-00041a-9k for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:14 -0400 Received: from mail-qv1-xf2d.google.com ([2607:f8b0:4864:20::f2d]:53350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJN-0003ud-UD for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:54 -0400 Received: by mail-qv1-xf2d.google.com with SMTP id 6a1803df08f44-65b162328edso26816126d6.2 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869627; x=1697474427; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cGycn03kCInG//1Os/zLR/2DI37sAP+JvdSzDkeCH4I=; b=VXAAT+NEXIFX+8R17hf7rmM55ay1RYDszpkC0qGxcdocNFWIl/agD4bhZIwkz9iMf8 2YrgZD4R/P4T4CQgjyv4fZ9RC6vDviQWUkNEcvGMiQi9LOyJnqZU8Ob1X4YuG8iOnFot OmQqzuxQAFvOMJNU4qr99bFbr+K8OoiuntEhLWweHEli9e7I1OcWgZv2LmRj9/TPf7Sx 2XbVExqMtQ03FmUkDci62QFjsrVAvGtEFMhgzXPbj2nKbdlTQ1qtBoaXqqTGicYLI4SP iBzoOuCrJdxZtLbADI3417gn1VvzyE8ARd0yDoVooDenQRhD6mvqmdeUtgNw42gse4zs DZiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869627; x=1697474427; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cGycn03kCInG//1Os/zLR/2DI37sAP+JvdSzDkeCH4I=; b=fQRQFV9myKhxtGcVRGsM5zmq4m6dPoP4ma0PHtGaI/3Iy08alAaR5ZTSMr+xgSqmta IKrQ7q3v8146yG6E+YjeFdFeSEfdb4ufaj3Saj3qNKzCtHU5CyRhu7JIqW4aONu5jBo2 xppTEc8jZlIkn0cmsIyUa+hqEGTCcJSvpNpEGLYkrVmeaEQvMeCmKp6RqJ+v723dkNKp 734F5S61cHEc/3BJBVKdv0cmLlE18KzHOqY8EM9+t8uE4jMoSJQrEyE3D37rPM7gIT+I 7UTYg+DVzRz6S9rWiTiFsownkdTOWSxzpoA1p/F4ghXBXbUb+J5K93xr7TqSlO9VmOw3 JKSA== X-Gm-Message-State: AOJu0Yzn27Vv40RO8wAcsSVa6uQmX17/rBJweaGdgKeIRMDKV449RqFt htgQcvCUE4/0N9yihYwGuquxrlM2r00= X-Google-Smtp-Source: AGHT+IEprRVNLj+eB7JRWOJG4iZBiC9bBA1B+0fBlc0dym3X7wRpeR4EmKl/ptWWyDKIjHQ6Lpi92g== X-Received: by 2002:a05:6214:3bc4:b0:65c:fd5b:d74e with SMTP id ng4-20020a0562143bc400b0065cfd5bd74emr15915762qvb.26.1696869627599; Mon, 09 Oct 2023 09:40:27 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:27 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 64/65] gnu: ganeti: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:33 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/virtualization.scm (ganeti) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I986d3713ed80116863eee30e0b4e3dd445eed59b --- gnu/packages/virtualization.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index f7bde3a344..bdbc523043 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -681,7 +681,7 @@ (define-public ganeti `(#:imported-modules (,@%default-gnu-imported-modules (guix build haskell-build-system) (guix build python-build-system)) - #:modules (,@%default-gnu-imported-modules + #:modules (,@%default-gnu-modules ((guix build haskell-build-system) #:prefix haskell:) ((guix build python-build-system) #:select (site-packages)) (srfi srfi-1) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:41:15 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:41:15 +0000 Received: from localhost ([127.0.0.1]:32927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJi-00041j-KR for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:41:15 -0400 Received: from mail-qv1-xf33.google.com ([2607:f8b0:4864:20::f33]:49654) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptJP-0003v6-6J for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:40:55 -0400 Received: by mail-qv1-xf33.google.com with SMTP id 6a1803df08f44-65af75a0209so24772476d6.3 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:40:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869629; x=1697474429; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bKTVJBPcYmrB2F3XtTR8wLWrfPa+MdMlhVvj9GCIBI8=; b=np77Rc0W/T7PkiSWW8xZ1WIbVxa1vHCiMOt/7WZSlkliz0zvfIabZgBIcuLTkOOW05 mI/u59yH7eOpAGJJYehMaDCw05DVUfMjQGmtiLzw7ES3z0GzSkxCuiSxrS361yH8eJA4 aAwOnI6G7TxYrIpvxXl+HpIVyZNOEZYquK0qxE5pIsKHgEvkHOf4U8xrJCaEIAXazJBI dl8ptgzb5r6JSSKvmBEKFQ1f6D9cMiL+QxkLfOEKy10yc7ES85g7Zy2iQE4ldatl/Zgj Rjqd+V1x9JLYA8HUHX2Bdv/lDUHJ7e8asYOVnzERF2Xq68aKYYKOzr4+Wp4hDNUhgk9i Z6Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869629; x=1697474429; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bKTVJBPcYmrB2F3XtTR8wLWrfPa+MdMlhVvj9GCIBI8=; b=oRManhMdXyJXFGutn+DmnL/8kaZbew0VZ+fAUs8fN/pYBZXhhFIpUWORzE+zTZ7yDc SiEPbyUfT047ekHYCZmiUTQxAqmrdDOSAOQ4xhRL3Hn0d7Eg6hnlSRPiCc6Zgd0/9d4n zRZpvgU48k/x4YYxyzu0fv23mkrClXSZ4vv+HUorTfgZfPdKBKuEIcYzMyk2GBWgWdJt rL2xP96jxfbak1SiFY+s0tNrj4vLVYdwyu/xhoQkgIXwx3SElmVDNtcU8Ay1SiVLddP2 r+k8N+kg2a+wa58GHjtvsbfdFFptLaWA58WOekvUv7DnVRjBSDmnaTQC/SOl4AmAtJLc 37Rw== X-Gm-Message-State: AOJu0YyjuWQ0Ck11LCg/dVU13kXtsQUTY7NYqQxxsTbDshoUOY9aYqsK aQugqaCWrgDu2j1qfOiZaQjKKITBAlY= X-Google-Smtp-Source: AGHT+IFQLo5v60D18pXLH2A1fJrB9ldDJ7EdxP4LAtDWZXcSdpo6pVeCr2xX6TwgjYJHDQI9LblzUw== X-Received: by 2002:a0c:e7d1:0:b0:63f:bf70:6796 with SMTP id c17-20020a0ce7d1000000b0063fbf706796mr15105481qvo.58.1696869628904; Mon, 09 Oct 2023 09:40:28 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.40.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:40:28 -0700 (PDT) From: Maxim Cournoyer To: 65924@debbugs.gnu.org Subject: [PATCH core-updates 65/65] gnu: criu: Import the correct set of modules. Date: Mon, 9 Oct 2023 12:38:34 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Partially fixes bug #66425. * gnu/packages/virtualization.scm (criu) [arguments] : Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: Iec94d9eadd149d9a735965f78b432ad4e0d7c5dd --- gnu/packages/virtualization.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index bdbc523043..f721147c28 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1753,7 +1753,7 @@ (define-public criu (search-input-file %build-inputs "/bin/xmlto"))) #:modules ((ice-9 ftw) - ,@%default-gnu-imported-modules) + ,@%default-gnu-modules) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 12:49:44 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:49:44 +0000 Received: from localhost ([127.0.0.1]:32993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptRo-0004PZ-AX for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:49:44 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:60541) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptRi-0004PJ-Gj for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:49:34 -0400 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-522bd411679so7803140a12.0 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:49:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696870144; x=1697474944; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=g3CrzLWlICMFSBJdTz3+067gC0SmlUx0kjQKJcP9eRI=; b=mz8zUy4ywJKW4ibQHYkpVPilE/lPz0A1mJqHBa1+HkJwC1aLKmCbNGyDeg8gTt1jkm 5bFi4KDtGPkxggRCjGSWP6CFaUjm2Ph/NkKtj18paXZhpEvya3BMjuqaBT6GroGzfy2u trXtloOotw3wCgBZy70MlnsfoVtoCWsUsxtoOr+U6IEawcpN6P5h+4Fe+1qkTSVmptRu isE/s/k23zvw58rdL8c8bkhQWom7EE7UPe2gna0N9de5k1GQ8qSsCfdIuJ+lHw1mgO7i GRqr7o5IAop2ZHx/ilMYXBgzhuceQx1Qo9TZku5GAYYuqYd3lAUI3TqMrD7FWfPi31rh zGtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696870144; x=1697474944; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=g3CrzLWlICMFSBJdTz3+067gC0SmlUx0kjQKJcP9eRI=; b=R5yfLCnB2jMjpIF0Eb7WmrZ+BmawqZIeStFiRY6t3GdG36m+rEwPnya1xfnMLlmlov fkECeWMYTpKha52GZb89FxcflrqsJ07PneMDlxYVCNOFznh0EYrvFkh9el3tYDeocZIn LltroV5Fs2+p0Lo9KKdoAH6kJs+LrUG2gPx3aJEqwNwrF1Rhf8slTWNz1Ptj/0kkkgEd /S9IDOP2ltyzNwfAofkXlBrc+/D0HQHfvc2/chH16ygjMqXcj5uRo9TvjNT1KS+hrGRc BDhDKSvNa4XI1RxY1omKbhBhSJNNCrrtYK4H3oAcUDGVqTvXA/OLVD5saWk75fNH2YtG 5N+w== X-Gm-Message-State: AOJu0YxCfOLwOzgN8slFVYyzYFhuhldL5Mds7ogNY4IvZzSV3kzY44mH IEKfc31K6dJQpAJTxqnq60Q= X-Google-Smtp-Source: AGHT+IE08DvRop4sPZ/HeN6SGmQWpWlMf+qGMEe90rawzE2FvycF8yrfmUX/RWVuTCDb0sU+WSmNAQ== X-Received: by 2002:a17:906:5a6b:b0:9ad:e43b:1ef2 with SMTP id my43-20020a1709065a6b00b009ade43b1ef2mr14486707ejc.16.1696870143732; Mon, 09 Oct 2023 09:49:03 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id x6-20020a170906b08600b009a19701e7b5sm6965330ejy.96.2023.10.09.09.49.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:49:02 -0700 (PDT) Message-ID: <1a219a891192b526d3e28fea8ce350c0fd5e3b53.camel@gmail.com> Subject: Re: bug#65924: git searches coreutils and util-linux commands in PATH From: Liliana Marie Prikler To: Maxim Cournoyer Date: Mon, 09 Oct 2023 18:49:00 +0200 In-Reply-To: <87il7fdggi.fsf_-_@gmail.com> References: <9f9ecf37a04d6a3d788d247d8fb46f7bd6fabad5.1696734901.git.maxim.cournoyer@gmail.com> <442bb34f6ba81b7134c6cbf06d0045debc42bf68.camel@gmail.com> <87il7fdggi.fsf_-_@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Montag, dem 09.10.2023 um 10:21 -0400 schrieb Maxim Cournoyer: > Hi Liliana :-) >=20 > Liliana Marie Prikler writes: >=20 > > Am Samstag, dem 07.10.2023 um 23:18 -0400 schrieb Maxim Cournoyer: > > > It's simpler to add features on top of a minimal variant than to > > > remove them, and helps avoiding mistakenly changing git-minimal, > > > which has many dependents. > > >=20 > > > * gnu/packages/version-control.scm (git-minimal): Move above git > > > and severe inheritance.=C2=A0 Remove input label.=C2=A0 Repatriate mo= st > > > fields from... > > > (git): ... here.=C2=A0 Define as package/inherit to inherit from git- > > > minimal. > > > Extend minimal values instead of overriding them whole. > > > --- > > Having done the same to Emacs recently, I fully agree with this > > move. >=20 > Great; does this mean a LGTM on your side for this one?=C2=A0 Please be > explicit :-). If you need me to reduce it to four letters, yes, LGTM. From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 14:21:37 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 18:21:37 +0000 Received: from localhost ([127.0.0.1]:33122 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpusq-0004Mf-PG for submit@debbugs.gnu.org; Mon, 09 Oct 2023 14:21:37 -0400 Received: from mail-qk1-x72d.google.com ([2607:f8b0:4864:20::72d]:45473) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpuso-0004MP-AB for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 14:21:35 -0400 Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-7740aa4b545so327003485a.3 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 11:21:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696875668; x=1697480468; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BkCpFM0G7U/u7wU/HM/NXaCBbDbIOHebpxkE549pIbg=; b=VgxpCHcZw90muEHlDUQy6fYBleKYwxwFPH5Q7VwnghOiCGavqfREkTzvBSk7NI6a8H bdRW0CzBiP5stjUhfPbX+0mHxyo6NZRVCGCl6ZY68scMjsm6afnVoP4VgA7hSOeMOKKU se7M8u5k+9fsYg23sHPteG4lalMOMDPNnMbT6h2DJyd25JvzQwFL8Ft+9AIPaiIHlYDX LA0pkS5acUcvoQ/zkc79cgEVb/YqvVVQFYYlhO3hWNdqVHI/2kyidNbvWIfaglAPzgc2 9g44fjW/e4bp0AaQVPtIljz7VI/pt8yF4B6meI7PeMADIZDzee6A5lEKyFZidgNeYXqY V6zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696875668; x=1697480468; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=BkCpFM0G7U/u7wU/HM/NXaCBbDbIOHebpxkE549pIbg=; b=iTF9LhPW+e9C11yUpbbXNJTHDY0k2/XzH5LRCd2c+BCwxVZDWp2e9n1ZZr6ohVq6yZ y5ZyuiIx+9l5MvTgg7OaHpsLtT/wQVx/UELGEAMklyD8lWWhGU2DE3wEn14qHevxUwMT jbWxpoJyyCxbo7OOdtj3EJkmIbSX+tzi4OOiAW4axI7Y7v3bhH7InkhNs38G+q/6YYAl YJYyss6igJEJ9EWTzaBAway4lmJTopZkKm7Sw094rHbX48daQ+DgMz9BQgnsscZ+O8hn 9Mj0XesewWWwc8BNasG/YKDTpDVo5QjErA+l7XRorNEF/5wJY9+fdHl5YDROW4rqZwOt kBVQ== X-Gm-Message-State: AOJu0YxB5W543UrXOZrNQZbbZbE23pc+bEAv4AjoVZu+T1XDDdUx2TPP sYrSOhjB5bpTerEEf8y3dglILLKwlIA= X-Google-Smtp-Source: AGHT+IH6xEFrdkb3AHGtBffNxbmZWXlA6OPrDgcKCIHblfhV3ZkdMRGnBmU7SiWlx9gFnkzgwOa7AQ== X-Received: by 2002:a05:6214:488e:b0:65d:9b6:b9ff with SMTP id pc14-20020a056214488e00b0065d09b6b9ffmr17550397qvb.15.1696875667727; Mon, 09 Oct 2023 11:21:07 -0700 (PDT) Received: from hurd (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id x8-20020a0ce248000000b0065afbb39b2dsm4016046qvl.47.2023.10.09.11.21.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 11:21:07 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: bug#65924: git searches coreutils and util-linux commands in PATH In-Reply-To: <1a219a891192b526d3e28fea8ce350c0fd5e3b53.camel@gmail.com> (Liliana Marie Prikler's message of "Mon, 09 Oct 2023 18:49:00 +0200") References: <9f9ecf37a04d6a3d788d247d8fb46f7bd6fabad5.1696734901.git.maxim.cournoyer@gmail.com> <442bb34f6ba81b7134c6cbf06d0045debc42bf68.camel@gmail.com> <87il7fdggi.fsf_-_@gmail.com> <1a219a891192b526d3e28fea8ce350c0fd5e3b53.camel@gmail.com> Date: Mon, 09 Oct 2023 14:21:06 -0400 Message-ID: <87pm1nac8d.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Liliana Marie Prikler writes: > Am Montag, dem 09.10.2023 um 10:21 -0400 schrieb Maxim Cournoyer: >> Hi Liliana :-) >>=20 >> Liliana Marie Prikler writes: >>=20 >> > Am Samstag, dem 07.10.2023 um 23:18 -0400 schrieb Maxim Cournoyer: >> > > It's simpler to add features on top of a minimal variant than to >> > > remove them, and helps avoiding mistakenly changing git-minimal, >> > > which has many dependents. >> > >=20 >> > > * gnu/packages/version-control.scm (git-minimal): Move above git >> > > and severe inheritance.=C2=A0 Remove input label.=C2=A0 Repatriate m= ost >> > > fields from... >> > > (git): ... here.=C2=A0 Define as package/inherit to inherit from git- >> > > minimal. >> > > Extend minimal values instead of overriding them whole. >> > > --- >> > Having done the same to Emacs recently, I fully agree with this >> > move. >>=20 >> Great; does this mean a LGTM on your side for this one?=C2=A0 Please be >> explicit :-). > If you need me to reduce it to four letters, yes, LGTM. Explicit is better than implicit. I've been thinking to document this in our contributing section; e.g. a reviewed commit must have the 'LGTM' from the reviewer. If a series is LGTM, it needs to be implicitly mentioned with 'this series LGTM'. That may sound silly, but I think it'd simplify reviewer/submitters interactions. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 14:34:11 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 18:34:11 +0000 Received: from localhost ([127.0.0.1]:33142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpv50-0007Lh-Ry for submit@debbugs.gnu.org; Mon, 09 Oct 2023 14:34:11 -0400 Received: from mail-lf1-x143.google.com ([2a00:1450:4864:20::143]:47588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpv4y-0007LR-T5 for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 14:34:09 -0400 Received: by mail-lf1-x143.google.com with SMTP id 2adb3069b0e04-50308217223so6027473e87.3 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 11:33:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696876421; x=1697481221; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=Qkmuasy28SCWfJ7JOOEDz1XwZNxG8iAcnsOnHSwGwVY=; b=dH/bIMRSl8UyJbwRNgpau9pdlAZN/7pvGG896SUWRmYrgcjuSKpBFcd4d44unJvQIR HXnJQIbpfubaq9GO0Wnkkczu1jTB/1ZTtjLRgcBCLIv3QTK2AS45aMNSrMfboNtliRXz hdy/dbOmiMGrBajALt3Hbj9hISeVqkaWSk1P/ezLdE52Wc63V2ext0IMJFGIWFXQbKpZ vQ7jQ6a4+2QEDwG1bJ5LEQ5uhWdP1LWWG7xDG7YnZ201bLuqwLY0nK36vElt1S11lhZc 8jRFu3Vmza9Ty4m89ty9NrGFxgFlWeanFtDQc4fjOl7Xn+vTE5W4L3k6na50jGyg6/Zf 0gqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696876421; x=1697481221; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Qkmuasy28SCWfJ7JOOEDz1XwZNxG8iAcnsOnHSwGwVY=; b=jhyzkAyO7GpJP1KhHPOis9o2PZAdcjWbD9RcbuLfUVYPLBvo7UFl24J0aXjkC3pgay 9ANjoF4z0Qos9kQ4pJS9gEFSnKxmh3FT+2Jwt2f7pyeS2E7p0sJ/3wJkebsPBrp4Gmf5 JDqdeASIkgbEjxqenEWXXQ8IIV+Nlx2/YX5Zk8SQkFXWcfdI0U8TTrohrETyWmCOFpEm t6m6zG7k8jstSZclyq49sbDt8pQwImPxuMtRJxPLugxsWjXzESOv4wO/bj9SB3eWPSuo UMn2F8YVZJl9BV20m+tigsVjLfa9Gb3ljXPVhYmu83+ShSEMCa9tjunzZiCoL7TUExYW vdZg== X-Gm-Message-State: AOJu0YwJs6VqguMLhOLFzU0AC4ySA/YwzmL38sGOY0K+4QesxobSmC7x dupi7dn1hqlV+D/TUHr8Nik= X-Google-Smtp-Source: AGHT+IHUSPahuTRl62aJ2he4U+C0ZxTEtsG8l5eGKoV1EQQnPYAfg1o0w8FOvTPdxus/2s2llMa/pg== X-Received: by 2002:a05:6512:478:b0:503:1875:5ae5 with SMTP id x24-20020a056512047800b0050318755ae5mr12269624lfd.38.1696876421201; Mon, 09 Oct 2023 11:33:41 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id b3-20020aa7cd03000000b0053660f76dbbsm6371876edw.10.2023.10.09.11.33.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 11:33:40 -0700 (PDT) Message-ID: Subject: Re: bug#65924: git searches coreutils and util-linux commands in PATH From: Liliana Marie Prikler To: Maxim Cournoyer Date: Mon, 09 Oct 2023 20:33:38 +0200 In-Reply-To: <87pm1nac8d.fsf@gmail.com> References: <9f9ecf37a04d6a3d788d247d8fb46f7bd6fabad5.1696734901.git.maxim.cournoyer@gmail.com> <442bb34f6ba81b7134c6cbf06d0045debc42bf68.camel@gmail.com> <87il7fdggi.fsf_-_@gmail.com> <1a219a891192b526d3e28fea8ce350c0fd5e3b53.camel@gmail.com> <87pm1nac8d.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Montag, dem 09.10.2023 um 14:21 -0400 schrieb Maxim Cournoyer: > Hello, >=20 > Liliana Marie Prikler writes: >=20 > > [...] > > If you need me to reduce it to four letters, yes, LGTM. >=20 > Explicit is better than implicit.=C2=A0 I've been thinking to document > this in our contributing section; e.g. a reviewed commit must have > the 'LGTM' from the reviewer.=C2=A0 If a series is LGTM, it needs to be > implicitly mentioned with 'this series LGTM'.=C2=A0 That may sound silly, > but I think it'd simplify reviewer/submitters interactions. s/implicitly/explicitly/? I don't necessarily agree, but it's not a hard disagree either. I'll try to keep that in mind at least when reviewing your patches to not cause confusion. Cheers From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 15:18:23 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 19:18:23 +0000 Received: from localhost ([127.0.0.1]:33199 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpvll-0000YK-3e for submit@debbugs.gnu.org; Mon, 09 Oct 2023 15:18:23 -0400 Received: from mail-qt1-x835.google.com ([2607:f8b0:4864:20::835]:53569) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpvlg-0000Y1-Ss for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 15:18:20 -0400 Received: by mail-qt1-x835.google.com with SMTP id d75a77b69052e-4194c3cf04aso34537501cf.3 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 12:17:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696879070; x=1697483870; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NFSYeBhobRUk7yBUwdQD+f6Wjbk/VPyI/JEJNTDSY0Q=; b=OR1WL75CnTnBzADdCqu/78S7pQDxBNKE2rc/vpPwXoeHpKkLLLp6BWYF3tZm9i5HHY eCwuPpEzXyKT2SeXoPCMwcSp84Hi46gueNS3nvmj7cjCu5B82uEvWV7tE28Zq2rKyPAu +RT2liN0UbK/nGKZYZ8yvZ4tc4G2jmW0Oob8bYdD/GFrUXxNwy8Qiplbo4/0f5O/p2jP bE5jShhvzkUpoDj+xaWcRYRqTHDhefEPw2Ufs8QfZQRf8oc56wV5MEvdiY7NGD4CYPvz mLbEbI4Sc7sswsSyPiy96XjYjRLqEHv4c4l/Qbc+EbiE0ZJ6eDHHxWMXSRc2vbl9PcqE CPdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696879070; x=1697483870; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=NFSYeBhobRUk7yBUwdQD+f6Wjbk/VPyI/JEJNTDSY0Q=; b=QJmmMbXH6GtWgrwXCcOkoeM5FMZZpds2vjIsWuYG0FIQgzv07qb5dlRidYwkdETehN bFIMgNXwLriLP9/EzP4LAm50O4bEGnnJg1uyoal/Jh8+wlDB2AsvPeN64M4cjOmD+0x8 zQqlb/iFMiXRHYl8IWbcppbHFjFCQy9aIotyDmlZd/LmzaIlJ61wIyXGOcOqVT6vWuSv EulLN+CbAx05WBGRokoHmYNQT/L1wc03KBBuWkO4J0qP/gtkGBriIpTRB08PMMYhkGyo GCzFC3JHxZs2Gg+8VFHxzZYZfvvnE+75z2vT7iHOF95oyeQUXymKZNTy7PQXfYfalN4W VbXA== X-Gm-Message-State: AOJu0YySn8zx4a8dJaX9+xo0umgiLYiI2P+ZD5CVPai9oWQdLL5V/0WN LVIwf386+Nc6GpkGAR9pIZn1bOkqnOg= X-Google-Smtp-Source: AGHT+IHa1rMDcA6A+KSQwGe7BVEGhEkAQh1oiJgOYFAKn4f5+4CRR6/IzUqJWJtybJyavSpSdiB5tQ== X-Received: by 2002:ac8:7d0e:0:b0:412:387:e110 with SMTP id g14-20020ac87d0e000000b004120387e110mr19822908qtb.15.1696879070118; Mon, 09 Oct 2023 12:17:50 -0700 (PDT) Received: from hurd (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id 8-20020ac85648000000b00419792c1be7sm3907984qtt.30.2023.10.09.12.17.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 12:17:49 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: bug#65924: git searches coreutils and util-linux commands in PATH In-Reply-To: <1a219a891192b526d3e28fea8ce350c0fd5e3b53.camel@gmail.com> (Liliana Marie Prikler's message of "Mon, 09 Oct 2023 18:49:00 +0200") References: <9f9ecf37a04d6a3d788d247d8fb46f7bd6fabad5.1696734901.git.maxim.cournoyer@gmail.com> <442bb34f6ba81b7134c6cbf06d0045debc42bf68.camel@gmail.com> <87il7fdggi.fsf_-_@gmail.com> <1a219a891192b526d3e28fea8ce350c0fd5e3b53.camel@gmail.com> Date: Mon, 09 Oct 2023 15:17:48 -0400 Message-ID: <87bkd7a9lv.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Liliana, Liliana Marie Prikler writes: > Am Montag, dem 09.10.2023 um 10:21 -0400 schrieb Maxim Cournoyer: >> Hi Liliana :-) >>=20 >> Liliana Marie Prikler writes: >>=20 >> > Am Samstag, dem 07.10.2023 um 23:18 -0400 schrieb Maxim Cournoyer: >> > > It's simpler to add features on top of a minimal variant than to >> > > remove them, and helps avoiding mistakenly changing git-minimal, >> > > which has many dependents. >> > >=20 >> > > * gnu/packages/version-control.scm (git-minimal): Move above git >> > > and severe inheritance.=C2=A0 Remove input label.=C2=A0 Repatriate m= ost >> > > fields from... >> > > (git): ... here.=C2=A0 Define as package/inherit to inherit from git- >> > > minimal. >> > > Extend minimal values instead of overriding them whole. >> > > --- >> > Having done the same to Emacs recently, I fully agree with this >> > move. >>=20 >> Great; does this mean a LGTM on your side for this one?=C2=A0 Please be >> explicit :-). > If you need me to reduce it to four letters, yes, LGTM. Just to make sure, the LGTM is for the whole series? --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 15:26:28 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 19:26:28 +0000 Received: from localhost ([127.0.0.1]:33204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpvtc-0000nX-0w for submit@debbugs.gnu.org; Mon, 09 Oct 2023 15:26:28 -0400 Received: from mail-vs1-xe29.google.com ([2607:f8b0:4864:20::e29]:48385) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpvtV-0000n9-0S for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 15:26:26 -0400 Received: by mail-vs1-xe29.google.com with SMTP id ada2fe7eead31-45290cda80aso1655113137.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 12:26:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696879554; x=1697484354; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xXFFXlIKOkulHhZpxp1TpGmq2HRPELf7nbmUgX7Ll/U=; b=HVPpjcPT1+F6quGupkrCgDdZhg+PjD4L0BMViRPK/cB4+uaw3TO/V8Bp6+AI9WxE17 Z+baHGEjWuOBc4wXltIHf8xElNMwB1wWZkspMcDykjNibRsHvIl3SjHYRs4JSnOzigMP CQNpTHHIxUIrbAvLTLmkN7dniEA+KhVJDmfib3zauK1LmzjN2sEhqrIoFB1ws1JpFuyd 8EtSBFk1RcGcGxR52rkiLqEOVvz94MDeicIDMxX4l9eg4ZGDJNJHtyTsyL62LzPPnaFj PF/o4gHkkxeNOn36ME+/8NkEYCLf8AQ8Exh8PW8lkXxOEpBVqjGaoQ4Use7tzjvyGmEv cbIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696879554; x=1697484354; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=xXFFXlIKOkulHhZpxp1TpGmq2HRPELf7nbmUgX7Ll/U=; b=ryMjZuejpswWsvpA7/lTAuK+RTeFWKp6D3RcvYgT5ePMkyt9/xknrCBIgmeyLzpUYt 2e+pVrRoA8WsPv2YKDVA6TrZ46TV2sOoIHVOS+rtNUxWreZD6D1mnaOa+fjrs/gHEN9P Cq1w30LbUPFjzFN9XVAdFyhcgts9bXaAftBk8bO16KdvSw9SpJvG1d8x92Wl1d1+wYfL FHWrHtLNBeUmuusKijS4tmEq3aI/61HMqpDaBogDGq2Mp48zxd4Rp6rgjSAHnJey+jAQ YR81EmcIqSzVDKrgkEIV1oW0bF8KeTIzwulis4fnwQs4safhGyvahTcUSuF33MsHqdmm 303A== X-Gm-Message-State: AOJu0YyD8yIhxxITe9VszIkBrwMHq9K9ainr4YvncZtR+TFc6d/3ZQdi OGJnFXoV8Jpkf8Dxndj2YlsUYTECRbw= X-Google-Smtp-Source: AGHT+IEuyBFdmE4zA+6ZDLPVDWYpI4rlM/VvJIZvjBDGkxaYMbcKXFQzzwRvmE1ey+DG5Qo01o/2vA== X-Received: by 2002:a67:ad0f:0:b0:452:6fc1:a3e5 with SMTP id t15-20020a67ad0f000000b004526fc1a3e5mr11293307vsl.1.1696879554336; Mon, 09 Oct 2023 12:25:54 -0700 (PDT) Received: from hurd (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id c28-20020a05620a135c00b0076f21383b6csm3744460qkl.112.2023.10.09.12.25.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 12:25:53 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: bug#65924: git searches coreutils and util-linux commands in PATH In-Reply-To: (Liliana Marie Prikler's message of "Mon, 09 Oct 2023 20:33:38 +0200") References: <9f9ecf37a04d6a3d788d247d8fb46f7bd6fabad5.1696734901.git.maxim.cournoyer@gmail.com> <442bb34f6ba81b7134c6cbf06d0045debc42bf68.camel@gmail.com> <87il7fdggi.fsf_-_@gmail.com> <1a219a891192b526d3e28fea8ce350c0fd5e3b53.camel@gmail.com> <87pm1nac8d.fsf@gmail.com> Date: Mon, 09 Oct 2023 15:25:53 -0400 Message-ID: <8734yja98e.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Liliana, Liliana Marie Prikler writes: > Am Montag, dem 09.10.2023 um 14:21 -0400 schrieb Maxim Cournoyer: >> Hello, >>=20 >> Liliana Marie Prikler writes: >>=20 >> > [...] >> > If you need me to reduce it to four letters, yes, LGTM. >>=20 >> Explicit is better than implicit.=C2=A0 I've been thinking to document >> this in our contributing section; e.g. a reviewed commit must have >> the 'LGTM' from the reviewer.=C2=A0 If a series is LGTM, it needs to be >> implicitly mentioned with 'this series LGTM'.=C2=A0 That may sound silly, >> but I think it'd simplify reviewer/submitters interactions. > s/implicitly/explicitly/? Explicit, indeed. > I don't necessarily agree, but it's not a hard disagree either. I'll > try to keep that in mind at least when reviewing your patches to not > cause confusion. OK. One place where this becomes more important is when the send-email cc hook includes people partially to a series. A LGTM on a single message in this case could be misinterpreted for the whole series. It's best to document the expectations and codify these often used signals, in my opinion. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 15:28:55 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 19:28:55 +0000 Received: from localhost ([127.0.0.1]:33209 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpvvy-0000sC-MQ for submit@debbugs.gnu.org; Mon, 09 Oct 2023 15:28:54 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:56658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpvvw-0000rw-VQ for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 15:28:53 -0400 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-9b974955474so831435866b.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 12:28:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696879706; x=1697484506; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=8ZDcq76cx6A4PJLeyDp5ifPa8i8QGuKz9+dtYtWPtvI=; b=Dzo3Uuztw+etHAAiC2fCN1i8HsC11/hjJ2jKps+c0vX+bCy/wpVH5sTNBkYfF6sWye XYiimo3/guw7ooO6LgnuYfbH4EfrVwxreVzxNO0NBsKE3lH3HAtRDXcbxaqmf6w85Src XWaFp6+A4TJ14vZOP6htuXKaVbXSJHu2SF2DMvnV7dh7wQiGB54BT25y1AqQH8XL3uGC 2/KnhtYRmwem4P3rXbhxl3FvCUJ1MQHE64O9zag2GvA6A7DRDJCQDn3Joe1bFWKa/5lW Cku3c1grHJ2LRpvxEdXJKh7vgJW5WezZvYtsqpQKcFuE4Y3FO9ZFhkciPT1sJ7FKwItJ keMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696879706; x=1697484506; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=8ZDcq76cx6A4PJLeyDp5ifPa8i8QGuKz9+dtYtWPtvI=; b=kIuXiNPbEVv2tdySgFPgosfTvQc9XZQ9yotWsiaQxkidYQ+93B0r23wljmWTApGqKE IOmMJh44c+S7ZPcJGNpL4gGh4IjLVCPvxcmGnVkGmQ27AkhgCXVqXfk9XMqMjwItgsNv dKOMTECg6hjOctHpB+ovBBRSvntxjAP04qse9sbS1d7lmlr9po9R3UVLJeDaGiLmaxvm ptaVWH1BU5wJCj56eOrIh4gpLe8qeQ9lCIpcxs3FJt3wFd0Xg6AG6WL+hva1lBuW3Jxs 5oSn+EJrQTVy4J1Y2h13ImZoz2Ns13ylSDLO/0nplJordIvK0RUec0OQDd4fRXEVFpoT OtyQ== X-Gm-Message-State: AOJu0YyuKMyUh0q66oqIpdiL3GwXEBMtcJWg2fI0CuZY/KxRKK1SzyUv FGtakCuDn9nLnK1D/5+l3DY= X-Google-Smtp-Source: AGHT+IGrjZEioo85N73KcDF0O0NBY5BrBWLhMpfMbd7l+Y+9zm9fFVrlKYYtt/AIyax4rqi9koTPnw== X-Received: by 2002:a17:906:30cc:b0:9a1:c447:3c62 with SMTP id b12-20020a17090630cc00b009a1c4473c62mr14222421ejb.49.1696879706084; Mon, 09 Oct 2023 12:28:26 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id gh18-20020a170906e09200b009786c8249d6sm7211402ejb.175.2023.10.09.12.28.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 12:28:25 -0700 (PDT) Message-ID: <6ab66bf2dda6a5a0c8db6192a367452c2782e1ee.camel@gmail.com> Subject: Re: bug#65924: git searches coreutils and util-linux commands in PATH From: Liliana Marie Prikler To: Maxim Cournoyer Date: Mon, 09 Oct 2023 21:28:24 +0200 In-Reply-To: <8734yja98e.fsf@gmail.com> References: <9f9ecf37a04d6a3d788d247d8fb46f7bd6fabad5.1696734901.git.maxim.cournoyer@gmail.com> <442bb34f6ba81b7134c6cbf06d0045debc42bf68.camel@gmail.com> <87il7fdggi.fsf_-_@gmail.com> <1a219a891192b526d3e28fea8ce350c0fd5e3b53.camel@gmail.com> <87pm1nac8d.fsf@gmail.com> <8734yja98e.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Montag, dem 09.10.2023 um 15:25 -0400 schrieb Maxim Cournoyer: > Hi Liliana, >=20 > Liliana Marie Prikler writes: >=20 > > Am Montag, dem 09.10.2023 um 14:21 -0400 schrieb Maxim Cournoyer: > > > Hello, > > >=20 > > > Liliana Marie Prikler writes: > > >=20 > > > > [...] > > > > If you need me to reduce it to four letters, yes, LGTM. > > >=20 > > > Explicit is better than implicit.=C2=A0 I've been thinking to documen= t > > > this in our contributing section; e.g. a reviewed commit must > > > have the 'LGTM' from the reviewer.=C2=A0 If a series is LGTM, it need= s > > > to be implicitly mentioned with 'this series LGTM'.=C2=A0 That may > > > sound silly, but I think it'd simplify reviewer/submitters > > > interactions. > > s/implicitly/explicitly/? >=20 > Explicit, indeed. >=20 > > I don't necessarily agree, but it's not a hard disagree either.=C2=A0 > > I'll try to keep that in mind at least when reviewing your patches > > to not cause confusion. >=20 > OK.=C2=A0 One place where this becomes more important is when the send- > email cc hook includes people partially to a series. A LGTM on a > single message in this case could be misinterpreted for the whole > series.=C2=A0 It's best to document the expectations and codify these > often used signals, in my opinion. I personally prefer to comment to all individual patches or use the series starter for "this series LGTM", but to recap; 1 and 2 L'd GTM (with a small caveat for 1) already and we discussed 3 in IRC, so LGTM for the series. Cheers From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 15:45:04 2023 Received: (at 65924-done) by debbugs.gnu.org; 9 Oct 2023 19:45:04 +0000 Received: from localhost ([127.0.0.1]:33224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwBc-0001WJ-21 for submit@debbugs.gnu.org; Mon, 09 Oct 2023 15:45:04 -0400 Received: from mail-qk1-x72c.google.com ([2607:f8b0:4864:20::72c]:51470) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwBX-0001VO-Fu for 65924-done@debbugs.gnu.org; Mon, 09 Oct 2023 15:45:02 -0400 Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-77574c6cab0so354256885a.3 for <65924-done@debbugs.gnu.org>; Mon, 09 Oct 2023 12:44:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696880673; x=1697485473; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aijstTHI0QQQ07B/iH7syQJHw//90aJf+mKCqOkart8=; b=VcXxup2kjU5xWw5K4MtpnvJjYLBA8c7TiCTEF5/fF7zX8uP0GzEqVQK2YKkG1128QA 3GMoaNpdlRvqurV8juzPNSjxWGfE+zfrxuxOz1MABA1WtS9FZdSqN++7I8eFbAuPZaND CPdIEy6L24mr7NG1oRJOMGxxb6layRuREJ79Z7gWoFPxPR9oKOWKpwpeEdXKSpEQ5meR /zifsZt5CDIPRASsQMdEzSXXSP8UuVh6TaEeGdIdVWr0h5qikuup5yR+dBGHOWV9wBB6 jhLOKT4LSt9ZoX9rE5+hvZlvthAz2mjzFtWwEIQCZgGVhYscTw8SXWgIlFdDozGIjAXo suCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696880673; x=1697485473; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=aijstTHI0QQQ07B/iH7syQJHw//90aJf+mKCqOkart8=; b=ZNAbAa1OcXohkQP4yAtS+r3Aqa1sYD3E9dCzGsxsqqZDb226wEnQ4U58M7zX5Nb77j ZfdNT24LK+n4UuhUP8MFhdfj8vPLgvMF/ubpNmEKVwVFuD3JybD2gHFjsXy+V0qPrKIM K5nugjoTiSmhzTyRo6L8TpRAlLclo5552r4c86+r1T1hMCSfq3cWIftt88N3K2+1q9Sy SQakJtQnwIA4K4GNEVgoj/lkHUN/OI2erz3KgKo9jMZyDro6oFZe2vfIBob0ei29qzca yuGEQXSCD2PaknafD5r75AfGCJGgn+1Nwj8qVW9zlKpFHx3r4iY3PX0Ewpq9ftUvZcwF 1p3A== X-Gm-Message-State: AOJu0Yymcrk3cAUa5f6iC4n0JrrqNmOQsd4apsfEY9yPcmnffNM8B1cM U3JnzsNkvavHx9JHEqxYFLQ= X-Google-Smtp-Source: AGHT+IHpsFOT2IrSul3u83GEx1OnMHt6jDVYa+fuB3bE4s86aVF7AClGdrn1h5jtIK5HvdVgffXJaw== X-Received: by 2002:a05:620a:24cf:b0:775:a3fc:a9d1 with SMTP id m15-20020a05620a24cf00b00775a3fca9d1mr21617401qkn.23.1696880672956; Mon, 09 Oct 2023 12:44:32 -0700 (PDT) Received: from hurd (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id pi2-20020a05620a378200b007677347e20asm3722255qkn.129.2023.10.09.12.44.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 12:44:32 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: bug#65924: git searches coreutils and util-linux commands in PATH In-Reply-To: <6ab66bf2dda6a5a0c8db6192a367452c2782e1ee.camel@gmail.com> (Liliana Marie Prikler's message of "Mon, 09 Oct 2023 21:28:24 +0200") References: <9f9ecf37a04d6a3d788d247d8fb46f7bd6fabad5.1696734901.git.maxim.cournoyer@gmail.com> <442bb34f6ba81b7134c6cbf06d0045debc42bf68.camel@gmail.com> <87il7fdggi.fsf_-_@gmail.com> <1a219a891192b526d3e28fea8ce350c0fd5e3b53.camel@gmail.com> <87pm1nac8d.fsf@gmail.com> <8734yja98e.fsf@gmail.com> <6ab66bf2dda6a5a0c8db6192a367452c2782e1ee.camel@gmail.com> Date: Mon, 09 Oct 2023 15:44:31 -0400 Message-ID: <87r0m38tsw.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924-done Cc: =?utf-8?Q?Ludovic_Court=C3=A8s?= , 65924-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Liliana Marie Prikler writes: > Am Montag, dem 09.10.2023 um 15:25 -0400 schrieb Maxim Cournoyer: >> Hi Liliana, >>=20 >> Liliana Marie Prikler writes: >>=20 >> > Am Montag, dem 09.10.2023 um 14:21 -0400 schrieb Maxim Cournoyer: >> > > Hello, >> > >=20 >> > > Liliana Marie Prikler writes: >> > >=20 >> > > > [...] >> > > > If you need me to reduce it to four letters, yes, LGTM. >> > >=20 >> > > Explicit is better than implicit.=C2=A0 I've been thinking to docume= nt >> > > this in our contributing section; e.g. a reviewed commit must >> > > have the 'LGTM' from the reviewer.=C2=A0 If a series is LGTM, it nee= ds >> > > to be implicitly mentioned with 'this series LGTM'.=C2=A0 That may >> > > sound silly, but I think it'd simplify reviewer/submitters >> > > interactions. >> > s/implicitly/explicitly/? >>=20 >> Explicit, indeed. >>=20 >> > I don't necessarily agree, but it's not a hard disagree either.=C2=A0 >> > I'll try to keep that in mind at least when reviewing your patches >> > to not cause confusion. >>=20 >> OK.=C2=A0 One place where this becomes more important is when the send- >> email cc hook includes people partially to a series. A LGTM on a >> single message in this case could be misinterpreted for the whole >> series.=C2=A0 It's best to document the expectations and codify these >> often used signals, in my opinion. > I personally prefer to comment to all individual patches or use the > series starter for "this series LGTM", but to recap; 1 and 2 L'd GTM > (with a small caveat for 1) already and we discussed 3 in IRC, so LGTM > for the series. That's a good idea. Thanks for the heads-up! I've now installed this series to core-updates. Closing! --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 17:03:49 2023 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 21:03:49 +0000 Received: from localhost ([127.0.0.1]:33494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpxPp-00073Z-Ho for submit@debbugs.gnu.org; Mon, 09 Oct 2023 17:03:49 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:46318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpxPk-00073G-Fe for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 17:03:47 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 62E61E3779; Mon, 9 Oct 2023 21:03:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=bokr.com; s=easymail; t=1696885397; bh=n0wxnTiY0KYh3zo2pooCTNlA5MO/GqZkqpFGb8i6Pbo=; h=From:Date:To:Cc:Subject:Reply-To:References:In-Reply-To:From; b=Lfcwr05Sk1k85ajGG0nVn9Ra94CRqmBiUg7jxTG9WOv1IslT/NcbcYT9sIqIWN4QA aKLnvZyTPudXqCnkHsQg4t5g5CSChti0mUmGEJ2AShZMIY851RZllSyvwLLCWFkGq5 REUsyv5JM23ikOPDTy3QCXSRzXiO32SuAMLpSk3q9krVLMCRuYjVkoeFG8t0zZjB6Y /4FNef8yNKvlQaYeM9HolpMrIXD6rxzkEPpCfy8V0BksLvObGycGJMdjK39Vit2VCp gAJpVGhd9NrNKR4tofJ/UEO8cs9msIUGnDVamhfe1p1aOeOhsyVpijgQTE32KJUqtf xLBy0bCXZGXbQ== X-Virus-Scanned: Debian amavisd-new at emo08-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo08-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XCnjPpsRsKaf; Mon, 9 Oct 2023 21:03:16 +0000 (UTC) Received: from localhost (unknown [83.185.242.126]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 63339E36AD; Mon, 9 Oct 2023 21:03:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=bokr.com; s=easymail; t=1696885396; bh=n0wxnTiY0KYh3zo2pooCTNlA5MO/GqZkqpFGb8i6Pbo=; h=From:Date:To:Cc:Subject:Reply-To:References:In-Reply-To:From; b=W3fNh1w50icmghIzgokj5HYDJ1mjs9MPTQ8pC9kLPPF2B3JTUQmoKZMF89Joo6ovH y+jv9OkV69oFEp8yMSBlFOi7jYOtTVFYSXkrDcJf7Mx1YF6LCJJOeCKdMTfrzKmIR1 5DloJniSKdRrXEe0B5KZRaqVmxj8bhqjaBOMGBio4/7Qlllp1Am8HQ4p62Ks9t1Eva GeWsd0T8t5T2i8/4YBddQx4mGYqjBSlMq8ANmkvM37UOIxVd+lpcqhJW9cEqUpXt3P Alj7TgcSfotKh8xJjLIZQyrdlwnGrzbsnrbsJgpzSn3YxlFrL1qkm4+sHZOkEoPrVq bADWvRrg00Xzw== From: bokr@bokr.com Date: Mon, 9 Oct 2023 23:03:00 +0200 To: Liliana Marie Prikler Subject: Re: bug#65924: git searches coreutils and util-linux commands in PATH Message-ID: <20231009210300.GA32650@LionPure> References: <9f9ecf37a04d6a3d788d247d8fb46f7bd6fabad5.1696734901.git.maxim.cournoyer@gmail.com> <442bb34f6ba81b7134c6cbf06d0045debc42bf68.camel@gmail.com> <87il7fdggi.fsf_-_@gmail.com> <1a219a891192b526d3e28fea8ce350c0fd5e3b53.camel@gmail.com> <87pm1nac8d.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: bokr@bokr.com Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, On +2023-10-09 20:33:38 +0200, Liliana Marie Prikler wrote: > Am Montag, dem 09.10.2023 um 14:21 -0400 schrieb Maxim Cournoyer: > > Hello, > > > > Liliana Marie Prikler writes: > > > > > [...] > > > If you need me to reduce it to four letters, yes, LGTM. > > > > Explicit is better than implicit.  I've been thinking to document > > this in our contributing section; e.g. a reviewed commit must have > > the 'LGTM' from the reviewer.  If a series is LGTM, it needs to be > > implicitly mentioned with 'this series LGTM'.  That may sound silly, > > but I think it'd simplify reviewer/submitters interactions. > s/implicitly/explicitly/? > > I don't necessarily agree, but it's not a hard disagree either. I'll > try to keep that in mind at least when reviewing your patches to not > cause confusion. > > Cheers > TL;DR: Would it make sense to anticipate that LLM-bots will be used to automate gathering of info for reviewers? If so, what would a style guide for english in posts (like a coding style guide, but for LLM-bot consumption) look like? Some kind of literate programming for LLM-bot and human use? (I assume experiments have been going on by now, though perhaps not yet for guile or guix) -- Regards, Bengt Richter From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 10 00:29:05 2023 Received: (at 65924) by debbugs.gnu.org; 10 Oct 2023 04:29:05 +0000 Received: from localhost ([127.0.0.1]:33779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qq4Mj-0003Iy-5P for submit@debbugs.gnu.org; Tue, 10 Oct 2023 00:29:05 -0400 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]:46526) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qq4Me-0003IR-BB for 65924@debbugs.gnu.org; Tue, 10 Oct 2023 00:29:03 -0400 Received: by mail-ed1-x542.google.com with SMTP id 4fb4d7f45d1cf-53636f98538so8978355a12.1 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 21:28:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696912113; x=1697516913; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=LhQ1rbrRUUjr2I/YGNCat9N3ktETnU9v0zkuJ/Hqe48=; b=T2p6nQzfcMkKYsYticO5Y3ekELJ1C6pjrTdxGZMpAYtKyimtNByXhafo3l57WTNAx3 HOmg/O0ydC+eDw2UrnAhVeSPdrQGl3Fvy8TBWLhblKs6zYI7mtVdC+KQOF9XI2navkQZ copphpPR4+neTtNwB+10UGz4BDKbauZCBdsyMyB1TRr5xPt4aouOlAeI7pDG7MHGOHm9 tpXyfzKdAayrGTWmPYrYppmjax6E6uvKoSMtjzLX0pbTnSdP8pzAuhKarytPUMWgkoZl uUwCOtSc5tIEPSIW4vomgGHcWaibZOZ6bdeemc3Zil/v5XRN/xWKHV9JsmfgUi2HteWw /fUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696912113; x=1697516913; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=LhQ1rbrRUUjr2I/YGNCat9N3ktETnU9v0zkuJ/Hqe48=; b=tXLmANUa+EocjfPdvYNaNjAJxGF52lckq/y5WngmeZ4/HUg1fPqfOuUX9qUiraxoTy Paw1V3dpQCNKOtR2tJvgC/KOT/tKTqMnhNGqLuEwkfJDCMqU7+0NRnb/h9hOre1O8R8r B5dMRdROQjFyJDxrimeYkqoRrV8xniyUJuJWkfJLwErysSq3awH7odDXatDzUSwTs0aw r9Vy+oiy6p+4Y1n2odd+MvlXImTuHJwOUUb+uqDzi49m/MVqGWMHt7USe/hA+HkyVqxb rJ8TkzESuj4XpSTSnecYvxJXm8/tl2hNPwWFzF2GfyfEVh8o2FPvC1+PxW/KCvypGnjE tgHA== X-Gm-Message-State: AOJu0YxrrK2fUl+0iYxBY9pSmODlBCtm6eR9gXBMqyeByO+7GJ8HLnfs cTDP5bwlZJEVJIDhfOpAJbBOBQ/Hsv0CNQ== X-Google-Smtp-Source: AGHT+IGLbD0a6FrGj15VWqxEUQehd5TfQ3+phGENZ1IZgKfFdfy4E3mbTM54XmTQqvpcljdA3kOYPA== X-Received: by 2002:a17:906:3050:b0:9b2:982e:339a with SMTP id d16-20020a170906305000b009b2982e339amr16304193ejd.22.1696912113331; Mon, 09 Oct 2023 21:28:33 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id n24-20020a170906089800b009929d998abcsm7701134eje.209.2023.10.09.21.28.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 21:28:32 -0700 (PDT) Message-ID: <76c92ec74974032bd293427e0d3d879535cfbdcc.camel@gmail.com> Subject: Re: bug#65924: git searches coreutils and util-linux commands in PATH From: Liliana Marie Prikler To: bokr@bokr.com Date: Tue, 10 Oct 2023 06:28:31 +0200 In-Reply-To: <20231009210300.GA32650@LionPure> References: <9f9ecf37a04d6a3d788d247d8fb46f7bd6fabad5.1696734901.git.maxim.cournoyer@gmail.com> <442bb34f6ba81b7134c6cbf06d0045debc42bf68.camel@gmail.com> <87il7fdggi.fsf_-_@gmail.com> <1a219a891192b526d3e28fea8ce350c0fd5e3b53.camel@gmail.com> <87pm1nac8d.fsf@gmail.com> <20231009210300.GA32650@LionPure> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org, Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Montag, dem 09.10.2023 um 23:03 +0200 schrieb bokr@bokr.com: > Hi, >=20 > On +2023-10-09 20:33:38 +0200, Liliana Marie Prikler wrote: > > I don't necessarily agree, but it's not a hard disagree either.=C2=A0 > > I'll try to keep that in mind at least when reviewing your patches > > to not cause confusion. > >=20 > > Cheers > >=20 >=20 > TL;DR: Would it make sense to anticipate that LLM-bots will be used > to automate gathering of info for reviewers? >=20 > If so, what would a style guide for english in posts (like > a coding style guide, but for LLM-bot consumption) look like? > Some kind of literate programming for LLM-bot and human use? Let's not rely on large language models. If we are going to automate this, it ought to be through interpretable, "rule-based" systems.=20 Like, imagine that on top of telling debbugs to close a bug etc., you could tell debbugs (or some other tool) that some patch or a series looks good to you. We could then add an interface to allow filtering for "looks good" series for quick patch application, the rationale being that committers have to do less or no review of their own as they commit to a patch or series.* Cheers * They should still check that the series actually looks good to enough folks. From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 14 12:51:59 2023 Received: (at 65924) by debbugs.gnu.org; 14 Oct 2023 16:51:59 +0000 Received: from localhost ([127.0.0.1]:50292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrhrr-00023e-8I for submit@debbugs.gnu.org; Sat, 14 Oct 2023 12:51:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrhrn-00023Q-VK for 65924@debbugs.gnu.org; Sat, 14 Oct 2023 12:51:57 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qrhrK-0001Wu-RD; Sat, 14 Oct 2023 12:51:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=Q1ZscFn60307CHCPPrMbxgJAY6xo36CES+/Odz3pxjI=; b=YQCdLWSxya8Jn2nmUOLH htmSfTCwJ6ZIF6SVpBjxwlmv14dTF9KoCQ1b1MQih5QO8y3+sWnwj6qfd/sNmH7OAsJD43XT3dgCV Ff14WQ1xhFKC1u096JvDfWVExfYVNEZaUCCgovHCVhV8RZHqlkxoQjNL4GIS/O2Ah/E7ZansUKGHo SI+VVm+adMTNlFs9LmLfXzcPehueDNhla05oqu6o3P5VCZpXHMQ14bXNSWKzu1ES6RPrYg1no1lM3 L6x66+RtGnrfgGaQ1sS6x6J/vJRnhjE0yM57WTVBYsR6AfX1MK9rL6xwfJEPGD5UlrwDdpuJqQiW5 o3QqxsmhKF7KCQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Maxim Cournoyer Subject: Re: bug#65924: [PATCH core-updates 1/3] gnu: git: Remove labels and use gexps. In-Reply-To: <1090d01a7ba277090c84cf66bc7bfaf22521f0e3.1696734901.git.maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Sat, 7 Oct 2023 23:18:49 -0400") References: <1090d01a7ba277090c84cf66bc7bfaf22521f0e3.1696734901.git.maxim.cournoyer@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Tridi 23 =?utf-8?Q?Vend=C3=A9miaire?= an 232 de la =?utf-8?Q?R=C3=A9volution=2C?= jour du Navet X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sat, 14 Oct 2023 18:51:24 +0200 Message-ID: <871qdxf8qb.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org, Simon Tournier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi! Maxim Cournoyer skribis: > * gnu/packages/version-control.scm (git) > [native-inputs, inputs]: Remove labels. > [arguments]: Use gexps. Use gexp variables input searching procedures wh= ere > it makes sense. [...] > + ;; Tell 'git-send-email' where perl modules are. > + (wrap-program git-se* > + `("PERL5LIB" ":" prefix > + ,(search-path-as-list > + '("lib/perl5/site_perl") > + '#$(delete-duplicates > + (append-map > + (compose last package-transitive-propagated-i= nputs) > + (list (this-package-input "perl-authen-sasl") > + (this-package-input "perl-net-smtp-ssl") > + (this-package-input "perl-io-socket-ssl= "))))))) > + ;; Tell 'gitweb.cgi' where perl modules are. > + (wrap-program (string-append out "/share/gitweb/gitweb.c= gi") > + `("PERL5LIB" ":" prefix > + ,(search-path-as-list > + '("lib/perl5/site_perl") > + '#$(delete-duplicates > + (append-map > + (compose last package-transitive-propagated-i= nputs) > + (list (this-package-input "perl-cgi"))))))) I wonder if this could be simplified, but I don=E2=80=99t have a good idea. Otherwise LGTM! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 14 12:54:37 2023 Received: (at 65924) by debbugs.gnu.org; 14 Oct 2023 16:54:37 +0000 Received: from localhost ([127.0.0.1]:50297 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrhuO-00027f-PQ for submit@debbugs.gnu.org; Sat, 14 Oct 2023 12:54:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrhuN-00027T-6R for 65924@debbugs.gnu.org; Sat, 14 Oct 2023 12:54:35 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qrhtu-0001v0-6R; Sat, 14 Oct 2023 12:54:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=Bcn9T0dBNBCAaiEW4ZkINr9+qY5S5iykWFG/X5XBA1I=; b=Ng8N4HKYdxqjsFBkFZEz vhehGtM1c2Tf5Mm3KvwL/K4uoq/1knCkBoc0UW82KPWrZoIIeUeSSZzSNUvtS8ann4l4ciEkXHYrO GADq457iR5A1Qo9HC4VOUln0YhKH5z0KK1Wi6RoJOvFFhSo+WpdKYQu9wbRZ0S54AAXM9D5qbCSlb cJWI34bNPDPwVMewyPCpt3DFUUKQWa53EbbVVWmO4Jwh/iu1oZIZgQTs471+BT+gq6O/bL3BXXgA7 iMIkdfQrgOBqTylCKZY8Zu1mhCP6EoXyQ5A3A9VB/ygJRp0MQxkvSWcXPaD7SGQ8b/aXTmGoFiqay B7MihxR8If0KjQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Maxim Cournoyer Subject: Re: bug#65924: [PATCH core-updates 2/3] gnu: git: Invert inheritance relationship. In-Reply-To: <9f9ecf37a04d6a3d788d247d8fb46f7bd6fabad5.1696734901.git.maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Sat, 7 Oct 2023 23:18:50 -0400") References: <9f9ecf37a04d6a3d788d247d8fb46f7bd6fabad5.1696734901.git.maxim.cournoyer@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Tridi 23 =?utf-8?Q?Vend=C3=A9miaire?= an 232 de la =?utf-8?Q?R=C3=A9volution=2C?= jour du Navet X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sat, 14 Oct 2023 18:54:04 +0200 Message-ID: <87wmvpdu1f.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org, Simon Tournier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Maxim Cournoyer skribis: > It's simpler to add features on top of a minimal variant than to remove them, > and helps avoiding mistakenly changing git-minimal, which has many dependents. > > * gnu/packages/version-control.scm (git-minimal): Move above git and severe > inheritance. Remove input label. Repatriate most fields from... > (git): ... here. Define as package/inherit to inherit from git-minimal. > Extend minimal values instead of overriding them whole. LGTM! Ludo'. From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 14 13:01:37 2023 Received: (at 65924) by debbugs.gnu.org; 14 Oct 2023 17:01:37 +0000 Received: from localhost ([127.0.0.1]:50310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qri1A-0002Nw-JW for submit@debbugs.gnu.org; Sat, 14 Oct 2023 13:01:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48814) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qri18-0002Nh-2g for 65924@debbugs.gnu.org; Sat, 14 Oct 2023 13:01:35 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qri0e-0003i2-VC; Sat, 14 Oct 2023 13:01:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=3EDotjpd1hyvaaO5KFlBLMQjcW+dYmxvqMSOMmZZc1w=; b=cErNDrtkXd9InJPzn1+i z4ltzcQV1+m7AlvR7ZpBJ+jkGlxuLp7YqO4yWanTPMPp8qZbtGe1EUwiAkRJp9ey0wmF2dLmXcKXb XjxAEaRA0z9X6tDFmSggmFsQHu6lj/SvOr9vAY31msZKhA0zrjNjc7IHS2DTAPcePwK89aKODG0jA RZnmH+BVwij6ZCmhPZ4VBAy/VpENFGX+l0ucfnFa4H6YINYEJAW9MWMYtEZ9qA+rZziCC4gD9rV9w L8mbFfhyR431VkDs3791sKxfI4G5amyfRotTEtUY7VQpJ60OTNiTDee3y0vFsrqLTjEiuw+f6sptB hD36fEIoVU5Uyw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Maxim Cournoyer Subject: Re: bug#65924: [PATCH core-updates 3/3] gnu: git-minimal: Add coreutils and sed to PATH. In-Reply-To: <9e15a3ab5f8d4f44b834e1fc90464312c60fac9e.1696734901.git.maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Sat, 7 Oct 2023 23:18:51 -0400") References: <9e15a3ab5f8d4f44b834e1fc90464312c60fac9e.1696734901.git.maxim.cournoyer@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Tridi 23 =?utf-8?Q?Vend=C3=A9miaire?= an 232 de la =?utf-8?Q?R=C3=A9volution=2C?= jour du Navet X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sat, 14 Oct 2023 19:01:02 +0200 Message-ID: <87r0lxdtpt.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org, Simon Tournier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Maxim Cournoyer skribis: > Fixes . > > * gnu/packages/version-control.scm (git-minimal) > [arguments] : New field. > : Augment with (ice-9 match), (ice-9 textual-ports) and (guix > search-paths). > : Add patch-commands phase. > [inputs]: Add coreutils-minimal and sed. [...] > + #:imported-modules `(,@%gnu-build-system-modules > + ,@(source-module-closure '((guix search-paths= )))) I think we should avoid the dependency on (guix search-paths) here, to avoid situation such as that described in . > + (add-after 'unpack 'patch-commands > + (lambda* (#:key inputs #:allow-other-keys) > + (define (prepend-string-to-file text file) > + "Prepend TEXT to FILE." Nitpick: no need to add a docstring to internal defines because it=E2=80=99s optimized out and inaccessible (you can use a comment instead). > + (let ((content (call-with-input-file file > + (cut get-string-all <>)))) > + (call-with-output-file file > + (lambda (port) > + (display text port) > + (display content port))))) > + > + (define PATH-variable-definition > + (let ((value > + (match (evaluate-search-paths > + (list $PATH) > + (list #$(this-package-input "coreutils-mi= nimal") > + #$(this-package-input "sed"))) > + (((spec . value)) > + value)))) > + (string-append > + (search-path-definition $PATH value > + #:kind 'prefix) "\n\n"))) > + > + ;; Ensure that coreutils (for basename) and sed are on PATH > + ;; for any script that sources the 'git-sh-setup.sh' file. > + (prepend-string-to-file PATH-variable-definition > + "git-sh-setup.sh") How about something along these lines instead: ;; Instead PATH definition at the top of the file. (substitute* "git-sh-setup.sh" (("^unset CDPATH" all) (string-append "PATH=3D" (dirname (search-input-file inputs "bin/basen= ame")) ":$PATH\nexport PATH\n" all))) ? Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 15 15:56:10 2023 Received: (at 65924) by debbugs.gnu.org; 15 Oct 2023 19:56:10 +0000 Received: from localhost ([127.0.0.1]:54156 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qs7Dd-0002l5-QO for submit@debbugs.gnu.org; Sun, 15 Oct 2023 15:56:10 -0400 Received: from mail-qv1-xf34.google.com ([2607:f8b0:4864:20::f34]:61898) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qs7Db-0002kr-CG for 65924@debbugs.gnu.org; Sun, 15 Oct 2023 15:56:08 -0400 Received: by mail-qv1-xf34.google.com with SMTP id 6a1803df08f44-66d134a019cso25513896d6.3 for <65924@debbugs.gnu.org>; Sun, 15 Oct 2023 12:55:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697399737; x=1698004537; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CK7dOi5ELZzvxAiwzP/wRMdB+DnLv8epETJS6DEaOzY=; b=KjJgz1nubP7AUbb3ATymS6ZZg9zQZ3JRdQBzGDljeZOah1QoICKqAhQD0X/A4YQ9jb qR/9gDFOrNMe8kkA93GktkIaRA2ccs3fyuvCFtb020IiNvEcZGxtP0pm++2KOWyAhbar Wtcu0A0KAymLtuidq1cgEaKjfUU1kV4jV2D9wz/yB48gH3QbgTRDW64yzGj1pem60uWC 7gH7gOO0IqTd9oT7VFth3hHB14yOtZSgxsaLZHk+wxTNWUl3aHKA4f86pFlzk3bJW3V7 K9Z94HDGcp/E23eeG0ObFbqrF7uoeMZrEI5LNiMUSbszitGaQF0P71BzqZ/+jo4MDfcu xlig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697399737; x=1698004537; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=CK7dOi5ELZzvxAiwzP/wRMdB+DnLv8epETJS6DEaOzY=; b=hXLRRSt+4ZUT+JCDYASCZGl5hLCm8rZU4y2kfq00AInHKRpnWGKRl8gde1yKV/ys7i gGwg5zx8izPR1asHH8/BD0jBEYbYVNsExyHkmmLs4f0HOC8vh0yexxw4Ig4a5WqBymwS Atq+dqFXmkhk2+EO66Vtj/J4659nea+HscqkdVZQssX1mQ+DBetXHZi4vI7/DyZLNWcn K8SOV4xiWjXL8AY8s1Nfq2yve9KZ4HRusYQRgMZRXsHoT5mr6KKFgE65QTpSMXt86WUK dbJTz5UdOjpMw6q/pQHYqBaQUdfyR92eUb8nQH3F4c3jMavjGGZ3c6IDimQopqCC+ur2 mhuw== X-Gm-Message-State: AOJu0YwiZ6oqvJvObL/MIFHYFbjkytbAqbvjaXJ/vTzl+0XGz1Uf/fJS i+6qrFaOLSFdUifD+F7BOTuCx4vLR90= X-Google-Smtp-Source: AGHT+IHDnGmCpUqSTAjJiz75tWAC9QS5T96jKxFo8uyYYkUX12JXTJr6ThGQfDtnYVpVaZUUamOP7g== X-Received: by 2002:a0c:d802:0:b0:655:d9b1:7980 with SMTP id h2-20020a0cd802000000b00655d9b17980mr31008860qvj.62.1697399737488; Sun, 15 Oct 2023 12:55:37 -0700 (PDT) Received: from hurd (dsl-10-149-74.b2b2c.ca. [72.10.149.74]) by smtp.gmail.com with ESMTPSA id d9-20020a0cea89000000b00656506a1881sm2802121qvp.74.2023.10.15.12.55.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Oct 2023 12:55:37 -0700 (PDT) From: Maxim Cournoyer To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#65924: [PATCH core-updates 1/3] gnu: git: Remove labels and use gexps. In-Reply-To: <871qdxf8qb.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Sat, 14 Oct 2023 18:51:24 +0200") References: <1090d01a7ba277090c84cf66bc7bfaf22521f0e3.1696734901.git.maxim.cournoyer@gmail.com> <871qdxf8qb.fsf@gnu.org> Date: Sun, 15 Oct 2023 15:55:35 -0400 Message-ID: <874jir1wzs.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org, Simon Tournier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Ludovic, Ludovic Court=C3=A8s writes: > Hi! > > Maxim Cournoyer skribis: > >> * gnu/packages/version-control.scm (git) >> [native-inputs, inputs]: Remove labels. >> [arguments]: Use gexps. Use gexp variables input searching procedures w= here >> it makes sense. > > [...] > >> + ;; Tell 'git-send-email' where perl modules are. >> + (wrap-program git-se* >> + `("PERL5LIB" ":" prefix >> + ,(search-path-as-list >> + '("lib/perl5/site_perl") >> + '#$(delete-duplicates >> + (append-map >> + (compose last package-transitive-propagated-= inputs) >> + (list (this-package-input "perl-authen-sasl") >> + (this-package-input "perl-net-smtp-ssl= ") >> + (this-package-input "perl-io-socket-ss= l"))))))) >> + ;; Tell 'gitweb.cgi' where perl modules are. >> + (wrap-program (string-append out "/share/gitweb/gitweb.= cgi") >> + `("PERL5LIB" ":" prefix >> + ,(search-path-as-list >> + '("lib/perl5/site_perl") >> + '#$(delete-duplicates >> + (append-map >> + (compose last package-transitive-propagated-= inputs) >> + (list (this-package-input "perl-cgi"))))))) > > I wonder if this could be simplified, but I don=E2=80=99t have a good ide= a. > > Otherwise LGTM! Thanks; this was merged some days ago to core-updates. We can still refine it though. From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 15 16:04:26 2023 Received: (at 65924) by debbugs.gnu.org; 15 Oct 2023 20:04:26 +0000 Received: from localhost ([127.0.0.1]:54173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qs7Le-0005YL-3o for submit@debbugs.gnu.org; Sun, 15 Oct 2023 16:04:26 -0400 Received: from mail-yb1-xb32.google.com ([2607:f8b0:4864:20::b32]:55776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qs7Lb-0005Y5-NA for 65924@debbugs.gnu.org; Sun, 15 Oct 2023 16:04:24 -0400 Received: by mail-yb1-xb32.google.com with SMTP id 3f1490d57ef6-d8a000f6a51so4227308276.3 for <65924@debbugs.gnu.org>; Sun, 15 Oct 2023 13:03:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697400233; x=1698005033; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ckGfdlpyIdzQMQqSZ2ioTPd5RaS0NJ2l+zjvZ1Ibzgs=; b=hMEWwFK/ScWyrzWehEjMZf4IstAo08Wy0z1spscrMD8lXiBmJUz7kCUVMK6HY+E0DU tzIenmrUC1HtPXmcFtqhqukaAz45ZnyLrLls9e/B35qsGVj0pjGXo4n+CLt+wajfnOHv iwVHyN44SBcrkslIf9ngNIV4W6dnQSjX1gAIcE26F2yAnfIeZfXNmT27JFKctZtxecLF 6p7qs07+qD9tyVQOcVlQWVWThutup2UqOFGKv+Cy27MVc6nJTyT43vdTAewCR6t58XB9 9wPTaWHkggBjUme5UUPTLxkqgZj7vffe0ZjoE91r3WPyO866vtBP1ckcUYWmAvZy9MJJ u00w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697400233; x=1698005033; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ckGfdlpyIdzQMQqSZ2ioTPd5RaS0NJ2l+zjvZ1Ibzgs=; b=OcGrgVLYUQTX2kitzRhuc6EqhEYLPNCmQ4pdCgoM+3lQZRBm/S4Aog3kpjM0b00fu2 TLqhXZqA0af8fsJpvfB1+WXh781x31lQUtfbApenu2PNdWYsa9JBhybFqBSApXSH9yDF caKhU+nvCC51yJNKtjGYjXHlyj8R8THRG+EakQ64U4RXW+YguDCClET6NgZEik4Rlm1y 9ds31HcVUuY9QBYeXq0Yk9Zr2rLgnJLWMgqJDAUW3jwMX8k70hlqGghBrfRdPSLJ3mmU sPIfr9QOBNOamtqUC1oJtIMY3uMkTvOWf/C2xFYaSKlv1WatkQanc8m4uZpr1N8knFHb 7BPQ== X-Gm-Message-State: AOJu0YwVr4VOAI7llDBlqdic2B9nzpyKcNNji+H5ObY7TXrQxzmQYF91 r0g1CnApGKldjKZDgiAoJI4= X-Google-Smtp-Source: AGHT+IF34SBgZIm1PC0zfz5ltHWu0zkfHq7XC0YimrWS81bUmnJxtQHN/UUubA78XAsjz0Ye25/5YQ== X-Received: by 2002:a25:dc12:0:b0:d9a:c946:c18a with SMTP id y18-20020a25dc12000000b00d9ac946c18amr9104903ybe.28.1697400233595; Sun, 15 Oct 2023 13:03:53 -0700 (PDT) Received: from hurd (dsl-10-149-74.b2b2c.ca. [72.10.149.74]) by smtp.gmail.com with ESMTPSA id dr20-20020a05621408f400b006590d020260sm2814628qvb.98.2023.10.15.13.03.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Oct 2023 13:03:53 -0700 (PDT) From: Maxim Cournoyer To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#65924: [PATCH core-updates 3/3] gnu: git-minimal: Add coreutils and sed to PATH. In-Reply-To: <87r0lxdtpt.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Sat, 14 Oct 2023 19:01:02 +0200") References: <9e15a3ab5f8d4f44b834e1fc90464312c60fac9e.1696734901.git.maxim.cournoyer@gmail.com> <87r0lxdtpt.fsf@gnu.org> Date: Sun, 15 Oct 2023 16:03:51 -0400 Message-ID: <87zg0jzm8o.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org, Simon Tournier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Ludovic, Ludovic Court=C3=A8s writes: > Maxim Cournoyer skribis: > >> Fixes . >> >> * gnu/packages/version-control.scm (git-minimal) >> [arguments] : New field. >> : Augment with (ice-9 match), (ice-9 textual-ports) and (guix >> search-paths). >> : Add patch-commands phase. >> [inputs]: Add coreutils-minimal and sed. > > [...] > >> + #:imported-modules `(,@%gnu-build-system-modules >> + ,@(source-module-closure '((guix search-path= s)))) > > I think we should avoid the dependency on (guix search-paths) here, to > avoid situation such as that described in > . OK, I can see how that could be annoying, especially since (guix search-paths) will see frequent new search paths additions. I think the best course to avoid a repeat may be to document that only modules part of the (guix build ...) prefix should be used on the build side, with the list of exception modules, if there are any; what do you think? >> + (add-after 'unpack 'patch-commands >> + (lambda* (#:key inputs #:allow-other-keys) >> + (define (prepend-string-to-file text file) >> + "Prepend TEXT to FILE." > > Nitpick: no need to add a docstring to internal defines because it=E2=80= =99s > optimized out and inaccessible (you can use a comment instead). I think I did so here in case it's ever moved to (guix build utils) or the likes; it seems a useful procedure to have around. Thanks for the bit of knowledge! >> + (let ((content (call-with-input-file file >> + (cut get-string-all <>)))) >> + (call-with-output-file file >> + (lambda (port) >> + (display text port) >> + (display content port))))) >> + >> + (define PATH-variable-definition >> + (let ((value >> + (match (evaluate-search-paths >> + (list $PATH) >> + (list #$(this-package-input "coreutils-m= inimal") >> + #$(this-package-input "sed"))) >> + (((spec . value)) >> + value)))) >> + (string-append >> + (search-path-definition $PATH value >> + #:kind 'prefix) "\n\n"))) >> + >> + ;; Ensure that coreutils (for basename) and sed are on PA= TH >> + ;; for any script that sources the 'git-sh-setup.sh' file. >> + (prepend-string-to-file PATH-variable-definition >> + "git-sh-setup.sh") > > How about something along these lines instead: > > ;; Instead PATH definition at the top of the file. > (substitute* "git-sh-setup.sh" > (("^unset CDPATH" all) > (string-append "PATH=3D" (dirname (search-input-file inputs "bin/bas= ename")) > ":$PATH\nexport PATH\n" all))) I'd like to preserve prepending the shell expression to the beginning of the file, as substitute* doesn't error when it doesn't match anything, which could lead to silent breakage in the future (if that 'unset CDPATH' line is ever moved/deleted). The rest looks good, except we'd have to add sed to the PATH as well. I can send a new patch to that effect. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 17 11:15:59 2023 Received: (at 65924) by debbugs.gnu.org; 17 Oct 2023 15:15:59 +0000 Received: from localhost ([127.0.0.1]:60840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qslna-0004KY-PJ for submit@debbugs.gnu.org; Tue, 17 Oct 2023 11:15:59 -0400 Received: from mail-qk1-x733.google.com ([2607:f8b0:4864:20::733]:46560) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qslnX-0004KG-41 for 65924@debbugs.gnu.org; Tue, 17 Oct 2023 11:15:57 -0400 Received: by mail-qk1-x733.google.com with SMTP id af79cd13be357-7781bc3783fso48014985a.1 for <65924@debbugs.gnu.org>; Tue, 17 Oct 2023 08:15:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697555724; x=1698160524; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mB1qKttpSOcYnWDLxVfmdqAJkfbFBqfe5U2ShI8xYGc=; b=Kt4u2rs3aocKuxpbx6M+N+9O6CcWyPcf+kJCDVgwo/DDaoi2BiDkZ6UKrfZl0/lWB5 1sajyZsPbcXHWtUhASMV9CkQiFhGEsdl1qP/nITg9T+QWrI/XKzrex3uSqD5Yvzq677l m1hUGTMZoiTEMDYDyEX08jtOptZ7tprv1twVdcpnR6dgli5/nZz0ZTvOfSgLv/NFinm5 ocigjgsssiFLSZBF2t3TXOTsIQ7hX4+8dVg2+HQyUybsgmUbtUnap3uQ0JrJnlRCXQUE tDEru3Ng/8N9I1q2DJg0s7rSAoddPKEeIlzbYmZRfJ9GzvOK64Z2OtsfP3RwgjEf6wSI yAyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697555724; x=1698160524; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=mB1qKttpSOcYnWDLxVfmdqAJkfbFBqfe5U2ShI8xYGc=; b=c1G35NV/DtrN3GReRHbIISLn00K1qMFXj8vRpbJLg90MXxKWfwldldAnJ41FcKdLvx uW/xNgD0YEvL/Vn+OC5l9j5Gx3xppAblldbhafhXjl9DAZV4+xbkxUBb+dILu/fugrJQ XsySztOKgOqBlvQWWP1TxM3JhOLfPoOV03ixZq0L8YGXkKPxgQLm4n1Qx1iI1fTKWRUD pVkh1ecL5ygCF4+34tuqd+mWlM7nQdfJ/SIaZk/o5lmW4v6DraSsNpF6xn2bh0O6hO8f alxI17al7yz7sWfT51hlqJ3ZmDMMfEmvgnk+TJBJI+6K6/1PsGjpztP+l7S7jsQbV/mi 1KQQ== X-Gm-Message-State: AOJu0YwZFSuVt+zdt9IR7NTAOoRl1tQAjGdNjSllHPXDwndnY1C4OTWb ux3U6DNQXTkDG/zSlJAgkqk= X-Google-Smtp-Source: AGHT+IFqSTeFV3v28Q1VXHdq+G904CMAMgHBXIHld5SAmZXaKzZS+aBD8BIceE6JX8Hos6vXqso7+A== X-Received: by 2002:a05:620a:3994:b0:76e:faf1:5e2c with SMTP id ro20-20020a05620a399400b0076efaf15e2cmr2375603qkn.45.1697555724005; Tue, 17 Oct 2023 08:15:24 -0700 (PDT) Received: from hurd (dsl-155-177.b2b2c.ca. [66.158.155.177]) by smtp.gmail.com with ESMTPSA id bk40-20020a05620a1a2800b0076cc4610d0asm727956qkb.85.2023.10.17.08.15.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 08:15:23 -0700 (PDT) From: Maxim Cournoyer To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#65924: [PATCH core-updates 3/3] gnu: git-minimal: Add coreutils and sed to PATH. In-Reply-To: <87r0lxdtpt.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Sat, 14 Oct 2023 19:01:02 +0200") References: <9e15a3ab5f8d4f44b834e1fc90464312c60fac9e.1696734901.git.maxim.cournoyer@gmail.com> <87r0lxdtpt.fsf@gnu.org> Date: Tue, 17 Oct 2023 11:15:22 -0400 Message-ID: <877cnluvp1.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65924 Cc: 65924@debbugs.gnu.org, Simon Tournier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Ludovic, Ludovic Court=C3=A8s writes: > Maxim Cournoyer skribis: > >> Fixes . >> >> * gnu/packages/version-control.scm (git-minimal) >> [arguments] : New field. >> : Augment with (ice-9 match), (ice-9 textual-ports) and (guix >> search-paths). >> : Add patch-commands phase. >> [inputs]: Add coreutils-minimal and sed. > > [...] > >> + #:imported-modules `(,@%gnu-build-system-modules >> + ,@(source-module-closure '((guix search-path= s)))) > > I think we should avoid the dependency on (guix search-paths) here, to > avoid situation such as that described in > . [...] > How about something along these lines instead: > > ;; Instead PATH definition at the top of the file. > (substitute* "git-sh-setup.sh" > (("^unset CDPATH" all) > (string-append "PATH=3D" (dirname (search-input-file inputs "bin/bas= ename")) > ":$PATH\nexport PATH\n" all))) > I've done something along these lines with commit ab9a88e355165025f7b4719017c0a40264167b22. Also see bug#66585 for a small doc addition hopefully serving as a reminder to not go down that path again. --=20 Thanks, Maxim From unknown Fri Jun 20 07:09:42 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 16 Nov 2023 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator