public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Julia language: update to a fresh version

Browse Source 
Update julia and some of its dependencies

Split PCRE because a lot of packages depend on it and I am not sure we
want to test them in a hurry (and Julia specifies exact version).
This commit is contained in:
Michael Raskin
2012-08-01 19:03:52 +04:00
parent 4f972b793f
commit 901574fe8a
8 changed files with 154 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/suitesparse/default.nix
View File

@@ -1,9 +1,10 @@
{ stdenv, fetchurl, blas, liblapack, gfortran } :
stdenv.mkDerivation {
name = "suitesparse";
stdenv.mkDerivation rec {
version = "4.0.0";
name = "suitesparse-${version}";
src = fetchurl {
url = http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-3.5.0.tar.gz ;
sha256 = "0npn7c1j5qag5m2r0cmh3bwc42c1jk8k2yg2cfyxlcrp0h7wn4rc";
url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ;
sha256 = "1nvbdw10wa6654k8sa2vhr607q6fflcywyji5xd767cqpwag4v5j";
};
buildInputs = [blas liblapack gfortran] ;
patches = [./disable-metis.patch];
@@ -14,6 +15,8 @@ stdenv.mkDerivation {
mkdir -p $out/include
'';
makeFlags = ''PREFIX=\"$(out)\" INSTALL_LIB=$(out)/lib INSTALL_INCLUDE=$(out)/include'';
NIX_CFLAGS = "-fPIC";
}

130
pkgs/development/libraries/suitesparse/disable-metis.patch
View File

@@ -1,140 +1,18 @@
diff -Nrc SuiteSparse/UFconfig/Makefile SuiteSparse-new/UFconfig/Makefile
*** SuiteSparse/UFconfig/Makefile 2009-11-11 20:59:08.000000000 +0100
--- SuiteSparse-new/UFconfig/Makefile 2010-08-02 13:14:04.000000000 +0200
***************
*** 25,31 ****
# install UFconfig
install:
! $(CP) Lib/libufconfig.a $(INSTALL_LIB)/libufconfig.$(VERSION).a
( cd $(INSTALL_LIB) ; ln -s libufconfig.$(VERSION).a libufconfig.a )
$(CP) UFconfig.h $(INSTALL_INCLUDE)
--- 25,31 ----
# install UFconfig
install:
! $(CP) libufconfig.a $(INSTALL_LIB)/libufconfig.$(VERSION).a
( cd $(INSTALL_LIB) ; ln -s libufconfig.$(VERSION).a libufconfig.a )
$(CP) UFconfig.h $(INSTALL_INCLUDE)
diff -Nrc SuiteSparse/UFconfig/UFconfig.mk SuiteSparse-new/UFconfig/UFconfig.mk
*** SuiteSparse/UFconfig/UFconfig.mk 2010-06-02 17:40:42.000000000 +0200
--- SuiteSparse-new/UFconfig/UFconfig.mk 2010-08-02 14:55:27.000000000 +0200
***************
*** 34,40 ****
# performance. You should select the optimization parameters that are best
# for your system. On Linux, use "CFLAGS = -O3 -fexceptions" for example.
CC = cc
! CFLAGS = -O3 -fexceptions
# C++ compiler (also uses CFLAGS)
CPLUSPLUS = g++
--- 34,40 ----
# performance. You should select the optimization parameters that are best
# for your system. On Linux, use "CFLAGS = -O3 -fexceptions" for example.
CC = cc
! CFLAGS = -O3 -fexceptions -fPIC
# C++ compiler (also uses CFLAGS)
CPLUSPLUS = g++
***************
*** 71,78 ****
# MAKE = gmake
# For "make install"
! INSTALL_LIB = /usr/local/lib
! INSTALL_INCLUDE = /usr/local/include
#------------------------------------------------------------------------------
# BLAS and LAPACK configuration:
--- 71,78 ----
# MAKE = gmake
# For "make install"
! INSTALL_LIB = $(out)/lib
! INSTALL_INCLUDE = $(out)/include
#------------------------------------------------------------------------------
# BLAS and LAPACK configuration:
***************
*** 127,134 ****
# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
# You may wish to use an absolute path. METIS is optional. Compile
# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
! METIS_PATH = ../../metis-4.0
! METIS = ../../metis-4.0/libmetis.a
# If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following
# options:
--- 127,134 ----
# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
# You may wish to use an absolute path. METIS is optional. Compile
# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
! #METIS_PATH = ../../metis-4.0
! #METIS =
# If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following
# options:
***************
*** 189,195 ****
# -DNSUNPERF for Solaris only. If defined, do not use the Sun
# Performance Library
! CHOLMOD_CONFIG =
#------------------------------------------------------------------------------
# SuiteSparseQR configuration:
--- 189,195 ----
# -DNSUNPERF for Solaris only. If defined, do not use the Sun
# Performance Library
! CHOLMOD_CONFIG = -DNPARTITION
#------------------------------------------------------------------------------
# SuiteSparseQR configuration:
***************
*** 203,209 ****
# -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB)
# default, without timing, without TBB:
! SPQR_CONFIG =
# with timing and TBB:
# SPQR_CONFIG = -DTIMING -DHAVE_TBB
# with timing
--- 203,209 ----
# -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB)
# default, without timing, without TBB:
! SPQR_CONFIG = -DNPARTITION
# with timing and TBB:
# SPQR_CONFIG = -DTIMING -DHAVE_TBB
# with timing
diff -Nrc SuiteSparse/UMFPACK/Demo/Makefile SuiteSparse-new/UMFPACK/Demo/Makefile
*** SuiteSparse/UMFPACK/Demo/Makefile 2009-11-11 21:09:45.000000000 +0100
--- SuiteSparse-new/UMFPACK/Demo/Makefile 2010-08-02 12:53:16.000000000 +0200
***************
*** 40,51 ****
*** 40,46 ****
../../CAMD/Lib/libcamd.a:
( cd ../../CAMD ; $(MAKE) library )
- ../../metis-4.0/libmetis.a:
- ( cd ../../metis-4.0/Lib ; $(MAKE) )
- $(METIS):
- ( cd $(METIS_PATH) && $(MAKE) )
UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \
../../CHOLMOD/Lib/libcholmod.a ../../COLAMD/Lib/libcolamd.a \
! ../../CAMD/Lib/libcamd.a ../../metis-4.0/libmetis.a \
../../CCOLAMD/Lib/libccolamd.a
libs: $(UMFPACK)
--- 40,49 ----
--- 40,44 ----
../../CAMD/Lib/libcamd.a:
( cd ../../CAMD ; $(MAKE) library )
UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \
../../CHOLMOD/Lib/libcholmod.a ../../COLAMD/Lib/libcolamd.a \
! ../../CAMD/Lib/libcamd.a \
../../CCOLAMD/Lib/libccolamd.a
libs: $(UMFPACK)