From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id uGxMArVRBWKp+AAAgWs5BA (envelope-from ) for ; Thu, 10 Feb 2022 18:56:05 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UB9gOrRRBWIpwAAAauVa8A (envelope-from ) for ; Thu, 10 Feb 2022 18:56:04 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6ECF336D0C for ; Thu, 10 Feb 2022 18:56:04 +0100 (CET) Received: from localhost ([::1]:40268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIDfn-0004Xn-HB for larch@yhetil.org; Thu, 10 Feb 2022 12:56:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIBuT-0008Dn-7N for guix-patches@gnu.org; Thu, 10 Feb 2022 11:03:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34733) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIBuQ-0005lf-Iy for guix-patches@gnu.org; Thu, 10 Feb 2022 11:03:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIBuQ-0000wA-Gi for guix-patches@gnu.org; Thu, 10 Feb 2022 11:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53908] [PATCH] Cleanups for the ditaa pkg References: <87r18bk8y3.fsf@gmail.com> In-Reply-To: <87r18bk8y3.fsf@gmail.com> Resent-From: Frank Pursel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 16:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53908 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53908@debbugs.gnu.org Received: via spool by 53908-submit@debbugs.gnu.org id=B53908.16445089683571 (code B ref 53908); Thu, 10 Feb 2022 16:03:02 +0000 Received: (at 53908) by debbugs.gnu.org; 10 Feb 2022 16:02:48 +0000 Received: from localhost ([127.0.0.1]:56863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIBuC-0000vX-8v for submit@debbugs.gnu.org; Thu, 10 Feb 2022 11:02:48 -0500 Received: from mail-pj1-f44.google.com ([209.85.216.44]:55890) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIBuB-0000vG-7p for 53908@debbugs.gnu.org; Thu, 10 Feb 2022 11:02:47 -0500 Received: by mail-pj1-f44.google.com with SMTP id om7so5581024pjb.5 for <53908@debbugs.gnu.org>; Thu, 10 Feb 2022 08:02:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version; bh=uTZWXQYjPvMV3t2taBJUfuwdSHP5Jb+fGS7/IZBOhkg=; b=OCx1osV4HfbEBnwgzoV1e1vcVWMWYoZXlTQJsWsxA14YK8ySdtn4At2S+hiCmtEh/s l82uPz3uCFVEFHKxK4RWb1R34XW0qIN7K98rIi4XGCDgFLPHx2J+Ugx33iGrRUKlD4wM Z5t/kUPFOSS9ColZt7iURwUjGzYSEzJVcR59wqI7G4vlgZqtnLl3CS787zrLzuRRkvCu SwBn2ntSPX/eYOmM/3nLpA5/oudgi9aZh6EDvFobvg02RYFnUSlRPWHouY2Y+KqXSfON IBaiNJH4zaosakNY0KzCg9B0eACr1yO70Y2xRfK+CKXcX/oGHlPs2AmQVG2AN/6J7I3A 8I2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=uTZWXQYjPvMV3t2taBJUfuwdSHP5Jb+fGS7/IZBOhkg=; b=UEIYEkQmTaJhQwh1mjmfEt1gwkAolYLkIn/IzwTHC8MlTunoB/uBAXv6InsrL/jdQ8 zW4jhHu+4/nuliL/FzZ7mpN4FNKrF037uXHfAk8qwTwYt2/1BJquJevKd7tT4bsHGggY YhhThtPo1R0WpHUDf6G7EouSCCRiqdh3mNqE+ZILuZiNEHaub9G0fUGkpLJLfpOj5tBg z4bgfthBABxzpmvNp1jJpdypwe//lN6cs2BPhAB7yS78mv3QJ4FM5lOML5PATRImx7oR r/Vm9O2B78Zd9Ug181WH9P9fKDKMQ12cyipUs/bzo8ucJTJ1IRdPkiqHrbOreVDYDvir 1u/A== X-Gm-Message-State: AOAM530XHl7Bo3pCH0PAtDkxuxxOKR9SafkPOD15SB7+M6auqF2HYo1N hM5nURm9Ps521Uon2x1TBKRcj3QyFSk= X-Google-Smtp-Source: ABdhPJyFd0a+F6+Y/BvDzl/LZB6o2ObMlOtkHu2hncxvm+H1/072oufBVrbTUjov2WqtZJuF+oO/KA== X-Received: by 2002:a17:903:2348:: with SMTP id c8mr8285220plh.174.1644508961043; Thu, 10 Feb 2022 08:02:41 -0800 (PST) Received: from Ginko.local ([66.170.190.211]) by smtp.gmail.com with ESMTPSA id om1sm3075882pjb.55.2022.02.10.08.02.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Feb 2022 08:02:40 -0800 (PST) From: Frank Pursel Date: Thu, 10 Feb 2022 08:02:39 -0800 Message-ID: <87o83ek8v4.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1644515764; 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=uTZWXQYjPvMV3t2taBJUfuwdSHP5Jb+fGS7/IZBOhkg=; b=JqVcGDDX6OY1WeLGLnxZSMzBczCjsCC12wM23rT5jPO+zBmxn871colS6kLUgcX3TIbCjJ c7dyisOjeY8s4twBcfQ6BfuF1Ocw/B2pebse28kSFE8KpQfje8GTvQkqJdESsxxOfdcaQU cZry0+Pbj4xH0Kydu/ki4cHj17+11Yr5j2I4nrGD12FEBbC4yl4NlP5R5M8MqkFPF/Wzf+ WF3ppUB3k8gxBTOAOjIUcifySYI2RVlUOiFTICrCaBntHwNkTUw6NTwR1pYi7GR6sLgGnq FeDxoUvD2iEtMGLC58Ae/EA0aEdAwcd59gB+TFnp5aG8IsR7UshPOv3mbBvaCQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1644515764; a=rsa-sha256; cv=none; b=IVQGimX4H4Y1n0KP897dccyCgDdgjXWBvpSx2nK7nifuSFyFOJaLL5+XOuyxXL2xOae0Vn X5Co1YKmoOBBBZlK7TB41vll86dgBPl764LJ9H9tU7QFvmrkpA8sYfGB21dxYbPCQX8+6+ 9GM7Uj+19Qb0EZ54/p2vp3LlNkslxE1pvQbF5jCKgB/ApQKCo5KdvabCXYyQ2JiErX3CLN gamFrrL/Ts9ZAH8h7apZ5PSaAWg3Xnb1JEAIm9DwA8XbueNHc1quvHWYFXei7aIhHD+oTO wZbOmTQRKuo/mbBMXrwRvjTVkWueYI0FSWw9p9fMG882bGn5b6PQCzRpaA/kow== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=OCx1osV4; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.13 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=OCx1osV4; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 6ECF336D0C X-Spam-Score: -3.13 X-Migadu-Scanner: scn0.migadu.com X-TUID: UaRMORnCig8T Hi, After sleeping on my earlier submission I see things that I should've seen before. I love what guix style does, but not always: converting #o755 to decimal in a chmod seems counterproductive. I also removed some unhelpful comments and a pointless recursive copy that can only create needless questions. No practical change but it's a bit cleaner. Regards, Frank Please, too. Let me know if this is formatted optimally. This is an emacs production of "C-u, Esc ! cd ~/src/guix; git format-patch " appended to my waiting emacs message buffer. In this case I think it suffices but if a git merge were to be needed it might not be so. Hey! -- guix is genius. Thank you for making it so. >From 9e1050ef106e004c71d7b3c69e661e64ab0eaf03 Mon Sep 17 00:00:00 2001 Message-Id: <9e1050ef106e004c71d7b3c69e661e64ab0eaf03.1644508366.git.frank.pursel@gmail.com> From: Frank Pursel Date: Thu, 10 Feb 2022 07:28:20 -0800 Subject: [PATCH] Removed some unneeded comments and commands. Tweaked formatting. --- gnu/packages/graph.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 45dd83edb8..a763f02da8 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -658,8 +658,8 @@ (define-public python-graph-tool (license license:lgpl3+))) (define-public ditaa - (let* ((ver "0.11.0") (hash - "1y3g17wp1wvb05m56pp25avww2njpgh0gk0jsbsf25scj7hyyj26")) + (let* ((ver "0.11.0") + (hash "1y3g17wp1wvb05m56pp25avww2njpgh0gk0jsbsf25scj7hyyj26")) (package (name "ditaa") (version ver) @@ -693,9 +693,6 @@ (define-public ditaa (mkdir-p "lib") (copy-file batik-jar "./lib/batik.jar") (copy-file commons-cli-jar "./lib/commons-cli.jar")) - (copy-recursively "service/web/lib" "lib" - #:log - (current-output-port)) (with-directory-excursion "build" (substitute* "release.xml" (("source=\"1.6\"") "source=\"7\"") @@ -704,16 +701,13 @@ (define-public ditaa "" " " ""))) - ;; (invoke "ant" "clean") ) #t)) (replace 'build (lambda* _ - ;; (invoke "ant" "-f" "release.xml" "release-jar") (setenv "ANT_OPTS" (string-append "-Dversion.string=" ,version)) (with-directory-excursion "build" - ;; (invoke "ant" "compile") (invoke "ant" "-f" "release.xml" "release-jar")) #t)) (replace 'check @@ -758,7 +752,8 @@ (define-public ditaa "/lib/" jar-name " $@")))) - (chmod ditaa 493)) #t)) + (chmod ditaa #o755)) + #t)) (add-after 'install 'install-docs (lambda* (#:key outputs #:allow-other-keys) (let ((doc (string-append (assoc-ref outputs "out") -- 2.34.0