svn merge ^/nixpkgs/trunk
Merge conflicts: * unzip (almost trivial) * dvswitch (trivial) * gmp (copied result of `git merge`) The last item introduced gmp-5.0.3, thus full rebuild. +ensureDir->mkdir -p in TeX packages was catched by git but not svn. svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
This commit is contained in:
commit
215a07c1a9
@ -2,7 +2,7 @@
|
||||
|
||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
||||
|
||||
let version = "0.6.2.291"; in
|
||||
let version = "0.6.6.10"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "spotify-${version}";
|
||||
@ -10,13 +10,13 @@ stdenv.mkDerivation {
|
||||
src =
|
||||
if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gcccc1f5.116-1_i386.deb";
|
||||
sha256 = "164ka9xry9nbnv77w71kzi7bjidlmccw8wnn4fyzavi8pbrpmj08";
|
||||
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gbd39032.58-1_i386.deb";
|
||||
sha256 = "184wvw2jqihw7bbmd7pgz51nkzvk777imz9pvknv52mggai61523";
|
||||
}
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gcccc1f5.116-1_amd64.deb";
|
||||
sha256 = "08snnpqd5ldiqv98pwx3fjrhdlwp4arbgda9xnsy92wfk0s85lv8";
|
||||
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gbd39032.58-1_amd64.deb";
|
||||
sha256 = "0qy4dgcl4y8ymqk8i9vgabik7mq0niqpbkwl3sk8z66znax4am4c";
|
||||
}
|
||||
else throw "Spotify not supported on this platform.";
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,21 +0,0 @@
|
||||
{stdenv, fetchurl, alsaLib, esound, libogg, libvorbis, glib, gtk}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xmms-1.2.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://nixos.org/tarballs/xmms-1.2.10.tar.bz2;
|
||||
md5 = "03a85cfc5e1877a2e1f7be4fa1d3f63c";
|
||||
};
|
||||
|
||||
# Patch borrowed from SuSE 10.0 to fix pause/continue on ALSA.
|
||||
patches = [./alsa.patch];
|
||||
|
||||
buildInputs = [alsaLib esound libogg libvorbis glib gtk];
|
||||
|
||||
meta = {
|
||||
description = "A music player very similar to Winamp";
|
||||
homepage = http://www.xmms.org;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
{ fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoconf }:
|
||||
|
||||
let date = "2009-07-09"; in
|
||||
let date = "2012-01-15"; in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "emacs-w3m-cvs${date}";
|
||||
|
||||
|
@ -27,5 +27,6 @@ stdenv.mkDerivation {
|
||||
homepage = http://www.graphicsmagick.org;
|
||||
description = "Swiss army knife of image processing";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
@ -27,5 +27,6 @@ stdenv.mkDerivation {
|
||||
homepage = http://www.graphicsmagick.org;
|
||||
description = "Swiss army knife of image processing";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
@ -3,13 +3,13 @@
|
||||
assert stdenv.system == "i686-linux";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "adobe-reader-9.4.2-1";
|
||||
name = "adobe-reader-9.4.7-1";
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.2/enu/AdbeRdr9.4.2-1_i486linux_enu.tar.bz2;
|
||||
sha256 = "0xm8ngr7lslhxli9ly1g2w7ichip88vpf7lfx1ma0liaw4m2gv0h";
|
||||
url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.7/enu/AdbeRdr9.4.7-1_i486linux_enu.tar.bz2;
|
||||
sha256 = "0bzx1rcwc9bi5jkh8f8hjb354zxlvvx37lhm0l2r0mjxj8fimfb5";
|
||||
};
|
||||
|
||||
# !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu.
|
||||
|
31
pkgs/applications/misc/goldendict/default.nix
Normal file
31
pkgs/applications/misc/goldendict/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ stdenv, fetchurl, qt4, libXtst, libvorbis, phonon, hunspell }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "goldendict-1.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/goldendict/${name}-src.tar.bz2";
|
||||
sha256 = "19p99dd5jgs0k66sy30vck7ymqj6dv1lh6w8xw18zczdll2h9yxk";
|
||||
};
|
||||
buildInputs = [ qt4 libXtst libvorbis phonon hunspell ];
|
||||
unpackPhase = ''
|
||||
mkdir ${name}-src
|
||||
cd ${name}-src
|
||||
tar xf ${src}
|
||||
'';
|
||||
patches = [ ./goldendict-paths.diff ];
|
||||
patchFlags = "-p 0";
|
||||
configurePhase = ''
|
||||
qmake
|
||||
'';
|
||||
installPhase = ''
|
||||
make INSTALL_ROOT="$out" install
|
||||
rm -rf "$out/share/app-install"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://goldendict.org/;
|
||||
description = "a feature-rich dictionary lookup program";
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.astsmtl ];
|
||||
};
|
||||
}
|
10
pkgs/applications/misc/goldendict/goldendict-paths.diff
Normal file
10
pkgs/applications/misc/goldendict/goldendict-paths.diff
Normal file
@ -0,0 +1,10 @@
|
||||
--- goldendict.pro~ 2010-12-27 22:52:21.000000000 +0100
|
||||
+++ goldendict.pro 2010-12-27 22:52:21.000000000 +0100
|
||||
@@ -63,2 +63,2 @@
|
||||
- isEmpty( PREFIX ):PREFIX = /usr/local
|
||||
- DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\"
|
||||
+ isEmpty( PREFIX ):PREFIX = /
|
||||
+ DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\"
|
||||
@@ -66 +66 @@
|
||||
- locale.path = $$PREFIX/share/apps/goldendict/locale/
|
||||
+ locale.path = $$PREFIX/share/goldendict/locale/
|
@ -13,14 +13,14 @@ assert monotoneSupport -> (monotone != null);
|
||||
|
||||
let
|
||||
name = "ikiwiki";
|
||||
version = "3.20120109";
|
||||
version = "3.20120115";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${name}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
|
||||
sha256 = "0a47135c039f3dfd62162dd3b250397fcdab2dbb4bf4cf0433099f6e48d6f3e8";
|
||||
sha256 = "3145372b3d86068f90348a96f9daf3a3b438d747be0e977358d82ee752499c1f";
|
||||
};
|
||||
|
||||
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
|
||||
|
@ -40,17 +40,17 @@ library, use the 'NOGUI' parameter:
|
||||
$ make NOGUI=1
|
||||
*/
|
||||
|
||||
{ fetchurl, stdenv, pkgconfig, fuse, wxGTK, devicemapper,
|
||||
{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, devicemapper,
|
||||
wxGUI ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "truecrypt-6.3a";
|
||||
name = "truecrypt-7.1";
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.sfr-fresh.com/unix/misc/TrueCrypt_6.3a_Source.tar.gz;
|
||||
sha256 = "1vwnzay9gjlldqbdb20rhq2arhyzhdy347qc00hkpqmv2b8z070y";
|
||||
url = http://fossies.org/unix/misc/TrueCrypt-7.1-Source.tar.gz;
|
||||
sha256 = "1x6rdxcvklb3zpmgfc3mg5h71gzki1q55ljkzjab2vzkf9n5v0cl";
|
||||
};
|
||||
|
||||
pkcs11h = fetchurl {
|
||||
@ -68,7 +68,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig fuse devicemapper wxGTK ];
|
||||
buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ];
|
||||
makeFlags = if (wxGUI) then "" else "NOGUI=1";
|
||||
|
||||
meta = {
|
||||
|
@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
|
||||
|
||||
rec {
|
||||
|
||||
firefoxVersion = "8.0.1";
|
||||
firefoxVersion = "10.0";
|
||||
|
||||
xulVersion = "8.0.1"; # this attribute is used by other packages
|
||||
xulVersion = "10.0"; # this attribute is used by other packages
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
|
||||
sha1 = "0dd207c5cee9d53114c55aa23eeca36b754bc128";
|
||||
sha1 = "cbf1fb0efe0a3a2b2dafaa324b136736e93de70c";
|
||||
};
|
||||
|
||||
commonConfigureFlags =
|
||||
@ -139,7 +139,7 @@ rec {
|
||||
[ "--enable-application=browser"
|
||||
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
|
||||
"--enable-chrome-format=jar"
|
||||
"--disable-elf-hack"
|
||||
"--disable-elf-hack"
|
||||
]
|
||||
++ commonConfigureFlags
|
||||
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
|
180
pkgs/applications/networking/browsers/firefox/11.0.nix
Normal file
180
pkgs/applications/networking/browsers/firefox/11.0.nix
Normal file
@ -0,0 +1,180 @@
|
||||
{ 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
|
||||
|
||||
, # 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 = "11.0b1";
|
||||
|
||||
xulVersion = "11.0"; # this attribute is used by other packages
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";
|
||||
sha256 = "1f9p2jmjvhmb23wmvj84jj22wd9g803k6pdjm8glwmkzwnva8x1b";
|
||||
};
|
||||
|
||||
commonConfigureFlags =
|
||||
[ "--enable-optimize"
|
||||
"--disable-debug"
|
||||
"--enable-strip"
|
||||
"--with-system-jpeg"
|
||||
"--with-system-zlib"
|
||||
"--with-system-bz2"
|
||||
#"--with-system-nspr" # <-- There are links to nspr 4.9.0, but no file...
|
||||
# "--with-system-nss"
|
||||
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
|
||||
"--enable-system-cairo"
|
||||
"--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
|
||||
xlibs.libXext xlibs.xextproto sqlite unzip
|
||||
];
|
||||
|
||||
configureFlags =
|
||||
[ "--enable-application=xulrunner"
|
||||
"--disable-javaxpcom"
|
||||
] ++ commonConfigureFlags;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# 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]))
|
||||
}' ';'
|
||||
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
|
||||
'';
|
||||
|
||||
# !!! Temporary hack.
|
||||
preBuild =
|
||||
''
|
||||
export NIX_ENFORCE_PURITY=
|
||||
'';
|
||||
|
||||
installFlags = "SKIP_GRE_REGISTRATION=1";
|
||||
|
||||
postInstall = ''
|
||||
# Fix some references to /bin paths in the Xulrunner shell script.
|
||||
substituteInPlace $out/bin/xulrunner \
|
||||
--replace /bin/pwd "$(type -tP pwd)" \
|
||||
--replace /bin/ls "$(type -tP ls)"
|
||||
|
||||
# Fix run-mozilla.sh search
|
||||
libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
|
||||
echo libDir: $libDir
|
||||
test -n "$libDir"
|
||||
cd $out/bin
|
||||
mv xulrunner ../lib/$libDir/
|
||||
|
||||
for i in $out/lib/$libDir/*; do
|
||||
file $i;
|
||||
if file $i | grep executable &>/dev/null; then
|
||||
echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
|
||||
chmod a+x "$out/bin/$(basename "$i")";
|
||||
fi;
|
||||
done;
|
||||
for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do
|
||||
patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
|
||||
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 libnotify
|
||||
xlibs.pixman yasm mesa sqlite file unzip
|
||||
];
|
||||
|
||||
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";
|
||||
|
||||
# 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
|
||||
for j in $out/bin/*; do
|
||||
i="$(readlink "$j")";
|
||||
file $i;
|
||||
if file $i | grep executable &>/dev/null; then
|
||||
rm "$out/bin/$(basename "$i")"
|
||||
echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
|
||||
chmod a+x "$out/bin/$(basename "$i")"
|
||||
fi;
|
||||
done;
|
||||
''; # */
|
||||
|
||||
meta = {
|
||||
description = "Mozilla Firefox - the browser, reloaded";
|
||||
homepage = http://www.mozilla.com/en-US/firefox/;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
inherit gtk xulrunner nspr;
|
||||
isFirefox3Like = true;
|
||||
};
|
||||
};
|
||||
}
|
@ -1,33 +1,44 @@
|
||||
a :
|
||||
let
|
||||
s = import ./src-for-default.nix;
|
||||
buildInputs = with a; [
|
||||
libpng libjpeg bzip2 zlib libtiff
|
||||
libX11 libXau xproto gpm
|
||||
openssl libXt pkgconfig
|
||||
];
|
||||
in
|
||||
rec {
|
||||
src = a.fetchUrlFromSrcInfo s;
|
||||
{ stdenv, fetchurl
|
||||
, gpm, openssl, pkgconfig # Misc.
|
||||
, libpng, libjpeg, libtiff # graphic formats
|
||||
, bzip2, zlib, xz # Transfer encodings
|
||||
, enableFB ? true
|
||||
, enableDirectFB ? false, directfb
|
||||
, enableX11 ? true, libX11, libXt, libXau # GUI support
|
||||
}:
|
||||
|
||||
inherit (s) name;
|
||||
inherit buildInputs;
|
||||
configureFlags = [
|
||||
"--enable-graphics"
|
||||
"--with-ssl"
|
||||
"--with-x"
|
||||
"--with-fb"
|
||||
];
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.5";
|
||||
name = "links2-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/download/links-${version}.tar.bz2";
|
||||
sha256 = "1wlmj8s6bxgznh0pnawihyvhffzryciz3lkagcxhf7fp64zz5izm";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ libpng libjpeg libtiff gpm openssl xz bzip2 zlib ]
|
||||
++ stdenv.lib.optionals enableX11 [ libX11 libXau libXt ]
|
||||
++ stdenv.lib.optional enableDirectFB [ directfb ];
|
||||
|
||||
buildNativeInputs = [ pkgconfig ];
|
||||
|
||||
configureFlags = [ "--with-ssl" ]
|
||||
++ stdenv.lib.optional (enableX11 || enableFB || enableDirectFB) "--enable-graphics"
|
||||
++ stdenv.lib.optional enableX11 "--with-x"
|
||||
++ stdenv.lib.optional enableFB "--with-fb"
|
||||
++ stdenv.lib.optional enableDirectFB "--with-directfb";
|
||||
|
||||
crossAttrs = {
|
||||
preConfigure = ''
|
||||
export CC=$crossConfig-gcc
|
||||
'';
|
||||
};
|
||||
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["doConfigure" "doMakeInstall"];
|
||||
|
||||
meta = {
|
||||
homepage = http://links.twibright.com/;
|
||||
description = "A small browser with some graphics support";
|
||||
maintainers = [
|
||||
a.lib.maintainers.raskin
|
||||
];
|
||||
platforms = with a.lib.platforms;
|
||||
linux;
|
||||
maintainers = with stdenv.lib.maintainers; [ raskin urkud viric ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
@ -1,9 +0,0 @@
|
||||
rec {
|
||||
version="2.2";
|
||||
name="links2-2.2";
|
||||
hash="188y37rw4s9brl55ncc12q1b45w0caxcnsq1gqyby9byw1sawnq9";
|
||||
url="http://links.twibright.com/download/links-${version}.tar.gz";
|
||||
advertisedUrl="http://links.twibright.com/download/links-2.2.tar.gz";
|
||||
|
||||
|
||||
}
|
@ -1,4 +0,0 @@
|
||||
{
|
||||
downloadPage = "http://links.twibright.com/download.php";
|
||||
baseName = "links2";
|
||||
}
|
@ -1,41 +0,0 @@
|
||||
{ stdenv, fetchurl, libpng, libjpeg, bzip2, zlib, libtiff, gpm, openssl, pkgconfig, directfb
|
||||
, enableX11 ? true, libX11, libXau, xproto, libXt }:
|
||||
|
||||
let
|
||||
version="2.2";
|
||||
name="links2-2.2";
|
||||
hash="188y37rw4s9brl55ncc12q1b45w0caxcnsq1gqyby9byw1sawnq9";
|
||||
url="http://links.twibright.com/download/links-${version}.tar.gz";
|
||||
advertisedUrl="http://links.twibright.com/download/links-2.2.tar.gz";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
inherit url;
|
||||
sha256 = hash;
|
||||
};
|
||||
|
||||
buildInputs = [ libpng libjpeg bzip2 zlib libtiff gpm openssl pkgconfig directfb ]
|
||||
++ stdenv.lib.optionals enableX11 [ libX11 libXau xproto libXt ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-graphics"
|
||||
"--with-ssl"
|
||||
"--with-fb"
|
||||
] ++ stdenv.lib.optional enableX11 "--with-x";
|
||||
|
||||
crossAttrs = {
|
||||
preConfigure = ''
|
||||
export CC=$crossConfig-gcc
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A small browser with some graphics support";
|
||||
maintainers = [
|
||||
stdenv.lib.maintainers.viric
|
||||
];
|
||||
};
|
||||
}
|
@ -1,17 +1,15 @@
|
||||
{ stdenv, fetchurl, openssl, curl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "esniper-2.26.0";
|
||||
name = "esniper-2.27.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/esniper/esniper-2-26-0.tgz";
|
||||
sha256 = "5fd9a0f4b27b98deca303cd3d16c1ed060e05a165a40b2f4a9f8546db5e3877d";
|
||||
url = "mirror://sourceforge/esniper/esniper-2-27-0.tgz";
|
||||
sha256 = "0ca9946395be8958d3eb28c9abc4a1a4d4c9134e4b6b3c3816f4631e3be25c02";
|
||||
};
|
||||
|
||||
buildInputs = [openssl curl];
|
||||
|
||||
patches = [ ./fix-build-with-latest-curl.patch ];
|
||||
|
||||
postInstall = ''
|
||||
sed -e "2i export PATH=\"$out/bin:\$PATH\"" <"frontends/snipe" >"$out/bin/snipe"
|
||||
chmod 555 "$out/bin/snipe"
|
||||
|
@ -1,10 +0,0 @@
|
||||
--- esniper-2-26-0/http.c 2011-08-09 21:05:59.000000000 +0200
|
||||
+++ esniper/http.c 2011-08-10 00:24:43.000000000 +0200
|
||||
@@ -28,7 +28,6 @@
|
||||
#include "esniper.h"
|
||||
#include <ctype.h>
|
||||
#include <curl/curl.h>
|
||||
-#include <curl/types.h>
|
||||
#include <curl/easy.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
pname = "rdesktop";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
|
||||
sha256 = "0x2hnzvm0smnanin28n4mvzx9chpj2qnjfrxy307x21mgw6l5q1v";
|
||||
sha256 = "0yc4xz95w40m8ailpjgqp9h7bkc758vp0dlq4nj1pvr3xfnl7sni";
|
||||
};
|
||||
|
||||
buildInputs = [openssl libX11];
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, alsaLib, libXv, libXi, libXrender, libXrandr, zlib, glib
|
||||
, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig
|
||||
, pulseaudio }:
|
||||
, pulseaudio, usePulseAudio, lib }:
|
||||
|
||||
assert stdenv.system == "i686-linux";
|
||||
|
||||
@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "157ba3ci12bq0nv2m8wlsab45ib5sccqagyna8nixnhqw9q72sxm";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
buildInputs =
|
||||
lib.optional usePulseAudio pulseaudio ++ [
|
||||
alsaLib
|
||||
pulseaudio
|
||||
stdenv.glibc
|
||||
stdenv.gcc.gcc
|
||||
libXv
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hledger-interest";
|
||||
version = "1.3";
|
||||
sha256 = "1sgnl3vv38cmgxv3xag3c78j1955xxwdmr5xr3f8rc78np6d0wnz";
|
||||
version = "1.4";
|
||||
sha256 = "0lm4jcxcig3yxzhbnka1q54fvshn5b9d91a5a2mbmkzbwhzjj0lg";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [ hledgerLib mtl time ];
|
||||
|
@ -9,11 +9,11 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "hol_light-20120109";
|
||||
name = "hol_light-20120129";
|
||||
src = fetchsvn {
|
||||
url = http://hol-light.googlecode.com/svn/trunk;
|
||||
rev = "118";
|
||||
sha256 = "97e72dad731338328c031421512c26d440a989ea083f3ae34820eb8413aff495";
|
||||
rev = "122";
|
||||
sha256 = "d837ba5fe941af9595540691ba4be34e58174ba9a9c7e1ce57620e5cd4385769";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib camlp5 ];
|
||||
|
@ -166,5 +166,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://mplayerhq.hu";
|
||||
license = "GPL";
|
||||
maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.urkud ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
@ -1,5 +1,6 @@
|
||||
{ stdenv, fetchurl, alsaLib, boost, cmake, gtkmm, libXau, libXdmcp,
|
||||
libXv, libav, pixman, libpthreadstubs, pkgconfig }:
|
||||
{ stdenv, fetchurl, alsaLib, boost, cmake, gtkmm, libXau, libXdmcp
|
||||
, libXv, libav, pixman, libpthreadstubs, pkgconfig
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dvswitch-${version}";
|
||||
@ -15,13 +16,12 @@ stdenv.mkDerivation rec {
|
||||
libpthreadstubs pixman pkgconfig
|
||||
];
|
||||
|
||||
installPhase = "
|
||||
mkdir -p $out
|
||||
cp src/dv* $out/
|
||||
";
|
||||
patchPhase = ''
|
||||
sed -e "s@prefix /usr/local@prefix $out@" -i CMakeLists.txt
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "digital video mixer intended for interactive live mixing of several incoming DV video streams";
|
||||
description = "interactive live video mixer for DV streams";
|
||||
homepage = "http://dvswitch.alioth.debian.org";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
|
@ -1,29 +1,35 @@
|
||||
{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, imlib
|
||||
, xlibs, automake, pkgconfig, gtk }:
|
||||
{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, freetype
|
||||
, fontconfig, xlibs, automake, pkgconfig, gdk_pixbuf }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "icewm-1.3.6";
|
||||
name = "icewm-1.3.7";
|
||||
|
||||
buildInputs =
|
||||
[ gettext libjpeg libtiff libungif libpng imlib
|
||||
[ gettext libjpeg libtiff libungif libpng
|
||||
xlibs.libX11 xlibs.libXft xlibs.libXext xlibs.libXinerama xlibs.libXrandr
|
||||
pkgconfig gtk
|
||||
xlibs.libICE xlibs.libSM freetype fontconfig
|
||||
pkgconfig gdk_pixbuf
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/icewm/${name}.tar.gz";
|
||||
sha256 = "1pr7rc10rddwvy4ncng4mf5fpxd1nqjsw34xba9ngsg32rg57b91";
|
||||
sha256 = "0yw813d8amrl0n1fvdiyznxah92wcylj9kj1qhjc6h73d827h6na";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = "-lfontconfig";
|
||||
|
||||
# The fuloong2f is not supported by 1.3.6 still
|
||||
#
|
||||
# Don't know whether 1.3.7 supports fuloong2f and don't know how to test it
|
||||
# on x86_64 hardware. So I left this 'cp' -- urkud
|
||||
|
||||
preConfigure = ''
|
||||
cp ${automake}/share/automake*/config.{sub,guess} .
|
||||
cp -v ${automake}/share/automake*/config.{sub,guess} .
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A window manager for the X Window System";
|
||||
homepage = http://www.icewm.org/;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
34
pkgs/build-support/make-startupitem/default.nix
Normal file
34
pkgs/build-support/make-startupitem/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
# given a pakcage with a $name.desktop file, makes a copy
|
||||
# as autostart item.
|
||||
|
||||
{stdenv, lib}:
|
||||
{ name # name of the desktop file (without .desktop)
|
||||
, package # package where the desktop file resides in
|
||||
, after ? null
|
||||
, condition ? null
|
||||
, phase ? "2"
|
||||
}:
|
||||
|
||||
# the builder requires that
|
||||
# $package/share/applications/$name.desktop
|
||||
# exists as file.
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "autostart-${name}";
|
||||
priority = 5;
|
||||
|
||||
buildCommand = ''
|
||||
ensureDir $out/share/autostart
|
||||
target=${name}.desktop
|
||||
cp ${package}/share/applications/${name}.desktop $target
|
||||
chmod +rw $target
|
||||
echo "X-KDE-autostart-phase=${phase}" >> $target
|
||||
${lib.optionalString (after != null) ''echo "${after}" >> $target''}
|
||||
${lib.optionalString (condition != null) ''echo "${condition}" >> $target''}
|
||||
cp $target $out/share/autostart
|
||||
'';
|
||||
|
||||
# this will automatically put 'package' in the environment when you
|
||||
# put its startup item in there.
|
||||
propagatedBuildInputs = [ package ];
|
||||
}
|
@ -76,8 +76,9 @@ for (my $i = 0; $i < scalar(@packagesFiles); $i++) {
|
||||
my $earlierPkg = $pkgs{$pkg->{name}};
|
||||
print STDERR "WARNING: duplicate occurrence of package $pkg->{name}\n";
|
||||
# <version epoch="0" ver="1.28.0" rel="2.el6"/>
|
||||
if (rpmvercmp($pkg->{'version'}->{ver}, $earlierPkg->{'version'}->{ver}) >= 0) {
|
||||
print STDERR "WARNING: replaced package $pkg->{name} with newer one\n";
|
||||
my $cmp = rpmvercmp($pkg->{'version'}->{ver}, $earlierPkg->{'version'}->{ver});
|
||||
if ($cmp > 0 || ($cmp == 0 && rpmvercmp($pkg->{'version'}->{rel}, $earlierPkg->{'version'}->{rel})>0)) {
|
||||
print STDERR "WARNING: replaced package $pkg->{name} (".$earlierPkg->{'version'}->{ver}." ".$earlierPkg->{'version'}->{rel}.") with newer one (".$pkg->{'version'}->{ver}." ".$pkg->{'version'}->{rel}.")\n";
|
||||
$pkg->{urlPrefix} = $urlPrefixes[$i];
|
||||
$pkgs{$pkg->{name}} = $pkg;
|
||||
}
|
||||
|
44
pkgs/development/compilers/ghc/7.4.1.nix
Normal file
44
pkgs/development/compilers/ghc/7.4.1.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "7.4.1";
|
||||
name = "ghc-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
|
||||
sha256 = "0ycscsagyy9n796a59q6761s6ar50d8inibvnrcp96siksj0j73j";
|
||||
};
|
||||
|
||||
buildInputs = [ghc perl gmp ncurses] ++
|
||||
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
|
||||
|
||||
buildMK = ''
|
||||
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
|
||||
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
echo "${buildMK}" > mk/build.mk
|
||||
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
|
||||
'';
|
||||
|
||||
configureFlags=[
|
||||
"--with-gcc=${stdenv.gcc}/bin/gcc"
|
||||
];
|
||||
|
||||
# required, because otherwise all symbols from HSffi.o are stripped, and
|
||||
# that in turn causes GHCi to abort
|
||||
stripDebugFlags=["-S" "--keep-file-symbols"];
|
||||
|
||||
meta = {
|
||||
homepage = "http://haskell.org/ghc";
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
maintainers = [
|
||||
stdenv.lib.maintainers.marcweber
|
||||
stdenv.lib.maintainers.andres
|
||||
stdenv.lib.maintainers.simons
|
||||
];
|
||||
platforms = ghc.meta.platforms;
|
||||
};
|
||||
|
||||
}
|
@ -1,13 +1,13 @@
|
||||
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "7.4.0.20111219";
|
||||
version = "7.4.0.20120126";
|
||||
|
||||
name = "ghc-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://haskell.org/ghc/dist/7.4.1-rc1/${name}-src.tar.bz2";
|
||||
sha256 = "11imfag07wr9s5vf12yh6bz4hjfbw20i1c7n8py9fa4vx7va676n";
|
||||
url = "http://haskell.org/ghc/dist/7.4.1-rc2/${name}-src.tar.bz2";
|
||||
sha256 = "0arnvzhwjzk2z3m2891b4z13p4v1c84f31jgyj13a1fbfpylgs64";
|
||||
};
|
||||
|
||||
buildInputs = [ghc perl gmp ncurses] ++
|
||||
|
@ -3,8 +3,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "idris";
|
||||
version = "0.9.0";
|
||||
sha256 = "03zbdcl3v90zv0ibzq9fa8z2qrrdsilh5m509mczwrcmlzbzsmrl";
|
||||
version = "0.9.1";
|
||||
sha256 = "1yvw15750mqrvq1kd7bsk3ldq3s0z947c4f93pv7008gq5im4cvr";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [ binary epic haskeline mtl parsec transformers ];
|
||||
@ -12,7 +12,7 @@ cabal.mkDerivation (self: {
|
||||
noHaddock = true;
|
||||
meta = {
|
||||
homepage = "http://www.idris-lang.org/";
|
||||
description = "Dependently Typed Functional Programming Language";
|
||||
description = "Functional Programming Language with Dependent Types";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
|
@ -3,7 +3,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
revision = "2399";
|
||||
revision = "2426";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "uhc-svn-${revision}";
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
||||
src = fetchsvn {
|
||||
url = "https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC";
|
||||
rev = revision;
|
||||
sha256 = "f4e87dbf95f90b021994b0840f27e042dd4e785df7efedcf567f3e2c7ce32621";
|
||||
sha256 = "06963edb673697f3eac357eccdc6d4bf7fbe7b9b92a96e3e329a4caf53f85c4c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [mtl network binary fgl syb];
|
||||
|
@ -7,11 +7,11 @@
|
||||
else stdenv.mkDerivation)
|
||||
|
||||
rec {
|
||||
name = "guile-2.0.3";
|
||||
name = "guile-2.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/guile/${name}.tar.xz";
|
||||
sha256 = "14rhlpxxa4v5y3gl992l7lnd5qnqawx0a84idnwq0w2qviwcvsyj";
|
||||
sha256 = "1lycm10x316jzlv1nyag7x9gisn4d3dz8jcmbi6lbdn0z6a9skc2";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ makeWrapper gawk pkgconfig ];
|
||||
|
@ -4,12 +4,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "racket";
|
||||
version = "5.2";
|
||||
version = "5.2.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz";
|
||||
sha256 = "1viz2hq1q1wyw9jmnssg5sbgglh05fwqkhyhfbak9lb6nfbhlg5w";
|
||||
sha256 = "1v5kvp7vfi4a4bn08jlaga441amlfxpjw9dm6vc1fazwzd72m539";
|
||||
};
|
||||
|
||||
# Various racket executables do run-time searches for these.
|
||||
|
@ -3,24 +3,28 @@
|
||||
g: # Get dependencies from patched gems
|
||||
{
|
||||
aliases = {
|
||||
actionmailer = g.actionmailer_3_2_0;
|
||||
actionpack = g.actionpack_3_2_0;
|
||||
activemodel = g.activemodel_3_2_0;
|
||||
activerecord = g.activerecord_3_2_0;
|
||||
activeresource = g.activeresource_3_2_0;
|
||||
activesupport = g.activesupport_3_2_0;
|
||||
ZenTest = g.ZenTest_4_5_0;
|
||||
actionmailer = g.actionmailer_3_2_1;
|
||||
actionpack = g.actionpack_3_2_1;
|
||||
activemodel = g.activemodel_3_2_1;
|
||||
activerecord = g.activerecord_3_2_1;
|
||||
activeresource = g.activeresource_3_2_1;
|
||||
activesupport = g.activesupport_3_2_1;
|
||||
arel = g.arel_3_0_0;
|
||||
atoulme_Antwrap = g.atoulme_Antwrap_0_7_1;
|
||||
autotest_rails = g.autotest_rails_4_1_1;
|
||||
builder = g.builder_3_0_0;
|
||||
buildr = g.buildr_1_4_6;
|
||||
bundler = g.bundler_1_0_21;
|
||||
childprocess = g.childprocess_0_3_0;
|
||||
diff_lcs = g.diff_lcs_1_1_3;
|
||||
erubis = g.erubis_2_7_0;
|
||||
ffi = g.ffi_1_0_11;
|
||||
highline = g.highline_1_5_1;
|
||||
hike = g.hike_1_2_1;
|
||||
hoe = g.hoe_2_3_3;
|
||||
i18n = g.i18n_0_6_0;
|
||||
journey = g.journey_1_0_0;
|
||||
journey = g.journey_1_0_1;
|
||||
json = g.json_1_6_5;
|
||||
json_pure = g.json_pure_1_6_5;
|
||||
mail = g.mail_2_4_1;
|
||||
@ -35,19 +39,20 @@ g: # Get dependencies from patched gems
|
||||
rack_cache = g.rack_cache_1_1;
|
||||
rack_ssl = g.rack_ssl_1_3_2;
|
||||
rack_test = g.rack_test_0_6_1;
|
||||
rails = g.rails_3_2_0;
|
||||
railties = g.railties_3_2_0;
|
||||
rails = g.rails_3_2_1;
|
||||
railties = g.railties_3_2_1;
|
||||
rake = g.rake_0_9_2_2;
|
||||
rb_fsevent = g.rb_fsevent_0_4_3_1;
|
||||
rb_fsevent = g.rb_fsevent_0_9_0;
|
||||
rdoc = g.rdoc_3_12;
|
||||
rjb = g.rjb_1_3_8;
|
||||
rjb = g.rjb_1_3_9;
|
||||
rspec = g.rspec_2_1_0;
|
||||
rspec_core = g.rspec_core_2_1_0;
|
||||
rspec_expectations = g.rspec_expectations_2_1_0;
|
||||
rspec_mocks = g.rspec_mocks_2_1_0;
|
||||
rubyforge = g.rubyforge_2_0_4;
|
||||
rubyzip = g.rubyzip_0_9_4;
|
||||
sass = g.sass_3_1_12;
|
||||
rubyzip = g.rubyzip_0_9_5;
|
||||
sass = g.sass_3_1_13;
|
||||
selenium_webdriver = g.selenium_webdriver_2_18_0;
|
||||
sprockets = g.sprockets_2_1_2;
|
||||
thor = g.thor_0_14_6;
|
||||
tilt = g.tilt_1_3_3;
|
||||
@ -55,73 +60,101 @@ g: # Get dependencies from patched gems
|
||||
tzinfo = g.tzinfo_0_3_31;
|
||||
xml_simple = g.xml_simple_1_0_12;
|
||||
};
|
||||
gem_nix_args = [ ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ];
|
||||
gem_nix_args = [ ''autotest-rails'' ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ];
|
||||
gems = {
|
||||
actionmailer_3_2_0 = {
|
||||
ZenTest_4_5_0 = {
|
||||
basename = ''ZenTest'';
|
||||
meta = {
|
||||
description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby'';
|
||||
homepage = ''http://www.zenspider.com/ZSS/Products/ZenTest/'';
|
||||
longDescription = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and
|
||||
multiruby.
|
||||
|
||||
ZenTest scans your target and unit-test code and writes your missing
|
||||
code based on simple naming rules, enabling XP at a much quicker
|
||||
pace. ZenTest only works with Ruby and Test::Unit. Nobody uses this
|
||||
tool anymore but it is the package namesake, so it stays.
|
||||
|
||||
unit_diff is a command-line filter to diff expected results from
|
||||
actual results and allow you to quickly see exactly what is wrong.
|
||||
|
||||
autotest is a continous testing facility meant to be used during
|
||||
development. As soon as you save a file, autotest will run the
|
||||
corresponding dependent tests.
|
||||
|
||||
multiruby runs anything you want on multiple versions of ruby. Great
|
||||
for compatibility checking! Use multiruby_setup to manage your
|
||||
installed versions.'';
|
||||
};
|
||||
name = ''ZenTest-4.5.0'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''05iam95wqafz4c890b17w7ahp9i4jbz4hsw6304p9zbsaq7d7h1h'';
|
||||
};
|
||||
actionmailer_3_2_1 = {
|
||||
basename = ''actionmailer'';
|
||||
meta = {
|
||||
description = ''Email composition, delivery, and receiving framework (part of Rails).'';
|
||||
homepage = ''http://www.rubyonrails.org'';
|
||||
longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'';
|
||||
};
|
||||
name = ''actionmailer-3.2.0'';
|
||||
name = ''actionmailer-3.2.1'';
|
||||
requiredGems = [ g.mail_2_4_1 ];
|
||||
sha256 = ''0fhvdbxw93y00awz4xfkyzn78zfca210zwqx7xvaizipaq5rs8d6'';
|
||||
sha256 = ''02xxyz3r3cfhiynx73y2ybabdhf9x9vxfqj215p8477w6cm2sh47'';
|
||||
};
|
||||
actionpack_3_2_0 = {
|
||||
actionpack_3_2_1 = {
|
||||
basename = ''actionpack'';
|
||||
meta = {
|
||||
description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).'';
|
||||
homepage = ''http://www.rubyonrails.org'';
|
||||
longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'';
|
||||
};
|
||||
name = ''actionpack-3.2.0'';
|
||||
requiredGems = [ g.activemodel_3_2_0 g.rack_cache_1_1 g.rack_test_0_6_1 g.journey_1_0_0 g.sprockets_2_1_2 g.erubis_2_7_0 ];
|
||||
sha256 = ''08fghqa01x6bkcnyik36jaxdd6jp05sh1mnxgqaw4snjwrl5b4ki'';
|
||||
name = ''actionpack-3.2.1'';
|
||||
requiredGems = [ g.activemodel_3_2_1 g.rack_cache_1_1 g.rack_test_0_6_1 g.journey_1_0_1 g.sprockets_2_1_2 g.erubis_2_7_0 ];
|
||||
sha256 = ''0yz5h8c4m1a8590kdsx2akg3jmbrsjf9wbd950lv19c3sm3sahzx'';
|
||||
};
|
||||
activemodel_3_2_0 = {
|
||||
activemodel_3_2_1 = {
|
||||
basename = ''activemodel'';
|
||||
meta = {
|
||||
description = ''A toolkit for building modeling frameworks (part of Rails).'';
|
||||
homepage = ''http://www.rubyonrails.org'';
|
||||
longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'';
|
||||
};
|
||||
name = ''activemodel-3.2.0'';
|
||||
name = ''activemodel-3.2.1'';
|
||||
requiredGems = [ g.builder_3_0_0 ];
|
||||
sha256 = ''1785g6b1daqncgsyc1kjwhxypx6xk9m3pw5vhipfv2bvygan3y9z'';
|
||||
sha256 = ''1m639mdhkjwxw7szl3r7ay4s8yjwbh2sfjyv2d4wrkiq4wpz694m'';
|
||||
};
|
||||
activerecord_3_2_0 = {
|
||||
activerecord_3_2_1 = {
|
||||
basename = ''activerecord'';
|
||||
meta = {
|
||||
description = ''Object-relational mapper framework (part of Rails).'';
|
||||
homepage = ''http://www.rubyonrails.org'';
|
||||
longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
|
||||
};
|
||||
name = ''activerecord-3.2.0'';
|
||||
name = ''activerecord-3.2.1'';
|
||||
requiredGems = [ g.arel_3_0_0 g.tzinfo_0_3_31 ];
|
||||
sha256 = ''065yyv3y1wkzm3ykdxd43hmz3q4gadc9qb3psjydqalgii0dr1ww'';
|
||||
sha256 = ''0xch76nqfgyx750z89lsxkvgshci1y49f4h7xmgiq9nmr4gfxxmv'';
|
||||
};
|
||||
activeresource_3_2_0 = {
|
||||
activeresource_3_2_1 = {
|
||||
basename = ''activeresource'';
|
||||
meta = {
|
||||
description = ''REST modeling framework (part of Rails).'';
|
||||
homepage = ''http://www.rubyonrails.org'';
|
||||
longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.'';
|
||||
};
|
||||
name = ''activeresource-3.2.0'';
|
||||
name = ''activeresource-3.2.1'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''0lklbgmf1in8cm3w1xl9nxc5yjr9a884fjslyjca42kc7j90mbr7'';
|
||||
sha256 = ''0fvsi8kikmp287dym3s4y1np9s0sxm0q65kx0idgsp9bi89wpl0d'';
|
||||
};
|
||||
activesupport_3_2_0 = {
|
||||
activesupport_3_2_1 = {
|
||||
basename = ''activesupport'';
|
||||
meta = {
|
||||
description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.'';
|
||||
homepage = ''http://www.rubyonrails.org'';
|
||||
longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
|
||||
};
|
||||
name = ''activesupport-3.2.0'';
|
||||
name = ''activesupport-3.2.1'';
|
||||
requiredGems = [ g.i18n_0_6_0 g.multi_json_1_0_4 ];
|
||||
sha256 = ''07x0jl4fnjgiblffbwmjnqzly765l55y9zmyad8divcaa1qjqwmb'';
|
||||
sha256 = ''0ajkzsa7467jp7lxgjcsl94nqkvw9d0h492rypljs0f8f1fn744v'';
|
||||
};
|
||||
arel_3_0_0 = {
|
||||
basename = ''arel'';
|
||||
@ -160,9 +193,21 @@ database compatibility and query generation.'';
|
||||
check out Buildr!'';
|
||||
};
|
||||
name = ''atoulme-Antwrap-0.7.1'';
|
||||
requiredGems = [ g.rjb_1_3_8 ];
|
||||
requiredGems = [ g.rjb_1_3_9 ];
|
||||
sha256 = ''0r9jy2asyma8h0878nhjfbi00qvb4yapc8glngvmkkj21zbx2mfy'';
|
||||
};
|
||||
autotest_rails_4_1_1 = {
|
||||
basename = ''autotest_rails'';
|
||||
meta = {
|
||||
description = ''This is an autotest plugin to provide rails support'';
|
||||
homepage = ''https://github.com/seattlerb/autotest-rails'';
|
||||
longDescription = ''This is an autotest plugin to provide rails support. It provides basic
|
||||
rails support and extra plugins for migrations and fixtures.'';
|
||||
};
|
||||
name = ''autotest-rails-4.1.1'';
|
||||
requiredGems = [ g.ZenTest_4_5_0 ];
|
||||
sha256 = ''09i6mpxibs8yfdcr53nazlxq94yswahz9gdjqdz9srfshcccqbal'';
|
||||
};
|
||||
builder_2_1_2 = {
|
||||
basename = ''builder'';
|
||||
meta = {
|
||||
@ -217,6 +262,17 @@ for those one-off tasks, with a language that's a joy to use.
|
||||
requiredGems = [ ];
|
||||
sha256 = ''0lcxz75vvgqib43wxzv6021qs5d7bxhnds4j4q27hzqs982cn0s6'';
|
||||
};
|
||||
childprocess_0_3_0 = {
|
||||
basename = ''childprocess'';
|
||||
meta = {
|
||||
description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
|
||||
homepage = ''http://github.com/jarib/childprocess'';
|
||||
longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
|
||||
};
|
||||
name = ''childprocess-0.3.0'';
|
||||
requiredGems = [ g.ffi_1_0_11 ];
|
||||
sha256 = ''1bvx6nkc1m24wjjybk943x1vjr51c98l0pwj73hj1r237307jyb4'';
|
||||
};
|
||||
diff_lcs_1_1_2 = {
|
||||
basename = ''diff_lcs'';
|
||||
meta = {
|
||||
@ -276,6 +332,21 @@ is the MIT license.'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3'';
|
||||
};
|
||||
ffi_1_0_11 = {
|
||||
basename = ''ffi'';
|
||||
meta = {
|
||||
description = ''Ruby-FFI is a ruby extension for programmatically loading dynamic libraries, binding functions within them, and calling those functions from Ruby code'';
|
||||
homepage = ''http://wiki.github.com/ffi/ffi'';
|
||||
longDescription = ''Ruby-FFI is a ruby extension for programmatically loading dynamic
|
||||
libraries, binding functions within them, and calling those functions
|
||||
from Ruby code. Moreover, a Ruby-FFI extension works without changes
|
||||
on Ruby and JRuby. Discover why should you write your next extension
|
||||
using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].'';
|
||||
};
|
||||
name = ''ffi-1.0.11'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''177v6bwslyb7n961nw11i8x9j43k796s11bs98kynl58n0a3n99b'';
|
||||
};
|
||||
highline_1_5_1 = {
|
||||
basename = ''highline'';
|
||||
meta = {
|
||||
@ -339,16 +410,16 @@ See class rdoc for help. Hint: ri Hoe'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0'';
|
||||
};
|
||||
journey_1_0_0 = {
|
||||
journey_1_0_1 = {
|
||||
basename = ''journey'';
|
||||
meta = {
|
||||
description = ''Journey is a router'';
|
||||
homepage = ''http://github.com/tenderlove/journey'';
|
||||
longDescription = ''Journey is a router. It routes requests.'';
|
||||
};
|
||||
name = ''journey-1.0.0'';
|
||||
name = ''journey-1.0.1'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''0xphcsxksy0m78j1mphzp0lyj7bgrabdnlgs18lrkwivs0gryhdd'';
|
||||
sha256 = ''1fccxnc9ji6j2p1avfph701b0lf2rzsksyipfavhv8kjwlzvsglx'';
|
||||
};
|
||||
json_1_6_5 = {
|
||||
basename = ''json'';
|
||||
@ -554,27 +625,27 @@ request helpers feature.'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''0hq5q8fjhbb7szzrj7k0l21z025c4qsxqzd5qmgivikhymw10ws0'';
|
||||
};
|
||||
rails_3_2_0 = {
|
||||
rails_3_2_1 = {
|
||||
basename = ''rails'';
|
||||
meta = {
|
||||
description = ''Full-stack web application framework.'';
|
||||
homepage = ''http://www.rubyonrails.org'';
|
||||
longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
|
||||
};
|
||||
name = ''rails-3.2.0'';
|
||||
requiredGems = [ g.activesupport_3_2_0 g.actionpack_3_2_0 g.activerecord_3_2_0 g.activeresource_3_2_0 g.actionmailer_3_2_0 g.railties_3_2_0 g.bundler_1_0_21 ];
|
||||
sha256 = ''10jc4ri60ivd5z54k0i4l1pdqbmswwhh05ydca7axpd9d1ss1jzh'';
|
||||
name = ''rails-3.2.1'';
|
||||
requiredGems = [ g.activesupport_3_2_1 g.actionpack_3_2_1 g.activerecord_3_2_1 g.activeresource_3_2_1 g.actionmailer_3_2_1 g.railties_3_2_1 g.bundler_1_0_21 ];
|
||||
sha256 = ''0fx5pmywvh0s263dd6qv34rbc4qxnla5qzh8r30zrip24j6w0nr5'';
|
||||
};
|
||||
railties_3_2_0 = {
|
||||
railties_3_2_1 = {
|
||||
basename = ''railties'';
|
||||
meta = {
|
||||
description = ''Tools for creating, working with, and running Rails applications.'';
|
||||
homepage = ''http://www.rubyonrails.org'';
|
||||
longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
|
||||
};
|
||||
name = ''railties-3.2.0'';
|
||||
name = ''railties-3.2.1'';
|
||||
requiredGems = [ g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_12 ];
|
||||
sha256 = ''0zwdjj6kfgpslqywyhc171pfp9zc26hs4z0fx0hysyvvc961qhb3'';
|
||||
sha256 = ''13ya1jryzz8s1j1vh1qw44y282vjjk72nf3a6dzsna9z8yx4278h'';
|
||||
};
|
||||
rake_0_8_7 = {
|
||||
basename = ''rake'';
|
||||
@ -598,16 +669,16 @@ request helpers feature.'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''19n4qp5gzbcqy9ajh56kgwqv9p9w2hnczhyvaqz0nlvk9diyng6q'';
|
||||
};
|
||||
rb_fsevent_0_4_3_1 = {
|
||||
rb_fsevent_0_9_0 = {
|
||||
basename = ''rb_fsevent'';
|
||||
meta = {
|
||||
description = ''Very simple & usable FSEvents API'';
|
||||
homepage = ''http://rubygems.org/gems/rb-fsevent'';
|
||||
longDescription = ''FSEvents API with Signals catching (without RubyCocoa)'';
|
||||
};
|
||||
name = ''rb-fsevent-0.4.3.1'';
|
||||
name = ''rb-fsevent-0.9.0'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''043w4695j7f9n0hawy9y0yci36linivsbp23v52v2qg64ji7hsiw'';
|
||||
sha256 = ''1sk7y6bxq8p4vh2cv4zk320xlxrbs15n2knyyvdd1bj89wmmiryy'';
|
||||
};
|
||||
rdoc_3_12 = {
|
||||
basename = ''rdoc'';
|
||||
@ -636,7 +707,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''0jhj1y84yzdr11li784m255jvc191vs8d3zck21rfqv4z4zpifz6'';
|
||||
};
|
||||
rjb_1_3_8 = {
|
||||
rjb_1_3_9 = {
|
||||
basename = ''rjb'';
|
||||
meta = {
|
||||
description = ''Ruby Java bridge'';
|
||||
@ -644,9 +715,9 @@ See RDoc for a description of RDoc's markup and basic use.'';
|
||||
longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
|
||||
'';
|
||||
};
|
||||
name = ''rjb-1.3.8'';
|
||||
name = ''rjb-1.3.9'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''0cwc3zh9ydwzvc176vjin7jpf8riisyjdwbywrmvc426kjyrrwwr'';
|
||||
sha256 = ''0iimwg22jacbidc43lngqndbnvgv4f9zppxzy008gi88pqgargsd'';
|
||||
};
|
||||
rspec_2_1_0 = {
|
||||
basename = ''rspec'';
|
||||
@ -738,7 +809,17 @@ See RDoc for a description of RDoc's markup and basic use.'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''1lc67ssqyz49rm1jms5sdvy6x41h070razxlmvj4j5q6w3qixx41'';
|
||||
};
|
||||
sass_3_1_12 = {
|
||||
rubyzip_0_9_5 = {
|
||||
basename = ''rubyzip'';
|
||||
meta = {
|
||||
description = ''rubyzip is a ruby module for reading and writing zip files'';
|
||||
homepage = ''http://github.com/aussiegeek/rubyzip'';
|
||||
};
|
||||
name = ''rubyzip-0.9.5'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''1744bds6lc46d1kjfgapf34p2574s70hcyz63877qkry4db2jb54'';
|
||||
};
|
||||
sass_3_1_13 = {
|
||||
basename = ''sass'';
|
||||
meta = {
|
||||
description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
|
||||
@ -749,9 +830,20 @@ See RDoc for a description of RDoc's markup and basic use.'';
|
||||
command line tool or a web-framework plugin.
|
||||
'';
|
||||
};
|
||||
name = ''sass-3.1.12'';
|
||||
name = ''sass-3.1.13'';
|
||||
requiredGems = [ ];
|
||||
sha256 = ''10n2aic53290xsa3y3d63523s8xc78w5q5gqpns6cbljkdwb0ndy'';
|
||||
sha256 = ''0x07yckw9c4d59713midk2n85d3h88fcp147p8nai88gbvrm8b63'';
|
||||
};
|
||||
selenium_webdriver_2_18_0 = {
|
||||
basename = ''selenium_webdriver'';
|
||||
meta = {
|
||||
description = ''The next generation developer focused tool for automated testing of webapps'';
|
||||
homepage = ''http://selenium.googlecode.com'';
|
||||
longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
|
||||
};
|
||||
name = ''selenium-webdriver-2.18.0'';
|
||||
requiredGems = [ g.rubyzip_0_9_5 g.childprocess_0_3_0 ];
|
||||
sha256 = ''17am2b6bjv62s02n1bfmhg9wz5n7sppzh7dx1llp28ivj2hdfbg9'';
|
||||
};
|
||||
sprockets_2_1_2 = {
|
||||
basename = ''sprockets'';
|
||||
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.ruby-lang.org/pub/ruby/1.8/${name}.tar.gz";
|
||||
sha256 = "0qf50wa1ziziagnxarj8z6yrsivrhchq1j9017ff3z2z7d31l9kc";
|
||||
sha256 = "0b4n9d1idmsl47cq3mw6zhi94yp048ljlfgg9qdblbkvnd7arp1g";
|
||||
};
|
||||
|
||||
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
|
||||
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
passthru = rec {
|
||||
majorVersion = "1.8";
|
||||
minorVersion = "7";
|
||||
patchLevel = "330";
|
||||
patchLevel = "357";
|
||||
libPath = "lib/ruby/${majorVersion}";
|
||||
gemPath = "lib/ruby/gems/${majorVersion}";
|
||||
};
|
||||
|
@ -22,6 +22,7 @@ let
|
||||
|
||||
meta = {
|
||||
description = "Aspell dictionary for ${fullName}";
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
};
|
||||
|
||||
|
40
pkgs/development/libraries/cppnetlib/default.nix
Normal file
40
pkgs/development/libraries/cppnetlib/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{stdenv, fetchurl, cmake, openssl, boost}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cpp-netlib-0.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/downloads/cpp-netlib/cpp-netlib/${name}.tar.bz2";
|
||||
sha256 = "0llmiyp9l7byavwdyb7vpks27yfv3g85170bm81paps748bcyb1p";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake boost openssl ];
|
||||
|
||||
/* Tests fail to build ...
|
||||
https://github.com/cpp-netlib/cpp-netlib/issues/85
|
||||
|
||||
Once working, we could do:
|
||||
checkTarget = "test";
|
||||
doCheck = true;
|
||||
*/
|
||||
|
||||
preConfigure = ''
|
||||
sed -i /test/d CMakeLists.txt
|
||||
'';
|
||||
|
||||
/* The build phase just builds examples. That's at least some testing.
|
||||
That's how to install the lib - copy the headers. */
|
||||
installPhase = ''
|
||||
# We are at sourcepath/build
|
||||
mkdir -p $out/include
|
||||
cp -R ../boost $out/include/
|
||||
mkdir -p $out/lib
|
||||
cp -R libs/network/src/*.a $out/lib/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://cpp-netlib.github.com/;
|
||||
description = "Provides application layer network support at boost style";
|
||||
license = "boost";
|
||||
};
|
||||
}
|
@ -18,11 +18,11 @@ assert xvidSupport -> xvidcore != null;
|
||||
assert faacSupport -> faac != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ffmpeg-0.8.1";
|
||||
name = "ffmpeg-0.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
|
||||
sha256 = "0vdq6bmrsi55p1l3dddiwyqsspb3l5dgqb87lysf5cz3sjxcfw2v";
|
||||
sha256 = "1ybzw6d5axr807141izvm2yf4pa0hc1zcywj89nsn3qsdnknlna3";
|
||||
};
|
||||
|
||||
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
|
||||
|
@ -1,12 +0,0 @@
|
||||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "glib-1.2.10";
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz;
|
||||
md5 = "6fe30dad87c77b91b632def29dd69ef9";
|
||||
};
|
||||
# Patch for gcc 3.4 compatibility. Based on
|
||||
# http://cvs.openpkg.org/chngview?cn=16208.
|
||||
patches = [./gcc34.patch];
|
||||
}
|
@ -1,20 +0,0 @@
|
||||
diff -rc glib-orig/glib.h glib-1.2.10/glib.h
|
||||
*** glib-orig/glib.h 2001-02-27 04:44:38.000000000 +0100
|
||||
--- glib-1.2.10/glib.h 2004-09-22 10:22:01.000000000 +0200
|
||||
***************
|
||||
*** 272,278 ****
|
||||
/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
|
||||
* macros, so we can refer to them as strings unconditionally.
|
||||
*/
|
||||
! #ifdef __GNUC__
|
||||
#define G_GNUC_FUNCTION __FUNCTION__
|
||||
#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
|
||||
#else /* !__GNUC__ */
|
||||
--- 272,278 ----
|
||||
/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
|
||||
* macros, so we can refer to them as strings unconditionally.
|
||||
*/
|
||||
! #if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
|
||||
#define G_GNUC_FUNCTION __FUNCTION__
|
||||
#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
|
||||
#else /* !__GNUC__ */
|
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, m4, cxx ? true }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gmp-5.0.2";
|
||||
name = "gmp-5.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gmp/${name}.tar.bz2";
|
||||
sha256 = "0a2ch2kpbzrsf3c1pfc6sph87hk2xmwa6np3sn2rzsflzmvdphnv";
|
||||
sha256 = "dcafe9989c7f332b373e1f766af8e9cd790fc802fdec422a1910a6ef783480e3";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ m4 ];
|
||||
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://gmplib.org/;
|
||||
license = "LGPLv3+";
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
@ -1,12 +0,0 @@
|
||||
{stdenv, fetchurl, x11, glib}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gtk+-1.2.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz;
|
||||
md5 = "4d5cb2fc7fb7830e4af9747a36bfce20";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [x11 glib];
|
||||
}
|
@ -1,13 +1,13 @@
|
||||
{ cabal, cairo, colour, dataAccessor, dataAccessorTemplate, gtk
|
||||
, mtl, time
|
||||
{ cabal, cairo, colour, dataAccessor, dataAccessorTemplate, mtl
|
||||
, time
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "Chart";
|
||||
version = "0.14";
|
||||
sha256 = "0ji81j4c2by5zyrdhx1s17j6kqsi3ngr9y1zh7hr9wv7jsrj3rf2";
|
||||
version = "0.15";
|
||||
sha256 = "1357gqn2ifalknl85n2z9ysf195dnaxm175rp0kmmzbf4vik9gc4";
|
||||
buildDepends = [
|
||||
cairo colour dataAccessor dataAccessorTemplate gtk mtl time
|
||||
cairo colour dataAccessor dataAccessorTemplate mtl time
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.dockerz.net/software/chart.html";
|
||||
|
19
pkgs/development/libraries/haskell/GLFW/default.nix
Normal file
19
pkgs/development/libraries/haskell/GLFW/default.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ cabal, libX11, mesa, OpenGL }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "GLFW";
|
||||
version = "0.5.0.1";
|
||||
sha256 = "1zjxw0fn1am9n4bwqn8jwp14cdgyg1cv5v8rrg2bisggw7wdc4c6";
|
||||
buildDepends = [ OpenGL ];
|
||||
extraLibraries = [ libX11 mesa ];
|
||||
meta = {
|
||||
homepage = "http://haskell.org/haskellwiki/GLFW";
|
||||
description = "A Haskell binding for GLFW";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "GLURaw";
|
||||
version = "1.1.0.1";
|
||||
sha256 = "0n2yazdk98ia9j65n4ac7k0lnyp9cmz51d344x0jsi0xyfckm0mq";
|
||||
version = "1.2.0.0";
|
||||
sha256 = "06dsazj3zadjahwy926gnjngqg8cb1mhdxh8bg5f3axf3hsvxqp1";
|
||||
buildDepends = [ OpenGLRaw ];
|
||||
extraLibraries = [ freeglut mesa ];
|
||||
meta = {
|
||||
|
21
pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix
Normal file
21
pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
|
||||
, OpenGLRaw, StateVar, Tensor
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "GLUT";
|
||||
version = "2.3.0.0";
|
||||
sha256 = "10rh57w3lx8fs0xy24lqilv5a5sgq57kshydja41r6fq9wdvwp99";
|
||||
buildDepends = [ OpenGL OpenGLRaw StateVar Tensor ];
|
||||
extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/haskellwiki/Opengl";
|
||||
description = "A binding for the OpenGL Utility Toolkit";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
|
||||
buildDepends = [
|
||||
bktrees extensibleExceptions fgl graphviz pandoc random text time
|
||||
];
|
||||
patchPhase = ''
|
||||
sed -i Graphalyze.cabal -e 's|pandoc == 1.8.\*|pandoc|'
|
||||
'';
|
||||
meta = {
|
||||
description = "Graph-Theoretic Analysis library";
|
||||
license = "unknown";
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "HaskellForMaths";
|
||||
version = "0.4.1";
|
||||
sha256 = "0jwdxz5wqayx196giv7nj5j0k9zw50x555ig6xj00cladvplvh9h";
|
||||
version = "0.4.3";
|
||||
sha256 = "00s502h3pw9i464qn6cn74ihghcnn5gsar891q276ld682m5vdns";
|
||||
buildDepends = [ random ];
|
||||
meta = {
|
||||
homepage = "http://haskellformaths.blogspot.com/";
|
||||
|
21
pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix
Normal file
21
pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar
|
||||
, Tensor
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "OpenGL";
|
||||
version = "2.5.0.0";
|
||||
sha256 = "1kpakn5i4aka67mqcpfq9jpl38h409x63zd14y35abpm6h3x8m3j";
|
||||
buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ];
|
||||
extraLibraries = [ libX11 mesa ];
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/haskellwiki/Opengl";
|
||||
description = "A binding for the OpenGL graphics system";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "OpenGLRaw";
|
||||
version = "1.1.0.2";
|
||||
sha256 = "0d1rjh2vq0w1pzf3vz0mw6p0w43h3sf6034qsi89m4jkx3125fwf";
|
||||
version = "1.2.0.0";
|
||||
sha256 = "1nwk93wlwh7gz2lb1dc88frmwik71g61a7k8xfiib2q5a8a8kf9r";
|
||||
extraLibraries = [ mesa ];
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/haskellwiki/Opengl";
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "ansi-wl-pprint";
|
||||
version = "0.6.3";
|
||||
sha256 = "1cpkfn1ld0sjysksdsxxwwy1b17s4smmzk8y88y9mb81vgwlalkl";
|
||||
version = "0.6.4";
|
||||
sha256 = "0zrhzkmc5ki6q9ac5l16lhnyf9z2raj78gj9n0a7530rcv4ak3k0";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ ansiTerminal ];
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "binary";
|
||||
version = "0.5.0.2";
|
||||
sha256 = "02qkybh11psmggkqcs7f8kh4izfj44gq1wk23xhv3jbxc7gdxhp0";
|
||||
version = "0.5.1.0";
|
||||
sha256 = "18si0f021447b1kqshar224zyh02gc65z7v82waxcn4igss7gm1a";
|
||||
meta = {
|
||||
homepage = "http://code.haskell.org/binary/";
|
||||
description = "Binary serialisation for Haskell values using lazy ByteStrings";
|
||||
|
17
pkgs/development/libraries/haskell/bitarray/default.nix
Normal file
17
pkgs/development/libraries/haskell/bitarray/default.nix
Normal file
@ -0,0 +1,17 @@
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "bitarray";
|
||||
version = "0.0.1";
|
||||
sha256 = "01ijysisw70zaw70hx851axw48agfamdqj21rzzhdqd2ww6bwchb";
|
||||
meta = {
|
||||
homepage = "http://code.haskell.org/~bkomuves/";
|
||||
description = "Mutable and immutable bit arrays";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "blaze-builder";
|
||||
version = "0.3.0.2";
|
||||
sha256 = "009njfm9g0fs7kg6q9c7qqfl69msw9q3d07xh3xg7layh09khsdb";
|
||||
version = "0.3.1.0";
|
||||
sha256 = "192pqmr6mcjnflqpvp93nycfbdi0ifab8ifvrxvmwbrdkiidvai6";
|
||||
buildDepends = [ text ];
|
||||
meta = {
|
||||
homepage = "http://github.com/meiersi/blaze-builder";
|
||||
|
@ -2,12 +2,12 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "bytestring-lexing";
|
||||
version = "0.2.1";
|
||||
sha256 = "0pibn4phfp346i6i8zwic5zlbq9lqa6ifyx6bdl3p5c8jy3v23r9";
|
||||
version = "0.4.0";
|
||||
sha256 = "1lww38rab9k8drndqkg306kiq6663i89sq6l1bvjv6cs13acc8wr";
|
||||
buildTools = [ alex ];
|
||||
meta = {
|
||||
homepage = "http://code.haskell.org/~dons/code/bytestring-lexing";
|
||||
description = "Parse literals efficiently from bytestrings";
|
||||
homepage = "http://code.haskell.org/~wren/";
|
||||
description = "Parse and produce literals efficiently from strict or lazy bytestrings";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
|
@ -4,6 +4,7 @@ cabal.mkDerivation (self: {
|
||||
pname = "cabal-file-th";
|
||||
version = "0.2.1";
|
||||
sha256 = "0nczwicgf6kx3lk5m7wqf1wj6ghn8jfx112dzh7jh4f4xs66nsd1";
|
||||
patchPhase = "sed -i cabal-file-th.cabal -e 's|Cabal >= 1.10 && < 1.13|Cabal|'";
|
||||
meta = {
|
||||
homepage = "http://github.com/nkpart/cabal-file-th";
|
||||
description = "Template Haskell expressions for reading fields from a project's cabal file";
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "citeproc-hs";
|
||||
version = "0.3.3";
|
||||
sha256 = "0yhzqxrr7jn1h0r2vy1jmlrf0z64qcr2fl37i04rpiwzb3nc16r4";
|
||||
version = "0.3.4";
|
||||
sha256 = "17w6fpmlhbfd8jxxz4s6ybz3dswf0i96fjjbs05ykh4i97rs62nv";
|
||||
buildDepends = [
|
||||
hsBibutils HTTP json mtl network pandocTypes parsec syb time
|
||||
utf8String xml
|
||||
|
@ -4,14 +4,14 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "clientsession";
|
||||
version = "0.7.3.6";
|
||||
sha256 = "04cvws7h2pm3rk8p2yj1pqkf9vjqq65hxg9sjldg7zhxdjgq1hgc";
|
||||
version = "0.7.4";
|
||||
sha256 = "050mg3rzyld4v2b9v1pc1q563sp7sffiapvr8ks8f46ibl17lvss";
|
||||
buildDepends = [
|
||||
base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
|
||||
skein tagged
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/clientsession/tree/master";
|
||||
homepage = "http://github.com/yesodweb/clientsession/tree/master";
|
||||
description = "Securely store session data in a client-side cookie";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cmdargs";
|
||||
version = "0.8";
|
||||
sha256 = "0yhjg6rck1aj8gq07i9dcfxyjffxlr4lxnir2brkyahpfx5iyw9k";
|
||||
version = "0.9.2";
|
||||
sha256 = "1c0xy4g9b5jqy51qhgq7djafqz27z6q7ya31pgy186pfgl7604kr";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ transformers ];
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "conduit";
|
||||
version = "0.0.4";
|
||||
sha256 = "1sc14nh21ba85azm4my5qnllnlbmsq5j6h1yd1mdsk2z3fb0x5zz";
|
||||
version = "0.1.1.1";
|
||||
sha256 = "0gqkk5q329xbw565xd9xc0pz2ha66jkdbbjgwadvrjw1n52vaqg5";
|
||||
buildDepends = [
|
||||
liftedBase monadControl text transformers transformersBase
|
||||
];
|
||||
|
@ -0,0 +1,17 @@
|
||||
{ cabal, deepseq }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "containers-deepseq";
|
||||
version = "0.1.0.1";
|
||||
sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541";
|
||||
buildDepends = [ deepseq ];
|
||||
meta = {
|
||||
description = "Provide orphan NFData instances for containers as needed. (deprecated)";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "crypto-api";
|
||||
version = "0.8";
|
||||
sha256 = "1fwkafb9v2348vr1a4xnlmkgs4kh85az4f3wnrl9cbqwxf3cc328";
|
||||
version = "0.9";
|
||||
sha256 = "11372brnpiqdm6fdfp95wyyl8nvhbagnq0q2bdhn4xsskpnp4hnp";
|
||||
buildDepends = [ cereal entropy largeword tagged ];
|
||||
meta = {
|
||||
homepage = "http://trac.haskell.org/crypto-api/wiki";
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "data-object-yaml";
|
||||
version = "0.3.4.1";
|
||||
sha256 = "04mpa59gyfkqi5s94ps3qhphw4csiasb3lj6kf6rhhmd5yx52dnp";
|
||||
version = "0.3.4.2";
|
||||
sha256 = "18a9r4wfpb7icjb6nji9iy3abq6sxafmsnfwqpnm1nn2nn3fm1ap";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
16
pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix
Normal file
16
pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix
Normal file
@ -0,0 +1,16 @@
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "deepseq";
|
||||
version = "1.3.0.0";
|
||||
sha256 = "0z2k1rda67nmhv62irjfd642iarj1i9m55l6p47j4cysrszhvqgy";
|
||||
meta = {
|
||||
description = "Deep evaluation of data structures";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "email-validate";
|
||||
version = "0.2.7";
|
||||
sha256 = "13zam197ph431f351g8srsxwqchjdwx1c1bizmildsc1zxm2nm3q";
|
||||
version = "0.2.8";
|
||||
sha256 = "04cz1nm1zkb46kdxs43pmkxli2xm5nqlh951nn0mdgy6hqhkpkqd";
|
||||
buildDepends = [ parsec ranges ];
|
||||
meta = {
|
||||
homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct";
|
||||
|
@ -0,0 +1,20 @@
|
||||
{ cabal, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "explicit-exception";
|
||||
version = "0.1.6";
|
||||
sha256 = "0pgdbaav952bwcmbfwg0fgvc15k57rlnw131bs3pnp8rqdbxfv39";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ transformers ];
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/haskellwiki/Exception";
|
||||
description = "Exceptions which are explicit in the type signature";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
@ -0,0 +1,16 @@
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "extensible-exceptions";
|
||||
version = "0.1.1.4";
|
||||
sha256 = "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc";
|
||||
meta = {
|
||||
description = "Extensible exceptions";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "fast-logger";
|
||||
version = "0.0.1";
|
||||
sha256 = "19ff2dhkh62i1ljsl90wnsblzk30dz0yx4kw5gk1hb22md7hakim";
|
||||
version = "0.0.2";
|
||||
sha256 = "1pwxhgcy4lmc63dnr9fihkmiclf60hrnsv8wzbsdg0jcj4qi0zr7";
|
||||
buildDepends = [ blazeBuilder ];
|
||||
meta = {
|
||||
description = "A fast logging system";
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "filepath";
|
||||
version = "1.2.0.1";
|
||||
sha256 = "1fq62kxf68y2952qhipllz049cq52yc3wm4i31v2lg5hdcwbw152";
|
||||
version = "1.3.0.0";
|
||||
sha256 = "1v5affq82b4fypm49d5sradcx4ymgmkac563vfx483pmyl73i5jl";
|
||||
meta = {
|
||||
homepage = "http://www-users.cs.york.ac.uk/~ndm/filepath/";
|
||||
description = "Library for manipulating FilePaths in a cross platform way";
|
||||
|
19
pkgs/development/libraries/haskell/gd/default.nix
Normal file
19
pkgs/development/libraries/haskell/gd/default.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ cabal, expat, fontconfig, freetype, gd, libjpeg, libpng, zlib }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "gd";
|
||||
version = "3000.7.1";
|
||||
sha256 = "07rb02jfmz6bw853b6snw1inby9qgaygdmlsid35snc2xn2ylb50";
|
||||
extraLibraries = [
|
||||
expat fontconfig freetype gd libjpeg libpng zlib
|
||||
];
|
||||
meta = {
|
||||
description = "A Haskell binding to a subset of the GD graphics library";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "ghc-mod";
|
||||
version = "1.0.6";
|
||||
sha256 = "c075314de03209827a0e59ee3e63a4d21bc8edb024a1e36721eea248805b38ba";
|
||||
version = "1.0.8";
|
||||
sha256 = "1c1236a8829418cae3039c3479875104664827c661b8c7567dd7bdbda12e8bcc";
|
||||
buildDepends = [
|
||||
attoparsec attoparsecEnumerator ghcPaths hlint regexPosix
|
||||
];
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hackage-db";
|
||||
version = "1.0";
|
||||
sha256 = "0y769ssr9jlyzcdr0l8wh5s3ivc3zbp9mf7xy7vnq6mr9hjh7lcw";
|
||||
version = "1.2";
|
||||
sha256 = "1dsm8mp8f6z7jqqgx39xfvl5kql6bbwxk25k435rsb685q9hzpxq";
|
||||
buildDepends = [ tar ];
|
||||
meta = {
|
||||
homepage = "http://github.com/peti/hackage-db";
|
||||
|
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hakyll";
|
||||
version = "3.2.5.0";
|
||||
sha256 = "1y1dqfbas7ym1jghq3i7zhqcny01paqfrszj0aakg6ys2jjx0m29";
|
||||
version = "3.2.6.0";
|
||||
sha256 = "1yg97kihfxb250vk9dm2v9sh197lc6qjil0j40zgcwpss96xynax";
|
||||
buildDepends = [
|
||||
binary blazeHtml citeprocHs cryptohash hamlet mtl pandoc parsec
|
||||
regexBase regexPcre snapCore snapServer tagsoup time
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "happstack-util";
|
||||
version = "6.0.2";
|
||||
sha256 = "03qlnclpg72iflry1xlkd0sxqm6nybvx113la9r0cmsnz17y546a";
|
||||
version = "6.0.3";
|
||||
sha256 = "0hqssd5wzir6rxn46q8r3hdp3nl7v5m7w322j39120xpg2bhiphh";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
@ -1,10 +1,10 @@
|
||||
{ cabal, blazeBuilder, mtl, syb, text, utf8String }:
|
||||
{ cabal, blazeBuilder, ieee754, mtl, syb, text, utf8String }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hastache";
|
||||
version = "0.2.4";
|
||||
sha256 = "0881sh3vp5v8kk3rnz9dg2bnis6qy4gx5sr0sqj6xl162sbhf3yv";
|
||||
buildDepends = [ blazeBuilder mtl syb text utf8String ];
|
||||
version = "0.3.3";
|
||||
sha256 = "18ayrfwi3jn3q650m5dm9wx9c7djwc2miz3mxlscd9gzlnrfi772";
|
||||
buildDepends = [ blazeBuilder ieee754 mtl syb text utf8String ];
|
||||
meta = {
|
||||
homepage = "http://github.com/lymar/hastache";
|
||||
description = "Haskell implementation of Mustache templates";
|
||||
|
@ -1,12 +1,12 @@
|
||||
{ cabal, parsec, regexPcreBuiltin, xhtml }:
|
||||
{ cabal, blazeHtml, mtl, parsec, regexPcreBuiltin }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "highlighting-kate";
|
||||
version = "0.2.10";
|
||||
sha256 = "0cw89qsslrp4zh47ics7bg79fkqnxpnyz1a9xws0xzd9xmg3zrhh";
|
||||
version = "0.5.0.1";
|
||||
sha256 = "05r8w4366gi64l65k6vyda1cs96ld8i2dgch8r5fmxwiaa8dcs1l";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ parsec regexPcreBuiltin xhtml ];
|
||||
buildDepends = [ blazeHtml mtl parsec regexPcreBuiltin ];
|
||||
meta = {
|
||||
homepage = "http://github.com/jgm/highlighting-kate";
|
||||
description = "Syntax highlighting";
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hjsmin";
|
||||
version = "0.0.14";
|
||||
sha256 = "16053hnxnr9vsqvasbibjwjdg0jpsl5fwzgy54ac1xkh4rhp3a5i";
|
||||
version = "0.0.15";
|
||||
sha256 = "1bik3bvaz4zjhyx8nyghhs61l14zm71hndfhj4k0xvkw3h6hlj9k";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ blazeBuilder languageJavascript text ];
|
||||
|
@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
|
||||
buildDepends = [
|
||||
Chart cmdargs colour hledger hledgerLib HUnit safe time
|
||||
];
|
||||
patchPhase = ''
|
||||
sed -i hledger-chart.cabal -e 's|Chart >= 0.11 && < 0.15|Chart|g'
|
||||
'';
|
||||
meta = {
|
||||
homepage = "http://hledger.org";
|
||||
description = "A pie chart image generator for the hledger accounting tool";
|
||||
|
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hledger-lib";
|
||||
version = "0.16.1";
|
||||
sha256 = "15imhdkzfnxr72lsghrbsfisc7c2al4jkzcp72yf4hhra4zym1sd";
|
||||
version = "0.17";
|
||||
sha256 = "0dlm3hjbcf48nzz597ag1q9y0phsc09062wvzpmfkhk4hsijpds4";
|
||||
buildDepends = [
|
||||
cmdargs HUnit mtl parsec regexpr safe split time utf8String
|
||||
];
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ cabal, aesonNative, blazeHtml, cabalFileTh, clientsession
|
||||
, cmdargs, dataObject, dataObjectYaml, failure, fileEmbed, hamlet
|
||||
, hledger, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe
|
||||
{ cabal, aeson, blazeHtml, cabalFileTh, clientsession, cmdargs
|
||||
, dataObject, dataObjectYaml, failure, fileEmbed, hamlet, hledger
|
||||
, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe
|
||||
, shakespeareCss, shakespeareJs, shakespeareText, text, time
|
||||
, transformers, wai, waiExtra, warp, yesod, yesodCore, yesodForm
|
||||
, yesodJson, yesodStatic
|
||||
@ -8,12 +8,12 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hledger-web";
|
||||
version = "0.16.5";
|
||||
sha256 = "0gqhmyl62jkz156gypzxwj46xrh5as3wrvkwrg04wfmpqrac5n06";
|
||||
version = "0.17";
|
||||
sha256 = "1b5k76p27pvxc91gns3aimy3zcy6m366nnpwzbm214v6ka82imfi";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
aesonNative blazeHtml cabalFileTh clientsession cmdargs dataObject
|
||||
aeson blazeHtml cabalFileTh clientsession cmdargs dataObject
|
||||
dataObjectYaml failure fileEmbed hamlet hledger hledgerLib HUnit
|
||||
ioStorage parsec regexpr safe shakespeareCss shakespeareJs
|
||||
shakespeareText text time transformers wai waiExtra warp yesod
|
||||
|
@ -1,16 +1,16 @@
|
||||
{ cabal, cmdargs, csv, haskeline, hledgerLib, HUnit, mtl, parsec
|
||||
, regexpr, safe, split, time, utf8String
|
||||
{ cabal, cabalFileTh, cmdargs, csv, haskeline, hledgerLib, HUnit
|
||||
, mtl, parsec, regexpr, safe, split, time, utf8String
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hledger";
|
||||
version = "0.16.1";
|
||||
sha256 = "182a5qlcxbh9q8hzrmgm99hcgvxjq8j5xq202iff14p1yqv0irs2";
|
||||
version = "0.17";
|
||||
sha256 = "0ah01d10hvz12zwkprk6sb3by8azz9fhm772440arhd7r9fn6232";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
cmdargs csv haskeline hledgerLib HUnit mtl parsec regexpr safe
|
||||
split time utf8String
|
||||
cabalFileTh cmdargs csv haskeline hledgerLib HUnit mtl parsec
|
||||
regexpr safe split time utf8String
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://hledger.org";
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hmatrix";
|
||||
version = "0.13.0.0";
|
||||
sha256 = "1jlibgg2nrgajw2ny0dq88f5mhrffi7kda9bb8sp9szf4a0kd4wd";
|
||||
version = "0.13.1.0";
|
||||
sha256 = "0pl5z6zsxyvbdfdng77r2c4isq6d4wbyzx2qs9r8rbn6glaxwrmp";
|
||||
buildDepends = [ binary storableComplex vector ];
|
||||
extraLibraries = [ blas gsl liblapack ];
|
||||
configureFlags = "-fvector";
|
||||
|
@ -7,8 +7,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-conduit";
|
||||
version = "1.1.2.2";
|
||||
sha256 = "049gidxmrw4zri2zkibl2298glhapzzh1kg001dn563594bbiccz";
|
||||
version = "1.2.0";
|
||||
sha256 = "1s3qrvglhymwvr0cp32mi95dijic40lphhsfr4hm63qjphfc8dpi";
|
||||
buildDepends = [
|
||||
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
|
||||
blazeBuilderConduit caseInsensitive certificate conduit cprngAes
|
||||
|
17
pkgs/development/libraries/haskell/ieee754/default.nix
Normal file
17
pkgs/development/libraries/haskell/ieee754/default.nix
Normal file
@ -0,0 +1,17 @@
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "ieee754";
|
||||
version = "0.7.3";
|
||||
sha256 = "0gq747h15inxbxbgmzmchb9a8p57rhv3bmj69idx5arh0d3whgv0";
|
||||
meta = {
|
||||
homepage = "http://github.com/patperry/hs-ieee754";
|
||||
description = "Utilities for dealing with IEEE floating point numbers";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "language-javascript";
|
||||
version = "0.4.6";
|
||||
sha256 = "1rqbb44cyvj6iyipi4bzrdd59lk9q1vxh0zvilvc54kqg97y07v6";
|
||||
version = "0.4.7";
|
||||
sha256 = "029ncc7hdw3pi9fbnxd0knz7wy3jpj5wcfqsxzyk5dkwji6d95x1";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ mtl utf8Light ];
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "mime-mail";
|
||||
version = "0.4.1.0";
|
||||
sha256 = "1czjxxpv2w8zvwm6nkv0rr47rdl84s5f5xvf3r4kjaw44a6jfgg0";
|
||||
version = "0.4.1.1";
|
||||
sha256 = "01dshc6ysjkab9hl851948l6k0lwgm1fqmyk97zy7wckb252w6y4";
|
||||
buildDepends = [ base64Bytestring blazeBuilder random text ];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/mime-mail";
|
||||
|
22
pkgs/development/libraries/haskell/multiarg/default.nix
Normal file
22
pkgs/development/libraries/haskell/multiarg/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ cabal, explicitException, QuickCheck, text, transformers
|
||||
, utf8String
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "multiarg";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "010mph49fq0rdr5dmm4pdlbmfmaaas8wffa9p1cgprs2ic1hnx3g";
|
||||
buildDepends = [
|
||||
explicitException QuickCheck text transformers utf8String
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://github.com/massysett/multiarg";
|
||||
description = "Combinators to build command line parsers";
|
||||
license = self.stdenv.lib.licenses.mit;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "neither";
|
||||
version = "0.3.0.1";
|
||||
sha256 = "1vr8zap3vp28dr48s510lfrbfhw5yz25vng6wyk20582lv4j2mz8";
|
||||
version = "0.3.1";
|
||||
sha256 = "1n00v2xs2ghm273barc3bbi67wgpvyihhgl1ij7qczyp9fhqlyfk";
|
||||
buildDepends = [ failure transformers ];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/neither";
|
||||
|
18
pkgs/development/libraries/haskell/network/2.3.0.10.nix
Normal file
18
pkgs/development/libraries/haskell/network/2.3.0.10.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ cabal, parsec }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "network";
|
||||
version = "2.3.0.10";
|
||||
sha256 = "1f1z7wggxl2rzix1r4bhvcdl0fmx2mzkn70iy3w5yl54vmym21bm";
|
||||
buildDepends = [ parsec ];
|
||||
meta = {
|
||||
homepage = "http://github.com/haskell/network";
|
||||
description = "Low-level networking interface";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "nixos-types";
|
||||
version = "1.2";
|
||||
sha256 = "140qk6wqq87qfk471cnhrg135fnqv0vfmfxh8kj14ar2kxvzrr8w";
|
||||
version = "1.3";
|
||||
sha256 = "0kdi3q316c9irrzwl1vx764f958i5d61v2vc03356sfyy13d19sk";
|
||||
buildDepends = [ regexPosix ];
|
||||
meta = {
|
||||
homepage = "http://github.com/haskell4nix/nixos-types";
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pandoc-types";
|
||||
version = "1.8.2";
|
||||
sha256 = "04whkqld2pnfz25i9rcq7d4pi9zkn6c1rpz95vdlg9r5xkhhnn3a";
|
||||
version = "1.9.0.2";
|
||||
sha256 = "1rqqchxinjk3njgkp73i92q4iz1cl84p56i2fmgj2zn221r0zhyl";
|
||||
buildDepends = [ syb ];
|
||||
meta = {
|
||||
homepage = "http://johnmacfarlane.net/pandoc";
|
||||
|
@ -1,18 +1,23 @@
|
||||
{ cabal, base64Bytestring, citeprocHs, dlist, extensibleExceptions
|
||||
, highlightingKate, HTTP, json, mtl, network, pandocTypes, parsec
|
||||
, random, syb, tagsoup, texmath, utf8String, xhtml, xml, zipArchive
|
||||
{ cabal, ansiTerminal, base64Bytestring, blazeHtml, citeprocHs
|
||||
, Diff, extensibleExceptions, highlightingKate, HTTP, HUnit, json
|
||||
, mtl, network, pandocTypes, parsec, QuickCheck, random, syb
|
||||
, tagsoup, temporary, testFramework, testFrameworkHunit
|
||||
, testFrameworkQuickcheck2, texmath, time, utf8String, xml
|
||||
, zipArchive, zlib
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pandoc";
|
||||
version = "1.8.2.1";
|
||||
sha256 = "0cwly0j2rj46h654iwl04l6jkhk6rrhynqvrdnq47067n9vm60pi";
|
||||
version = "1.9.0.3";
|
||||
sha256 = "1p5054sdvvgl38rr0ajfavr79rwr2l8jdrpzai329ksskkh1acdp";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
base64Bytestring citeprocHs dlist extensibleExceptions
|
||||
highlightingKate HTTP json mtl network pandocTypes parsec random
|
||||
syb tagsoup texmath utf8String xhtml xml zipArchive
|
||||
ansiTerminal base64Bytestring blazeHtml citeprocHs Diff
|
||||
extensibleExceptions highlightingKate HTTP HUnit json mtl network
|
||||
pandocTypes parsec QuickCheck random syb tagsoup temporary
|
||||
testFramework testFrameworkHunit testFrameworkQuickcheck2 texmath
|
||||
time utf8String xml zipArchive zlib
|
||||
];
|
||||
configureFlags = "-fhighlighting -fthreaded";
|
||||
meta = {
|
||||
|
@ -1,10 +1,10 @@
|
||||
{ cabal, utf8String }:
|
||||
{ cabal, text }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "parsimony";
|
||||
version = "1.1";
|
||||
sha256 = "0476zmsjyjf58lh85806baqblq8hjxcrrnqc6ddxxq17lmvsd5ic";
|
||||
buildDepends = [ utf8String ];
|
||||
version = "1.3";
|
||||
sha256 = "0vbayvk989m85qfxxls74rn0v8ylb5l7lywp30sw2wybvi4r08lg";
|
||||
buildDepends = [ text ];
|
||||
meta = {
|
||||
description = "Monadic parser combinators derived from Parsec";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
@ -0,0 +1,22 @@
|
||||
{ cabal, dataObject, monadControl, neither, persistent, text
|
||||
, transformers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent-sqlite";
|
||||
version = "0.6.2.1";
|
||||
sha256 = "10sqmkd7vnrrpr8phcswbxcvn8vjipgy96nk2jj3g96j3cfwfpk0";
|
||||
buildDepends = [
|
||||
dataObject monadControl neither persistent text transformers
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/persistent";
|
||||
description = "Backend for the persistent library using sqlite3";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pool-conduit";
|
||||
version = "0.0.0";
|
||||
sha256 = "0cbs7swb1ay3l1hlbirys171ybqg887csnp6yiy9biq11q5mhsml";
|
||||
version = "0.0.0.1";
|
||||
sha256 = "1im5fpwadg9hmajay6dkwmlzbp5rzn8hh9wh01iy23jgivkqk2q0";
|
||||
buildDepends = [ conduit resourcePool transformers ];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/persistent";
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "skein";
|
||||
version = "0.1.0.4";
|
||||
sha256 = "1m910kvm1ba9cl3ghr6j393xf1lvxb4ms55nipnzc5zg7r2xzh96";
|
||||
version = "0.1.0.5";
|
||||
sha256 = "12hyyydznss802v4pwfcpjr0y7241114a9z82xxq60q8dval8fyb";
|
||||
buildDepends = [ cereal cryptoApi tagged ];
|
||||
meta = {
|
||||
description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
|
||||
|
18
pkgs/development/libraries/haskell/socks/default.nix
Normal file
18
pkgs/development/libraries/haskell/socks/default.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ cabal, cereal, network }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "socks";
|
||||
version = "0.4.1";
|
||||
sha256 = "0kapic4rf1cwbqy5f229b69kr1mg9blpr5p5jna8sx5ds2b8jdjn";
|
||||
buildDepends = [ cereal network ];
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-socks";
|
||||
description = "Socks proxy (version 5) implementation";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "string-combinators";
|
||||
version = "0.6.0.2";
|
||||
sha256 = "1bsnli6376nq5dmcx8da2fakj7h73plqz6v1myzhkz1f6r3qcjfi";
|
||||
version = "0.6.0.3";
|
||||
sha256 = "18jawxqvcj7zpvb0wf1zln12s03mp6nglhv5ccywrkb5x0r0557j";
|
||||
buildDepends = [ baseUnicodeSymbols ];
|
||||
meta = {
|
||||
homepage = "https://github.com/basvandijk/string-combinators";
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user