summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2016-05-10 11:25:18 +0200
committerMichael Raskin <7c6f434c@mail.ru>2016-05-10 11:29:38 +0200
commit99bab146a5281c737f4043a7d39fdf1a1110d713 (patch)
treeac4f35c0c75b1493a5155076a2c39bed13dba90e /pkgs/development/compilers
parentc84d366295e0483740bcee127e732c3dd31bb0dc (diff)
downloadnixlib-99bab146a5281c737f4043a7d39fdf1a1110d713.tar
nixlib-99bab146a5281c737f4043a7d39fdf1a1110d713.tar.gz
nixlib-99bab146a5281c737f4043a7d39fdf1a1110d713.tar.bz2
nixlib-99bab146a5281c737f4043a7d39fdf1a1110d713.tar.lz
nixlib-99bab146a5281c737f4043a7d39fdf1a1110d713.tar.xz
nixlib-99bab146a5281c737f4043a7d39fdf1a1110d713.tar.zst
nixlib-99bab146a5281c737f4043a7d39fdf1a1110d713.zip
julia: 0.4.2 -> 0.4.5
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/julia/0003-no-ldconfig.patch2
-rw-r--r--pkgs/development/compilers/julia/default.nix8
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/julia/0003-no-ldconfig.patch b/pkgs/development/compilers/julia/0003-no-ldconfig.patch
index d490b7049278..06d1a57ed627 100644
--- a/pkgs/development/compilers/julia/0003-no-ldconfig.patch
+++ b/pkgs/development/compilers/julia/0003-no-ldconfig.patch
@@ -21,9 +21,9 @@ index 22015ff..2821192 100644
 -    FILE *ldc = popen("/sbin/ldconfig -r", "r");
 -#endif
 +    FILE *ldc = popen("true", "r");
+     if (ldc == NULL) return; // ignore errors in running ldconfig (other than whatever might have been printed to stderr)
  
      while (!feof(ldc)) {
-         ssize_t n = getline(&line, &sz, ldc);
 -- 
 2.5.2
 
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 9e90ecfbe216..1dc6805bcd3b 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -33,10 +33,10 @@ let
     sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
   };
 
-  libuvVersion = "9ab431a88fe255dd21e19a11f7fa2dd95774abf4";
+  libuvVersion = "efb40768b7c7bd9f173a7868f74b92b1c5a61a0e";
   libuv = fetchurl {
     url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
-    sha256 = "1bh973lbrzrjk7pcjbjnh4n92qldi81ql3aqsclywn2yg07a36h5";
+    sha256 = "1znkxyv1cy9pjap7afypipzsn04533ni3pqjd191fdgw2sv9cal7";
   };
 
   rmathVersion = "0.1";
@@ -48,12 +48,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "julia";
-  version = "0.4.2";
+  version = "0.4.5";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "04i5kjji5553lkdxz3wgflg1mav5ivwy2dascjy8jprqpq33aknk";
+    sha256 = "09gc6yf3v4in0qwhrbgjrjgvblp941di0mli4zax22mvf4dzc7s4";
   };
 
   prePatch = ''