From mboxrd@z Thu Jan  1 00:00:00 1970
From: Leo Famulari <leo@famulari.name>
Subject: Re: [PATCH 3/3] gnu: nmap: Update to 7.31.
Date: Mon, 31 Oct 2016 13:53:47 -0400
Message-ID: <20161031175347.GA27555@jasmine>
References: <20161031132944.2353-1-mbakke@fastmail.com>
	<20161031132944.2353-4-mbakke@fastmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40132)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1c1GmO-0000WW-RI
	for guix-devel@gnu.org; Mon, 31 Oct 2016 13:53:53 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1c1GmL-0007br-My
	for guix-devel@gnu.org; Mon, 31 Oct 2016 13:53:52 -0400
Received: from out2-smtp.messagingengine.com ([66.111.4.26]:53728)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <leo@famulari.name>) id 1c1GmL-0007bn-Ie
	for guix-devel@gnu.org; Mon, 31 Oct 2016 13:53:49 -0400
Content-Disposition: inline
In-Reply-To: <20161031132944.2353-4-mbakke@fastmail.com>
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel/>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: "Guix-devel" <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
To: Marius Bakke <mbakke@fastmail.com>
Cc: guix-devel@gnu.org

On Mon, Oct 31, 2016 at 01:29:44PM +0000, Marius Bakke wrote:
> * gnu/packages/admin.scm (nmap): Update to 7.31.
> [arguments]: Add phase 'patch-Makefile' to prevent lua from being built.
> ---
>  gnu/packages/admin.scm | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
> index d9b08ef..35156f6 100644
> --- a/gnu/packages/admin.scm
> +++ b/gnu/packages/admin.scm
> @@ -1570,14 +1570,14 @@ done with the @code{auditctl} utility.")
>  (define-public nmap
>    (package
>      (name "nmap")
> -    (version "7.12")
> +    (version "7.31")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append "https://nmap.org/dist/nmap-" version
>                                    ".tar.bz2"))
>                (sha256
>                 (base32
> -                "014vagh9ak10hidwzp9s6g30y5h5fhsh8wykcnc1hnn9hwm0ipv3"))
> +                "0hiqb28950kn4bjsmw0ksfyss7j2qdmgrj3xsjf7073pq01lx7yb"))

Okay!

>                (modules '((guix build utils)))
>                (snippet
>                 '(map delete-file-recursively
> @@ -1603,6 +1603,12 @@ done with the @code{auditctl} utility.")
>       '(#:configure-flags '("--without-zenmap")
>         #:phases
>         (modify-phases %standard-phases
> +         (add-after 'configure 'patch-Makefile
> +           (lambda _
> +             (substitute* "Makefile"
> +               ;; Do not attempt to build lua.
> +               (("build-dnet build-lua") "build-dnet"))
> +             #t))

So, in this new release it tries to build the bundled Lua and fails
because we've deleted it?