From 87f5d36630db13fee1f2c0563505dc0938f3787e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 13 Nov 2012 00:22:44 +0100 Subject: Remove (guix http) and (guix ftp). * guix/ftp.scm, guix/http.scm, guix/build/ftp.scm, guix/build/http.scm: Remove. * Makefile.am (MODULES): Likewise. * tests/builders.scm, distro/packages/base.scm, distro/packages/bash.scm, distro/packages/bdw-gc.scm, distro/packages/compression.scm, distro/packages/gawk.scm, distro/packages/gnupg.scm, distro/packages/gperf.scm, distro/packages/guile.scm, distro/packages/libffi.scm, distro/packages/libsigsegv.scm, distro/packages/libtool.scm, distro/packages/libunistring.scm, distro/packages/lout.scm, distro/packages/m4.scm, distro/packages/multiprecision.scm, distro/packages/ncurses.scm, distro/packages/perl.scm, distro/packages/pkg-config.scm, distro/packages/pth.scm, distro/packages/readline.scm, distro/packages/recutils.scm: Use `url-fetch' instead of `http-fetch' and `ftp-fetch'. * distro/packages/bootstrap.scm: Likewise (bootstrap-origin): Remove references to `http-fetch' and `ftp-fetch'. * guix.scm (%public-modules): Remove `http' and `ftp'; add `download'. --- distro/packages/base.scm | 29 ++++++++++++++--------------- distro/packages/bash.scm | 4 ++-- distro/packages/bdw-gc.scm | 4 ++-- distro/packages/bootstrap.scm | 16 +++++----------- distro/packages/compression.scm | 10 +++++----- distro/packages/gawk.scm | 4 ++-- distro/packages/gnupg.scm | 12 ++++++------ distro/packages/gperf.scm | 4 ++-- distro/packages/guile.scm | 8 ++++---- distro/packages/libffi.scm | 4 ++-- distro/packages/libsigsegv.scm | 4 ++-- distro/packages/libtool.scm | 4 ++-- distro/packages/libunistring.scm | 4 ++-- distro/packages/lout.scm | 4 ++-- distro/packages/m4.scm | 4 ++-- distro/packages/multiprecision.scm | 8 ++++---- distro/packages/ncurses.scm | 4 ++-- distro/packages/perl.scm | 4 ++-- distro/packages/pkg-config.scm | 4 ++-- distro/packages/pth.scm | 4 ++-- distro/packages/readline.scm | 4 ++-- distro/packages/recutils.scm | 4 ++-- 22 files changed, 70 insertions(+), 77 deletions(-) (limited to 'distro') diff --git a/distro/packages/base.scm b/distro/packages/base.scm index 707e8db2f2..04b1cccedc 100644 --- a/distro/packages/base.scm +++ b/distro/packages/base.scm @@ -27,8 +27,7 @@ (define-module (distro packages base) #:use-module (distro packages multiprecision) #:use-module (distro packages perl) #:use-module (guix packages) - #:use-module (guix ftp) - #:use-module (guix http) + #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix utils) @@ -47,7 +46,7 @@ (define-public hello (name "hello") (version "2.8") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/hello/hello-" version ".tar.gz")) (sha256 @@ -68,7 +67,7 @@ (define-public grep (name "grep") (version "2.14") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/grep/grep-" version ".tar.xz")) (sha256 @@ -88,7 +87,7 @@ (define-public sed (name "sed") (version "4.2.1") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/sed/sed-" version ".tar.bz2")) (sha256 @@ -110,7 +109,7 @@ (define-public tar (name "tar") (version "1.26") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/tar/tar-" version ".tar.bz2")) (sha256 @@ -140,7 +139,7 @@ (define-public patch (name "patch") (version "2.6.1") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/patch/patch-" version ".tar.xz")) (sha256 @@ -166,7 +165,7 @@ (define-public diffutils (name "diffutils") (version "3.2") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/diffutils/diffutils-" version ".tar.xz")) (sha256 @@ -211,7 +210,7 @@ (define-public findutils (name "findutils") (version "4.4.2") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/findutils/findutils-" version ".tar.gz")) (sha256 @@ -253,7 +252,7 @@ (define-public coreutils (name "coreutils") (version "8.19") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/coreutils/coreutils-" version ".tar.xz")) (sha256 @@ -279,7 +278,7 @@ (define-public gnu-make (name "make") (version "3.82") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/make/make-" version ".tar.bz2")) (sha256 @@ -308,7 +307,7 @@ (define-public binutils (name "binutils") (version "2.22") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/binutils/binutils-" version ".tar.bz2")) (sha256 @@ -341,7 +340,7 @@ (define-public gcc-4.7 (name "gcc") (version "4.7.2") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/gcc/gcc-" version "/gcc-" version ".tar.bz2")) (sha256 @@ -469,7 +468,7 @@ (define-public linux-libre-headers (name "linux-libre-headers") (version version*) (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://linux-libre.fsfla.org/pub/linux-libre/releases/3.3.8-gnu/linux-libre-" version "-gnu.tar.xz")) @@ -498,7 +497,7 @@ (define-public glibc (name "glibc") (version "2.16.0") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/glibc/glibc-" version ".tar.xz")) (sha256 diff --git a/distro/packages/bash.scm b/distro/packages/bash.scm index b4e5c1158a..3ee54299f9 100644 --- a/distro/packages/bash.scm +++ b/distro/packages/bash.scm @@ -20,7 +20,7 @@ (define-module (distro packages bash) #:use-module (distro packages ncurses) #:use-module (distro packages readline) #:use-module (guix packages) - #:use-module (guix http) + #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -36,7 +36,7 @@ (define-public bash (name "bash") (version "4.2") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/bash/bash-" version ".tar.gz")) (sha256 diff --git a/distro/packages/bdw-gc.scm b/distro/packages/bdw-gc.scm index 9cf6c4cb2d..7f9800eb09 100644 --- a/distro/packages/bdw-gc.scm +++ b/distro/packages/bdw-gc.scm @@ -18,7 +18,7 @@ (define-module (distro packages bdw-gc) #:use-module (guix packages) - #:use-module (guix http) + #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -27,7 +27,7 @@ (define-public libgc (name "libgc") (version "7.2alpha6") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-" version ".tar.gz")) diff --git a/distro/packages/bootstrap.scm b/distro/packages/bootstrap.scm index 95a7de444c..8165be1d53 100644 --- a/distro/packages/bootstrap.scm +++ b/distro/packages/bootstrap.scm @@ -19,8 +19,6 @@ (define-module (distro packages bootstrap) #:use-module (distro) #:use-module (guix packages) - #:use-module (guix ftp) - #:use-module (guix http) #:use-module (guix download) #:use-module (guix build-system) #:use-module (guix build-system gnu) @@ -67,11 +65,7 @@ (define (boot fetch) (let ((orig-method (origin-method source))) (origin (inherit source) - (method (cond ((eq? orig-method http-fetch) - (boot http-fetch)) - ((eq? orig-method ftp-fetch) - (boot ftp-fetch)) - ((eq? orig-method url-fetch) + (method (cond ((eq? orig-method url-fetch) (boot url-fetch)) (else orig-method)))))) @@ -207,7 +201,7 @@ (define %bootstrap-coreutils&co (package-from-tarball "bootstrap-binaries" (lambda (system) (origin - (method http-fetch) + (method url-fetch) (uri (string-append %bootstrap-base-url "/" system "/static-binaries.tar.xz")) @@ -226,7 +220,7 @@ (define %bootstrap-binutils (package-from-tarball "binutils-bootstrap" (lambda (system) (origin - (method http-fetch) + (method url-fetch) (uri (string-append %bootstrap-base-url "/" system "/binutils-2.22.tar.xz")) @@ -280,7 +274,7 @@ (define %bootstrap-glibc ("tarball" ,(lambda (system) (bootstrap-origin (origin - (method http-fetch) + (method url-fetch) (uri (string-append %bootstrap-base-url "/" system "/glibc-2.16.0.tar.xz")) (sha256 @@ -351,7 +345,7 @@ (define %bootstrap-gcc ("tarball" ,(lambda (system) (bootstrap-origin (origin - (method http-fetch) + (method url-fetch) (uri (string-append %bootstrap-base-url "/" system "/gcc-4.7.2.tar.xz")) (sha256 diff --git a/distro/packages/compression.scm b/distro/packages/compression.scm index b6f16afdf5..d5299f62bb 100644 --- a/distro/packages/compression.scm +++ b/distro/packages/compression.scm @@ -18,7 +18,7 @@ (define-module (distro packages compression) #:use-module (guix packages) - #:use-module (guix http) + #:use-module (guix download) #:use-module (guix build-system gnu)) (define-public zlib @@ -27,7 +27,7 @@ (define-public zlib (version "1.2.7") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://zlib.net/zlib-" version ".tar.gz")) (sha256 @@ -66,7 +66,7 @@ (define-public gzip (name "gzip") (version "1.5") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/gzip/gzip-" version ".tar.gz")) (sha256 @@ -114,7 +114,7 @@ (define-public bzip2 (name "bzip2") (version "1.0.6") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://www.bzip.org/" version "/bzip2-" version ".tar.gz")) (sha256 @@ -150,7 +150,7 @@ (define-public xz (name "xz") (version "5.0.4") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://tukaani.org/xz/xz-" version ".tar.gz")) (sha256 diff --git a/distro/packages/gawk.scm b/distro/packages/gawk.scm index b04a1ebb57..58c1bf1bea 100644 --- a/distro/packages/gawk.scm +++ b/distro/packages/gawk.scm @@ -19,7 +19,7 @@ (define-module (distro packages gawk) #:use-module (distro packages libsigsegv) #:use-module (guix packages) - #:use-module (guix http) + #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -28,7 +28,7 @@ (define-public gawk (name "gawk") (version "4.0.0") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/gawk/gawk-" version ".tar.bz2")) (sha256 diff --git a/distro/packages/gnupg.scm b/distro/packages/gnupg.scm index 062187c0f8..7bc3b0c266 100644 --- a/distro/packages/gnupg.scm +++ b/distro/packages/gnupg.scm @@ -21,7 +21,7 @@ (define-module (distro packages gnupg) #:use-module (distro packages readline) #:use-module (distro packages compression) #:use-module (guix packages) - #:use-module (guix ftp) + #:use-module (guix download) #:use-module (guix build-system gnu)) (define-public libgpg-error @@ -30,7 +30,7 @@ (define-public libgpg-error (version "1.10") (source (origin - (method ftp-fetch) + (method url-fetch) (uri (string-append "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-" version ".tar.bz2")) (sha256 @@ -53,7 +53,7 @@ (define-public libgcrypt (version "1.5.0") (source (origin - (method ftp-fetch) + (method url-fetch) (uri (string-append "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-" version ".tar.bz2")) (sha256 @@ -79,7 +79,7 @@ (define-public libassuan (version "2.0.3") (source (origin - (method ftp-fetch) + (method url-fetch) (uri (string-append "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-" version ".tar.bz2")) (sha256 @@ -104,7 +104,7 @@ (define-public libksba (version "1.2.0") (source (origin - (method ftp-fetch) + (method url-fetch) (uri (string-append "ftp://ftp.gnupg.org/gcrypt/libksba/libksba-" version ".tar.bz2")) @@ -129,7 +129,7 @@ (define-public gnupg (version "2.0.19") (source (origin - (method ftp-fetch) + (method url-fetch) (uri (string-append "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-" version ".tar.bz2")) diff --git a/distro/packages/gperf.scm b/distro/packages/gperf.scm index 392b9dd4fe..099038af69 100644 --- a/distro/packages/gperf.scm +++ b/distro/packages/gperf.scm @@ -18,7 +18,7 @@ (define-module (distro packages gperf) #:use-module (guix packages) - #:use-module (guix ftp) + #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -28,7 +28,7 @@ (define-public gperf (version "3.0.4") (source (origin - (method ftp-fetch) + (method url-fetch) (uri (string-append "ftp://ftp.gnu.org/gnu/gperf/gperf-" version ".tar.gz")) (sha256 diff --git a/distro/packages/guile.scm b/distro/packages/guile.scm index d65584f371..937be8dd2c 100644 --- a/distro/packages/guile.scm +++ b/distro/packages/guile.scm @@ -29,7 +29,7 @@ (define-module (distro packages guile) #:use-module (distro packages pkg-config) #:use-module (distro packages readline) #:use-module (guix packages) - #:use-module (guix http) + #:use-module (guix download) #:use-module (guix build-system gnu)) ;;; Commentary: @@ -43,7 +43,7 @@ (define-public guile-1.8 (name "guile") (version "1.8.8") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/guile/guile-" version ".tar.gz")) (sha256 @@ -93,7 +93,7 @@ (define-public guile-2.0 (name "guile") (version "2.0.6") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/guile/guile-" version ".tar.xz")) (sha256 @@ -142,7 +142,7 @@ (define (guile-reader guile) (name (string-append "guile-reader-for-guile-" (package-version guile))) (version "0.6") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://download-mirror.savannah.gnu.org/releases/guile-reader/guile-reader-" version ".tar.gz")) diff --git a/distro/packages/libffi.scm b/distro/packages/libffi.scm index dca0387433..8d702a92dd 100644 --- a/distro/packages/libffi.scm +++ b/distro/packages/libffi.scm @@ -18,7 +18,7 @@ (define-module (distro packages libffi) #:use-module (guix packages) - #:use-module (guix ftp) + #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -40,7 +40,7 @@ (define out (assoc-ref outputs "out")) (name "libffi") (version "3.0.9") (source (origin - (method ftp-fetch) + (method url-fetch) (uri (string-append "ftp://sourceware.org/pub/libffi/" name "-" version ".tar.gz")) diff --git a/distro/packages/libsigsegv.scm b/distro/packages/libsigsegv.scm index 9c6d80296d..030557f918 100644 --- a/distro/packages/libsigsegv.scm +++ b/distro/packages/libsigsegv.scm @@ -18,7 +18,7 @@ (define-module (distro packages libsigsegv) #:use-module (guix packages) - #:use-module (guix http) + #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -27,7 +27,7 @@ (define-public libsigsegv (name "libsigsegv") (version "2.10") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-" version ".tar.gz")) diff --git a/distro/packages/libtool.scm b/distro/packages/libtool.scm index 02af715d32..63c88cd4cd 100644 --- a/distro/packages/libtool.scm +++ b/distro/packages/libtool.scm @@ -21,7 +21,7 @@ (define-module (distro packages libtool) #:use-module (distro packages m4) #:use-module (distro packages perl) #:use-module (guix packages) - #:use-module (guix http) + #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -30,7 +30,7 @@ (define-public libtool (name "libtool") (version "2.4.2") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/libtool/libtool-" version ".tar.gz")) (sha256 diff --git a/distro/packages/libunistring.scm b/distro/packages/libunistring.scm index fb912eaf8f..0d865645bd 100644 --- a/distro/packages/libunistring.scm +++ b/distro/packages/libunistring.scm @@ -18,7 +18,7 @@ (define-module (distro packages libunistring) #:use-module (guix packages) - #:use-module (guix http) + #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -27,7 +27,7 @@ (define-public libunistring (name "libunistring") (version "0.9.3") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/libunistring/libunistring-" version ".tar.gz")) diff --git a/distro/packages/lout.scm b/distro/packages/lout.scm index 3045afa3ab..0ea3b0887d 100644 --- a/distro/packages/lout.scm +++ b/distro/packages/lout.scm @@ -18,7 +18,7 @@ (define-module (distro packages lout) #:use-module (guix packages) - #:use-module (guix http) + #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -78,7 +78,7 @@ (define out (name "lout") (version "3.39") (source (origin - (method http-fetch) + (method url-fetch) ;; FIXME: `http-get' doesn't follow redirects, hence the URL. (uri (string-append "http://download-mirror.savannah.gnu.org/releases/lout/lout-" diff --git a/distro/packages/m4.scm b/distro/packages/m4.scm index 7097ffb68f..8517b73834 100644 --- a/distro/packages/m4.scm +++ b/distro/packages/m4.scm @@ -19,7 +19,7 @@ (define-module (distro packages m4) #:use-module (distro) #:use-module (guix packages) - #:use-module (guix http) + #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -28,7 +28,7 @@ (define-public m4 (name "m4") (version "1.4.16") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/m4/m4-" version ".tar.bz2")) (sha256 diff --git a/distro/packages/multiprecision.scm b/distro/packages/multiprecision.scm index 98e4c72a72..c780e4ce03 100644 --- a/distro/packages/multiprecision.scm +++ b/distro/packages/multiprecision.scm @@ -20,7 +20,7 @@ (define-module (distro packages multiprecision) #:use-module (distro) #:use-module (distro packages m4) #:use-module (guix packages) - #:use-module (guix http) + #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -29,7 +29,7 @@ (define-public gmp (name "gmp") (version "5.0.5") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/gmp/gmp-" version ".tar.bz2")) (sha256 @@ -71,7 +71,7 @@ (define-public mpfr (name "mpfr") (version "3.1.1") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/mpfr/mpfr-" version ".tar.xz")) (sha256 (base32 @@ -97,7 +97,7 @@ (define-public mpc (name "mpc") (version "1.0") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://www.multiprecision.org/mpc/download/mpc-" version ".tar.gz")) diff --git a/distro/packages/ncurses.scm b/distro/packages/ncurses.scm index d9c31c6fee..b16d4002ee 100644 --- a/distro/packages/ncurses.scm +++ b/distro/packages/ncurses.scm @@ -18,7 +18,7 @@ (define-module (distro packages ncurses) #:use-module (guix packages) - #:use-module (guix http) + #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -55,7 +55,7 @@ (define lib.so (name "ncurses") (version "5.9") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/ncurses/ncurses-" version ".tar.gz")) (sha256 diff --git a/distro/packages/perl.scm b/distro/packages/perl.scm index 7e6cf0e4f7..9704ae1440 100644 --- a/distro/packages/perl.scm +++ b/distro/packages/perl.scm @@ -19,7 +19,7 @@ (define-module (distro packages perl) #:use-module (distro) #:use-module (guix packages) - #:use-module (guix http) + #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -29,7 +29,7 @@ (define-public perl (name "perl") (version "5.16.1") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://www.cpan.org/src/5.0/perl-" version ".tar.gz")) (sha256 diff --git a/distro/packages/pkg-config.scm b/distro/packages/pkg-config.scm index 7e44efb429..554be6bcde 100644 --- a/distro/packages/pkg-config.scm +++ b/distro/packages/pkg-config.scm @@ -18,7 +18,7 @@ (define-module (distro packages pkg-config) #:use-module (guix packages) - #:use-module (guix http) + #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -27,7 +27,7 @@ (define-public pkg-config (name "pkg-config") (version "0.27.1") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://pkgconfig.freedesktop.org/releases/pkg-config-" version ".tar.gz")) diff --git a/distro/packages/pth.scm b/distro/packages/pth.scm index 94e0dbbaee..bb65c41598 100644 --- a/distro/packages/pth.scm +++ b/distro/packages/pth.scm @@ -18,7 +18,7 @@ (define-module (distro packages pth) #:use-module (guix packages) - #:use-module (guix ftp) + #:use-module (guix download) #:use-module (guix build-system gnu)) (define-public pth @@ -27,7 +27,7 @@ (define-public pth (version "2.0.7") (source (origin - (method ftp-fetch) + (method url-fetch) (uri (string-append "ftp://ftp.gnu.org/gnu/pth/pth-" version ".tar.gz")) (sha256 diff --git a/distro/packages/readline.scm b/distro/packages/readline.scm index 6f54d32825..18c149b2c6 100644 --- a/distro/packages/readline.scm +++ b/distro/packages/readline.scm @@ -20,7 +20,7 @@ (define-module (distro packages readline) #:use-module (distro) #:use-module (distro packages ncurses) #:use-module (guix packages) - #:use-module (guix http) + #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -29,7 +29,7 @@ (define-public readline (name "readline") (version "6.2") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/readline/readline-" version ".tar.gz")) (sha256 diff --git a/distro/packages/recutils.scm b/distro/packages/recutils.scm index c3b74b6085..a03e73b7d6 100644 --- a/distro/packages/recutils.scm +++ b/distro/packages/recutils.scm @@ -19,7 +19,7 @@ (define-module (distro packages recutils) #:use-module (distro) #:use-module (guix packages) - #:use-module (guix http) + #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -28,7 +28,7 @@ (define-public recutils (name "recutils") (version "1.5") (source (origin - (method http-fetch) + (method url-fetch) (uri (string-append "http://ftp.gnu.org/gnu/recutils/recutils-" version ".tar.gz")) (sha256 -- cgit v1.2.3