From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 6Gv5IH24t14wSwAA0tVLHw (envelope-from ) for ; Sun, 10 May 2020 08:17:01 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id iCkmAIu4t14/awAAB5/wlQ (envelope-from ) for ; Sun, 10 May 2020 08:17:15 +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 7A910940B6B for ; Sun, 10 May 2020 08:17:12 +0000 (UTC) Received: from localhost ([::1]:44392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXh97-0004k5-8D for larch@yhetil.org; Sun, 10 May 2020 04:17:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXh8x-0004hu-4e for guix-patches@gnu.org; Sun, 10 May 2020 04:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37338) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXh8w-0005KG-S4 for guix-patches@gnu.org; Sun, 10 May 2020 04:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jXh8w-0002QQ-O3 for guix-patches@gnu.org; Sun, 10 May 2020 04:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41167] [PATCH 2/5] gnu: julia: Fix patch. Resent-From: nixo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 May 2020 08:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41167 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 41167@debbugs.gnu.org Cc: nixo Received: via spool by 41167-submit@debbugs.gnu.org id=B41167.15890986029252 (code B ref 41167); Sun, 10 May 2020 08:17:02 +0000 Received: (at 41167) by debbugs.gnu.org; 10 May 2020 08:16:42 +0000 Received: from localhost ([127.0.0.1]:48875 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jXh8b-0002P9-NF for submit@debbugs.gnu.org; Sun, 10 May 2020 04:16:41 -0400 Received: from mail-wr1-f41.google.com ([209.85.221.41]:33736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jXh8Z-0002Oh-NA for 41167@debbugs.gnu.org; Sun, 10 May 2020 04:16:40 -0400 Received: by mail-wr1-f41.google.com with SMTP id l11so999020wru.0 for <41167@debbugs.gnu.org>; Sun, 10 May 2020 01:16:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3yHEQ7WeSm4uCL2six73ybcvVZN/cZ4XaXjVl9A2ZA0=; b=Ok1+4ByGUgvOEFwEwWonXIZIoinU9jnbFJIhxwT+/bqWSE8Zhb3IIUNk3sQ8a0iVXs ESuVO9oSpMwOfS9S9dgqdfHjDCEMAnZn5cHc7VOdWN60zh4Y80RhVL9OSZuBRbhC0f4A fEv5dh4eLcuHTwXY0UBqsK58VspN0dZo3mv8XF7rjc/ETf4ojWrsYbVS5y1nq2wTVQjX wzNQx40bQV4C1tBVqMZovYmWax0TTtgrY+FeT2tqbkhjCxKBiBSRMPF70GunnUvtGGFB SesImAbcvzdBq4ZGN2T1fRvpIraJLQITAwTark2geg+Jvvov3Et2e4CzWi5Aht+62H0Q UrsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3yHEQ7WeSm4uCL2six73ybcvVZN/cZ4XaXjVl9A2ZA0=; b=iHXlVHXSfS8pUBIX1q1+T7hIZBHTcZoV7b4OoWywEnvessB2EkYEqxnmrj4YYzpp8i k43AfY9HEgAp/92hVuNJ8YFdx2ur417XL13yc/D5IgYj7jgyzGSxPYMGsboosSai2NGq 1Scw2kkdePmAKRHrOxGiCQIlWVmBIun7lCWULYUhMulP6DKUk6CKUU8qTPUAK6vVeTTt ZhFPV8ZV/4WCJ+xHd3QnL3Akd8BfscPbJDROU1xCMs5lirh8hpxmCiCBNQQwIkCwY0CY HF6VkE6mzIb8bDgxq1JcEhrTz7zW/7of618ena4Eas4++Up/e39GbfUcaUsR3+7hO+SP P4aw== X-Gm-Message-State: AGi0PuZAWVni57TWmUvfZk5LK66qIZ9+qDECwgcPtdqiJ5x/WvAXrX+L Zz7gBS4p+dwYSHusZ0v9cHUUOsH31n0= X-Google-Smtp-Source: APiQypL58XUt0hRHsppwTDFCeDg6gY1U3tNoGEg7uVMyYFl5vsBLxA7Tyt3FqN95B+RrMDiRlf1Rhg== X-Received: by 2002:a5d:4006:: with SMTP id n6mr12679922wrp.27.1589098593779; Sun, 10 May 2020 01:16:33 -0700 (PDT) Received: from localhost.localdomain (host187-75-dynamic.12-79-r.retail.telecomitalia.it. [79.12.75.187]) by smtp.gmail.com with ESMTPSA id t2sm21702475wmt.15.2020.05.10.01.16.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 01:16:33 -0700 (PDT) From: nixo X-Google-Original-From: nixo Date: Sun, 10 May 2020 10:15:10 +0200 Message-Id: <20200510081513.26015-2-nicolo@nixo.xyz> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200510081513.26015-1-nicolo@nixo.xyz> References: <20200510081513.26015-1-nicolo@nixo.xyz> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 2.0 (++) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: 1.0 (+) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 X-Spam-Score: 0.09 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=Ok1+4ByG; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [0.09 / 13.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GENERIC_REPUTATION(0.00)[-0.53894731652313]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.51.188.0/24:c]; R_DKIM_REJECT(1.00)[gmail.com:s=20161025]; DWL_DNSWL_FAIL(0.00)[209.51.188.17:server fail]; FREEMAIL_FROM(0.00)[gmail.com]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.08), country: US(-0.00), ip: 209.51.188.17(-0.54)]; DKIM_TRACE(0.00)[gmail.com:-]; RCPT_COUNT_TWO(0.00)[2]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_IN_DNSWL_FAIL(0.00)[209.51.188.17:server fail]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:22989, ipnet:209.51.188.0/24, country:US]; TAGGED_FROM(0.00)[larch=yhetil.org]; FROM_NEQ_ENVFROM(0.00)[anothersms@gmail.com,guix-patches-bounces@gnu.org]; ARC_NA(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[79.12.75.187:received]; FROM_HAS_DN(0.00)[]; URIBL_BLOCKED(0.00)[nixo.xyz:email]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[41167@debbugs.gnu.org]; HAS_LIST_UNSUB(-0.01)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.51.188.17:from]; RCVD_COUNT_SEVEN(0.00)[9]; FORGED_SENDER_MAILLIST(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : SPF not aligned (relaxed),none] X-TUID: ln/gCeLjM4vF * gnu/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch: replaced with actual patch. It was a patch creating the patch. --- .../julia-SOURCE_DATE_EPOCH-mtime.patch | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/gnu/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch b/gnu/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch index 32dfd7b856..a6a4456303 100644 --- a/gnu/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch +++ b/gnu/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch @@ -1,28 +1,28 @@ ---- /dev/null -+++ b/gnu/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch -@@ -0,0 +1,22 @@ -+Fix one of upstream non-determinism, tracked here: -+ -+https://github.com/JuliaLang/julia/issues/34115 -+https://github.com/JuliaLang/julia/issues/25900 -+ -+ -+Patch by Nicolò Balzarotti . -+ -+--- a/base/loading.jl -++++ b/base/loading.jl -+@@ -807,7 +807,10 @@ -+ path = normpath(joinpath(dirname(prev), _path)) -+ end -+ if _track_dependencies[] -+- push!(_require_dependencies, (mod, path, mtime(path))) -++ push!(_require_dependencies, -++ (mod, path, -++ haskey(ENV, "SOURCE_DATE_EPOCH") ? -++ parse(Float64, ENV["SOURCE_DATE_EPOCH"]) : mtime(path))) -+ end -+ return path, prev -+ end --- -2.26.0 +From e4dc28db1d70819505fd1a68fd9d2bfc4fb61a7d Mon Sep 17 00:00:00 2001 +From: nixo +Date: Fri, 17 Jan 2020 11:28:30 +0100 +Subject: [PATCH] base: loading: support fake mtime with SOURCE_DATE_EPCOCH +Do this when loading libraries +--- + base/loading.jl | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/base/loading.jl b/base/loading.jl +index 7f11a2d4fc..1b4686d1dc 100644 +--- a/base/loading.jl ++++ b/base/loading.jl +@@ -807,8 +807,10 @@ function _include_dependency(mod::Module, _path::AbstractString) + path = normpath(joinpath(dirname(prev), _path)) + end + if _track_dependencies[] +- push!(_require_dependencies, (mod, path, mtime(path))) ++ push!(_require_dependencies, ++ (mod, path, ++ haskey(ENV, "SOURCE_DATE_EPOCH") ? ++ parse(Float64, ENV["SOURCE_DATE_EPOCH"]) : mtime(path))) + end + return path, prev + end +-- +2.24.1 -- 2.26.2