unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: nixo <anothersms@gmail.com>
To: 41167@debbugs.gnu.org
Cc: nixo <nicolo@nixo.xyz>
Subject: [bug#41167] [PATCH 2/5] gnu: julia: Fix patch.
Date: Sun, 10 May 2020 10:15:10 +0200	[thread overview]
Message-ID: <20200510081513.26015-2-nicolo@nixo.xyz> (raw)
In-Reply-To: <20200510081513.26015-1-nicolo@nixo.xyz>

* 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 <nicolo@nixo.xyz>.
-+
-+--- 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 <nicolo@nixo.xyz>
+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





  reply	other threads:[~2020-05-10  8:17 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <handler.41167.B.15890980308315.ack@debbugs.gnu.org>
2020-05-10  8:15 ` [bug#41167] [PATCH 1/5] gnu: julia: Fix patch url nixo
2020-05-10  8:15   ` nixo [this message]
2020-05-10  8:15   ` [bug#41167] [PATCH 3/5] gnu: Add libwhich nixo
2020-05-10  8:15   ` [bug#41167] [PATCH 4/5] gnu: julia: Update to 1.4.1 nixo
2020-05-10  8:15   ` [bug#41167] [PATCH 5/5] gnu: Add julia-compat nixo
2020-05-11 20:58     ` Ludovic Courtès
2020-05-11 21:11       ` [bug#41167] V2 " Nicolò Balzarotti
2020-05-12 13:36         ` bug#41167: " Ludovic Courtès
2020-05-11 21:06     ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200510081513.26015-2-nicolo@nixo.xyz \
    --to=anothersms@gmail.com \
    --cc=41167@debbugs.gnu.org \
    --cc=nicolo@nixo.xyz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).