[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/110: guix: Add svn-multi-reference.
From: |
guix-commits |
Subject: |
03/110: guix: Add svn-multi-reference. |
Date: |
Mon, 22 Jul 2019 15:25:30 -0400 (EDT) |
rekado pushed a commit to branch wip-texlive
in repository guix.
commit f6a686f749e7effb4abc3b6235fb5a3e88f5e472
Author: Ricardo Wurmus <address@hidden>
Date: Sat Jul 6 00:19:43 2019 +0200
guix: Add svn-multi-reference.
* guix/svn-download.scm (<svn-multi-reference>): New record type.
(svn-multi-reference-url, svn-multi-reference-revision,
svn-multi-reference-locations, svn-multi-reference-user-name,
svn-multi-reference-password, svn-multi-fetch): New procedures.
---
guix/svn-download.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 57 insertions(+), 2 deletions(-)
diff --git a/guix/svn-download.scm b/guix/svn-download.scm
index c118869..5c25437 100644
--- a/guix/svn-download.scm
+++ b/guix/svn-download.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <address@hidden>
;;; Copyright © 2014 Sree Harsha Totakura <address@hidden>
-;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2017, 2019 Ricardo Wurmus <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -32,7 +32,14 @@
svn-reference-url
svn-reference-revision
svn-fetch
- download-svn-to-store))
+ download-svn-to-store
+
+ svn-multi-reference
+ svn-multi-reference?
+ svn-multi-reference-url
+ svn-multi-reference-revision
+ svn-multi-reference-locations
+ svn-multi-fetch))
;;; Commentary:
;;;
@@ -83,6 +90,54 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a
generic name if #f."
#:guile-for-build guile
#:local-build? #t)))
+(define-record-type* <svn-multi-reference>
+ svn-multi-reference make-svn-multi-reference
+ svn-multi-reference?
+ (url svn-multi-reference-url) ; string
+ (revision svn-multi-reference-revision) ; number
+ (locations svn-multi-reference-locations) ; list of strings
+ (user-name svn-multi-reference-user-name (default #f))
+ (password svn-multi-reference-password (default #f)))
+
+(define* (svn-multi-fetch ref hash-algo hash
+ #:optional name
+ #:key (system (%current-system)) (guile
(default-guile))
+ (svn (subversion-package)))
+ "Return a fixed-output derivation that fetches REF, a <svn-multi-reference>
+object. The output is expected to have recursive hash HASH of type
+HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f."
+ (define build
+ (with-imported-modules '((guix build svn)
+ (guix build utils))
+ #~(begin
+ (use-modules (guix build svn)
+ (guix build utils)
+ (srfi srfi-1))
+ (every (lambda (location)
+ ;; The directory must exist if we are to fetch only a
+ ;; single file.
+ (unless (string-suffix? "/" location)
+ (mkdir-p (string-append #$output "/" (dirname location))))
+ (svn-fetch (string-append '#$(svn-multi-reference-url ref)
+ "/" location)
+ '#$(svn-multi-reference-revision ref)
+ (if (string-suffix? "/" location)
+ (string-append #$output "/" location)
+ (string-append #$output "/" (dirname
location)))
+ #:svn-command (string-append #+svn "/bin/svn")
+ #:user-name #$(svn-multi-reference-user-name ref)
+ #:password #$(svn-multi-reference-password ref)))
+ '#$(svn-multi-reference-locations ref)))))
+
+ (mlet %store-monad ((guile (package->derivation guile system)))
+ (gexp->derivation (or name "svn-checkout") build
+ #:system system
+ #:hash-algo hash-algo
+ #:hash hash
+ #:recursive? #t
+ #:guile-for-build guile
+ #:local-build? #t)))
+
(define* (download-svn-to-store store ref
#:optional (name (basename (svn-reference-url
ref)))
#:key (log (current-error-port)))
- branch wip-texlive created (now 5215ddb), guix-commits, 2019/07/22
- 02/110: build: svn-fetch: Use "svn export"., guix-commits, 2019/07/22
- 01/110: gnu: texlive-union: Build font maps., guix-commits, 2019/07/22
- 03/110: guix: Add svn-multi-reference.,
guix-commits <=
- 05/110: gnu: Add simple-texlive-package., guix-commits, 2019/07/22
- 07/110: gnu: Add texlive-hyphen-package., guix-commits, 2019/07/22
- 04/110: build-system/texlive: Add texlive-origin., guix-commits, 2019/07/22
- 06/110: gnu: Add hyph-utf8-scripts., guix-commits, 2019/07/22
- 08/110: gnu: Add texlive-unicode-data., guix-commits, 2019/07/22
- 09/110: gnu: Add texlive-hyphen-base., guix-commits, 2019/07/22
- 13/110: gnu: texlive-fonts-cm: Remove cm-type1., guix-commits, 2019/07/22
- 12/110: gnu: texlive-dvips: Implement with simple-texlive-package., guix-commits, 2019/07/22
- 11/110: gnu: Add texlive-dehyph-exptl., guix-commits, 2019/07/22
- 14/110: gnu: texlive-fonts-cm: Use simple-texlive-package., guix-commits, 2019/07/22