From a23571b9016a3d89de7f37ae92217b7b3c016ae7 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Mon, 14 Feb 2022 12:15:21 +0200
Subject: gn: Upstream 2 julia packages

---
 VERSION               |  2 +-
 gn/packages/julia.scm | 92 ---------------------------------------------------
 2 files changed, 1 insertion(+), 93 deletions(-)

diff --git a/VERSION b/VERSION
index cca9214..203b2bf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-161f2b1522cb5f16ed7d6574771d5edf1f12cc07
+7d0cbe714814a4abbdde20ce3b8e3951e25314b2
diff --git a/gn/packages/julia.scm b/gn/packages/julia.scm
index 34a7a35..6dddd4b 100644
--- a/gn/packages/julia.scm
+++ b/gn/packages/julia.scm
@@ -303,54 +303,6 @@ properties
 @end enumerate")
     (license license:expat)))
 
-;; ready to upstream
-(define-public julia-optim
-  (package
-    (name "julia-optim")
-    (version "1.6.0")
-    (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/JuliaNLSolvers/Optim.jl")
-               (commit (string-append "v" version))))
-        (file-name (git-file-name name version))
-        (sha256
-         (base32 "0nvl3xp9c6r80y9n7fic4zyq2443apfmbcpnx0wvgkv4vsy08x5j"))))
-    (build-system julia-build-system)
-    (arguments
-     (list
-       #:phases
-       #~(modify-phases %standard-phases
-           (add-after 'unpack 'adjust-tests
-             (lambda _
-               ;; TODO: Figure out why this test fails.
-               (substitute* "test/runtests.jl"
-                 ((".*l_bfgs.*") "")))))))
-    (propagated-inputs
-     (list julia-compat
-           julia-fillarrays
-           julia-forwarddiff
-           julia-linesearches
-           julia-nanmath
-           julia-nlsolversbase
-           julia-parameters
-           julia-positivefactorizations
-           julia-statsbase))
-    (native-inputs
-     (list julia-linesearches
-           julia-measurements
-           julia-nlsolversbase
-           julia-optimtestproblems
-           julia-positivefactorizations
-           julia-recursivearraytools
-           julia-stablerngs))
-    (home-page "https://github.com/JuliaNLSolvers/Optim.jl")
-    (synopsis "Optimization functions for Julia")
-    (description "@code{Optim.jl} is a package for univariate and multivariate
-optimization of functions.")
-    (license license:expat)))
-
 (define-public julia-plots
   (package
     (name "julia-plots")
@@ -641,50 +593,6 @@ R's d-p-q-r functions for probability distributions.  It is a wrapper around
     (description "This package provides a wrapper for Rmath.")
     (license license:expat)))
 
-;; ready to upstream
-(define-public julia-linesearches
-  (package
-    (name "julia-linesearches")
-    (version "7.1.1")
-    (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/JuliaNLSolvers/LineSearches.jl")
-               (commit (string-append "v" version))))
-        (file-name (git-file-name name version))
-        (sha256
-         (base32 "1qc4la07w6s1xhcyd0hvbnpr31zc1a2ssgyybc8biv5m00g0dnr0"))))
-    (build-system julia-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'link-depot 'skip-optim-tests
-           (lambda _
-             (substitute* "test/examples.jl"
-               ;; Prevent a cycle with Optim.jl.
-               (("^    SKIPFILE.*") "")
-               (("^    #SKIPFILE") "    SKIPFILE"))))
-         (add-after 'link-depot 'skip-doublefloats-tests
-           (lambda _
-             (substitute* "test/runtests.jl"
-               (("using DoubleFloats.*") "")
-               ((".*arbitrary_precision\\.jl.*") "")))))))
-    (propagated-inputs
-     (list julia-nlsolversbase
-           julia-nanmath
-           julia-parameters))
-    (native-inputs
-     ;; DoubleFloats.jl transitively depends on TimeZones.jl, which is currently
-     ;; unpackageable due to its oversized Artifacts.toml.
-     (list ;julia-doublefloats
-           julia-optimtestproblems))
-    (home-page "https://github.com/JuliaNLSolvers/LineSearches.jl")
-    (synopsis "Line search methods for optimization and root-finding")
-    (description "This package provides an interface to line search algorithms
-implemented in Julia.")
-    (license license:expat)))
-
 ;; ready to upstream
 (define-public julia-doublefloats
   (package
-- 
cgit v1.2.3