guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/05: gnu: julia: Fix patch.


From: guix-commits
Subject: 02/05: gnu: julia: Fix patch.
Date: Tue, 12 May 2020 09:32:19 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 3c125ac00e8611587c2b4cd4db48e14a1e42b82c
Author: nixo <address@hidden>
AuthorDate: Sun May 10 10:15:10 2020 +0200

    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 <address@hidden>
---
 .../patches/julia-SOURCE_DATE_EPOCH-mtime.patch    | 48 ++++++++++------------
 1 file 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 32dfd7b..b60f284 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 <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
+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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]