2014-03-26 17:59:01 +01:00
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
monads: Move '%store-monad' and related procedures where they belong.
This turns (guix monads) into a generic module for monads, and moves the
store monad and related monadic procedures in their corresponding
module.
* guix/monads.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file, package-file, package->derivation,
package->cross-derivation, origin->derivation, imported-modules,
compiled, modules, built-derivations, run-with-store): Move to...
* guix/store.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file): ... here.
(%guile-for-build): New variable.
(run-with-store): Moved from monads.scm. Remove default value for
#:guile-for-build.
* guix/packages.scm (default-guile): Export.
(set-guile-for-build): New procedure.
(package-file, package->derivation, package->cross-derivation,
origin->derivation): Moved from monads.scm.
* guix/derivations.scm (%guile-for-build): Remove.
(imported-modules): Rename to...
(%imported-modules): ... this.
(compiled-modules): Rename to...
(%compiled-modules): ... this.
(built-derivations, imported-modules, compiled-modules): New
procedures.
* gnu/services/avahi.scm, gnu/services/base.scm, gnu/services/dbus.scm,
gnu/services/dmd.scm, gnu/services/networking.scm,
gnu/services/ssh.scm, gnu/services/xorg.scm, gnu/system/install.scm,
gnu/system/linux-initrd.scm, gnu/system/shadow.scm, guix/download.scm,
guix/gexp.scm, guix/git-download.scm, guix/profiles.scm,
guix/svn-download.scm, tests/monads.scm: Adjust imports accordingly.
* guix/monad-repl.scm (default-guile-derivation): New procedure.
(store-monad-language, run-in-store): Use it.
* build-aux/hydra/gnu-system.scm (qemu-jobs): Add explicit
'set-guile-for-build' call.
* guix/scripts/archive.scm (derivation-from-expression): Likewise.
* guix/scripts/build.scm (options/resolve-packages): Likewise.
* guix/scripts/environment.scm (guix-environment): Likewise.
* guix/scripts/system.scm (guix-system): Likewise.
* doc/guix.texi (The Store Monad): Adjust module names accordingly.
2015-01-14 13:34:52 +01:00
|
|
|
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
2014-03-26 17:59:01 +01:00
|
|
|
;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
|
|
|
|
;;;
|
|
|
|
;;; 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 svn-download)
|
|
|
|
#:use-module (guix records)
|
2014-08-23 20:52:25 +02:00
|
|
|
#:use-module (guix gexp)
|
monads: Move '%store-monad' and related procedures where they belong.
This turns (guix monads) into a generic module for monads, and moves the
store monad and related monadic procedures in their corresponding
module.
* guix/monads.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file, package-file, package->derivation,
package->cross-derivation, origin->derivation, imported-modules,
compiled, modules, built-derivations, run-with-store): Move to...
* guix/store.scm (store-return, store-bind, %store-monad, store-lift,
text-file, interned-file): ... here.
(%guile-for-build): New variable.
(run-with-store): Moved from monads.scm. Remove default value for
#:guile-for-build.
* guix/packages.scm (default-guile): Export.
(set-guile-for-build): New procedure.
(package-file, package->derivation, package->cross-derivation,
origin->derivation): Moved from monads.scm.
* guix/derivations.scm (%guile-for-build): Remove.
(imported-modules): Rename to...
(%imported-modules): ... this.
(compiled-modules): Rename to...
(%compiled-modules): ... this.
(built-derivations, imported-modules, compiled-modules): New
procedures.
* gnu/services/avahi.scm, gnu/services/base.scm, gnu/services/dbus.scm,
gnu/services/dmd.scm, gnu/services/networking.scm,
gnu/services/ssh.scm, gnu/services/xorg.scm, gnu/system/install.scm,
gnu/system/linux-initrd.scm, gnu/system/shadow.scm, guix/download.scm,
guix/gexp.scm, guix/git-download.scm, guix/profiles.scm,
guix/svn-download.scm, tests/monads.scm: Adjust imports accordingly.
* guix/monad-repl.scm (default-guile-derivation): New procedure.
(store-monad-language, run-in-store): Use it.
* build-aux/hydra/gnu-system.scm (qemu-jobs): Add explicit
'set-guile-for-build' call.
* guix/scripts/archive.scm (derivation-from-expression): Likewise.
* guix/scripts/build.scm (options/resolve-packages): Likewise.
* guix/scripts/environment.scm (guix-environment): Likewise.
* guix/scripts/system.scm (guix-system): Likewise.
* doc/guix.texi (The Store Monad): Adjust module names accordingly.
2015-01-14 13:34:52 +01:00
|
|
|
#:use-module (guix store)
|
2014-08-23 20:52:25 +02:00
|
|
|
#:use-module (guix monads)
|
2014-03-26 17:59:01 +01:00
|
|
|
#:use-module (guix packages)
|
|
|
|
#:use-module (ice-9 match)
|
|
|
|
#:export (svn-reference
|
|
|
|
svn-reference?
|
|
|
|
svn-reference-url
|
|
|
|
svn-reference-revision
|
|
|
|
svn-fetch))
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
;;;
|
|
|
|
;;; An <origin> method that fetches a specific revision from a Subversion
|
|
|
|
;;; repository. The repository URL and REVISION are specified with a
|
|
|
|
;;; <svn-reference> object. REVISION should be specified as a number.
|
|
|
|
;;;
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
(define-record-type* <svn-reference>
|
|
|
|
svn-reference make-svn-reference
|
|
|
|
svn-reference?
|
2016-06-30 15:43:23 +02:00
|
|
|
(url svn-reference-url) ; string
|
|
|
|
(revision svn-reference-revision) ; number
|
|
|
|
(user-name svn-reference-user-name (default #f))
|
|
|
|
(password svn-reference-password (default #f)))
|
2014-03-26 17:59:01 +01:00
|
|
|
|
2014-08-23 20:52:25 +02:00
|
|
|
(define (subversion-package)
|
|
|
|
"Return the default Subversion package."
|
|
|
|
(let ((distro (resolve-interface '(gnu packages version-control))))
|
|
|
|
(module-ref distro 'subversion)))
|
|
|
|
|
2015-01-14 14:42:10 +01:00
|
|
|
(define* (svn-fetch ref hash-algo hash
|
2014-03-26 17:59:01 +01:00
|
|
|
#:optional name
|
2015-01-14 14:42:10 +01:00
|
|
|
#:key (system (%current-system)) (guile (default-guile))
|
2014-08-23 20:52:25 +02:00
|
|
|
(svn (subversion-package)))
|
2015-01-14 14:42:10 +01:00
|
|
|
"Return a fixed-output derivation that fetches REF, a <svn-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."
|
2014-08-23 20:52:25 +02:00
|
|
|
(define build
|
|
|
|
#~(begin
|
|
|
|
(use-modules (guix build svn))
|
|
|
|
(svn-fetch '#$(svn-reference-url ref)
|
|
|
|
'#$(svn-reference-revision ref)
|
|
|
|
#$output
|
2016-06-30 15:43:23 +02:00
|
|
|
#:svn-command (string-append #+svn "/bin/svn")
|
|
|
|
#:user-name #$(svn-reference-user-name ref)
|
|
|
|
#:password #$(svn-reference-password ref))))
|
2014-03-26 17:59:01 +01:00
|
|
|
|
2015-01-14 14:42:10 +01:00
|
|
|
(mlet %store-monad ((guile (package->derivation guile system)))
|
2014-08-23 20:52:25 +02:00
|
|
|
(gexp->derivation (or name "svn-checkout") build
|
|
|
|
#:system system
|
|
|
|
#:hash-algo hash-algo
|
|
|
|
#:hash hash
|
|
|
|
#:recursive? #t
|
|
|
|
#:modules '((guix build svn)
|
|
|
|
(guix build utils))
|
2015-01-14 14:42:10 +01:00
|
|
|
#:guile-for-build guile
|
|
|
|
#:local-build? #t)))
|
2014-03-26 17:59:01 +01:00
|
|
|
|
|
|
|
;;; svn-download.scm ends here
|