From: Mathieu Lirzin <mthl@gnu.org>
To: guix-devel@gnu.org
Subject: [PATCH] derivations: Make <derivation> record datatype immutable.
Date: Tue, 10 Jan 2017 00:00:13 +0100 [thread overview]
Message-ID: <20170109230014.16500-1-mthl@gnu.org> (raw)
* guix/derivations.scm (<derivation>): 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 d5e4b5730..b712c508e 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)))
--
2.11.0
next reply other threads:[~2017-01-09 23:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-09 23:00 Mathieu Lirzin [this message]
2017-01-09 23:00 ` [PATCH] git download: Remove redundant argument in 'gexp->derivation' call Mathieu Lirzin
2017-01-10 8:32 ` Ludovic Courtès
2017-01-11 18:10 ` Mathieu Lirzin
2017-01-10 8:32 ` [PATCH] derivations: Make <derivation> record datatype immutable Ludovic Courtès
2017-01-11 18:09 ` Mathieu Lirzin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170109230014.16500-1-mthl@gnu.org \
--to=mthl@gnu.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.