From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id cEO3Ax6M01+2DgAA0tVLHw (envelope-from ) for ; Fri, 11 Dec 2020 15:11:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id iIMsOx2M018laAAA1q6Kng (envelope-from ) for ; Fri, 11 Dec 2020 15:11:25 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CC059940367 for ; Fri, 11 Dec 2020 15:11:25 +0000 (UTC) Received: from localhost ([::1]:34762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knk4q-0006BO-P9 for larch@yhetil.org; Fri, 11 Dec 2020 10:11:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knk4V-0005km-VK for bug-guix@gnu.org; Fri, 11 Dec 2020 10:11:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59311) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1knk4V-0001Bf-LJ for bug-guix@gnu.org; Fri, 11 Dec 2020 10:11:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1knk4V-0007nl-Fq for bug-guix@gnu.org; Fri, 11 Dec 2020 10:11:03 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#44760: [PATCH 14/15] database: Honor 'SOURCE_DATE_EPOCH'. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 11 Dec 2020 15:11:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44760 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 44760@debbugs.gnu.org Received: via spool by 44760-submit@debbugs.gnu.org id=B44760.160769941829881 (code B ref 44760); Fri, 11 Dec 2020 15:11:03 +0000 Received: (at 44760) by debbugs.gnu.org; 11 Dec 2020 15:10:18 +0000 Received: from localhost ([127.0.0.1]:42612 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knk3l-0007ll-FB for submit@debbugs.gnu.org; Fri, 11 Dec 2020 10:10:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knk3k-0007kk-3G for 44760@debbugs.gnu.org; Fri, 11 Dec 2020 10:10:16 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:47547) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knk3e-0000gS-Uq; Fri, 11 Dec 2020 10:10:10 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=59326 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1knk3d-0004Vl-8u; Fri, 11 Dec 2020 10:10:09 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Fri, 11 Dec 2020 16:09:50 +0100 Message-Id: <20201211150951.18508-5-ludo@gnu.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201211150951.18508-1-ludo@gnu.org> References: <87h7pkffzy.fsf@inria.fr> <20201211150951.18508-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.20 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: CC059940367 X-Spam-Score: 2.20 X-Migadu-Scanner: scn1.migadu.com X-TUID: oDrtTLoRA7H2 * guix/store/database.scm (timestamp): New procedure. (sqlite-register): Use it as the default for #:time. (register-items): Likewise for #:registeration-time. --- guix/store/database.scm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/guix/store/database.scm b/guix/store/database.scm index 4579b05261..0a84bbddb9 100644 --- a/guix/store/database.scm +++ b/guix/store/database.scm @@ -323,8 +323,19 @@ ids of items referred to." (sqlite-fold cons '() stmt)) references))) +(define (timestamp) + "Return a timestamp, either the current time of SOURCE_DATE_EPOCH." + (match (getenv "SOURCE_DATE_EPOCH") + (#f + (current-time time-utc)) + ((= string->number seconds) + (if seconds + (make-time time-utc 0 seconds) + (current-time time-utc))))) + (define* (sqlite-register db #:key path (references '()) - deriver hash nar-size time) + deriver hash nar-size + (time (timestamp))) "Registers this stuff in DB. PATH is the store item to register and REFERENCES is the list of store items PATH refers to; DERIVER is the '.drv' that produced PATH, HASH is the base16-encoded Nix sha256 hash of @@ -337,9 +348,7 @@ Every store item in REFERENCES must already be registered." #:deriver deriver #:hash hash #:nar-size nar-size - #:time (time-second - (or time - (current-time time-utc)))))) + #:time (time-second time)))) ;; Call 'path-id' on each of REFERENCES. This ensures we get a ;; "non-NULL constraint" failure if one of REFERENCES is unregistered. (add-references db id @@ -388,7 +397,7 @@ is true." (define* (register-items db items #:key prefix - registration-time + (registration-time (timestamp)) (log-port (current-error-port))) "Register all of ITEMS, a list of records as returned by 'read-reference-graph', in DB. ITEMS must be in topological order (with -- 2.29.2