summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-01-07 12:08:33 +0100
committerLudovic Courtès <ludo@gnu.org>2019-01-07 14:40:59 +0100
commit46cf4cd6766d0a7186af513d33def5637ea8529c (patch)
treee328538ced97cc1a2e9a15d25de47811b14ee129
parent3b451546ed9d3f858bfb213eabafdfc3dd4c130f (diff)
downloadpatches-46cf4cd6766d0a7186af513d33def5637ea8529c.tar
patches-46cf4cd6766d0a7186af513d33def5637ea8529c.tar.gz
Remove (guix build pull).
This module had been unused since commit 5f93d97005897c2d859f0be1bdff34c88467ec61 (Oct. 2017). * guix/build/pull.scm: Delete. * Makefile.am (MODULES): Remove.
-rw-r--r--Makefile.am3
-rw-r--r--guix/build/pull.scm154
2 files changed, 1 insertions, 156 deletions
diff --git a/Makefile.am b/Makefile.am
index e74916cc0a..9f30d5b2b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2013 Andreas Enge <andreas@enge.fr>
# Copyright © 2015, 2017 Alex Kost <alezost@gmail.com>
# Copyright © 2016, 2018 Mathieu Lirzin <mthl@gnu.org>
@@ -172,7 +172,6 @@ MODULES = \
guix/build/union.scm \
guix/build/profiles.scm \
guix/build/compile.scm \
- guix/build/pull.scm \
guix/build/rpath.scm \
guix/build/cvs.scm \
guix/build/svn.scm \
diff --git a/guix/build/pull.scm b/guix/build/pull.scm
deleted file mode 100644
index a011e366f6..0000000000
--- a/guix/build/pull.scm
+++ /dev/null
@@ -1,154 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU 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.
-;;;
-;;; GNU 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 GNU Guix. If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (guix build pull)
- #:use-module (guix modules)
- #:use-module (guix build utils)
- #:use-module (guix build compile)
- #:use-module (ice-9 ftw)
- #:use-module (ice-9 match)
- #:use-module (ice-9 format)
- #:use-module (srfi srfi-1)
- #:use-module (srfi srfi-11)
- #:use-module (srfi srfi-26)
- #:use-module (srfi srfi-34)
- #:export (build-guix))
-
-;;; Commentary:
-;;;
-;;; Helpers for the 'guix pull' command to unpack and build Guix.
-;;;
-;;; Code:
-
-(define (has-all-its-dependencies? file)
- "Return true if the dependencies of the module defined in FILE are
-available, false otherwise."
- (let ((module (call-with-input-file file
- (lambda (port)
- (match (read port)
- (('define-module name _ ...)
- name))))))
- ;; If one of the dependencies of MODULE is missing, we get a
- ;; '&missing-dependency-error'.
- (guard (c ((missing-dependency-error? c) #f))
- (source-module-closure (list module) #:select? (const #t)))))
-
-(define (all-scheme-files directory)
- "Return a sorted list of Scheme files found in DIRECTORY."
- ;; Load guix/ modules before gnu/ modules to get somewhat steadier
- ;; progress reporting.
- (sort (filter (cut string-suffix? ".scm" <>)
- (find-files directory "\\.scm"))
- (let ((guix (string-append directory "/guix"))
- (gnu (string-append directory "/gnu")))
- (lambda (a b)
- (or (and (string-prefix? guix a)
- (string-prefix? gnu b))
- (string<? a b))))))
-
-
-(define* (build-guix out source
- #:key
- system
- storedir localstatedir sysconfdir sbindir
-
- (package-name "GNU Guix")
- (package-version "0")
- (bug-report-address "bug-guix@gnu.org")
- (home-page-url "https://gnu.org/s/guix")
-
- libgcrypt zlib gzip bzip2 xz
-
- (debug-port (%make-void-port "w"))
- (log-port (current-error-port)))
- "Build and install Guix in directory OUT using SOURCE, a directory
-containing the source code. Write any debugging output to DEBUG-PORT."
- (setvbuf (current-output-port) _IOLBF)
- (setvbuf (current-error-port) _IOLBF)
-
- (with-directory-excursion source
- (format #t "copying and compiling to '~a' with Guile ~a...~%"
- out (version))
-
- ;; Copy everything under guix/ and gnu/ plus {guix,gnu}.scm.
- (copy-recursively "guix" (string-append out "/guix")
- #:log debug-port)
- (copy-recursively "gnu" (string-append out "/gnu")
- #:log debug-port)
- (copy-file "guix.scm" (string-append out "/guix.scm"))
- (copy-file "gnu.scm" (string-append out "/gnu.scm"))
-
- ;; Instantiate a (guix config) module that preserves the original
- ;; settings.
- (copy-file "guix/config.scm.in"
- (string-append out "/guix/config.scm"))
- (substitute* (string-append out "/guix/config.scm")
- (("@PACKAGE_NAME@") package-name)
- (("@PACKAGE_VERSION@") package-version)
- (("@PACKAGE_BUGREPORT@") bug-report-address)
- (("@PACKAGE_URL@") home-page-url)
- (("@storedir@") storedir)
- (("@guix_localstatedir@") localstatedir)
- (("@guix_sysconfdir@") sysconfdir)
- (("@guix_sbindir@") sbindir)
- (("@guix_system@") system)
- (("@LIBGCRYPT@") (string-append libgcrypt "/lib/libgcrypt"))
- (("@LIBZ@") (string-append zlib "/lib/libz"))
- (("@GZIP@") (string-append gzip "/bin/gzip"))
- (("@BZIP2@") (string-append bzip2 "/bin/bzip2"))
- (("@XZ@") (string-append xz "/bin/xz"))
- (("@NIX_INSTANTIATE@") "nix-instantiate")) ;for (guix import nix)
-
- ;; Augment the search path so Scheme code can be compiled.
- (set! %load-path (cons out %load-path))
- (set! %load-compiled-path (cons out %load-compiled-path))
-
- ;; Compile the .scm files. Hide warnings.
- (parameterize ((current-warning-port (%make-void-port "w")))
- ;; Filter out files depending on Guile-SSH when Guile-SSH is missing.
- (let ((files (filter has-all-its-dependencies?
- (all-scheme-files out))))
- (compile-files out out files
-
- #:workers (parallel-job-count)
-
- ;; Disable warnings.
- #:warning-options '()
-
- #:report-load
- (lambda (file total completed)
- (display #\cr log-port)
- (format log-port
- "loading...\t~5,1f% of ~d files" ;FIXME: i18n
- (* 100. (/ completed total)) total)
- (force-output log-port)
- (format debug-port "~%loading '~a'...~%" file))
-
- #:report-compilation
- (lambda (file total completed)
- (display #\cr log-port)
- (format log-port "compiling...\t~5,1f% of ~d files" ;FIXME: i18n
- (* 100. (/ completed total)) total)
- (force-output log-port)
- (format debug-port "~%compiling '~a'...~%" file))))))
-
- (newline)
- #t)
-
-;;; pull.scm ends here