futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: julia: Fix patch.

Browse Source 
* gnu/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch: replaced with
  actual patch.

It was a patch creating the patch.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
nixo 2020-05-10 10:15:10 +02:00 committed by Ludovic Courtès
parent 4fc231a730
commit 3c125ac00e
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gnu/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch
View File

@ -1,28 +1,22 @@
--- /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
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