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

This commit is contained in:
Peter Simons 2013-06-01 11:48:21 +02:00
commit 5718931dd3
160 changed files with 4240 additions and 2684 deletions

View File

@ -0,0 +1,32 @@
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
shared_desktop_ontologies, marble, mysql }:
stdenv.mkDerivation rec {
name = "digikam-2.9.0";
src = fetchurl {
url = "mirror://sourceforge/digikam/${name}.tar.bz2";
sha256 = "181vf065j1zz26zahkb7hy3fk4837nvwm61cnykvni7w40w0zpbk";
};
nativeBuildInputs = [ cmake automoc4 pkgconfig ];
buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql ];
# Make digikam find some FindXXXX.cmake
KDEDIRS="${marble}:${qjson}";
enableParallelBuilding = true;
meta = {
description = "Photo Management Program";
license = "GPL";
homepage = http://www.digikam.org;
maintainers = with stdenv.lib.maintainers; [ viric urkud ];
inherit (kdelibs.meta) platforms;
};
}

View File

@ -4,11 +4,11 @@ liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost
shared_desktop_ontologies, marble, mysql }:
stdenv.mkDerivation rec {
name = "digikam-2.6.0";
name = "digikam-3.2.0";
src = fetchurl {
url = "mirror://sourceforge/digikam/${name}.tar.bz2";
sha256 = "1prnaywnbv0xpw6knqagzc4gn1vsj9kw2hvdasjwknc9ljiyl721";
url = "http://download.kde.org/stable/digikam/${name}.tar.bz2";
sha256 = "06j858d2nvbqh0bw6m60rh1bsws06fm5vfjpwwi3zxsf5ka08wmx";
};
nativeBuildInputs = [ cmake automoc4 pkgconfig ];
@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
# Make digikam find some FindXXXX.cmake
KDEDIRS="${marble}:${qjson}";
enableParallelBuilding = true;
meta = {
description = "Photo Management Program";
license = "GPL";

View File

@ -1,15 +1,14 @@
{ fetchgit, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts,
{ fetchurl, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts,
boost, zlib,
python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }:
stdenv.mkDerivation rec {
name = "freecad-${version}";
version = "git-20121213";
version = "0.13.1830";
src = fetchgit {
url = git://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad;
rev = "d3949cedc7e3c924d426660515e06eaf55d1a67f";
sha256 = "0a07ih0z5d8m69zasmvi7z4lgq0pa67k2g7r1l6nz2d0b30py61w";
src = fetchurl {
url = "mirror://sourceforge/free-cad/${name}.tar.gz";
sha256 = "04rgww5y32asn4sx5j4wh79ggvb479pq56xfcfj6gkg44mid23jm";
};
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost

View File

@ -0,0 +1,22 @@
{ stdenv, fetchurl, libX11, imlib2, giflib }:
stdenv.mkDerivation {
name = "sxiv-1.1";
src = fetchurl {
url = "https://github.com/muennich/sxiv/archive/v1.1.tar.gz";
name = "sxiv-1.1.tar.gz";
sha256 = "0gsqwa1yacsig7ycjrw0sjyrsa9mynfzzbwm1vp2bgk4s9hb08kx";
};
buildInputs = [ libX11 imlib2 giflib ];
prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';
meta = {
description = "Simple X Image Viewer";
homepage = "https://github.com/muennich/sxiv";
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -1,14 +1,22 @@
{ stdenv, fetchurl, libX11, ncurses, libXext, libXft }:
{ stdenv, fetchurl, writeText, libX11, ncurses, libXext, libXft, fontconfig
, conf? null}:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "st-0.3";
name = "st-0.4.1";
src = fetchurl {
url = "http://dl.suckless.org/st/${name}.tar.gz";
sha256 = "0d0fjixiis4ixbz4l18rqhnssa7cy2bap3jkjyphqlqhl7lahv3d";
sha256 = "0cdzwbm5fxrwz8ryxkh90d3vwx54wjyywgj28ymsb5fdv3396bzf";
};
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
buildInputs = [ libX11 ncurses libXext libXft ];
buildInputs = [ libX11 ncurses libXext libXft fontconfig ];
NIX_LDFLAGS = "-lfontconfig";
installPhase = ''
TERMINFO=$out/share/terminfo make install PREFIX=$out
@ -17,7 +25,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://st.suckless.org/;
license = "MIT";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
maintainers = with maintainers; [viric];
platforms = with platforms; linux;
};
}

View File

@ -14,9 +14,9 @@ let
else if stdenv.system == "i686-linux" then "ld-linux.so.2"
else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
version = "1.0.132";
sha256 = if stdenv.system == "x86_64-linux" then "04mwzpbibzzbl384ziq07g7xxbc1rb5lyxgc7g8m1x5fvc6g1dk6"
else if stdenv.system == "i686-linux" then "0yz1y761gx612lczlqjc3wddnw73qf4b8rna9hmfzan7ikqb81z0"
version = "1.0.134";
sha256 = if stdenv.system == "x86_64-linux" then "1kyxiqjabqgsg7n0a8snh03axxzpniazp93shb2l1b6x0f7d24n7"
else if stdenv.system == "i686-linux" then "02wb8pqcb1rk108r49cqyg7s14grmjnkr6p3068pkiwdwwgi8jak"
else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
in stdenv.mkDerivation {

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, which
{ stdenv, fetchurl, makeWrapper, ninja, which
# default dependencies
, bzip2, flac, speex
@ -12,12 +12,9 @@
, utillinux, alsaLib
, gcc, bison, gperf
, glib, gtk, dbus_glib
, libXScrnSaver, libXcursor, mesa
, libXScrnSaver, libXcursor, libXtst, mesa
, protobuf, speechd, libXdamage
# dependencies for >= v27
, libXtst
# optional dependencies
, libgcrypt ? null # gnomeSupport || cupsSupport
@ -81,11 +78,6 @@ let
libusb1 libexif
];
pre27 = versionOlder sourceInfo.version "27.0.0.0";
pre28 = versionOlder sourceInfo.version "28.0.0.0";
post26 = !pre27;
post27 = !pre28;
# build paths and release info
packageName = "chromium";
buildType = "Release";
@ -112,23 +104,20 @@ in stdenv.mkDerivation rec {
gcc bison gperf
krb5
glib gtk dbus_glib
libXScrnSaver libXcursor mesa
libXScrnSaver libXcursor libXtst mesa
pciutils protobuf speechd libXdamage
] ++ optional gnomeKeyringSupport libgnome_keyring
++ optionals gnomeSupport [ gconf libgcrypt ]
++ optional enableSELinux libselinux
++ optional cupsSupport libgcrypt
++ optional pulseSupport pulseaudio
++ optional post26 libXtst;
++ optional pulseSupport pulseaudio;
opensslPatches = optional useOpenSSL openssl.patches;
prePatch = "patchShebangs .";
patches = [ ./sandbox_userns.patch ]
++ optional cupsSupport ./cups_allow_deprecated.patch
++ optional (pulseSupport && pre27) ./pulseaudio_array_bounds.patch
++ optional pre27 ./glibc-2.16-use-siginfo_t.patch;
++ optional cupsSupport ./cups_allow_deprecated.patch;
postPatch = ''
sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi
@ -136,7 +125,7 @@ in stdenv.mkDerivation rec {
cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
'' + ''
sed -i -e 's|/usr/bin/gcc|gcc|' \
third_party/WebKit/Source/${if post27
third_party/WebKit/Source/${if !versionOlder sourceInfo.version "28.0.0.0"
then "core/core.gypi"
else "WebCore/WebCore.gyp/WebCore.gyp"}
'';
@ -165,28 +154,21 @@ in stdenv.mkDerivation rec {
target_arch = "ia32";
});
enableParallelBuilding = true;
configurePhase = ''
python build/gyp_chromium --depth "$(pwd)" ${gypFlags}
GYP_GENERATORS=ninja python build/gyp_chromium --depth "$(pwd)" ${gypFlags}
'';
makeFlags = let
buildPhase = let
CC = "${gcc}/bin/gcc";
CXX = "${gcc}/bin/g++";
in [
"CC=${CC}"
"CXX=${CXX}"
"CC.host=${CC}"
"CXX.host=${CXX}"
"LINK.host=${CXX}"
];
buildFlags = [
"BUILDTYPE=${buildType}"
"library=shared_library"
"chrome"
] ++ optional (!enableSELinux) "chrome_sandbox";
in ''
CC="${CC}" CC_host="${CC}" \
CXX="${CXX}" CXX_host="${CXX}" \
LINK_host="${CXX}" \
"${ninja}/bin/ninja" -C "out/${buildType}" \
-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
chrome ${optionalString (!enableSELinux) "chrome_sandbox"}
'';
installPhase = ''
mkdir -vp "${libExecPath}"
@ -206,6 +188,7 @@ in stdenv.mkDerivation rec {
for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do
num_and_suffix="''${icon_file##*logo_}"
icon_size="''${num_and_suffix%.*}"
expr "$icon_size" : "^[0-9][0-9]*$" || continue
logo_output_prefix="$out/share/icons/hicolor"
logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
mkdir -vp "$logo_output_path"

View File

@ -1,27 +0,0 @@
--- a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h.orig 2012-12-22 16:01:44.000000000 +0200
+++ b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-12-23 21:53:26.746069153 +0200
@@ -250,7 +250,7 @@
struct kernel_old_sigaction {
union {
void (*sa_handler_)(int);
- void (*sa_sigaction_)(int, struct siginfo *, void *);
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
};
unsigned long sa_mask;
unsigned long sa_flags;
@@ -287,13 +287,13 @@
unsigned long sa_flags;
union {
void (*sa_handler_)(int);
- void (*sa_sigaction_)(int, struct siginfo *, void *);
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
};
struct kernel_sigset_t sa_mask;
#else
union {
void (*sa_handler_)(int);
- void (*sa_sigaction_)(int, struct siginfo *, void *);
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
};
unsigned long sa_flags;
void (*sa_restorer)(void);

View File

@ -1,12 +0,0 @@
diff --git a/media/media.gyp b/media/media.gyp
index 2a8c6c6..66ca767 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -399,6 +399,7 @@
['use_pulseaudio == 1', {
'cflags': [
'<!@(pkg-config --cflags libpulse)',
+ '-Wno-array-bounds',
],
'link_settings': {
'libraries': [

View File

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
dev = {
version = "28.0.1500.5";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.5.tar.xz";
sha256 = "1jpjmqag875bpy4rwvr362nzx0r8ffcrisil9ci2ar6ayjd4lfhd";
version = "29.0.1516.3";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1516.3.tar.xz";
sha256 = "0pdn9c6v0v55d7g4amivxrv132bpj9sfqywk5b8l6kqfjq28mw5k";
};
beta = {
version = "27.0.1453.81";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.81.tar.xz";
sha256 = "1g4gsrcdrp06hqr25fd9l4snjhibp5pi7pc3wv11fp8gd04cpv9w";
version = "28.0.1500.20";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.20.tar.xz";
sha256 = "1q4qsgixh9q5akjnk614k942kxshi81v4xvm40f7rxzns88qbfrz";
};
stable = {
version = "26.0.1410.63";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.63.tar.xz";
sha256 = "0gsb0dgk7p04997wlw7swxnnpf5ix9drn0wn07pgsalr8l3zgy3s";
version = "27.0.1453.93";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.93.tar.xz";
sha256 = "0h5d4v7003y3h6rg48dn6cswp6zzj9zdcci3cl9cbb3j9ldc1n3d";
};
}

View File

@ -0,0 +1,22 @@
{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, perl, zlib, file, curl, geoip, gperftools }:
stdenv.mkDerivation rec {
name = "bro-2.1";
src = fetchurl {
url = "http://www.bro.org/downloads/release/${name}.tar.gz";
sha256 = "1q2mm7rbgjcn01na2wm5fdfdm9pggzgljxj0n127s93fip3vg0qd";
};
buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip gperftools ];
USER="something";
enableParallelBuilding = true;
meta = {
description = "Bro is a powerful network analysis framework that is much different from the typical IDS you may know.";
homepage = http://www.bro.org/;
license = "BSD";
};
}

View File

@ -0,0 +1,19 @@
{stdenv, fetchurl, flex, bison, libpcap}:
stdenv.mkDerivation rec {
name = "daq-2.0.0";
src = fetchurl {
name = "${name}.tar.gz";
url = http://www.snort.org/downloads/2311;
sha256 = "0f0w5jfmx0n2sms4f2mfg984a27r7qh927vkd7fclvx9cbiwibzv";
};
buildInputs = [ flex bison libpcap ];
meta = {
description = "Data AcQuisition library (DAQ), for packet I/O";
homepage = http://www.snort.org;
license = "GPLv2";
};
}

View File

@ -0,0 +1,19 @@
{stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}:
stdenv.mkDerivation rec {
name = "snort-2.9.4.6";
src = fetchurl {
name = "${name}.tar.gz";
url = http://www.snort.org/downloads/2320;
sha256 = "1g5kn36l67a5m95h2shqwqbbjb6rgl3sf1bciakal2l4n6857ang";
};
buildInputs = [ libpcap pcre libdnet daq zlib flex bison ];
meta = {
description = "Snort is an open source network intrusion prevention and detection system (IDS/IPS)";
homepage = http://www.snort.org;
license = "GPLv2";
};
}

View File

@ -1,54 +1,92 @@
a :
let
fetchurl = a.fetchurl;
{ stdenv, fetchurl, python, intltool, pkgconfig, libX11, gtk
, ldns, pyopenssl, pythonDBus, pythonPackages
, enableJingle ? true, farstream ? null, gst_plugins_bad ? null
, libnice ? null
, enableE2E ? true
, enableRST ? true
, enableSpelling ? true, gtkspell ? null
, enableNotifications ? false
, enableLaTeX ? false, texLive ? null
}:
assert enableJingle -> farstream != null && gst_plugins_bad != null
&& libnice != null;
assert enableE2E -> pythonPackages.pycrypto != null;
assert enableRST -> pythonPackages.docutils != null;
assert enableSpelling -> gtkspell != null;
assert enableNotifications -> pythonPackages.notify != null;
assert enableLaTeX -> texLive != null;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "gajim-${version}";
version = "0.15.4";
version = a.lib.attrByPath ["version"] "0.15.1" a;
buildInputs = with a; [
python pyGtkGlade gtk perl intltool dbus gettext
pkgconfig makeWrapper libglade pyopenssl libXScrnSaver
libXt xproto libXext xextproto libX11 gtkspell aspell
scrnsaverproto pycrypto pythonDBus pythonSexy
docutils pyasn1 farstream gst_plugins_bad gstreamer
gst_ffmpeg gst_python
];
in
rec {
src = fetchurl {
url = "http://www.gajim.org/downloads/0.15/gajim-${version}.tar.gz";
sha256 = "b315d4a600da0c5f8248e8f887a41ce2630c49995b36cbad8fb2cd81cc8d2e8b";
sha256 = "1g4m5j777vqqdwqvr2m6l09ljjx65ilag45d5kfc78z7frm0cz7g";
};
inherit buildInputs;
configureFlags = [];
patches = [
(fetchurl {
name = "gajim-drill-srv.patch";
url = "https://projects.archlinux.org/svntogit/packages.git/"
+ "plain/trunk/gajim-drill.patch?h=packages/gajim";
sha256 = "1k8zz3ns0l0kriffq41jgkv5ym6jvyd24171l7s98v9d81prdw1w";
})
(fetchurl {
name = "gajim-icon-index.patch";
url = "http://hg.gajim.org/gajim/raw-rev/b9ec78663dfb";
sha256 = "0w54hr5dq9y36val55kmh8d6cid7h4fs2nghx09714jylz2nyxxv";
})
];
preConfigure = a.fullDepEntry (''
export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pyGtkGlade})/gtk-2.0"
export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pygobject})/gtk-2.0"
sed -e '/-L[$]x_libraries/d' -i configure
sed -e 's@tmpfd.close()@os.close(tmpfd)@' -i src/common/latex.py
'') ["addInputs" "doUnpack"];
postPatch = ''
sed -i -e '0,/^[^#]/ {
/^[^#]/i export \\\
PYTHONPATH="'"$PYTHONPATH\''${PYTHONPATH:+:}\$PYTHONPATH"'" \\\
GST_PLUGIN_PATH="'"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}${""
}$GST_PLUGIN_PATH"'"
}' scripts/gajim.in
fixScriptNames = a.fullDepEntry (''
mkdir "$out"/bin-wrapped
for i in "$out"/bin/.*-wrapped; do
name="$i"
name="''${name%-wrapped}"
name="''${name##*/.}"
mv "$i" "$out/bin-wrapped/$name"
sed -e 's^'"$i"'^'"$out/bin-wrapped/$name"'^' -i "$out/bin/$name"
sed -e "2aexport LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${a.gtkspell}/lib:${a.gtkspell}/lib64\"" -i "$out/bin/gajim"
sed -e "2aexport NIX_LDFLAGS=\"\$NIX_LDFLAGS -L${a.gtkspell}/lib -L${a.gtkspell}/lib64\"" -i "$out/bin/gajim"
sed -e "2aexport GST_PLUGIN_PATH=\"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}$(echo ${a.gst_plugins_bad}/lib/gstreamer-*):$(echo ${a.gst_ffmpeg}/lib/gstreamer-*):$(echo ${a.farstream}/lib/gstreamer-*)\"" -i "$out/bin/gajim"
done
'') ["wrapBinContentsPython"];
sed -i -e 's/return helpers.is_in_path('"'"'drill.*/return True/' \
src/features_window.py
sed -i -e "s|'drill'|'${ldns}/bin/drill'|" src/common/resolver.py
'' + optionalString enableSpelling ''
sed -i -e 's|=.*find_lib.*|= "${gtkspell}/lib/libgtkspell.so"|' \
src/gtkspell.py
'' + optionalString enableLaTeX ''
sed -i -e "s|try_run(.'dvipng'|try_run(['${texLive}/bin/dvipng'|" \
-e "s|try_run(.'latex'|try_run(['${texLive}/bin/latex'|" \
-e 's/tmpfd.close()/os.close(tmpfd)/' \
src/common/latex.py
'';
/* doConfigure should be removed if not needed */
phaseNames = ["preConfigure" (a.doDump "1") "doConfigure" "doMakeInstall"
"wrapBinContentsPython" "fixScriptNames"];
buildInputs = [
python intltool pkgconfig libX11
pythonPackages.pygobject pythonPackages.pyGtkGlade
pythonPackages.sqlite3 pythonPackages.pyasn1
pythonPackages.pyxdg
pyopenssl pythonDBus
] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ]
++ optional enableE2E pythonPackages.pycrypto
++ optional enableRST pythonPackages.docutils
++ optional enableNotifications pythonPackages.notify
++ optional enableLaTeX texLive;
postInstall = ''
install -m 644 -t "$out/share/gajim/icons/hicolor" \
"icons/hicolor/index.theme"
'';
enableParallelBuilding = true;
name = "gajim-" + version;
meta = {
description = "Jabber client with meta-contacts";
maintainers = [a.lib.maintainers.raskin];
homepage = "http://gajim.org/";
description = "Jabber client written in PyGTK";
license = licenses.gpl3Plus;
maintainers = [ maintainers.raskin maintainers.aszlig ];
};
}

View File

@ -41,5 +41,7 @@ stdenv.mkDerivation rec {
homepage = http://mumble.sourceforge.net/;
description = "Low-latency, high quality voice chat software";
license = "BSD";
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [viric];
};
}

View File

@ -1,85 +0,0 @@
{ stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt
, zlib, gmp, curl, libtool, guile, adns, sqlite, pkgconfig
, libxml2, ncurses, gettext, findutils
, gtkSupport ? false, gtk ? null, libglade ? null
, makeWrapper }:
assert gtkSupport -> (gtk != null) && (libglade != null);
let version = "0.8.1b";
in
stdenv.mkDerivation {
name = "gnunet-${version}";
src = fetchurl {
url = "mirror://gnu/gnunet/GNUnet-${version}.tar.gz";
sha256 = "0k6nrsxz5s52z6hlahb7d3sj1z0gidm79n04pf9j2ngfylp4v1bw";
};
buildInputs = [
libextractor libmicrohttpd libgcrypt gmp curl libtool
zlib guile adns sqlite libxml2 ncurses
pkgconfig gettext findutils
makeWrapper
] ++ (if gtkSupport then [ gtk libglade ] else []);
preConfigure = ''
# Brute force: since nix-worker chroots don't provide
# /etc/{resolv.conf,hosts}, replace all references to `localhost'
# by their IPv4 equivalent.
for i in $(find . \( -name \*.c -or -name \*.conf \) \
-exec grep -l localhost {} \;)
do
echo "$i: substituting \`127.0.0.1' to \`localhost'..."
substituteInPlace "$i" --replace "localhost" "127.0.0.1"
done
# Make sure the tests don't rely on `/tmp', for the sake of chroot
# builds.
for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \
-exec grep -l /tmp {} \;)
do
echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
done
'';
doCheck = false;
# 1. Run tests have once GNUnet is installed.
# 2. Help programs find the numerous modules that sit under
# `$out/lib/GNUnet'.
# FIXME: `src/transports/test_udp' hangs forever.
postInstall = ''
#GNUNET_PREFIX="$out" make check
wrapProgram "$out/bin/gnunetd" \
--prefix LTDL_LIBRARY_PATH ":" "$out/lib/GNUnet"
'';
meta = {
description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework";
longDescription = ''
GNUnet is a framework for secure peer-to-peer networking that
does not use any centralized or otherwise trusted services. A
first service implemented on top of the networking layer
allows anonymous censorship-resistant file-sharing. Anonymity
is provided by making messages originating from a peer
indistinguishable from messages that the peer is routing. All
peers act as routers and use link-encrypted connections with
stable bandwidth utilization to communicate with each other.
GNUnet uses a simple, excess-based economic model to allocate
resources. Peers in GNUnet monitor each others behavior with
respect to resource usage; peers that contribute to the
network are rewarded with better service.
'';
homepage = http://gnunet.org/;
license = "GPLv2+";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.gnu;
};
}

View File

@ -0,0 +1,90 @@
{ stdenv, fetchsvn, libextractor, libmicrohttpd, libgcrypt
, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
, libxml2, ncurses, gettext, libunistring, libidn
, makeWrapper, autoconf, automake }:
let
rev = "27317";
in
stdenv.mkDerivation rec {
name = "gnunet-svn-${rev}";
src = fetchsvn {
url = https://gnunet.org/svn/gnunet;
rev = "27317";
sha256 = "1l7jypm57wjhzlwdj8xzhfppjdpy6wbph4nqgwxxb9q056wwf9zy";
};
buildInputs = [
libextractor libmicrohttpd libgcrypt gmp curl libtool
zlib adns sqlite libxml2 ncurses libidn
pkgconfig gettext libunistring makeWrapper
autoconf automake
];
preConfigure = ''
# Brute force: since nix-worker chroots don't provide
# /etc/{resolv.conf,hosts}, replace all references to `localhost'
# by their IPv4 equivalent.
for i in $(find . \( -name \*.c -or -name \*.conf \) \
-exec grep -l '\<localhost\>' {} \;)
do
echo "$i: substituting \`127.0.0.1' to \`localhost'..."
sed -i "$i" -e's/\<localhost\>/127.0.0.1/g'
done
# Make sure the tests don't rely on `/tmp', for the sake of chroot
# builds.
for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \
-exec grep -l /tmp {} \;)
do
echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
done
# Ensure NSS installation works fine
configureFlags="$configureFlags --with-nssdir=$out/lib"
patchShebangs src/gns/nss/install-nss-plugin.sh
sh contrib/pogen.sh
sh bootstrap
'';
doCheck = false;
/* FIXME: Tests must be run this way, but there are still a couple of
failures.
postInstall =
'' export GNUNET_PREFIX="$out"
export PATH="$out/bin:$PATH"
make -k check
'';
*/
meta = {
description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework";
longDescription = ''
GNUnet is a framework for secure peer-to-peer networking that
does not use any centralized or otherwise trusted services. A
first service implemented on top of the networking layer
allows anonymous censorship-resistant file-sharing. Anonymity
is provided by making messages originating from a peer
indistinguishable from messages that the peer is routing. All
peers act as routers and use link-encrypted connections with
stable bandwidth utilization to communicate with each other.
GNUnet uses a simple, excess-based economic model to allocate
resources. Peers in GNUnet monitor each others behavior with
respect to resource usage; peers that contribute to the
network are rewarded with better service.
'';
homepage = http://gnunet.org/;
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [ ludo viric ];
platforms = stdenv.lib.platforms.gnu;
};
}

View File

@ -0,0 +1,86 @@
{ stdenv, fetchurl, makeDesktopItem, patchelf, zlib, freetype, fontconfig
, openssl, libXrender, libXrandr, libXcursor, libX11, libXext, libXi
}:
let
libPath = stdenv.lib.makeLibraryPath
[ zlib freetype fontconfig openssl libXrender libXrandr libXcursor libX11
libXext libXi
];
in
stdenv.mkDerivation rec {
name = "eagle-${version}";
version = "6.4.0";
src = fetchurl {
url = "ftp://ftp.cadsoft.de/eagle/program/6.4/eagle-lin-${version}.run";
sha256 = "0jb44dsq4cl9rx5nam6rxsw9fsmm6fsksv9s544p2zrwnad2x2i8";
};
desktopItem = makeDesktopItem {
name = "Eagle";
exec = "eagle";
icon = "eagle";
comment = "Schematic capture and PCB layout";
desktopName = "Eagle";
genericName = "Schematic editor";
categories = "Application;Development;";
};
buildInputs =
[ patchelf zlib freetype fontconfig openssl libXrender libXrandr libXcursor
libX11 libXext libXi
];
phases = [ "installPhase" ];
# NOTES:
# Eagle for Linux comes as a self-extracting shell script with embedded
# tarball. The tarball data (.tar.bz2) starts after a __DATA__ marker.
#
# Eagle apparently doesn't like binary patching. This is what happens:
# $ ./result/eagle-6.4.0/bin/eagle
# argv[0] (/home/bfo/nixpkgs/result/eagle-6.4.0/bin/eagle) is not the currently executed program version!
installPhase = ''
# Extract eagle tarball
mkdir "$out"
sed '1,/^__DATA__$/d' "$src" | tar -xjf - -C "$out"
# Install manpage
mkdir -p "$out"/share/man/man1
ln -s "$out"/eagle-${version}/doc/eagle.1 "$out"/share/man/man1/eagle.1
# Build LD_PRELOAD library that redirects license file access to the home
# directory of the user
mkdir -p "$out"/lib
gcc -shared -fPIC -DEAGLE_PATH=\"$out/eagle-${version}\" ${./eagle_fixer.c} -o "$out"/lib/eagle_fixer.so -ldl
# Make wrapper script
dynlinker="$(cat $NIX_GCC/nix-support/dynamic-linker)"
mkdir -p "$out"/bin
cat > "$out"/bin/eagle << EOF
#!${stdenv.shell}
export LD_LIBRARY_PATH="${stdenv.gcc.gcc}/lib:${libPath}"
export LD_PRELOAD="$out/lib/eagle_fixer.so"
exec "$dynlinker" "$out/eagle-${version}/bin/eagle" "\$@"
EOF
chmod a+x "$out"/bin/eagle
# Make desktop item
mkdir -p "$out"/share/applications
cp "$desktopItem"/share/applications/* "$out"/share/applications/
mkdir -p "$out"/share/icons
ln -s "$out/eagle-${version}/bin/eagleicon50.png" "$out"/share/icons/eagle.png
'';
meta = with stdenv.lib; {
description = "Schematic editor and PCB layout tool from CadSoft";
homepage = http://www.cadsoftusa.com/;
license = licenses.unfree;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

View File

@ -0,0 +1,134 @@
/*
* LD_PRELOAD trick to make Eagle (schematic editor and PCB layout tool from
* CadSoft) work from a read-only installation directory.
*
* When Eagle starts, it looks for the license file in <eagle>/bin/eagle.key
* (where <eagle> is the install path). If eagle.key is not found, Eagle checks
* for write access to <eagle>/bin/, shows a license dialog to the user and
* then attempts to write a license file to <eagle>/bin/.
*
* This will of course fail when Eagle is installed in the read-only Nix store.
* Hence this library that redirects accesses to the those paths in the
* following way:
*
* <eagle>/bin => $HOME
* <eagle>/bin/eagle.key => $HOME/.eagle.key
*
* Also, if copying an example project to ~/eagle/ (in the Eagle GUI), Eagle
* chmod's the destination with read-only permission bits (presumably because
* the source is read-only) and fails to complete the copy operation.
* Therefore, the mode argument in calls to chmod() is OR'ed with the S_IWUSR
* bit (write by owner).
*
* Usage:
* gcc -shared -fPIC -DEAGLE_PATH="$out/eagle-${version}" eagle_fixer.c -o eagle_fixer.so -ldl
* LD_PRELOAD=$PWD/eagle_fixer.so ./result/bin/eagle
*
* To see the paths that are modified at runtime, set the environment variable
* EAGLE_FIXER_DEBUG to 1.
*/
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
#include <dlfcn.h>
#include <limits.h>
#include <sys/stat.h>
#ifndef EAGLE_PATH
#error Missing EAGLE_PATH, path to the eagle-${version} installation directory.
#endif
typedef FILE *(*fopen_func_t)(const char *path, const char *mode);
typedef int (*access_func_t)(const char *pathname, int mode);
typedef int (*chmod_func_t)(const char *path, mode_t mode);
/*
* Map <eagle>/bin to $HOME and <eagle>/bin/eagle.key to $HOME/.eagle.key
*
* Path is truncated if bigger than PATH_MAX. It's not threadsafe, but that's
* OK.
*/
static const char *redirect(const char *pathname)
{
static char buffer[PATH_MAX];
const char *homepath;
const char *new_path;
static int have_warned;
homepath = getenv("HOME");
if (!homepath) {
homepath = "/";
if (!have_warned && getenv("EAGLE_FIXER_DEBUG")) {
fprintf(stderr, "eagle_fixer: HOME is unset, using \"/\" (root) instead.\n");
have_warned = 1;
}
}
new_path = pathname;
if (strcmp(EAGLE_PATH "/bin", pathname) == 0) {
/* redirect to $HOME */
new_path = homepath;
} else if (strcmp(EAGLE_PATH "/bin/eagle.key", pathname) == 0) {
/* redirect to $HOME/.eagle.key */
snprintf(buffer, PATH_MAX, "%s/.eagle.key", homepath);
buffer[PATH_MAX-1] = '\0';
new_path = buffer;
}
return new_path;
}
FILE *fopen(const char *pathname, const char *mode)
{
FILE *fp;
const char *path;
fopen_func_t orig_fopen;
orig_fopen = (fopen_func_t)dlsym(RTLD_NEXT, "fopen");
path = redirect(pathname);
fp = orig_fopen(path, mode);
if (path != pathname && getenv("EAGLE_FIXER_DEBUG")) {
fprintf(stderr, "eagle_fixer: fopen(\"%s\", \"%s\") => \"%s\": fp=%p\n", pathname, mode, path, fp);
}
return fp;
}
int access(const char *pathname, int mode)
{
int ret;
const char *path;
access_func_t orig_access;
orig_access = (access_func_t)dlsym(RTLD_NEXT, "access");
path = redirect(pathname);
ret = orig_access(path, mode);
if (path != pathname && getenv("EAGLE_FIXER_DEBUG")) {
fprintf(stderr, "eagle_fixer: access(\"%s\", %d) => \"%s\": ret=%d\n", pathname, mode, path, ret);
}
return ret;
}
int chmod(const char *pathname, mode_t mode)
{
int ret;
mode_t new_mode;
chmod_func_t orig_chmod;
orig_chmod = (chmod_func_t)dlsym(RTLD_NEXT, "chmod");
new_mode = mode | S_IWUSR;
ret = orig_chmod(pathname, new_mode);
if (getenv("EAGLE_FIXER_DEBUG")) {
fprintf(stderr, "eagle_fixer: chmod(\"%s\", %o) => %o: ret=%d\n", pathname, mode, new_mode, ret);
}
return ret;
}

View File

@ -0,0 +1,28 @@
{ stdenv, fetchurl, blas, bzip2, gfortran, liblapack, libX11, libXmu, libXt
, libjpeg, libpng, libtiff, ncurses, pango, pcre, perl, readline, tcl
, texLive, tk, xz, zlib, less, texinfo, graphviz
}:
stdenv.mkDerivation rec {
name = "R-3.0.1";
src = fetchurl {
url = "http://ftp5.gwdg.de/pub/misc/cran/src/base/R-3/${name}.tar.gz";
sha256 = "0d3iv382bsyz6ad5fk382x7sy3qzgpqvd0fw26r0648lyf54i45g";
};
buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt
libXt libjpeg libpng libtiff ncurses pango pcre perl readline tcl
texLive tk xz zlib less texinfo graphviz ];
enableParallelBuilding = true;
meta = {
description = "a free software environment for statistical computing and graphics";
homepage = "http://www.r-project.org/";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

View File

@ -10,14 +10,14 @@
}:
let
version = "4.20130501";
version = "4.20130521";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "https://github.com/joeyh/git-annex/tarball/${version}";
sha256 = "1280sdj3d3s3k5a1znzl7xzzyncv9kz522bprhwb9if03v6xh2kl";
sha256 = "0wa3sgw0xbqykl5r6ba0gannwj61y0h024glm0xjj97fy06b77i0";
name = "git-annex-${version}.tar.gz";
};
@ -35,7 +35,7 @@ stdenv.mkDerivation {
makeFlagsArray=( PREFIX=$out CABAL=./Setup )
patchShebangs .
ghc -O2 --make Setup
./Setup configure -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -fwebapp -fassistant -fdbus -finotify -fwebdav -fs3
./Setup configure -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -f-webapp -fassistant -fdbus -finotify -fwebdav -fs3
'';
doCheck = true;

View File

@ -16,6 +16,7 @@
, x264Support ? false, x264 ? null
, jackaudioSupport ? false, jackaudio ? null
, pulseSupport ? false, pulseaudio ? null
, bs2bSupport ? false, libbs2b ? null
# For screenshots
, libpngSupport ? true, libpng ? null
, useUnfreeCodecs ? false
@ -38,6 +39,7 @@ assert theoraSupport -> libtheora != null;
assert x264Support -> x264 != null;
assert jackaudioSupport -> jackaudio != null;
assert pulseSupport -> pulseaudio != null;
assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null;
let
@ -112,6 +114,7 @@ stdenv.mkDerivation rec {
++ optional vdpauSupport libvdpau
++ optional speexSupport speex
++ optional libpngSupport libpng
++ optional bs2bSupport libbs2b
;
nativeBuildInputs = [ yasm ];

View File

@ -12,6 +12,7 @@
, theoraSupport ? true, libtheora ? null
, jackaudioSupport ? false, jackaudio ? null
, pulseSupport ? true, pulseaudio ? null
, bs2bSupport ? false, libbs2b ? null
# For screenshots
, libpngSupport ? true, libpng ? null
, useUnfreeCodecs ? false
@ -29,6 +30,7 @@ assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert jackaudioSupport -> jackaudio != null;
assert pulseSupport -> pulseaudio != null;
assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null;
let
@ -92,6 +94,7 @@ stdenv.mkDerivation rec {
++ optional screenSaverSupport libXScrnSaver
++ optional vdpauSupport libvdpau
++ optional speexSupport speex
++ optional bs2bSupport libbs2b
++ optional libpngSupport libpng
;

View File

@ -33,11 +33,11 @@ assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport;
assert pulseSupport -> pulseaudio != null;
stdenv.mkDerivation rec {
name = "xbmc-12.1";
name = "xbmc-12.2";
src = fetchurl {
url = "http://mirrors.xbmc.org/releases/source/${name}.tar.gz";
sha256 = "1hqyq1vl34sywcj8zgx7kdpf8ljzj969l5w6yy4314c431pg7qr9";
sha256 = "077apkq9sx6wlwkwmiz63w5dcqbbrbjbn6qk9fj2fgaizhs0ccxj";
};
buildInputs = [

View File

@ -1,5 +1,5 @@
{stdenv, subversion, sshSupport ? false, openssh ? null}:
{url, rev ? "HEAD", md5 ? "", sha256 ? "", ignoreExternals ? false}:
{stdenv, subversion, sshSupport ? false, openssh ? null}:
{url, rev ? "HEAD", md5 ? "", sha256 ? "", ignoreExternals ? false, name ? null}:
let
repoName = with stdenv.lib;
@ -18,10 +18,12 @@ let
else if snd path == "tags" then "${trd path}-${fst path}"
# ../repo (no trunk) -> repo
else fst path;
name_ = if name == null then "${repoName}-r${toString rev}" else name;
in
stdenv.mkDerivation {
name = "${repoName}-r${toString rev}";
name = name_;
builder = ./builder.sh;
buildInputs = [subversion];

View File

@ -2,11 +2,11 @@
, libxml2, glib}:
stdenv.mkDerivation rec {
name = "shared-mime-info-1.0";
name = "shared-mime-info-1.1";
src = fetchurl {
url = "http://freedesktop.org/~hadess/${name}.tar.xz";
sha256 = "13xf09c4vc4hl5qhk7i4gc6z8knc32b5wjb4ds8ds4z2mbjk1s6j";
sha256 = "0v70z5b6340jsjvdhf7brczpzq766wc1lsnjg9hc57ks2m5hjk8q";
};
buildInputs = [

View File

@ -1,18 +1,20 @@
{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, qca2, xz, pulseaudio
, networkmanager, kactivities, kdepimlibs
, networkmanager, kactivities, kdepimlibs, openexr, ilmbase
}:
kde {
buildInputs = [
kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
qca2 samba (libcanberra.override { gtk = null; }) pulseaudio
networkmanager kactivities kdepimlibs
#todo: add openslp, openexr
networkmanager kactivities kdepimlibs openexr
#todo: add openslp
];
nativeBuildInputs = [ pkgconfig ];
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
passthru.propagatedUserEnvPackages = [ virtuoso ];
meta = {

View File

@ -3,54 +3,31 @@
, openexr, avahi, kerberos, attr, shared_desktop_ontologies, libXScrnSaver
, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee
, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
, getopt, udev, herqq, phonon, libjpeg, xz
, getopt, udev, herqq, phonon, libjpeg, xz, ilmbase
, pkgconfig
}:
kde {
buildInputs =
[ pkgconfig
# attr
attica #todo: update to 4.1
avahi
bzip2
enchant
fam
# getopt
giflib
grantlee # todo: update to 0.3
herqq
jasper
libdbusmenu_qt #todo: update to 0.9.2
libXScrnSaver
libxslt
# pcre
polkit_qt_1 qca2
shared_desktop_ontologies xz udev
# libxml2
libjpeg
kerberos
#openexr # todo: update openexr to 1.7.1. make it compile maybe need ilmbase although it's supposedly propagated
[ pkgconfig attica avahi bzip2 enchant fam giflib grantlee herqq jasper
libdbusmenu_qt libXScrnSaver libxslt polkit_qt_1 qca2
shared_desktop_ontologies xz udev libjpeg kerberos openexr
];
propagatedBuildInputs = [ qt4 soprano
strigi # todo: update to 0.7.8
phonon ];
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
propagatedNativeBuildInputs = [ automoc4 cmake perl
shared_mime_info #todo: update to 1.1
];
propagatedBuildInputs = [ qt4 soprano strigi phonon ];
propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ];
# TODO: make sonnet plugins (dictionaries) really work.
# There are a few hardcoded paths.
# Let kdelibs find openexr
# Split plugins from libs?
patches = [ ../files/polkit-install.patch ];
# cmake fails to find acl.h because of C++-style comment
# TODO: OpenEXR
cmakeFlags = [
"-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
"-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"

View File

@ -3,7 +3,7 @@
, nepomuk_widgets, dblatex }:
kde {
#todo: update grantlee to 0.3
buildInputs =
[ kdepimlibs boost akonadi shared_desktop_ontologies nepomuk_widgets
libxslt cyrus_sasl gpgme libassuan grantlee prison dblatex

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite }:
stdenv.mkDerivation rec {
name = "akonadi-1.9.1";
name = "akonadi-1.9.2";
src = fetchurl {
url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
sha256 = "1w10kb4m8ri6yi1mii2j0sckj3vq11y6qkzijm3lbh4w0fi4kbjk";
sha256 = "1ndzc7a1q1hqy4pn9xnihq6ni02zsqfdyy6z6lwn27bkb7pg64p7";
};
buildInputs = [ qt4 soprano libxslt boost sqlite ];

View File

@ -1,34 +1,27 @@
{ stdenv, fetchsvn, ocaml, zlib, neko }:
stdenv.mkDerivation {
name = "haxe-2.10";
name = "haxe-3.00";
buildInputs = [ocaml zlib neko];
srcs = fetchsvn {
url = "http://haxe.googlecode.com/svn/tags/v2-10";
sha256 = "0vwdlj0vmmf97bg6cish7yah36aca2q599vwzbr1m0jpjbvindkh";
ignoreExternals = true;
};
ocamllibs = fetchsvn {
url = "http://ocamllibs.googlecode.com/svn/trunk";
sha256 = "143s320xn2xalm0lnw46h1fvy48qg7my3j8cf66f0wwzv2fisr1q";
rev = 256;
ignoreExternals = true;
src = fetchsvn {
url = "http://haxe.googlecode.com/svn/trunk";
sha256 = "0hg8qailhgrcdk7r4k9kmwfl9d9ds0vy0l7wbv5wdrrc34qzifm4";
rev = 6706;
};
prePatch = ''
cp -r "$ocamllibs" libs
chmod -R u+w libs
sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml
'';
postBuild = ''
find std/tools -name '*.n' -delete
rm std/tools/haxedoc/haxedoc std/tools/haxelib/haxelib
rm -f std/tools/haxedoc/haxedoc std/tools/haxelib/haxelib
'';
buildFlags = [ "all" "tools" ];
installPhase = ''
install -vd "$out/bin" "$out/lib/haxe/std"
install -vt "$out/bin" haxe haxelib haxedoc

View File

@ -0,0 +1,80 @@
# Sourcery CodeBench Lite toolchain(s) (GCC) from Mentor Graphics
{ stdenv, fetchurl, patchelf, ncurses }:
let
buildToolchain =
{ name, src, description }:
stdenv.mkDerivation rec {
inherit name src;
buildInputs = [ patchelf ];
buildCommand = ''
# Unpack tarball
mkdir -p "$out"
tar --strip-components=1 -xjf "$src" -C "$out"
# Patch binaries
interpreter="$(cat "$NIX_GCC"/nix-support/dynamic-linker)"
for file in "$out"/bin/* "$out"/libexec/gcc/*/*/* "$out"/*/bin/*; do
# Skip non-executable files
case "$file" in
*README.txt) echo "skipping $file"; continue;;
*liblto_plugin.so*) echo "skipping $file"; continue;;
esac
# Skip directories
test -d "$file" && continue
echo "patchelf'ing $file"
patchelf --set-interpreter "$interpreter" "$file"
# GDB needs ncurses
case "$file" in
*gdb) patchelf --set-rpath "${ncurses}/lib" "$file";;
esac
done
# Manpages
mkdir -p "$out/share/man"
ln -s "$out"/share/doc/*/man/man1 "$out/share/man/man1"
ln -s "$out"/share/doc/*/man/man7 "$out/share/man/man7"
'';
meta = with stdenv.lib; {
inherit description;
homepage = http://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
};
in
{
armLinuxGnuEabi = let version = "2013.05-24"; in buildToolchain rec {
name = "sourcery-codebench-lite-arm-linux-gnueabi-${version}";
description = "Sourcery CodeBench Lite toolchain (GCC) for ARM GNU/Linux, from Mentor Graphics";
src = fetchurl {
url = "http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${version}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2";
sha256 = "1xb075ia61c59cya2jl8zp4fvqpfnwkkc5330shvgdlg9981qprr";
};
};
armEabi = let version = "2013.05-23"; in buildToolchain rec {
name = "sourcery-codebench-lite-arm-eabi-${version}";
description = "Sourcery CodeBench Lite toolchain (GCC) for ARM EABI, from Mentor Graphics";
src = fetchurl {
url = "http://sourcery.mentor.com/public/gnu_toolchain/arm-none-eabi/arm-${version}-arm-none-eabi-i686-pc-linux-gnu.tar.bz2";
sha256 = "0nbvdwj3kcv9scx808gniqp0ncdiy2i7afmdvribgkz1lsfin923";
};
};
# TODO: Sourcery CodeBench is also available for MIPS, Power, SuperH,
# ColdFire (and more).
}

View File

@ -3,14 +3,14 @@
assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
let version = "15B02"; in
let version = "15B03"; in
stdenv.mkDerivation {
name = "erlang-" + version;
src = fetchurl {
url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz";
sha256 = "03eb0bd640916666ff83df1330912225fbf555e0c8cf58bb35d8307a314f1158";
url = "http://www.erlang.org/download/otp_src_R15B03-1.tar.gz";
sha256 = "4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c";
};
buildInputs =

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, qt4 }:
stdenv.mkDerivation rec {
name = "attica-0.4.0";
name = "attica-0.4.1";
src = fetchurl {
url = "mirror://kde/stable/attica/${name}.tar.bz2";
sha256 = "172d1z97aw9iscq6wh23i31s4hgq7mmhr3mk4xgifqv0hjcmzyhq";
sha256 = "1rnd861vy6waf25b1ilsr3rwb06dmmlnd8zq3l8y6r0lq5i2bl9n";
};
buildInputs = [ qt4 ];
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A library to access Open Collaboration Service providers";
license = "LGPL";
maintainers = [ maintainers.sander maintainers.urkud ];
maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
inherit (qt4.meta) platforms;
};
}

View File

@ -0,0 +1,19 @@
{ stdenv, fetchurl, pkgconfig, libsndfile }:
stdenv.mkDerivation rec {
name = "libbs2b-${version}";
version = "3.1.0";
src = fetchurl {
url = "mirror://sourceforge/bs2b/${name}.tar.bz2";
sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7";
};
buildInputs = [ pkgconfig libsndfile ];
meta = {
homepage = "http://bs2b.sourceforge.net/";
description = "Bauer stereophonic-to-binaural DSP library";
license = stdenv.lib.licenses.mit;
};
}

View File

@ -57,7 +57,7 @@ stdenv.mkDerivation {
};
# See <http://svn.boost.org/trac/boost/ticket/4688>.
patches = [ ./boost_filesystem_post_1_49_0.patch ./time_utc.patch ];
patches = [ ./boost_filesystem_post_1_49_0.patch ./time_utc.patch ] ++ (stdenv.lib.optional stdenv.isDarwin ./boost-149-darwin.patch );
enableParallelBuilding = true;

View File

@ -0,0 +1,40 @@
diff -rc boost_1_49_0/tools/build/v2/tools/darwin.jam boost_1_49_0-new/tools/build/v2/tools/darwin.jam
*** boost_1_49_0/tools/build/v2/tools/darwin.jam Mon Jun 6 22:36:21 2011
--- boost_1_49_0-new/tools/build/v2/tools/darwin.jam Thu May 23 22:07:45 2013
***************
*** 498,504 ****
flags darwin.compile OPTIONS <link>shared : -dynamic ;
# Misc options.
! flags darwin.compile OPTIONS : -no-cpp-precomp -gdwarf-2 -fexceptions ;
#~ flags darwin.link OPTIONS : -fexceptions ;
# Add the framework names to use.
--- 498,504 ----
flags darwin.compile OPTIONS <link>shared : -dynamic ;
# Misc options.
! flags darwin.compile OPTIONS : -gdwarf-2 -fexceptions ;
#~ flags darwin.link OPTIONS : -fexceptions ;
# Add the framework names to use.
diff -rc boost_1_49_0/tools/build/v2/tools/darwin.py boost_1_49_0-new/tools/build/v2/tools/darwin.py
*** boost_1_49_0/tools/build/v2/tools/darwin.py Wed Oct 28 08:47:51 2009
--- boost_1_49_0-new/tools/build/v2/tools/darwin.py Thu May 23 21:58:12 2013
***************
*** 37,43 ****
feature.feature ('framework', [], ['free'])
toolset.flags ('darwin.compile', 'OPTIONS', '<link>shared', ['-dynamic'])
! toolset.flags ('darwin.compile', 'OPTIONS', None, ['-Wno-long-double', '-no-cpp-precomp'])
toolset.flags ('darwin.compile.c++', 'OPTIONS', None, ['-fcoalesce-templates'])
toolset.flags ('darwin.link', 'FRAMEWORK', '<framework>')
--- 37,43 ----
feature.feature ('framework', [], ['free'])
toolset.flags ('darwin.compile', 'OPTIONS', '<link>shared', ['-dynamic'])
! toolset.flags ('darwin.compile', 'OPTIONS', None, ['-Wno-long-double'])
toolset.flags ('darwin.compile.c++', 'OPTIONS', None, ['-fcoalesce-templates'])
toolset.flags ('darwin.link', 'FRAMEWORK', '<framework>')

View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "c-ares-1.10.0";
src = fetchurl {
url = "http://c-ares.haxx.se/download/${name}.tar.gz";
sha256 = "1nyka87yf2jfd0y6sspll0yxwb8zi7kyvajrdbjmh4axc5s1cw1x";
};
meta = {
description = "A C library for asynchronous DNS requests";
homepage = http://c-ares.haxx.se;
license = stdenv.lib.licenses.mit;
maintainer = [ stdenv.lib.maintainers.shlevy ];
};
}

View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.1.3";
src = fetchurl {
url = "http://ftp.coin3d.org/coin/src/all/Coin-${version}.tar.gz";
url = "https://bitbucket.org/Coin3D/coin/downloads/Coin-${version}.tar.gz";
sha256 = "05ylhrcglm81dajbk132l1w892634z2i97x10fm64y1ih72phd2q";
};

View File

@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
)
'';
installFlags = if stdenv.isDarwin then [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ] else null;
meta = {
homepage = "http://cyrusimap.web.cmu.edu/";
description = "library for adding authentication support to connection-based protocols";

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, qt4, cmake }:
stdenv.mkDerivation rec {
name = "grantlee-0.2.0";
name = "grantlee-0.3.0";
# Upstream download server has country code firewall, so I made a mirror.
src = fetchurl {
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
"http://downloads.grantlee.org/${name}.tar.gz"
"http://www.loegria.net/grantlee/${name}.tar.gz"
];
sha256 = "0x6lvn5i9025vdbs6sybs2mm5ay5y40f7nvb58mc2k518rmjb9j3";
sha256 = "0c2zwaickp7han0zbxg78qrxv06jjfc4xyz2lmvl1xxmpv4vqzpv";
};
buildInputs = [ cmake qt4 ];

View File

@ -5,6 +5,9 @@ cabal.mkDerivation (self: {
version = "5.2.0.10";
sha256 = "0kq6dlx1g7dra7nsfmrc13yvnl7wh00fadmgln9v2vyf0ww82x95";
buildDepends = [ StateVar transformers ];
patchPhase = ''
sed -i -e 's|containers.*,|containers,|' Hipmunk.cabal
'';
meta = {
homepage = "http://patch-tag.com/r/felipe/hipmunk/home";
description = "A Haskell binding for Chipmunk";

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "asn1-types";
version = "0.1.3";
sha256 = "1d55vhax71d29c2b6238pz1hqp4jnyvvfhs8f05qpcv754b4s4jg";
version = "0.2.0";
sha256 = "0350g5p3zbvm29nnjd554i6fyc47vmzpb42w6q46v3i9fiy23kvd";
buildDepends = [ time ];
meta = {
homepage = "http://github.com/vincenthz/hs-asn1-types";

View File

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "0.2.2.6";
sha256 = "19ygaf2g4yqkfbc6bw6fmf9jsymbj1iallzvl0zw3vjx860rchfg";
buildDepends = [ mtl time ];
jailbreak = true;
meta = {
homepage = "http://github.com/tibbe/benchpress";
description = "Micro-benchmarking with detailed statistics";

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "certificate";
version = "1.3.7";
sha256 = "06sfka5p381gayx2q7vvyr7dl8q8d4jfqdrys3k0z8fjxdbqrqya";
version = "1.3.8";
sha256 = "1id3jfaisl04n1mjj9lbq3gyz8hyn3r9p9chzmfbra0pcj3vf1m0";
isLibrary = true;
isExecutable = true;
buildDepends = [

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "1.0.5";
sha256 = "0w8japlx0darpf67ki753l0kw64lgisr1dww3alfwjlya0k84z65";
version = "1.0.6";
sha256 = "0da5wxhsfjgcn850iimcp15vhg5lw0fa8i7c3hdw4yvrpza14dcn";
buildDepends = [
liftedBase mmorph monadControl resourcet text transformers
transformersBase void

View File

@ -1,14 +1,15 @@
{ cabal, aeson, deepseq, filepath, hastache, mtl, mwcRandom, parsec
, statistics, time, transformers, vector, vectorAlgorithms
{ cabal, aeson, binary, deepseq, filepath, Glob, hastache, mtl
, mwcRandom, parsec, statistics, time, transformers, vector
, vectorAlgorithms
}:
cabal.mkDerivation (self: {
pname = "criterion";
version = "0.6.2.1";
sha256 = "08gbs61qqsq0kh2r33kzm9mmbs3ar5krmp1a0cf21c012k6k55z5";
version = "0.8.0.0";
sha256 = "05v4glwvidsd4gm2jcvmlcpfaxg2x0fb69w051rbwg9scanrm7bf";
buildDepends = [
aeson deepseq filepath hastache mtl mwcRandom parsec statistics
time transformers vector vectorAlgorithms
aeson binary deepseq filepath Glob hastache mtl mwcRandom parsec
statistics time transformers vector vectorAlgorithms
];
meta = {
homepage = "https://github.com/bos/criterion";

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "crypto-pubkey-types";
version = "0.3.2";
sha256 = "12gzx4mj8rc243vvjkzvrxnj2f7x3z86yfgahx3my5vsaw4bix2h";
version = "0.4.0";
sha256 = "0bapzvd0xgv38mbj1xhzcswchnx81sq0wwyax3qqzcpgvcyz28sl";
buildDepends = [ asn1Types ];
meta = {
homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types";

View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "crypto-pubkey";
version = "0.1.3";
sha256 = "154bclz7mg2v7q72y6y0ylw0b28527nsmc8f6zf6ja5l9c9skw0g";
version = "0.1.4";
sha256 = "13ah3ip6gdv7b1zz5qwi7515a3k8pp3l0jr1kq4q2a0vqy24gkn1";
buildDepends = [
cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandomApi
];

View File

@ -3,12 +3,11 @@
cabal.mkDerivation (self: {
pname = "digestive-functors-heist";
version = "0.6.2.0";
sha256 = "03wxdmgwc6qialwhp5zdj3s3a8a8yz6vswfgryjx4izaaq7pdhl1";
version = "0.7.0.0";
sha256 = "0ljsr4yy3pb4cjg9dcgfcs9rn1ihg3xi9ak5p3h3kw3w19d1hsaq";
buildDepends = [
blazeBuilder digestiveFunctors heist mtl text xmlhtml
];
jailbreak = true;
meta = {
homepage = "http://github.com/jaspervdj/digestive-functors";
description = "Heist frontend for the digestive-functors library";

View File

@ -1,11 +1,17 @@
{ cabal, HUnit, mtl, testFramework, testFrameworkHunit, text }:
{ cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2, text
}:
cabal.mkDerivation (self: {
pname = "digestive-functors";
version = "0.6.0.1";
sha256 = "1ni1hfmpz14yvgjphwz64hqhg7xbhvvqbdnapspipplvnl0rcmhi";
version = "0.6.1.0";
sha256 = "0p38q8xz01vjn1mf718xi5ny3i7z9zd00lnnybmd6zy03laq4a2d";
buildDepends = [ mtl text ];
testDepends = [ HUnit mtl testFramework testFrameworkHunit text ];
testDepends = [
HUnit mtl QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2 text
];
jailbreak = true;
meta = {
homepage = "http://github.com/jaspervdj/digestive-functors";
description = "A practical formlet library";

View File

@ -20,6 +20,7 @@ cabal.mkDerivation (self: {
testFrameworkHunit
];
noHaddock = true;
jailbreak = true;
doCheck = false;
meta = {
homepage = "http://github.com/haskell-distributed/distributed-process";

View File

@ -2,10 +2,10 @@
cabal.mkDerivation (self: {
pname = "entropy";
version = "0.2.1";
sha256 = "1qp8hvdzfgg2wk7d431qycwbn2zpzlplc1c7dbhimj1had5jscrs";
version = "0.2.2";
sha256 = "1zri5qs19cbz9ydbh076q6834pspf2gqn06ssz4hsq6j65cnd9x2";
meta = {
homepage = "http://trac.haskell.org/crypto-api/wiki";
homepage = "https://github.com/TomMD/entropy";
description = "A platform independent entropy source";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "ghc-mod";
version = "2.0.2";
sha256 = "1j2av7lcsnpizy6lyykk47rmm07rkfjyg9glfi7ma5cg082v15ni";
version = "2.0.3";
sha256 = "0f0n4cqpspad3ygw89rp8wj1gxb7mv5zrd8938zm1rn2mimihggr";
isLibrary = true;
isExecutable = true;
buildDepends = [

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "gloss";
version = "1.7.8.2";
sha256 = "0jf49vdms8jzygkwch5k8s611pay0xqwq1lc0p476d37rzb8qpn4";
version = "1.7.8.3";
sha256 = "0wbp8bz5c3hzix6r7nbg6dmakb77i3lq4hgjk3gd8mvksd3n97jr";
buildDepends = [ bmp GLUT OpenGL ];
jailbreak = true;
meta = {

View File

@ -1,23 +0,0 @@
{ cabal, extensibleExceptions, filepath, hslogger, mtl, network
, parsec, random, time, unixCompat
}:
cabal.mkDerivation (self: {
pname = "happstack-util";
version = "6.0.3";
sha256 = "0hqssd5wzir6rxn46q8r3hdp3nl7v5m7w322j39120xpg2bhiphh";
isLibrary = true;
isExecutable = true;
buildDepends = [
extensibleExceptions filepath hslogger mtl network parsec random
time unixCompat
];
jailbreak = true;
meta = {
homepage = "http://happstack.com";
description = "Web framework";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hs-bibutils";
version = "4.17.1";
sha256 = "0qn3kibwwiaandmk672n9lki431934qahj81r4yj2acmyv6fcycf";
version = "5.0";
sha256 = "18gchn62g2cqzyj1nr8wd5i6smhq739g00cblkllj1jkni33ch2l";
buildDepends = [ syb ];
meta = {
homepage = "http://gorgias.mine.nu/repos/hs-bibutils/";

View File

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.9.3";
sha256 = "03c08jj6941kxl5iw60n8s8qnxp2rsfgfmf7m761iy7i7hsj1rkk";
version = "1.9.4";
sha256 = "0zm8m3nvxyc9z3b8d47ggx56raqpz1aa8r268k6gidpc5zpad2yl";
buildDepends = [
asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
caseInsensitive certificate conduit cookie cprngAes dataDefault

View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "language-c-quote";
version = "0.7.1";
sha256 = "14gh944wpwg4csxwswr9jlll4p5wc3x1fhbqsfh9lqf98ys7ij3z";
version = "0.7.2";
sha256 = "01ki78qh39gbd9md3pq783vx2p86gyzhclci7pcppz2rd3man51m";
buildDepends = [
exceptionMtl exceptionTransformers filepath haskellSrcMeta
mainlandPretty mtl srcloc syb symbol
@ -15,6 +15,7 @@ cabal.mkDerivation (self: {
HUnit srcloc symbol testFramework testFrameworkHunit
];
buildTools = [ alex happy ];
jailbreak = true;
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";
description = "C/CUDA/OpenCL/Objective-C quasiquoting library";

View File

@ -1,14 +1,15 @@
{ cabal, aeson, attoparsec, cereal, cryptoApi, httpConduit
, httpTypes, HUnit, network, pureMD5, testFramework
, testFrameworkHunit, text
{ cabal, aeson, attoparsec, cereal, contravariant, cryptoApi
, httpConduit, httpTypes, HUnit, network, pureMD5, testFramework
, testFrameworkHunit, text, void
}:
cabal.mkDerivation (self: {
pname = "liblastfm";
version = "0.1.1.2";
sha256 = "1zckgjc0r2s1s6s9s309dr2ri8bzj1fi8gcbhm3hifczq1v149w9";
version = "0.2.0.0";
sha256 = "1x147mry8pq8qzrhrsbxm4b7sb80c9900kq2igwvcskwszd5h56n";
buildDepends = [
aeson cereal cryptoApi httpConduit httpTypes network pureMD5 text
aeson cereal contravariant cryptoApi httpConduit httpTypes network
pureMD5 text void
];
testDepends = [
aeson attoparsec HUnit testFramework testFrameworkHunit text

View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "monad-par";
version = "0.3.4.1";
sha256 = "0v0gnxzv49zvmgm2cb20dlb8m7mn4chpwrc61g4zp69nabjpwwm8";
version = "0.3.4.2";
sha256 = "1k10m4w2g92psahsvcyi98sc31wg5anijp46lbsipi2r2gxxc7bs";
buildDepends = [
abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
parallel

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "multiarg";
version = "0.14.0.0";
sha256 = "05zibar3yqwz2k2ihpby8jdfr4qniz2cz2989sxjf72hqih0g9pb";
version = "0.16.0.0";
sha256 = "086mnhbp1d3n0xdn4cdlyrkkgrykg4bwhi7sbfdmn688qhpl3g9m";
buildDepends = [ explicitException utf8String ];
meta = {
homepage = "https://github.com/massysett/multiarg";

View File

@ -4,13 +4,12 @@
cabal.mkDerivation (self: {
pname = "network-protocol-xmpp";
version = "0.4.4";
sha256 = "0l2s412aazli80jszdl1am01z14a0q2z8fsxxjawk4cy70d6f4ry";
version = "0.4.5";
sha256 = "1phnd9nygpc8gmyriwaqjnvygxi5zg4nx2i1m3vwwxql221420gg";
buildDepends = [
gnuidn gnutls gsasl libxmlSax monadsTf network text transformers
xmlTypes
];
jailbreak = true;
meta = {
homepage = "https://john-millikin.com/software/haskell-xmpp/";
description = "Client library for the XMPP protocol";

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "parseargs";
version = "0.1.3.4";
sha256 = "1n55ay42qiwm72fa63xbz5m5fi0ld5dr3vypmyz5mc0zzhqwxz2j";
version = "0.1.3.5";
sha256 = "1ig1n2nnicmy71qwcl5hkdk4mvwq0mz6zr5h9kw329lgvr9cyzyc";
isLibrary = true;
isExecutable = true;
meta = {

View File

@ -1,16 +1,15 @@
{ cabal, aeson, conduit, monadControl, persistent, postgresqlLibpq
, postgresqlSimple, text, time, transformers
{ cabal, aeson, blazeBuilder, conduit, monadControl, persistent
, postgresqlLibpq, postgresqlSimple, text, time, transformers
}:
cabal.mkDerivation (self: {
pname = "persistent-postgresql";
version = "1.1.3.1";
sha256 = "1lbr4x45hzk73439x6is9zw6y3mqy1ivmblncvg70kzw0kmjhpnk";
version = "1.2.0";
sha256 = "0i5ha1vs91makwrw4qqwdzp92i24ynmmsmjyqpik6q80fxxiwps6";
buildDepends = [
aeson conduit monadControl persistent postgresqlLibpq
aeson blazeBuilder conduit monadControl persistent postgresqlLibpq
postgresqlSimple text time transformers
];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/book/persistent";
description = "Backend for the persistent library using postgresql";

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "persistent-sqlite";
version = "1.1.5";
sha256 = "1kqxp0qsvxfz352yg9k1wgb2nfm7kcz8xdj9q537ilh99wxkp6cl";
version = "1.2.0";
sha256 = "09xd9z16rcq9ymx5ysshzdr30lih55b9kasvbq5xw6wq7lvg6q4h";
buildDepends = [
aeson conduit monadControl monadLogger persistent text transformers
];

View File

@ -1,12 +1,14 @@
{ cabal, aeson, hspec, monadControl, persistent, QuickCheck, text
, transformers
{ cabal, aeson, hspec, monadControl, monadLogger, persistent
, QuickCheck, text, transformers
}:
cabal.mkDerivation (self: {
pname = "persistent-template";
version = "1.1.3.1";
sha256 = "0171x8mv3ff9ppllkp3mgpwa8p1zg3y6fykq70z9h0hx1ny0407p";
buildDepends = [ aeson monadControl persistent text transformers ];
version = "1.2.0.1";
sha256 = "1l8ws4mijl0cwcl14ms8hibfgcn3y6b1679xc0cdyz1ifiymkdns";
buildDepends = [
aeson monadControl monadLogger persistent text transformers
];
testDepends = [ aeson hspec persistent QuickCheck text ];
meta = {
homepage = "http://www.yesodweb.com/book/persistent";

View File

@ -7,15 +7,19 @@
cabal.mkDerivation (self: {
pname = "persistent";
version = "1.1.5.1";
sha256 = "1ds0q3mzgg60makx7impyxsvpzd3issa89igcy176yb54ypjwfnz";
version = "1.2.0.1";
sha256 = "1bs74g1fkwq4wvz18lp0ial6z58vpslgv0rqdn91ka6gw8k4fvlb";
buildDepends = [
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
liftedBase monadControl monadLogger pathPieces poolConduit
resourcet silently text time transformers transformersBase
unorderedContainers vector
];
testDepends = [ hspec text ];
testDepends = [
aeson attoparsec base64Bytestring blazeHtml conduit hspec
monadControl monadLogger pathPieces resourcet text time
transformers unorderedContainers vector
];
extraLibraries = [ sqlite ];
meta = {
homepage = "http://www.yesodweb.com/book/persistent";

View File

@ -0,0 +1,14 @@
{ cabal, mtl, network }:
cabal.mkDerivation (self: {
pname = "pop3-client";
version = "0.1.4";
sha256 = "0kfcfxfwg5rjm7qx9r0ssdvkrvca95hflahrip1hi5wbplf224xv";
buildDepends = [ mtl network ];
meta = {
homepage = "https://github.com/tmrudick/haskell-pop3-client/";
description = "POP3 Client Library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@ -5,13 +5,15 @@
cabal.mkDerivation (self: {
pname = "postgresql-simple";
version = "0.2.4.1";
sha256 = "09yszkiahfyidaq9yfk4mda5sf1m8bcqqag51vasybln9k9hhws3";
version = "0.3.3.0";
sha256 = "0srkalfg41gdnzwwa2bmwwrcdqnw13f7b94wv4d5a6sg6yf1ry1l";
buildDepends = [
attoparsec blazeBuilder blazeTextual postgresqlLibpq text time
transformers vector
];
testDepends = [ base16Bytestring cryptohash HUnit text time ];
testDepends = [
base16Bytestring cryptohash HUnit text time vector
];
doCheck = false;
meta = {
description = "Mid-Level PostgreSQL client library";

View File

@ -0,0 +1,19 @@
{ cabal, base16Bytestring, base64Bytestring, cryptohash, filepath
, mimeMail, network, text
}:
cabal.mkDerivation (self: {
pname = "smtp-mail";
version = "0.1.4.3";
sha256 = "0kpm42n7s3rvkn9i3s8wvkdrq2d85qy422y6p2r4s7nivh6sx1dk";
buildDepends = [
base16Bytestring base64Bytestring cryptohash filepath mimeMail
network text
];
meta = {
homepage = "http://github.com/jhickner/smtp-mail";
description = "Simple email sending via SMTP";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@ -1,16 +1,16 @@
{ cabal, deepseq, erf, HUnit, ieee754, mathFunctions, monadPar
, mwcRandom, primitive, QuickCheck, testFramework
{ cabal, binary, deepseq, erf, HUnit, ieee754, mathFunctions
, monadPar, mwcRandom, primitive, QuickCheck, testFramework
, testFrameworkHunit, testFrameworkQuickcheck2, vector
, vectorAlgorithms
, vectorAlgorithms, vectorBinaryInstances
}:
cabal.mkDerivation (self: {
pname = "statistics";
version = "0.10.3.1";
sha256 = "12abfqxsriqlncr60wwcsm0q41hmqc6vp9p1hmnv2l3qqcisk60s";
version = "0.10.4.1";
sha256 = "0kd3zn8ckz3h9dnighmfviacw5cy6czsj90ryn8c0h6yb2s3gqi1";
buildDepends = [
deepseq erf mathFunctions monadPar mwcRandom primitive vector
vectorAlgorithms
binary deepseq erf mathFunctions monadPar mwcRandom primitive
vector vectorAlgorithms vectorBinaryInstances
];
testDepends = [
erf HUnit ieee754 mathFunctions mwcRandom primitive QuickCheck

View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "stm-conduit";
version = "1.1.0";
sha256 = "1b5v3vf9izzpw3vaslskhdxqnc1zmag1f3x50dh8r1nl318ndkf7";
version = "2.0.0";
sha256 = "015gz4fqijgcs6dls5l8ry47q4a33a6ik0hsj5mw48iw44af39jr";
buildDepends = [ conduit resourcet stm stmChans transformers ];
testDepends = [
conduit HUnit QuickCheck stm stmChans testFramework

View File

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "0.1.4";
sha256 = "00318syprv1ixfbr4v7xq86z10f0psxk0b8kaxvawvacm8hp61bn";
buildDepends = [ deepseq syb ];
jailbreak = true;
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";
description = "A 'Symbol' type for fast symbol comparison";

View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "tls-extra";
version = "0.6.1";
sha256 = "0gc3dz3s188jk6q2lai56y4ckxh62s9gm04d7jznr6jzpx2i4fan";
version = "0.6.3";
sha256 = "1ng8h3v5px63fpb4y3sd47djzpksyzzavilsdnp1kd453abpmx9l";
isLibrary = true;
isExecutable = true;
buildDepends = [

View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "wai-extra";
version = "1.3.4";
sha256 = "1ay82q58pizc48rh4d8z7ybf2jjvzxqylj6mx34nvrxxlmxf5gfx";
version = "1.3.4.2";
sha256 = "14mrvh3av6dn4jx5q06b4lyjw8sr1ynygbncf5fbp3nzn8nmh17s";
buildDepends = [
ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
caseInsensitive conduit dataDefault dateCache fastLogger httpTypes

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "wai-logger";
version = "0.3.0";
sha256 = "132jcjyqr7bxcfi7v9mapvx8dci0lz8rv91mgnrzgvpac542c2yq";
version = "0.3.1";
sha256 = "0x1d67fcfpjrgyjr7hipifqrzk13x8z8xmlj7h999r8mswijhgii";
buildDepends = [
blazeBuilder byteorder caseInsensitive dateCache fastLogger
httpTypes network wai

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "wai";
version = "1.4.0";
sha256 = "1213sib2qp1xafrrnmkxabgkba0g00awy6dx9jnlfkj5r6m32wdq";
version = "1.4.0.1";
sha256 = "1d08mp7dpf8iw50yjysr5p7fc9jgdcwql943p9c11x35n2ks6z2n";
buildDepends = [
blazeBuilder conduit httpTypes network text transformers vault
];

View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "warp";
version = "1.3.8.1";
sha256 = "07kzfv8j9x6qhl9kjhyl6gricq88y6ys48vml4chqnd8sg9vki3x";
version = "1.3.8.2";
sha256 = "0s8na04n21glgkc0bcc0171ikh9cagx35s2h6i1pb5pwa8l0akv6";
buildDepends = [
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
httpTypes liftedBase network networkConduit simpleSendfile

View File

@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
sha256 = "0d79hr6cz9zj3w57h6630nfnsmfq1w73gz04jjmlhwh8ih557imw";
buildDepends = [ filepath parsec stm time wxc wxdirect ];
extraLibraries = [ libX11 mesa wxGTK ];
patchPhase = ''
sed -i -e 's|containers >=.*|containers|' wxcore.cabal
'';
meta = {
homepage = "http://haskell.org/haskellwiki/WxHaskell";
description = "wxHaskell core";

View File

@ -7,6 +7,9 @@ cabal.mkDerivation (self: {
isLibrary = true;
isExecutable = true;
buildDepends = [ parsec strict time ];
patchPhase = ''
sed -i -e 's|containers >=.*|containers|' wxdirect.cabal
'';
meta = {
homepage = "http://haskell.org/haskellwiki/WxHaskell";
description = "helper tool for building wxHaskell";

View File

@ -2,10 +2,9 @@
cabal.mkDerivation (self: {
pname = "xdot";
version = "0.2.3";
sha256 = "0xb8igsqydiw1w00frn4mxkflhxkayif2vivxmq5fk53am2f43wy";
version = "0.2.3.1";
sha256 = "1gricrnssxgzaq1z7nnyppmz284nix0m89477x22mal125pkcf7n";
buildDepends = [ cairo graphviz gtk mtl polyparse text ];
jailbreak = true;
meta = {
description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
license = self.stdenv.lib.licenses.bsd3;

View File

@ -1,21 +1,21 @@
{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, fileEmbed
, hamlet, httpConduit, httpTypes, liftedBase, mimeMail, network
, persistent, persistentTemplate, pureMD5, pwstoreFast, random, SHA
, shakespeareCss, shakespeareJs, text, transformers
, unorderedContainers, wai, yesodCore, yesodForm, yesodJson
, yesodPersistent
{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, dataDefault
, emailValidate, fileEmbed, hamlet, httpConduit, httpTypes
, liftedBase, mimeMail, network, persistent, persistentTemplate
, pureMD5, pwstoreFast, random, resourcet, SHA, shakespeareCss
, shakespeareJs, text, transformers, unorderedContainers, wai
, yesodCore, yesodForm, yesodPersistent
}:
cabal.mkDerivation (self: {
pname = "yesod-auth";
version = "1.1.7";
sha256 = "0vsgpvmsmdzbwj5l862bzm21ld3adkmbwgkffbpjr4yylbvvyvrn";
version = "1.2.0.1";
sha256 = "02nljkc12mgjhvkiv876w6w13q9s9iigya8v4jzj6myv48lainvd";
buildDepends = [
aeson authenticate blazeHtml blazeMarkup fileEmbed hamlet
httpConduit httpTypes liftedBase mimeMail network persistent
persistentTemplate pureMD5 pwstoreFast random SHA shakespeareCss
shakespeareJs text transformers unorderedContainers wai yesodCore
yesodForm yesodJson yesodPersistent
aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate
fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network
persistent persistentTemplate pureMD5 pwstoreFast random resourcet
SHA shakespeareCss shakespeareJs text transformers
unorderedContainers wai yesodCore yesodForm yesodPersistent
];
meta = {
homepage = "http://www.yesodweb.com/";

View File

@ -1,29 +1,30 @@
{ cabal, aeson, blazeBuilder, blazeHtml, blazeMarkup
, caseInsensitive, cereal, clientsession, conduit, cookie, failure
, fastLogger, hamlet, hspec, httpTypes, HUnit, liftedBase
, monadControl, monadLogger, parsec, pathPieces, QuickCheck, random
, resourcet, shakespeare, shakespeareCss, shakespeareI18n
, shakespeareJs, text, time, transformers, transformersBase, vector
, wai, waiExtra, waiTest, yesodRoutes
{ cabal, aeson, attoparsecConduit, blazeBuilder, blazeHtml
, blazeMarkup, caseInsensitive, cereal, clientsession, conduit
, cookie, dataDefault, failure, fastLogger, hamlet, hspec
, httpTypes, HUnit, liftedBase, monadControl, monadLogger, parsec
, pathPieces, QuickCheck, random, resourcet, safe, shakespeare
, shakespeareCss, shakespeareI18n, shakespeareJs, text, time
, transformers, transformersBase, vector, wai, waiExtra, waiTest
, warp, yesodRoutes
}:
cabal.mkDerivation (self: {
pname = "yesod-core";
version = "1.1.8.3";
sha256 = "116vglpqh2561g0gzhm4ijwx829c50ai1hh715vwi5j5i01y2rkr";
version = "1.2.1";
sha256 = "1p9xaw0d9dx68q7i99kjcqy1lhmd164drbcw3489560wa71mwamk";
buildDepends = [
aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
clientsession conduit cookie failure fastLogger hamlet httpTypes
liftedBase monadControl monadLogger parsec pathPieces random
resourcet shakespeare shakespeareCss shakespeareI18n shakespeareJs
text time transformers transformersBase vector wai waiExtra
yesodRoutes
aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
caseInsensitive cereal clientsession conduit cookie dataDefault
failure fastLogger hamlet httpTypes liftedBase monadControl
monadLogger parsec pathPieces random resourcet safe shakespeare
shakespeareCss shakespeareI18n shakespeareJs text time transformers
transformersBase vector wai waiExtra warp yesodRoutes
];
testDepends = [
blazeBuilder conduit hamlet hspec httpTypes HUnit QuickCheck random
shakespeareCss shakespeareJs text transformers wai waiTest
blazeBuilder conduit hamlet hspec httpTypes HUnit liftedBase
QuickCheck random resourcet shakespeareCss shakespeareJs text
transformers wai waiTest
];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/";
description = "Creation of type-safe, RESTful web applications";

View File

@ -1,20 +1,13 @@
{ cabal, dataDefault, hamlet, networkConduit, safe, shakespeareCss
, shakespeareJs, text, transformers, unorderedContainers, wai
, waiExtra, warp, yaml, yesodCore
}:
{ cabal, yesodCore }:
cabal.mkDerivation (self: {
pname = "yesod-default";
version = "1.1.3.2";
sha256 = "07gm9sj4c231wdmfmb7df1s8wvqa6fw7nhcq554h16h2ibv5pcqg";
buildDepends = [
dataDefault hamlet networkConduit safe shakespeareCss shakespeareJs
text transformers unorderedContainers wai waiExtra warp yaml
yesodCore
];
version = "1.2.0";
sha256 = "15nsknnxnfbkpg4pswxcpgfb2y0hz0xxj56jknd93hcm7aay36pk";
buildDepends = [ yesodCore ];
meta = {
homepage = "http://www.yesodweb.com/";
description = "Default config and main functions for your yesod application";
description = "Default config and main functions for your yesod application (deprecated)";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];

View File

@ -1,18 +1,18 @@
{ cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup
, cryptoApi, dataDefault, emailValidate, hamlet, hspec, network
, persistent, shakespeareCss, shakespeareJs, text, time
, persistent, resourcet, shakespeareCss, shakespeareJs, text, time
, transformers, wai, xssSanitize, yesodCore, yesodPersistent
}:
cabal.mkDerivation (self: {
pname = "yesod-form";
version = "1.2.1.3";
sha256 = "1mrqr6pfrhkk0vv9lhd4wxiic8d1hsraiqmjcqsfbpdyrc6fqypq";
version = "1.3.0";
sha256 = "1y729h61w30yi4mcva727317gdc70nhn6jzxb7fmc9hqgnh136nc";
buildDepends = [
aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
dataDefault emailValidate hamlet network persistent shakespeareCss
shakespeareJs text time transformers wai xssSanitize yesodCore
yesodPersistent
dataDefault emailValidate hamlet network persistent resourcet
shakespeareCss shakespeareJs text time transformers wai xssSanitize
yesodCore yesodPersistent
];
testDepends = [ hspec text time ];
meta = {

View File

@ -1,20 +1,13 @@
{ cabal, aeson, attoparsecConduit, blazeBuilder, conduit, hspec
, safe, shakespeareJs, text, transformers, vector, wai, waiExtra
, waiTest, yesodCore, yesodRoutes
}:
{ cabal, yesodCore }:
cabal.mkDerivation (self: {
pname = "yesod-json";
version = "1.1.2.2";
sha256 = "1bl4rs3biv2man0n8ijldil32lyswjqk5ykz0nv06qsaaafjpc3g";
buildDepends = [
aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs
text transformers vector wai waiExtra yesodCore yesodRoutes
];
testDepends = [ hspec text waiTest yesodCore ];
version = "1.2.0";
sha256 = "0d035k1ls5iq1c12yxknyc33qd22ayyhl69y62zmcw7arwx35sgw";
buildDepends = [ yesodCore ];
meta = {
homepage = "http://www.yesodweb.com/";
description = "Generate content for Yesod using the aeson package";
description = "Generate content for Yesod using the aeson package. (deprecated)";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];

View File

@ -1,11 +1,19 @@
{ cabal, persistent, persistentTemplate, transformers, yesodCore }:
{ cabal, blazeBuilder, conduit, hspec, liftedBase, persistent
, persistentSqlite, persistentTemplate, poolConduit, resourcet
, text, transformers, waiTest, yesodCore
}:
cabal.mkDerivation (self: {
pname = "yesod-persistent";
version = "1.1.0.1";
sha256 = "0kgd1b7kaif644hjbvkc53yxr7qk310zdndypd9h0j31paw52k1p";
version = "1.2.0";
sha256 = "1gzzs62mnx2q15sm3hvlk18qjgk3bi828klgl2ckc0462f7z8d0k";
buildDepends = [
persistent persistentTemplate transformers yesodCore
blazeBuilder conduit liftedBase persistent persistentTemplate
poolConduit resourcet transformers yesodCore
];
testDepends = [
blazeBuilder conduit hspec persistent persistentSqlite text waiTest
yesodCore
];
meta = {
homepage = "http://www.yesodweb.com/";

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "yesod-routes";
version = "1.1.2";
sha256 = "17yv2z7k1s958xyn552wpk0cwpivsnkvia8477yhgbp4n2d1i5jv";
version = "1.2.0";
sha256 = "1d7z0v6jrl08w7qz3apwdjss3vq151y28l7231cpqiia46damib2";
buildDepends = [ pathPieces text vector ];
testDepends = [ hspec HUnit pathPieces text ];
meta = {

View File

@ -1,21 +1,24 @@
{ cabal, base64Bytestring, cereal, conduit, cryptoConduit
, cryptohash, fileEmbed, hspec, httpTypes, systemFilepath, text
, transformers, unixCompat, wai, waiAppStatic, yesodCore
, cryptohash, dataDefault, fileEmbed, hspec, httpTypes
, shakespeareCss, systemFileio, systemFilepath, text, transformers
, unixCompat, wai, waiAppStatic, yesodCore
}:
cabal.mkDerivation (self: {
pname = "yesod-static";
version = "1.1.2.3";
sha256 = "15wk7kpr5xdxia07wyx7msfdlyafqn2pkkrzzdfqvij972n17xmh";
version = "1.2.0";
sha256 = "18fkphk8qzshm5r0ivdvllmbmvl5q6m84zsf1g0fmridqz2xywjz";
buildDepends = [
base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed
httpTypes systemFilepath text transformers unixCompat wai
waiAppStatic yesodCore
base64Bytestring cereal conduit cryptoConduit cryptohash
dataDefault fileEmbed httpTypes shakespeareCss systemFileio
systemFilepath text transformers unixCompat wai waiAppStatic
yesodCore
];
testDepends = [
base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed
hspec httpTypes systemFilepath text transformers unixCompat wai
waiAppStatic yesodCore
base64Bytestring cereal conduit cryptoConduit cryptohash
dataDefault fileEmbed hspec httpTypes shakespeareCss systemFileio
systemFilepath text transformers unixCompat wai waiAppStatic
yesodCore
];
meta = {
homepage = "http://www.yesodweb.com/";

View File

@ -1,20 +1,23 @@
{ cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup
, caseInsensitive, cookie, hspec, htmlConduit, httpTypes, HUnit
, monadControl, network, persistent, poolConduit, text, time
, transformers, wai, waiTest, xmlConduit, xmlTypes
, transformers, wai, waiTest, xmlConduit, xmlTypes, yesodCore
, yesodForm
}:
cabal.mkDerivation (self: {
pname = "yesod-test";
version = "0.3.5";
sha256 = "095hwl1dm4mk467la68x3lilj0c056603kl0nn8ra4glcr86273j";
version = "1.2.0";
sha256 = "184hfhp62jq2icyn1l6s8kvdcsa6099vmykg2nxrafg9f83lb53q";
buildDepends = [
attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
cookie hspec htmlConduit httpTypes HUnit monadControl network
persistent poolConduit text time transformers wai waiTest
xmlConduit xmlTypes
xmlConduit xmlTypes yesodCore
];
testDepends = [
hspec htmlConduit HUnit text xmlConduit yesodCore yesodForm
];
testDepends = [ hspec htmlConduit HUnit xmlConduit ];
meta = {
homepage = "http://www.yesodweb.com";
description = "integration testing for WAI/Yesod Applications";

View File

@ -1,31 +1,18 @@
{ cabal, aeson, attoparsec, base64Bytestring, blazeBuilder
, blazeHtml, blazeMarkup, Cabal, conduit, fileEmbed, filepath
, fsnotify, ghcPaths, hamlet, httpConduit, httpReverseProxy
, httpTypes, liftedBase, monadControl, network, networkConduit
, optparseApplicative, parsec, projectTemplate, resourcet
, shakespeare, shakespeareCss, shakespeareJs, shakespeareText
, split, systemFileio, systemFilepath, tar, text, time
, transformers, unixCompat, unorderedContainers, wai, waiExtra
, warp, yaml, yesodAuth, yesodCore, yesodDefault, yesodForm
, yesodJson, yesodPersistent, zlib
{ cabal, aeson, blazeHtml, blazeMarkup, dataDefault, hamlet
, monadControl, networkConduit, safe, shakespeareCss, shakespeareJs
, text, transformers, unorderedContainers, wai, waiExtra, warp
, yaml, yesodAuth, yesodCore, yesodForm, yesodPersistent
}:
cabal.mkDerivation (self: {
pname = "yesod";
version = "1.1.9.3";
sha256 = "16w96lyd0z9slhzggbvmb23yfr3jkwywpmp15kbilwn7ghjlkm41";
isLibrary = true;
isExecutable = true;
version = "1.2.0.1";
sha256 = "1whkw0lmkyja2j6vbfcf5rjmmhmc85r4arjwjrvdmz6jkjyqham3";
buildDepends = [
aeson attoparsec base64Bytestring blazeBuilder blazeHtml
blazeMarkup Cabal conduit fileEmbed filepath fsnotify ghcPaths
hamlet httpConduit httpReverseProxy httpTypes liftedBase
monadControl network networkConduit optparseApplicative parsec
projectTemplate resourcet shakespeare shakespeareCss shakespeareJs
shakespeareText split systemFileio systemFilepath tar text time
transformers unixCompat unorderedContainers wai waiExtra warp yaml
yesodAuth yesodCore yesodDefault yesodForm yesodJson
yesodPersistent zlib
aeson blazeHtml blazeMarkup dataDefault hamlet monadControl
networkConduit safe shakespeareCss shakespeareJs text transformers
unorderedContainers wai waiExtra warp yaml yesodAuth yesodCore
yesodForm yesodPersistent
];
meta = {
homepage = "http://www.yesodweb.com/";

View File

@ -0,0 +1,30 @@
diff -Naur http-parser-2.1-orig/http_parser.gyp http-parser-2.1/http_parser.gyp
--- http-parser-2.1-orig/http_parser.gyp 2013-03-26 18:35:20.000000000 -0400
+++ http-parser-2.1/http_parser.gyp 2013-05-23 16:47:49.280488341 -0400
@@ -21,7 +21,7 @@
},
'Release': {
'defines': [ 'NDEBUG' ],
- 'cflags': [ '-Wall', '-Wextra', '-O3' ],
+ 'cflags': [ '-Wall', '-Wextra', '-O3', '-fPIC' ],
'msvs_settings': {
'VCCLCompilerTool': {
'RuntimeLibrary': 0, # static release
@@ -50,7 +50,7 @@
'targets': [
{
'target_name': 'http_parser',
- 'type': 'static_library',
+ 'type': 'shared_library',
'include_dirs': [ '.' ],
'direct_dependent_settings': {
'defines': [ 'HTTP_PARSER_STRICT=0' ],
@@ -73,7 +73,7 @@
{
'target_name': 'http_parser_strict',
- 'type': 'static_library',
+ 'type': 'shared_library',
'include_dirs': [ '.' ],
'direct_dependent_settings': {
'defines': [ 'HTTP_PARSER_STRICT=1' ],

View File

@ -0,0 +1,50 @@
{ stdenv, fetchurl, gyp, utillinux, python }:
let
version = "2.1";
in stdenv.mkDerivation {
name = "http-parser-${version}";
src = fetchurl {
url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz";
sha256 = "16a2w5z4g2bma25fqcrkpidqzlq8a2jxkk93ajl721q85406j105";
};
patches = [ ./build-shared.patch ];
configurePhase = "gyp -f make --depth=`pwd` http_parser.gyp";
buildFlags = [ "BUILDTYPE=Release" ];
buildInputs = [ gyp ] ++ (stdenv.lib.optional stdenv.isLinux utillinux) ++ stdenv.lib.optional stdenv.isDarwin python;
doCheck = !stdenv.isDarwin;
checkPhase = ''
out/Release/test-nonstrict
out/Release/test-strict
'';
installPhase = ''
mkdir -p $out/lib
mv out/Release/${if stdenv.isDarwin then "*.dylib" else "lib.target/*"} $out/lib
mkdir -p $out/include
mv http_parser.h $out/include
'';
postFixup = if stdenv.isDarwin then ''
install_name_tool -id $out/lib/libhttp_parser.dylib $out/lib/libhttp_parser.dylib
install_name_tool -id $out/lib/libhttp_parser_strict.dylib $out/lib/libhttp_parser_strict.dylib
'' else null;
meta = {
description = "An HTTP message parser written in C";
homepage = https://github.com/joyent/http-parser;
license = stdenv.lib.licenses.mit;
maintainer = [ stdenv.lib.maintainers.shlevy ];
};
}

View File

@ -1,10 +1,11 @@
{stdenv, fetchurl, openssl, perl}:
stdenv.mkDerivation {
name = "ldns-1.6.11";
stdenv.mkDerivation rec {
name = "ldns-1.6.16";
src = fetchurl {
url = "http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.11.tar.gz";
sha256 = "1248c9gkgfmjdmpp3lfd56vvln94ii54kbxa5iykxvcxivmbi4b8";
url = "http://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz";
sha256 = "15gn9m95r6sq2n55dw4r87p2aljb5lvy1w0y0br70wbr0p5zkci4";
};
patchPhase = ''
@ -13,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [ openssl perl ];
configureFlags = [ "--with-ssl=${openssl}" ];
configureFlags = [ "--with-ssl=${openssl}" "--with-drill" ];
meta = {
description = "Library with the aim of simplifying DNS programming in C";

View File

@ -2,7 +2,7 @@
let
baseName = "libdbusmenu-qt";
v = "0.9.0";
v = "0.9.2";
homepage = "http://launchpad.net/${baseName}";
name = "${baseName}-${v}";
in
@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "${homepage}/trunk/${v}/+download/${name}.tar.bz2";
sha256 = "0xdicb3fmwgbyhc6cpcmdkwysdg18m5rcqc3izpwv6brq4aq4787";
sha256 = "1v0ri5g9xw2z64ik0kx0ra01v8rpjn2kxprrxppkls1wvav1qv5f";
};
buildInputs = [ qt4 ];

View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = http://www.netlib.org/f2c/libf2c.zip;
sha256 = "14py0zdwzj5gqjzi0z2hlcy3czpzx1fav55akdj143qgav8h6dav";
sha256 = "1mcp1lh7gay7hm186dr0wvwd2bc05xydhnc1qy3dqs4n3r102g7i";
};
unpackPhase = ''

View File

@ -1,11 +1,11 @@
{ fetchurl, stdenv, libgpgerror }:
stdenv.mkDerivation rec {
name = "libgcrypt-1.5.0";
name = "libgcrypt-1.5.2";
src = fetchurl {
url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
sha256 = "1ykkh7dm0gyndz7bbpvn3agijj8xb2h02m02f42hm504c18zqqjb";
sha1 = "c9998383532ba3e8bcaf690f2f0d65e814b48d2f";
};
propagatedBuildInputs = [ libgpgerror ];

View File

@ -0,0 +1,48 @@
{ fetchgit, stdenv, libgpgerror, autoconf, automake, libtool, transfig, ghostscript, texinfo }:
stdenv.mkDerivation rec {
name = "libgcrypt-git-20130524";
src = fetchgit {
url = git://git.gnupg.org/libgcrypt.git;
rev = "99b18aa53";
sha256 = "1rhbpxqrkfszlv8jvw8s4apwklal07k8zxv5q555l7binc1j1j3z";
};
nativeBuildInputs = [ autoconf automake libtool transfig ghostscript texinfo ];
propagatedBuildInputs = [ libgpgerror ];
preConfigure = ''
sh autogen.sh
'';
preBuild = ''
(cd doc; make stamp-vti)
'';
doCheck = true;
# For some reason the tests don't find `libgpg-error.so'.
checkPhase = ''
LD_LIBRARY_PATH="${libgpgerror}/lib:$LD_LIBRARY_PATH" \
make check
'';
meta = {
description = "GNU Libgcrypt, a general-pupose cryptographic library";
longDescription = ''
GNU Libgcrypt is a general purpose cryptographic library based on
the code from GnuPG. It provides functions for all
cryptographic building blocks: symmetric ciphers, hash
algorithms, MACs, public key algorithms, large integer
functions, random numbers and a lot of supporting functions.
'';
license = "LGPLv2+";
homepage = https://www.gnu.org/software/libgcrypt/;
platforms = stdenv.lib.platforms.all;
};
}

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