From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id CNR/AwAG5GDo0QAAgWs5BA (envelope-from ) for ; Tue, 06 Jul 2021 09:28:00 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id OFq/Ov8F5GCAKQAAbx9fmQ (envelope-from ) for ; Tue, 06 Jul 2021 07:27:59 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 704CD1B3F0 for ; Tue, 6 Jul 2021 09:27:59 +0200 (CEST) Received: from localhost ([::1]:38440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0fUr-0005LY-1b for larch@yhetil.org; Tue, 06 Jul 2021 03:27:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0fR4-000600-OF for guix-patches@gnu.org; Tue, 06 Jul 2021 03:24:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35616) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0fR4-0006NF-Er for guix-patches@gnu.org; Tue, 06 Jul 2021 03:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m0fR4-0005KB-Cg for guix-patches@gnu.org; Tue, 06 Jul 2021 03:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49419] [PATCH 1/4] home-services: Add most essential home services Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Jul 2021 07:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49419 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos , 49419@debbugs.gnu.org Received: via spool by 49419-submit@debbugs.gnu.org id=B49419.162555620920419 (code B ref 49419); Tue, 06 Jul 2021 07:24:02 +0000 Received: (at 49419) by debbugs.gnu.org; 6 Jul 2021 07:23:29 +0000 Received: from localhost ([127.0.0.1]:47162 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0fQW-0005JH-Lg for submit@debbugs.gnu.org; Tue, 06 Jul 2021 03:23:28 -0400 Received: from mail-lf1-f44.google.com ([209.85.167.44]:33481) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0fQU-0005J1-21 for 49419@debbugs.gnu.org; Tue, 06 Jul 2021 03:23:26 -0400 Received: by mail-lf1-f44.google.com with SMTP id t17so36706809lfq.0 for <49419@debbugs.gnu.org>; Tue, 06 Jul 2021 00:23:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop-in.20150623.gappssmtp.com; s=20150623; h=from:to:subject:in-reply-to:references:date:message-id:mime-version; bh=7lUQP/fpEOKv5wVmwNGt1oRKRbD56nqF/IDoIFiqVp8=; b=ftP3bYWwppQ2zx8VL4cpzmBfkhGoLq20G1S3Wpj8dimiN8piu7OLvi4Dg+C3dWwFz+ WlHoGDhAk5Mkqx8uJVre/XeM8JBP37yim3DCeDJvuvAN8oysvhrXB2xq0jATQxTdiJGW bWApb7rSXJiZ0gq20g3HrpBu12MW2efZ+pycvZo5hBoH5nVUeedZXg9D11n7ebU4UMwr +gzb0WTW0z2M0fE/A2wz1bdIFglvm0X6JeUQLGkgSH89hk9LyLT/MfwxLlQlv5wE5FmW ZxKcJAf2dx2yEHCc7IbhxSDHW/nlW8OhtXZ1f9e3Z37ftD3a62a7s1cDZrUUehNymiSU g5og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:in-reply-to:references:date :message-id:mime-version; bh=7lUQP/fpEOKv5wVmwNGt1oRKRbD56nqF/IDoIFiqVp8=; b=SEfY7PJXk5dyRydqz3yy9RjA16ZCNPMNPnpendWg5EzZ8dWWOTuXXayIdaGEd59ddM R4dgcKZTDdaZepeSzAsLDNAEmh94lXXW7vWZGmF0sYYjZQedWcg1qOkNLBR/HMPMnUnb pPrra4QrAEhPu9av9czQKIkTjv1ywHKx1dBgzJ/RpH6jt9LMu+yp9Xj/H2pB8JNboeGS GrLnCFVcT+yDLlzmeRJwvCsk0fe2OWmH9wT/pG6G70WN6LvDn6TJzAIEpsWPKul3TMGK YfJpxa+k4f8P64FpifoTgCJlj9i4eUkBlaiBh4iXEOHBGgvqhupb2svJTkvNXImjra9d Hujw== X-Gm-Message-State: AOAM532qkTbm3mMHLAgEky7PYrjEqtdaWW2ZZjOqTFqqAe5IDQZIZc0k jfWI3nP7vNBE+tENUnMAbvsJnKtt6NtHbg== X-Google-Smtp-Source: ABdhPJyj45WrCT03llE9sGUxZAKTKxbswtuSQAx8muInqtypbnuTbcVKOKmeSmU6is6UyPS6Ent0TQ== X-Received: by 2002:ac2:43a9:: with SMTP id t9mr2742533lfl.568.1625556199657; Tue, 06 Jul 2021 00:23:19 -0700 (PDT) Received: from ixy ([109.252.117.164]) by smtp.gmail.com with ESMTPSA id b43sm1398208ljr.55.2021.07.06.00.23.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 00:23:18 -0700 (PDT) From: Andrew Tropin In-Reply-To: <9ee31c62aef0a42b15b48ece2c1d0fe765fdcc83.camel@telenet.be> References: <87y2akhiz1.fsf@trop.in> <87wnq4hivq.fsf@trop.in> <9ee31c62aef0a42b15b48ece2c1d0fe765fdcc83.camel@telenet.be> Date: Tue, 06 Jul 2021 10:23:15 +0300 Message-ID: <878s2jsy70.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1625556479; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=7lUQP/fpEOKv5wVmwNGt1oRKRbD56nqF/IDoIFiqVp8=; b=OIqu9GAa+gBK2UGA00HZ1OBQCCE30Rai4fdRFYvi76q9gx0Nd7fEz8z5mxRVk1A3Khhj8s G5JqoceoydC1cTBilNN0VwyGvc8vYt6hecJjI6KNr8nIGJ/pkHGoT8R/tWF6fQ8VlUrM/x dwv65nCKPcNzmn9o1c7KlsjI9NMdCsD03S6eYzVnVjZLAwCpoU1O7gjaDqTXqxXTomOwRy HqJhVn/Aytf/1ETn0yHVpeYoL/hTBNYaTf9cJne5O2qFs7HDesfXpVEsBLMs/gg82B9fw7 M6jGdZLfwRhDWF83/BvGq0hBAfOyezjLw0dVmPw+NOzxQJGirsTMkpX6Feaa5A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1625556479; a=rsa-sha256; cv=none; b=D88Cqi4wK2yTsPz6epDHAhIQY9H1Kj9+bNAUlxo8kzevgldoO97A20jMVtoy9XeoExyqxd S7Fcs1nqgOf2KjfUNicGg92OmcX3WNqRfiY1onpHhEsedp8M8zIIofvs51Xf77aIpRgy+R BtDLv6C5W6vIM3SB28PJRdD/VUuhvaK6+o/cjSCGXEqRRYwE/d1FZr9qhWipsko6dZwPhL mtw7cduN1R2LKVRxHRKEs3vx/xLq6SDdpHv4ag/lhr5vLPr2IlN4HKa0rjxDe22AfwRAV+ Iu7Gyc9LxUKwK28uzD4uqjZIP0Ldd7K29l212sgnzxEavodehYNHZxxYNr4pdw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop-in.20150623.gappssmtp.com header.s=20150623 header.b=ftP3bYWw; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -3.51 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop-in.20150623.gappssmtp.com header.s=20150623 header.b=ftP3bYWw; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 704CD1B3F0 X-Spam-Score: -3.51 X-Migadu-Scanner: scn0.migadu.com X-TUID: atbLUfAF1KeV --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Maxime Devos writes: > Hi, > > Andrew Tropin schreef op ma 05-07-2021 om 18:37 [+0300]: >> + (if (file-exists? (he-init-file new-home)) >> + (let* ((port ((@@ (ice-9 popen) open-input-pipe) >> + (format #f "source ~a && env" >> + (he-init-file new-home)))) >> + (result ((@@ (ice-9 rdelim) read-delimited) "" port)) >> + (vars (map (lambda (x) >> + (let ((si (string-index x #\=))) >> + (cons (string-take x si) >> + (string-drop x (1+ si))))) >> + ((@@ (srfi srfi-1) remove) >> + string-null? >> + (string-split result #\newline))))) > > Why are you using @@ here? 'open-input-pipe', 'read-delimited' and 'remove' > are exported variables, so you can just use @ instead of the magic evil @@ > operator. Addressed the issue with the following patch. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-toberebased-home-services-Use-instead-of.patch Content-Transfer-Encoding: quoted-printable Content-Description: patch changing @@ to @ From=2027998096bf5b4ccd1c66ef71c1280faf0e11be72 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Mon, 5 Jul 2021 19:22:40 +0300 Subject: [PATCH] (toberebased) home-services: Use @ instead of @@ =2D-- gnu/home-services.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/home-services.scm b/gnu/home-services.scm index a06cd72459..78e5603edf 100644 =2D-- a/gnu/home-services.scm +++ b/gnu/home-services.scm @@ -280,15 +280,15 @@ extended with one gexp."))) (readlink he-path) #f)))) (if (file-exists? (he-init-file new-home)) =2D (let* ((port ((@@ (ice-9 popen) open-input-pipe) + (let* ((port ((@ (ice-9 popen) open-input-pipe) (format #f "source ~a && env" (he-init-file new-home)))) =2D (result ((@@ (ice-9 rdelim) read-delimited) "" port)) + (result ((@ (ice-9 rdelim) read-delimited) "" port)) (vars (map (lambda (x) (let ((si (string-index x #\=3D))) (cons (string-take x si) (string-drop x (1+ si))))) =2D ((@@ (srfi srfi-1) remove) + ((@ (srfi srfi-1) remove) string-null? (string-split result #\newline))))) (close-port port) @@ -340,7 +340,7 @@ with one gexp, but many times, and all gexps must be id= empotent."))) (define (equal-regulars? file1 file2) "Check if FILE1 and FILE2 are bit for bit identical." (let* ((cmp-binary #$(file-append =2D (@@ (gnu packages base) diffutils) "/bin/c= mp")) + (@ (gnu packages base) diffutils) "/bin/cmp"= )) (status (system* cmp-binary file1 file2))) (=3D status 0))) =20 =2D-=20 2.32.0 --=-=-= Content-Type: text/plain I can use different methods to attach/prepare/send patches and reply to the reviews, sorry for any inconveniences in advance) I'll stick to some approach, once I'll practice a few of them. --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJDBAEBCgAtFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmDkBOMPHGFuZHJld0B0 cm9wLmluAAoJECII0glYwd6wgsAP/2YH58b0q9Rwo1pA5CpCUrbFL5YdMvnt+Xxg KMssxCwcFWAdXj8sDGULjlU/QzyErBuFaCscUJN0pQNL1Ku3/+9oDVyAKNei94UN YMY5fX3Fa54VyU2IMItSN7n+fQM0BqEX9h0qplB+4V/NdIy5LedDz7N4WtNMY9B3 DH+co6rkaWWvzUnrUQigHSVzKLmqs4WWo+joa04RVumdmqiGCHAteNSS9dzaq28I PKVFBj5uW6e9BCWaj5rFYYJJ901NbYQ1LrN0OaIemDfxg1fOB1vZigbQdPMJHLlc Qy3rvXGG1WewT+fN5x+QUx2TpPIzmZvOh/UBjkGbJvmrxlSotMG+Ewyq1422VXGa zAoK8H+Pbi5VycffCLp4suKq/1m6TpRM6TFYOc+Toz2tRKKwzgVTq1Ry9ygwsYTz a8Ow/Apk+wS97iTztjrET0119AQG3yHAp4lhXctfHN3g18mw9wekebJnbGjdGi8E in/S3bhenElchbIHoujOOr5SjYdUX1H7EJZbaWizsFJLJJn9wl/AHgazxzFYRzfA pv6bZzFigWPeD+9Io9wKpLu69cp0i+kmqNWDVUNspyrGrUZJueXLzjnLpiOmkK/W xtMhPAfzw3UKecsq7fSl+O7vgS0opWsFHSB/I6hARxCWZHpe5koy0DqOB75GfbrJ YKB45Xfx =5gVZ -----END PGP SIGNATURE----- --==-=-=--