From dc673fa1131fb5d1e5ca29acb4a693cfb906986f Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Sat, 17 Dec 2016 15:12:19 +0100 Subject: derivations: Make record datatype immutable. * guix/derivations.scm (): Make it immutable. (derivation): Use generic 'set-field' instead of ad-hoc functional setter. --- guix/derivations.scm | 17 +++++------------ 1 file 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 +;;; Copyright © 2016, 2017 Mathieu Lirzin ;;; ;;; This file is part of GNU Guix. ;;; @@ -120,7 +121,7 @@ (define-condition-type &derivation-missing-output-error &derivation-error ;;; Nix derivations, as implemented in Nix's `derivations.cc'. ;;; -(define-record-type +(define-immutable-record-type (make-derivation outputs inputs sources system builder args env-vars file-name) derivation? @@ -817,14 +818,6 @@ (define (env-vars-with-empty-outputs env-vars) e outputs))) - (define (set-file-name drv file) - ;; Set FILE as the 'file-name' field of DRV. - (match drv - (($ 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 @@ (define input->derivation-input (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))) -- cgit v1.2.3