[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/11: gnu: ocaml: Use a helper function to download from ocaml-forge.
From: |
David Craven |
Subject: |
06/11: gnu: ocaml: Use a helper function to download from ocaml-forge. |
Date: |
Wed, 4 Jan 2017 15:05:59 +0000 (UTC) |
dvc pushed a commit to branch master
in repository guix.
commit 56f73eadc018bef27d895d6f3fd21d6b16a5ce50
Author: Julien Lepiller <address@hidden>
Date: Thu Dec 22 20:05:46 2016 +0100
gnu: ocaml: Use a helper function to download from ocaml-forge.
* gnu/packages/ocaml.scm (ocaml-forge-origin): New procedure.
(lablgtk)[origin]: Use it.
Signed-off-by: David Craven <address@hidden>
---
gnu/packages/ocaml.scm | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 88e95a8..dd43741 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -50,6 +50,13 @@
#:use-module (guix svn-download)
#:use-module (guix utils))
+;; A shortcut for files from ocaml forge. Downloaded files are computed from
+;; their number, not their name.
+(define (ocaml-forge-uri name version file-number)
+ (string-append "https://forge.ocamlcore.org/frs/download.php/"
+ (number->string file-number) "/" name "-" version
+ ".tar.gz"))
+
(define-public ocaml
(package
(name "ocaml")
@@ -509,14 +516,12 @@ Knuthâs LR(1) parser construction technique.")
(package
(name "lablgtk")
(version "2.18.5")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://forge.ocamlcore.org/frs/download.php/"
- "1627/lablgtk-2.18.5.tar.gz"))
- (sha256
- (base32
- "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib"))))
+ (source (origin
+ (method url-fetch)
+ (uri (ocaml-forge-uri name version 1627))
+ (sha256
+ (base32
+ "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib"))))
(build-system gnu-build-system)
(native-inputs
`(("camlp4" ,camlp4)
- branch master updated (1ff755d -> ddf2b50), David Craven, 2017/01/04
- 04/11: gnu: camlp4: Compile native version., David Craven, 2017/01/04
- 03/11: gnu: ocaml: Fix indentation., David Craven, 2017/01/04
- 06/11: gnu: ocaml: Use a helper function to download from ocaml-forge.,
David Craven <=
- 09/11: gnu: Add camlzip., David Craven, 2017/01/04
- 02/11: gnu: ocaml: Add CAML_LD_LIBRARY_PATH search-path., David Craven, 2017/01/04
- 10/11: gnu: Add ocamlmod., David Craven, 2017/01/04
- 08/11: gnu: Add ocaml-ounit., David Craven, 2017/01/04
- 11/11: gnu: Add ocaml-zarith., David Craven, 2017/01/04
- 07/11: gnu: camlp4: Install camlp4 META file., David Craven, 2017/01/04
- 05/11: gnu: Add ocaml-build-system., David Craven, 2017/01/04
- 01/11: gnu: ocaml: Add a .file directive to generated .s files., David Craven, 2017/01/04