mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-03 10:44:18 +00:00
Merge remote-tracking branch 'upstream/master' into master_clean
This commit is contained in:
commit
b3a23081e3
pkgs
applications
audio/bristol
editors/zile
graphics
misc
networking
browsers
ftp/filezilla
p2p/gnunet
science/misc/boinc
version-management/git-and-tools
virtualization/virtualbox/guest-additions
window-managers/xmonad
data/documentation/man-pages
development
compilers/sbcl
interpreters/python/2.6
libraries
ffmpeg
haskell
Diff
Graphalyze
X11
active
basic-prelude
cautious-file
classy-prelude-conduit
classy-prelude
clientsession
comonad-transformers
comonad
comonads-fd
conduit
cprng-aes
crypto-random-api
cryptohash
dataenc
diagrams
digestive-functors-heist
dimensional-tf
distributive
double-conversion
dual-tree
either
file-embed
filestore
fsnotify
gitit
graphviz
hakyll
hashable
heist
highlighting-kate
hsemail
http-conduit
http-date
http-reverse-proxy
language-c-quote
lens
liblastfm
mainland-pretty
monoid-extras
multiarg
nat
nats
naturals
network-conduit
numtype-tf
persistent-template
persistent
pretty-show
random-fu
random-source
semigroupoids
semigroups
srcloc
tabular
texmath
transformers-compat
type-level-natural-number
uu-parsinglib
void
wai-app-static
wai-extra
warp
wxHaskell
xss-sanitize
yaml
yesod-core
zip-archive
libmicrohttpd
libvdpau
tinyxml
v8
@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
|
||||
xlibs.xproto
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol
|
||||
sed -e "s@\`which brighton\`@$out/bin/brighton@g" -i bin/startBristol
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A range of synthesiser, electric piano and organ emulations";
|
||||
homepage = http://bristol.sourceforge.net;
|
||||
|
@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ ncurses boehmgc ];
|
||||
buildNativeInputs = [ help2man perl ];
|
||||
|
||||
# `help2man' wants to run Zile, which fails when cross-compiling.
|
||||
crossAttrs.buildNativeInputs = [];
|
||||
|
||||
# Tests can't be run because most of them rely on the ability to
|
||||
# fiddle with the terminal.
|
||||
doCheck = false;
|
||||
|
@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
|
||||
'' else "";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.imagemagick.org;
|
||||
homepage = http://www.imagemagick.org/;
|
||||
description = "A software suite to create, edit, compose, or convert bitmap images";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
47
pkgs/applications/graphics/ipe/default.nix
Normal file
47
pkgs/applications/graphics/ipe/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ stdenv, fetchurl, pkgconfig, zlib, qt4, freetype, cairo, lua5, texLive, ghostscriptX
|
||||
, makeWrapper }:
|
||||
let ghostscript = ghostscriptX; in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ipe-7.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/ipe7/ipe/7.1.0/${name}-src.tar.gz";
|
||||
sha256 = "04fs5slci3bmpgz8d038h3hnzzdw57xykcpsmisdxci2xrkxx41k";
|
||||
};
|
||||
|
||||
# changes taken from Gentoo portage
|
||||
preConfigure = ''
|
||||
cd src
|
||||
sed -i \
|
||||
-e 's/fpic/fPIC/' \
|
||||
-e 's/moc-qt4/moc/' \
|
||||
config.mak || die
|
||||
sed -i -e 's/install -s/install/' common.mak || die
|
||||
'';
|
||||
|
||||
IPEPREFIX="$$out";
|
||||
URWFONTDIR="${texLive}/texmf-dist/fonts/type1/urw/";
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig zlib qt4 freetype cairo lua5 texLive ghostscript makeWrapper
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
for prog in $out/bin/*; do
|
||||
wrapProgram "$prog" --prefix PATH : "${texLive}/bin"
|
||||
done
|
||||
'';
|
||||
|
||||
#TODO: make .desktop entry
|
||||
|
||||
meta = {
|
||||
description = "An editor for drawing figures";
|
||||
homepage = http://ipe7.sourceforge.net;
|
||||
license = "GPLv3+";
|
||||
longDescription = ''
|
||||
Ipe is an extensible drawing editor for creating figures in PDF and Postscript format.
|
||||
It supports making small figures for inclusion into LaTeX-documents
|
||||
as well as presentations in PDF.
|
||||
'';
|
||||
};
|
||||
}
|
30
pkgs/applications/misc/freicoin/default.nix
Normal file
30
pkgs/applications/misc/freicoin/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ fetchurl, stdenv, db4, boost, gmp, mpfr, miniupnpc, qt4, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.0.1-3";
|
||||
name = "freicoin-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/freicoin/freicoin/archive/v${version}.zip";
|
||||
sha256 = "19q4llv67kmvfr0x56rnqcf0d050dayv246q4i51mmkvjijc1qpf";
|
||||
};
|
||||
|
||||
# I think that openssl and zlib are required, but come through other
|
||||
# packages
|
||||
buildInputs = [ db4 boost gmp mpfr miniupnpc qt4 unzip ];
|
||||
|
||||
configurePhase = "qmake";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp freicoin-qt $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Peer-to-peer currency with demurrage fee";
|
||||
homepage = "http://freicoi.in/";
|
||||
license = "MIT";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
@ -3,19 +3,19 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.4";
|
||||
version = "2.0.5.1";
|
||||
name = "lyx-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz";
|
||||
sha256 = "137dzmz1z6aqz9mdj8gmmi0k60s9sfn6gy916j175cwzq6hpncb8";
|
||||
sha256 = "18k9qbz40v6lqmkfcg98wvcv4wi4p36ach1jz3z2b15gbmv2gr9n";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
#"--without-included-boost"
|
||||
/* Boost is a huge dependency from which 1.4 MB of libs would be used.
|
||||
Using internal boost stuff only increases executable by around 0.2 MB. */
|
||||
#"--without-included-mythes" # such a small library isn't worth a split package
|
||||
#"--without-included-mythes" # such a small library isn't worth a separate package
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
176
pkgs/applications/networking/browsers/firefox/18.0.nix
Normal file
176
pkgs/applications/networking/browsers/firefox/18.0.nix
Normal file
@ -0,0 +1,176 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
|
||||
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
|
||||
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
|
||||
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
|
||||
|
||||
, # If you want the resulting program to call itself "Firefox" instead
|
||||
# of "Shiretoko" or whatever, enable this option. However, those
|
||||
# binaries may not be distributed without permission from the
|
||||
# Mozilla Foundation, see
|
||||
# http://www.mozilla.org/foundation/trademarks/.
|
||||
enableOfficialBranding ? false
|
||||
}:
|
||||
|
||||
assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
|
||||
|
||||
rec {
|
||||
|
||||
firefoxVersion = "18.0";
|
||||
|
||||
xulVersion = "18.0"; # this attribute is used by other packages
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
# It is better to use this url for official releases, to take load off Mozilla's ftp server.
|
||||
"http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
|
||||
# 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 = "3356562e69d699e5901df5a4da4e2e59dd1e7f57";
|
||||
};
|
||||
|
||||
commonConfigureFlags =
|
||||
[ "--enable-optimize"
|
||||
#"--enable-profiling"
|
||||
"--disable-debug"
|
||||
"--enable-strip"
|
||||
# "--with-system-jpeg" # Too old in nixpkgs
|
||||
"--with-system-zlib"
|
||||
"--with-system-bz2"
|
||||
"--with-system-nspr"
|
||||
# "--with-system-nss" # Too old in nixpkgs
|
||||
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
|
||||
# "--enable-system-cairo" # disabled for the moment because our Cairo is too old
|
||||
"--enable-system-sqlite"
|
||||
"--disable-crashreporter"
|
||||
"--disable-tests"
|
||||
"--disable-necko-wifi" # maybe we want to enable this at some point
|
||||
"--disable-installer"
|
||||
"--disable-updater"
|
||||
];
|
||||
|
||||
|
||||
xulrunner = stdenv.mkDerivation rec {
|
||||
name = "xulrunner-${xulVersion}";
|
||||
|
||||
inherit src;
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
|
||||
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
|
||||
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
|
||||
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
|
||||
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
|
||||
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
|
||||
];
|
||||
|
||||
configureFlags =
|
||||
[ "--enable-application=xulrunner"
|
||||
"--disable-javaxpcom"
|
||||
] ++ commonConfigureFlags;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
|
||||
|
||||
mkdir ../objdir
|
||||
cd ../objdir
|
||||
configureScript=../mozilla-release/configure
|
||||
''; # */
|
||||
|
||||
#installFlags = "SKIP_GRE_REGISTRATION=1";
|
||||
|
||||
postInstall = ''
|
||||
# Fix run-mozilla.sh search
|
||||
libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
|
||||
echo libDir: $libDir
|
||||
test -n "$libDir"
|
||||
cd $out/bin
|
||||
rm xulrunner
|
||||
|
||||
for i in $out/lib/$libDir/*; do
|
||||
file $i;
|
||||
if file $i | grep executable &>/dev/null; then
|
||||
echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
|
||||
chmod a+x "$out/bin/$(basename "$i")";
|
||||
fi;
|
||||
done
|
||||
for i in $out/lib/$libDir/*.so; do
|
||||
patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
|
||||
done
|
||||
for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
|
||||
wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
|
||||
done
|
||||
rm -f $out/bin/run-mozilla.sh
|
||||
''; # */
|
||||
|
||||
meta = {
|
||||
description = "Mozilla Firefox XUL runner";
|
||||
homepage = http://www.mozilla.com/en-US/firefox/;
|
||||
};
|
||||
|
||||
passthru = { inherit gtk; version = xulVersion; };
|
||||
};
|
||||
|
||||
|
||||
firefox = stdenv.mkDerivation rec {
|
||||
name = "firefox-${firefoxVersion}";
|
||||
|
||||
inherit src;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
|
||||
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
|
||||
xlibs.pixman yasm mesa sqlite file unzip pysqlite
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [xulrunner];
|
||||
|
||||
configureFlags =
|
||||
[ "--enable-application=browser"
|
||||
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
|
||||
"--enable-chrome-format=jar"
|
||||
"--disable-elf-hack"
|
||||
]
|
||||
++ commonConfigureFlags
|
||||
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
|
||||
|
||||
makeFlags = [
|
||||
"SYSTEM_LIBXUL=1"
|
||||
];
|
||||
|
||||
# Hack to work around make's idea of -lbz2 dependency
|
||||
preConfigure =
|
||||
''
|
||||
find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
|
||||
stdenv.lib.concatStringsSep ":"
|
||||
(map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
|
||||
}' ';'
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
''
|
||||
ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
|
||||
cd "$out/lib/"firefox-*
|
||||
rm firefox
|
||||
echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
|
||||
chmod a+x firefox
|
||||
''; # */
|
||||
|
||||
meta = {
|
||||
description = "Mozilla Firefox - the browser, reloaded";
|
||||
homepage = http://www.mozilla.com/en-US/firefox/;
|
||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
||||
};
|
||||
|
||||
passthru = {
|
||||
inherit gtk xulrunner nspr;
|
||||
isFirefox3Like = true;
|
||||
};
|
||||
};
|
||||
}
|
@ -13,6 +13,7 @@
|
||||
, libXrender
|
||||
, libXcursor
|
||||
, libXt
|
||||
, libvdpau
|
||||
, gtk
|
||||
, glib
|
||||
, pango
|
||||
@ -78,6 +79,7 @@ stdenv.mkDerivation {
|
||||
rpath = stdenv.lib.makeLibraryPath
|
||||
[ zlib alsaLib curl nss nspr fontconfig freetype expat libX11
|
||||
libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf
|
||||
libvdpau
|
||||
];
|
||||
|
||||
buildPhase = ":";
|
||||
|
23
pkgs/applications/networking/ftp/filezilla/default.nix
Normal file
23
pkgs/applications/networking/ftp/filezilla/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ stdenv, fetchurl, dbus, gnutls2, wxGTK28, libidn, tinyxml, gettext, pkgconfig, xdg_utils, gtk2, sqlite36 }:
|
||||
|
||||
let version = "3.6.0.2"; in
|
||||
stdenv.mkDerivation {
|
||||
name = "filezilla-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
|
||||
sha256 = "01n6k1q21i21451rdx3rgc4hhxghdn5b0ldzpjsp44ipgww5wsjk";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
"--disable-manualupdatecheck"
|
||||
];
|
||||
|
||||
buildInputs = [ dbus gnutls2 wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite36 ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://filezilla-project.org/";
|
||||
description = "FileZilla is a cross-platform graphical FTP, FTPS and SFTP client a lot of features, supporting Windows, Linux, Mac OS X and more.";
|
||||
license = "GPLv2";
|
||||
};
|
||||
}
|
@ -1,19 +1,19 @@
|
||||
{ stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt
|
||||
, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
|
||||
, libxml2, ncurses, gettext, libunistring
|
||||
, libxml2, ncurses, gettext, libunistring, libidn
|
||||
, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnunet-0.9.3";
|
||||
name = "gnunet-0.9.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnunet/${name}.tar.gz";
|
||||
sha256 = "0ppirvwjb7w7270g0w83z6wyk984cnxv2ydxj7qr0j1cz2j6nn2h";
|
||||
sha256 = "162bahbskhzc0b2pda7v36dckm3p5p9rnbv2w0fbl0xl2gln63aa";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libextractor libmicrohttpd libgcrypt gmp curl libtool
|
||||
zlib adns sqlite libxml2 ncurses
|
||||
zlib adns sqlite libxml2 ncurses libidn
|
||||
pkgconfig gettext libunistring makeWrapper
|
||||
];
|
||||
|
||||
@ -36,6 +36,10 @@ stdenv.mkDerivation rec {
|
||||
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
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
@ -72,7 +76,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
license = "GPLv2+";
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
maintainers = with stdenv.lib.maintainers; [ ludo viric ];
|
||||
platforms = stdenv.lib.platforms.gnu;
|
||||
};
|
||||
}
|
||||
|
@ -1,18 +1,20 @@
|
||||
{ fetchsvn, stdenv, autoconf, automake, pkgconfig, m4, curl,
|
||||
mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK,
|
||||
sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11 }:
|
||||
{ fetchgit, stdenv, autoconf, automake, pkgconfig, m4, curl,
|
||||
mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil,
|
||||
sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "boinc-6.12.39";
|
||||
name = "boinc-7.0.44";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "http://boinc.berkeley.edu/svn/tags/boinc_core_release_6_12_39";
|
||||
rev = 24341;
|
||||
sha256 = "158fkm4mr7wljsy8gav20km8jamf00mxjk1wsiqw6kx62bih37yb";
|
||||
src = fetchgit {
|
||||
url = "git://boinc.berkeley.edu/boinc.git";
|
||||
rev = "7c449b1fb8a681ceb27d6895751b62a2b3adf0f2";
|
||||
sha256 = "0hdramyl9nip3gadp7xiaz8ngyld15i93d8ai1nsd04bmrvdfqia";
|
||||
};
|
||||
|
||||
buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi
|
||||
freeglut libjpeg wxGTK sqlite gtk libXScrnSaver libnotify patchelf libX11 ];
|
||||
freeglut libjpeg wxGTK sqlite gtk libXScrnSaver libnotify patchelf libX11
|
||||
libxcb xcbutil
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
sed -i -e s,/etc,$out/etc, client/scripts/Makefile
|
||||
@ -27,17 +29,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = "--disable-server --disable-fast-install";
|
||||
|
||||
postInstall = "
|
||||
# Remove a leading rpath to /tmp/... I don't know how it got there
|
||||
# I could not manage to get rid of that through autotools.
|
||||
for a in $out/bin/*; do
|
||||
RPATH=$(patchelf --print-rpath $a)
|
||||
NEWRPATH=$(echo $RPATH | sed 's/^[^:]*://')
|
||||
patchelf --set-rpath $out/lib:$NEWRPATH $a
|
||||
done
|
||||
";
|
||||
configureFlags = "--disable-server";
|
||||
|
||||
meta = {
|
||||
description = "Free software for distributed and grid computing";
|
||||
|
@ -12,14 +12,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.20121211";
|
||||
version = "3.20130107";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "git-annex-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
|
||||
sha256 = "1l5sffcn6mcfk0s808z490s30dbq8m4wi8a11ard35hyf599zawq";
|
||||
sha256 = "15x4rmpxv3mgp8r4gb6jana5262nvyl6rm5p8slc5z5ijl0qwbzq";
|
||||
name = "git-annex-${version}.tar.gz";
|
||||
};
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
let
|
||||
|
||||
version = "1.8.0.1";
|
||||
version = "1.8.1";
|
||||
|
||||
svn = subversionClient.override { perlBindings = true; };
|
||||
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
|
||||
sha1 = "4e7492f7558f3ba2a450c43efa7de3b0b1adc6c1";
|
||||
sha1 = "wfj2pbqf9l56014dm330wb13qgcwx3dc";
|
||||
};
|
||||
|
||||
patches = [ ./docbook2texi.patch ];
|
||||
|
@ -1,5 +1,6 @@
|
||||
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
|
||||
, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
|
||||
, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor
|
||||
, dbus }:
|
||||
|
||||
let version = "4.2.4"; in
|
||||
|
||||
@ -13,7 +14,7 @@ stdenv.mkDerivation {
|
||||
|
||||
KERN_DIR = "${kernel}/lib/modules/*/build";
|
||||
|
||||
buildInputs = [ patchelf cdrkit makeWrapper ];
|
||||
buildInputs = [ patchelf cdrkit makeWrapper dbus ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
@ -56,7 +57,7 @@ stdenv.mkDerivation {
|
||||
cd ..
|
||||
|
||||
# Change the interpreter for various binaries
|
||||
for i in sbin/VBoxService bin/{VBoxClient,VBoxControl}
|
||||
for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} lib/VBoxGuestAdditions/mount.vboxsf
|
||||
do
|
||||
${if stdenv.system == "i686-linux" then ''
|
||||
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $i
|
||||
@ -66,14 +67,12 @@ stdenv.mkDerivation {
|
||||
''
|
||||
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
|
||||
}
|
||||
patchelf --set-rpath ${stdenv.gcc.gcc}/lib:${dbus}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib $i
|
||||
done
|
||||
|
||||
# Change rpath for various binaries and libraries
|
||||
patchelf --set-rpath ${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib bin/VBoxClient
|
||||
|
||||
for i in lib/VBoxOGL*.so
|
||||
do
|
||||
patchelf --set-rpath $out/lib $i
|
||||
patchelf --set-rpath $out/lib:${dbus}/lib $i
|
||||
done
|
||||
|
||||
# Remove references to /usr from various scripts and files
|
||||
@ -82,6 +81,7 @@ stdenv.mkDerivation {
|
||||
|
||||
# Install binaries
|
||||
mkdir -p $out/sbin
|
||||
install -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/sbin/mount.vboxsf
|
||||
install -m 755 sbin/VBoxService $out/sbin
|
||||
|
||||
mkdir -p $out/bin
|
||||
|
@ -1,24 +1,19 @@
|
||||
{ cabal, extensibleExceptions, mtl, utf8String, X11, xmessage }:
|
||||
{ cabal, extensibleExceptions, filepath, mtl, utf8String, X11 }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xmonad";
|
||||
version = "0.10";
|
||||
sha256 = "19z5y36pybsm93x6hlj5hzyys9r4ag7hkdib5spsnryk2mv72xj6";
|
||||
version = "0.11";
|
||||
sha256 = "1nsv88y2b206n3s5hrsp5ginvz1bj818ns7jmikavb2g33akdgg5";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ extensibleExceptions mtl utf8String X11 ];
|
||||
buildDepends = [
|
||||
extensibleExceptions filepath mtl utf8String X11
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://xmonad.org";
|
||||
description = "A tiling window manager";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
];
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace XMonad/Core.hs --replace \
|
||||
'"xmessage"' '"${xmessage}/bin/xmessage"'
|
||||
'';
|
||||
})
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xmonad-contrib";
|
||||
version = "0.10";
|
||||
sha256 = "0lp7qr69rpjy4s3knhdgh2bp6zs81xp0az1lisv4a2i7i1ys7hfq";
|
||||
version = "0.11";
|
||||
sha256 = "188brys16b3wmxd22j4284wnpasm8bixdjfxl1jr2q2xi45nzks0";
|
||||
buildDepends = [
|
||||
extensibleExceptions mtl random utf8String X11 X11Xft xmonad
|
||||
];
|
||||
|
@ -4,13 +4,14 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xmonad-extras";
|
||||
version = "0.10.1.2";
|
||||
sha256 = "1v0yhi3sw7qks8d13amps0qs5p90j3prjh5abm02wblcd0bm1xay";
|
||||
version = "0.11";
|
||||
sha256 = "09r64z09mfdz86k7v5c6zds9ng0fjcp44kd8f5qg1sz40yblrny5";
|
||||
buildDepends = [
|
||||
hint libmpd mtl network parsec random regexPosix split X11 xmonad
|
||||
xmonadContrib
|
||||
];
|
||||
configureFlags = "-f-with_hlist -fwith_split -fwith_parsec";
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://projects.haskell.org/xmonad-extras";
|
||||
description = "Third party extensions for xmonad with wacky dependencies";
|
||||
|
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "man-pages-3.43";
|
||||
name = "man-pages-3.45";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.xz";
|
||||
sha256 = "05fjq8llfxm77mnf2jhly98780xbkakim7b7hbx6kafvvs5zisrf";
|
||||
sha256 = "1lwqrp79xcyhnjlyg1n0imz5wc88lpgv909xxz8bdgbk7c1mky0h";
|
||||
};
|
||||
|
||||
preBuild =
|
||||
|
@ -4,11 +4,11 @@ let
|
||||
s= # Generated upstream information
|
||||
rec {
|
||||
baseName="sbcl";
|
||||
version="1.1.2";
|
||||
name="sbcl-1.1.2";
|
||||
hash="04vp68cf0jfpjwx64iys7hi7qxbk2h7277wiym7k4jgirka08yhc";
|
||||
url="mirror://sourceforge/project/sbcl/sbcl/1.1.2/sbcl-1.1.2-source.tar.bz2";
|
||||
sha256="04vp68cf0jfpjwx64iys7hi7qxbk2h7277wiym7k4jgirka08yhc";
|
||||
version="1.1.3";
|
||||
name="${baseName}-${version}";
|
||||
hash="1qy64fy0nvjdgzlmasswgvzg1b2h2rygnnjvlf9vj7wg16i5383i";
|
||||
url="mirror://sourceforge/project/sbcl/sbcl/1.1.3/sbcl-1.1.3-source.tar.bz2";
|
||||
sha256="1qy64fy0nvjdgzlmasswgvzg1b2h2rygnnjvlf9vj7wg16i5383i";
|
||||
};
|
||||
buildInputs = with a; [
|
||||
clisp makeWrapper
|
||||
|
@ -9,11 +9,13 @@ with stdenv.lib;
|
||||
let
|
||||
|
||||
majorVersion = "2.6";
|
||||
version = "${majorVersion}.7";
|
||||
version = "${majorVersion}.8";
|
||||
|
||||
# http://www.python.org/download/releases/2.6.8/
|
||||
# md5 taken from webpage, python 2.6 will receive security fixes until Oct 2013
|
||||
src = fetchurl {
|
||||
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
|
||||
sha256 = "0p0fd8i533zsdm6gc0jmhmdifccx4v064mh0i1hl2s6fcjhc20j5";
|
||||
md5 = "c6e0420a21d8b23dee8b0195c9b9a125";
|
||||
};
|
||||
|
||||
patches =
|
||||
@ -51,6 +53,10 @@ let
|
||||
for i in /usr /sw /opt /pkg; do
|
||||
substituteInPlace ./setup.py --replace $i /no-such-path
|
||||
done
|
||||
'' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) ''
|
||||
for i in Lib/plat-*/regen; do
|
||||
substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/
|
||||
done
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2";
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2
|
||||
{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib
|
||||
, mp3Support ? true, lame ? null
|
||||
, speexSupport ? true, speex ? null
|
||||
, theoraSupport ? true, libtheora ? null
|
||||
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
|
||||
++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
|
||||
|
||||
buildInputs = [ pkgconfig lame yasm zlib bzip2 ]
|
||||
buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ]
|
||||
++ stdenv.lib.optional mp3Support lame
|
||||
++ stdenv.lib.optional speexSupport speex
|
||||
++ stdenv.lib.optional theoraSupport libtheora
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "Diff";
|
||||
version = "0.1.3";
|
||||
sha256 = "02dhy4rp3mkzm5x3h1rkdin2h8qcb7h7nhn14gl2gvl6wdykfh5w";
|
||||
version = "0.2.0";
|
||||
sha256 = "15hdkrzwajnfcx8bj4jdcy4jli115g9v20msw1xyc9wnwrmbz97k";
|
||||
meta = {
|
||||
description = "O(ND) diff algorithm in haskell";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "Graphalyze";
|
||||
version = "0.13.0.1";
|
||||
sha256 = "1yk7iglsspbj0kxh5rhjkc6q65vz07vpygiig07w86g2s6gad8am";
|
||||
version = "0.14.0.0";
|
||||
sha256 = "027nxvv38cza6y6rivmvc9wpglbazkjrkyriwv3mn03pp21y53fg";
|
||||
buildDepends = [
|
||||
bktrees fgl filepath graphviz pandoc random text time
|
||||
];
|
||||
|
@ -1,16 +0,0 @@
|
||||
{ cabal, libX11, libXext, libXinerama, syb }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "X11";
|
||||
version = "1.5.0.1";
|
||||
sha256 = "0s8k3lhvlks6i1mwfnm5fimfd2f0sjw9k2p67is3x564kih7mh19";
|
||||
buildDepends = [ syb ];
|
||||
extraLibraries = [ libX11 libXext libXinerama ];
|
||||
meta = {
|
||||
homepage = "https://github.com/haskell-pkg-janitors/X11";
|
||||
description = "A binding to the X11 graphics library";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
@ -2,9 +2,10 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "active";
|
||||
version = "0.1.0.2";
|
||||
sha256 = "1iymh3sd21ba7ijwv5afphn5vhmwchk6725hbcsdwk2d2x2gd674";
|
||||
version = "0.1.0.3";
|
||||
sha256 = "0jarc270z6raak1vz30jy2gl0pkj9a2x3ib5hq7vsl2ljbvbgyqi";
|
||||
buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
description = "Abstractions for animation";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
@ -1,13 +1,13 @@
|
||||
{ cabal, hashable, ReadArgs, systemFilepath, text, transformers
|
||||
, unorderedContainers, vector
|
||||
{ cabal, hashable, liftedBase, ReadArgs, systemFilepath, text
|
||||
, transformers, unorderedContainers, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "basic-prelude";
|
||||
version = "0.3.1.0";
|
||||
sha256 = "15k89z78zjhga36wrvfn8b17hsmlwr1na6xq0gmimivfrdlnz5j0";
|
||||
version = "0.3.2.0";
|
||||
sha256 = "1sdwkh9xrsx8v96d06jll7cqc0p6ykv2y9gnjzpbfx0k3ns69kcj";
|
||||
buildDepends = [
|
||||
hashable ReadArgs systemFilepath text transformers
|
||||
hashable liftedBase ReadArgs systemFilepath text transformers
|
||||
unorderedContainers vector
|
||||
];
|
||||
meta = {
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cautious-file";
|
||||
version = "1.0.1";
|
||||
sha256 = "0mlgchvdhw9lhml4pqmxxvx1zcqmkcyl3yx6w3zp0df200njzsws";
|
||||
version = "1.0.2";
|
||||
sha256 = "1sw5ngwrarq1lsd4c6v2wdmgbhkkq6kpybb62r8ccm11ddgn3yiq";
|
||||
buildDepends = [ filepath ];
|
||||
meta = {
|
||||
description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "classy-prelude-conduit";
|
||||
version = "0.4.2";
|
||||
sha256 = "1p5j519s95cgiy5ig0agbfs4vyay8srzwsimnblij68zz5jjfrzp";
|
||||
version = "0.4.3";
|
||||
sha256 = "0ny4si6z6i6g6khcg9d3m9wks42sqh8i8kpgghhdwd37v32l3f34";
|
||||
buildDepends = [
|
||||
classyPrelude conduit monadControl resourcet transformers void
|
||||
xmlConduit
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "classy-prelude";
|
||||
version = "0.4.2";
|
||||
sha256 = "082zqhyswzlnl250g8pf88nmh7pkwxwjwnkp0pm9960qsl6kbn7s";
|
||||
version = "0.4.3";
|
||||
sha256 = "1k2iszja03s8azypl8lpkdjvvqsgzg73cl1wp4jl2fqp1psqv36q";
|
||||
buildDepends = [
|
||||
basicPrelude hashable systemFilepath text transformers
|
||||
unorderedContainers vector
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "clientsession";
|
||||
version = "0.8.0.1";
|
||||
sha256 = "0r6j15wkyp4akhaxvimjxlwdka7cbm3c3nfk5bvkqan1nrip5rxv";
|
||||
version = "0.8.0.2";
|
||||
sha256 = "189v030g23lvky4vccdaw3p0p6drn26zly80a8n9bbn7b8kbfh4r";
|
||||
buildDepends = [
|
||||
base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
|
||||
skein tagged
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "comonad-transformers";
|
||||
version = "3.0";
|
||||
sha256 = "1bjix61rdzmqcd1irh6p91jwy4sz1617sj4zic07p7ng9h7fsz24";
|
||||
version = "3.0.1";
|
||||
sha256 = "1lmcz01zsgy0lfzsznqbdq83vlk6h10zs7i41nav8qhzzhjn095j";
|
||||
buildDepends = [
|
||||
comonad contravariant distributive semigroupoids semigroups
|
||||
transformers
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "comonad";
|
||||
version = "3.0.0.2";
|
||||
sha256 = "01q71b446mdbdj81qjrxjl5bshbg4bjih5zpw9fd4y5431bclfhi";
|
||||
version = "3.0.1.1";
|
||||
sha256 = "01zqxrqxy6x6nf6rynzmncbhlgbbpshhw10pkimnw5isg3b8qhc2";
|
||||
buildDepends = [ semigroups transformers ];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/comonad/";
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "comonads-fd";
|
||||
version = "3.0";
|
||||
sha256 = "1j5ymj711c49fsk2ilxfpzqr0jr117z8kb5ggyh5nlwjy16m32in";
|
||||
version = "3.0.1";
|
||||
sha256 = "0ap9sw7h130bza43091mbl9a5bsin6342zawgycdcsag49wm3dyy";
|
||||
buildDepends = [
|
||||
comonad comonadTransformers mtl semigroups transformers
|
||||
];
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "conduit";
|
||||
version = "0.5.5";
|
||||
sha256 = "0av12gaxsrfmsbs70y532wfwnpz9v6ymn182dr8phpqn8d9lx2iq";
|
||||
version = "0.5.6";
|
||||
sha256 = "1a5apcds3jjksz7hzw4ag725796axqk9nm5fhn5i4l82zphq2cxs";
|
||||
buildDepends = [
|
||||
liftedBase monadControl resourcet text transformers
|
||||
transformersBase void
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cprng-aes";
|
||||
version = "0.3.1";
|
||||
sha256 = "0z1kpgy9d4yp1vmcparsv3r5g1khv2yqqkr99ac3mgvr6pyh24dk";
|
||||
version = "0.3.2";
|
||||
sha256 = "1xwwhg83llf9fzfafxsky65biwk0sla9273rp4gqr7vg9p02k221";
|
||||
buildDepends = [
|
||||
cipherAes cryptoApi cryptoRandomApi entropy random
|
||||
];
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "crypto-random-api";
|
||||
version = "0.1.0";
|
||||
sha256 = "1zx05hskzdxm0kfj6x9qsx8f659zv77pa189s3xg56i7h18d25md";
|
||||
version = "0.2.0";
|
||||
sha256 = "0z49kwgjj7rz235642q64hbkgp0zl6ipn29xd19yb75xc5q7gsan";
|
||||
buildDepends = [ entropy ];
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-crypto-random-api";
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cryptohash";
|
||||
version = "0.8.2";
|
||||
sha256 = "0mym1q5sa1pqfffy0p8v12lfim1dlaczppw3c3wjhxgs222303wj";
|
||||
version = "0.8.3";
|
||||
sha256 = "1fcqbbclii2hmbhi7h64v0nnbc34zzs107m3lqq38iiyy5fvqqv2";
|
||||
buildDepends = [ cereal cryptoApi tagged ];
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-cryptohash";
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "dataenc";
|
||||
version = "0.14.0.4";
|
||||
sha256 = "0xnn90nyz4m0rbzykkr5p9270s8dq2bfiz5j7qyzyy5m8vbl15bw";
|
||||
version = "0.14.0.5";
|
||||
sha256 = "13gajqbayar7x8sq3rw93i277gqd0bx1i34spshlj4b41fraxc8w";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
meta = {
|
||||
|
@ -4,12 +4,13 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "diagrams-core";
|
||||
version = "0.6";
|
||||
sha256 = "15frd5jdzkgpdcvyyhd0mbi5d4a69ajcnxawa1gafl4c3byz1778";
|
||||
version = "0.6.0.1";
|
||||
sha256 = "0kw0rxk9a2zkpnbx4bfd0japm75y29ldvdn7i3c93kvz0p6jc2wa";
|
||||
buildDepends = [
|
||||
dualTree MemoTrie monoidExtras newtype semigroups vectorSpace
|
||||
vectorSpacePoints
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://projects.haskell.org/diagrams";
|
||||
description = "Core libraries for diagrams EDSL";
|
||||
|
@ -4,12 +4,13 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "diagrams-lib";
|
||||
version = "0.6";
|
||||
sha256 = "05nfp5ggjk4fviwvwiblmzzw5dbzbi1w8dx5dimvah7wxb0km3lf";
|
||||
version = "0.6.0.1";
|
||||
sha256 = "00ysdppl2jv0kspj0pjy8qj8shc9gg6g10lkq62vlvr39wnxx6yj";
|
||||
buildDepends = [
|
||||
active colour dataDefault diagramsCore monoidExtras newtype
|
||||
NumInstances semigroups vectorSpace
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://projects.haskell.org/diagrams";
|
||||
description = "Embedded domain-specific language for declarative graphics";
|
||||
|
@ -1,10 +1,10 @@
|
||||
{ cabal, digestiveFunctors, heist, text, xmlhtml }:
|
||||
{ cabal, digestiveFunctors, heist, mtl, text, xmlhtml }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "digestive-functors-heist";
|
||||
version = "0.5.1.0";
|
||||
sha256 = "1rycf6y1c0car2m71iia929si5iqpc2rdyyxzp326q0rgj94whpk";
|
||||
buildDepends = [ digestiveFunctors heist text xmlhtml ];
|
||||
version = "0.5.1.1";
|
||||
sha256 = "0jdg35xrikqg3r0rziv71g619vnmn8fzsv63b73m72fbj5xvy881";
|
||||
buildDepends = [ digestiveFunctors heist mtl text xmlhtml ];
|
||||
meta = {
|
||||
homepage = "http://github.com/jaspervdj/digestive-functors";
|
||||
description = "Heist frontend for the digestive-functors library";
|
||||
|
@ -0,0 +1,14 @@
|
||||
{ cabal, numtypeTf, time }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "dimensional-tf";
|
||||
version = "0.1.1";
|
||||
sha256 = "0hhp2nx8xyk5ms3mzg1d3jhzm1b0bxz7aijxqasrxjq9p04jr2ci";
|
||||
buildDepends = [ numtypeTf time ];
|
||||
meta = {
|
||||
homepage = "http://dimensional.googlecode.com/";
|
||||
description = "Statically checked physical dimensions, implemented using type families";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
@ -1,10 +1,10 @@
|
||||
{ cabal, transformers }:
|
||||
{ cabal, transformers, transformersCompat }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "distributive";
|
||||
version = "0.2.2";
|
||||
sha256 = "13wvr2wb3h2nr1qd3dwjqx0b6g4igjqm3q2cyi4mc41gwihkbhr2";
|
||||
buildDepends = [ transformers ];
|
||||
version = "0.3";
|
||||
sha256 = "0z6vwak2n91vpx9ps9j1pbiw0zlh9jmds84yx1yqssbqx8npi32f";
|
||||
buildDepends = [ transformers transformersCompat ];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/distributive/";
|
||||
description = "Haskell 98 Distributive functors -- Dual to Traversable";
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "double-conversion";
|
||||
version = "0.2.0.5";
|
||||
sha256 = "1z23a8sfnq5lady8n2kcina9a7df8lmsliscf85x84dxkd3a1ahf";
|
||||
version = "0.2.0.6";
|
||||
sha256 = "1c6hy0ghdqf44fvhdpdxjbcr0ahimw283x5fnvjxja36i71qshjp";
|
||||
buildDepends = [ text ];
|
||||
meta = {
|
||||
homepage = "https://github.com/bos/double-conversion";
|
||||
|
@ -2,9 +2,10 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "dual-tree";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "0av525gjxzd2hhrg5da647chwbv4j30gccaff2b3n5qijzy8l167";
|
||||
version = "0.1.0.1";
|
||||
sha256 = "09bdid65frccpbh1bs01f7vprq0vfgqsb5bfa4j8yi3q773mycb2";
|
||||
buildDepends = [ monoidExtras newtype semigroups ];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
description = "Rose trees with cached and accumulating monoidal annotations";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "either";
|
||||
version = "3.0.2";
|
||||
sha256 = "1s3rpxxqc9052hrmiznwqwxhl4826qzbgpivpv5acxfhm0w06lhg";
|
||||
version = "3.0.3";
|
||||
sha256 = "02kpb8xd19n00ll61haqr6k3hy8qmbdf73gr4zs59q9xh0739qxc";
|
||||
buildDepends = [ semigroupoids semigroups transformers ];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/either/";
|
||||
|
@ -1,9 +1,10 @@
|
||||
{ cabal }:
|
||||
{ cabal, filepath }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "file-embed";
|
||||
version = "0.0.4.6";
|
||||
sha256 = "0p2vs56s1jy5xaw3axzfsir925z2a46624n32x797lga9khm3qvp";
|
||||
version = "0.0.4.7";
|
||||
sha256 = "1hn08499kay0y6ik5z1s58s8r9h1nzf116avgi6ia4b565wpzkvi";
|
||||
buildDepends = [ filepath ];
|
||||
meta = {
|
||||
homepage = "https://github.com/snoyberg/file-embed";
|
||||
description = "Use Template Haskell to embed file contents directly";
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "filestore";
|
||||
version = "0.5.0.1";
|
||||
sha256 = "1wbiw3skbbcqi9p97xnhg5lnakq3vyan9v4f68wd3g4swk09xp7l";
|
||||
version = "0.6";
|
||||
sha256 = "1bmsqxrkiqw791h0xwasry3jm56rjsyvl9l5r78209bhiv5v6xk0";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "fsnotify";
|
||||
version = "0.0.4";
|
||||
sha256 = "0s71zxj48jimzhl7wz9j22g9c09z64g61nfmpy4mlrhpkzn1f8sz";
|
||||
version = "0.0.6";
|
||||
sha256 = "0ib6ansj3vaq9hxxbsq5jw14w2b61wp4jfahzb3c3x46mdb1bqw5";
|
||||
buildDepends = [ hinotify systemFileio systemFilepath text time ];
|
||||
meta = {
|
||||
description = "Cross platform library for file creation, modification, and deletion notification";
|
||||
|
@ -7,8 +7,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "gitit";
|
||||
version = "0.10.0.2";
|
||||
sha256 = "0cnql35h4laqpaymg32dmszwzc74qmbmmjas44gcsd8v5n6f701i";
|
||||
version = "0.10.1.1";
|
||||
sha256 = "1akrc362cf3fzfjyyf1g8bzna093kwsiyxdfpz0d9wd3z6jyc8cg";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
@ -4,12 +4,11 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "graphviz";
|
||||
version = "2999.14.1.0";
|
||||
sha256 = "13fni5sf6cdfvgyh7kqjjdhmjxkhbgl3gbi0cbq90n8blzg4q1ql";
|
||||
version = "2999.15.0.1";
|
||||
sha256 = "137d8n20fbpdz7az79gqharsfl293pl3xn444338i6blfi47ssdy";
|
||||
buildDepends = [
|
||||
colour dlist fgl filepath polyparse text transformers wlPprintText
|
||||
];
|
||||
patchPhase = "sed -i -e 's|bytestring.*,|bytestring,|' graphviz.cabal";
|
||||
meta = {
|
||||
homepage = "http://projects.haskell.org/graphviz/";
|
||||
description = "Bindings to Graphviz for graph visualisation";
|
||||
|
@ -5,14 +5,13 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hakyll";
|
||||
version = "3.5.2.0";
|
||||
sha256 = "088qhzycpz003qa4b7hnn6frgmidk6219icii04ap964fkw0mqn0";
|
||||
version = "3.5.2.1";
|
||||
sha256 = "1fp7jak2sfznvg3lfyjqy13m1iq9821mdq6n5qmqz5dh5b960iv4";
|
||||
buildDepends = [
|
||||
binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet
|
||||
lrucache mtl pandoc parsec regexBase regexTdfa snapCore snapServer
|
||||
tagsoup text time
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://jaspervdj.be/hakyll";
|
||||
description = "A static website compiler library";
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hashable";
|
||||
version = "1.2.0.2";
|
||||
sha256 = "1l827sh7v2jls2gcbxgbvz5hacwi43bcrxwmd3wp92hfwy1yza65";
|
||||
version = "1.2.0.3";
|
||||
sha256 = "0q4zl2mry6qfp9vln6pxmgqik7szv1sh7if55gydnxln1ybvvgmp";
|
||||
buildDepends = [ text ];
|
||||
meta = {
|
||||
homepage = "http://github.com/tibbe/hashable";
|
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "heist";
|
||||
version = "0.10.2";
|
||||
sha256 = "13v9x5dph52xddkb2dy4gfrapvihf1881fin996ag0snbma3wh68";
|
||||
version = "0.10.2.1";
|
||||
sha256 = "14lp27vlzv6qqv325x2vqqvphw5ads5ywjqpjramv3hhd275fn3d";
|
||||
buildDepends = [
|
||||
aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
|
||||
filepath hashable MonadCatchIOTransformers mtl random text time
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "highlighting-kate";
|
||||
version = "0.5.3.3";
|
||||
sha256 = "08jxl2ba0kb4vj1qbdf4sas8bwbxzayzwsxnjvq358x57i5l302n";
|
||||
version = "0.5.3.4";
|
||||
sha256 = "1xm9dr71qna1w65vzaf63hbchpvshfjvvs5038sy04x2ddwdix77";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hsemail";
|
||||
version = "1.7.3";
|
||||
sha256 = "0i9qh4rbgcgpjiz7nj8rrmj0ai53s420dskfvwrbwl4j6z67f7la";
|
||||
version = "1.7.4";
|
||||
sha256 = "0nigv0zbkm90m5jskfc5a4zx2d3gyqj1y472jplrgd76s15alsmw";
|
||||
buildDepends = [ mtl parsec ];
|
||||
meta = {
|
||||
homepage = "http://gitorious.org/hsemail";
|
||||
|
@ -8,8 +8,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-conduit";
|
||||
version = "1.8.5.2";
|
||||
sha256 = "0c1a6iknvi34sh97j7cfzwyikcz0kdz4vgsc47lr7c2a75gl0via";
|
||||
version = "1.8.6.2";
|
||||
sha256 = "0b9iw8gq0kyfmnpv1jba2dx8rik9136zx5q9xdyvy0lczdgb8i09";
|
||||
buildDepends = [
|
||||
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
|
||||
blazeBuilderConduit caseInsensitive certificate conduit cookie
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-date";
|
||||
version = "0.0.3";
|
||||
sha256 = "12iylfzz1d0v0gl4cf31dxcmlg0x7bq5f7acacy2pb0ilrxmzsnn";
|
||||
version = "0.0.4";
|
||||
sha256 = "1pbm066i1cpa3z2kfsqpva0qixnx87s76dpafz3wf6dkaqj8n8i5";
|
||||
buildDepends = [ attoparsec ];
|
||||
meta = {
|
||||
description = "HTTP Date parser/formatter";
|
||||
|
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-reverse-proxy";
|
||||
version = "0.1.1";
|
||||
sha256 = "0p04zpw1v0zhzri7wpikc0b8g7n21kgl8j8238vv7xqxapkal0pc";
|
||||
version = "0.1.1.1";
|
||||
sha256 = "0xg6xw0j61db75smys2fgjn0nzv2dy8c1ha4m828ssnxlic98lk2";
|
||||
buildDepends = [
|
||||
blazeBuilder caseInsensitive classyPreludeConduit conduit
|
||||
dataDefault httpConduit httpTypes liftedBase monadControl network
|
||||
|
@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
|
||||
mainlandPretty mtl srcloc syb symbol
|
||||
];
|
||||
buildTools = [ alex happy ];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://www.eecs.harvard.edu/~mainland/";
|
||||
description = "C/CUDA/OpenCL quasiquoting library";
|
||||
|
@ -1,17 +1,20 @@
|
||||
{ cabal, comonad, comonadsFd, comonadTransformers, filepath
|
||||
, hashable, mtl, parallel, semigroups, split, text, transformers
|
||||
, unorderedContainers, vector
|
||||
, hashable, mtl, nats, parallel, semigroups, split, text
|
||||
, transformers, transformersCompat, unorderedContainers, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "lens";
|
||||
version = "3.7.1.2";
|
||||
sha256 = "1hapcnmyqyc3645gsy1ikwzm2srbbznps6yrfr02y2lcbnjpn3g6";
|
||||
version = "3.7.3";
|
||||
sha256 = "0mvwczviszfv52ylymvrz3zk6s05ngmqc2g1k4r6pym8s9cmgmzz";
|
||||
buildDepends = [
|
||||
comonad comonadsFd comonadTransformers filepath hashable mtl
|
||||
parallel semigroups split text transformers unorderedContainers
|
||||
vector
|
||||
comonad comonadsFd comonadTransformers filepath hashable mtl nats
|
||||
parallel semigroups split text transformers transformersCompat
|
||||
unorderedContainers vector
|
||||
];
|
||||
patchPhase = ''
|
||||
sed -i -e 's|semigroups.*,|semigroups,|' lens.cabal
|
||||
'';
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/lens/";
|
||||
description = "Lenses, Folds and Traversals";
|
||||
|
@ -1,16 +1,16 @@
|
||||
{ cabal, aeson, attoparsec, curl, mtl, pureMD5, urlencoded
|
||||
, utf8String, xml
|
||||
{ cabal, aeson, cereal, cryptoApi, httpConduit, httpTypes, network
|
||||
, pureMD5, text
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "liblastfm";
|
||||
version = "0.0.3.8";
|
||||
sha256 = "0icx86x3w85z0pqdxcch583j6jk5id5aw9gf24266mgfg5k6iwdy";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "1777p2zysha9z389dkzvc22wph5k2xa6f23xk1ckr8j1q5v9dg6x";
|
||||
buildDepends = [
|
||||
aeson attoparsec curl mtl pureMD5 urlencoded utf8String xml
|
||||
aeson cereal cryptoApi httpConduit httpTypes network pureMD5 text
|
||||
];
|
||||
meta = {
|
||||
description = "Wrapper to Lastfm API";
|
||||
description = "Lastfm API interface";
|
||||
license = self.stdenv.lib.licenses.mit;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "mainland-pretty";
|
||||
version = "0.2.4";
|
||||
sha256 = "0x481k36rz4zvj1nwvrfw1d10vbmmx8gb5f2nc8alnxcbc2y7xwq";
|
||||
version = "0.2.5";
|
||||
sha256 = "0h3q7xw69dc0lcqwlacsnv36dlbj0sfgv5imjlqrixy6m5cniq9x";
|
||||
buildDepends = [ srcloc text ];
|
||||
meta = {
|
||||
homepage = "http://www.eecs.harvard.edu/~mainland/";
|
||||
|
@ -2,9 +2,10 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "monoid-extras";
|
||||
version = "0.2.2.1";
|
||||
sha256 = "0n2zwkwwq8kg9m6qr79mrhlxsfsrjzbyg96gfhcgk21zgc09zary";
|
||||
version = "0.2.2.2";
|
||||
sha256 = "1fz93hm0sswisvwvbygxvbwmmnzqcxmz9h82i4361wzychf2si22";
|
||||
buildDepends = [ semigroups ];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
description = "Various extra monoid-related definitions and utilities";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "multiarg";
|
||||
version = "0.6.0.0";
|
||||
sha256 = "1qrw1rajdvrvd297a7lpfkxm5qqhwmnnl5jiagjwzb9lckgpy87y";
|
||||
version = "0.8.0.0";
|
||||
sha256 = "17zfrm9zjf7c8g7q9vqj1srk0g766ifhwqp7gm4ql890541q5lv5";
|
||||
buildDepends = [ explicitException utf8String ];
|
||||
meta = {
|
||||
homepage = "https://github.com/massysett/multiarg";
|
||||
description = "Combinators to build command line parsers";
|
||||
license = self.stdenv.lib.licenses.mit;
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
|
12
pkgs/development/libraries/haskell/nat/default.nix
Normal file
12
pkgs/development/libraries/haskell/nat/default.nix
Normal file
@ -0,0 +1,12 @@
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "nat";
|
||||
version = "0.3";
|
||||
sha256 = "1v43c1dr72qn8mymnwcq6an8sqxjaxhac037k4gbv8z8bg18zmf5";
|
||||
meta = {
|
||||
description = "Lazy binary natural numbers";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
13
pkgs/development/libraries/haskell/nats/default.nix
Normal file
13
pkgs/development/libraries/haskell/nats/default.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "nats";
|
||||
version = "0.1";
|
||||
sha256 = "08gh7jjmws70919hmqqmvnfqcpxr34f03jmg3lzmmhqvr15gm1vy";
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/nats/";
|
||||
description = "Haskell 98 natural numbers";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
13
pkgs/development/libraries/haskell/naturals/default.nix
Normal file
13
pkgs/development/libraries/haskell/naturals/default.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "naturals";
|
||||
version = "0.2.0.2";
|
||||
sha256 = "1ay291833dcah411zc3r4qjilaw8x13ljlnb5z40d1s7784djm16";
|
||||
meta = {
|
||||
homepage = "frigidcode.com";
|
||||
description = "Constructors and related functions for natural numbers";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
@ -3,8 +3,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "network-conduit";
|
||||
version = "0.6.2.1";
|
||||
sha256 = "1pkqkkj18yn31dmxcc8xfq2drg2jm9169my0s3jsxjbyxsyq58l6";
|
||||
version = "0.6.2.2";
|
||||
sha256 = "1v8abhw977hr78hkshrbxy04abbbhafvvnhr4xxgqc0phwch02mc";
|
||||
buildDepends = [
|
||||
conduit liftedBase monadControl network transformers
|
||||
];
|
||||
|
13
pkgs/development/libraries/haskell/numtype-tf/default.nix
Normal file
13
pkgs/development/libraries/haskell/numtype-tf/default.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "numtype-tf";
|
||||
version = "0.1";
|
||||
sha256 = "1hvnqgjg7yifxdsji9v0wqwbp4syhdc97pa3nrn4p96g7kmvw25v";
|
||||
meta = {
|
||||
homepage = "http://dimensional.googlecode.com/";
|
||||
description = "Type-level (low cardinality) integers, implemented using type families";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent-template";
|
||||
version = "1.1.2";
|
||||
sha256 = "1hz8cxx2a84c93x364vgahmv4xd3cbpjx4j7si5n0pasyq3clbvr";
|
||||
version = "1.1.2.1";
|
||||
sha256 = "02sqrq847cxywj9hwixvi0bqq09kxr9w6lhn6kqg4ww0mw2add6s";
|
||||
buildDepends = [ aeson monadControl persistent text transformers ];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/persistent";
|
||||
|
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent";
|
||||
version = "1.1.3.1";
|
||||
sha256 = "12gv2gjkrf7qchlv6kj0an8bvpkin8vdhdkxg4ck9ydw7hh292v2";
|
||||
version = "1.1.3.2";
|
||||
sha256 = "1q8p5nxsf9fjhsyy1lha852f7vssp9mz6l24gg47mgv6y5mm9myv";
|
||||
buildDepends = [
|
||||
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
|
||||
liftedBase monadControl monadLogger pathPieces poolConduit
|
||||
|
@ -1,15 +1,15 @@
|
||||
{ cabal, haskellLexer }:
|
||||
{ cabal, filepath, haskellLexer }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pretty-show";
|
||||
version = "1.3.2";
|
||||
sha256 = "0m3kw4d68gd1mhlgi5vy3k2cqi9f0i4s502m2sgy4pww45fjllxy";
|
||||
version = "1.5";
|
||||
sha256 = "1n04f9aypgbhkq0lbji9czv1mjfwv4f80w1c6hqs55gmzwif63m4";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ haskellLexer ];
|
||||
buildDepends = [ filepath haskellLexer ];
|
||||
meta = {
|
||||
homepage = "http://wiki.github.com/yav/pretty-show";
|
||||
description = "Tools for working with derived Show instances";
|
||||
description = "Tools for working with derived `Show` instances and generic inspection of values";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "random-fu";
|
||||
version = "0.2.3.1";
|
||||
sha256 = "06b4v7012fj1kmnz6i63vbwl9gkhzgk556gmcc62k14299ks8pci";
|
||||
version = "0.2.4.0";
|
||||
sha256 = "1wiwh52qfs699mcj3ylwc97pyabczn6dr8j92qczs89g8vvi91wd";
|
||||
buildDepends = [
|
||||
erf gamma monadLoops mtl randomShuffle randomSource rvar syb
|
||||
transformers vector
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "random-source";
|
||||
version = "0.3.0.2";
|
||||
sha256 = "0sp39bj7rqg4w4rc4d4zgj0f77c23z4xc47p55chy12znc4frlp2";
|
||||
version = "0.3.0.4";
|
||||
sha256 = "1gvx9r6vy36lx7fy537zdbnbhpmfxz88a7gh0aiyd2vi7bvnndxy";
|
||||
buildDepends = [
|
||||
flexibleDefaults mersenneRandomPure64 mtl mwcRandom random stateref
|
||||
syb thExtras
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "semigroupoids";
|
||||
version = "3.0.0.1";
|
||||
sha256 = "0ilqmpywiwp9m1k8lrw0mxb0pzc9l8bs2hgzrp8k5iln1yq1fh6i";
|
||||
version = "3.0.1";
|
||||
sha256 = "12k2yryr31lxhwq42cx05kswljmbli8p8c2wknigzkkam63d8k5h";
|
||||
buildDepends = [ comonad contravariant semigroups transformers ];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/semigroupoids";
|
||||
|
@ -1,9 +1,10 @@
|
||||
{ cabal }:
|
||||
{ cabal, nats }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "semigroups";
|
||||
version = "0.8.5";
|
||||
sha256 = "0dnxqqxfyxj0mpy524nvgwagsp6ynadmh2yr4k5159rzbg2xgz90";
|
||||
version = "0.9";
|
||||
sha256 = "0cwyjjlr9zgpxryzdf26pb58dmad0cp8d0493rarhh5zmgighh90";
|
||||
buildDepends = [ nats ];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/semigroups/";
|
||||
description = "Haskell 98 semigroups";
|
||||
|
@ -1,10 +1,9 @@
|
||||
{ cabal, syb }:
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "srcloc";
|
||||
version = "0.3.0";
|
||||
sha256 = "1ymk8k0r9ckk7dalz3virvvpyrf4nw8xvb23cs6ibdjjbzsphpiz";
|
||||
buildDepends = [ syb ];
|
||||
version = "0.4.0";
|
||||
sha256 = "00af562n4m3nwlhl86x8rx7hhpnhwaijin61wk574pp47bh2jg0k";
|
||||
meta = {
|
||||
homepage = "http://www.eecs.harvard.edu/~mainland/";
|
||||
description = "Data types for managing source code locations";
|
||||
|
@ -2,12 +2,11 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "tabular";
|
||||
version = "0.2.2.3";
|
||||
sha256 = "cf6d9f1928ec6981edcbb06c4dcbaea7a96deef5272192ad4290caa18711ea76";
|
||||
version = "0.2.2.4";
|
||||
sha256 = "103fqbypsgykv6z29jp1s75pd99vra9sfa70krcnlhbk9kbvdyjk";
|
||||
buildDepends = [ csv html mtl ];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://patch-tag.com/r/kowey/tabular";
|
||||
homepage = "http://hub.darcs.net/kowey/tabular";
|
||||
description = "Two-dimensional data tables with rendering functions";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "texmath";
|
||||
version = "0.6.1.1";
|
||||
sha256 = "06yk19jvpj7di1njybk1hdc7hp6c9h3yb4gvi7ljna6wqrh6zqaz";
|
||||
version = "0.6.1.2";
|
||||
sha256 = "1izsjy30saz2il16dwx8sh2s30b1pfgcpq6023v135w1bdrzrnmq";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ parsec syb xml ];
|
||||
|
@ -0,0 +1,15 @@
|
||||
{ cabal, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "transformers-compat";
|
||||
version = "0.1";
|
||||
sha256 = "100xw00h2l6iipg6lq5bbncpil3bl6w3frak99klpi8gn6ihd8ah";
|
||||
buildDepends = [ transformers ];
|
||||
noHaddock = true;
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/transformers-compat/";
|
||||
description = "Lenses, Folds and Traversals";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
@ -0,0 +1,12 @@
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "type-level-natural-number";
|
||||
version = "1.1.1";
|
||||
sha256 = "1zc26nckpcixxp1m818jhzi3dj1ysnjfc2xliq4rpmf5583k6mjw";
|
||||
meta = {
|
||||
description = "Simple, Haskell 2010-compatible type level natural numbers";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "uu-parsinglib";
|
||||
version = "2.7.4";
|
||||
sha256 = "1cznyn09a3glfkvvzqma3bhjinddkp6v2xwiy5x403v0wy8y565j";
|
||||
version = "2.7.4.1";
|
||||
sha256 = "1aya95j7dd0yal0ygy6d4w4wmlhgn5ddy3c5f6ncl4k3kg7hjxd1";
|
||||
buildDepends = [ ListLike time ];
|
||||
meta = {
|
||||
homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "void";
|
||||
version = "0.5.10";
|
||||
sha256 = "0adykqns7vvzgrjg7waaklfj3dl1h7vk5rwlfx0f18js6di9zrh4";
|
||||
version = "0.5.11";
|
||||
sha256 = "0fi8ccnhg0ckz5v3cgxhdd67p0v3g9yawin917ik4vxfbwz5j3v6";
|
||||
buildDepends = [ semigroups ];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/void";
|
||||
|
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai-app-static";
|
||||
version = "1.3.0.5";
|
||||
sha256 = "1fz2a30f3imn0m5q6hjkm2xan0ddalhfbzx78pklz4g7k79s1ncn";
|
||||
version = "1.3.1";
|
||||
sha256 = "0r2ghx3nqh7nms8yxa874h5pyagj993r077f8riybjyjp078s2lk";
|
||||
buildDepends = [
|
||||
base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal
|
||||
cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes
|
||||
|
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai-extra";
|
||||
version = "1.3.0.5";
|
||||
sha256 = "0xzsnsf4sdbzkw92xyzmyi6qp2qpbh5dj3579sppcihdq9djj8l8";
|
||||
version = "1.3.1.1";
|
||||
sha256 = "0590i9zs47fxqlz4l7zrk15x4s1rvzvp0fs1caygr5hw32v8h0by";
|
||||
buildDepends = [
|
||||
ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
|
||||
conduit dataDefault dateCache fastLogger httpTypes network
|
||||
|
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "warp";
|
||||
version = "1.3.6";
|
||||
sha256 = "0aw5m7apj7l6fjb0w59bmgiy4j0rmdwjil4ppgp5qz2q2njqbbnj";
|
||||
version = "1.3.7";
|
||||
sha256 = "06648wqiwlcsvd41qdqdbgn1zcq890iq39zsxi24vf4s8q7jnzyf";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
|
||||
httpTypes liftedBase network networkConduit simpleSendfile
|
||||
|
@ -0,0 +1,13 @@
|
||||
diff -ubr wxc-0.90.0.4-orig/src/cpp/eljpen.cpp wxc-0.90.0.4/src/cpp/eljpen.cpp
|
||||
--- wxc-0.90.0.4-orig/src/cpp/eljpen.cpp 2012-07-03 12:12:17.000000000 +0200
|
||||
+++ wxc-0.90.0.4/src/cpp/eljpen.cpp 2013-01-07 12:09:50.296417007 +0100
|
||||
@@ -156,7 +156,7 @@
|
||||
EWXWEXPORT(void,wxPen_GetStipple)(void* self,wxBitmap* _ref)
|
||||
{
|
||||
#if defined(__WXGTK__)
|
||||
- *_ref = NULL;
|
||||
+ _ref = NULL;
|
||||
#else
|
||||
*_ref = *(((wxPen*)self)->GetStipple());
|
||||
#endif
|
||||
Only in wxc-0.90.0.4/src/cpp: eljpen.cpp.orig
|
@ -10,7 +10,7 @@ cabal.mkDerivation (self: {
|
||||
postInstall = ''
|
||||
cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so
|
||||
'';
|
||||
|
||||
patches = [ ./fix-bogus-pointer-assignment.patch ];
|
||||
meta = {
|
||||
homepage = "http://haskell.org/haskellwiki/WxHaskell";
|
||||
description = "wxHaskell C++ wrapper";
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xss-sanitize";
|
||||
version = "0.3.2";
|
||||
sha256 = "0m7gl232i06i090kbrlz67cs4q3pqf8169m9kjdj41kj6jay1dcx";
|
||||
version = "0.3.3";
|
||||
sha256 = "0xnyp8nwglh4waawijk1q5z8higf8mggh6hp0pp6ys4bm7gsp74a";
|
||||
buildDepends = [
|
||||
attoparsec cssText network tagsoup text utf8String
|
||||
];
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yaml";
|
||||
version = "0.8.1.2";
|
||||
sha256 = "1prk1nxzb84svqr552pgrfxg8kd34zvnh35js8l0q58y9rifxyq0";
|
||||
version = "0.8.2";
|
||||
sha256 = "1c83vxgry1425z4wk2mnijy183pnlhamcra7fvh55rvhq4bql1m8";
|
||||
buildDepends = [
|
||||
aeson attoparsec conduit resourcet text transformers
|
||||
unorderedContainers vector
|
||||
|
@ -9,8 +9,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-core";
|
||||
version = "1.1.7";
|
||||
sha256 = "1z47h7ghhi8mvmrc0rcwb3si1bq4623i5x127k8fahcy6qk4qls8";
|
||||
version = "1.1.7.1";
|
||||
sha256 = "07rh6yy8hz660hxz60gvminm166cb5was8qb1l24lrmzchigbf3r";
|
||||
buildDepends = [
|
||||
aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
|
||||
clientsession conduit cookie failure fastLogger hamlet httpTypes
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "zip-archive";
|
||||
version = "0.1.2.1";
|
||||
sha256 = "1c0pjbrkfv44nbpz60b1c4xdbkdk8qaxlkfxl51rb2183gj1gkph";
|
||||
version = "0.1.3.3";
|
||||
sha256 = "0zzps6s6lsv35qv1xx1fwipk2nwv255wpa956mvzbwdr47pgqjwi";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ binary digest filepath mtl time utf8String zlib ];
|
||||
|
@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl, curl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libmicrohttpd-0.9.9";
|
||||
name = "libmicrohttpd-0.9.24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
|
||||
sha256 = "0059isy80cmxv44dhngnsc4g25kwxdcfis5yrva199r0vnb8ab6c";
|
||||
sha256 = "0cp2ac6wbk493zslbvbmb5z96h18k496f9id8d2ji7hbdrwzfk6h";
|
||||
};
|
||||
|
||||
buildInputs = [ curl ];
|
||||
|
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libX11 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libvdpau-0.4.1";
|
||||
name = "libvdpau-0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
|
||||
sha256 = "16zmmbawfnvrxjqvgfwxjfd1wh3vyz2cmvxza6cgf4j9qs36y6q6";
|
||||
sha256 = "0k2ydz4yp7zynlkpd1llfwax30xndwbca36z83ah1i4ldjw2gfhx";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig libX11 ];
|
||||
|
13
pkgs/development/libraries/tinyxml/2.6.2-add-pkgconfig.patch
Normal file
13
pkgs/development/libraries/tinyxml/2.6.2-add-pkgconfig.patch
Normal file
@ -0,0 +1,13 @@
|
||||
--- a/tinyxml.pc 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/tinyxml.pc 2012-12-29 08:52:07.512266072 +0100
|
||||
@@ -0,0 +1,10 @@
|
||||
+prefix=@out@
|
||||
+exec_prefix=${prefix}
|
||||
+libdir=${exec_prefix}/lib
|
||||
+includedir=${prefix}/include
|
||||
+
|
||||
+Name: TinyXML
|
||||
+Description: A simple, small, C++ XML parser
|
||||
+Version: @version@
|
||||
+Libs: -L${libdir} -ltinyxml
|
||||
+Cflags: -I${includedir}
|
64
pkgs/development/libraries/tinyxml/2.6.2-entity.patch
Executable file
64
pkgs/development/libraries/tinyxml/2.6.2-entity.patch
Executable file
@ -0,0 +1,64 @@
|
||||
? entity.patch
|
||||
Index: a/tinyxml.cpp
|
||||
===================================================================
|
||||
RCS file: b/tinyxml.cpp,v
|
||||
retrieving revision 1.105
|
||||
diff -u -r1.105 a/tinyxml.cpp
|
||||
--- tinyxml.cpp 5 Jun 2010 19:06:57 -0000 1.105
|
||||
+++ tinyxml.cpp 19 Jul 2010 21:24:16 -0000
|
||||
@@ -57,30 +57,7 @@
|
||||
{
|
||||
unsigned char c = (unsigned char) str[i];
|
||||
|
||||
- if ( c == '&'
|
||||
- && i < ( (int)str.length() - 2 )
|
||||
- && str[i+1] == '#'
|
||||
- && str[i+2] == 'x' )
|
||||
- {
|
||||
- // Hexadecimal character reference.
|
||||
- // Pass through unchanged.
|
||||
- // © -- copyright symbol, for example.
|
||||
- //
|
||||
- // The -1 is a bug fix from Rob Laveaux. It keeps
|
||||
- // an overflow from happening if there is no ';'.
|
||||
- // There are actually 2 ways to exit this loop -
|
||||
- // while fails (error case) and break (semicolon found).
|
||||
- // However, there is no mechanism (currently) for
|
||||
- // this function to return an error.
|
||||
- while ( i<(int)str.length()-1 )
|
||||
- {
|
||||
- outString->append( str.c_str() + i, 1 );
|
||||
- ++i;
|
||||
- if ( str[i] == ';' )
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
- else if ( c == '&' )
|
||||
+ if ( c == '&' )
|
||||
{
|
||||
outString->append( entity[0].str, entity[0].strLength );
|
||||
++i;
|
||||
Index: a/xmltest.cpp
|
||||
===================================================================
|
||||
RCS file: b/xmltest.cpp,v
|
||||
retrieving revision 1.89
|
||||
diff -u -r1.89 a/xmltest.cpp
|
||||
--- xmltest.cpp 5 Jun 2010 17:41:52 -0000 1.89
|
||||
+++ xmltest.cpp 19 Jul 2010 21:24:16 -0000
|
||||
@@ -1340,6 +1340,16 @@
|
||||
}*/
|
||||
}
|
||||
|
||||
+ #ifdef TIXML_USE_STL
|
||||
+ {
|
||||
+ TiXmlDocument xml;
|
||||
+ xml.Parse("<foo>foo&#xa+bar</foo>");
|
||||
+ std::string str;
|
||||
+ str << xml;
|
||||
+ XmlTest( "Entity escaping", "<foo>foo&#xa+bar</foo>", str.c_str() );
|
||||
+ }
|
||||
+ #endif
|
||||
+
|
||||
/* 1417717 experiment
|
||||
{
|
||||
TiXmlDocument xml;
|
61
pkgs/development/libraries/tinyxml/2.6.2.nix
Normal file
61
pkgs/development/libraries/tinyxml/2.6.2.nix
Normal file
@ -0,0 +1,61 @@
|
||||
{ stdenv, fetchurl, unzip }:
|
||||
|
||||
let
|
||||
version = "2.6.2";
|
||||
in stdenv.mkDerivation {
|
||||
name = "tinyxml-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/tinyxml/tinyxml/${version}/tinyxml_2_6_2.zip";
|
||||
sha256 = "04nmw6im2d1xp12yir8va93xns5iz816pwi25n9cql3g3i8bjsxc";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# add pkgconfig file
|
||||
./2.6.2-add-pkgconfig.patch
|
||||
|
||||
# http://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
|
||||
./2.6.2-entity.patch
|
||||
];
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
buildPhase = ''
|
||||
# build xmltest
|
||||
make
|
||||
|
||||
# build the lib as a shared library
|
||||
g++ -Wall -O2 -shared -fpic tinyxml.cpp \
|
||||
tinyxmlerror.cpp tinyxmlparser.cpp \
|
||||
tinystr.cpp -o libtinyxml.so
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
./xmltest
|
||||
result=$?
|
||||
if [[ $result != 0 ]] ; then
|
||||
exit $result
|
||||
fi
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out/include/
|
||||
mkdir -pv $out/lib/pkgconfig/
|
||||
mkdir -pv $out/share/doc/tinyxml/
|
||||
|
||||
cp -v libtinyxml.so $out/lib/
|
||||
cp -v *.h $out/include/
|
||||
|
||||
substituteInPlace tinyxml.pc --replace "@out@" "$out"
|
||||
substituteInPlace tinyxml.pc --replace "@version@" "${version}"
|
||||
cp -v tinyxml.pc $out/lib/pkgconfig/
|
||||
|
||||
cp -v docs/* $out/share/doc/tinyxml/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "TinyXML is a simple, small, C++ XML parser that can be easily integrating into other programs.";
|
||||
homepage = "http://www.grinninglizard.com/tinyxml/index.html";
|
||||
license = "free-non-copyleft";
|
||||
};
|
||||
}
|
@ -37,7 +37,11 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/lib
|
||||
mv -v out/${arch}.release/d8 $out/bin
|
||||
mv -v out/${arch}.release/lib.target/libv8.so $out/lib
|
||||
|
||||
${if stdenv.system == "x86_64-darwin" then
|
||||
"mv -v out/${arch}.release/libv8.dylib $out/lib"
|
||||
else
|
||||
"mv -v out/${arch}.release/lib.target/libv8.so $out/lib"}
|
||||
mv -v include $out/
|
||||
'';
|
||||
}
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user