From patchwork Sun May 10 08:15:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Nicol=C3=B2_Balzarotti?= X-Patchwork-Id: 21968 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7BC8827BBE3; Sun, 10 May 2020 09:17:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3DDA227BBE1 for ; Sun, 10 May 2020 09:17:16 +0100 (BST) Received: from localhost ([::1]:44392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXh99-0004k5-QP for patchwork@mira.cbaines.net; Sun, 10 May 2020 04:17:15 -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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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