diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2016-12-17 15:12:19 +0100 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2017-01-11 18:55:31 +0100 |
| commit | dc673fa1131fb5d1e5ca29acb4a693cfb906986f (patch) | |
| tree | a0f34cb10d95e1568cc6a4e5fb428a04ca18dc33 | |
| parent | 5c6a30c5119ffd5702c02e07e7f04669a8f225bb (diff) | |
| download | guix-dc673fa1131fb5d1e5ca29acb4a693cfb906986f.tar.gz | |
derivations: Make <derivation> record datatype immutable.
* guix/derivations.scm (<derivation>): Make it immutable. (derivation): Use generic 'set-field' instead of ad-hoc functional setter.
| -rw-r--r-- | guix/derivations.scm | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/guix/derivations.scm b/guix/derivations.scm index d5e4b5730b..b712c508e5 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016, 2017 Mathieu Lirzin <mthl@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -120,7 +121,7 @@ ;;; Nix derivations, as implemented in Nix's `derivations.cc'. ;;; -(define-record-type <derivation> +(define-immutable-record-type <derivation> (make-derivation outputs inputs sources system builder args env-vars file-name) derivation? @@ -817,14 +818,6 @@ output should not be used." e outputs))) - (define (set-file-name drv file) - ;; Set FILE as the 'file-name' field of DRV. - (match drv - (($ <derivation> outputs inputs sources system builder - args env-vars) - (make-derivation outputs inputs sources system builder - args env-vars file)))) - (define input->derivation-input (match-lambda (((? derivation? drv)) @@ -872,9 +865,9 @@ output should not be used." (let* ((file (add-text-to-store store (string-append name ".drv") (derivation->string drv) (map derivation-input-path inputs))) - (drv (set-file-name drv file))) - (hash-set! %derivation-cache file drv) - drv))) + (drv* (set-field drv (derivation-file-name) file))) + (hash-set! %derivation-cache file drv*) + drv*))) (define* (map-derivation store drv mapping #:key (system (%current-system))) |