Small fixes and removed package now in main line

4 files changed, 3 insertions, 88 deletions

diff --git a/gn/packages/java.scm b/gn/packages/java.scm
index 3fce390..ab93425 100644
--- a/gn/packages/java.scm
+++ b/gn/packages/java.scm
@@ -16,7 +16,7 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gnu packages java)
+(define-module (gn packages java)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
diff --git a/gn/packages/mongodb.scm b/gn/packages/mongodb.scm
index 8f0c68e..cc4196e 100644
--- a/gn/packages/mongodb.scm
+++ b/gn/packages/mongodb.scm
@@ -16,7 +16,7 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gn packages bioinformatics)
+(define-module (gn packages mongodb)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
@@ -71,4 +71,4 @@
 schema-free document-oriented database.  A key goal of MongoDB is to bridge
 the gap between key/value stores (which are fast and highly scalable) and
 traditional RDBMS systems (which are deep in functionality).")
-    (license (list agpl3 asl2.0))))
+    (license (list license:agpl3 license:asl2.0))))
diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index 47b2c23..b5b582d 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -42,43 +42,6 @@
   #:use-module (guix build-system trivial)
   #:use-module (srfi srfi-1))
 
-(define-public python-flask
-(package
-  (name "python-flask")
-  (version "0.10.1")
-  (source
-    (origin
-      (method url-fetch)
-      (uri (pypi-uri "Flask" version))
-      (sha256
-        (base32
-          "0wrkavjdjndknhp8ya8j850jq7a1cli4g5a93mg8nh1xz2gq50sc"))))
-  (build-system python-build-system)
-  (inputs
-   `(("python-setuptools" ,python-setuptools)
-     ; ("python-itsdangerous" ,python-itsdangerous)
-     ; ("python-jinja2" ,python-jinja2)
-     ; ("python-werkzeug" ,python-werkzeug)
-     ))
-  (propagated-inputs
-   `(
-     ("python-itsdangerous" ,python-itsdangerous)
-     ("python-jinja2" ,python-jinja2)
-     ("python-werkzeug" ,python-werkzeug)
-     ))
-  
-  (arguments
-   `(#:tests? #f)) ; No tests
-  (home-page "http://github.com/mitsuhiko/flask/")
-  (synopsis
-    "A microframework based on Werkzeug, Jinja2 and good intentions")
-  (description
-    "A microframework based on Werkzeug, Jinja2 and good intentions")
-  (license license:bsd-3)))
-
-(define-public python2-flask
-  (package-with-python2 python-flask))
-
 (define-public python-flask-sqlalchemy
   (package
    (name "python-flask-sqlalchemy")
diff --git a/gn/packages/statistics.scm b/gn/packages/statistics.scm
index 2c9ebda..dbe6b99 100644
--- a/gn/packages/statistics.scm
+++ b/gn/packages/statistics.scm
@@ -150,32 +150,6 @@
     "Contains many functions useful for data analysis, high-level graphics, utility operations, functions for computing sample size and power, importing and annotating datasets, imputing missing values, advanced table making, variable clustering, character string manipulation, conversion of R objects to LaTeX code, and recoding variables.")
   (license license:gpl2+)))
 
-(define-public r-doparallel
-(package
-  (name "r-doparallel")
-  (version "1.0.10")
-  (source
-    (origin
-      (method url-fetch)
-      (uri (cran-uri "doParallel" version))
-      (sha256
-        (base32
-          "1mddx25l25pw9d0csnx2q203dbg5hbrhkr1f08kw0p02a1lln0kh"))))
-  (properties `((upstream-name . "doParallel")))
-  (build-system r-build-system)
-  (propagated-inputs
-    `(("r-foreach" ,r-foreach)
-      ("r-iterators" ,r-iterators)
-      ;; ("r-parallel" ,r-parallel)
-      ))
-  (home-page
-    "http://cran.r-project.org/web/packages/doParallel")
-  (synopsis
-    "Foreach Parallel Adaptor for the 'parallel' Package")
-  (description
-    "Provides a parallel backend for the %dopar% function using the parallel package.")
-  (license license:gpl2+)))
-
 (define-public r-iterators
 (package
   (name "r-iterators")
@@ -196,28 +170,6 @@
     "Support for iterators, which allow a programmer to traverse through all the elements of a vector, list, or other collection of data.")
   (license #f)))
 
-(define-public r-foreach
-(package
-  (name "r-foreach")
-  (version "1.4.3")
-  (source
-    (origin
-      (method url-fetch)
-      (uri (cran-uri "foreach" version))
-      (sha256
-        (base32
-          "10aqsd3rxz03s1qdb6gsb1cj89mj4vmh491zfpin4skj1xvkzw0y"))))
-  (build-system r-build-system)
-  (propagated-inputs `(("r-iterators" ,r-iterators)))
-  (home-page
-    "http://cran.r-project.org/web/packages/foreach")
-  (synopsis
-    "Provides Foreach Looping Construct for R")
-  (description
-    "Support for the foreach looping construct.  Foreach is an idiom that allows for iterating over elements in a collection, without the use of an explicit loop counter.  This package in particular is intended to be used for its return value, rather than for its side effects.  In that sense, it is similar to the standard lapply function, but doesn't require the evaluation of a function.  Using foreach without side effects also facilitates executing the loop in parallel.")
-  (license #f))
-)
-
 (define-public r-fastcluster
 (package
   (name "r-fastcluster")