Merge remote-tracking branch 'origin/master' into stdenv-updates

This commit is contained in:
Eelco Dolstra 2013-02-15 13:36:34 +01:00
commit 2aa6f262cb
302 changed files with 14276 additions and 4226 deletions

View file

@ -0,0 +1,122 @@
#! /bin/sh -e
export PERL5LIB=/nix/var/nix/profiles/per-user/eelco/cpan-generator/lib/perl5/site_perl
name="$1"
[ -n "$name" ] || { echo "no name"; exit 1; }
cpan -D "$name" > cpan-info
url="$(echo $(cat cpan-info | sed '6!d'))"
[ -n "$url" ] || { echo "no URL"; exit 1; }
url="mirror://cpan/authors/id/$url"
echo "URL = $url" >&2
version=$(cat cpan-info | grep 'CPAN: ' | awk '{ print $2 }')
echo "VERSION = $version"
declare -a xs=($(PRINT_PATH=1 nix-prefetch-url "$url"))
hash=${xs[0]}
path=${xs[1]}
echo "HASH = $hash" >&2
namedash="$(echo $name | sed s/::/-/g)-$version"
attr=$(echo $name | sed s/:://g)
rm -rf cpan_tmp
mkdir cpan_tmp
tar xf "$path" -C cpan_tmp
shopt -s nullglob
meta=$(echo cpan_tmp/*/META.json)
if [ -z "$meta" ]; then
yaml=$(echo cpan_tmp/*/META.yml)
[ -n "$yaml" ] || { echo "no meta file"; exit 1; }
meta=$(echo $yaml | sed s/\.yml$/.json/)
perl -e '
use YAML;
use JSON;
local $/;
$x = YAML::Load(<>);
print encode_json $x;
' < $yaml > $meta
fi
description="$(json abstract < $meta | perl -e '$x = <>; print uc(substr($x, 0, 1)), substr($x, 1);')"
homepage="$(json resources.homepage < $meta)"
if [ -z "$homepage" ]; then
#homepage="$(json meta-spec.url < $meta)"
true
fi
license="$(json license < $meta | json -a 2> /dev/null || true)"
if [ -z "$license" ]; then
license="$(json -a license < $meta)"
fi
license="$(echo $license | sed s/perl_5/perl5/)"
f() {
local type="$1"
perl -e '
use JSON;
local $/;
$x = decode_json <>;
if (defined $x->{prereqs}) {
$x2 = $x->{prereqs}->{'$type'}->{requires};
} elsif ("'$type'" eq "runtime") {
$x2 = $x->{requires};
} elsif ("'$type'" eq "configure") {
$x2 = $x->{configure_requires};
} elsif ("'$type'" eq "build") {
$x2 = $x->{build_requires};
}
foreach my $y (keys %{$x2}) {
next if $y eq "perl";
eval "use $y;";
if (!$@) {
print STDERR "skipping Perl-builtin module $y\n";
next;
}
print $y, "\n";
};
' < $meta | sed s/:://g
}
confdeps=$(f configure)
builddeps=$(f build)
testdeps=$(f test)
runtimedeps=$(f runtime)
buildInputs=$(echo $(for i in $confdeps $builddeps $testdeps; do echo $i; done | sort | uniq))
propagatedBuildInputs=$(echo $(for i in $runtimedeps; do echo $i; done | sort | uniq))
echo "===" >&2
cat <<EOF
$attr = buildPerlPackage {
name = "$namedash";
src = fetchurl {
url = $url;
sha256 = "$hash";
};
EOF
if [ -n "$buildInputs" ]; then
cat <<EOF
buildInputs = [ $buildInputs ];
EOF
fi
if [ -n "$propagatedBuildInputs" ]; then
cat <<EOF
propagatedBuildInputs = [ $propagatedBuildInputs ];
EOF
fi
cat <<EOF
meta = {
homepage = $homepage;
description = "$description";
license = "$license";
};
};
EOF

View file

@ -0,0 +1,53 @@
{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, jackaudio, libsndfile
, glib, gtk, glibmm, gtkmm, fftw, librdf, ladspaH, boost }:
stdenv.mkDerivation rec {
name = "guitarix-${version}";
version = "0.25.2";
src = fetchurl {
url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2";
sha256 = "1wcg3yc2iy72hj6z9l88393f00by0iwhhn8xrc3q55p4rj0mnrga";
};
buildInputs =
[ python gettext intltool pkgconfig jackaudio libsndfile glib gtk glibmm
gtkmm fftw librdf ladspaH boost
];
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf build";
installPhase = "python waf install";
meta = {
description = "A virtual guitar amplifier for Linux running with JACK";
longDescription = ''
guitarix is a virtual guitar amplifier for Linux running with
JACK (Jack Audio Connection Kit). It is free as in speech and
free as in beer. Its free sourcecode allows to build it for
other UNIX-like systems also, namely for BSD and for MacOSX.
It takes the signal from your guitar as any real amp would do:
as a mono-signal from your sound card. Your tone is processed by
a main amp and a rack-section. Both can be routed separately and
deliver a processed stereo-signal via JACK. You may fill the
rack with effects from more than 25 built-in modules spanning
from a simple noise-gate to brain-slashing modulation-fx like
flanger, phaser or auto-wah. Your signal is processed with
minimum latency. On any properly set-up Linux-system you do not
need to wait for more than 10 milli-seconds for your playing to
be delivered, processed by guitarix.
guitarix offers the range of sounds you would expect from a
full-featured universal guitar-amp. You can get crisp
clean-sounds, nice overdrive, fat distortion and a diversity of
crazy sounds never heard before.
'';
homepage = http://guitarix.sourceforge.net/;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = [ stdenv.lib.maintainers.astsmtl ];
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -1,20 +1,22 @@
{ stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }:
stdenv.mkDerivation rec {
version = "0.3.8";
version = "0.3.9";
name = "qjackctl-${version}";
# some dependencies such as killall have to be installed additionally
src = fetchurl {
url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
sha256 = "1rbipbknq7f8qfma33vwfv2ar3vxkz1p1ykp5mx6nirmcn1nj247";
sha256 = "0a4s7lwd5b67qbwv1yck8bw6zz8ffx1gza5fwflfqrfcfl3dds2y";
};
buildInputs = [ qt4 alsaLib jackaudio dbus ];
configureFlags = "--enable-jack-version";
meta = {
description = "qt jackd control gui tool";
description = "A Qt application to control the JACK sound server daemon";
homepage = http://qjackctl.sourceforge.net/;
license = "GPL";
};

View file

@ -8,12 +8,12 @@
assert stdenv ? glibc;
stdenv.mkDerivation rec {
version = "1.1.1";
version = "1.1.2";
name = "darktable-${version}";
src = fetchurl {
url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz";
sha256 = "0k1m7nd42yn4c2jr1ps1g96fqk9pq20cxjp7dmlza61pj2j9nads";
sha256 = "225ebf1bd2ca4cf06aa609f2eda55cb0894ae69bdf4db25fd97b2503c28e1765";
};
buildInputs =

View file

@ -4,14 +4,14 @@
, gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }:
stdenv.mkDerivation rec {
name = "inkscape-0.48.3.1";
name = "inkscape-0.48.4";
src = fetchurl {
url = "mirror://sourceforge/inkscape/${name}.tar.bz2";
sha256 = "126vfsafkfj6z65i5vp6g5dg9hvp3dd1zppjhms78257ns2zafq7";
sha256 = "17aiibgdwjqpjc38f0yr2sdlgwngg5ac9srlybjcx9aspf6ashc7";
};
patches = [ ./configure-python-libs.patch ./libpng-1.5.patch ];
patches = [ ./configure-python-libs.patch ];
propagatedBuildInputs = [
# Python is used at run-time to execute scripts, e.g., those from

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, qt, bzip2, lib3ds, levmar, muparser, unzip}:
{stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip}:
stdenv.mkDerivation rec {
name = "meshlab-1.3.2";
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
sourceRoot = ".";
buildInputs = [ qt unzip ];
buildInputs = [ qt4 unzip ];
meta = {
description = "System for the processing and editing of unstructured 3D triangular meshes";

View file

@ -20,20 +20,20 @@ stdenv.mkDerivation {
patches =
let
debPrefix = "http://patch-tracker.debian.org/patch/series/dl/xfig/1:3.2.5.b-2";
debPrefix = "http://patch-tracker.debian.org/patch/series/dl/xfig/1:3.2.5.b-3";
in
[
(fetchurl {
url = "${debPrefix}/35_CVE-2010-4262.dpatch";
sha256 = "18741b3dbipgr55fyp5x0296za3336ylln639jw8yjcyd1call22";
url = "${debPrefix}/35_CVE-2010-4262.patch";
sha256 = "1pj669sz49wzjvvm96gwbnani7wqi0ijh21imqdzqw47qxdv7zp5";
})
(fetchurl {
url = "${debPrefix}/13_remove_extra_libs.dpatch";
sha256 = "0v3k30ib7xq5wfhd3yacnal4gbih7nqw0z0aycvc0hafffl97i46";
url = "${debPrefix}/13_remove_extra_libs.patch";
sha256 = "1qb14ay0c8xrjzhi21jl7sl8mdzxardldzpnflkzml774bbpn8av";
})
(fetchurl {
url = "${debPrefix}/36_libpng15.dpatch";
sha256 = "0ssmvlcpjn3iqj3l38db8j8qpqbzixlwpczq01m49r5w9l3viy8k";
url = "${debPrefix}/36_libpng15.patch";
sha256 = "0jd5bqj7sj9bbnxg2d0y6zmv4ka4qif2x4zc84ngdqga5433anvn";
})
];

View file

@ -1,7 +1,6 @@
{stdenv, fetchurl,
zlib, libpng, libjpeg, perl, expat, qt3,
libX11, libXext, libSM, libICE,
withKde, kdelibs, kdebase
}:
stdenv.mkDerivation rec {
@ -13,7 +12,6 @@ stdenv.mkDerivation rec {
buildInputs =
[zlib libpng libX11 libXext libSM libICE perl expat libjpeg]
++ (if withKde then [kdelibs] else [])
;
patches = [ ./timezone-glibc.patch ];
@ -51,7 +49,6 @@ stdenv.mkDerivation rec {
--x-includes=${libX11}/include
--x-libraries=${libX11}/lib
--with-qt-dir=${qt3}
--with-kde-support=${if withKde then "yes" else "no"} --with-ical-support=${if withKde then "yes" else "no"}
";
preInstall = ''
@ -61,7 +58,7 @@ stdenv.mkDerivation rec {
installFlags =
# kde_locale is not defined when installing without kde.
if withKde then "" else "kde_locale=\${out}/share/locale";
"kde_locale=\${out}/share/locale";
meta = {
homepage = "http://www.taskjuggler.org";

View file

@ -50,7 +50,7 @@ let
use_system_libexpat = true;
use_system_libexif = true;
use_system_libjpeg = true;
use_system_libpng = true;
use_system_libpng = !post24;
use_system_libusb = true;
use_system_libxml = true;
use_system_speex = true;

View file

@ -6,13 +6,13 @@
sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s";
};
beta = {
version = "25.0.1364.36";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.36.tar.bz2";
sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s";
version = "25.0.1364.68";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.68.tar.bz2";
sha256 = "0ps3dnpih2nxb0zkw251cfrls126ysnp818bjzcbl325cbypcgc9";
};
stable = {
version = "24.0.1312.52";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.52.tar.bz2";
sha256 = "04fp04591dszx07wwdsgxf0wb2sxm863z1qxn5dii6f9yjqgh3gk";
version = "24.0.1312.69";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.69.tar.bz2";
sha256 = "1nvnhkky72nywk601vx5bbjp1m2f5dygza9h34y20inz3jgg8nbr";
};
}

View file

@ -78,7 +78,12 @@ get_channel_exprs()
do
channel="${chline%%,*}";
version="${chline##*,}";
url="${bucket_url%/}/chromium-$version.tar.bz2";
# XXX: Remove case after version 26 is stable:
case "${version%%.*}" in
26) url="${bucket_url%/}/chromium-$version-lite.tar.xz";;
*) url="${bucket_url%/}/chromium-$version.tar.bz2";;
esac;
echo -n "Checking if sha256 of version $version is cached..." >&2;
if sha256="$(sha_lookup "$version")";

View file

@ -21,8 +21,8 @@ rec {
src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "3752f13f26a51dd2e42d2805a707a842e6f8d1b1";
url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha256 = "1qwvs3rdmrnkjnjvhi3vh4mjdpxr43zcm7llc6z5qws9n9yx15n1";
};
commonConfigureFlags =

View file

@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "18.0.1";
firefoxVersion = "18.0.2";
xulVersion = "18.0.1"; # this attribute is used by other packages
xulVersion = "18.0.2"; # this attribute is used by other packages
src = fetchurl {
@ -27,7 +27,7 @@ rec {
# Fall back to this url for versions not available at releases.mozilla.org.
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
];
sha1 = "26415396233450a4e66bb0e0a73a258e1cb174ef";
sha1 = "fe5810d61edf6f4dc8bc477a08f9483b955f747b";
};
commonConfigureFlags =

View file

@ -44,9 +44,9 @@ let
throw "no x86_64 debugging version available"
else rec {
# -> http://labs.adobe.com/downloads/flashplayer10.html
version = "11.2.202.251";
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux_x86_64.tar.gz";
sha256 = "0nkwpqp8ilv21rlmr4jv8abdnfmz292y3w1qlx6r67qf926nfrz2";
version = "11.2.202.262";
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
sha256 = "1bfr7ajpqkah4kshhqkmi2c15mm962absrq9ks7gfsfaircp387j";
}
else if stdenv.system == "i686-linux" then
if debug then {
@ -55,9 +55,9 @@ let
url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk";
} else rec {
version = "11.2.202.251";
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux_i386.tar.gz";
sha256 = "0nph42s1bspf88m1qqrvc93kkxkrvq3lfs5iq4l5dflwzs32jdm3";
version = "11.2.202.262";
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
sha256 = "0fhslr46apa6qfzdhagmjb8vbl741ryh6j14qy2271nl2q687jsx";
}
else throw "Flash Player is not supported on this platform";

View file

@ -45,6 +45,8 @@ in
stdenv.mkDerivation rec {
name = "google-talk-plugin-${version}";
# Use the following to determine the current upstream version:
# curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | sed -nr 's/^Version: *([^ ]+)-1$/\1/p'
version = "3.10.2.0";
src =

View file

@ -3,12 +3,12 @@
, pango, pkgconfig, scrollkeeper, zlib
}:
stdenv.mkDerivation {
name = "gnumeric-1.11.3";
stdenv.mkDerivation rec {
name = "gnumeric-1.12.0";
src = fetchurl {
url = mirror://gnome/sources/gnumeric/1.11/gnumeric-1.11.3.tar.xz;
sha256 = "1hblcbba4qzlby094dih6ncclgf2n5ac59lqg9dykpz8ad3hxw72";
url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
sha256 = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111";
};
configureFlags = "--disable-component";

View file

@ -1,40 +1,24 @@
# Patchelf fails to hard-code the library paths to ledger's
# libamounts.so and libledger-2.6.3 shared objects:
#
# $ ldd ~/.nix-profile/bin/ledger
# linux-vdso.so.1 => (0x00007fff513ff000)
# libamounts.so.0 => not found
# libledger-2.6.3.so => not found
# libstdc++.so.6 => /nix/store/3r8kfi33y3lbrsvlx8vzwm74h8178y35-gcc-4.5.1/lib/../lib64/libstdc++.so.6 (0x00007f1f0feee000)
# libpcre.so.0 => /nix/store/kfhy189arpj3wrfzpgw8p9ac4g4hfgca-pcre-8.10/lib/libpcre.so.0 (0x00007f1f0fcd3000)
# libgmp.so.3 => /nix/store/ji6py9m9w2ray1bmpkmgig9llj1i2ggf-gmp-4.3.2/lib/libgmp.so.3 (0x00007f1f0fa7f000)
# libm.so.6 => /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libm.so.6 (0x00007f1f0f7fd000)
# libgcc_s.so.1 => /nix/store/3r8kfi33y3lbrsvlx8vzwm74h8178y35-gcc-4.5.1/lib/../lib64/libgcc_s.so.1 (0x00007f1f0f5e8000)
# libc.so.6 => /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libc.so.6 (0x00007f1f0f27d000)
# /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/ld-linux-x86-64.so.2 (0x00007f1f101ef000)
#
# Fortunately, libtools builds the program with proper paths hard-coded
# alread, so we don't need patchelf. Phew!
{ stdenv, fetchurl, emacs, gmp, pcre, expat }:
{stdenv, fetchurl, emacs, gmp, pcre, expat}:
let
stdenv.mkDerivation rec {
name = "ledger-2.6.3";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "https://github.com/downloads/jwiegley/ledger/${name}.tar.gz";
url = "https://github.com/downloads/ledger/ledger/${name}.tar.gz";
sha256 = "05zpnypcwgck7lwk00pbdlcwa347xsqifxh4zsbbn01m98bx1v5k";
};
buildInputs = [ emacs gmp pcre expat ];
configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3";
dontPatchELF = true;
doCheck = true;
# Patchelf breaks the hard-coded rpath to ledger's libamounts.0.so and
# libledger-2.6.3.so. Fortunately, libtool chooses proper rpaths to
# begin with, so we can just disable patchelf to avoid the issue.
dontPatchELF = true;
meta = {
homepage = "http://ledger-cli.org/";
description = "A double-entry accounting system with a command-line reporting interface";

View file

@ -1,105 +0,0 @@
source $stdenv/setup
export nodep=TRUE
export NO_HIDS=TRUE
export PATH=$icu/sbin:$PATH
postUnpack() {
tar xvjf $src_system
}
preConfigure() {
./configure --help
for i in sysui/desktop/share/makefile.mk; do
substituteInPlace $i --replace /bin/bash $shell
done
SRCDIR=
sed -e '/CURL_NO_OLDIES/d' -i ucb/source/ucp/ftp/makefile.mk
}
postConfigure() {
for i in LinuxX86*Env.Set; do
substituteInPlace $i --replace /usr /no-such-path
done
substituteInPlace solenv/inc/libs.mk \
--replace /usr/lib/libjpeg.so $libjpeg/lib/libjpeg.so \
--replace /usr/lib64/libjpeg.so $libjpeg/lib/libjpeg.so
}
buildPhase() {
source LinuxX86*Env.Set.sh
./bootstrap
# bootstrap defines the alias 'build', that mostly runs this perl script:
(cd instsetoo_native; perl ../solenv/bin/build.pl --all) # wait a few hours... add -P4 for quadcores
}
wrapSOffice() {
local fn=$1
local arg=$2
# !!! should use makeWrapper for this.
cat > $out/bin/$fn <<EOF
#! $shell
# Add fontconfig to the library search path; apparently OpenOffice
# looks for it at runtime.
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH\${LD_LIBRARY_PATH:+:}$fontconfig/lib:$libjpeg/lib:$cups/lib
export JAVA_HOME=$jdk
exec $ooFiles/openoffice.org3/program/soffice $arg "\$@"
EOF
chmod +x $out/bin/$fn
}
installPhase() {
ooFiles=$out/lib/openoffice
# This was all borrowed from ooo-build-2.2.1's bin/ooinstall.
# This needs the ./bootstrap having run in the buildPhase to get some env vars.
eval $(grep 'BUILD\|LAST_MINOR' $SOLARENV/inc/minor.mk)
export PYTHONPATH=$SOLARVERSION/$INPATH/lib:$SRC_ROOT/instsetoo_native/$INPATH/bin:$PYTHONPATH
export OUT=../$INPATH
export LOCAL_OUT=../$INPATH
export LOCAL_COMMON_OUT=../$INPATH
# Do the actual installation into $out.
(cd $SRC_ROOT/instsetoo_native/util && perl -w $SOLARENV/bin/make_installer.pl \
-f openoffice.lst -l en-US -p OpenOffice \
-buildid $BUILD -simple $ooFiles)
mkdir -p $out/bin
for i in soffice ooffice; do wrapSOffice $i; done
# Create some wrappers to start individual OpenOffice components.
for i in writer calc draw impress base math web; do wrapSOffice oo$i -$i; done
# Create symlinks to desktop files, so that openoffice.org apps can be picked from
# the application menu in KDE and GNOME
mkdir -p $out/share
ln -s $out/lib/openoffice/openoffice.org3/share/xdg $out/share/applications
# Apply a minor correction to the *.desktop files in order to correctly address the icons
# The openoffice- prefix should be removed from the icon identifiers
for appl in $out/share/applications/*.desktop
do
chmod 644 $appl # What's wrong with the file permissions?
sed -i '/Icon/d' $appl
echo "Icon=$(echo $(basename $appl) | sed 's/.desktop//')" >> $appl
done
# Copy icons so that the menu items in KDE and GNOME will look much nicer
(cd $SRC_ROOT/sysui/desktop/icons
install -v -d $out/share/icons/{hicolor,locolor} -m 755
cp -rv hicolor/*x* $out/share/icons/hicolor
cp -rv locolor/*x* $out/share/icons/locolor
)
# The desktop files expect a openoffice.org3 executable in the PATH, which is a symlink to soffice
ln -s $out/bin/soffice $out/bin/openoffice.org3
}
genericBuild

View file

@ -1,105 +0,0 @@
{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, ArchiveZip
, CompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd
, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
, libXinerama, openssl, gperf, cppunit, GConf, ORBit2
}:
let version = "3.2.1"; in
stdenv.mkDerivation rec {
name = "openoffice.org-${version}";
builder = ./builder.sh;
downloadRoot = "http://openoffice.mirrorbrain.org/files/stable";
versionDirs = true;
src = fetchurl {
url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_core.tar.bz2";
sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i";
};
patches = [ ./oo.patch ./root-required.patch ./xlib.patch ];
postPatch =
/* Compiling with GCC 4.5 fails:
Compiling: cppu/source/AffineBridge/AffineBridge.cxx
[...]
../../inc/uno/lbnames.h:67:2: error: #error "Supported gcc majors are 2 , 3 and 4 <= 4.4. Unsupported gcc major version."
However, we can't compile with GCC 4.4 because then we'd end up with
two different versions of libstdc++ (because the deps are compiled
with 4.5), which isn't supported (link time error.)
Thus, force compilation with 4.5 and hope for the best. */
'' sed -i "cppu/inc/uno/lbnames.h" \
-e 's/#[[:blank:]]*error "Supported.*$//g'
'';
src_system = fetchurl {
url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_system.tar.bz2";
sha256 = "0giy3sza64ij19w7b06rxcrkrb5kq2fvkz486vh3mv08s8xa8zfc";
};
preConfigure = ''
PATH=$PATH:${icu}/sbin
'';
configureFlags = "
--with-package-format=native
--disable-epm
--disable-fontooo
--disable-gnome-vfs
--disable-gnome-vfs
--disable-mathmldtd
--disable-mozilla
--disable-odk
--disable-pasf
--with-cairo
--with-system-libs
--with-system-python
--with-system-boost
--with-system-db
--with-jdk-home=${jdk}
--with-ant-home=${ant}
--without-afms
--without-dict
--without-fonts
--without-myspell-dicts
--without-nas
--without-ppds
--without-system-agg
--without-system-beanshell
--without-system-hsqldb
--without-system-xalan
--without-system-xerces
--without-system-xml-apis
--without-system-xt
--without-system-jars
--without-system-hunspell
--without-system-altlinuxhyph
--without-system-lpsolve
--without-system-graphite
";
LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib";
buildInputs = [
pam python tcsh libxslt perl ArchiveZip CompressZlib zlib
libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl
libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack
getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
cups libXinerama openssl gperf GConf ORBit2
];
inherit icu fontconfig libjpeg jdk cups;
meta = {
description = "OpenOffice.org is a multiplatform and multilingual office suite";
homepage = http://www.openoffice.org/;
license = "LGPL";
maintainers = [ stdenv.lib.maintainers.raskin ];
};
}

View file

@ -1,72 +0,0 @@
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index 74c64bf..fbf8d21 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -57,7 +57,7 @@ ADDITIONAL_FILES= \
#CONFIGURE_DIR=$(BUILD_DIR)
#relative to CONFIGURE_DIR
-CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
+CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" --prefix=$(TMPDIR)
CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
BUILD_ACTION=make
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 0d92de9..aae3b4f 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -130,7 +130,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
# do not enable grddl parser (#i93768#)
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index fba6460..fc70419 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -126,7 +126,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 710d7d6..dd60f0d 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -132,7 +132,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/hunspell/hunspell-1.2.8.patch b/hunspell/hunspell-1.2.8.patch
index 37b7964..e6fd962 100644
--- a/hunspell/hunspell-1.2.8.patch
+++ b/hunspell/hunspell-1.2.8.patch
@@ -619,3 +619,15 @@
p++;
}
if (i > 0 && buf[i - 1] == '\n') {
+diff --git a/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh b/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh
+index 90080f6..f069517 100755
+--- a/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh
++++ b/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh
+--- misc/hunspell-1.2.8/tests/test.sh Sep 4 01:25:35 2007
++++ misc/build/hunspell-1.2.8/tests/test.sh Jun 18 11:53:11 2008
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ export LC_ALL="C"
+
+ function check_valgrind_log () {

View file

@ -1,25 +0,0 @@
As nix chroot environment does not have the 'root' as owner, we have to disable
the "owner=root" tar parameters when doing these tar files.
They are built at openoffice build time.
diff --git a/sysui/desktop/slackware/makefile.mk b/sysui/desktop/slackware/makefile.mk
index 3342aca..49679b1 100644
--- a/sysui/desktop/slackware/makefile.mk
+++ b/sysui/desktop/slackware/makefile.mk
@@ -100,7 +100,7 @@ $(MISC)/$(TARGET)/usr/share/applications/ :
$(MISC)/$(TARGET)/empty.tar :
@$(MKDIRHIER) $(@:d)/empty
- @tar -C $(MISC)/$(TARGET)/empty --owner=root --group=root --same-owner -cf $@ .
+ @tar -C $(MISC)/$(TARGET)/empty -cf $@ .
# --- packaging ---------------------------------------------------
@@ -112,7 +112,7 @@ $(MENUFILES) : $(MISC)/$(TARGET)/empty.tar
-$(RM) -r $(MISC)$/$(@:b)
dmake $(MISC)$/$(@:b)$/usr/share/applications $(MISC)$/$(@:b)$/install$/slack-desc $(MISC)$/$(@:b)$/install$/doinst.sh
@$(COPY) $(MISC)/$(TARGET)$/empty.tar $@.tmp
- @tar -C $(MISC)/$(@:b) --owner=root --group=root --same-owner --exclude application.flag -rf $@.tmp install usr opt
+ @tar -C $(MISC)/$(@:b) --exclude application.flag -rf $@.tmp install usr opt
@gzip < $@.tmp > $@
@$(RM) $@.tmp
$(RM) -r $(MISC)$/$(@:b)

View file

@ -1,22 +0,0 @@
https://bugs.freedesktop.org/show_bug.cgi?id=31322
diff -rc OOO320_m19-orig//vcl/unx/inc/dtint.hxx OOO320_m19//vcl/unx/inc/dtint.hxx
*** OOO320_m19-orig//vcl/unx/inc/dtint.hxx 2010-05-26 20:34:28.000000000 +0200
--- OOO320_m19//vcl/unx/inc/dtint.hxx 2011-02-15 17:04:32.134813676 +0100
***************
*** 36,42 ****
class SalDisplay;
class AllSettings;
! #ifndef _XLIB_H_
// forwards from X
struct Display;
struct XEvent;
--- 36,42 ----
class SalDisplay;
class AllSettings;
! #if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_)
// forwards from X
struct Display;
struct XEvent;

View file

@ -9,11 +9,11 @@ let
in
stdenv.mkDerivation {
name = "hol_light-20121213";
name = "hol_light-20130124";
src = fetchsvn {
url = http://hol-light.googlecode.com/svn/trunk;
rev = "153";
sha256 = "1n4da5k3jya8mf7dgif8cl5sr2dqf6vl21fw1fcdna215v2x1rc0";
rev = "155";
sha256 = "057223kcv7y2vcnyzvrygvdafn6mb7ycr1m5rj3fsrwz0yl8dqnr";
};
buildInputs = [ ocaml findlib camlp5 ];

View file

@ -1,18 +1,18 @@
{ cabal, curl, extensibleExceptions, filepath, hashedStorage
, haskeline, html, HTTP, mmap, mtl, network, parsec, random
, regexCompat, tar, terminfo, text, vector, zlib
, regexCompat, tar, terminfo, text, utf8String, vector, zlib
}:
cabal.mkDerivation (self: {
pname = "darcs";
version = "2.8.3";
sha256 = "0nbg45i5sgbsc488siqirgysy3z912xghqbwm5hcsl37j910hxch";
version = "2.8.4";
sha256 = "164zclgib9ql4rqykpdhhk2bad0m5v0k0iwzsj0z7nax5nxlvarz";
isLibrary = true;
isExecutable = true;
buildDepends = [
extensibleExceptions filepath hashedStorage haskeline html HTTP
mmap mtl network parsec random regexCompat tar terminfo text vector
zlib
mmap mtl network parsec random regexCompat tar terminfo text
utf8String vector zlib
];
extraLibraries = [ curl ];
postInstall = ''

View file

@ -1,20 +0,0 @@
source $stdenv/setup
source $makeWrapper
mkdir -p $out/real
skip=143273 # Look for "BZh91" in the executable.
(dd bs=1 count=$skip of=/dev/null && dd) < $src | (cd $out/real && tar xvfj -)
rm -rf $out/real/Bin $out/real/postinst
patchelf --interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $out/real/realplay.bin
mkdir -p $out/bin
makeWrapper "$out/real/realplay.bin" "$out/bin/realplay" \
--set HELIX_LIBS "$out/real" \
--suffix-each LD_LIBRARY_PATH ':' "$(addSuffix /lib $libPath)"
#echo "$libstdcpp5/lib" > $out/real/mozilla/extra-library-path # !!! must be updated, use patchelf --rpath
echo "$out/bin" > $out/real/mozilla/extra-bin-path

View file

@ -1,19 +0,0 @@
{stdenv, fetchurl, libstdcpp5, glib, pango, atk, gtk, libX11, makeWrapper}:
# Note that RealPlayer 10 need libstdc++.so.5, i.e., GCC 3.3, not 3.4.
assert stdenv.system == "i686-linux";
(stdenv.mkDerivation {
name = "RealPlayer-10.0.8.805-GOLD";
builder = ./builder.sh;
src = fetchurl {
url = http://software-dl.real.com/25ae61d70a6855a52c14/unix/RealPlayer10GOLD.bin;
md5 = "d28b31261059231a3e93c7466f8153e6";
};
inherit libstdcpp5 makeWrapper;
libPath = [libstdcpp5 glib pango atk gtk libX11];
}) // {mozillaPlugin = "/real/mozilla";}

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "kdenlive-${version}";
version = "0.9.2";
version = "0.9.4";
src = fetchurl {
url = "mirror://kde/stable/kdenlive/0.9.2/src/${name}.tar.bz2";
sha256 = "1h240s0c10z8sgvwmrfzam33qlx7j2a5b12lw1mk02ihs9hl43j1";
url = "mirror://kde/stable/kdenlive/${version}/src/${name}.tar.bz2";
sha256 = "1l3axf3y83gdfr6yc1lmy296h09gypkpqsc01w7pprg0y19rrfif";
};
buildInputs =

View file

@ -0,0 +1,132 @@
{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, yasm, freefont_ttf, ffmpeg, libass
, python3, docutils, which
, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null
, xineramaSupport ? true, libXinerama ? null
, xvSupport ? true, libXv ? null
, alsaSupport ? true, alsaLib ? null
, screenSaverSupport ? true, libXScrnSaver ? null
, vdpauSupport ? true, libvdpau ? null
, dvdnavSupport ? true, libdvdnav ? null
, bluraySupport ? true, libbluray ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, jackaudioSupport ? false, jackaudio ? null
, pulseSupport ? true, pulseaudio ? null
# For screenshots
, libpngSupport ? true, libpng ? null
, useUnfreeCodecs ? false
}:
assert x11Support -> (libX11 != null && libXext != null && mesa != null);
assert xineramaSupport -> (libXinerama != null && x11Support);
assert xvSupport -> (libXv != null && x11Support);
assert alsaSupport -> alsaLib != null;
assert screenSaverSupport -> libXScrnSaver != null;
assert vdpauSupport -> libvdpau != null;
assert dvdnavSupport -> libdvdnav != null;
assert bluraySupport -> libbluray != null;
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert jackaudioSupport -> jackaudio != null;
assert pulseSupport -> pulseaudio != null;
assert libpngSupport -> libpng != null;
let
codecs_src =
let
dir = http://www.mplayerhq.hu/MPlayer/releases/codecs/;
in
if stdenv.system == "i686-linux" then fetchurl {
url = "${dir}/essential-20071007.tar.bz2";
sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic";
} else if stdenv.system == "x86_64-linux" then fetchurl {
url = "${dir}/essential-amd64-20071007.tar.bz2";
sha256 = "13xf5b92w1ra5hw00ck151lypbmnylrnznq9hhb0sj36z5wz290x";
} else if stdenv.system == "powerpc-linux" then fetchurl {
url = "${dir}/essential-ppc-20071007.tar.bz2";
sha256 = "18mlj8dp4wnz42xbhdk1jlz2ygra6fbln9wyrcyvynxh96g1871z";
} else null;
codecs = if codecs_src != null then stdenv.mkDerivation {
name = "MPlayer-codecs-essential-20071007";
src = codecs_src;
installPhase = ''
mkdir $out
cp -prv * $out
'';
meta.license = "unfree";
} else null;
in
stdenv.mkDerivation rec {
name = "mplayer2-20130130";
src = fetchgit {
url = "git://git.mplayer2.org/mplayer2.git";
rev = "d3c580156c0b8777ff082426ebd61bb7ffe0c225";
sha256 = "1akf2mb2zklz609ks555vjvcs1gw8nwg5kbb9jwra8c4v1dfyhys";
};
prePatch = ''
sed -i /^_install_strip/d configure
'';
buildInputs = with stdenv.lib;
[ freetype pkgconfig ffmpeg libass docutils which ]
++ optionals x11Support [ libX11 libXext mesa ]
++ optional alsaSupport alsaLib
++ optional xvSupport libXv
++ optional theoraSupport libtheora
++ optional xineramaSupport libXinerama
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optional bluraySupport libbluray
++ optional jackaudioSupport jackaudio
++ optional pulseSupport pulseaudio
++ optional screenSaverSupport libXScrnSaver
++ optional vdpauSupport libvdpau
++ optional speexSupport speex
++ optional libpngSupport libpng
;
buildNativeInputs = [ yasm python3 ];
postConfigure = ''
patchShebangs TOOLS
'';
configureFlags = with stdenv.lib;
''
${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"}
${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"}
${optionalString dvdnavSupport "--extra-ldflags=-ldvdread"}
${if xvSupport then "--enable-xv" else "--disable-xv"}
${if x11Support then "--enable-x11 --enable-gl --extra-cflags=-I{libx11}/include"
else "--disable-x11 --disable-gl"}
--disable-xvid
--disable-ossaudio
'';
NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext";
enableParallelBuilding = true;
# Provide a reasonable standard font. Maybe we should symlink here.
postInstall =
''
mkdir -p $out/share/mplayer
cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf
'';
meta = {
description = "A movie player that supports many video formats (MPlayer fork)";
homepage = "http://mplayer2.org";
license = "GPLv3+";
maintainers = [ stdenv.lib.maintainers.viric ];
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -1,19 +0,0 @@
{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses }:
stdenv.mkDerivation rec {
name = "qemu-0.15.1";
src = fetchurl {
url = "http://wiki.qemu.org/download/${name}.tar.gz";
sha256 = "1fmm7l7hm0vsmahp41pgvbl62hh833k802brn6hg8kcfkd6v21bp";
};
buildInputs = [ python zlib pkgconfig glib SDL ncurses ];
meta = {
description = "QEmu processor emulator";
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

View file

@ -1,19 +0,0 @@
{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses }:
stdenv.mkDerivation rec {
name = "qemu-1.0.1";
src = fetchurl {
url = "http://wiki.qemu.org/download/${name}.tar.gz";
sha256 = "0y43v5ls3j7iqczfswxkksiqww77nllydncygih7ylc20zhh528r";
};
buildInputs = [ python zlib pkgconfig glib SDL ncurses ];
meta = {
description = "QEmu processor emulator";
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

View file

@ -0,0 +1,21 @@
{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman }:
stdenv.mkDerivation rec {
name = "qemu-1.3.1";
src = fetchurl {
url = "http://wiki.qemu.org/download/${name}.tar.bz2";
sha256 = "1bqfrb5dlsxm8gxhkksz8qzi5fhj3xqhxyfwbqcphhcv1kpyfwip";
};
buildInputs = [ python zlib pkgconfig glib SDL ncurses perl pixman ];
enableParallelBuilding = true;
meta = {
description = "QEmu processor emulator";
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [ viric shlevy ];
platforms = with stdenv.lib.platforms; linux;
};
}

View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
distutils_extra simplejson readline glance cheetah lockfile httplib2
# !!! should libvirt be a build-time dependency? Note that
# libxml2Python is a dependency of libvirt.py.
libvirt libxml2Python
libvirt libxml2Python urlgrabber
];
buildInputs =
@ -31,8 +31,9 @@ stdenv.mkDerivation rec {
buildPhase = "python setup.py build";
installPhase =
''
''
python setup.py install --prefix="$out";
wrapPythonPrograms
'';
meta = {

View file

@ -121,7 +121,7 @@ in stdenv.mkDerivation {
--base-dir "$libexec/ExtensionPacks" \
--cert-dir "$libexec/ExtPackCertificates" \
--name "Oracle VM VirtualBox Extension Pack" \
--tarball "${extensionPack}"
--tarball "${extensionPack}" \
--sha-256 "${extensionPack.outputHash}"
''}

View file

@ -9,6 +9,10 @@ cabal.mkDerivation (self: {
buildDepends = [
extensibleExceptions filepath mtl utf8String X11
];
postInstall = ''
mkdir -p $out/share/man/man1
mv $out/share/xmonad-*/man/*.1 $out/share/man/man1/
'';
meta = {
homepage = "http://xmonad.org";
description = "A tiling window manager";

View file

@ -6,7 +6,7 @@ source $mirrorsFile
# Curl flags to handle redirects, not use EPSV, handle cookies for
# servers to need them during redirects, and work on SSL without a
# certificate (this isn't a security problem because we check the
# cryptographic hash of the output anyway).
# cryptographic hash of the output anyway).
curl="curl \
--location --max-redirs 20 \
--retry 3
@ -29,20 +29,6 @@ tryDownload() {
finish() {
# On old versions of Nix, verify the hash of the output. On newer
# versions, Nix verifies the hash itself.
if test "$NIX_OUTPUT_CHECKED" != "1"; then
if test "$outputHashAlgo" != "md5"; then
echo "hashes other than md5 are unsupported in Nix <= 0.7, upgrade to Nix 0.8"
exit 1
fi
actual=$(md5sum -b "$out" | cut -c1-32)
if test "$actual" != "$id"; then
echo "hash is $actual, expected $id"
exit 1
fi
fi
stopNest
exit 0
}
@ -52,10 +38,11 @@ tryHashedMirrors() {
if test -n "$NIX_HASHED_MIRRORS"; then
hashedMirrors="$NIX_HASHED_MIRRORS"
fi
for mirror in $hashedMirrors; do
url="$mirror/$outputHashAlgo/$outputHash"
if $curl --fail --silent --show-error --head "$url" \
if $curl --retry 0 --connect-timeout "${NIX_CONNECT_TIMEOUT:-15}" \
--fail --silent --show-error --head "$url" \
--write-out "%{http_code}" --output /dev/null > code 2> log; then
tryDownload "$url"
if test -n "$success"; then finish; fi

View file

@ -1,4 +1,4 @@
{stdenv, curl}: # Note that `curl' may be `null', in case of the native stdenv.
{ stdenv, curl }: # Note that `curl' may be `null', in case of the native stdenv.
let
@ -17,10 +17,7 @@ let
# Names of the master sites that are mirrored (i.e., "sourceforge",
# "gnu", etc.).
sites =
if builtins ? attrNames
then builtins.attrNames mirrors
else [] /* backwards compatibility */;
sites = builtins.attrNames mirrors;
impureEnvVars = [
# We borrow these environment variables from the caller to allow
@ -35,10 +32,14 @@ let
# This variable allows the user to override hashedMirrors from the
# command-line.
"NIX_HASHED_MIRRORS"
# This variable allows overriding the timeout for connecting to
# the hashed mirrors.
"NIX_CONNECT_TIMEOUT"
] ++ (map (site: "NIX_MIRRORS_${site}") sites);
in
{ # URL to fetch.
url ? ""
@ -79,9 +80,9 @@ stdenv.mkDerivation {
if showURLs then "urls"
else if name != "" then name
else baseNameOf (toString (builtins.head urls_));
builder = ./builder.sh;
buildInputs = [curl];
urls = urls_;
@ -90,9 +91,6 @@ stdenv.mkDerivation {
# (http://nixos.org/tarballs) over the original URLs.
preferHashedMirrors = true;
# Compatibility with Nix <= 0.7.
id = md5;
# New-style output content requirements.
outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else
if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5";

View file

@ -46,17 +46,17 @@ stdenv.mkDerivation (
header "Copying build directory to $KEEPBUILDDIR"
mkdir -p $KEEPBUILDDIR
cp -R $TMPDIR/* $KEEPBUILDDIR
stopNest
stopNest
fi
fi
'';
}
// args //
// args //
{
name = name + (if src ? version then "-" + src.version else "");
postHook = ''
. ${./functions.sh}
origSrc=$src
@ -75,7 +75,10 @@ stdenv.mkDerivation (
echo "$system" > $out/nix-support/system
if [ -z "${toString doCoverageAnalysis}" ]; then
echo "nix-build none $out" >> $out/nix-support/hydra-build-products
for i in $outputs; do
if [ "$i" = out ]; then j=none; else j="$i"; fi
echo "nix-build $j ''${!i}" >> $out/nix-support/hydra-build-products
done
fi
'';

View file

@ -10,6 +10,8 @@ rec {
ecore = callPackage ./ecore { };
eio = callPackage ./eio { };
embryo = callPackage ./embryo { };
edje = callPackage ./edje { lua = pkgs.lua5; };
@ -20,6 +22,12 @@ rec {
eeze = callPackage ./eeze { };
emotion = callPackage ./emotion { };
ethumb = callPackage ./ethumb { };
elementary = callPackage ./elementary { };
#### WINDOW MANAGER

View file

@ -2,10 +2,10 @@
, dbus_libs }:
stdenv.mkDerivation rec {
name = "e_dbus-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1kky76v7yydsjihgi1hbwpyqhdmbxmxj2dw4p7kiqbl67dmsjhxg";
sha256 = "16ckrpzzw5x1cs0fwqkk8431al55xil5magihkp9l3s77g0qd26q";
};
buildInputs = [ pkgconfig zlib libjpeg expat ecore eina evas ];
propagatedBuildInputs = [ dbus_libs ];
@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
--disable-edbus-test-client
--disable-edbus-notify-send
--disable-edbus-notify-test
--disable-edbus-async-test
'';
meta = {
description = "Enlightenment's D-Bus wrapping and glue layer library";

View file

@ -1,13 +1,16 @@
{ stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext }:
{ stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext, libXrender
, libXcomposite, libXfixes, libXdamage }:
stdenv.mkDerivation rec {
name = "ecore-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1fq3prr2i9n14jppfpns3dg1mkk3iy0ijv2d47pm4krymd7l4hs4";
sha256 = "08ljda6p0zj1h5sq3l0js6mihw8cr6ydynn42dnka36vachvmfjb";
};
buildInputs = [ pkgconfig eina evas ];
propagatedBuildInputs = [ libX11 libXext ];
propagatedBuildInputs = [ libX11 libXext libXcomposite libXrender libXfixes
libXdamage
];
meta = {
description = "Enlightenment's core mainloop, display abstraction and utility library";
longDescription = ''

View file

@ -2,12 +2,16 @@
, ecore, embryo }:
stdenv.mkDerivation rec {
name = "edje-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "15vh0plb9gb75q0lgbqv4kjz0pyhbfxk39x3inzn87ih567z73xx";
sha256 = "1hsyj46bk94yd9ymf9425pf4ygy36h5gdkg9fhf8qds8cnn2kcy7";
};
buildInputs = [ pkgconfig expat zlib libjpeg lua eina eet evas ecore embryo ];
patchPhase = ''
substituteInPlace src/bin/edje_cc_out.c --replace '%s/embryo_cc' '${embryo}/bin/embryo_cc'
substituteInPlace src/bin/edje_cc_out.c --replace 'eina_prefix_bin_get(pfx),' ""
'';
meta = {
description = "Enlightenment's abstract GUI layout and animation object library";
longDescription = ''

View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, eina, zlib, libjpeg }:
stdenv.mkDerivation rec {
name = "eet-${version}";
version = "1.6.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1cq6i9g020mi5mr069jykx1fvihd18k1y4x49skmhzfh7dv10dfp";
sha256 = "0ys2579v45f9x2n47shq0k63g0sdbj1ndhh72dvfajihsgjwd767";
};
buildInputs = [ pkgconfig eina zlib libjpeg ];
meta = {

View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, eina, ecore, udev }:
stdenv.mkDerivation rec {
name = "eeze-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1v0n6bn3g04bjq0cxp6ixw7hb4kjbqpvywpvgik960xkn4pva76p";
sha256 = "0274fs4cxgw6420yyz9frrc8zhj0qqyvwczzslq3kih3sx1nikxr";
};
buildInputs = [ pkgconfig eina ecore ];
propagatedBuildInputs = [ udev ];

View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, eina, eet, ecore }:
stdenv.mkDerivation rec {
name = "efreet-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1nydy3ahdq7q6b0xxaj79a8kd4b4xy3hzf1fdh117c9pwp4fxhl0";
sha256 = "1yw7qjddqcnsz1vb693pa57v9wydvzfy198dc23mz46qfqx08nlg";
};
buildInputs = [ pkgconfig eina eet ecore ];
meta = {

View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "eina-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1vchzb34hd9z8ghh75ch7sdf90gmzzpxryk3yq8hjcdxd0zjx9yj";
sha256 = "0kd4116njrbag9h459cmfpg07c4ag04z3yrsg513lpi27amch27w";
};
meta = {
description = "Enlightenment's core data structure library";

View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, eet, eina, ecore }:
stdenv.mkDerivation rec {
name = "eio-${version}";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1bsam5q364kc4xwfv7pql6686gj0byhk42zwjqx9ajf70l23kss6";
};
buildInputs = [ pkgconfig eet eina ecore ];
meta = {
description = "A library that integrates with EFL to provide efficient filesystem IO";
longDescription = ''
Eio integrates with EFL (Ecore, Eina) to provide efficient filesystem Input/Output.
It use the best techniques to achieve such purpose, like using at-variants, splice,
properly handling errors and doing it in an asynchronous fashion by means of worker
threads. It is also ported to Windows, so multi-platform.
Whenever you need to list a directory, copy, move or delete files, Eio will do that
task better than you'd achieve with naive implementations, and it is easy to use.
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.lgpl21;
};
}

View file

@ -0,0 +1,19 @@
{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje }:
stdenv.mkDerivation rec {
name = "elementary-${version}";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "08cb4x9639xyrb8d4vzvhl6v385qjfswl717sicm7iimh5zlm2l9";
};
buildInputs = [ pkgconfig eina eet evas ecore edje ];
meta = {
description = "Enlightenment's core data structure library";
longDescription = ''
Enlightenment's Eina is a core data structure and common utility
library.
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.lgpl21;
};
}

View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, eina }:
stdenv.mkDerivation rec {
name = "embryo-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "0hcjlf0rljz4zs1y5l4h0gn2gyqb1h4msfsaps8flaym4mxrvvd9";
sha256 = "104fsa179w2dfg00sfnap7c3b4ixcps4crxa6yav755awssdcim9";
};
buildInputs = [ pkgconfig eina ];
meta = {

View file

@ -0,0 +1,19 @@
{ stdenv, fetchurl, pkgconfig, ecore, evas, eet, eina, edje }:
stdenv.mkDerivation rec {
name = "emotion-${version}";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1sfw8kpj2fcqymzd6q7p51xxib1n2arvjl1hnwhqkvwhlsq2b4sw";
};
buildInputs = [ pkgconfig ecore evas eet eina edje ];
meta = {
description = "A library to easily integrate media playback into EFL applications";
longDescription = ''
Emotion is a library to easily integrate media playback into EFL applications,
it will take care of using Ecore's main loop and video display is done using Evas.
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.lgpl21;
};
}

View file

@ -1,12 +1,14 @@
{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus, embryo }:
{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus
, embryo, eio, xcbutilkeysyms, libjpeg }:
stdenv.mkDerivation rec {
name = "enlightenment-${version}";
version = "0.16.999.65643";
version = "0.17.1";
src = fetchurl {
url = "http://download.enlightenment.org/snapshots/2011-11-28/${name}.tar.gz";
sha256 = "1bb577gbccb1wrifrhv9pzm451zhig2p29mwz55b187ls31p36kz";
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1z2vx9r7yc55rs673jg7d685slgdv9dss45asg50wh5wxp2mfi3y";
};
buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo ];
buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo
eio xcbutilkeysyms libjpeg ];
configureFlags = ''
--with-profile=FAST_PC
--disable-illume

View file

@ -0,0 +1,22 @@
{ stdenv, fetchurl, pkgconfig, eina, evas, ecore, edje, eet }:
stdenv.mkDerivation rec {
name = "ethumb-${version}";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "0prka3knz8p2n46dfrzgwn55khhhrhjny4vvnzkjcwmhvz7kgc9l";
};
buildInputs = [ pkgconfig eina evas ecore edje eet ];
meta = {
description = "A thumbnail generation library";
longDescription = ''
Ethumb - thumbnail generation library. Features:
* create thumbnails with a predefined frame (possibly an edje frame);
* have an option to create fdo-like thumbnails;
* have a client/server utility;
* TODO: make thumbnails from edje backgrounds, icons and themes;
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.lgpl21;
};
}

View file

@ -2,10 +2,10 @@
, libX11, libXext, eina, eet }:
stdenv.mkDerivation rec {
name = "evas-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1lyya0nc8p0vs63azkflwq7lqqml94cqzjpg12h43sbvza342rsq";
sha256 = "0x3k89q2wxgxjsbhdf4qws7jgpjl7rpqji98ca3nf25jf2lm1cvh";
};
buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg
libX11 libXext eina eet

View file

@ -1,51 +0,0 @@
{ stdenv, fetchurl, xlibs, zlib, perl, qt3, openssl, pcre
, pkgconfig, libtiff, libxml2, libxslt, libtool, expat
, freetype, bzip2, cups, attr, acl
}:
let version = "3.5.10"; in
stdenv.mkDerivation {
name = "kdelibs-${version}";
src = fetchurl {
url = "mirror://kde/stable/${version}/src/kdelibs-${version}.tar.bz2";
sha256 = "0wjw51r96h6rngbsrzndw890xggzvrakydsbaldlrvbh3jq9qzk1";
};
patches = [
# We're not supposed to use linux/inotify.h, use sys/inotify.h instead.
# Adapted from Gentoo.
./inotify.patch
# Fixes compilation issues with openssl-1.0.0
./kdelibs-3.5.10-openssl_1.0.0.patch
];
buildInputs = [
zlib perl qt3 openssl pcre pkgconfig libtiff libxml2
libxslt expat libtool freetype bzip2 cups
xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft
];
propagatedBuildInputs = [attr acl];
# Prevent configure from looking for pkg-config and freetype-config
# in the wrong location (it looks in /usr/bin etc. *before* looking
# in $PATH).
preConfigure = ''
substituteInPlace configure \
--replace /usr/bin /no-such-path \
--replace /usr/local/bin /no-such-path \
--replace /opt/local/bin /no-such-path
'';
configureFlags = ''
--without-arts
--with-ssl-dir=${openssl}
--x-includes=${xlibs.libX11}/include
--x-libraries=${xlibs.libX11}/lib
'';
meta.platforms = stdenv.lib.platforms.linux;
}

View file

@ -1,30 +0,0 @@
diff -rc kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp kdelibs-3.5.10/kio/kio/kdirwatch.cpp
*** kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000 +0200
--- kdelibs-3.5.10/kio/kio/kdirwatch.cpp 2009-04-01 13:26:48.000000000 +0200
***************
*** 64,74 ****
// debug
#include <sys/ioctl.h>
! #ifdef HAVE_INOTIFY
#include <unistd.h>
#include <fcntl.h>
#include <sys/syscall.h>
- #include <linux/types.h>
// Linux kernel headers are documented to not compile
#define _S390_BITOPS_H
#include <linux/inotify.h>
--- 64,76 ----
// debug
#include <sys/ioctl.h>
! #if 1
! #include <sys/inotify.h>
! #include <fcntl.h>
! #elif HAVE_INOTIFY
#include <unistd.h>
#include <fcntl.h>
#include <sys/syscall.h>
// Linux kernel headers are documented to not compile
#define _S390_BITOPS_H
#include <linux/inotify.h>

View file

@ -1,180 +0,0 @@
diff -Naur kdelibs-3.5.10-old/kio/kssl/kopenssl.cc kdelibs-3.5.10-new/kio/kssl/kopenssl.cc
--- kdelibs-3.5.10-old/kio/kssl/kopenssl.cc 2006-07-22 01:16:39.000000000 -0700
+++ kdelibs-3.5.10-new/kio/kssl/kopenssl.cc 2010-03-31 09:34:38.000000000 -0700
@@ -96,9 +96,14 @@
static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
const EVP_CIPHER *,unsigned char *,int ,
pem_password_cb *, void *) = 0L;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L;
+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L;
+#else
static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L;
static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L;
static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L;
+#endif
static int (*K_X509_print_fp) (FILE *, X509*) = 0L;
static int (*K_i2d_PKCS12) (PKCS12*, unsigned char**) = 0L;
static int (*K_i2d_PKCS12_fp) (FILE *, PKCS12*) = 0L;
@@ -404,9 +409,14 @@
K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl");
K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write");
K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio");
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp");
+ K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it");
+#else
K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth");
K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp");
K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER");
+#endif
K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp");
K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12");
K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp");
@@ -568,7 +578,7 @@
K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
- K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
+ K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
#endif
@@ -956,7 +966,13 @@
else return -1;
}
-
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
+ if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it)
+ return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x);
+ else return -1;
+}
+#else
ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
else return 0L;
@@ -968,7 +984,7 @@
return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
else return -1;
}
-
+#endif
int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
diff -Naur kdelibs-3.5.10-old/kio/kssl/kopenssl.h kdelibs-3.5.10-new/kio/kssl/kopenssl.h
--- kdelibs-3.5.10-old/kio/kssl/kopenssl.h 2006-07-22 01:16:39.000000000 -0700
+++ kdelibs-3.5.10-new/kio/kssl/kopenssl.h 2010-03-31 09:35:20.000000000 -0700
@@ -48,6 +48,9 @@
#include <openssl/stack.h>
#include <openssl/bn.h>
#undef crypt
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK _STACK
+#endif
#endif
#include <kstaticdeleter.h>
@@ -446,12 +449,12 @@
*/
int PEM_write_bio_X509(BIO *bp, X509 *x);
-
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
/*
* X509_asn1_meth - used for netscape output
*/
ASN1_METHOD *X509_asn1_meth();
-
+#endif
/*
* ASN1_i2d_fp - used for netscape output
@@ -531,6 +534,9 @@
*/
void sk_free(STACK *s);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
+#endif
/*
* Number of elements in the stack
@@ -543,6 +549,9 @@
*/
char *sk_value(STACK *s, int n);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
+#endif
/*
* Create a new stack
@@ -555,6 +564,9 @@
*/
int sk_push(STACK *s, char *d);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
+#endif
/*
* Duplicate the stack
diff -Naur kdelibs-3.5.10-old/kio/kssl/ksmimecrypto.cc kdelibs-3.5.10-new/kio/kssl/ksmimecrypto.cc
--- kdelibs-3.5.10-old/kio/kssl/ksmimecrypto.cc 2005-10-10 08:05:44.000000000 -0700
+++ kdelibs-3.5.10-new/kio/kssl/ksmimecrypto.cc 2010-03-31 09:34:38.000000000 -0700
@@ -87,7 +87,7 @@
STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
- STACK_OF(X509) *x509 = sk_new(NULL);
+ STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL));
KSSLCertificate *cert = certs.first();
while(cert) {
sk_X509_push(x509, cert->getCert());
diff -Naur kdelibs-3.5.10-old/kio/kssl/ksslcertificate.cc kdelibs-3.5.10-new/kio/kssl/ksslcertificate.cc
--- kdelibs-3.5.10-old/kio/kssl/ksslcertificate.cc 2006-01-19 09:06:12.000000000 -0800
+++ kdelibs-3.5.10-new/kio/kssl/ksslcertificate.cc 2010-03-31 09:34:38.000000000 -0700
@@ -1003,17 +1003,31 @@
QByteArray KSSLCertificate::toNetscape() {
QByteArray qba;
#ifdef KSSL_HAVE_SSL
-ASN1_HEADER ah;
-ASN1_OCTET_STRING os;
-KTempFile ktf;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ NETSCAPE_X509 nx;
+ ASN1_OCTET_STRING hdr;
+#else
+ ASN1_HEADER ah;
+ ASN1_OCTET_STRING os;
+#endif
+ KTempFile ktf;
- os.data = (unsigned char *)NETSCAPE_CERT_HDR;
- os.length = strlen(NETSCAPE_CERT_HDR);
- ah.header = &os;
- ah.data = (char *)getCert();
- ah.meth = d->kossl->X509_asn1_meth();
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
+ hdr.length = strlen(NETSCAPE_CERT_HDR);
+ nx.header = &hdr;
+ nx.cert = getCert();
+
+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
+#else
+ os.data = (unsigned char *)NETSCAPE_CERT_HDR;
+ os.length = strlen(NETSCAPE_CERT_HDR);
+ ah.header = &os;
+ ah.data = (char *)getCert();
+ ah.meth = d->kossl->X509_asn1_meth();
- d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
+#endif
ktf.close();

View file

@ -278,7 +278,7 @@ stdenv.mkDerivation ({
[ "--with-host-libstdcxx=-lstdc++ -lgcc_s" ];
configureFlags = "
${if enableMultilib then "" else "--disable-multilib"}
${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}
${if enableShared then "" else "--disable-shared"}
${if enablePlugin then "--enable-plugin" else ""}
${if ppl != null then "--with-ppl=${ppl}" else ""}

View file

@ -0,0 +1,46 @@
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
stdenv.mkDerivation rec {
version = "7.6.2";
name = "ghc-${version}";
src = fetchurl {
url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
sha256 = "d5f45184abeacf7e9c6b4f63c7101a5c1d7b4fe9007901159e2287ecf38de533";
};
buildInputs = [ ghc perl gmp ncurses ];
enableParallelBuilding = true;
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
'';
preConfigure = ''
echo "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'';
configureFlags = [
"--with-gcc=${stdenv.gcc}/bin/gcc"
];
# required, because otherwise all symbols from HSffi.o are stripped, and
# that in turn causes GHCi to abort
stripDebugFlags=["-S" "--keep-file-symbols"];
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = [
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
stdenv.lib.maintainers.simons
];
platforms = ghc.meta.platforms;
};
}

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
stdenv.mkDerivation rec {
version = "7.7.20121106";
version = "7.7.20121213";
name = "ghc-${version}";
src = fetchurl {
url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
sha256 = "1n3xj8arkzfvs3q1ymxsnbzs23ndsp8pl67sqirl837pkgcmq263";
sha256 = "0z9ld6271jzv3mx02vqaakirj79pm2vzxnv5a178r6v874qbzx3p";
};
buildInputs = [ ghc perl gmp ncurses ];

View file

@ -64,6 +64,13 @@ stdenv.mkDerivation rec {
ln -s $f $out/etc/bash_completion.d/
echo -n .
done
for s in 1 2 3 4 5 6 7 8 9; do
for f in "$currentPath/share/man/man$s/"*; do
mkdir -p $out/share/man/man$s
ln -sv $f $out/share/man/man$s/
echo -n .
done
done
for f in "$currentPkgDir/"*.conf; do
ln -s $f $linkedPkgDir
echo -n .

View file

@ -1,12 +1,14 @@
{stdenv, fetchurl, unzip}:
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation {
name = "gwt-java-2.4.0";
src = fetchurl {
url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip;
sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88";
src = fetchurl {
url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip;
sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88";
};
buildInputs = [unzip];
buildInputs = [ unzip ];
installPhase = ''
ensureDir $out
@ -18,4 +20,4 @@ stdenv.mkDerivation {
homepage = http://code.google.com/webtoolkit/;
description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications.";
};
}
}

View file

@ -1,31 +0,0 @@
source $stdenv/setup
tar xfvj $src
mkdir -p $out
cp -av $name $out
# Create wrapper scripts so that the GWT compiler/host work
libPath="$libstdcpp5/lib:$glib/lib:$gtk/lib:$atk/lib:$pango/lib:$libX11/lib:$libXt/lib:$out/$name/mozilla-1.7.12"
mkdir -p $out/bin
cat > $out/bin/gwt-compile <<EOF
#!/bin/sh
export LD_LIBRARY_PATH=$libPath
export LIBXCB_ALLOW_SLOPPY_LOCK=1 # Workaround for bug in Java AWT implementation
$jdk/bin/java -Xmx256m -cp "\$CLASSPATH:$out/$name/gwt-user.jar:$out/$name/gwt-dev-linux.jar" com.google.gwt.dev.Compiler \$@
EOF
chmod 755 $out/bin/gwt-compile
cat > $out/bin/gwt-shell <<EOF
#!/bin/sh
export LD_LIBRARY_PATH=$libPath
export LIBXCB_ALLOW_SLOPPY_LOCK=1 # Workaround for bug in Java AWT implementation
$jdk/bin/java -Xmx256m -cp "\$CLASSPATH:$out/$name/gwt-user.jar:$out/$name/gwt-dev-linux.jar" com.google.gwt.dev.GWTShell \$@
EOF
chmod 755 $out/bin/gwt-shell

View file

@ -1,14 +0,0 @@
{stdenv, fetchurl, glib, gtk, pango, atk, libX11, libXt, libstdcpp5, jdk}:
stdenv.mkDerivation {
name = "gwt-linux-1.7.1";
builder = ./builder.sh;
src = fetchurl {
url = http://google-web-toolkit.googlecode.com/files/gwt-linux-1.7.1.tar.bz2;
sha256 = "0lgirr9lr0qsfvw61hqzracdllqklb4qkzbk5x3lc4r64mms5b3g";
};
inherit glib gtk pango atk libX11 libXt libstdcpp5 jdk;
buildInputs = [glib gtk pango atk libX11 libXt libstdcpp5];
}

View file

@ -1,14 +1,14 @@
{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
, readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
, ncurses, libunistring, lighttpd, patchelf, openblas, liblapack
, tcl, tk, xproto, libX11
, tcl, tk, xproto, libX11, git
} :
let
realGcc = stdenv.gcc.gcc;
in
stdenv.mkDerivation rec {
pname = "julia";
date = "20121209";
date = "20130205";
name = "${pname}-git-${date}";
grisu_ver = "1.1.1";
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
clp_ver = "1.14.5";
lighttpd_ver = "1.4.29";
patchelf_ver = "0.6";
pcre_ver = "8.31";
grisu_src = fetchurl {
url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
@ -57,16 +58,20 @@ stdenv.mkDerivation rec {
url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2";
sha256 = "00bw29vdsscsili65wcb5ay0gvg1w0ljd00sb5xc6br8bylpyzpw";
};
pcre_src = fetchurl {
url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pcre_ver}.tar.bz2";
sha256 = "0g4c0z4h30v8g8qg02zcbv7n67j5kz0ri9cfhgkpwg276ljs0y2p";
};
src = fetchgit {
url = "git://github.com/JuliaLang/julia.git";
rev = "27b950f62aeb3664ab76e5d827b30b4885a9efb9";
sha256 = "0khx8ln2zq3vpj0g66hnsdhw04hxl79fq43rc06ggsmc1j4xrifb";
rev = "efc696bf74eec7605b4da19f6f1605ba99959ed3";
sha256 = "19if7aj3mrp84dg9g2d3zbhasrq0nz28djl9a01m0y4y9bfymp7s";
};
buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
openblas liblapack tcl tk xproto libX11
openblas liblapack tcl tk xproto libX11 git
];
configurePhase = ''
@ -79,7 +84,7 @@ stdenv.mkDerivation rec {
cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')"
}
for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" "${patchelf_src}" ; do
for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" "${patchelf_src}" "${pcre_src}" ; do
copy_kill_hash "$i" deps
done
copy_kill_hash "${dsfmt_src}" deps/random
@ -105,18 +110,9 @@ stdenv.mkDerivation rec {
preBuild = ''
mkdir -p usr/lib
ln -s libuv.a usr/lib/uv.a
'';
preInstall = ''
make -C deps install-tk-wrapper
'';
postInstall = ''
(
cd $out/share/julia/test/
$out/bin/julia runtests.jl all
) || true
'';
meta = {

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, libtool, gcc, patches ? []}:
{ stdenv, fetchurl, libtool, gcc, patches ? []}:
stdenv.mkDerivation {
name = "opencxx-2.8";

View file

@ -4,20 +4,6 @@ rec {
inherit aterm;
atermStatic = stdenv.mkDerivation ( rec {
name = "${aterm.name}-static";
configureFlags = "--enable-shared=no --enable-static=yes";
inherit (aterm) src meta patches;
} // ( if stdenv.system == "i686-cygwin" then { inherit (sdf) CFLAGS; } else {} ) ) ;
sdfStatic = stdenv.mkDerivation ( rec {
name = "${sdf.name}-static";
configureFlags = "--enable-shared=no --enable-static=yes";
inherit (sdf) src buildInputs preConfigure meta;
} // ( if stdenv.system == "i686-cygwin" then { inherit (sdf) CFLAGS; } else {} ) ) ;
sdf = stdenv.mkDerivation ( rec {
name = "sdf2-bundle-2.4";

View file

@ -1,17 +1,22 @@
{stdenv, fetchurl, unzip, ant}:
{stdenv, fetchurl, unzip, ant, version ? "1.4.0" }:
stdenv.mkDerivation rec {
version = "1.4.0";
let
src_hashes = {
"1.4.0" = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171";
"1.5.0-RC1" = "111jm0nxkvqr1vrwcpvr70v5paasp8msrj5h8zm1c144c8zc1vln";
};
in
stdenv.mkDerivation {
name = "clojure-${version}";
src = fetchurl {
url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip";
sha256 = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171";
sha256 = (builtins.getAttr version src_hashes);
};
buildInputs = [ unzip ant ];
buildPhase = "ant";
buildPhase = "ant jar";
installPhase = "
mkdir -p $out/lib/java

View file

@ -14,13 +14,12 @@ PROG=$(basename "$0")
SITES=
pypath() {
BIN=$(dirname "$1")
BIN=$(realpath -s "$BIN")
BIN=$(realpath -s "$(dirname "$1")")
ENV=$(dirname "$BIN")
SITE="$ENV/lib/python2.7/site-packages"
SITES="$SITES${SITES:+:}$SITE"
PRG=$BIN/$(readlink "$1")
PRG="$BIN"/$(readlink "$1")
if test -L "$PRG"; then
pypath "$PRG"
@ -31,4 +30,4 @@ pypath $(realpath -s "$0")
export PYTHONPATH="$PYTHONPATH${PYTHONPATH:+:}$SITES"
exec $BIN/$PROG "$@"
exec "$BIN/$PROG" "$@"

View file

@ -44,6 +44,8 @@ let
propagatedUserEnvPkgs = requiredGems;
passthru.isRubyGem = true;
};
mb = stdenv.lib.maybeAttr;
patchedGem = a: stdenv.mkDerivation (removeAttrs (stdenv.lib.mergeAttrsByFuncDefaults

File diff suppressed because it is too large Load diff

View file

@ -1,31 +0,0 @@
{stdenv, fetchurl, pkgconfig, glib, kdelibs, libX11, libXext, zlib, libjpeg
, libpng, perl, qt3}:
stdenv.mkDerivation {
name = "arts-1.5.10";
src = fetchurl {
url = mirror://kde/stable/3.5.10/src/arts-1.5.10.tar.bz2;
sha256 = "0ffcm24lkgg3sm89q4zsj8za5h5d9j1195pmbjhx4hj0xcwkiqlj";
};
KDEDIR = kdelibs;
configureFlags = ''
--with-extra-includes=${libjpeg}/include
--with-extra-libs=${libjpeg}/lib
--x-includes=${libX11}/include
--x-libraries=${libX11}/lib
--disable-dependency-tracking
--enable-final
'';
nativeBuildInputs = [ pkgconfig perl ];
buildInputs =
[glib kdelibs libX11 libXext zlib libjpeg libpng qt3];
meta = {
homepage = http://www.arts-project.org/;
};
}

View file

@ -56,7 +56,7 @@ stdenv.mkDerivation {
};
# See <http://svn.boost.org/trac/boost/ticket/4688>.
patches = [ ./boost_filesystem.patch ];
patches = [ ./boost_filesystem_1_47_0.patch ];
enableParallelBuilding = true;

View file

@ -1,26 +0,0 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "boost-headers-1.49.0";
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_49_0.tar.bz2";
sha256 = "0g0d33942rm073jgqqvj3znm3rk45b2y2lplfjpyg9q7amzqlx6x";
};
phases = [ "installPhase" ];
installPhase = ''
mkdir -p $out/include
tar xvf $src -C $out/include --strip-components=1 boost_1_49_0/boost
'';
meta = {
homepage = "http://boost.org/";
description = "Boost C++ Library Collection";
license = "boost-license";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.viric ];
};
}

View file

@ -1,18 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "boost-headers-1.52.0";
name = "boost-headers-1.53.0";
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2";
sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2";
url = "mirror://sourceforge/boost/boost_1_53_0.tar.bz2";
sha256 = "15livg6y1l3gdsg6ybvp3y4gp0w3xh1rdcq5bjf0qaw804dh92pq";
};
phases = [ "installPhase" ];
installPhase = ''
mkdir -p $out/include
tar xf $src -C $out/include --strip-components=1 boost_1_52_0/boost
tar xf $src -C $out/include --strip-components=1 boost_1_53_0/boost
'';
meta = {

View file

@ -38,7 +38,7 @@ let
in
stdenv.mkDerivation {
name = "boost-1.52.0";
name = "boost-1.53.0";
meta = {
homepage = "http://boost.org/";
@ -50,8 +50,8 @@ stdenv.mkDerivation {
};
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2";
sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2";
url = "mirror://sourceforge/boost/boost_1_53_0.tar.bz2";
sha256 = "15livg6y1l3gdsg6ybvp3y4gp0w3xh1rdcq5bjf0qaw804dh92pq";
};
enableParallelBuilding = true;

View file

@ -1,5 +1,5 @@
{stdenv, fetchurl, perl, zlib, libjpeg, freetype, libpng, giflib
, enableX11 ? true, libX11, xproto, xextproto, libXext, renderproto, libXrender
{ stdenv, fetchurl, pkgconfig, perl, zlib, libjpeg, freetype, libpng, giflib
, enableX11 ? true, xlibs
, enableSDL ? true, SDL }:
let s = import ./src-for-default.nix; in
@ -10,16 +10,14 @@ stdenv.mkDerivation {
sha256 = s.hash;
};
patches = [ ./ftbfs.patch ];
nativeBuildInputs = [ perl ];
buildInputs = [ zlib libjpeg freetype giflib libpng ]
buildInputs = [ pkgconfig zlib libjpeg freetype giflib libpng ]
++ stdenv.lib.optional enableSDL SDL
++ stdenv.lib.optionals enableX11 [
xproto libX11 libXext xextproto
renderproto libXrender
];
++ stdenv.lib.optionals enableX11 (with xlibs; [
xproto libX11 libXext #xextproto
#renderproto libXrender
]);
NIX_LDFLAGS="-lgcc_s";
@ -31,7 +29,7 @@ stdenv.mkDerivation {
"--enable-fbdev"
"--enable-mmx"
"--enable-sse"
"--enable-sysfs"
#"--enable-sysfs" # not recognized
"--with-software"
"--with-smooth-scaling"
] ++ stdenv.lib.optionals enableX11 [

View file

@ -1,25 +0,0 @@
From: André Draszik <andre.draszik@st.com>
Date: Wed, 28 Sep 2011 17:36:00 +0000 (+0100)
Subject: generic_stretch_blit: fix compilation due to undefined reference to DSPF_ARGBF88871
X-Git-Url: http://git.directfb.org/?p=core%2FDirectFB.git;a=commitdiff_plain;h=ef5e1398fe4037b63d6513e450f107fcfe91047f
generic_stretch_blit: fix compilation due to undefined reference to DSPF_ARGBF88871
../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c: In function 'stretch_hvx':
../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c:444:21: error: 'DSPF_ARGBF88871' undeclared (first use in this function)
../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c:444:21: note: each undeclared identifier is reported only once for each function it appears in
---
diff --git a/src/gfx/generic/generic_stretch_blit.c b/src/gfx/generic/generic_stretch_blit.c
index 65076f4..6dd987b 100644
--- a/src/gfx/generic/generic_stretch_blit.c
+++ b/src/gfx/generic/generic_stretch_blit.c
@@ -441,7 +441,7 @@ stretch_hvx( CardState *state, DFBRectangle *srect, DFBRectangle *drect )
}
break;
- case DSPF_ARGBF88871:
+ case DSPF_RGBAF88871:
if (state->blittingflags & DSBLIT_SRC_PREMULTIPLY) {
for (i=0; i<gfxs->Blut->num_entries; i++) {
int alpha = entries[i].a + 1;

View file

@ -7,6 +7,7 @@
, x264Support ? true, x264 ? null
, xvidSupport ? true, xvidcore ? null
, vdpauSupport ? true, libvdpau ? null
, vaapiSupport ? true, libva ? null
, faacSupport ? false, faac ? null
, dc1394Support ? false, libdc1394 ? null
, x11grabSupport ? false, libXext ? null, libXfixes ? null
@ -19,6 +20,7 @@ assert vpxSupport -> libvpx != null;
assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null;
assert vdpauSupport -> libvdpau != null;
assert vaapiSupport -> libva != null;
assert faacSupport -> faac != null;
assert x11grabSupport -> libXext != null && libXfixes != null;
@ -39,6 +41,7 @@ stdenv.mkDerivation rec {
"--enable-swscale"
"--disable-ffplay"
"--enable-shared"
"--enable-avresample"
"--enable-runtime-cpudetect"
]
++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
@ -62,6 +65,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional x264Support x264
++ stdenv.lib.optional xvidSupport xvidcore
++ stdenv.lib.optional vdpauSupport libvdpau
++ stdenv.lib.optional vaapiSupport libva
++ stdenv.lib.optional faacSupport faac
++ stdenv.lib.optional dc1394Support libdc1394
++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ];

View file

@ -2,12 +2,13 @@
, fetchurl
}:
stdenv.mkDerivation {
name = "gnu-efi-3.0r";
let version = "3.0s"; in stdenv.mkDerivation {
name = "gnu-efi-${version}";
src = fetchurl {
url = "mirror://sourceforge/gnu-efi/gnu-efi_3.0r.orig.tar.gz";
sha256 = "1zi298wsg8v29xj4azcawqfjbxqi2w7l60agf7x2ph2lnqlga2v5";
url = "mirror://sourceforge/gnu-efi/gnu-efi_${version}.orig.tar.gz";
sha256 = "18bpswzkj81dadq1b7n2s9g0cz60l34ggzxlq21mb8va10j9zmhh";
};
meta = {

View file

@ -3,11 +3,11 @@
, cairo, gconf, libgnomeui }:
stdenv.mkDerivation rec {
name = "goffice-0.9.3";
name = "goffice-0.10.0";
src = fetchurl {
url = "mirror://gnome/sources/goffice/0.9/${name}.tar.xz";
sha256 = "0l9achvmbmhn2p5qd0nl7vxn5c3nf1ndzlyknczzyiaa6d5zj91h";
url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
sha256 = "7e7577f69203b03c4966906bcaabc6e87a629efb1684630c2bee7907bed08439";
};
buildInputs = [

View file

@ -15,6 +15,7 @@ cabal.mkDerivation (self: {
xhtml zlib
];
buildTools = [ alex happy ];
jailbreak = true;
meta = {
homepage = "http://wiki.portal.chalmers.se/agda/";
description = "A dependently typed functional programming language and proof assistant";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Diff";
version = "0.2.0";
sha256 = "15hdkrzwajnfcx8bj4jdcy4jli115g9v20msw1xyc9wnwrmbz97k";
version = "0.3.0";
sha256 = "0k7fj4icnh25x21cmrnbqq0sjgxrr2ffhn8bz89qmy5h9dznvy98";
meta = {
description = "O(ND) diff algorithm in haskell";
license = self.stdenv.lib.licenses.bsd3;

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "HSH";
version = "2.0.4";
sha256 = "1ddpazmk82716hqd1riqs7vnl4aildgwkjgk80iam49df9p5b8v8";
version = "2.1.0";
sha256 = "0gz2hzdvf0gqv33jihn67bvry38c6hkjapb1prxmb3w12lisr4l5";
isLibrary = true;
isExecutable = true;
buildDepends = [

View file

@ -1,14 +1,14 @@
{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb
, sybWithClass, text, time, utf8String
{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb, text
, time, utf8String, void
}:
cabal.mkDerivation (self: {
pname = "HStringTemplate";
version = "0.6.12";
sha256 = "02jx02qbs4jxpf1s8nzc9lbaz0flkfcy6xj475v77i45xc1hc71p";
version = "0.7.0";
sha256 = "0xxxikgjw1dhx7kx3mjyvgh70m9avcd1kbp2bpig6gjwswk0mmai";
buildDepends = [
blazeBuilder deepseq filepath mtl parsec syb sybWithClass text time
utf8String
blazeBuilder deepseq filepath mtl parsec syb text time utf8String
void
];
meta = {
description = "StringTemplate implementation in Haskell";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "HTTP";
version = "4000.2.6";
sha256 = "0rycwrn9cq9mrsgxkbx373zjvmzg4hd8hzclya6ipd3jda1w5r92";
version = "4000.2.8";
sha256 = "0p0cwzjw2102bsyfaga6m8b53s6qnhd6byg2j2qla653f6kjlsh8";
buildDepends = [ mtl network parsec ];
meta = {
homepage = "https://github.com/haskell/HTTP";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "SDL-ttf";
version = "0.6.1";
sha256 = "0n6vbigkjfvvk98bp7ys14snpd1zmbz69ndhhpnrn02h363vwkal";
version = "0.6.2";
sha256 = "0jajnbqnhdd4i8pj8j27m53zwgfs1v06kiwy0s0zml02fdkq8j4a";
buildDepends = [ SDL ];
extraLibraries = [ SDL_ttf ];
meta = {

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "SMTPClient";
version = "1.0.4";
sha256 = "12m0qv8bf0s52yz07sipxlvas8k3xvi1d4lw6960q0nxr40ijyy2";
version = "1.1.0";
sha256 = "07njj24c43iz33c641d5ish62h13lhpvn2mx5pv5i6s3fm3bxsfk";
buildDepends = [ extensibleExceptions hsemail network ];
meta = {
description = "A simple SMTP client library";

View file

@ -2,12 +2,12 @@
cabal.mkDerivation (self: {
pname = "attoparsec";
version = "0.10.3.0";
sha256 = "1l4cnfgnynrprfvx0p3n6kca8arsmvb1yxb9ir782rrk537jci50";
version = "0.10.4.0";
sha256 = "0inkcrl40j9kgcmmi0xkcszayqjd5yn7i9fyvv0ywfqwpl6lxf5n";
buildDepends = [ deepseq text ];
meta = {
homepage = "https://github.com/bos/attoparsec";
description = "Fast combinator parsing for bytestrings";
description = "Fast combinator parsing for bytestrings and text";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];

View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "authenticate";
version = "1.3.2";
sha256 = "1bvgfri0c2nyz06r59rm3slpvm1b0s242s4mznmndpdclgg33d9m";
version = "1.3.2.4";
sha256 = "1xakp54g5dyppzpm1q3bbx6g4pvs7p2903pyq6bya1n82zsk7yg7";
buildDepends = [
aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive
conduit httpConduit httpTypes monadControl network resourcet

View file

@ -2,11 +2,11 @@
cabal.mkDerivation (self: {
pname = "base64-bytestring";
version = "1.0.0.0";
sha256 = "0z0r0lrpka3qrq45ajzyxsjc2as7zp6bq7z7sd56rwiziw7vp7vm";
version = "1.0.0.1";
sha256 = "0l1v4ddjdsgi9nqzyzcxxj76rwar3lzx8gmwf2r54bqan3san9db";
meta = {
homepage = "https://github.com/bos/base64-bytestring";
description = "Fast base64 encoding and deconding for ByteStrings";
description = "Fast base64 encoding and decoding for ByteStrings";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];

View file

@ -1,10 +1,10 @@
{ cabal, semigroupoids, semigroups }:
{ cabal, semigroupoids, semigroups, tagged }:
cabal.mkDerivation (self: {
pname = "bifunctors";
version = "3.0.3";
sha256 = "1nmrwc9n9qkj9w9c38ja0had32isr6v35j1v19fhqdwk5ddbpxp4";
buildDepends = [ semigroupoids semigroups ];
version = "3.2";
sha256 = "03bszf1127iw5kimjbag5gmgzz7h2qzcd9f7jb53jpiadfhjfx0a";
buildDepends = [ semigroupoids semigroups tagged ];
meta = {
homepage = "http://github.com/ekmett/bifunctors/";
description = "Haskell 98 bifunctors";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "bmp";
version = "1.2.3.4";
sha256 = "134nfchsw4q1k3kr09i5w8jxbr659as4523gs5m2dch15wrmrhf6";
version = "1.2.4.1";
sha256 = "1ipy8v5n5dmajnai2cf7591chklxcbhpvwjdgvdwglipds2hjpap";
buildDepends = [ binary ];
meta = {
homepage = "http://code.ouroborus.net/bmp";

View file

@ -1,10 +1,10 @@
{ cabal, hashable, text }:
{ cabal, deepseq, hashable, text }:
cabal.mkDerivation (self: {
pname = "case-insensitive";
version = "0.4.0.4";
sha256 = "1xzpri688vbd6fvvxczqx8bv53009ygzws7vbjmj2q97wcm8nmwd";
buildDepends = [ hashable text ];
version = "1.0";
sha256 = "1x437b5yyh930a5dr642lvfdgpx12w4ms70whiw1ffjjhssb88zk";
buildDepends = [ deepseq hashable text ];
meta = {
homepage = "https://github.com/basvandijk/case-insensitive";
description = "Case insensitive string comparison";

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "classy-prelude-conduit";
version = "0.4.3";
sha256 = "0ny4si6z6i6g6khcg9d3m9wks42sqh8i8kpgghhdwd37v32l3f34";
version = "0.5.0";
sha256 = "1c1j9cxj08nz1pkrdxhphk6zyn1dxf3wbl8phcrzi8qk6q1vi0bi";
buildDepends = [
classyPrelude conduit monadControl resourcet transformers void
xmlConduit

View file

@ -1,13 +1,13 @@
{ cabal, basicPrelude, hashable, systemFilepath, text, transformers
, unorderedContainers, vector
{ cabal, basicPrelude, hashable, liftedBase, systemFilepath, text
, transformers, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "classy-prelude";
version = "0.4.3";
sha256 = "1k2iszja03s8azypl8lpkdjvvqsgzg73cl1wp4jl2fqp1psqv36q";
version = "0.5.0";
sha256 = "187a1p2x7jw53iramdq3v2m8h451k5nrjrmnv5sz4c8x9jmj04dp";
buildDepends = [
basicPrelude hashable systemFilepath text transformers
basicPrelude hashable liftedBase systemFilepath text transformers
unorderedContainers vector
];
meta = {

View file

@ -1,10 +1,10 @@
{ cabal, transformers }:
{ cabal, tagged, transformers, transformersCompat }:
cabal.mkDerivation (self: {
pname = "contravariant";
version = "0.2.0.2";
sha256 = "0142s1c914zbfnvysvcc9s3bv8qs6wimnqcmxca1gxaxqvyfkf3p";
buildDepends = [ transformers ];
version = "0.4";
sha256 = "1nqslc9vcx6v6c33fn7mvb1xhr33yl3ja92p788zx8z1drx9cqc3";
buildDepends = [ tagged transformers transformersCompat ];
meta = {
homepage = "http://github.com/ekmett/contravariant/";
description = "Haskell 98 contravariant functors";

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "criterion";
version = "0.6.2.0";
sha256 = "1xd90qb026niq2sn7ks8bn92ifb6255saic68bzg6kzj7ydwwdmx";
version = "0.6.2.1";
sha256 = "08gbs61qqsq0kh2r33kzm9mmbs3ar5krmp1a0cf21c012k6k55z5";
buildDepends = [
aeson deepseq filepath hastache mtl mwcRandom parsec statistics
time transformers vector vectorAlgorithms

Some files were not shown because too many files have changed in this diff Show more