From a1679b74c9aa20bb51bc4add82ebb7ba78926b9c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 8 Oct 2021 23:26:24 +0200 Subject: Revert the #51061 patch series for now. This reverts commits f63c79bf7674df012517f8e9148f94c611e35f32 ..f86f7e24b39928247729020df0134e2e1c4cde62 for more chillax reviewing. See . --- guix/upstream.scm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'guix/upstream.scm') diff --git a/guix/upstream.scm b/guix/upstream.scm index f1fb84eb45..632e9ebc4f 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -24,10 +24,6 @@ #:use-module (guix discovery) #:use-module ((guix download) #:select (download-to-store url-fetch)) - #:use-module ((guix hexpm-download) - #:select (hexpm-fetch)) - #:use-module ((guix extracting-download) - #:select (download-to-store/extract)) #:use-module (guix gnupg) #:use-module (guix packages) #:use-module (guix diagnostics) @@ -434,23 +430,9 @@ SOURCE, an ." #:key-download key-download))) (values version tarball source)))))) -(define* (package-update/hexpm-fetch store package source - #:key key-download) - "Return the version, tarball, and SOURCE, to update PACKAGE to -SOURCE, an ." - (match source - (($ _ version urls signature-urls) - (let* ((url (first urls)) - (name (or (origin-file-name (package-source package)) - (string-append (basename url) ".gz"))) - (tarball (download-to-store/extract - store url "contents.tar.gz" name))) - (values version tarball source))))) - (define %method-updates ;; Mapping of origin methods to source update procedures. - `((,url-fetch . ,package-update/url-fetch) - (,hexpm-fetch . ,package-update/hexpm-fetch))) + `((,url-fetch . ,package-update/url-fetch))) (define* (package-update store package #:optional (updaters (force %updaters)) -- cgit v1.2.3