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

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-02-07 11:17:57 +00:00
parent 0516626101 6205f17ea4
commit 9229e9c656
469 changed files with 23339 additions and 14678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/asymptote/default.nix
+15 -3
View File
@@ -1,8 +1,11 @@
{stdenv, fetchurl
, freeglut, ghostscriptX, imagemagick, fftw
, boehmgc, mesa, ncurses, readline, gsl, libsigsegv
, boehmgc, mesa_glu, mesa_noglu, ncurses, readline, gsl, libsigsegv
, python, zlib, perl, texLive, texinfo, xz
}:
assert stdenv.isLinux;
let
s = # Generated upstream information
rec {
@@ -15,30 +18,39 @@ let
};
buildInputs = [
freeglut ghostscriptX imagemagick fftw
boehmgc mesa ncurses readline gsl libsigsegv
boehmgc mesa_glu mesa_noglu mesa_noglu.osmesa ncurses readline gsl libsigsegv
python zlib perl texLive texinfo xz
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
preConfigure = ''
export HOME="$PWD"
patchShebangs .
sed -e 's@epswrite@eps2write@g' -i runlabel.in
xz -d < ${texinfo.src} | tar --wildcards -x texinfo-'*'/doc/texinfo.tex
cp texinfo-*/doc/texinfo.tex doc/
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${boehmgc}/include/gc"
rm *.tar.gz
configureFlags="$configureFlags --with-latex=$out/share/texmf/tex/latex --with-context=$out/share/texmf/tex/context/third"
'';
NIX_CFLAGS_COMPILE = [ "-I${boehmgc}/include/gc" ];
postInstall = ''
mv -v "$out/share/info/asymptote/"*.info $out/share/info/
sed -i -e 's|(asymptote/asymptote)|(asymptote)|' $out/share/info/asymptote.info
rmdir $out/share/info/asymptote
rm $out/share/info/dir
'';
enableParallelBuilding = true;
meta = {
inherit (s) version;
description = "A tool for programming graphics intended to replace Metapost";
pkgs/tools/graphics/cuneiform/default.nix
+7 -30
View File
@@ -1,42 +1,19 @@
a @ { cmake, patchelf, imagemagick, ... } :
let
fetchurl = a.fetchurl;
{ stdenv, fetchurl, cmake, patchelf, imagemagick }:
stdenv.mkDerivation rec {
name = "cuneiform-${version}";
version = "1.1.0";
buildInputs = with a; [
cmake imagemagick patchelf
];
in
rec {
src = fetchurl {
url = "https://launchpad.net/cuneiform-linux/1.1/1.1/+download/cuneiform-linux-1.1.0.tar.bz2";
sha256 = "1bdvppyfx2184zmzcylskd87cxv56d8f32jf7g1qc8779l2hszjp";
};
inherit buildInputs;
configureFlags = [];
buildInputs = [
cmake imagemagick
];
/* doConfigure should be removed if not needed */
phaseNames = ["doCmake" "doMakeInstall" "postInstall"];
libc = if a.stdenv ? glibc then a.stdenv.glibc else "";
doCmake = a.fullDepEntry(''
mkdir -p $PWD/builddir
cd builddir
export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib"
cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib
'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
needLib64 = a.stdenv.system == "x86_64-linux";
postInstall = a.fullDepEntry(''
patchelf --set-rpath $out/lib${if needLib64 then "64" else ""}${if a.stdenv.cc.cc != null then ":${a.stdenv.cc.cc}/lib" else ""}${if a.stdenv.cc.cc != null && needLib64 then ":${a.stdenv.cc.cc}/lib64" else ""}:${a.imagemagick}/lib $out/bin/cuneiform
'') ["minInit" "addInputs" "doMakeInstall"];
name = "cuneiform-" + version;
meta = {
inherit version;
description = "Multi-language OCR system";
};
}
pkgs/tools/graphics/vips/default.nix
+2 -2
View File
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
name = "vips-8.1.1";
name = "vips-8.2.2";
src = fetchurl {
url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz";
sha256 = "014sgpqj832vl5k212jv25sjakrsifnspjfclywpmn7cwaqwjlvx";
sha256 = "12b319aicr129cpi5sixwd3q91y97vwwva6b044zy54px4s8ls0g";
};
buildInputs =
pkgs/tools/graphics/welkin/default.nix
+23 -45
View File
@@ -1,57 +1,35 @@
x@{builderDefsPackage
, jre
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
["jre"];
{ stdenv, fetchsvn, jre, makeWrapper }:
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="welkin";
version="1.1";
name="${baseName}-${version}";
url="http://simile.mit.edu/dist/welkin/${name}.tar.gz";
hash="0hr2xvfz887fdf2ysiqydv6m13gbdl5x0fh4960i655d5imvd5x0";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
stdenv.mkDerivation rec {
name = "welkin-${version}";
version = "1.1";
src = fetchsvn {
url = "http://simile.mit.edu/repository/welkin";
rev = "9638";
sha256 = "1bqh3vam7y805xrmdw7k0ckcfwjg88wypxgv3njkkwyn7kxnfnqp";
};
inherit (sourceInfo) name version;
inherit buildInputs;
sourceRoot = "welkin-r9638/tags/${version}";
/* doConfigure should be removed if not needed */
phaseNames = ["doDeploy" "createBin"];
buildInputs = [ jre makeWrapper ];
doDeploy = a.simplyShare "welkin";
createBin = a.fullDepEntry ''
mkdir -p "$out/bin"
echo "#! ${a.stdenv.shell}" > "$out/bin/welkin"
echo "export JAVA_HOME=${jre}" >> "$out/bin/welkin"
echo "\"$out/share/welkin/welkin.sh\" \"\$@\"" >> "$out/bin/welkin"
sed -e 's@[.]/lib/welkin[.]jar@"'"$out"'/share/welkin/lib/welkin.jar"@' -i "$out/share/welkin/welkin.sh"
chmod a+x "$out/bin/welkin"
'' ["minInit" "defEnsureDir"];
installPhase = ''
mkdir -p $out/{bin,share}
cp -R . $out/share
cp $out/share/welkin.sh $out/bin/welkin
sed -e 's@\./lib/welkin\.jar@'"$out"'/share/lib/welkin.jar@' -i $out/bin/welkin
wrapProgram $out/bin/welkin \
--set JAVA_HOME ${jre}
chmod a+x $out/bin/welkin
'';
meta = {
description = "An RDF visualizer";
maintainers = with a.lib.maintainers;
[
maintainers = with stdenv.lib.maintainers; [
raskin
];
hydraPlatforms = [];
license = a.lib.licenses.free;
license = stdenv.lib.licenses.free;
};
passthru = {
updateInfo = {
downloadPage = "http://simile.mit.edu/dist/welkin/";
};
};
}) x
}