From 3a8112f7daf69190f81a5420bef3c5fac4aaf703 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 29 Dec 2015 20:52:19 +0100
Subject: [PATCH] r-modules: prefer gsl 1.x since 2.x is unsupported by
 r-gsl-1.9.x

---
 pkgs/development/r-modules/default.nix | 62 +++++++++++++-------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 14be68988f84..ee3a17fdb3cc 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -221,53 +221,53 @@ let
   };
 
   packagesWithNativeBuildInputs = {
-    abn = [ pkgs.gsl ];
+    abn = [ pkgs.gsl_1 ];
     adimpro = [ pkgs.imagemagick ];
     audio = [ pkgs.portaudio ];
-    BayesSAE = [ pkgs.gsl ];
-    BayesVarSel = [ pkgs.gsl ];
+    BayesSAE = [ pkgs.gsl_1 ];
+    BayesVarSel = [ pkgs.gsl_1 ];
     BayesXsrc = [ pkgs.readline pkgs.ncurses ];
     bigGP = [ pkgs.openmpi ];
     BiocCheck = [ pkgs.which ];
     Biostrings = [ pkgs.zlib ];
-    bnpmr = [ pkgs.gsl ];
-    BNSP = [ pkgs.gsl ];
+    bnpmr = [ pkgs.gsl_1 ];
+    BNSP = [ pkgs.gsl_1 ];
     cairoDevice = [ pkgs.gtk2 ];
     Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo ];
     Cardinal = [ pkgs.which ];
     chebpol = [ pkgs.fftw ];
     ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ];
-    cit = [ pkgs.gsl ];
+    cit = [ pkgs.gsl_1 ];
     curl = [ pkgs.curl ];
     devEMF = [ pkgs.xorg.libXft ];
-    diversitree = [ pkgs.gsl pkgs.fftw ];
+    diversitree = [ pkgs.gsl_1 pkgs.fftw ];
     EMCluster = [ pkgs.liblapack ];
     fftw = [ pkgs.fftw ];
     fftwtools = [ pkgs.fftw ];
     Formula = [ pkgs.gmp ];
-    geoCount = [ pkgs.gsl ];
+    geoCount = [ pkgs.gsl_1 ];
     git2r = [ pkgs.zlib pkgs.openssl ];
-    GLAD = [ pkgs.gsl ];
+    GLAD = [ pkgs.gsl_1 ];
     glpkAPI = [ pkgs.gmp pkgs.glpk ];
     gmp = [ pkgs.gmp ];
-    graphscan = [ pkgs.gsl ];
-    gsl = [ pkgs.gsl ];
-    HiCseg = [ pkgs.gsl ];
-    iBMQ = [ pkgs.gsl ];
+    graphscan = [ pkgs.gsl_1 ];
+    gsl = [ pkgs.gsl_1 ];
+    HiCseg = [ pkgs.gsl_1 ];
+    iBMQ = [ pkgs.gsl_1 ];
     igraph = [ pkgs.gmp ];
     JavaGD = [ pkgs.jdk ];
     jpeg = [ pkgs.libjpeg ];
-    KFKSDS = [ pkgs.gsl ];
+    KFKSDS = [ pkgs.gsl_1 ];
     kza = [ pkgs.fftw ];
-    libamtrack = [ pkgs.gsl ];
-    mixcat = [ pkgs.gsl ];
-    mvabund = [ pkgs.gsl ];
+    libamtrack = [ pkgs.gsl_1 ];
+    mixcat = [ pkgs.gsl_1 ];
+    mvabund = [ pkgs.gsl_1 ];
     mwaved = [ pkgs.fftw ];
     ncdf4 = [ pkgs.netcdf ];
     ncdf = [ pkgs.netcdf ];
     nloptr = [ pkgs.nlopt ];
     openssl = [ pkgs.openssl ];
-    outbreaker = [ pkgs.gsl ];
+    outbreaker = [ pkgs.gsl_1 ];
     pander = [ pkgs.pandoc pkgs.which ];
     pbdMPI = [ pkgs.openmpi ];
     pbdNCDF4 = [ pkgs.netcdf ];
@@ -278,7 +278,7 @@ let
     proj4 = [ pkgs.proj ];
     qtbase = [ pkgs.qt4 ];
     qtpaint = [ pkgs.qt4 ];
-    R2GUESS = [ pkgs.gsl ];
+    R2GUESS = [ pkgs.gsl_1 ];
     R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype ];
     RAppArmor = [ pkgs.libapparmor ];
     rapportools = [ pkgs.which ];
@@ -286,9 +286,9 @@ let
     rbamtools = [ pkgs.zlib ];
     rcdd = [ pkgs.gmp ];
     RcppCNPy = [ pkgs.zlib ];
-    RcppGSL = [ pkgs.gsl ];
+    RcppGSL = [ pkgs.gsl_1 ];
     RcppOctave = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.octave ];
-    RcppZiggurat = [ pkgs.gsl ];
+    RcppZiggurat = [ pkgs.gsl_1 ];
     rgdal = [ pkgs.proj pkgs.gdal ];
     rgeos = [ pkgs.geos ];
     rggobi = [ pkgs.ggobi pkgs.gtk2 pkgs.libxml2 ];
@@ -297,11 +297,11 @@ let
     RGtk2 = [ pkgs.gtk2 ];
     Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ];
     Rhtslib = [ pkgs.zlib ];
-    ridge = [ pkgs.gsl ];
+    ridge = [ pkgs.gsl_1 ];
     RJaCGH = [ pkgs.zlib ];
     rjags = [ pkgs.jags ];
     rJava = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.jdk pkgs.libzip ];
-    Rlibeemd = [ pkgs.gsl ];
+    Rlibeemd = [ pkgs.gsl_1 ];
     rmatio = [ pkgs.zlib ];
     Rmpfr = [ pkgs.gmp pkgs.mpfr ];
     Rmpi = [ pkgs.openmpi ];
@@ -326,28 +326,28 @@ let
     SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ];
     sdcTable = [ pkgs.gmp pkgs.glpk ];
     seewave = [ pkgs.fftw pkgs.libsndfile ];
-    SemiCompRisks = [ pkgs.gsl ];
+    SemiCompRisks = [ pkgs.gsl_1 ];
     seqinr = [ pkgs.zlib ];
     seqminer = [ pkgs.zlib pkgs.bzip2 ];
     showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype ];
-    simplexreg = [ pkgs.gsl ];
+    simplexreg = [ pkgs.gsl_1 ];
     SOD = [ pkgs.cudatoolkit ]; # requres CL/cl.h
     spate = [ pkgs.fftw ];
     sprint = [ pkgs.openmpi ];
     ssanv = [ pkgs.proj ];
-    stsm = [ pkgs.gsl ];
+    stsm = [ pkgs.gsl_1 ];
     stringi = [ pkgs.icu ];
-    survSNP = [ pkgs.gsl ];
+    survSNP = [ pkgs.gsl_1 ];
     sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype ];
     TAQMNGR = [ pkgs.zlib ];
     tiff = [ pkgs.libtiff ];
-    TKF = [ pkgs.gsl ];
+    TKF = [ pkgs.gsl_1 ];
     tkrplot = [ pkgs.xorg.libX11 ];
-    topicmodels = [ pkgs.gsl ];
+    topicmodels = [ pkgs.gsl_1 ];
     udunits2 = [ pkgs.udunits pkgs.expat ];
     V8 = [ pkgs.v8 ];
-    VBLPCM = [ pkgs.gsl ];
-    VBmix = [ pkgs.gsl pkgs.fftw pkgs.qt4 ];
+    VBLPCM = [ pkgs.gsl_1 ];
+    VBmix = [ pkgs.gsl_1 pkgs.fftw pkgs.qt4 ];
     WhopGenome = [ pkgs.zlib ];
     XBRL = [ pkgs.zlib pkgs.libxml2 ];
     xml2 = [ pkgs.libxml2 ];