gnu: Add cl-ana.statistical-learning.

[jackhill/guix/guix.git] / gnu / packages / wget.scm

diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm
index bd43e37..3d4ea94 100644 (file)
--- a/gnu/packages/wget.scm
+++ b/gnu/packages/wget.scm
@@ -1,8 +1,9 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2014, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2014, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>

-;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>

 ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>

+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>

 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;


@@ -20,31 +21,29 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages wget)
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages wget)

-  #:use-module (guix licenses)
+  #:use-module ((guix licenses) #:prefix license:)

   #:use-module (gnu packages)
   #:use-module (gnu packages)

-  #:use-module (gnu packages autotools)

   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)

-  #:use-module (gnu packages flex)
-  #:use-module (gnu packages gettext)

   #:use-module (gnu packages gnunet)
   #:use-module (gnu packages gnunet)

+  #:use-module (gnu packages gnupg)

   #:use-module (gnu packages libidn)
   #:use-module (gnu packages libidn)

-  #:use-module (gnu packages python)
-  #:use-module (gnu packages perl)
-  #:use-module (gnu packages web)

   #:use-module (gnu packages pcre)
   #:use-module (gnu packages pcre)

+  #:use-module (gnu packages perl)

   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pkg-config)

+  #:use-module (gnu packages python)

   #:use-module (gnu packages tls)
   #:use-module (gnu packages tls)

+  #:use-module (gnu packages web)
+  #:use-module (gnu packages xdisorg)

   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix packages)
   #:use-module (guix download)

-  #:use-module (guix git-download)

   #:use-module (guix build-system gnu))
 
 (define-public wget
   (package
     (name "wget")
   #:use-module (guix build-system gnu))
 
 (define-public wget
   (package
     (name "wget")

-    (version "1.19.5")
+    (version "1.20.3")

     (source
      (origin
       (method url-fetch)
     (source
      (origin
       (method url-fetch)


@@ -52,23 +51,8 @@
                           version ".tar.lz"))
       (sha256
        (base32
                           version ".tar.lz"))
       (sha256
        (base32

-        "0xfaxmlnih7dhkyks5wi4vrn0n1xshmy6gx6fb2k1120sprydyr9"))))
+        "1frajd86ds8vz2hprq30wq8ya89z9dcxnwm8nwk12bbc47l7qq39"))))

     (build-system gnu-build-system)
     (build-system gnu-build-system)

-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (add-before 'check 'disable-https-tests
-                    (lambda _
-                      ;; XXX: Skip TLS tests, which fail with "The
-                      ;; certificate's owner does not match hostname" as
-                      ;; reported at:
-                      ;; <https://lists.gnu.org/archive/html/bug-wget/2017-07/msg00012.html>.
-                      ;; The problem appears to be due to a change in GnuTLS
-                      ;; 3.5.12, whereby 'gnutls_x509_crt_check_hostname2' no
-                      ;; longer matches IP address against the 'CN' or
-                      ;; 'DNSname' fields of certificates.
-                      (substitute* "testenv/Makefile"
-                        (("SSL_TESTS=1") ""))
-                      #t)))))

     (inputs
      `(("gnutls" ,gnutls)
        ("libidn2" ,libidn2)
     (inputs
      `(("gnutls" ,gnutls)
        ("libidn2" ,libidn2)


@@ -87,12 +71,12 @@
 HTTPS and FTP protocols.  It can resume interrupted downloads, use file name
 wild cards, supports proxies and cookies, and it can convert absolute links
 in downloaded documents to relative links.")
 HTTPS and FTP protocols.  It can resume interrupted downloads, use file name
 wild cards, supports proxies and cookies, and it can convert absolute links
 in downloaded documents to relative links.")

-    (license gpl3+))) ; some files are under GPLv2+
+    (license license:gpl3+))) ; some files are under GPLv2+

 
 (define-public wgetpaste
   (package
     (name "wgetpaste")
 
 (define-public wgetpaste
   (package
     (name "wgetpaste")

-    (version "2.28")
+    (version "2.29")

     (source
       (origin
         (method url-fetch)
     (source
       (origin
         (method url-fetch)


@@ -100,76 +84,96 @@ in downloaded documents to relative links.")
                             version ".tar.bz2"))
         (sha256
          (base32
                             version ".tar.bz2"))
         (sha256
          (base32

-          "1hh9svyypqcvdg5mjxyyfzpdzhylhf7s7xq5dzglnm4injx3i3ak"))))
+          "1rp0wxr3zy7y2xp3azaadfghrx7g0m138f9qg6icjxkkz4vj9r22"))))

     (build-system gnu-build-system)
     (arguments
     (build-system gnu-build-system)
     (arguments

-     '(#:phases
+     `(#:modules ((guix build gnu-build-system)
+                  (guix build utils)
+                  (srfi srfi-1))
+       #:phases

        (modify-phases %standard-phases
          (delete 'configure)
          (delete 'build)
        (modify-phases %standard-phases
          (delete 'configure)
          (delete 'build)

+         (add-after 'unpack 'remove-dead-paste-site
+           ;; This phase is adaped from the following patch:
+           ;; https://gitweb.gentoo.org/repo/gentoo.git/tree/app-text/wgetpaste/files/wgetpaste-remove-dead.patch
+           (lambda _
+             (substitute* "wgetpaste"
+               (("-bpaste") "-dpaste")) ; dpaste blocks tor users
+             #t))

          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
                     (bin (string-append out "/bin"))
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
                     (bin (string-append out "/bin"))

-                    (zsh (string-append out "/share/zsh/site-functions")))
+                    (zsh (string-append out "/share/zsh/site-functions"))
+                    (doc (string-append out "/share/doc/" ,name "-" ,version)))

                (install-file "wgetpaste" bin)
                (install-file "wgetpaste" bin)

-               (install-file "_wgetpaste" zsh)))))
-       #:tests? #f)) ; no test target
+               (install-file "_wgetpaste" zsh)
+               (install-file "LICENSE" doc)
+               #t)))
+         (add-after 'install 'wrap-program
+           ;; /bin/wgetpaste prides itself on relying only on the following
+           ;; inputs, and doesn't need to execute arbitrary commands, so
+           ;; override PATH completely to detect any new dependencies early.
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (wrap-program (string-append out "/bin/wgetpaste")
+                 `("PATH" ":" =
+                   ,(delete-duplicates
+                     (map (lambda (command) (dirname (which command)))
+                          (list "bash" "mktemp" "sed" "sort" "tee" "tr"
+                                "wget" "xclip")))))
+               #t))))
+       #:tests? #f))                    ; no test target
+    (inputs
+     `(("wget" ,wget)
+       ("xclip" ,xclip)))

     (home-page "http://wgetpaste.zlin.dk/")
     (synopsis "Script that automates pasting to a number of pastebin services")
     (description
      "@code{wgetpaste} is an extremely simple command-line interface to various
 online pastebin services.")
     (home-page "http://wgetpaste.zlin.dk/")
     (synopsis "Script that automates pasting to a number of pastebin services")
     (description
      "@code{wgetpaste} is an extremely simple command-line interface to various
 online pastebin services.")

-    (license public-domain)))
+    (license license:expat)))

 
 (define-public wget2
   (package
    (name "wget2")
 
 (define-public wget2
   (package
    (name "wget2")

-   (version "1.0.0")
+   (version "1.99.2")

    (source
    (source

-    (origin
-     (method git-fetch)
-     (uri (git-reference
-           (url "https://gitlab.com/gnuwget/wget2.git")
-           (commit "b45709d3d21714135ce79df6abbdcb704684063d")
-           (recursive? #t))) ;; Needed for 'gnulib' git submodule.
-     (file-name (string-append name "-" version "-checkout"))
-     (sha256
-      (base32
-       "0ww84wwzmpyylkz8rnb6nk6f7x040132z81x52w7rjhk68p9mm24"))))
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnu/wget/wget2-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0qv55f4bablrlhc8bnic8g3mkk1kq44c4cphrk5jmv92z9aqzi6b"))))

    (build-system gnu-build-system)
    (arguments
    (build-system gnu-build-system)
    (arguments

-    `(#:phases (modify-phases %standard-phases
-      (replace 'bootstrap
-        (lambda _
-          ;; Make sure all the files are writable so that ./bootstrap
-          ;; can proceed.
-          (for-each (lambda (file)
-                      (chmod file #o755))
-                      (find-files "."))
-          (substitute* "./gnulib/gnulib-tool.py"
-                       (("/usr/bin/python") (which "python3")))
-          (zero? (system* "sh" "./bootstrap"
-                          "--gnulib-srcdir=gnulib"
-                          "--no-git")))))))
-   (inputs `(("autoconf" ,autoconf)
-             ("automake" ,automake)
-             ("doxygen" ,doxygen)
-             ("flex" ,flex)
-             ("gettext" ,gettext-minimal)
-             ("gnutls" ,gnutls/dane)
-             ("libiconv" ,libiconv)
-             ("libidn2" ,libidn2)
-             ("libmicrohttpd" ,libmicrohttpd)
-             ("libpsl" ,libpsl)
-             ("libtool" ,libtool)
-             ("pcre2" ,pcre2)
-             ("python" ,python)))
+    `(#:phases
+      (modify-phases %standard-phases
+        (add-after 'unpack 'skip-network-tests
+          (lambda _
+            (substitute* "tests/Makefile.in"
+              (("test-gpg-verify-no-file\\$\\(EXEEXT)") "")
+              (("test-gpg-valid\\$\\(EXEEXT)") "")
+              (("test-gpg-styles\\$\\(EXEEXT)") ""))
+            #t)))
+      #:configure-flags '("--enable-static=no")))
+   (inputs
+    `(("bzip2" ,bzip2)
+      ("gnutls" ,gnutls/dane)
+      ("gpgme" ,gpgme)
+      ("libiconv" ,libiconv)
+      ("libidn2" ,libidn2)
+      ("libmicrohttpd" ,libmicrohttpd)
+      ("libpsl" ,libpsl)
+      ("pcre2" ,pcre2)
+      ("zlib" ,zlib)))

    ;; TODO: Add libbrotlidec, libnghttp2.
    ;; TODO: Add libbrotlidec, libnghttp2.

-   (native-inputs `(("pkg-config" ,pkg-config)))
+   (native-inputs
+    `(("pkg-config" ,pkg-config)))

    (home-page "https://gitlab.com/gnuwget/wget2")
    (synopsis "Successor of GNU Wget")
    (description "GNU Wget2 is the successor of GNU Wget, a file and recursive
 website downloader.  Designed and written from scratch it wraps around libwget,
 that provides the basic functions needed by a web client.")
    (home-page "https://gitlab.com/gnuwget/wget2")
    (synopsis "Successor of GNU Wget")
    (description "GNU Wget2 is the successor of GNU Wget, a file and recursive
 website downloader.  Designed and written from scratch it wraps around libwget,
 that provides the basic functions needed by a web client.")

-   (license (list gpl3+ lgpl3+))))
+   (license (list license:gpl3+ license:lgpl3+))))