Remove stuff that is in trunk

1 files changed, 2 insertions, 40 deletions

diff --git a/gn/packages/book_evolutionary_genomics.scm b/gn/packages/book_evolutionary_genomics.scm
index af4bf89..56b0572 100644
--- a/gn/packages/book_evolutionary_genomics.scm
+++ b/gn/packages/book_evolutionary_genomics.scm
@@ -10,7 +10,6 @@
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
-  ;; #:use-module (guix build-system ruby)
   #:use-module (guix build-system r)
   #:use-module (guix build-system trivial)
 
@@ -18,11 +17,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages bioinformatics)
   #:use-module (gnu packages compression)
-  ; #:use-module (gnu packages gcc)
-  ; #:use-module (gnu packages graphviz)
-  ; #:use-module (gnu packages java)
-  ; #:use-module (gnu packages linux)
-  ; #:use-module (gnu packages ldc)
+  #:use-module (gnu packages cran)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python)
@@ -30,14 +25,11 @@
   #:use-module (gnu packages statistics)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages vim)
-  ; #:use-module (gnu packages web)
-  ; #:use-module (gnu packages xml)
   #:use-module (gnu packages version-control)
 
   #:use-module (gn packages bioinformatics)
   #:use-module (gn packages javascript)
   #:use-module (gn packages python)
-  ; #:use-module (gn packages statistics)
   #:use-module (srfi srfi-1))
 
 (define-public r-gener ;; poor implementation
@@ -81,36 +73,6 @@
      ".")
     (license license:expat))) ; CeCILL-2.0
 
-(define-public r-rserve
-  (package
-    (name "r-rserve")
-    (version "1.8-4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri "https://github.com/s-u/Rserve/releases/download/1.8-4/Rserve_1.8-4.tar.gz")
-       (sha256
-        (base32
-         "1dncwiyhy1s1pimb6f2dzs3ivahah5id3chw4r10j92754bxmrn2"))))
-    (propagated-inputs
-     `(("r" ,r)))
-    (inputs `(("zlib" ,zlib)
-              ("openssl" ,openssl)))
-
-    (build-system r-build-system)
-    (home-page "https://github.com/s-u/Rserve")
-    (synopsis "Fast, flexible and powerful server providing access to R from many languages and systems http://RForge.net/Rserve")
-    (description
-     "Rserve acts as a socket server (TCP/IP or local sockets) which
-allows binary requests to be sent to R. Every connection has a
-separate workspace and working directory. Client-side implementations
-are available for popular languages such as C/C++ and Java, allowing
-any application to use facilities of R without the need of linking to
-R code. Rserve supports remote connection, user authentication and
-file transfer. A simple R client is included in this package as
-well.")
-    (license license:gpl2)))
-
 (define-public book-evolutionary-genomics
   (let ((commit "53a7aefefcedd52b94b38195f8daae94c07d89db"))
     (package
@@ -131,7 +93,7 @@ well.")
     (propagated-inputs
      `(("python" ,python)
        ("python-biopython" ,python-biopython)
-       ("python-rserve" ,python-rserve)
+       ; ("python-rserve" ,python-rserve)
        ("r" ,r)
        ("r-gener" ,r-gener)
        ("r-biostrings" ,r-biostrings)