[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#41167] [PATCH 2/5] gnu: julia: Fix patch.
From: |
nixo |
Subject: |
[bug#41167] [PATCH 2/5] gnu: julia: Fix patch. |
Date: |
Sun, 10 May 2020 10:15:10 +0200 |
* 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 <address@hidden>.
-+
-+--- 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 <address@hidden>
+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