>From 2973c3695b9c6f522685a03a059815485b23f580 Mon Sep 17 00:00:00 2001 From: Caleb Ristvedt Date: Sat, 3 Jun 2017 02:49:28 -0500 Subject: [PATCH 4/7] fixup! Implement prototype register-path in scheme --- guix/sql.scm | 7 ++++++- guix/store.scm | 13 +++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/guix/sql.scm b/guix/sql.scm index 6d756c0a6..16a379f97 100644 --- a/guix/sql.scm +++ b/guix/sql.scm @@ -215,5 +215,10 @@ base16-encoded sha256 hash of the store item denoted by PATH (prefixed with \"sha256:\") after being converted to nar form, and nar-size is the size in bytes of the store item denoted by PATH after being converted to nar form." (with-sql-database dbpath db - (let ((id (update-or-insert db path deriver hash nar-size (current-time)))) + (let ((id (update-or-insert #:db db + #:path path + #:deriver deriver + #:hash hash + #:nar-size nar-size + #:time (current-time)))) (add-references db id references)))) diff --git a/guix/store.scm b/guix/store.scm index f41856fe4..a62fcf3f1 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -1267,12 +1267,13 @@ be used internally by the daemon's build hook." (let* ((to-register (string-append %store-directory "/" (basename path)))) (let-values (((hash nar-size) (nar-sha256 (string-append prefix "/" to-register)))) - (sqlite-register (string-append state-directory "/db/db.sqlite") - to-register - references - deriver - (string-append "sha256:" (bytevector->base16-string hash)) - nar-size)))) + (sqlite-register #:dbpath (string-append state-directory "/db/db.sqlite") + #:path to-register + #:references references + #:deriver deriver + #:hash (string-append "sha256:" + (bytevector->base16-string hash)) + #:nar-size nar-size)))) ;;; -- 2.13.0