Guix moved zip to compression

19 files changed, 72 insertions, 90 deletions

diff --git a/gn/packages/afnumpy.scm b/gn/packages/afnumpy.scm
index d5515ac..850304b 100644
--- a/gn/packages/afnumpy.scm
+++ b/gn/packages/afnumpy.scm
@@ -48,7 +48,7 @@
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
-  #:use-module (gnu packages zip)
+  #:use-module (gnu packages compression)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -76,9 +76,9 @@
     ;; `(("python-setuptools" ,python-setuptools)))
     (arguments
      `(#:python ,python-2
-       #:tests? #f)) 
+       #:tests? #f))
     (home-page "https://github.com/FilipeMaia/afnumpy")
     (synopsis "Numerical library array processing of numbers, strings, records and objects")
     (description
      "A GPGPU-accelerated drop-in of python's numpy")
-    (license license:gpl2)))) 
+    (license license:gpl2))))
diff --git a/gn/packages/arrayfire.scm b/gn/packages/arrayfire.scm
index 361f2f0..39e7899 100644
--- a/gn/packages/arrayfire.scm
+++ b/gn/packages/arrayfire.scm
@@ -28,6 +28,7 @@
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages bootstrap)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages cmake)
@@ -51,7 +52,6 @@
   #:use-module (gnu packages ruby)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages version-control)
-  #:use-module (gnu packages zip)  
   #:use-module (gnu packages linux))
 
 (define-public arrayfire
@@ -60,7 +60,7 @@
     (version "3.3.1")
     (source (origin
               (method url-fetch)
-              (uri (string-append "http://arrayfire.com/arrayfire_source/arrayfire-full-" version 
+              (uri (string-append "http://arrayfire.com/arrayfire_source/arrayfire-full-" version
                                   ".tar.bz2"))
               (file-name (string-append name "-" version ".tar.bz2"))
               (sha256
@@ -107,15 +107,15 @@
        ("wget" ,wget)
        ("cmake" ,cmake)))
     (build-system cmake-build-system)
-    (arguments 
-     `(#:configure-flags '("-DBUILD_OPENCL=ON" "-DBUILD_CUDA=OFF" "-DBUILD_GRAPHICS=OFF" "-DUSE_SYSTEM_BOOST_COMPUTE=ON" "-DUSE_SYSTEM_CLBLAS=ON" "-DUSE_SYSTEM_CLFFT=ON") 
-       #:tests? #t))     
+    (arguments
+     `(#:configure-flags '("-DBUILD_OPENCL=ON" "-DBUILD_CUDA=OFF" "-DBUILD_GRAPHICS=OFF" "-DUSE_SYSTEM_BOOST_COMPUTE=ON" "-DUSE_SYSTEM_CLBLAS=ON" "-DUSE_SYSTEM_CLFFT=ON")
+       #:tests? #t))
     (synopsis "ArrayFire: a general purpose GPU library. https://arrayfire.com")
     (description "ArrayFire is a high performance software library for parallel computing with an easy-to-use API. Its array based function set makes parallel programming simple.Now on Guix")
     (home-page "http://arrayfire.com/")
-    (license (list license:gpl2 
-                   license:gpl2+ 
-                   license:gpl3 
+    (license (list license:gpl2
+                   license:gpl2+
+                   license:gpl3
                    license:gpl3+))))
 
 (define-public glfw
@@ -130,7 +130,7 @@
               (base32
                "08pixv8hd5xsccf7l8cqcijjqaq4k4da8qbp77wggal2fq445ika"))))
     (build-system cmake-build-system)
-    (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON") 
+    (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")
                  #:tests? #f))
     (native-inputs `(("autoconf" ,autoconf)
         ("automake" ,automake)
@@ -154,12 +154,12 @@
        ("xineramaproto" ,xineramaproto)
        ("libxinerama" ,libxinerama)
        ("libxcursor" ,libxcursor)
-       ("python" ,python-2)))       
+       ("python" ,python-2)))
     (home-page "http://www.glfw.org/")
     (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
     (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
     (license (list license:gpl2))))
-    
+
 (define-public clBLAS
   (package
     (name "clBLAS")
@@ -171,8 +171,8 @@
              (sha256
               (base32
                "0adlb02lqzrklfybhnv4n0p37mvkvdi3vqiwa05x2mv05ywnr93j"))))
-    (build-system cmake-build-system)    
-    (arguments `(#:tests? #f 
+    (build-system cmake-build-system)
+    (arguments `(#:tests? #f
                  #:configure-flags '("../clBLAS-2.10/src" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_TEST=OFF")))
     (native-inputs `(("autoconf" ,autoconf)
         ("automake" ,automake)
@@ -186,7 +186,7 @@
        ("enca" ,enca)
        ("eudev" ,eudev)
        ("fftw-openmpi" ,fftw-openmpi)
-       ("glew" ,glew)       
+       ("glew" ,glew)
        ("libcap" ,libcap)
        ("libjpeg" ,libjpeg)
        ("libltdl" ,libltdl)
@@ -200,12 +200,12 @@
        ("xineramaproto" ,xineramaproto)
        ("libxinerama" ,libxinerama)
        ("libxcursor" ,libxcursor)
-       ("python" ,python-2)))       
+       ("python" ,python-2)))
     (home-page "http://www.glfw.org/")
     (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
     (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
     (license (list license:gpl2))))
-    
+
 (define-public clFFT
   (package
     (name "clFFT")
@@ -217,7 +217,7 @@
              (sha256
               (base32
                "19hrk1lf06kch8x9dpbdj0waycn2mldrmj2y4vzi7zn2gdfw6g73"))))
-    (build-system cmake-build-system)    
+    (build-system cmake-build-system)
     (arguments `(#:configure-flags '("../clFFT-2.10.1/src" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=Release") #:tests? #f))
     (native-inputs `(("autoconf" ,autoconf)
         ("automake" ,automake)
@@ -243,12 +243,12 @@
        ("xineramaproto" ,xineramaproto)
        ("libxinerama" ,libxinerama)
        ("libxcursor" ,libxcursor)
-       ("python" ,python-2)))       
+       ("python" ,python-2)))
     (home-page "http://www.glfw.org/")
     (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
     (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
     (license (list license:gpl2))))
-    
+
 (define-public compute
   (package
     (name "compute")
@@ -260,7 +260,7 @@
              (sha256
               (base32
                "1r16zd1wdnn9gx278mkvr13k3i79hr35v6vj0fn7v3n92ngwxnhd"))))
-    (build-system cmake-build-system)    
+    (build-system cmake-build-system)
     (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=Release") #:tests? #f))
     (native-inputs `(("autoconf" ,autoconf)
         ("automake" ,automake)
@@ -287,12 +287,12 @@
        ("xineramaproto" ,xineramaproto)
        ("libxinerama" ,libxinerama)
        ("libxcursor" ,libxcursor)
-       ("python" ,python-2)))       
+       ("python" ,python-2)))
     (home-page "http://boost.org")
     (synopsis "Peer-reviewed portable C++ source libraries,BoostCompute")
     (description "Peer-reviewed portable C++ source libraries,BoostCompute")
     (license (list license:x11-style))))
-    
+
 (define-public ocl-icd
   (package
    (name "ocl-icd")
@@ -311,20 +311,20 @@
              ("ruby" ,ruby)
              ("libtool" ,libtool)
              ("opencl-headers" ,opencl-headers)
-             ("libgcrypt" ,libgcrypt)))                                              
+             ("libgcrypt" ,libgcrypt)))
     (build-system gnu-build-system)
      (arguments
      '(#:phases (modify-phases %standard-phases
                     (add-after 'unpack `bootstrap
                       (lambda _
-                        (zero? (system* "autoreconf" "-vfi")))))))    
+                        (zero? (system* "autoreconf" "-vfi")))))))
     (home-page "https://forge.imag.fr/projects/ocl-icd/")
     (synopsis "OpenCL implementations are provided as ICD (Installable Client Driver).")
     (description "OpenCL implementations are provided as ICD (Installable Client Driver).
     An OpenCL program can use several ICD thanks to the use of an ICD Loader as provided by this project.
     This free ICD Loader can load any (free or non free) ICD")
     (license (list license:gpl2 license:ruby))))
-    
+
 (define-public opencl-headers
 (let ((commit "c1770dc"))
   (package
@@ -358,8 +358,3 @@
     (description "This package provides the Khronos OpenCL headers")
     (home-page "https://www.khronos.org/registry/cl/")
     (license (list license:gpl2)))))
-    
-
-    
-   
-
diff --git a/gn/packages/beignet.scm b/gn/packages/beignet.scm
index a9e7a75..c07fa61 100644
--- a/gn/packages/beignet.scm
+++ b/gn/packages/beignet.scm
@@ -47,7 +47,6 @@
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages version-control)
-  #:use-module (gnu packages zip)  
   #:use-module (gnu packages linux))
 
 (define-public beignet
@@ -81,14 +80,14 @@
              ("freeglut" ,freeglut)
              ("mesa-utils" ,mesa-utils)
              ("ncurses" ,ncurses)
-             ("ocl-icd" ,ocl-icd)))                                              
+             ("ocl-icd" ,ocl-icd)))
     (build-system cmake-build-system)
-    (arguments `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release" "-DCOMPILER=CLANG") #:tests? #f))   
+    (arguments `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release" "-DCOMPILER=CLANG") #:tests? #f))
     (home-page "https://forge.imag.fr/projects/ocl-icd/")
     (synopsis "Intel's OpenCL framework")
     (description "Intel's OpenCL framework that works with Intel IvyBridge GPUs and above")
     (license license:gpl2)))
-        
+
 (define-public ocl-icd
   (package
    (name "ocl-icd")
@@ -107,20 +106,20 @@
              ("ruby" ,ruby)
              ("libtool" ,libtool)
              ("opencl-headers" ,opencl-headers)
-             ("libgcrypt" ,libgcrypt)))                                              
+             ("libgcrypt" ,libgcrypt)))
     (build-system gnu-build-system)
      (arguments
      '(#:phases (modify-phases %standard-phases
                     (add-after 'unpack `bootstrap
                       (lambda _
-                        (zero? (system* "autoreconf" "-vfi")))))))    
+                        (zero? (system* "autoreconf" "-vfi")))))))
     (home-page "https://forge.imag.fr/projects/ocl-icd/")
     (synopsis "OpenCL implementations are provided as ICD (Installable Client Driver).")
     (description "OpenCL implementations are provided as ICD (Installable Client Driver).
     An OpenCL program can use several ICD thanks to the use of an ICD Loader as provided by this project.
     This free ICD Loader can load any (free or non free) ICD")
     (license license:gpl2)))
-    
+
 (define-public opencl-headers
 (let ((commit "c1770dc"))
   (package
@@ -154,5 +153,3 @@
     (description "This package provides the Khronos OpenCL headers")
     (home-page "https://www.khronos.org/registry/cl/")
     (license license:gpl2))))
-    
-    
diff --git a/gn/packages/bioinformatics.scm b/gn/packages/bioinformatics.scm
index 376b43a..dffa11e 100644
--- a/gn/packages/bioinformatics.scm
+++ b/gn/packages/bioinformatics.scm
@@ -57,7 +57,6 @@
   #:use-module (gnu packages vim)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
-  #:use-module (gnu packages zip)
   #:use-module (gnu packages bootstrap)
   #:use-module (gn packages ldc)
   #:use-module (gn packages ldc)
diff --git a/gn/packages/clBLAS.scm b/gn/packages/clBLAS.scm
index 17a4589..1c838fb 100644
--- a/gn/packages/clBLAS.scm
+++ b/gn/packages/clBLAS.scm
@@ -24,10 +24,11 @@
   #:use-module (guix build-system cmake)
   #:use-module (guix packages)
   #:use-module (gnu packages algebra)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages bootstrap)
   #:use-module (gnu packages base)
-  #:use-module (gnu packages autotools)
   #:use-module (gnu packages curl)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages boost)
@@ -46,7 +47,6 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages version-control)
-  #:use-module (gnu packages zip)  
   #:use-module (gnu packages linux))
 
 (define-public clBLAS
@@ -60,8 +60,8 @@
              (sha256
               (base32
                "0adlb02lqzrklfybhnv4n0p37mvkvdi3vqiwa05x2mv05ywnr93j"))))
-    (build-system cmake-build-system)    
-    (arguments `(#:tests? #f 
+    (build-system cmake-build-system)
+    (arguments `(#:tests? #f
                  #:configure-flags '("../clBLAS-2.10/src" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_TEST=OFF")))
     (native-inputs `(("autoconf" ,autoconf)
         ("automake" ,automake)
@@ -75,7 +75,7 @@
        ("enca" ,enca)
        ("eudev" ,eudev)
        ("fftw-openmpi" ,fftw-openmpi)
-       ("glew" ,glew)       
+       ("glew" ,glew)
        ("libcap" ,libcap)
        ("libjpeg" ,libjpeg)
        ("libltdl" ,libltdl)
@@ -89,12 +89,12 @@
        ("xineramaproto" ,xineramaproto)
        ("libxinerama" ,libxinerama)
        ("libxcursor" ,libxcursor)
-       ("python" ,python-2)))       
+       ("python" ,python-2)))
     (home-page "http://www.glfw.org/")
     (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
     (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
     (license (list license:gpl2))))
-    
+
 (define-public ocl-icd
   (package
    (name "ocl-icd")
@@ -113,20 +113,20 @@
              ("ruby" ,ruby)
              ("libtool" ,libtool)
              ("opencl-headers" ,opencl-headers)
-             ("libgcrypt" ,libgcrypt)))                                              
+             ("libgcrypt" ,libgcrypt)))
     (build-system gnu-build-system)
      (arguments
      '(#:phases (modify-phases %standard-phases
                     (add-after 'unpack `bootstrap
                       (lambda _
-                        (zero? (system* "autoreconf" "-vfi")))))))    
+                        (zero? (system* "autoreconf" "-vfi")))))))
     (home-page "https://forge.imag.fr/projects/ocl-icd/")
     (synopsis "OpenCL implementations are provided as ICD (Installable Client Driver).")
     (description "OpenCL implementations are provided as ICD (Installable Client Driver).
     An OpenCL program can use several ICD thanks to the use of an ICD Loader as provided by this project.
     This free ICD Loader can load any (free or non free) ICD")
     (license (list license:gpl2 license:ruby))))
-    
+
 (define-public opencl-headers
 (let ((commit "c1770dc"))
   (package
@@ -160,5 +160,3 @@
     (description "This package provides the Khronos OpenCL headers")
     (home-page "https://www.khronos.org/registry/cl/")
     (license (list license:gpl2)))))
-    
-
diff --git a/gn/packages/clFFT.scm b/gn/packages/clFFT.scm
index 3e72357..fb42c85 100644
--- a/gn/packages/clFFT.scm
+++ b/gn/packages/clFFT.scm
@@ -27,6 +27,7 @@
   #:use-module (gnu packages bootstrap)
   #:use-module (gnu packages base)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages cmake)
@@ -45,7 +46,6 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages version-control)
-  #:use-module (gnu packages zip)  
   #:use-module (gnu packages linux))
 
 (define-public clFFT
@@ -59,7 +59,7 @@
              (sha256
               (base32
                "19hrk1lf06kch8x9dpbdj0waycn2mldrmj2y4vzi7zn2gdfw6g73"))))
-    (build-system cmake-build-system)    
+    (build-system cmake-build-system)
     (arguments `(#:configure-flags '("../clFFT-2.10.1/src" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=Release") #:tests? #f))
     (native-inputs `(("autoconf" ,autoconf)
         ("automake" ,automake)
@@ -85,12 +85,12 @@
        ("xineramaproto" ,xineramaproto)
        ("libxinerama" ,libxinerama)
        ("libxcursor" ,libxcursor)
-       ("python" ,python-2)))       
+       ("python" ,python-2)))
     (home-page "http://www.glfw.org/")
     (synopsis "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
     (description "glfw is an Open Source, multi-platform library for creating windows with OpenGL contexts and receiving input and events.")
     (license (list license:gpl2))))
-    
+
 (define-public ocl-icd
   (package
    (name "ocl-icd")
@@ -109,20 +109,20 @@
              ("ruby" ,ruby)
              ("libtool" ,libtool)
              ("opencl-headers" ,opencl-headers)
-             ("libgcrypt" ,libgcrypt)))                                              
+             ("libgcrypt" ,libgcrypt)))
     (build-system gnu-build-system)
      (arguments
      '(#:phases (modify-phases %standard-phases
                     (add-after 'unpack `bootstrap
                       (lambda _
-                        (zero? (system* "autoreconf" "-vfi")))))))    
+                        (zero? (system* "autoreconf" "-vfi")))))))
     (home-page "https://forge.imag.fr/projects/ocl-icd/")
     (synopsis "OpenCL implementations are provided as ICD (Installable Client Driver).")
     (description "OpenCL implementations are provided as ICD (Installable Client Driver).
     An OpenCL program can use several ICD thanks to the use of an ICD Loader as provided by this project.
     This free ICD Loader can load any (free or non free) ICD")
     (license (list license:gpl2 license:ruby))))
-    
+
 (define-public opencl-headers
 (let ((commit "c1770dc"))
   (package
diff --git a/gn/packages/cwl.scm b/gn/packages/cwl.scm
index 2acac7c..eed6b18 100644
--- a/gn/packages/cwl.scm
+++ b/gn/packages/cwl.scm
@@ -10,9 +10,9 @@
   #:use-module (guix packages)
   #:use-module (guix git-download)
   #:use-module (guix utils)
-  #:use-module (guix build-system gnu)
+  ; #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
-  #:use-module (guix build-system trivial)
+  ; #:use-module (guix build-system trivial)
   #:use-module (srfi srfi-1))
 
 (define-public python-cwltool ; guix: needs work
@@ -85,6 +85,6 @@
     (description
       "Schema Annotations for Linked Avro Data (SALAD)")
     (license license:asl2.0)))
-    
+
 (define-public python2-schema-salad
   (package-with-python2 python-schema-salad))
diff --git a/gn/packages/gemma.scm b/gn/packages/gemma.scm
index 9986bf5..23235d3 100644
--- a/gn/packages/gemma.scm
+++ b/gn/packages/gemma.scm
@@ -55,7 +55,7 @@
   #:use-module (gnu packages vim)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
-  #:use-module (gnu packages zip)
+  ; #:use-module (gnu packages zip)
   #:use-module (gnu packages bootstrap)
   #:use-module (gn packages ldc)
   #:use-module (gn packages ldc)
@@ -66,7 +66,7 @@
   (let ((commit "c978835c3630286414df6076d38aad16277cdb6b"))
   (package
     (name "gemma-git")
-    (version (string-append "0.97-" (string-take commit 7)))
+    (version (string-append "0.97-pre-" (string-take commit 7)))
     (source (origin
              (method git-fetch)
              (uri (git-reference
diff --git a/gn/packages/genenetwork.scm b/gn/packages/genenetwork.scm
index 34178b5..b55c37f 100644
--- a/gn/packages/genenetwork.scm
+++ b/gn/packages/genenetwork.scm
@@ -41,11 +41,10 @@
   #:use-module (gnu packages vim)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
-  #:use-module (gnu packages zip)
   #:use-module (gnu packages bootstrap)
   #:use-module (gnu packages version-control)
   #:use-module (gn packages bioinformatics)
-  #:use-module (gn packages gemma)
+  ; #:use-module (gn packages gemma)
   #:use-module (gn packages javascript)
   #:use-module (gn packages phewas)
   #:use-module (gn packages python)
diff --git a/gn/packages/gtest.scm b/gn/packages/gtest.scm
index 708df09..f11935a 100644
--- a/gn/packages/gtest.scm
+++ b/gn/packages/gtest.scm
@@ -46,7 +46,6 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages version-control)
-  #:use-module (gnu packages zip)  
   #:use-module (gnu packages linux))
 
 (define-public gtest ; guix check
diff --git a/gn/packages/java.scm b/gn/packages/java.scm
index ab93425..6d835b1 100644
--- a/gn/packages/java.scm
+++ b/gn/packages/java.scm
@@ -33,7 +33,7 @@
   #:use-module (gnu packages java)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages certs)
-  #:use-module (gnu packages zip))
+  )
 
 ;; ----------------------------------------------------------------------------
 ;; WORKING PACKAGES
diff --git a/gn/packages/ldc.scm b/gn/packages/ldc.scm
index e39d746..8caeefe 100644
--- a/gn/packages/ldc.scm
+++ b/gn/packages/ldc.scm
@@ -31,7 +31,7 @@
   #:use-module (gnu packages libedit)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages textutils)
-  #:use-module (gnu packages zip))
+)
 
 (define-public ldc-0.17.2 ; guix in main line
   (package
@@ -192,4 +192,4 @@
               (base32
                "12cak7yqmsgjlflx0dp6fwmwb9dac25amgi86n0bb95ard3547wy")))))))))
 
-(define-public ldc ldc-1.1.0-patched)
+(define-public ldc-patched ldc-1.1.0-patched)
diff --git a/gn/packages/lmm.scm b/gn/packages/lmm.scm
index 366c1b5..0b6ad5b 100644
--- a/gn/packages/lmm.scm
+++ b/gn/packages/lmm.scm
@@ -38,7 +38,6 @@
   #:use-module (gnu packages vim)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
-  #:use-module (gnu packages zip)
   #:use-module (gnu packages bootstrap)
   #:use-module (srfi srfi-1))
 
diff --git a/gn/packages/ocl-icd.scm b/gn/packages/ocl-icd.scm
index b33fe9d..79b4853 100644
--- a/gn/packages/ocl-icd.scm
+++ b/gn/packages/ocl-icd.scm
@@ -23,13 +23,13 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module (gnu packages bootstrap)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages base)
-  #:use-module (gnu packages ruby)
-  #:use-module (gnu packages zip)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages gnupg)
-  #:use-module (gnu packages bootstrap)
+  #:use-module (gnu packages ruby)
   #:use-module (guix git-download))
 
 (define-public ocl-icd
@@ -50,20 +50,20 @@
              ("ruby" ,ruby)
              ("libtool" ,libtool)
              ("opencl-headers" ,opencl-headers)
-             ("libgcrypt" ,libgcrypt)))                                              
+             ("libgcrypt" ,libgcrypt)))
     (build-system gnu-build-system)
      (arguments
      '(#:phases (modify-phases %standard-phases
                     (add-after 'unpack `bootstrap
                       (lambda _
-                        (zero? (system* "autoreconf" "-vfi")))))))    
+                        (zero? (system* "autoreconf" "-vfi")))))))
     (home-page "https://forge.imag.fr/projects/ocl-icd/")
     (synopsis "OpenCL implementations are provided as ICD (Installable Client Driver).")
     (description "OpenCL implementations are provided as ICD (Installable Client Driver).
     An OpenCL program can use several ICD thanks to the use of an ICD Loader as provided by this project.
     This free ICD Loader can load any (free or non free) ICD")
     (license license:gpl2)))
-    
+
     (define-public opencl-headers
 (let ((commit "c1770dc"))
   (package
diff --git a/gn/packages/openfyba.scm b/gn/packages/openfyba.scm
index 2b20d09..bfc50b7 100644
--- a/gn/packages/openfyba.scm
+++ b/gn/packages/openfyba.scm
@@ -27,7 +27,7 @@
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages base)
   ;;#:use-module (gnu packages tls)
-  #:use-module (gnu packages zip)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages bootstrap)
   #:use-module (guix git-download))
@@ -48,13 +48,13 @@
              ("autoconf" ,autoconf)
              ("automake" ,automake)
              ("libtool" ,libtool)
-             ("libgcrypt" ,libgcrypt)))                                              
+             ("libgcrypt" ,libgcrypt)))
     (build-system gnu-build-system)
      (arguments
      '(#:phases (modify-phases %standard-phases
                     (add-after 'unpack `bootstrap
                       (lambda _
-                        (zero? (system* "autoreconf" "-vfi")))))))    
+                        (zero? (system* "autoreconf" "-vfi")))))))
     (home-page "http://labs.kartverket.no/sos/")
     (synopsis "source code release of the FYBA library")
     (description "OpenFYBA is the source code release of the FYBA library.")
diff --git a/gn/packages/phewas.scm b/gn/packages/phewas.scm
index f9643af..2bd832e 100644
--- a/gn/packages/phewas.scm
+++ b/gn/packages/phewas.scm
@@ -38,8 +38,6 @@
   #:use-module (gnu packages vim)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
-  #:use-module (gnu packages zip)
-  #:use-module (gnu packages bootstrap)
   #:use-module (srfi srfi-1))
 
 (define-public r-intermediate
@@ -183,7 +181,7 @@ genome-wide association studies in structured populations.")
       ("r-qvalue" ,r-qvalue)
     ))
     (arguments
-     `(#:guile ,%bootstrap-guile
+     `(; #:guile ,%bootstrap-guile
        #:modules ((guix build utils))
        #:builder
          (let* ((out  (assoc-ref %outputs "out"))
diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index 9155d2e..2d245ca 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -32,7 +32,6 @@
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
-  #:use-module (gnu packages zip)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
diff --git a/gn/packages/sambamba.scm b/gn/packages/sambamba.scm
index f5a384f..261e325 100644
--- a/gn/packages/sambamba.scm
+++ b/gn/packages/sambamba.scm
@@ -14,7 +14,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python)
   #:use-module (gnu packages ruby)
-  #:use-module (gn packages ldc)
+  #:use-module (gnu packages ldc)
   #:use-module (gn packages shell)
   #:use-module (srfi srfi-1))
 
diff --git a/gn/packages/statistics.scm b/gn/packages/statistics.scm
index cdf8b41..c24c7d0 100644
--- a/gn/packages/statistics.scm
+++ b/gn/packages/statistics.scm
@@ -16,6 +16,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages bioinformatics)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages bootstrap)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpio)
   #:use-module (gnu packages file)
@@ -37,8 +38,6 @@
   #:use-module (gnu packages vim)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
-  #:use-module (gnu packages zip)
-  #:use-module (gnu packages bootstrap)
   #:use-module (srfi srfi-1))
 
 (define-public r-acepack