From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:45187) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibSiV-0006Jq-Lw for guix-patches@gnu.org; Sun, 01 Dec 2019 12:09:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibSiU-0003tn-4B for guix-patches@gnu.org; Sun, 01 Dec 2019 12:09:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58881) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibSiU-0003th-18 for guix-patches@gnu.org; Sun, 01 Dec 2019 12:09:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ibSiT-00081h-TO for guix-patches@gnu.org; Sun, 01 Dec 2019 12:09:01 -0500 Subject: [bug#37886] [PATCH] gnu: Add ipcalc. Resent-Message-ID: References: <87zhhqyy6y.fsf@gmail.com> <87a78jttef.fsf@gnu.org> From: Daniel =?UTF-8?Q?Sch=C3=A4fer?= Message-ID: Date: Sun, 1 Dec 2019 17:32:17 +0100 MIME-Version: 1.0 In-Reply-To: <87a78jttef.fsf@gnu.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 37886@debbugs.gnu.org, Mathieu Othacehe Hello Ludo and Matthieu, thanks for taking a look. Sorry, I did not receive Matthieu's answer and I'm not subscribed to the patches ML. It seems that etc/indent-code.el does not correct that particular formatting difference, which I had in my description attribute. I corrected it manually, according to what the other packages look like. It's also moved into networking.scm. off-topic @Ludo, What's the language of your MUA? Ido? (https://en.wiktionary.org/wiki/skribis) --8<---------------cut here---------------start------------->8--- >From b511c6a206cb61c22f3da3d6682bfc2a37035463 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Wed, 23 Oct 2019 15:29:48 +0200 Subject: [PATCH] gnu: Add ipcalc. * gnu/packages/networking.scm (ipcalc): New variable. --- gnu/packages/networking.scm | 54 +++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 1b31314485..13728038d8 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2019 Tonton ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Jan Wielkiewicz +;;; Copyright © 2019 Daniel Schaefer ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,6 +62,7 @@ #:use-module (guix build-system go) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages adns) @@ -2778,3 +2780,55 @@ a service (such as an HTTP or SSH server) on localhost visible to the wider Internet, even behind NAT or restrictive firewalls. A managed front-end relay service is available at @url{https://pagekite.net/}, or you can run your own.") (license license:agpl3+))) + +(define-public ipcalc + (package + (name "ipcalc") + (version "0.41") + (source (origin + (method url-fetch) + (uri (string-append "http://jodies.de/ipcalc-archive/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "12if9sm8h2ac0pgwkw835cgyqjxm6h27k4kfn2vfas9krrqwbafx")))) + (inputs `(("perl" ,perl) + ("tar" ,tar) + ("gzip" ,gzip) + ("tarball" ,source))) + (build-system trivial-build-system) ; no Makefile.PL + (arguments + '(#:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils)) + (use-modules (srfi srfi-1)) + (let* ((tarball (assoc-ref %build-inputs "tarball")) + (perl (string-append (assoc-ref %build-inputs + "perl") + "/bin")) + (gzip (string-append (assoc-ref %build-inputs + "gzip") + "/bin/gzip")) + (tar (string-append (assoc-ref %build-inputs + "tar") + "/bin/tar")) + (out (assoc-ref %outputs "out")) + (bin (string-append out "/bin")) + (doc (string-append out "/share/doc/ipcalc"))) + (copy-file tarball "ipcalc.tar.gz") + (invoke gzip "-d" "ipcalc.tar.gz") + (invoke tar "xvf" "ipcalc.tar") + + (mkdir-p bin) + (install-file "ipcalc-0.41/ipcalc" bin) + (patch-shebang (string-append bin "/ipcalc") (list perl)) + (install-file "ipcalc-0.41/ipcalc" doc) + #t)))) + (synopsis "Simple IP network calculator") + (description "ipcalc takes an IP address and netmask and calculates the +resulting broadcast, network, Cisco wildcard mask, and host range. By giving a +second netmask, you can design subnets and supernets. It is also intended to be +a teaching tool and presents the subnetting results as easy-to-understand +binary values.") + (home-page "http://jodies.de/ipcalc") + (license gpl2+))) -- 2.23.0 --8<---------------cut here---------------end------------->8--- Thanks, Daniel On 11/26/19 12:42 AM, Ludovic Courtès wrote: > Hello Daniel, > > Did you have a chance to look into the suggestions Mathieu made? > See . > > Thanks in advance! :-) > > Ludo’. > > Mathieu Othacehe skribis: > >> Hello Daniel, >> >>> here's my first patch to guix - please let me know whether everything's okay. >>> It adds the ipcalc package which can calculate IP ranges. Example: >> >> Welcome to Guix :) This first patch looks fine, I just have two remarks. >> >>> new file mode 100644 >>> index 0000000000..5f83389b25 >>> --- /dev/null >>> +++ b/gnu/packages/ipcalc.scm >> >> I think you can use the existing networking.scm for this tool. >> >>> + (description "ipcalc takes an IP address and netmask and calculates the >>> + resulting broadcast, network, Cisco wildcard mask, and host >>> + range. By giving a second netmask, you can design subnets and >>> + supernets. It is also intended to be a teaching tool and >>> + presents the subnetting results as easy-to-understand binary >>> + values.") >> >> The indentation is not correct here. You can use M-q if you are using >> emacs or indent.el script otherwise (see: >> https://guix.gnu.org/manual/en/html_node/Formatting-Code.html). >> >> Can you please send an updated patch? >> >> Thanks, >> >> Mathieu