me/guix
Archived
1
0
Fork 0
Code Activity

derivations: Make <derivation> record datatype immutable.

Browse source 
* guix/derivations.scm (<derivation>): Make it immutable.
(derivation): Use generic 'set-field' instead of ad-hoc functional setter.
This commit is contained in:
Mathieu Lirzin 2016-12-17 15:12:19 +01:00
parent 5c6a30c511
commit dc673fa113
No known key found for this signature in database
GPG key ID: 0ADEE10094604D37
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
guix/derivations.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -120,7 +121,7 @@
;;; Nix derivations, as implemented in Nix's `derivations.cc'. ;;; 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 (make-derivation outputs inputs sources system builder args env-vars
file-name) file-name)
derivation? derivation?
@ -817,14 +818,6 @@ output should not be used."
e e
outputs))) 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 (define input->derivation-input
(match-lambda (match-lambda
(((? derivation? drv)) (((? derivation? drv))
@ -872,9 +865,9 @@ output should not be used."
(let* ((file (add-text-to-store store (string-append name ".drv") (let* ((file (add-text-to-store store (string-append name ".drv")
(derivation->string drv) (derivation->string drv)
(map derivation-input-path inputs))) (map derivation-input-path inputs)))
(drv (set-file-name drv file))) (drv* (set-field drv (derivation-file-name) file)))
(hash-set! %derivation-cache file drv) (hash-set! %derivation-cache file drv*)
drv))) drv*)))
(define* (map-derivation store drv mapping (define* (map-derivation store drv mapping
#:key (system (%current-system))) #:key (system (%current-system)))