b6bee63bed
This patch changes three things:
1. package derivations are built using Guile 3.0;
2. 'gexp->derivation' defaults to Guile 3.0;
3. "guile3.0-" packages are deprecated aliases for the regular
package, which now depends on Guile 3.0; "guile2.2-" packages are
introduced; "guile-next" is renamed to "guile".
* gnu/packages/guile.scm (guile-2.0/fixed): Remove.
(guile-3.0/fixed): New variable.
(package-for-guile-3.0): Remove.
(package-for-guile-2.2): New variable.
(define-deprecated-guile3.0-package): New macro.
(guile-3.0)[name]: Change to "guile".
(guile-json-3)[native-inputs, inputs]: New fields.
(guile2.2-json): New variable.
(guile3.0-json): Deprecate.
(guile-gdbm-ffi)[native-inputs]: Switch to GUILE-3.0.
(guile2.2-gdbm-ffi): New variable.
(guile3.0-gdbm-ffi): Deprecate.
(guile-sqlite3): Switch to GUILE-3.0.
(guile2.2-sqlite3): New variable.
(guile3.0-sqlite3): Deprecate.
(guile-bytestructures): Switch to GUILE-3.0.
(guile2.2-bytestructures): New variable.
(guile3.0-bytestructures): Deprecate.
(guile-git): Switch to GUILE-3.0.
(guile2.2-git): New variable.
(guile3.0-git): Deprecate.
(guile-2.2/bug-fix):
* gnu/packages/ci.scm (cuirass): Switch to GUILE-3.0.
* gnu/packages/emacs-xyz.scm (emacs-guix): Switch to GUILE-3.0.
* gnu/packages/gtk.scm (guile-cairo)[arguments]: New field.
Switch to GUILE-3.0.
(guile2.2-cairo): New variable.
(guile3.0-cairo): Deprecate.
(guile-rsvg): Switch to GUILE-3.0.
(guile2.2-cairo): New variable.
(guile3.0-cairo): Deprecate.
(guile-present): Switch to GUILE-3.0.
(guile2.2-present): New variable.
(guile3.0-present): Deprecate.
(guile-gnome)[propagated-inputs]: Use GUILE2.2-CAIRO and GUILE2.2-LIB.
* gnu/packages/guile-xyz.scm (guile-fibers)[arguments]: Add #:configure-flags.
Switch to GUILE-3.0.
(guile2.2-fibers): New variable.
(guile3.0-fibers): Deprecate.
(guile-syntax-highlight): Switch to GUILE-3.0.
(guile2.2-syntax-highlight): New variable.
(guile3.0-syntax-highlight): Deprecate.
(guile-colorized): Switch to GUILE-3.0.
(guile2.2-colorized): New variable.
(guile3.0-colorized): Deprecate.
(guile-pfds): Switch to GUILE-3.0.
(guile2.2-pfds): New variable.
(guile3.0-pfds): Deprecate.
(guile-simple-zmq): Switch to GUILE-3.0.
(guile2.2-simple-zmq): New variable.
(guile3.0-simple-zmq): Deprecate.
(guile-newt): Switch to GUILE-3.0.
(guile2.2-newt): New variable.
(guile3.0-newt): Deprecate.
(guile-parted): Switch to GUILE-3.0.
(guile2.2-parted): New variable.
(guile3.0-parted): Deprecate.
(guile-config): Switch to GUILE-3.0.
(guile2.2-config): New variable.
(guile3.0-config): Deprecate.
(guile-hall): Switch to GUILE-3.0.
(guile2.2-hall): New variable.
(guile3.0-hall): Deprecate.
(guile-ics): Switch to GUILE-3.0.
(guile2.2-ics): New variable.
(guile3.0-ics): Deprecate.
(guile-wisp)[arguments]: Add 'support-guile-3.0' phase.
Switch to GUILE-3.0.
(guile2.2-wisp): New variable.
(guile3.0-wisp): Deprecate.
(guile-lib): Switch to GUILE-3.0.
(guile2.2-lib): New variable.
(guile3.0-lib): Deprecate.
(guile-minikanren): Switch to GUILE-3.0.
(guile2.2-minikanren): New variable.
(guile3.0-minikanren): Deprecate.
(guile-irregex): Switch to GUILE-3.0.
(guile2.2-irregex): New variable.
(guile3.0-irregex): Deprecate.
(haunt): Switch to GUILE-3.0, and remove GUILE-READER.
(guile2.2-haunt): New variable.
(guile3.0-haunt): Deprecate.
(guile-commonmark): Switch to GUILE-3.0.
(guile2.2-commonmark): New variable.
(guile3.0-commonmark): Deprecate.
(mcron): Switch to GUILE-3.0.
(guile2.0-mcron): New variable.
(guile3.0-mcron): Deprecate.
(guile-picture-language): Switch to GUILE-3.0.
(guile2.2-picture-language): New variable.
(guile3.0-picture-language): Deprecate.
(guile-gi): Switch to GUILE-3.0.
(guile2.2-gi): New variable.
(guile3.0-gi): Deprecate.
(guile-hashing): Switch to GUILE-3.0.
(guile2.2-hashing): New variable.
(guile3.0-hashing): Deprecate.
* gnu/packages/package-management.scm (guix): Switch to GUILE-3.0.
(guile2.2-guix): New variable.
(guile3.0-guix): Deprecate.
(gwl): Replace "guile3.0-" with "guile-".
(guix-jupyter)[source]: Adjust for Guile 3.0.
Switch to GUILE-3.0.
* gnu/packages/ssh.scm (guile-ssh): Switch to GUILE-3.0.
(guile2.2-ssh): New variable.
(guile3.0-ssh): Deprecate.
* gnu/packages/admin.scm (shepherd): Switch to GUILE-3.0.
(guile2.2-shepherd): New variable.
(guile3.0-shepherd): Deprecate.
* gnu/packages/mail.scm (mailutils): Switch to GUILE-3.0.
(guile2.2-mailutils): New variable.
(guile3.0-mailutils): Deprecate.
* gnu/packages/plotutils.scm (guile-charting): Switch to GUILE-3.0.
(guile2.2-charting): New variable.
(guile3.0-charting): Deprecate.
* gnu/packages/version-control.scm (libgit2): Switch to GUILE-3.0.
* gnu/packages/vpn.scm (vpnc-scripts): Switch to GUILE-3.0.
* gnu/packages/web.scm (guix-data-service): Switch to GUILE-3.0.
(hpcguix-web): Switch to GUILE-3.0.
* guix/self.scm (specification->package): Refer to the "guile-" variants
instead of "guile3.0-".
* guix/gexp.scm (default-guile): Change to GUILE-3.0.
* build-aux/build-self.scm (build): #:guile-version defaults to "3.0".
* gnu/packages/commencement.scm (guile-final): Base on GUILE-3.0/FIXED.
155 lines
6.9 KiB
Scheme
155 lines
6.9 KiB
Scheme
;;; GNU Guix --- Functional package management for GNU
|
|
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
|
|
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
|
;;; Copyright © 2016, 2017 Mathieu Lirzin <mthl@gnu.org>
|
|
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
|
;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
|
|
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
|
|
;;;
|
|
;;; 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 (gnu packages ci)
|
|
#:use-module ((guix licenses) #:prefix l:)
|
|
#:use-module (gnu packages)
|
|
#:use-module (guix packages)
|
|
#:use-module (guix git-download)
|
|
#:use-module (gnu packages autotools)
|
|
#:use-module (gnu packages base)
|
|
#:use-module (gnu packages docbook)
|
|
#:use-module (gnu packages compression)
|
|
#:use-module (gnu packages databases)
|
|
#:use-module (gnu packages guile)
|
|
#:use-module (gnu packages guile-xyz)
|
|
#:use-module (gnu packages gnupg)
|
|
#:use-module (gnu packages mail)
|
|
#:use-module (gnu packages package-management)
|
|
#:use-module (gnu packages perl)
|
|
#:use-module (gnu packages perl-compression)
|
|
#:use-module (gnu packages pkg-config)
|
|
#:use-module (gnu packages tls)
|
|
#:use-module (gnu packages texinfo)
|
|
#:use-module (gnu packages version-control)
|
|
#:use-module (gnu packages web)
|
|
#:use-module (gnu packages xml)
|
|
#:use-module (guix build-system gnu))
|
|
|
|
(define-public cuirass
|
|
(let ((commit "b9031db946ff89a39e1507b430f64402b0e9572a")
|
|
(revision "28"))
|
|
(package
|
|
(name "cuirass")
|
|
(version (string-append "0.0.1-" revision "." (string-take commit 7)))
|
|
(source (origin
|
|
(method git-fetch)
|
|
(uri (git-reference
|
|
(url "https://git.savannah.gnu.org/git/guix/guix-cuirass.git")
|
|
(commit commit)))
|
|
(file-name (string-append name "-" version))
|
|
(sha256
|
|
(base32
|
|
"103smfbdpgaw17xw3vc9cb3nfisrx64k71rpzn8g35f3jz7bxdcf"))))
|
|
(build-system gnu-build-system)
|
|
(arguments
|
|
'(#:modules ((guix build utils)
|
|
(guix build gnu-build-system)
|
|
(ice-9 rdelim)
|
|
(ice-9 popen))
|
|
|
|
#:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass
|
|
|
|
#:phases
|
|
(modify-phases %standard-phases
|
|
(add-after 'unpack 'disable-repo-tests
|
|
(λ _
|
|
;; Disable tests that use a connection to the Guix daemon.
|
|
(substitute* "Makefile.am"
|
|
(("tests/repo.scm \\\\") "\\"))
|
|
#t))
|
|
(add-after 'disable-repo-tests 'patch-/bin/sh
|
|
(lambda _
|
|
(substitute* "build-aux/git-version-gen"
|
|
(("#!/bin/sh") (string-append "#!" (which "sh"))))
|
|
#t))
|
|
(add-after 'install 'wrap-program
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
;; Wrap the 'cuirass' command to refer to the right modules.
|
|
(let* ((out (assoc-ref outputs "out"))
|
|
(gcrypt (assoc-ref inputs "guile-gcrypt"))
|
|
(json (assoc-ref inputs "guile-json"))
|
|
(sqlite (assoc-ref inputs "guile-sqlite3"))
|
|
(git (assoc-ref inputs "guile-git"))
|
|
(bytes (assoc-ref inputs "guile-bytestructures"))
|
|
(fibers (assoc-ref inputs "guile-fibers"))
|
|
(guix (assoc-ref inputs "guix"))
|
|
(deps (list gcrypt json sqlite git bytes fibers guix))
|
|
(guile (assoc-ref %build-inputs "guile"))
|
|
(effective (read-line
|
|
(open-pipe* OPEN_READ
|
|
(string-append guile "/bin/guile")
|
|
"-c" "(display (effective-version))")))
|
|
(mods (string-drop-right ;drop trailing colon
|
|
(string-join deps
|
|
(string-append "/share/guile/site/"
|
|
effective ":")
|
|
'suffix)
|
|
1))
|
|
(objs (string-drop-right
|
|
(string-join deps
|
|
(string-append "/lib/guile/" effective
|
|
"/site-ccache:")
|
|
'suffix)
|
|
1)))
|
|
;; Make sure 'cuirass' can find the 'evaluate' command, as
|
|
;; well as the relevant Guile modules.
|
|
(wrap-program (string-append out "/bin/cuirass")
|
|
`("PATH" ":" prefix (,(string-append out "/bin")))
|
|
`("GUILE_LOAD_PATH" ":" prefix (,mods))
|
|
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs)))
|
|
#t))))))
|
|
(inputs
|
|
`(("guile" ,guile-3.0)
|
|
("guile-fibers" ,guile-fibers)
|
|
("guile-gcrypt" ,guile-gcrypt)
|
|
("guile-json" ,guile-json-3)
|
|
("guile-sqlite3" ,guile-sqlite3)
|
|
("guile-git" ,guile-git)
|
|
;; FIXME: this is propagated by "guile-git", but it needs to be among
|
|
;; the inputs to add it to GUILE_LOAD_PATH.
|
|
("guile-bytestructures" ,guile-bytestructures)
|
|
("guix" ,guix)))
|
|
(native-inputs
|
|
`(("autoconf" ,autoconf)
|
|
("automake" ,automake)
|
|
("pkg-config" ,pkg-config)
|
|
("texinfo" ,texinfo)))
|
|
(native-search-paths
|
|
;; For HTTPS access, Cuirass itself honors these variables, with the
|
|
;; same semantics as Git and OpenSSL (respectively).
|
|
(list (search-path-specification
|
|
(variable "GIT_SSL_CAINFO")
|
|
(file-type 'regular)
|
|
(separator #f) ;single entry
|
|
(files '("etc/ssl/certs/ca-certificates.crt")))
|
|
(search-path-specification
|
|
(variable "SSL_CERT_DIR")
|
|
(files '("etc/ssl/certs")))))
|
|
(synopsis "Continuous integration system")
|
|
(description
|
|
"Cuirass is a continuous integration tool using GNU Guix. It is
|
|
intended as a replacement for Hydra.")
|
|
(home-page "https://www.gnu.org/software/guix/")
|
|
(license l:gpl3+))))
|