diff options
| author | nixo <anothersms@gmail.com> | 2020-05-10 10:15:10 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-05-12 15:32:06 +0200 |
| commit | 3c125ac00e8611587c2b4cd4db48e14a1e42b82c (patch) | |
| tree | 5a9c58fb416734e056bce94ab69b496066bed9e8 | |
| parent | 4fc231a73005b7ed304ecc0818ca7ef0f8590394 (diff) | |
| download | guix-3c125ac00e8611587c2b4cd4db48e14a1e42b82c.tar.gz | |
gnu: julia: Fix patch.
* 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>
| -rw-r--r-- | gnu/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch | 48 |
1 files changed, 21 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..b60f284923 100644 --- a/gnu/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch +++ b/gnu/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch @@ -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 |