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

Merge recent master into staging

Browse Source 
Hydra: ?compare=1150594
This commit is contained in:
Vladimír Čunát
2014-09-06 16:51:14 +02:00
parent 20be024d1b 0c398f6040
commit 06fea81c6e
140 changed files with 5000 additions and 2572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/elixir/default.nix
View File

@@ -46,7 +46,7 @@ stdenv.mkDerivation {
'';
license = licenses.epl10;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = [ maintainers.the-kenny ];
};
}

3
pkgs/development/interpreters/octave/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull
, libX11, graphicsmagick, pcre, liblapack, pkgconfig, mesa, fltk
, fftw, fftwSinglePrec, zlib, curl, qrupdate
, qt ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
, qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
, suitesparse ? null, gnuplot ? null, openjdk ? null, python ? null
}:
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
graphicsmagick pcre liblapack pkgconfig mesa fltk zlib curl
fftw fftwSinglePrec qrupdate ]
++ (stdenv.lib.optional (qt != null) qt)
++ (stdenv.lib.optional (qscintilla != null) qscintilla)
++ (stdenv.lib.optional (ghostscript != null) ghostscript)
++ (stdenv.lib.optional (llvm != null) llvm)
++ (stdenv.lib.optional (hdf5 != null) hdf5)