[PATCH] distro: Add GNU Wget.

[PATCH] distro: Add GNU Wget.

[Nikita Karetnikov]

[-- Attachment #1: Type: text/plain, Size: 541 bytes --]

Hi,

(I attached the patch.)

I'm getting this warning:

WARNING: (distro packages wget): imported module (distro packages
gettext) overrides core binding `gettext'

According to this message, [1] there is no need to worry, but I'd like
to be sure. Could you clarify?

Also, './pre-inst-env guix-import ../nixpkgs-github wget' listed the
following:

(inputs ...
  ("perl-libwww-perl" ,perl-libwww-perl))

But it builds fine without this line. Can we omit it?

Nikita

[1] https://lists.gnu.org/archive/html/guile-devel/2010-06/msg00172.html

[-- Attachment #2: 0001-distro-Add-GNU-Wget.patch --]
[-- Type: text/x-diff, Size: 3024 bytes --]

From e5cbf8997317d518d5ee550b2795922957e1d3f1 Mon Sep 17 00:00:00 2001
From: Nikita Karetnikov <nikita@karetnikov.org>
Date: Sun, 25 Nov 2012 02:15:05 +0000
Subject: [PATCH] distro: Add GNU Wget.

* distro/packages/wget.scm: New file.
* Makefile.am (MODULES): Add it.
---
 Makefile.am              |    1 +
 distro/packages/wget.scm |   52 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 0 deletions(-)
 create mode 100644 distro/packages/wget.scm

diff --git a/Makefile.am b/Makefile.am
index 4ee3a24..a974f41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,6 +77,7 @@ MODULES =					\
   distro/packages/shishi.scm			\
   distro/packages/system.scm			\
   distro/packages/texinfo.scm			\
+  distro/packages/wget.scm			\
   distro/packages/zile.scm
 
 
diff --git a/distro/packages/wget.scm b/distro/packages/wget.scm
new file mode 100644
index 0000000..112c5e2
--- /dev/null
+++ b/distro/packages/wget.scm
@@ -0,0 +1,52 @@
+;;; Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
+;;; Copyright (C) 2012 Nikita Karetnikov <nikita@karetnikov.org>
+;;;
+;;; This file is part of Guix.
+;;;
+;;; Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (distro packages wget)
+  #:use-module (distro packages gettext)
+  #:use-module (distro packages gnutls)
+  #:use-module (distro packages perl)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu))
+
+(define-public wget
+  (package
+    (name "wget")
+    (version "1.14")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/wget/wget-"
+                          version ".tar.xz"))
+      (sha256
+       (base32
+        "0yqllj3nv9p3vqbdm6j4nvpjcwf1y19rq8sd966nrbd2qvvxfq8p"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("gnutls" ,gnutls)
+       ("perl" ,perl)
+       ("gettext" ,gettext)))
+    (home-page "http://www.gnu.org/software/wget/")
+    (synopsis
+     "GNU Wget, a tool for retrieving files using HTTP, HTTPS, and FTP")
+    (description
+     "GNU Wget is a free software package for retrieving files using HTTP,
+HTTPS and FTP, the most widely-used Internet protocols.  It is a
+non-interactive commandline tool, so it may easily be called from
+scripts, cron jobs, terminals without X-Windows support, etc.")
+    (license "GPLv3+"))) ; some files are under GPLv2+
-- 
1.7.5.4

Re: [PATCH] distro: Add GNU Wget.

[Nikita Karetnikov]

> (I attached the patch.)

I've attached the patch.

Re: [PATCH] distro: Add GNU Wget.

[Ludovic Courtès]

Hi,

Nikita Karetnikov <nikita.karetnikov@gmail.com> skribis:

> (I attached the patch.)

Applied.  I added this line to fix chroot builds:

    (arguments
     '(#:phases
       (alist-cons-before 'build 'patch-/usr/bin/env
                          (lambda _
                            (for-each patch-shebang
                                      '("doc/texi2pod.pl" "tests/run-px")))
                          %standard-phases)))

> I'm getting this warning:
>
> WARNING: (distro packages wget): imported module (distro packages
> gettext) overrides core binding `gettext'
>
> According to this message, [1] there is no need to worry, but I'd like
> to be sure. Could you clarify?

Indeed, it’s just saying that the core ‘gettext’ binding is being
overridden by ours within (distro packages wget).

To silence the warning, perhaps we could rename ‘gettext’ to
‘gnu-gettext’, as I did for GNU Make.  WDYT?

> Also, './pre-inst-env guix-import ../nixpkgs-github wget' listed the
> following:
>
> (inputs ...
>   ("perl-libwww-perl" ,perl-libwww-perl))
>
> But it builds fine without this line. Can we omit it?

It’s an optional dependency (a Perl package) used to run some of the
tests.  Currently, we see a lot of these warnings during “make check”:

  Can't locate HTTP/Daemon.pm in @INC (@INC contains: ../tests /nix/store/a0si4l5cnbdh7ypwnz7k2knfpli8agra-perl-5.16.1/lib/perl5/site_perl/5.16.1/x86_64-linux /nix/store/a0si4l5cnbdh7ypwnz7k2knfpli8agra-perl-5.16.1/lib/perl5/site_perl/5.16.1 /nix/store/a0si4l5cnbdh7ypwnz7k2knfpli8agra-perl-5.16.1/lib/perl5/5.16.1/x86_64-linux /nix/store/a0si4l5cnbdh7ypwnz7k2knfpli8agra-perl-5.16.1/lib/perl5/5.16.1 .) at ../tests/HTTPServer.pm line 6.

This is because we lack libwww-perl, I guess.  Something to add
eventually.

Thanks,
Ludo’.

Re: [PATCH] distro: Add GNU Wget.

[Nikita Karetnikov]

Hi,

> To silence the warning, perhaps we could rename ‘gettext’ to
> ‘gnu-gettext’, as I did for GNU Make.  WDYT?

Are there any downsides? (I can create a patch.)

Nikita

Re: [PATCH] distro: Add GNU Wget.

[Ludovic Courtès]

Hi,

Nikita Karetnikov <nikita.karetnikov@gmail.com> skribis:

>> To silence the warning, perhaps we could rename ‘gettext’ to
>> ‘gnu-gettext’, as I did for GNU Make.  WDYT?
>
> Are there any downsides? (I can create a patch.)

Well, the name is slightly less intuitive.

Alternatively, we can keep that name, and use something like:

  (define-module (distro packages nano)
    #:use-module ((distro packages gettext)
                  #:renamer (symbol-prefix-proc 'guix:))
    #:use-module (distro packages ncurses)
    #:use-module (guix packages)
    #:use-module (guix download)
    #:use-module (guix build-system gnu))

The effect is that the package will be known as ‘guix:gettext’ within
this module.

Thanks,
Ludo’.