From 390ef237bb57e83a3fb2c67a37c23ba160d7fd30 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Sun, 27 Oct 2019 22:16:57 +0200
Subject: gn: Adjust to upstream crate changes.

* gn/packages/crates-io.scm: Remove upstreamed crates.
* gn/packages/genenetwork.scm (rust-qtlreaper)[arguments]: Update
cargo-development-inputs. Remove custom 'update-test-data phase to munge
test data.
---
 gn/packages/genenetwork.scm | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

(limited to 'gn/packages/genenetwork.scm')

diff --git a/gn/packages/genenetwork.scm b/gn/packages/genenetwork.scm
index 3ca1456..9f0b3f0 100644
--- a/gn/packages/genenetwork.scm
+++ b/gn/packages/genenetwork.scm
@@ -15,6 +15,7 @@
   #:use-module (gnu packages bootstrap)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cran)
+  #:use-module (gnu packages crates-io)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages python)
@@ -212,9 +213,9 @@ location of a putative QTL.")
           ("rust-arrayvec" ,rust-arrayvec-0.4)
           ("rust-atty" ,rust-atty-0.2)
           ("rust-autocfg" ,rust-autocfg-0.1)
-          ("rust-bitflags" ,rust-bitflags-1.0)
+          ("rust-bitflags" ,rust-bitflags-1)
           ("rust-cfg-if" ,rust-cfg-if-0.1)
-          ("rust-clap" ,rust-clap-2.33)
+          ("rust-clap" ,rust-clap-2)
           ("rust-cloudabi" ,rust-cloudabi-0.0)
           ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.2)
           ("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.3)
@@ -233,12 +234,13 @@ location of a putative QTL.")
           ("rust-num-cpus" ,rust-num-cpus-1.10)
           ("rust-num-traits" ,rust-num-traits-0.2)
           ("rust-numtoa" ,rust-numtoa-0.1)
+          ("rust-proc-macro2" ,rust-proc-macro2-1.0)
           ("rust-proc-macro2" ,rust-proc-macro2-0.4)
+          ("rust-quote" ,rust-quote-1.0)
           ("rust-quote" ,rust-quote-0.6)
           ("rust-rand" ,rust-rand-0.6)
           ("rust-rand-chacha" ,rust-rand-chacha-0.1)
-          ("rust-rand-core-0.4" ,rust-rand-core-0.4)
-          ("rust-rand-core-0.3" ,rust-rand-core-0.3)
+          ("rust-rand-core" ,rust-rand-core-0.3)
           ("rust-rand-hc" ,rust-rand-hc-0.1)
           ("rust-rand-isaac" ,rust-rand-isaac-0.1)
           ("rust-rand-jitter" ,rust-rand-jitter-0.1)
@@ -259,26 +261,16 @@ location of a putative QTL.")
           ("rust-strsim" ,rust-strsim-0.8)
           ("rust-structopt" ,rust-structopt-0.2)
           ("rust-structopt-derive" ,rust-structopt-derive-0.2)
+          ("rust-syn" ,rust-syn-1.0)
           ("rust-syn" ,rust-syn-0.15)
           ("rust-termion" ,rust-termion-1.5)
           ("rust-textwrap" ,rust-textwrap-0.11)
           ("rust-unicode-segmentation" ,rust-unicode-segmentation-1.3)
           ("rust-unicode-width" ,rust-unicode-width-0.1)
+          ("rust-unicode-xid" ,rust-unicode-xid-0.2)
           ("rust-unicode-xid" ,rust-unicode-xid-0.1)
           ("rust-vec-map" ,rust-vec-map-0.8)
-          ("rust-winapi" ,rust-winapi-0.3)
-          ("rust-winapi-i686-pc-windows-gnu" ,rust-winapi-i686-pc-windows-gnu-0.4)
-          ("rust-winapi-x86-64-pc-windows-gnu" ,rust-winapi-x86-64-pc-windows-gnu-0.4))
-         #:phases
-         (modify-phases %standard-phases
-           (add-after 'unpack 'update-test-data
-             (lambda _
-               (substitute* "src/geneobject.rs"
-                 ;; array![Genotype::Unk, Genotype::Unk, Genotype::Pat]
-                 (("0.3421367343627405") "0.3421367343627406")
-                 ;; array![Genotype::Unk, Genotype::Unk, Genotype::Unk]
-                 (("-0.3223330030526561") "-0.32233300305265566"))
-               #t)))))
+          ("rust-winapi" ,rust-winapi-0.3))))
       (home-page "https://github.com/chfi/rust-qtlreaper")
       (synopsis "Reimplementation of genenetwork/QTLReaper in Rust")
       (description "Reimplementation of genenetwork/QTLReaper in Rust")
-- 
cgit v1.2.3