diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-08-04 08:16:38 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-08-04 08:16:38 -0400 |
| commit | 0832787e5c463c713d8f24fdec0f52900ff1c2bd (patch) | |
| tree | 5ce20bef711d0d85a22cd041758278d7c176b0f3 /guix | |
| parent | 5b098cc4b937c05d6f685772c66e2aa04490710a (diff) | |
| download | guix-patches-0832787e5c463c713d8f24fdec0f52900ff1c2bd.tar guix-patches-0832787e5c463c713d8f24fdec0f52900ff1c2bd.tar.gz | |
Revert "Merge branch 'core-updates'"
This reverts commit 455859a50f88f625d13fc2f304111f02369b366b.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/build/download.scm | 3 | ||||
| -rw-r--r-- | guix/build/gnu-build-system.scm | 2 | ||||
| -rw-r--r-- | guix/download.scm | 7 |
3 files changed, 2 insertions, 10 deletions
diff --git a/guix/build/download.scm b/guix/build/download.scm index 4259f52b7a..307258be92 100644 --- a/guix/build/download.scm +++ b/guix/build/download.scm @@ -737,8 +737,7 @@ or #f." (append-map (lambda (make-url) (filter-map (match-lambda ((hash-algo . hash) - (let ((file (strip-store-file-name file))) - (string->uri (make-url file hash-algo hash))))) + (string->uri (make-url file hash-algo hash)))) hashes)) content-addressed-mirrors)) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 34edff7f40..2abaa6efdc 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -303,7 +303,7 @@ makefiles." (define (list-of-files dir) (map (cut string-append dir "/" <>) (or (scandir dir (lambda (f) - (let ((s (lstat (string-append dir "/" f)))) + (let ((s (stat (string-append dir "/" f)))) (eq? 'regular (stat:type s))))) '()))) diff --git a/guix/download.scm b/guix/download.scm index f1422bebc0..8484c31189 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -282,15 +282,8 @@ ;; List of content-addressed mirrors. Each mirror is represented as a ;; procedure that takes a file name, an algorithm (symbol) and a hash ;; (bytevector), and returns a URL or #f. - ;; Note: Avoid 'https' to mitigate <http://bugs.gnu.org/22774>. ;; TODO: Add more. '(list (lambda (file algo hash) - ;; Files served by 'guix publish' are accessible under a single - ;; hash algorithm. - (string-append "http://mirror.hydra.gnu.org/file/" - file "/" (symbol->string algo) "/" - (bytevector->nix-base32-string hash))) - (lambda (file algo hash) ;; 'tarballs.nixos.org' supports several algorithms. (string-append "http://tarballs.nixos.org/" (symbol->string algo) "/" |