Merge trunk
svn path=/nixpkgs/branches/libpng15/; revision=31217
This commit is contained in:
commit
b08a07a4eb
@ -1,14 +1,14 @@
|
||||
{stdenv, fetchurl_gnome, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext
|
||||
, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl
|
||||
, withGNOME ? false, libgnomeui }:
|
||||
, withGNOME ? false, libgnomeui, xz }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = src.pkgname;
|
||||
|
||||
src = fetchurl_gnome {
|
||||
project = "dia";
|
||||
major = "0"; minor = "97"; patchlevel = "1";
|
||||
sha256 = "0hli89fdzzbshqdznxrbgyqw55qlr4z5xpn86jcg5fl7kln8pzld";
|
||||
major = "0"; minor = "97"; patchlevel = "2"; extension = "xz";
|
||||
sha256 = "1qgawm7rrf4wd1yc0fp39ywv8gbz4ry1s16k00dzg5w6p67lfqd7";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
libxslt docbook_xsl libart_lgpl
|
||||
] ++ stdenv.lib.optional withGNOME libgnomeui;
|
||||
|
||||
buildNativeInputs = [ pkgconfig intltool perl ];
|
||||
buildNativeInputs = [ pkgconfig intltool perl xz ];
|
||||
|
||||
configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome";
|
||||
|
||||
|
@ -1,11 +1,11 @@
|
||||
{ fetchurl, stdenv, libjpeg, libpng, libtiff, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libpano13-2.9.17";
|
||||
name = "libpano13-2.9.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/panotools/libpano13/${name}/${name}.tar.gz";
|
||||
sha256 = "1zcrkw0xw11170mlhh9r8562gafwx3hd92wahl9xxaah5z4v0am2";
|
||||
url = "mirror://sourceforge/panotools/${name}.tar.gz";
|
||||
sha256 = "0wm1r9waa47n482yrl3hnphicdahr581rahgbklk0d2wy51lwpfy";
|
||||
};
|
||||
|
||||
buildInputs = [ perl libjpeg libpng libtiff ];
|
||||
|
@ -2,6 +2,13 @@ source $stdenv/setup
|
||||
|
||||
makeFlags="XAWLIB=-lXaw3d BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults LIBDIR=$out/lib/X11 XFIGDOCDIR=$out/share/doc/xfig MANPATH=$out/man"
|
||||
|
||||
# We need chmod +wx on dirs, not just chmod +w
|
||||
dontMakeSourcesWritable=1
|
||||
postUnpack() {
|
||||
find . -type d | xargs -n1 chmod +x
|
||||
find . -type d | xargs -n1 chmod +x
|
||||
}
|
||||
|
||||
preBuild() {
|
||||
echo "#define XAW3D" >> Imakefile.tmp
|
||||
echo "#define XAW3D1_5E" >> Imakefile.tmp
|
||||
|
@ -1,20 +1,42 @@
|
||||
{ stdenv, fetchurl, makeWrapper, imake
|
||||
, x11, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}:
|
||||
|
||||
let version = "3.2.5b"; in
|
||||
stdenv.mkDerivation {
|
||||
name = "xfig-3.2.5-pre-alpha-5";
|
||||
name = "xfig-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://xfig.org/software/xfig/3.2.5-alpha/xfig.3.2.5-alpha5.full.tar.gz;
|
||||
md5 = "7547b66232569e3c12e4a0639bd92629";
|
||||
url = "http://sourceforge/mcj/xfig.${version}.full.tar.gz";
|
||||
sha256 = "1hl5x49sgc0vap411whhcq6qhvh4xbjg7jggv7ih9pplg5nwy0aw";
|
||||
};
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
buildInputs = [imake x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg makeWrapper];
|
||||
buildInputs = [x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg];
|
||||
|
||||
buildNativeInputs = [ imake makeWrapper ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${libXpm}/include/X11";
|
||||
|
||||
patches =
|
||||
let
|
||||
debPrefix = "http://patch-tracker.debian.org/patch/series/dl/xfig/1:3.2.5.b-2";
|
||||
in
|
||||
[
|
||||
(fetchurl {
|
||||
url = "${debPrefix}/35_CVE-2010-4262.dpatch";
|
||||
sha256 = "18741b3dbipgr55fyp5x0296za3336ylln639jw8yjcyd1call22";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "${debPrefix}/13_remove_extra_libs.dpatch";
|
||||
sha256 = "0v3k30ib7xq5wfhd3yacnal4gbih7nqw0z0aycvc0hafffl97i46";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "${debPrefix}/36_libpng15.dpatch";
|
||||
sha256 = "0ssmvlcpjn3iqj3l38db8j8qpqbzixlwpczq01m49r5w9l3viy8k";
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "An interactive drawing tool for X11";
|
||||
homepage = http://xfig.org;
|
||||
|
@ -13,14 +13,14 @@ assert monotoneSupport -> (monotone != null);
|
||||
|
||||
let
|
||||
name = "ikiwiki";
|
||||
version = "3.20111107";
|
||||
version = "3.20111229";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${name}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
|
||||
sha256 = "5b14370ec9c31138d4937eca4ba9c1f1a74515edd34071cefd0cefa37395565c";
|
||||
sha256 = "6470d40c77ae055cfe8c5bbe2f64c765fc84f1ed2dcdd7dcc7577ae190414b89";
|
||||
};
|
||||
|
||||
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
|
||||
|
@ -1,22 +1,18 @@
|
||||
{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt
|
||||
, autoconf, automake, libtool, cmake, makeWrapper }:
|
||||
{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4
|
||||
, cmake, makeWrapper }:
|
||||
|
||||
let version = "3.5.0"; in
|
||||
let version = "3.6.1"; in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tulip-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/auber/tulip/tulip-${version}/${name}-src.tar.gz";
|
||||
sha256 = "0wl0wqjlifpay61pn7dxr3dl5r4a7v80f5g277p6s06ibvn2p3ln";
|
||||
url = "mirror://sourceforge/auber/${name}-src.tar.gz";
|
||||
sha256 = "0d76zmp7gmid4lc91zz6sp4rzxlga6vfwfqhap04326r4zl4nx1q";
|
||||
};
|
||||
|
||||
buildInputs = [ libxml2 freetype glew ]
|
||||
++ [ autoconf automake libtool cmake qt makeWrapper ];
|
||||
propagagedBuildInputs = [ mesa qt ];
|
||||
buildInputs = [ libxml2 freetype glew mesa qt4 ];
|
||||
|
||||
postInstall=''
|
||||
wrapProgram "$out/bin/tulip"
|
||||
'';
|
||||
buildNativeInputs = [ cmake makeWrapper ];
|
||||
|
||||
# FIXME: "make check" needs Docbook's DTD 4.4, among other things.
|
||||
doCheck = false;
|
||||
|
@ -46,11 +46,10 @@ rec {
|
||||
};
|
||||
|
||||
gitAnnex = lib.makeOverridable (import ./git-annex) {
|
||||
inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which;
|
||||
inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils;
|
||||
inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
|
||||
HTTP testpack hS3 mtl network hslogger hxt json;
|
||||
HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl;
|
||||
QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1;
|
||||
monadControl = haskellPackages.monadControl_OBSOLETE;
|
||||
};
|
||||
|
||||
qgit = import ./qgit {
|
||||
|
@ -1,23 +1,23 @@
|
||||
{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt
|
||||
, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
|
||||
, QuickCheck2, rsync, SHA, testpack, utf8String, which
|
||||
, QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.20111203";
|
||||
version = "3.20111231";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "git-annex-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";
|
||||
sha256 = "236a8fa537be1738a16afcab8a7438dc567dce75a6b71b62780d31048428f74b";
|
||||
sha256 = "4f53e7fc9560838be7efd0c90543c93ce1c7d2ba36b7754200586d845ec114f5";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
|
||||
libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2
|
||||
rsync SHA testpack utf8String which
|
||||
rsync SHA testpack utf8String which liftedBase
|
||||
];
|
||||
|
||||
checkTarget = "test";
|
||||
@ -26,6 +26,7 @@ stdenv.mkDerivation {
|
||||
preConfigure = ''
|
||||
makeFlagsArray=( PREFIX=$out )
|
||||
sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' mdwn2man
|
||||
sed -i -e 's|"cp |"${coreutils}/bin/cp |' -e 's|"rm -f |"${coreutils}/bin/rm -f |' test.hs
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, perl }:
|
||||
|
||||
let
|
||||
name = "openssl-1.0.0d";
|
||||
name = "openssl-1.0.0e";
|
||||
|
||||
opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
|
||||
(throw "openssl needs its platform name cross building" null)
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.openssl.org/source/${name}.tar.gz";
|
||||
sha256 = "1nr0cf6pf8i4qsnx31kqhiqv402xgn76yhjhlbdri8ma1hgislcj";
|
||||
sha256 = "1xw0ffzmr4wbnb0glywgks375dvq8x87pgxmwx6vhgvkflkxqqg3";
|
||||
};
|
||||
|
||||
patches =
|
||||
|
@ -1,25 +1,33 @@
|
||||
{ fetchurl, stdenv, lua5, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis
|
||||
, libpng, mesa, makeWrapper }:
|
||||
{ fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis
|
||||
, libpng, mesa, makeWrapper, zlib }:
|
||||
|
||||
let
|
||||
pname = "naev";
|
||||
version = "0.5.0";
|
||||
name = "${pname}-${version}";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "naev-0.5.0beta1";
|
||||
inherit name;
|
||||
|
||||
srcData = fetchurl {
|
||||
url = http://naev.googlecode.com/files/ndata-0.5.0-beta1;
|
||||
sha256 = "0pqys1wdlxa336i9gjxfkgnq42xrbvq58ym66y0aa9xm92vr53f6";
|
||||
url = "mirror://sourceforge/naev/ndata-${version}";
|
||||
sha256 = "0l05xxbbys3j5h6anvann2vylhp6hnxnzwpcaydaff8fpbbyi6r6";
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = http://naev.googlecode.com/files/naev-0.5.0-beta1.tar.bz2;
|
||||
sha256 = "1nkwjclfjypgdcfbfqkiidsvi0zfjvkcj0dgnrbj1g11rr6kd3wm";
|
||||
url = "mirror://sourceforge/naev/${name}.tar.bz2";
|
||||
sha256 = "0gahi91lmpra0wvxsz49zwwb28q9w2v1s3y7r70252hq6v80kanb";
|
||||
};
|
||||
|
||||
buildInputs = [ SDL lua5 SDL_mixer openal libxml2 pkgconfig libvorbis
|
||||
libpng mesa makeWrapper ];
|
||||
buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng mesa zlib ];
|
||||
|
||||
buildNativeInputs = [ pkgconfig makeWrapper ];
|
||||
|
||||
NIX_CFLAGS_COMPILE="-include ${zlib}/include/zlib.h";
|
||||
|
||||
postInstall = ''
|
||||
ensureDir $out/share/naev
|
||||
cp $srcData $out/share/naev/ndata
|
||||
cp -v $srcData $out/share/naev/ndata
|
||||
wrapProgram $out/bin/naev --add-flags $out/share/naev/ndata
|
||||
'';
|
||||
|
||||
|
@ -8327,9 +8327,7 @@ let
|
||||
|
||||
simgrid = callPackage ../applications/science/misc/simgrid { };
|
||||
|
||||
tulip = callPackage ../applications/science/misc/tulip {
|
||||
qt = qt46;
|
||||
};
|
||||
tulip = callPackage ../applications/science/misc/tulip { };
|
||||
|
||||
vite = callPackage ../applications/science/misc/vite {
|
||||
qt = qt4;
|
||||
|
@ -933,9 +933,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
MonadCatchIOTransformers = callPackage ../development/libraries/haskell/MonadCatchIO-transformers {};
|
||||
|
||||
monadControl_OBSOLETE = callPackage ../development/libraries/haskell/monad-control/0.2.0.3.nix {};
|
||||
monadControl2 = self.monadControl_OBSOLETE;
|
||||
monadControl = callPackage ../development/libraries/haskell/monad-control {};
|
||||
monadControl_0_2_0_3 = callPackage ../development/libraries/haskell/monad-control/0.2.0.3.nix {};
|
||||
monadControl_0_3_1 = callPackage ../development/libraries/haskell/monad-control/0.3.1.nix {};
|
||||
monadControl = self.monadControl_0_3_1;
|
||||
|
||||
monadLoops = callPackage ../development/libraries/haskell/monad-loops {};
|
||||
|
||||
@ -948,7 +948,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {};
|
||||
|
||||
mongoDB = callPackage ../development/libraries/haskell/mongoDB {
|
||||
monadControl = self.monadControl2;
|
||||
monadControl = self.monadControl_0_2_0_3;
|
||||
};
|
||||
|
||||
mpppc = callPackage ../development/libraries/haskell/mpppc {};
|
||||
|
Loading…
Reference in New Issue
Block a user