1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00

Merge branch 'master' into dropbox-py

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>

Conflicts:
	pkgs/top-level/all-packages.nix
This commit is contained in:
Moritz Ulrich 2013-04-04 00:18:48 +02:00
commit f49becb7a6
166 changed files with 8111 additions and 12390 deletions

3
.gitignore vendored
View file

@ -2,3 +2,6 @@
,*
.*.swp
.*.swo
cpan-info
cpan_tmp/
result

View file

@ -1,7 +1,5 @@
#! /bin/sh -e
export PERL5LIB=/nix/var/nix/profiles/per-user/eelco/cpan-generator/lib/perl5/site_perl
name="$1"
[ -n "$name" ] || { echo "no name"; exit 1; }

View file

@ -1,10 +1,10 @@
{stdenv, fetchurl, nasm}:
stdenv.mkDerivation rec {
name = "lame-3.98.4";
name = "lame-3.99.5";
src = fetchurl {
url = "mirror://sourceforge/lame/${name}.tar.gz";
sha256 = "1j3jywv6ic2cy0x0q1a1h6rcl6xmcs5f58xawjdkl8hpcv3l8cdc";
sha256 = "1zr3kadv35ii6liia0bpfgxpag27xcivp571ybckpbz4b10nnd14";
};
buildInputs = [ nasm ];

View file

@ -5,12 +5,12 @@
pythonPackages.buildPythonPackage rec {
name = "mopidy-${version}";
version = "0.11.1";
version = "0.12.0";
src = fetchgit {
url = "https://github.com/mopidy/mopidy.git";
rev = "refs/tags/v${version}";
sha256 = "123p9hsnlgwvrw4vzlxjf5f43rqzqa3ynbqha8pyi6r0q3ln7qjn";
sha256 = "18b1gsyq1ph1a8gl6m4jmhkvq1gyyhbkbb6rrr3qr4rb5prl1fyi";
};
propagatedBuildInputs = with pythonPackages; [

View file

@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
homepage = http://unkart.ovh.org/ncmpcpp/;
license = "GPLv2+";
maintainers = [ stdenv.lib.maintainers.mornfall ];
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -0,0 +1,21 @@
{ stdenv, fetchurl, flac }:
stdenv.mkDerivation rec {
version = "3.0.10";
name = "shntool-${version}";
src = fetchurl {
url = http://www.etree.org/shnutils/shntool/dist/src/shntool-3.0.10.tar.gz;
sha256 = "00i1rbjaaws3drkhiczaign3lnbhr161b7rbnjr8z83w8yn2wc3l";
};
buildInputs = [ flac ];
meta = {
description = "multi-purpose WAVE data processing and reporting utility";
homepage = http://www.etree.org/shnutils/shntool/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.all;
maintainers = with stdenv.lib.maintainers; [ jcumming ];
};
}

View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, lightdm, pkgconfig, gtk3, intltool }:
stdenv.mkDerivation {
name = "lightdm-gtk-greeter";
src = fetchurl {
url = "https://launchpad.net/lightdm-gtk-greeter/1.6/1.5.1/+download/lightdm-gtk-greeter-1.5.1.tar.gz";
sha256 = "ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621";
};
buildInputs = [ pkgconfig gtk3 lightdm intltool ];
patches =
[ ./lightdm-gtk-greeter.patch
];
patchFlags = "-p0";
postInstall = ''
substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \
--replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter"
'';
}

View file

@ -0,0 +1,13 @@
=== modified file 'src/lightdm-gtk-greeter.c'
--- src/lightdm-gtk-greeter.c 2013-02-09 23:20:39 +0000
+++ src/lightdm-gtk-greeter.c 2013-03-29 12:21:34 +0000
@@ -1273,7 +1273,7 @@
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (session_combo), renderer, TRUE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (session_combo), renderer, "text", 0);
model = gtk_combo_box_get_model (session_combo);
- items = lightdm_get_sessions ();
+ items = lightdm_get_sessions (greeter);
for (item = items; item; item = item->next)
{
LightDMSession *session = item->data;

View file

@ -0,0 +1,25 @@
{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2, intltool, x11, libxklavier, libgcrypt, makeWrapper }:
stdenv.mkDerivation {
name = "lightdm-1.5.1";
src = fetchurl {
url = https://launchpad.net/lightdm/1.6/1.5.1/+download/lightdm-1.5.1.tar.xz;
sha256 = "645db2d763cc514d6aecb1838f4a9c33c3dcf0c94567a7ef36c6b23d8aa56c86";
};
buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt makeWrapper ];
configureFlags = [ "--enable-liblightdm-gobject" ];
patches =
[ ./lightdm.patch
];
patchFlags = "-p0";
meta = {
homepage = http://launchpad.net/lightdm;
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -0,0 +1,193 @@
=== modified file 'liblightdm-gobject/greeter.c'
--- liblightdm-gobject/greeter.c 2013-01-31 20:56:09 +0000
+++ liblightdm-gobject/greeter.c 2013-03-29 14:15:58 +0000
@@ -567,6 +567,21 @@
}
/**
+ * lightdm_greeter_get_config_path
+ * @greeter: A #LightDMGreeter
+ *
+ * Get the config path to LightDM.
+ *
+ * Return value: The path to the current LightDM configuration file.
+ **/
+const gchar *
+lightdm_greeter_get_config_path (LightDMGreeter *greeter)
+{
+ g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL);
+ return lightdm_greeter_get_hint (greeter, "config-path");
+}
+
+/**
* lightdm_greeter_get_hide_users_hint:
* @greeter: A #LightDMGreeter
*
=== modified file 'liblightdm-gobject/lightdm/greeter.h'
--- liblightdm-gobject/lightdm/greeter.h 2013-01-31 20:56:09 +0000
+++ liblightdm-gobject/lightdm/greeter.h 2013-03-29 11:56:11 +0000
@@ -93,6 +93,8 @@
const gchar *lightdm_greeter_get_autologin_user_hint (LightDMGreeter *greeter);
+const gchar *lightdm_greeter_get_config_path (LightDMGreeter *greeter);
+
gboolean lightdm_greeter_get_autologin_guest_hint (LightDMGreeter *greeter);
gint lightdm_greeter_get_autologin_timeout_hint (LightDMGreeter *greeter);
=== modified file 'liblightdm-gobject/lightdm/session.h'
--- liblightdm-gobject/lightdm/session.h 2013-01-31 20:56:09 +0000
+++ liblightdm-gobject/lightdm/session.h 2013-03-29 11:59:16 +0000
@@ -12,6 +12,7 @@
#define _LIGHTDM_SESSION_H_
#include <glib-object.h>
+#include "greeter.h"
G_BEGIN_DECLS
@@ -42,9 +43,9 @@
GType lightdm_session_get_type (void);
-GList *lightdm_get_sessions (void);
+GList *lightdm_get_sessions (LightDMGreeter *greeter);
-GList *lightdm_get_remote_sessions (void);
+GList *lightdm_get_remote_sessions (LightDMGreeter *greeter);
const gchar *lightdm_session_get_key (LightDMSession *session);
=== modified file 'liblightdm-gobject/session.c'
--- liblightdm-gobject/session.c 2013-01-31 20:56:09 +0000
+++ liblightdm-gobject/session.c 2013-03-29 14:16:48 +0000
@@ -11,6 +11,7 @@
#include <string.h>
#include <gio/gdesktopappinfo.h>
+#include "lightdm/greeter.h"
#include "lightdm/session.h"
enum {
@@ -167,7 +168,7 @@
}
static void
-update_sessions (void)
+update_sessions (LightDMGreeter *greeter)
{
GKeyFile *config_key_file = NULL;
gchar *config_path = NULL;
@@ -183,8 +184,8 @@
remote_sessions_dir = g_strdup (REMOTE_SESSIONS_DIR);
/* Use session directory from configuration */
- /* FIXME: This should be sent in the greeter connection */
- config_path = g_build_filename (CONFIG_DIR, "lightdm.conf", NULL);
+ config_path = g_strdup (lightdm_greeter_get_config_path (greeter));
+
config_key_file = g_key_file_new ();
result = g_key_file_load_from_file (config_key_file, config_path, G_KEY_FILE_NONE, &error);
if (error)
@@ -228,9 +229,9 @@
* Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession
**/
GList *
-lightdm_get_sessions (void)
+lightdm_get_sessions (LightDMGreeter *greeter)
{
- update_sessions ();
+ update_sessions (greeter);
return local_sessions;
}
@@ -242,9 +243,9 @@
* Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession
**/
GList *
-lightdm_get_remote_sessions (void)
+lightdm_get_remote_sessions (LightDMGreeter *greeter)
{
- update_sessions ();
+ update_sessions (greeter);
return remote_sessions;
}
=== modified file 'src/display.c'
--- src/display.c 2013-03-26 22:22:49 +0000
+++ src/display.c 2013-03-29 12:12:43 +0000
@@ -62,6 +62,9 @@
/* Program to run sessions through */
gchar *session_wrapper;
+ /* Path to the configuration file that lightdm is running under */
+ gchar *config_path;
+
/* TRUE if in a user session */
gboolean in_user_session;
@@ -213,6 +216,14 @@
}
void
+display_set_config_path (Display *display, const gchar *config_path)
+{
+ g_return_if_fail (display != NULL);
+ g_free (display->priv->config_path);
+ display->priv->config_path = g_strdup (config_path);
+}
+
+void
display_set_show_remote_login_hint (Display *display, gboolean show_remote_login)
{
g_return_if_fail (display != NULL);
@@ -436,6 +447,7 @@
greeter_set_hint (display->priv->greeter, "show-remote-login", display->priv->greeter_show_remote_login ? "true" : "false");
if (display->priv->greeter_is_lock)
greeter_set_hint (display->priv->greeter, "lock-screen", "true");
+ greeter_set_hint (display->priv->greeter, "config-path", display->priv->config_path);
/* Run greeter as unprivileged user */
if (getuid () != 0)
=== modified file 'src/display.h'
--- src/display.h 2013-03-26 22:22:49 +0000
+++ src/display.h 2013-03-29 12:12:37 +0000
@@ -80,6 +80,8 @@
void display_set_user_session (Display *display, SessionType type, const gchar *session_name);
+void display_set_config_path (Display *display, const gchar *config_path);
+
gboolean display_start (Display *display);
gboolean display_get_is_ready (Display *display);
=== modified file 'src/lightdm.c'
--- src/lightdm.c 2013-03-07 21:40:31 +0000
+++ src/lightdm.c 2013-03-29 11:48:45 +0000
@@ -1050,6 +1050,7 @@
g_debug ("Starting Light Display Manager %s, UID=%i PID=%i", VERSION, getuid (), getpid ());
g_debug ("Loaded configuration from %s", config_path);
+ config_set_string (config_get_instance (), "LightDM", "config-path", config_path);
g_free (config_path);
g_debug ("Using D-Bus name %s", LIGHTDM_BUS_NAME);
=== modified file 'src/seat.c'
--- src/seat.c 2013-03-26 22:22:49 +0000
+++ src/seat.c 2013-03-29 12:13:00 +0000
@@ -536,6 +536,7 @@
if (!session_name)
session_name = seat_get_string_property (seat, "user-session");
display_set_user_session (display, SESSION_TYPE_LOCAL, session_name);
+ display_set_config_path (display, config_get_string (config_get_instance (), "LightDM", "config-path"));
seat->priv->displays = g_list_append (seat->priv->displays, display);
g_signal_emit (seat, signals[DISPLAY_ADDED], 0, display);

View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
NIX_LDFLAGS = "-llcms -ljpeg";
NIX_LDFLAGS = "-llcms -ljpeg -lX11";
# NIX_CFLAGS_COMPILE = "-I.";

View file

@ -0,0 +1,53 @@
{ stdenv, fetchurl
, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
, libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
, openexr, pixman, pkgconfig, sqlite, bash, libxslt }:
assert stdenv ? glibc;
stdenv.mkDerivation rec {
version = "1.2rc1";
name = "darktable-${version}";
src = fetchurl {
url = "http://tinyurl.com/bmwdztq";
name = "${name}-${version}.tar.xz";
sha256 = "0l3gl49bmaljrrl4zfaivvj7apxa2jm934ylq24gcms3b2whv70m";
};
buildInputs =
[ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk
ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt
];
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR"
substituteInPlace tools/create_preferences.sh.in --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash'
'';
cmakeFlags = [
"-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include"
"-DPTHREAD_LIBRARY=${stdenv.glibc}/lib/libpthread.so"
"-DCMAKE_BUILD_TYPE=Release"
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include"
];
meta = with stdenv.lib; {
description = "Virtual lighttable and darkroom for photographers";
homepage = http://darktable.sourceforge.net;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}

View file

@ -0,0 +1,34 @@
{ stdenv, fetchurl, boost, cmake, ilmbase, libjpeg, libpng, libtiff
, opencolorio, openexr, unzip
}:
stdenv.mkDerivation rec {
name = "oiio-${version}";
version = "1.1.8";
src = fetchurl {
url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
sha256 = "08a6qhplzs8kianqb1gjgrndg81h3il5531jn9g6i4940b1xispg";
};
buildInputs = [
boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr unzip
];
configurePhase = "";
buildPhase = ''
make ILMBASE_HOME=${ilmbase} OPENEXR_HOME=${openexr} USE_PYTHON=0 \
INSTALLDIR=$out dist_dir=
'';
installPhase = ":";
meta = with stdenv.lib; {
homepage = http://www.openimageio.org;
description = "A library and tools for reading and writing images";
license = licenses.bsd3;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
};
}

View file

@ -1,18 +1,18 @@
{ stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
, libXdmcp, lcms2, libiptcdata
, libXdmcp, lcms2, libiptcdata, libcanberra, fftw
, mercurial # Not really needed for anything, but it fails if it does not find 'hg'
}:
stdenv.mkDerivation rec {
name = "rawtherapee-4.0.9";
name = "rawtherapee-4.0.10";
src = fetchurl {
url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.9.tar.xz;
sha256 = "1ll7n7gzxs00jpw3gp9xfr90lbwqafkgqpps3j5ig6mf79frpm2a";
url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.10.tar.xz;
sha256 = "1ibsdm2kqpw796rcdihnnp67vx0wm1d1bnlzq269r9p01w5s102g";
};
buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp
lcms2 libiptcdata mercurial ];
lcms2 libiptcdata mercurial libcanberra fftw ];
# Disable the use of the RAWZOR propietary libraries
cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
meta = {
description = "RAW converter and digital photo processing software";
homepage = http://www.rawtherapee.com/;
license = "GPLv3+";
maintainers = with stdenv.lib.maintainers; [viric];
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [viric jcumming];
platforms = with stdenv.lib.platforms; linux;
};
}

View file

@ -1,26 +1,37 @@
{ stdenv, fetchurl, SDL, cmake, gettext, ilmbase, libXi, libjpeg,
libpng, libsamplerate, libtiff, mesa, openal, openexr, openjpeg,
python, zlib, boost }:
{ stdenv, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew
, ilmbase, jackaudio, libXi, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
, zlib
}:
stdenv.mkDerivation rec {
name = "blender-2.63a";
name = "blender-2.66a";
src = fetchurl {
url = "http://download.blender.org/source/${name}.tar.gz";
sha256 = "c479b1abfe5fd8a1a5d04b8d21fdbc0fc960d7855b24785b888c09792bca4c1a";
sha256 = "0wj8x9xk5irvsjc3rm7wzml1j47xcdpdpy84kidafk02biskcqcb";
};
buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal
SDL openexr libsamplerate libXi libtiff ilmbase openjpeg boost ];
buildInputs = [
SDL boost cmake ffmpeg gettext glew ilmbase jackaudio libXi
libjpeg libpng libsamplerate libsndfile libtiff mesa openal
opencolorio openexr openimageio openjpeg python zlib
];
cmakeFlags = [
"-DOPENEXR_INC=${openexr}/include/OpenEXR"
"-DWITH_OPENCOLLADA=OFF"
"-DWITH_CODEC_FFMPEG=ON"
"-DWITH_CODEC_SNDFILE=ON"
"-DWITH_JACK=ON"
"-DWITH_INSTALL_PORTABLE=OFF"
"-DPYTHON_LIBRARY=python${python.majorVersion}m"
"-DPYTHON_LIBPATH=${python}/lib"
"-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"
];
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}";
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}m";
enableParallelBuilding = true;

View file

@ -0,0 +1,31 @@
{ stdenv, fetchurl, buildPythonPackage, tempita, jinja2, pyyaml, clepy, mock
, nose, decorator, docutils }:
# TODO: pitz has a pitz-shell utility that depends on ipython, but it just
# errors out and dies (it probably depends on an old ipython version):
#
# from IPython.Shell import IPShellEmbed
# ImportError: No module named Shell
#
# pitz-shell is not the primary interface, so it is not critical to have it
# working. Concider fixing pitz upstream.
buildPythonPackage rec {
name = "pitz-1.2.4";
namePrefix = "";
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/pitz/${name}.tar.gz";
sha256 = "1k7f3h4acllzqy3mjqnjd4w5jskp03s79b7dx3c85vlmd7824smr";
};
# propagatedBuildInputs is needed for pitz to find its dependencies at
# runtime. If we use buildInputs it would just build, not run.
propagatedBuildInputs = [ tempita jinja2 pyyaml clepy mock nose decorator docutils ];
meta = {
description = "Distributed bugtracker";
license = stdenv.lib.licenses.bsd3;
homepage = http://pitz.tplus1.com/;
};
}

View file

@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Tool to share the mouse keyboard and the clipboard between computers";
homepage = http://synergy-foss.org;
license = "GPL";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -0,0 +1,17 @@
{ cabal, filepath, strict, time, xdgBasedir }:
cabal.mkDerivation (self: {
pname = "yeganesh";
version = "2.5";
sha256 = "1bgw5v1g5n06jj0lyxpf48mdpaa2s49g0lbagf3jf9q01rb92bvf";
isLibrary = false;
isExecutable = true;
buildDepends = [ filepath strict time xdgBasedir ];
meta = {
homepage = "http://dmwit.com/yeganesh";
description = "small dmenu wrapper";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
};
})

View file

@ -1,18 +1,18 @@
{ stdenv, fetchurl, unzip, xulrunner, makeWrapper }:
stdenv.mkDerivation {
name = "conkeror-1.0pre-20120316";
name = "conkeror-1.0pre-20130401";
src = fetchurl {
url = http://repo.or.cz/w/conkeror.git/snapshot/1264c0dbbefb6d671504a072d4ddb48d62ccead2.zip;
sha256 = "1vdxnhqjjvg9cry70byv6d3wib2p4rxhkmv7hs10pq39km1kpj7f";
url = http://repo.or.cz/w/conkeror.git/snapshot/0341e791c78653a2f5bbbff9a1dac04bf898dd65.zip;
sha256 = "11v7p40lcz6r5z0w54f8pk6hyn9mqjcw44fqszjyz25rkhx951ry";
};
buildInputs = [ unzip makeWrapper ];
buildCommand = ''
installPhase = ''
mkdir -p $out/libexec/conkeror
unzip $src -d $out/libexec
cp -r * $out/libexec/conkeror
makeWrapper ${xulrunner}/bin/xulrunner $out/bin/conkeror \
--add-flags $out/libexec/conkeror/application.ini

View file

@ -1,18 +1,18 @@
{stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, wxGTK, zlib, libX11,
gettext}:
{ stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, gtk, wxGTK, zlib, libX11,
gettext, cups } :
stdenv.mkDerivation rec {
name = "kicad-20110708";
name = "kicad-20130325";
src = fetchurl {
url = ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad_sources-2011-07-08-BZR3044.zip;
sha256 = "1gr75zcf55p3xpbg1gdkdpbh5x11bawc9rcff4fskwjyc3vfiv6a";
url = "http://iut-tice.ujf-grenoble.fr/cao/kicad-sources-stable_2013-03-25_BZR4005.zip";
sha256 = "0hg2aiis14am7mmpimcxnxvhy7c7fr5rgzlk6rjv44d9m0f9957m";
};
srcLibrary = fetchbzr {
url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library";
revision = 112;
sha256 = "49fa9ad90759cfaf522c2a62665f033688b9d84d02f31c6b2505c08a217ad312";
revision = 220;
sha256 = "0l2lblgnm51n2w1p4ifpwdvq04rxgq73zrfxlhqa9zdlyh4rcddb";
};
cmakeFlags = "-DKICAD_TESTING_VERSION=ON";

View file

@ -4,28 +4,20 @@ let
start_script = ''
#!/bin/sh
cd "$out/lib/hol_light"
exec ${ocaml}/bin/ocaml -I "$(ocamlfind query camlp5)" -init make.ml
exec ${ocaml}/bin/ocaml -I "camlp5 -where" -init make.ml
'';
in
stdenv.mkDerivation {
name = "hol_light-20130124";
name = "hol_light-20130324";
src = fetchsvn {
url = http://hol-light.googlecode.com/svn/trunk;
rev = "155";
sha256 = "057223kcv7y2vcnyzvrygvdafn6mb7ycr1m5rj3fsrwz0yl8dqnr";
rev = "157";
sha256 = "0d0pbnkw2gb11dn30ggfl91lhdxv86kd1fyiqn170w08n0gi805f";
};
buildInputs = [ ocaml findlib camlp5 ];
buildPhase = ''
make pa_j.ml
ocamlc -c \
-pp "camlp5r pa_lexer.cmo pa_extend.cmo q_MLast.cmo" \
-I "$(ocamlfind query camlp5)" \
pa_j.ml
'';
installPhase = ''
mkdir -p "$out/lib/hol_light" "$out/bin"
cp -a . $out/lib/hol_light
@ -45,6 +37,6 @@ can extend it with new theorems and inference rules without compromising its
soundness.
'';
homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/;
license = "BSD";
license = stdenv.lib.licenses.bsd2;
};
}

View file

@ -0,0 +1,59 @@
{ stdenv, fetchurl
, qt4, xapian, file, python
, djvulibre, groff, libxslt, unzip, xpdf, antiword, catdoc, lyx
, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconvOrLibc }:
stdenv.mkDerivation rec {
ver = "1.18.1";
name = "recoll-${ver}";
src = fetchurl {
url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz";
sha256 = "0cyrkx5aza3485avb2kxc6cbsqqrb32l1kq8ravr9d828331v84f";
};
configureFlags = [ "--with-inotify" ];
buildInputs = [ qt4 xapian file python ];
# the filters search through ${PATH} using a sh proc 'checkcmds' for the
# filtering utils. Short circuit this by replacing the filtering command with
# the absolute path to the filtering command.
postInstall = ''
for f in $out/share/recoll/filters/* ; do
substituteInPlace $f --replace antiword ${antiword}/bin/antiword
substituteInPlace $f --replace awk ${gawk}/bin/awk
substituteInPlace $f --replace catppt ${catdoc}/bin/catppt
substituteInPlace $f --replace djvused ${djvulibre}/bin/djvused
substituteInPlace $f --replace djvutxt ${djvulibre}/bin/djvutxt
substituteInPlace $f --replace grep ${gnugrep}/bin/grep
substituteInPlace $f --replace groff ${groff}/bin/groff
substituteInPlace $f --replace gunzip ${gzip}/bin/gunzip
substituteInPlace $f --replace iconv ${libiconvOrLibc}/bin/iconv
substituteInPlace $f --replace lyx ${lyx}/bin/lyx
substituteInPlace $f --replace pdftotext ${xpdf}/bin/pdftotext
substituteInPlace $f --replace pstotext ${ghostscript}/bin/ps2ascii
substituteInPlace $f --replace sed ${gnused}/bin/sed
substituteInPlace $f --replace tar ${gnutar}/bin/tar
substituteInPlace $f --replace unzip ${unzip}/bin/unzip
substituteInPlace $f --replace xls2csv ${catdoc}/bin/xls2csv
substituteInPlace $f --replace xsltproc ${libxslt}/bin/xsltproc
done
'';
# TODO:
#substituteInPlace $f --replace unrtf ${unrtf}/bin/unrtf
#substituteInPlace $f --replace untex ${untex}/bin/untex
#substituteInPlace $f --replace wpd2html ${wpd2html}/bin/wpd2html
meta = {
description = "finds keywords inside documents as well as file names";
longDescription = ''
Recoll is an Xapian frontend that can search through files, archive
members, email attachments.
'';
homepage = http://www.lesbonscomptes.com/recoll/;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ jcumming ];
};
}

View file

@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
installPhase = ''
make install
make install-doc
mkdir -p $out/etc/bash_completion.d/
cp contrib/tig-completion.bash $out/etc/bash_completion.d/
'';
meta = {
homepage = "http://jonas.nitro.dk/tig/";

View file

@ -0,0 +1,84 @@
{ stdenv, fetchurl, raspberrypifw, pcre, boostHeaders, freetype, zlib }:
let
ffmpeg = stdenv.mkDerivation rec {
name = "ffmpeg-1.1.3";
src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j";
};
configureFlags = [
"--arch=arm"
"--cpu=arm1176jzf-s"
"--disable-muxers"
"--enable-muxer=spdif"
"--enable-muxer=adts"
"--disable-encoders"
"--enable-encoder=ac3"
"--enable-encoder=aac"
"--disable-decoder=mpeg_xvmc"
"--disable-devices"
"--disable-ffprobe"
"--disable-ffplay"
"--disable-ffserver"
"--disable-ffmpeg"
"--enable-shared"
"--disable-doc"
"--enable-postproc"
"--enable-gpl"
"--enable-protocol=http"
"--enable-pthreads"
"--disable-runtime-cpudetect"
"--enable-pic"
"--disable-armv5te"
"--disable-neon"
"--enable-armv6t2"
"--enable-armv6"
"--enable-hardcoded-tables"
"--disable-runtime-cpudetect"
"--disable-debug"
];
enableParallelBuilding = true;
crossAttrs = {
dontSetConfigureCross = true;
configureFlags = configureFlags ++ [
"--cross-prefix=${stdenv.cross.config}-"
"--enable-cross-compile"
"--target_os=linux"
"--arch=${stdenv.cross.arch}"
];
};
meta = {
homepage = http://www.ffmpeg.org/;
description = "A complete, cross-platform solution to record, convert and stream audio and video";
};
};
in
stdenv.mkDerivation rec {
name = "omxplayer-20130328-fbee325dc2";
src = fetchurl {
url = https://github.com/huceke/omxplayer/tarball/fbee325dc2;
name = "${name}.tar.gz";
sha256 = "0fkvv8il7ffqxki2gp8cxa5shh6sz9jsy5vv3f4025g4gss6afkg";
};
patchPhase = ''
sed -i 1d Makefile
export INCLUDES="-I${raspberrypifw}/include/interface/vcos/pthreads -I${raspberrypifw}/include/interface/vmcs_host/linux/"
'';
installPhase = ''
ensureDir $out/bin
cp omxplayer.bin $out/bin
'';
buildInputs = [ raspberrypifw ffmpeg pcre boostHeaders freetype zlib ];
meta = {
homepage = https://github.com/huceke/omxplayer;
description = "Commandline OMX player for the Raspberry Pi";
license = "GPLv2+";
};
}

View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeWrapper
, pkgconfig, cmake, gnumake, yasm, python
, boost
, boost, avahi, libdvdcss, lame
, gettext, pcre, yajl, fribidi
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre
, libX11, xproto, inputproto
@ -20,7 +20,9 @@
, libusb ? null, usbSupport ? false
, samba ? null, sambaSupport ? true
# TODO: would be nice to have nfsSupport (needs libnfs library)
# TODO: librtmp
, libvdpau ? null, vdpauSupport ? true
, pulseaudio ? null, pulseSupport ? false
}:
assert dbusSupport -> dbus_libs != null;
@ -28,13 +30,14 @@ assert udevSupport -> udev != null;
assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable
assert sambaSupport -> samba != null;
assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport;
assert pulseSupport -> pulseaudio != null;
stdenv.mkDerivation rec {
name = "xbmc-12.0";
name = "xbmc-12.1";
src = fetchurl {
url = "http://mirrors.xbmc.org/releases/source/${name}.tar.gz";
sha256 = "0vy1a38gfbp9vhbjvwqm11sd76gl3s9q0h7gwpsks85m2k88q0ak";
sha256 = "1hqyq1vl34sywcj8zgx7kdpf8ljzj969l5w6yy4314c431pg7qr9";
};
buildInputs = [
@ -53,14 +56,15 @@ stdenv.mkDerivation rec {
ffmpeg libmpeg2 libsamplerate libmad
libogg libvorbis flac
lzo libcdio libmodplug libass
sqlite mysql nasm
sqlite mysql nasm avahi libdvdcss lame
curl bzip2 zip unzip glxinfo xdpyinfo
]
++ lib.optional dbusSupport dbus_libs
++ lib.optional udevSupport udev
++ lib.optional usbSupport libusb
++ lib.optional sambaSupport samba
++ lib.optional vdpauSupport libvdpau;
++ lib.optional vdpauSupport libvdpau
++ lib.optional pulseSupport pulseaudio;
dontUseCmakeConfigure = true;
@ -69,7 +73,8 @@ stdenv.mkDerivation rec {
"--disable-webserver"
]
++ lib.optional (! sambaSupport) "--disable-samba"
++ lib.optional vdpauSupport "--enable-vdpau";
++ lib.optional vdpauSupport "--enable-vdpau"
++ lib.optional pulseSupport "--enable-pulse";
postInstall = ''
for p in $(ls $out/bin/) ; do

View file

@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
homepage = "http://i3wm.org";
maintainers = [ stdenv.lib.maintainers.garbas ];
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
homepage = http://i3wm.org;
maintainers = [ stdenv.lib.maintainers.garbas ];
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
homepage = http://i3wm.org;
maintainers = [ stdenv.lib.maintainers.garbas ];
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -4,6 +4,6 @@ header "exporting \`$url' (revision $revision) into \`$out'"
# Perform a lightweight checkout so that we don't end up importing
# all the repository's history.
bzr checkout --lightweight "$url" -r "$revision" "$out"
bzr -Ossl.cert_reqs=none export -r "$revision" --format=dir "$out" "$url"
stopNest

View file

@ -50,12 +50,7 @@ if test -z "$finalPath"; then
trap "rm -rf $tmpPath" EXIT
# Perform the checkout.
if test "$NIX_PREFETCH_BZR_LEAVE_DOT_BZR" != 1
then
bzr export $revarg "$tmpFile" "$url" >&2
else
bzr checkout --lightweight $revarg "$url" "$tmpFile" >&2
fi
bzr -Ossl.cert_reqs=none export $revarg --format=dir "$tmpFile" "$url"
# Compute the hash.
hash=$(nix-hash --type $hashType $hashFormat $tmpFile)

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "man-pages-3.48";
name = "man-pages-3.50";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
sha256 = "6944cc3ad5131abab01c6703e63672b2e44be52737cdb1144f6ddaebb7f7d682";
sha256 = "04fn7zzi75y79rkg57nkync3hf14m8708iw33s03f0x8ays6fajz";
};
preBuild =

View file

@ -0,0 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "chicken-4.8.1";
meta = {
homepage = http://www.call-cc.org/;
description = "Chicken Scheme";
};
src = fetchurl {
url = http://code.call-cc.org/dev-snapshots/2013/01/04/chicken-4.8.1.tar.gz;
md5 = "bd758ec7abeaeb4f4c92c290fb5f3db7";
};
buildFlags = "PLATFORM=linux PREFIX=$(out) VARDIR=$(out)/var/lib";
installFlags = "PLATFORM=linux PREFIX=$(out) VARDIR=$(out)/var/lib";
}

View file

@ -0,0 +1,230 @@
Index: gcc-4_7-branch/libstdc++-v3/configure.host
===================================================================
--- gcc-4_7-branch/libstdc++-v3/configure.host (revision 194579)
+++ gcc-4_7-branch/libstdc++-v3/configure.host (revision 194580)
@@ -340,7 +340,7 @@
fi
esac
case "${host}" in
- arm*-*-linux-*eabi)
+ arm*-*-linux-*eabi*)
port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver"
;;
esac
Index: gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc
===================================================================
--- gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc (revision 194579)
+++ gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc (revision 194580)
@@ -1,5 +1,5 @@
// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
+// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
// 2007-05-03 Benjamin Kosnik <bkoz@redhat.com>
//
Index: gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc
===================================================================
--- gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc (revision 194579)
+++ gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc (revision 194580)
@@ -1,5 +1,5 @@
// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
+// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
// 2007-05-03 Benjamin Kosnik <bkoz@redhat.com>
//
Index: gcc-4_7-branch/libjava/configure.ac
===================================================================
--- gcc-4_7-branch/libjava/configure.ac (revision 194579)
+++ gcc-4_7-branch/libjava/configure.ac (revision 194580)
@@ -931,7 +931,7 @@
# on Darwin -single_module speeds up loading of the dynamic libraries.
extra_ldflags_libjava=-Wl,-single_module
;;
-arm*linux*eabi)
+arm*-*-linux*eabi*)
# Some of the ARM unwinder code is actually in libstdc++. We
# could in principle replicate it in libgcj, but it's better to
# have a dependency on libstdc++.
Index: gcc-4_7-branch/libjava/configure
===================================================================
--- gcc-4_7-branch/libjava/configure (revision 194579)
+++ gcc-4_7-branch/libjava/configure (revision 194580)
@@ -20542,7 +20542,7 @@
# on Darwin -single_module speeds up loading of the dynamic libraries.
extra_ldflags_libjava=-Wl,-single_module
;;
-arm*linux*eabi)
+arm*-*-linux*eabi*)
# Some of the ARM unwinder code is actually in libstdc++. We
# could in principle replicate it in libgcj, but it's better to
# have a dependency on libstdc++.
Index: gcc-4_7-branch/libgcc/config.host
===================================================================
--- gcc-4_7-branch/libgcc/config.host (revision 194579)
+++ gcc-4_7-branch/libgcc/config.host (revision 194580)
@@ -327,7 +327,7 @@
arm*-*-linux*) # ARM GNU/Linux with ELF
tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix"
case ${host} in
- arm*-*-linux-*eabi)
+ arm*-*-linux-*eabi*)
tmake_file="${tmake_file} arm/t-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
tm_file="$tm_file arm/bpabi-lib.h"
unwind_header=config/arm/unwind-arm.h
Index: gcc-4_7-branch/gcc/doc/install.texi
===================================================================
--- gcc-4_7-branch/gcc/doc/install.texi (revision 194579)
+++ gcc-4_7-branch/gcc/doc/install.texi (revision 194580)
@@ -3222,7 +3222,7 @@
@heading @anchor{arm-x-eabi}arm-*-eabi
ARM-family processors. Subtargets that use the ELF object format
require GNU binutils 2.13 or newer. Such subtargets include:
-@code{arm-*-netbsdelf}, @code{arm-*-*linux-gnueabi}
+@code{arm-*-netbsdelf}, @code{arm-*-*linux-gnueabi*}
and @code{arm-*-rtemseabi}.
@html
Index: gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c
===================================================================
--- gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c (revision 194579)
+++ gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c (revision 194580)
@@ -1,4 +1,4 @@
-/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi } } } */
+/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi* } } } */
void *foo (void)
{
Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C
===================================================================
--- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C (revision 194579)
+++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C (revision 194580)
@@ -7,10 +7,10 @@
// enum-size attributes should only be emitted if there are values of
// enum type that can escape the compilation unit, gcc cannot currently
// detect this; if this facility is added then this linker option should
-// not be needed. arm-*-linux*eabi should be a good approximation to
+// not be needed. arm-*-linux*eabi* should be a good approximation to
// those platforms where the EABI supplement defines enum values to be
// 32 bits wide.
-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
+// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
#include <limits.h>
Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C
===================================================================
--- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C (revision 194579)
+++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C (revision 194580)
@@ -9,10 +9,10 @@
// enum-size attributes should only be emitted if there are values of
// enum type that can escape the compilation unit, gcc cannot currently
// detect this; if this facility is added then this linker option should
-// not be needed. arm-*-linux*eabi should be a good approximation to
+// not be needed. arm-*-linux*eabi* should be a good approximation to
// those platforms where the EABI supplement defines enum values to be
// 32 bits wide.
-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
+// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
enum E {
a = -312
Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C
===================================================================
--- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C (revision 194579)
+++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C (revision 194580)
@@ -7,10 +7,10 @@
// enum-size attributes should only be emitted if there are values of
// enum type that can escape the compilation unit, gcc cannot currently
// detect this; if this facility is added then this linker option should
-// not be needed. arm-*-linux*eabi should be a good approximation to
+// not be needed. arm-*-linux*eabi* should be a good approximation to
// those platforms where the EABI supplement defines enum values to be
// 32 bits wide.
-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
+// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
// GROUPS passed enums
extern "C" int printf (const char *, ...);
Index: gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp
===================================================================
--- gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp (revision 194579)
+++ gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp (revision 194580)
@@ -3818,7 +3818,7 @@
}
} ""
}]
- } elseif { [istarget arm*-*-linux-gnueabi] } {
+ } elseif { [istarget arm*-*-linux-gnueabi*] } {
return [check_runtime sync_longlong_runtime {
#include <stdlib.h>
int main ()
@@ -3860,7 +3860,7 @@
|| [istarget i?86-*-*]
|| [istarget x86_64-*-*]
|| [istarget alpha*-*-*]
- || [istarget arm*-*-linux-gnueabi]
+ || [istarget arm*-*-linux-gnueabi*]
|| [istarget bfin*-*linux*]
|| [istarget hppa*-*linux*]
|| [istarget s390*-*-*]
@@ -3890,7 +3890,7 @@
|| [istarget i?86-*-*]
|| [istarget x86_64-*-*]
|| [istarget alpha*-*-*]
- || [istarget arm*-*-linux-gnueabi]
+ || [istarget arm*-*-linux-gnueabi*]
|| [istarget hppa*-*linux*]
|| [istarget s390*-*-*]
|| [istarget powerpc*-*-*]
Index: gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90
===================================================================
--- gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90 (revision 194579)
+++ gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90 (revision 194580)
@@ -1,6 +1,6 @@
! { dg-do run }
! { dg-options "-fshort-enums" }
-! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
+! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
! Program to test enumerations when option -fshort-enums is given
program main
Index: gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90
===================================================================
--- gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90 (revision 194579)
+++ gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90 (revision 194580)
@@ -1,7 +1,7 @@
! { dg-do run }
! { dg-additional-sources enum_10.c }
! { dg-options "-fshort-enums -w" }
-! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
+! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
! Make sure short enums are indeed interoperable with the
! corresponding C type.
Index: gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in
===================================================================
--- gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in (revision 194579)
+++ gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in (revision 194580)
@@ -1866,7 +1866,7 @@
LIBRARY_VERSION := $(LIB_VERSION)
endif
-ifeq ($(strip $(filter-out arm% linux-gnueabi,$(arch) $(osys)-$(word 4,$(targ)))),)
+ifeq ($(strip $(filter-out arm%-linux,$(arch)-$(osys)) $(if $(findstring eabi,$(word 4,$(targ))),,$(word 4,$(targ)))),)
LIBGNAT_TARGET_PAIRS = \
a-intnam.ads<a-intnam-linux.ads \
s-inmaop.adb<s-inmaop-posix.adb \
Index: gcc-4_7-branch/gcc/config.gcc
===================================================================
--- gcc-4_7-branch/gcc/config.gcc (revision 194579)
+++ gcc-4_7-branch/gcc/config.gcc (revision 194580)
@@ -855,7 +855,7 @@
esac
tmake_file="${tmake_file} arm/t-arm"
case ${target} in
- arm*-*-linux-*eabi)
+ arm*-*-linux-*eabi*)
tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
# Define multilib configuration for arm-linux-androideabi.

View file

@ -54,7 +54,8 @@ let version = "4.7.2";
# Whether building a cross-compiler for GNU/Hurd.
crossGNU = cross != null && cross.config == "i586-pc-gnu";
patches = [ ]
patches = []
++ optional stdenv.isArm [ ./arm-eabi.patch ]
++ optional (cross != null) ./libstdc++-target.patch
# ++ optional noSysDirs ./no-sys-dirs.patch
# The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its

View file

@ -2,95 +2,62 @@
assert stdenv ? glibc;
let version = "0.9.25"; in
stdenv.mkDerivation {
name = "tinycc-${version}";
stdenv.mkDerivation rec {
name = "tcc-0.9.26";
src = fetchurl {
url = "mirror://savannah/tinycc/tcc-${version}.tar.bz2";
sha256 = "0dfycf80x73dz67c97j1ry29wrv35393ai5ry46i1x1fzfq6rv8v";
};
src = fetchurl {
url = "mirror://savannah/tinycc/${name}.tar.bz2";
sha256 = "0wbdbdq6090ayw8bxnbikiv989kykff3m5rzbia05hrnwhd707jj";
};
nativeBuildInputs = [ perl texinfo ];
nativeBuildInputs = [ perl texinfo ];
patches =
[ (fetchurl {
# Add support for `alloca' on x86-64.
url = "http://repo.or.cz/w/tinycc.git/patch/8ea8305199496ba29b6d0da2de07aea4441844aa";
sha256 = "0dz1cm9zihk533hszqql4gxpzbp8c4g9dnvkkh9vs4js6fnz1fl2";
name = "x86-64-alloca.patch";
})
postPatch = ''
substituteInPlace "texi2pod.pl" \
--replace "/usr/bin/perl" "${perl}/bin/perl"
'';
(fetchurl {
# Fix alignment of the return value of `alloca'.
url = "http://repo.or.cz/w/tinycc.git/patch/dca2b15df42c1341794dd412917708416da25594";
sha256 = "0617a69gnfdmv8pr6dj3szv97v3zh57439dsbklxrnipx2jv6pq7";
name = "x86-64-alloca-align.patch";
})
];
preConfigure = ''
configureFlagsArray+=("--elfinterp=$(cat $NIX_GCC/nix-support/dynamic-linker)")
configureFlagsArray+=("--crtprefix=${stdenv.glibc}/lib")
configureFlagsArray+=("--sysincludepaths=${stdenv.glibc}/include:{B}/include")
configureFlagsArray+=("--libpaths=${stdenv.glibc}/lib")
'';
postPatch = ''
substituteInPlace "texi2pod.pl" \
--replace "/usr/bin/perl" "${perl}/bin/perl"
doCheck = true;
checkTarget = "test";
# To produce executables, `tcc' needs to know where `crt*.o' are.
sed -i "tcc.h" \
-e's|define CONFIG_TCC_CRT_PREFIX.*$|define CONFIG_TCC_CRT_PREFIX "${stdenv.glibc}/lib"|g'
meta = {
description = "TinyCC, a small, fast, and embeddable C compiler and interpreter";
sed -i "libtcc.c" \
-e's|tcc_add_library_path(s, CONFIG_SYSROOT "/lib");|tcc_add_library_path(s, "${stdenv.glibc}/lib");|g;
s|tcc_add_sysinclude_path(s, CONFIG_SYSROOT "/usr/include");|tcc_add_library_path(s, "${stdenv.glibc}/include");|g ;
s|tcc_add_sysinclude_path(s, buf);|tcc_add_sysinclude_path(s, buf); tcc_add_sysinclude_path(s, "${stdenv.glibc}/include");|g'
longDescription =
'' TinyCC (aka TCC) is a small but hyper fast C compiler. Unlike
other C compilers, it is meant to be self-sufficient: you do not
need an external assembler or linker because TCC does that for
you.
# Tell it about the loader's location.
sed -i "tccelf.c" \
-e's|".*/ld-linux\([^"]\+\)"|"${stdenv.glibc}/lib/ld-linux\1"|g'
''; # "
TCC compiles so fast that even for big projects Makefiles may not
be necessary.
postInstall = ''
makeinfo --force tcc-doc.texi || true
TCC not only supports ANSI C, but also most of the new ISO C99
standard and many GNU C extensions.
mkdir -p "$out/share/info"
mv tcc-doc.info* "$out/share/info"
TCC can also be used to make C scripts, i.e. pieces of C source
that you run as a Perl or Python script. Compilation is so fast
that your script will be as fast as if it was an executable.
echo 'int main () { printf ("it works!\n"); exit(0); }' | \
"$out/bin/tcc" -run -
'';
TCC can also automatically generate memory and bound checks while
allowing all C pointers operations. TCC can do these checks even
if non patched libraries are used.
doCheck = true;
checkTarget = "test";
With libtcc, you can use TCC as a backend for dynamic code
generation.
'';
meta = {
description = "TinyCC, a small, fast, and embeddable C compiler and interpreter";
homepage = http://www.tinycc.org/;
license = "LGPLv2+";
longDescription =
'' TinyCC (aka TCC) is a small but hyper fast C compiler. Unlike
other C compilers, it is meant to be self-sufficient: you do not
need an external assembler or linker because TCC does that for
you.
TCC compiles so fast that even for big projects Makefiles may not
be necessary.
TCC not only supports ANSI C, but also most of the new ISO C99
standard and many GNU C extensions.
TCC can also be used to make C scripts, i.e. pieces of C source
that you run as a Perl or Python script. Compilation is so fast
that your script will be as fast as if it was an executable.
TCC can also automatically generate memory and bound checks while
allowing all C pointers operations. TCC can do these checks even
if non patched libraries are used.
With libtcc, you can use TCC as a backend for dynamic code
generation.
'';
homepage = http://www.tinycc.org/;
license = "LGPLv2+";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}

View file

@ -29,7 +29,7 @@
enableParallelBuilding = true;
patches = [ ./disable-gc-sensitive-tests.patch ] ++
patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ] ++
(stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
# Explicitly link against libgcc_s, to work around the infamous

View file

@ -0,0 +1,24 @@
Building nixpkgs in non-chroot, NSS modules may fail
and that will report EAI_SYSTEM in getaddrinfo.
https://bugzilla.novell.com/show_bug.cgi?id=794696
Index: guile-2.0.7/test-suite/tests/net-db.test
===================================================================
--- guile-2.0.7.orig/test-suite/tests/net-db.test
+++ guile-2.0.7/test-suite/tests/net-db.test
@@ -79,6 +79,7 @@
(and (defined? 'EAI_NODATA) ; GNU extension
(= errcode EAI_NODATA))
(= errcode EAI_AGAIN)
+ (= errcode EAI_SYSTEM)
(begin
(format #t "unexpected error code: ~a ~s~%"
errcode (gai-strerror errcode))
@@ -105,6 +106,7 @@
;; `EAI_NONAME'.)
(and (or (= errcode EAI_SERVICE)
(= errcode EAI_NONAME)
+ (= errcode EAI_SYSTEM)
(and (defined? 'EAI_NODATA)
(= errcode EAI_NODATA)))
(string? (gai-strerror errcode))))))))

View file

@ -17,7 +17,7 @@ with stdenv.lib;
let
majorVersion = "3.3";
version = "${majorVersion}.0";
version = "${majorVersion}.1rc1";
buildInputs = filter (p: p != null) [
zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
@ -28,8 +28,8 @@ stdenv.mkDerivation {
inherit majorVersion version;
src = fetchurl {
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
sha256 = "1ybdf7wc8pfw51rf7xcywfw27n6l97qyzd1ibpq151q5dkyi7h8m";
url = "http://www.python.org/ftp/python/3.3.1/Python-${version}.tar.bz2";
sha256 = "1pnsbdzbd3750jcy32sv1760lv7am4x3f33jn1kmdmd82za279gv";
};
preConfigure = ''

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, cairo, file, pango, glib, gtk
, which, libtool, makeWrapper, libjpeg, libpng
, fontconfig, liberation_ttf } :
, fontconfig, liberation_ttf, sqlite } :
stdenv.mkDerivation rec {
pname = "racket";
@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
};
# Various racket executables do run-time searches for these.
ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib";
ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib:${sqlite}/lib";
buildInputs = [ file libtool which makeWrapper fontconfig liberation_ttf ];
buildInputs = [ file libtool which makeWrapper fontconfig liberation_ttf sqlite ];
preConfigure = ''
export LD_LIBRARY_PATH=${ffiSharedLibs}:$LD_LIBRARY_PATH

View file

@ -4,12 +4,12 @@ g: # Get dependencies from patched gems
{
aliases = {
ZenTest = g.ZenTest_4_9_0;
actionmailer = g.actionmailer_3_2_12;
actionpack = g.actionpack_3_2_12;
activemodel = g.activemodel_3_2_12;
activerecord = g.activerecord_3_2_12;
activeresource = g.activeresource_3_2_12;
activesupport = g.activesupport_3_2_12;
actionmailer = g.actionmailer_3_2_13;
actionpack = g.actionpack_3_2_13;
activemodel = g.activemodel_3_2_13;
activerecord = g.activerecord_3_2_13;
activeresource = g.activeresource_3_2_13;
activesupport = g.activesupport_3_2_13;
addressable = g.addressable_2_3_3;
arel = g.arel_3_0_2;
atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
@ -17,7 +17,7 @@ g: # Get dependencies from patched gems
aws_sdk = g.aws_sdk_1_8_5;
bitbucket_backup = g.bitbucket_backup_0_2_2;
builder = g.builder_3_2_0;
buildr = g.buildr_1_4_10;
buildr = g.buildr_1_4_11;
bundler = g.bundler_1_3_4;
childprocess = g.childprocess_0_3_9;
chronic = g.chronic_0_9_1;
@ -28,48 +28,51 @@ g: # Get dependencies from patched gems
erubis = g.erubis_2_7_0;
eventmachine = g.eventmachine_1_0_3;
eventmachine_tail = g.eventmachine_tail_0_6_4;
execjs = g.execjs_1_4_0;
fakes3 = g.fakes3_0_1_5;
faraday = g.faraday_0_8_6;
faraday = g.faraday_0_8_7;
faraday_middleware = g.faraday_middleware_0_8_8;
ffi = g.ffi_1_4_0;
ffi = g.ffi_1_6_0;
file_tail = g.file_tail_1_0_12;
foreman = g.foreman_0_62_0;
highline = g.highline_1_6_15;
highline = g.highline_1_6_16;
hike = g.hike_1_2_1;
hoe = g.hoe_3_1_0;
i18n = g.i18n_0_6_4;
journey = g.journey_1_0_4;
jruby_pageant = g.jruby_pageant_1_1_1;
jsduck = g.jsduck_4_6_2;
jsduck = g.jsduck_4_7_1;
json = g.json_1_7_7;
json_pure = g.json_pure_1_7_7;
libv8 = g.libv8_3_3_10_4;
macaddr = g.macaddr_1_6_1;
mail = g.mail_2_4_4;
mail = g.mail_2_5_3;
mime_types = g.mime_types_1_21;
minitar = g.minitar_0_5_3;
multi_json = g.multi_json_1_6_1;
multi_json = g.multi_json_1_7_2;
multipart_post = g.multipart_post_1_2_0;
net_sftp = g.net_sftp_2_0_5;
net_ssh = g.net_ssh_2_6_6;
nix = g.nix_0_1_1;
nokogiri = g.nokogiri_1_5_6;
nokogiri = g.nokogiri_1_5_9;
papertrail = g.papertrail_0_9_7;
papertrail_cli = g.papertrail_cli_0_9_3;
parallel = g.parallel_0_6_2;
parallel = g.parallel_0_6_3;
polyglot = g.polyglot_0_3_3;
rack = g.rack_1_5_2;
rack_cache = g.rack_cache_1_2;
rack_protection = g.rack_protection_1_5_0;
rack_ssl = g.rack_ssl_1_3_3;
rack_test = g.rack_test_0_6_2;
rails = g.rails_3_2_12;
railties = g.railties_3_2_12;
rake = g.rake_10_0_3;
rails = g.rails_3_2_13;
railties = g.railties_3_2_13;
rake = g.rake_10_0_4;
rb_fsevent = g.rb_fsevent_0_9_3;
rdiscount = g.rdiscount_2_0_7_1;
rdoc = g.rdoc_3_12_2;
remote_syslog = g.remote_syslog_1_6_13;
right_aws = g.right_aws_3_0_5;
right_http_connection = g.right_http_connection_1_3_0;
rjb = g.rjb_1_4_6;
rspec = g.rspec_2_11_0;
rspec_core = g.rspec_core_2_11_1;
@ -85,9 +88,9 @@ g: # Get dependencies from patched gems
syslog_protocol = g.syslog_protocol_0_9_2;
systemu = g.systemu_2_5_2;
therubyracer = g.therubyracer_0_10_2;
thin = g.thin_1_5_0;
thor = g.thor_0_17_0;
tilt = g.tilt_1_3_5;
thin = g.thin_1_5_1;
thor = g.thor_0_18_0;
tilt = g.tilt_1_3_6;
tins = g.tins_0_7_2;
treetop = g.treetop_1_4_12;
tzinfo = g.tzinfo_0_3_37;
@ -97,7 +100,7 @@ g: # Get dependencies from patched gems
xml_simple = g.xml_simple_1_1_1;
yajl_ruby = g.yajl_ruby_1_1_0;
};
gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
gems = {
ZenTest_4_9_0 = {
basename = ''ZenTest'';
@ -130,71 +133,71 @@ installed versions.'';
requiredGems = [ ];
sha256 = ''16bp7rwl463m0d213rmwp4rjfwiw1bm529c518v91l18h7hcnb96'';
};
actionmailer_3_2_12 = {
actionmailer_3_2_13 = {
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.12'';
requiredGems = [ g.actionpack_3_2_12 g.mail_2_4_4 ];
sha256 = ''0rjcyz5p139iv7r9gb9nw6c490mksf6n3rnfxsg6bdaxpabinlc7'';
name = ''actionmailer-3.2.13'';
requiredGems = [ g.actionpack_3_2_13 g.mail_2_5_3 ];
sha256 = ''0ksw1b5rba8l6400qgc6zjdn14q68n6crjmm76ggg32r4wv3xn06'';
};
actionpack_3_2_12 = {
actionpack_3_2_13 = {
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.12'';
requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_5 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ];
sha256 = ''19p8slf607ssvhd1xkqmk0ddhxqh99faqbgw9i0gyjh1hxyh4apk'';
name = ''actionpack-3.2.13'';
requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_5 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ];
sha256 = ''1m3kd3rwa4z0yik68xi0l9q71lyzq4gdciqaw5w2w9pal1cj8y5w'';
};
activemodel_3_2_12 = {
activemodel_3_2_13 = {
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.12'';
requiredGems = [ g.activesupport_3_2_12 g.builder_3_0_4 ];
sha256 = ''1w43k2yhdybrrhph87zhb9shc1j8z1ryhpqy15y7cj9gc4a1bnqf'';
name = ''activemodel-3.2.13'';
requiredGems = [ g.activesupport_3_2_13 g.builder_3_0_4 ];
sha256 = ''0lpc9ylwm00g66hmgj06iq51m2l234ii7k6qsjiywf9x5fq6khn5'';
};
activerecord_3_2_12 = {
activerecord_3_2_13 = {
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.12'';
requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.arel_3_0_2 g.tzinfo_0_3_37 ];
sha256 = ''0fl8iyv3gcy72y79iv4ccyck8ik02rrl3pdy7yxfhlnqgryp8syi'';
name = ''activerecord-3.2.13'';
requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 g.arel_3_0_2 g.tzinfo_0_3_37 ];
sha256 = ''1z5rrjy2v27xldr24sd4sxi6k6f5anyg20kwj3qyc0jjn8c0gv85'';
};
activeresource_3_2_12 = {
activeresource_3_2_13 = {
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.12'';
requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 ];
sha256 = ''0dmy7n93ndxfqkccs0mv82dzkr130414djg96qi8njyj07ad84fi'';
name = ''activeresource-3.2.13'';
requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 ];
sha256 = ''1r4ph4cqd32d4lq9bfyv1dpfxc4qndcqhqx7h7xg4p0va7dz251l'';
};
activesupport_3_2_12 = {
activesupport_3_2_13 = {
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.12'';
requiredGems = [ g.i18n_0_6_4 g.multi_json_1_6_1 ];
sha256 = ''1giqkprxjf5gyfyhn5nz9q8a5gi3v8irxhkpqr00zc5fw1azllsg'';
name = ''activesupport-3.2.13'';
requiredGems = [ g.i18n_0_6_1 g.multi_json_1_7_2 ];
sha256 = ''1vailj8ja9g3s029p5qbvqdpxcis5gcpkl2d6j7a6d36hxlwlf8y'';
};
addressable_2_3_3 = {
basename = ''addressable'';
@ -270,7 +273,7 @@ rails support and extra plugins for migrations and fixtures.'';
longDescription = ''AWS SDK for Ruby'';
};
name = ''aws-sdk-1.8.5'';
requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_7 ];
requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_9 g.json_1_7_7 ];
sha256 = ''0rhkkkfsw0qzckn99mnvpbnl7b1kysma3x8bbqwah2x438kwygpb'';
};
bitbucket_backup_0_2_2 = {
@ -281,7 +284,7 @@ rails support and extra plugins for migrations and fixtures.'';
longDescription = ''A tool to backup Bitbucket repos.'';
};
name = ''bitbucket-backup-0.2.2'';
requiredGems = [ g.highline_1_6_15 g.json_1_7_7 ];
requiredGems = [ g.highline_1_6_16 g.json_1_7_7 ];
sha256 = ''1kzg6pkzw04n96i6mhb74gpg4c899wly5fc2m1y6m2xvn71qksys'';
};
builder_3_0_4 = {
@ -332,7 +335,7 @@ simple to do. Currently the following builder objects are supported:
requiredGems = [ ];
sha256 = ''0f2cpfx6lpazb1wrz3lf06qp6f0qf0gdq5z8xnhkplc3fz3kslb0'';
};
buildr_1_4_10 = {
buildr_1_4_11 = {
basename = ''buildr'';
meta = {
description = ''Build like you code'';
@ -344,9 +347,9 @@ to do, and it takes care of the rest. But also something we can easily extend
for those one-off tasks, with a language that's a joy to use.
'';
};
name = ''buildr-1.4.10'';
name = ''buildr-1.4.11'';
requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_4 ];
sha256 = ''1x192r8ab5zr9rlp1i9b3pi3y74f9pj2w491wkgshgwj22akh6vn'';
sha256 = ''0bdrwl9jvxc5h2wqsyacr688hxvzcqan1bhqyryb5bg9a5gpscb4'';
};
bundler_1_3_4 = {
basename = ''bundler'';
@ -367,7 +370,7 @@ for those one-off tasks, with a language that's a joy to use.
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.9'';
requiredGems = [ g.ffi_1_4_0 ];
requiredGems = [ g.ffi_1_6_0 ];
sha256 = ''0jbz2ix7ff9ry8717lhcq9w8j8yd45akw48giwgdqccay5mlph7d'';
};
chronic_0_9_1 = {
@ -492,6 +495,17 @@ using TCP/IP, especially if custom protocols are required.'';
requiredGems = [ g.eventmachine_1_0_3 ];
sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61'';
};
execjs_1_4_0 = {
basename = ''execjs'';
meta = {
description = ''Run JavaScript code from Ruby'';
homepage = ''https://github.com/sstephenson/execjs'';
longDescription = ''ExecJS lets you run JavaScript code from Ruby.'';
};
name = ''execjs-1.4.0'';
requiredGems = [ g.multi_json_1_7_2 ];
sha256 = ''0b69ci2afbcdqsri3i89a7s7j7palxsxdb65x6h2wx79kzlc5xcs'';
};
fakes3_0_1_5 = {
basename = ''fakes3'';
meta = {
@ -499,18 +513,18 @@ using TCP/IP, especially if custom protocols are required.'';
longDescription = ''Use FakeS3 to test basic S3 functionality without actually connecting to S3'';
};
name = ''fakes3-0.1.5'';
requiredGems = [ g.thor_0_17_0 g.builder_3_2_0 ];
requiredGems = [ g.thor_0_18_0 g.builder_3_2_0 ];
sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib'';
};
faraday_0_8_6 = {
faraday_0_8_7 = {
basename = ''faraday'';
meta = {
description = ''HTTP/REST API client library.'';
homepage = ''https://github.com/lostisland/faraday'';
};
name = ''faraday-0.8.6'';
name = ''faraday-0.8.7'';
requiredGems = [ g.multipart_post_1_2_0 ];
sha256 = ''16jd0gnqfrh5v4v88nlasyjjm8cmf2w2p6gphxq64mvdxlcdy5jy'';
sha256 = ''186a9md3ixanl2crdlw37kspw5wiyw16z9mj3aw8rd1yd5q56ddi'';
};
faraday_middleware_0_8_8 = {
basename = ''faraday_middleware'';
@ -520,19 +534,19 @@ using TCP/IP, especially if custom protocols are required.'';
longDescription = ''Various middleware for Faraday'';
};
name = ''faraday_middleware-0.8.8'';
requiredGems = [ g.faraday_0_8_6 ];
requiredGems = [ g.faraday_0_8_7 ];
sha256 = ''1n0g8pm7ynx6ffyqhscc1cqw97zhvd8isr31yfyj15335j1jsncz'';
};
ffi_1_4_0 = {
ffi_1_6_0 = {
basename = ''ffi'';
meta = {
description = ''Ruby FFI'';
homepage = ''http://wiki.github.com/ffi/ffi'';
longDescription = ''Ruby FFI library'';
};
name = ''ffi-1.4.0'';
name = ''ffi-1.6.0'';
requiredGems = [ ];
sha256 = ''06a29qvg487yk9pyi7wzyj5700mf7s3mjdqc6dsrh0467mjj9768'';
sha256 = ''0jhjzj8gb6cakv32a6czgrx8krb0hx8mmkwh5yv2lhdcv3ak013v'';
};
file_tail_1_0_12 = {
basename = ''file_tail'';
@ -553,10 +567,10 @@ using TCP/IP, especially if custom protocols are required.'';
longDescription = ''Process manager for applications with multiple components'';
};
name = ''foreman-0.62.0'';
requiredGems = [ g.thor_0_17_0 ];
requiredGems = [ g.thor_0_18_0 ];
sha256 = ''08i34rgs3bydk52zwpps4p0y2fvcnibp9lvfdhr75ppin7wv7lmr'';
};
highline_1_6_15 = {
highline_1_6_16 = {
basename = ''highline'';
meta = {
description = ''HighLine is a high-level command-line IO library.'';
@ -567,9 +581,9 @@ crank out anything from simple list selection to complete shells with just
minutes of work.
'';
};
name = ''highline-1.6.15'';
name = ''highline-1.6.16'';
requiredGems = [ ];
sha256 = ''1ilwlgylv92md9dnw6hqhrw8hiwk3f4k8qz6airqjp1rq9r594m1'';
sha256 = ''1v9dps96hryg7c8hqw41vbm1q02d7wpq7fj1c3bkzsd5518idgzi'';
};
highline_1_6_2 = {
basename = ''highline'';
@ -617,6 +631,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
requiredGems = [ g.rake_0_9_6 ];
sha256 = ''0i961x0hrd6fs1nsfham87dhn64gqpnai27l14jag7qbnp3a79yp'';
};
i18n_0_6_1 = {
basename = ''i18n'';
meta = {
description = ''New wave Internationalization support for Ruby'';
homepage = ''http://github.com/svenfuchs/i18n'';
longDescription = ''New wave Internationalization support for Ruby.'';
};
name = ''i18n-0.6.1'';
requiredGems = [ ];
sha256 = ''0x3lhp1vl1k4dfqx6k93hhxcpjkz57y8cf007ws7p845ywk6ibfl'';
};
i18n_0_6_4 = {
basename = ''i18n'';
meta = {
@ -650,16 +675,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
requiredGems = [ ];
sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl'';
};
jsduck_4_6_2 = {
jsduck_4_7_1 = {
basename = ''jsduck'';
meta = {
description = ''Simple JavaScript Duckumentation generator'';
homepage = ''https://github.com/senchalabs/jsduck'';
longDescription = ''Documentation generator for Sencha JS frameworks'';
};
name = ''jsduck-4.6.2'';
requiredGems = [ g.rdiscount_2_0_7_1 g.json_1_7_7 g.parallel_0_6_2 g.therubyracer_0_10_2 g.dimensions_1_2_0 ];
sha256 = ''035w4igfa6yy6234ff4zbiqfjn0bhwqs6k8kji52l7gzgskwmzln'';
name = ''jsduck-4.7.1'';
requiredGems = [ g.rdiscount_2_0_7_1 g.json_1_7_7 g.parallel_0_6_3 g.execjs_1_4_0 g.therubyracer_0_10_2 g.dimensions_1_2_0 ];
sha256 = ''0yn568ix4j4xpyrsk07cp5c3migsl7ymlg07fsyn5a65yrwyaiyv'';
};
json_1_7_7 = {
basename = ''json'';
@ -716,16 +741,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
requiredGems = [ g.systemu_2_5_2 ];
sha256 = ''1vd9l1d0lc0sq3rn1ya816wrzgxxqdzq6pgq0y0435qm6ikwy7ch'';
};
mail_2_4_4 = {
mail_2_5_3 = {
basename = ''mail'';
meta = {
description = ''Mail provides a nice Ruby DSL for making, sending and reading emails.'';
homepage = ''http://github.com/mikel/mail'';
longDescription = ''A really Ruby Mail handler.'';
};
name = ''mail-2.4.4'';
name = ''mail-2.5.3'';
requiredGems = [ g.mime_types_1_21 g.treetop_1_4_12 g.i18n_0_6_4 ];
sha256 = ''0idylz5pnlz34mrxm7gs9jbll2c0k0y9dq2qarhxk30gwyvjaxi3'';
sha256 = ''1afr3acz7vsvr4gp6wnrkw1iwbjhf14mh8g8mlm40r86wcwzr39k'';
};
mime_types_1_21 = {
basename = ''mime_types'';
@ -770,16 +795,16 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
requiredGems = [ ];
sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53'';
};
multi_json_1_6_1 = {
multi_json_1_7_2 = {
basename = ''multi_json'';
meta = {
description = ''A gem to provide swappable JSON backends.'';
homepage = ''http://github.com/intridea/multi_json'';
longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.'';
};
name = ''multi_json-1.6.1'';
name = ''multi_json-1.7.2'';
requiredGems = [ ];
sha256 = ''0p33swcl9i97wvv0cq9jkdl8q7xbc3j07apy35vsgldnhw99krcg'';
sha256 = ''17mfs58bilkn2b9g3ggh6pz1w4c2a72mqsr6zf0qd8vahw5h158q'';
};
multipart_post_1_2_0 = {
basename = ''multipart_post'';
@ -836,7 +861,7 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
requiredGems = [ ];
sha256 = ''0kwrbkkg0gxibhsz9dpd5zabcf2wqsicg28yiazyb3dc9dslk26k'';
};
nokogiri_1_5_6 = {
nokogiri_1_5_9 = {
basename = ''nokogiri'';
meta = {
description = ''Nokogiri (é¸) is an HTML, XML, SAX, and Reader parser'';
@ -847,9 +872,9 @@ many features is the ability to search documents via XPath or CSS3 selectors.
XML is like violence - if it doesnât solve your problems, you are not using
enough of it.'';
};
name = ''nokogiri-1.5.6'';
name = ''nokogiri-1.5.9'';
requiredGems = [ ];
sha256 = ''1235h8k242f6yi5qgb8rfcx6gp7g99djwqgrz0vb6w12pbp9kar8'';
sha256 = ''08qx4p3p6dd1yh58c4waz5rjmkzv3v315fr0l6n0dgkg71dczbi9'';
};
papertrail_0_9_7 = {
basename = ''papertrail'';
@ -859,7 +884,7 @@ enough of it.'';
longDescription = ''Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).'';
};
name = ''papertrail-0.9.7'';
requiredGems = [ g.addressable_2_3_3 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_6 g.faraday_middleware_0_8_8 ];
requiredGems = [ g.addressable_2_3_3 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_7 g.faraday_middleware_0_8_8 ];
sha256 = ''0v0m1v0qabbr9pmyl77znz39qy1m7p0xwvf3lf9hyq6n524f2dwr'';
};
papertrail_cli_0_9_3 = {
@ -873,15 +898,15 @@ enough of it.'';
requiredGems = [ g.papertrail_0_9_7 ];
sha256 = ''1914dcfqsmw5rl4xd1zwjrfbgwglyncxm8km06bgxaqn4wnaq5iv'';
};
parallel_0_6_2 = {
parallel_0_6_3 = {
basename = ''parallel'';
meta = {
description = ''Run any kind of code in parallel processes'';
homepage = ''http://github.com/grosser/parallel'';
homepage = ''https://github.com/grosser/parallel'';
};
name = ''parallel-0.6.2'';
name = ''parallel-0.6.3'';
requiredGems = [ ];
sha256 = ''05rdbb1jqv0179wjfj74a1739rsqv7ijf4jp1i5s6lzh878c6l6p'';
sha256 = ''17mg4vfx1c4z7399azf982a3cn522m43kavdqfhfs6i89m7z0l9n'';
};
polyglot_0_3_3 = {
basename = ''polyglot'';
@ -981,27 +1006,27 @@ request helpers feature.'';
requiredGems = [ g.rack_1_5_2 ];
sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky'';
};
rails_3_2_12 = {
rails_3_2_13 = {
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.12'';
requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_3_4 ];
sha256 = ''1jjnm74nzl5v3461c0mrbpa471yd6s8hnkmnxb64c2rm95c61wxz'';
name = ''rails-3.2.13'';
requiredGems = [ g.activesupport_3_2_13 g.actionpack_3_2_13 g.activerecord_3_2_13 g.activeresource_3_2_13 g.actionmailer_3_2_13 g.railties_3_2_13 g.bundler_1_3_4 ];
sha256 = ''1f5w4ivy0jxpjf1gkav064i0gd5x9xqnznwrkbc3slc9savprifz'';
};
railties_3_2_12 = {
railties_3_2_13 = {
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.12'';
requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.thor_0_17_0 g.rdoc_3_12_2 g.activesupport_3_2_12 g.actionpack_3_2_12 ];
sha256 = ''0d8wy1n591x12bigj3jh8c9djzi8k68vh14342mc22raxwp5rwdw'';
name = ''railties-3.2.13'';
requiredGems = [ g.rake_10_0_4 g.rack_ssl_1_3_3 g.thor_0_18_0 g.rdoc_3_12_2 g.activesupport_3_2_13 g.actionpack_3_2_13 ];
sha256 = ''01wbqfnlrs9nbs0b97dbxh7aap2bma7my530pcggxdf8ckms8kr9'';
};
rake_0_9_2_2 = {
basename = ''rake'';
@ -1025,16 +1050,16 @@ request helpers feature.'';
requiredGems = [ ];
sha256 = ''09kyh351gddn6gjz255hbaza1cw235xvfz9dc15rhyq9phvqdphc'';
};
rake_10_0_3 = {
rake_10_0_4 = {
basename = ''rake'';
meta = {
description = ''Ruby based make-like utility.'';
homepage = ''http://rake.rubyforge.org'';
longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.'';
};
name = ''rake-10.0.3'';
name = ''rake-10.0.4'';
requiredGems = [ ];
sha256 = ''09vvf3ylhdkr10vz7ajl3c7ql6dsnzkh3qclpafar433bzadfbpf'';
sha256 = ''032z0csyi5bjfgzq3winvqvi9fpf3bfx518hzzapkfy90y702ds1'';
};
rb_fsevent_0_9_3 = {
basename = ''rb_fsevent'';
@ -1083,6 +1108,73 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ];
sha256 = ''0q35j02k2l3fw3fdzq0i3rd6chsqr982gj13f3m3lsxm7kms03nw'';
};
right_aws_3_0_5 = {
basename = ''right_aws'';
meta = {
description = ''The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront.'';
longDescription = ''== DESCRIPTION:
The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront.
These gems have been used in production by RightScale since late 2006 and are being maintained to track enhancements made by Amazon.
The RightScale AWS gems comprise:
- RightAws::Ec2 -- interface to Amazon EC2 (Elastic Compute Cloud) and the
associated EBS (Elastic Block Store)
- RightAws::S3 and RightAws::S3Interface -- interface to Amazon S3 (Simple Storage Service)
- RightAws::Sqs and RightAws::SqsInterface -- interface to first-generation Amazon SQS (Simple Queue Service) (API version 2007-05-01)
- RightAws::SqsGen2 and RightAws::SqsGen2Interface -- interface to second-generation Amazon SQS (Simple Queue Service) (API version 2008-01-01)
- RightAws::SdbInterface and RightAws::ActiveSdb -- interface to Amazon SDB (SimpleDB)
- RightAws::AcfInterface -- interface to Amazon CloudFront, a content distribution service
== FEATURES:
- Full programmmatic access to EC2, EBS, S3, SQS, SDB, and CloudFront.
- Complete error handling: all operations check for errors and report complete
error information by raising an AwsError.
- Persistent HTTP connections with robust network-level retry layer using
RightHttpConnection). This includes socket timeouts and retries.
- Robust HTTP-level retry layer. Certain (user-adjustable) HTTP errors returned
by Amazon's services are classified as temporary errors.
These errors are automaticallly retried using exponentially increasing intervals.
The number of retries is user-configurable.
- Fast REXML-based parsing of responses (as fast as a pure Ruby solution allows).
- Uses libxml (if available) for faster response parsing.
- Support for large S3 list operations. Buckets and key subfolders containing
many (&gt; 1000) keys are listed in entirety. Operations based on list (like
bucket clear) work on arbitrary numbers of keys.
- Support for streaming GETs from S3, and streaming PUTs to S3 if the data source is a file.
- Support for single-threaded usage, multithreaded usage, as well as usage with multiple
AWS accounts.
- Support for both first- and second-generation SQS (API versions 2007-05-01
and 2008-01-01). These versions of SQS are not compatible.
- Support for signature versions 0 and 1 on SQS, SDB, and EC2.
- Interoperability with any cloud running Eucalyptus (http://eucalyptus.cs.ucsb.edu)
- Test suite (requires AWS account to do "live" testing).
'';
};
name = ''right_aws-3.0.5'';
requiredGems = [ g.right_http_connection_1_3_0 ];
sha256 = ''0pxdmxmqiidy3dpxsp4l0b1l6nq9b1sh4p1gkzalqm4l24646h4k'';
};
right_http_connection_1_3_0 = {
basename = ''right_http_connection'';
meta = {
description = ''RightScale's robust HTTP/S connection module'';
homepage = ''http://rightscale.rubyforge.org/'';
longDescription = ''Rightscale::HttpConnection is a robust HTTP/S library. It implements a retry
algorithm for low-level network errors.
== FEATURES:
- provides put/get streaming
- does configurable retries on connect and read timeouts, DNS failures, etc.
- HTTPS certificate checking
'';
};
name = ''right_http_connection-1.3.0'';
requiredGems = [ ];
sha256 = ''0900zy2ya57vhxdkdm2gj7xmvzj4gwm5l7ad0lh68ka3vxhdi7ap'';
};
rjb_1_4_2 = {
basename = ''rjb'';
meta = {
@ -1202,7 +1294,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
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.31.0'';
requiredGems = [ g.multi_json_1_6_1 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
requiredGems = [ g.multi_json_1_7_2 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
sha256 = ''1nv3ff31g183kdb97jjz0y7ny3vdnccd09pgblpj87bzhrrdfv3r'';
};
servolux_0_10_0 = {
@ -1227,7 +1319,7 @@ interpreters.'';
longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.'';
};
name = ''sinatra-1.3.2'';
requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_3_5 ];
requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_3_6 ];
sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc'';
};
sprockets_2_2_2 = {
@ -1238,7 +1330,7 @@ interpreters.'';
longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
};
name = ''sprockets-2.2.2'';
requiredGems = [ g.hike_1_2_1 g.multi_json_1_6_1 g.rack_1_5_2 g.tilt_1_3_5 ];
requiredGems = [ g.hike_1_2_1 g.multi_json_1_7_2 g.rack_1_5_2 g.tilt_1_3_6 ];
sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s'';
};
syslog_protocol_0_9_2 = {
@ -1274,38 +1366,38 @@ interpreters.'';
requiredGems = [ g.libv8_3_3_10_4 ];
sha256 = ''111hm2l613v06sy7pzjzmnyi4x11rg3c2syhnpv8fn0wnn9rdiyb'';
};
thin_1_5_0 = {
thin_1_5_1 = {
basename = ''thin'';
meta = {
description = ''A thin and fast web server'';
homepage = ''http://code.macournoyer.com/thin/'';
longDescription = ''A thin and fast web server'';
};
name = ''thin-1.5.0'';
name = ''thin-1.5.1'';
requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_3 g.daemons_1_1_9 ];
sha256 = ''14sd2qbbk6y108z6v723mh3f1mk8s4fwxmmn9f8dk4xkhk4rwvq1'';
sha256 = ''0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga'';
};
thor_0_17_0 = {
thor_0_18_0 = {
basename = ''thor'';
meta = {
description = ''A scripting framework that replaces rake, sake and rubigen'';
homepage = ''http://whatisthor.com/'';
longDescription = ''A scripting framework that replaces rake, sake and rubigen'';
};
name = ''thor-0.17.0'';
name = ''thor-0.18.0'';
requiredGems = [ ];
sha256 = ''0gf46qafcfgmi20a2mnb3wkd9y6spgy2hq22h70377daj4zjxla2'';
sha256 = ''0m7pl518j5q1ymgxmsi6xfjp6k40mwbmzk33s760v53azwxkfxan'';
};
tilt_1_3_5 = {
tilt_1_3_6 = {
basename = ''tilt'';
meta = {
description = ''Generic interface to multiple Ruby template engines'';
homepage = ''http://github.com/rtomayko/tilt/'';
longDescription = ''Generic interface to multiple Ruby template engines'';
};
name = ''tilt-1.3.5'';
name = ''tilt-1.3.6'';
requiredGems = [ ];
sha256 = ''081saxdxnal4ky38a904jw3n2837m80g211w0zm5rx6m712mb6qd'';
sha256 = ''1yz6zfnwq0qyjn71115vd63ly8zm1jss0b2v7fbcbzzj9lrnq9y6'';
};
tins_0_7_2 = {
basename = ''tins'';

View file

@ -1,4 +1,4 @@
{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false, pthreads ? false}:
{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false, pthreads ? false, float ? false}:
let
version = "3.3.2";
localDefs = builderDefs.passthru.function {
@ -12,6 +12,7 @@ let
# some distros seem to be shipping both versions within the same package?
# why does --enable-float still result in ..3f.so instead of ..3.so?
++ (if singlePrecision then [ "--enable-single" ] else [ ])
++ (if float then [ "--enable-float" ] else [ ])
++ (stdenv.lib.optional (!pthreads) "--enable-openmp")
++ (stdenv.lib.optional pthreads "--enable-threads")
# I think all i686 has sse

View file

@ -31,15 +31,16 @@ stdenv.mkDerivation ({
enableParallelBuilding = true;
patches =
/* Don't try to apply these patches to the Hurd's snapshot, which is
older. */
patches = stdenv.lib.optionals (hurdHeaders == null)
[ /* Have rpcgen(1) look for cpp(1) in $PATH. */
./rpcgen-path.patch
/* Allow NixOS and Nix to handle the locale-archive. */
./nix-locale-archive.patch
/* Don't use /etc/ld.so.cache, for non-NixOS systems. Currently
disabled on GNU/Hurd, which uses a more recent libc snapshot. */
/* Don't use /etc/ld.so.cache, for non-NixOS systems. */
./dont-use-system-ld-so-cache.patch
/* Without this patch many KDE binaries crash. */

View file

@ -0,0 +1,18 @@
{ cabal, deepseq }:
cabal.mkDerivation (self: {
pname = "HUnit";
version = "1.2.5.2";
sha256 = "0hcs6qh8bqhip1kkjjnw7ccgcsmawdz5yvffjj5y8zd2vcsavx8a";
buildDepends = [ deepseq ];
meta = {
homepage = "http://hunit.sourceforge.net/";
description = "A unit testing framework for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "case-insensitive";
version = "1.0";
sha256 = "1x437b5yyh930a5dr642lvfdgpx12w4ms70whiw1ffjjhssb88zk";
version = "1.0.0.1";
sha256 = "1yp8895qvxcmai0hvxdq77qss9cia2f9fyn6rm0hln3rcx8n53xm";
buildDepends = [ deepseq hashable text ];
testDepends = [ HUnit testFramework testFrameworkHunit text ];
meta = {

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "certificate";
version = "1.3.5";
sha256 = "17g2alyib89y2k8jjg4b6jskz0ndpr92yi8hzra7vw7ygfi5mi4j";
version = "1.3.6";
sha256 = "1w7xndslapy4ycgf2xshgx90i3v04nsck9l2mzc74nrnwm817b2m";
isLibrary = true;
isExecutable = true;
buildDepends = [

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "clientsession";
version = "0.8.1";
sha256 = "1x4qfm4hkvm3xmn7hnvcx1j900g97qhks66xzik1wvsjy3piwpgd";
version = "0.9";
sha256 = "0cyw34vzvv1j7w094cjcf97g8bki7l9x82s8csaf96y6d9qws308";
buildDepends = [
base64Bytestring cereal cipherAes cprngAes cryptoApi entropy skein
tagged

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "1.0.4.1";
sha256 = "1fihn6ixs6cmim5y605w2mzjrcwplr58r835wq9k3arb25d5wnys";
version = "1.0.4.2";
sha256 = "11xrqn7jc4vccfwds6hy0d3jpm0d0ycwaszv18xk237zwl63w159";
buildDepends = [
liftedBase mmorph monadControl resourcet text transformers
transformersBase void

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "cryptohash";
version = "0.8.3";
sha256 = "1fcqbbclii2hmbhi7h64v0nnbc34zzs107m3lqq38iiyy5fvqqv2";
version = "0.8.4";
sha256 = "0h58apxcrvpkyj3s2c7l68g7biv80snkn53g6jya1s687xff8fmn";
buildDepends = [ cereal cryptoApi tagged ];
testDepends = [
HUnit QuickCheck testFramework testFrameworkHunit

View file

@ -0,0 +1,13 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "data-default-class";
version = "0.0.1";
sha256 = "0ccgr3jllinchqhw3lsn73ic6axk4196if5274rr1rghls0fxj5d";
meta = {
description = "A class for types with a default value";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
};
})

View file

@ -0,0 +1,14 @@
{ cabal, dataDefaultClass }:
cabal.mkDerivation (self: {
pname = "data-default-instances-base";
version = "0.0.1";
sha256 = "1832nq6by91f1iw73ycvkbgn8kpra83pvf2q61hy47xffh0zy4pb";
buildDepends = [ dataDefaultClass ];
meta = {
description = "Default instances for types in base";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
};
})

View file

@ -0,0 +1,14 @@
{ cabal, dataDefaultClass }:
cabal.mkDerivation (self: {
pname = "data-default-instances-containers";
version = "0.0.1";
sha256 = "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5";
buildDepends = [ dataDefaultClass ];
meta = {
description = "Default instances for types in containers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
};
})

View file

@ -0,0 +1,14 @@
{ cabal, dataDefaultClass, dlist }:
cabal.mkDerivation (self: {
pname = "data-default-instances-dlist";
version = "0.0.1";
sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x";
buildDepends = [ dataDefaultClass dlist ];
meta = {
description = "Default instances for types in dlist";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
};
})

View file

@ -0,0 +1,14 @@
{ cabal, dataDefaultClass }:
cabal.mkDerivation (self: {
pname = "data-default-instances-old-locale";
version = "0.0.1";
sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0";
buildDepends = [ dataDefaultClass ];
meta = {
description = "Default instances for types in old-locale";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
};
})

View file

@ -1,10 +1,17 @@
{ cabal, dlist }:
{ cabal, dataDefaultClass, dataDefaultInstancesBase
, dataDefaultInstancesContainers, dataDefaultInstancesDlist
, dataDefaultInstancesOldLocale
}:
cabal.mkDerivation (self: {
pname = "data-default";
version = "0.5.1";
sha256 = "05zp9bcxm4lcdqniwckq0zi014iqcnqbrk5wh54dyy83h97z6mpv";
buildDepends = [ dlist ];
version = "0.5.2";
sha256 = "1w9wqv3k579zp5w11v06fak0lr9zzads49b1c9rb1vkz1d8bvf82";
buildDepends = [
dataDefaultClass dataDefaultInstancesBase
dataDefaultInstancesContainers dataDefaultInstancesDlist
dataDefaultInstancesOldLocale
];
meta = {
description = "A class for types with a default value";
license = self.stdenv.lib.licenses.bsd3;

View file

@ -4,13 +4,12 @@
cabal.mkDerivation (self: {
pname = "diagrams-lib";
version = "0.6.0.1";
sha256 = "00ysdppl2jv0kspj0pjy8qj8shc9gg6g10lkq62vlvr39wnxx6yj";
version = "0.6.0.2";
sha256 = "0jxpbggwgbjnl2yx7y0zcjs2fls7y1wm33wllq5j9snkiz1n81hb";
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";

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "doctest";
version = "0.9.5.1";
sha256 = "0phakf605pdwp89y522wm17n1bflxlgqkgahklnf10wnywxwm7cs";
version = "0.9.6";
sha256 = "0gw13pm4hg69v60swsv6w4iwzgdj5f4pkcyfmgzfp1dx399p6hyl";
isLibrary = true;
isExecutable = true;
buildDepends = [ deepseq filepath ghcPaths syb transformers ];

View file

@ -2,10 +2,9 @@
cabal.mkDerivation (self: {
pname = "dual-tree";
version = "0.1.0.1";
sha256 = "09bdid65frccpbh1bs01f7vprq0vfgqsb5bfa4j8yi3q773mycb2";
version = "0.1.0.2";
sha256 = "0ys50m8yjksxi33qyk6ql4ldpdzb0fvxqvywi3y46xi16w5yrkb0";
buildDepends = [ monoidExtras newtype semigroups ];
jailbreak = true;
meta = {
description = "Rose trees with cached and accumulating monoidal annotations";
license = self.stdenv.lib.licenses.bsd3;

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "fclabels";
version = "1.1.4.3";
sha256 = "10qr0ncsqxg0dg2f73ip873gr342saxhidaf3c6g5vr03cvmmkap";
version = "1.1.5";
sha256 = "0g9h1mayzf8v9dg84b54cqjbz9m9hdmj9a2zh0lg2kbc1v7iwlx1";
buildDepends = [ mtl transformers ];
meta = {
description = "First class accessor labels";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "generic-deriving";
version = "1.4.0";
sha256 = "15av3l4m4qn5by41rkpdvp1kyp3fi9ixvy76wmyj20c46kjbmra7";
version = "1.5.0";
sha256 = "1m3hckwpzmarlvm2xq22za3386ady6p89kg7nd8cnjkifnnbz20r";
meta = {
description = "Generic programming library for generalised deriving";
license = self.stdenv.lib.licenses.bsd3;

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "ghc-mod";
version = "1.12.3";
sha256 = "1dc919xbq7aqvpayqh9czvpzz4w4j082d1fjv0n9b7i4a780xghv";
version = "1.12.4";
sha256 = "1f4pdwimzc2i7bb7ccpbl8pn18ygnqd65xw1z5cmhlswasbdab14";
isLibrary = false;
isExecutable = true;
buildDepends = [
@ -25,6 +25,7 @@ cabal.mkDerivation (self: {
ensureDir "$out/share/emacs"
mv $pname-$version emacs/site-lisp
'';
doCheck = false;
meta = {
homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
description = "Happy Haskell programming on Emacs/Vim";

View file

@ -1,10 +1,10 @@
{ cabal, Cabal, filepath, tar }:
{ cabal, Cabal, filepath, tar, utf8String }:
cabal.mkDerivation (self: {
pname = "hackage-db";
version = "1.4";
sha256 = "12z1ak21xc9v373j956gz8l4ryj0582lgbl9ykp8q46n9b8sxfph";
buildDepends = [ Cabal filepath tar ];
version = "1.5";
sha256 = "1m7f6vwgjzibk8rd14y6m62xv5969ns94a57sansi9d83q6rj9iv";
buildDepends = [ Cabal filepath tar utf8String ];
meta = {
homepage = "http://github.com/peti/hackage-db";
description = "provide access to the Hackage database via Data.Map";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hspec-expectations";
version = "0.3.0.3";
sha256 = "1ppcbfmcgrd1lwswa293fxwny6khhg4blygfbcsawrvgc5ji0q74";
version = "0.3.2";
sha256 = "0962wlngqck0wc7mcby9bzci1s8d9a91vsm39rnab5wifhc2c6xi";
buildDepends = [ HUnit ];
testDepends = [ hspec HUnit markdownUnlit silently ];
doCheck = false;

View file

@ -1,16 +1,16 @@
{ cabal, ansiTerminal, filepath, hspecExpectations, HUnit
, QuickCheck, setenv, silently, time, transformers
{ cabal, ansiTerminal, deepseq, filepath, hspecExpectations, HUnit
, QuickCheck, quickcheckIo, random, setenv, time, transformers
}:
cabal.mkDerivation (self: {
pname = "hspec-meta";
version = "1.4.5";
sha256 = "0k50vwzg3ka4727bj63y4gsvw4g80gnalj31rsbvj3afl9gikkk7";
version = "1.5.2";
sha256 = "1kzlppbp8ralkpi89qrfdm5yrr72b9iq4nrvmblyjrb67h9412q0";
isLibrary = true;
isExecutable = true;
buildDepends = [
ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv
silently time transformers
ansiTerminal deepseq filepath hspecExpectations HUnit QuickCheck
quickcheckIo random setenv time transformers
];
doCheck = false;
meta = {

View file

@ -1,22 +1,24 @@
{ cabal, ansiTerminal, doctest, filepath, ghcPaths
, hspecExpectations, hspecMeta, HUnit, QuickCheck, setenv, silently
, time, transformers
{ cabal, ansiTerminal, deepseq, doctest, filepath, ghcPaths
, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo
, random, setenv, silently, time, transformers
}:
cabal.mkDerivation (self: {
pname = "hspec";
version = "1.4.5";
sha256 = "1dfwc1gjsawafi6k19hsw4kd5ahp8a9hdkyrm7nhjp4kjzgd2ymf";
version = "1.5.2";
sha256 = "1bndznbq7qyqr4j4mnsxf3dabmjyzah0bsiyynrc00ay1pf033l8";
isLibrary = true;
isExecutable = true;
buildDepends = [
ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv
silently time transformers
ansiTerminal deepseq filepath hspecExpectations HUnit QuickCheck
quickcheckIo random setenv time transformers
];
testDepends = [
ansiTerminal doctest filepath ghcPaths hspecExpectations hspecMeta
HUnit QuickCheck setenv silently time transformers
ansiTerminal deepseq doctest filepath ghcPaths hspecExpectations
hspecMeta HUnit QuickCheck quickcheckIo random setenv silently time
transformers
];
doCheck = self.stdenv.system == "x86_64-linux";
meta = {
homepage = "http://hspec.github.com/";
description = "Behavior-Driven Development for Haskell";

View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "http-reverse-proxy";
version = "0.1.1.3";
sha256 = "0z2h2xbvg034snfh3hzc0v2zp5j57lcak2h4vz10lwaqr3jxqnpn";
version = "0.1.1.4";
sha256 = "0j77hp1ddbxrsv65xf6kqbl8jnvl6qzx98p0lg73j7s76j7vg9cd";
buildDepends = [
blazeBuilder caseInsensitive classyPrelude conduit dataDefault
httpConduit httpTypes liftedBase monadControl network

View file

@ -0,0 +1,28 @@
{ cabal, alex, exceptionMtl, exceptionTransformers, filepath, happy
, haskellSrcMeta, HUnit, mainlandPretty, mtl, srcloc, syb, symbol
, testFramework, testFrameworkHunit
}:
cabal.mkDerivation (self: {
pname = "language-c-quote";
version = "0.7.1";
sha256 = "14gh944wpwg4csxwswr9jlll4p5wc3x1fhbqsfh9lqf98ys7ij3z";
buildDepends = [
exceptionMtl exceptionTransformers filepath haskellSrcMeta
mainlandPretty mtl srcloc syb symbol
];
testDepends = [
HUnit srcloc symbol testFramework testFrameworkHunit
];
buildTools = [ alex happy ];
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";
description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

View file

@ -10,8 +10,8 @@
cabal.mkDerivation (self: {
pname = "lens";
version = "3.8.7.3";
sha256 = "0z28vv3k6zg2zsd3pb1vlhv75q0zjlh4zf1md77cviyyljwc0j09";
version = "3.9.0.2";
sha256 = "0ch38z33zgdyzjmc7jqwabwq68iidicpzhbwzpd4fvcqdp27apl2";
buildDepends = [
bifunctors comonad comonadsFd comonadTransformers contravariant
distributive filepath genericDeriving hashable

View file

@ -1,14 +1,18 @@
{ cabal, aeson, cereal, cryptoApi, httpConduit, httpTypes, network
, pureMD5, text
{ cabal, aeson, attoparsec, cereal, cryptoApi, httpConduit
, httpTypes, HUnit, network, pureMD5, testFramework
, testFrameworkHunit, text
}:
cabal.mkDerivation (self: {
pname = "liblastfm";
version = "0.1.1.0";
sha256 = "1yrgyb0m1gdhsrkv3b8a5a0qii67v9gx1kbv79ixlac60bsm4q95";
version = "0.1.1.2";
sha256 = "1zckgjc0r2s1s6s9s309dr2ri8bzj1fi8gcbhm3hifczq1v149w9";
buildDepends = [
aeson cereal cryptoApi httpConduit httpTypes network pureMD5 text
];
testDepends = [
aeson attoparsec HUnit testFramework testFrameworkHunit text
];
meta = {
description = "Lastfm API interface";
license = self.stdenv.lib.licenses.mit;

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "lifted-base";
version = "0.2.0.2";
sha256 = "19xzparj0k5h4wx71gvbd7l653fak1p57za236sncmar8cps5pdx";
version = "0.2.0.3";
sha256 = "1sfrak4jf3mvns9y6iadyhj8zvy4wyrqiaxihrxv2qby14c45psx";
buildDepends = [
baseUnicodeSymbols monadControl transformersBase
];

View file

@ -2,10 +2,9 @@
cabal.mkDerivation (self: {
pname = "monoid-extras";
version = "0.2.2.2";
sha256 = "1fz93hm0sswisvwvbygxvbwmmnzqcxmz9h82i4361wzychf2si22";
version = "0.2.2.3";
sha256 = "00yj7wdyznsis82fb7i07s0vz8vsn2mpqk7jkgl9xxa57gk1rsax";
buildDepends = [ semigroups ];
jailbreak = true;
meta = {
description = "Various extra monoid-related definitions and utilities";
license = self.stdenv.lib.licenses.bsd3;

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "multiarg";
version = "0.10.0.0";
sha256 = "09clgin66i2m0b3ws7di9p15cy9bd144as832xpx4li6cfbg16ip";
version = "0.12.0.2";
sha256 = "0f90dsa5ya55lrc0x0ziz01fjvaq85q4f8zsfci1w1rgxa9m7naa";
buildDepends = [ explicitException utf8String ];
meta = {
homepage = "https://github.com/massysett/multiarg";

View file

@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
aeson conduit monadControl persistent postgresqlLibpq
postgresqlSimple text time transformers
];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/book/persistent";
description = "Backend for the persistent library using postgresql";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "profunctors";
version = "3.3";
sha256 = "0cvar0qr2yf0lmqwhiy2ibajiq9cmqy2ikwn8l5mdxxh5q5rwgjj";
version = "3.3.0.1";
sha256 = "16d7xg929r4smmmcgi54bz7rsjxs6psksrdvzl4336sjpp3dw5h2";
buildDepends = [ comonad tagged ];
meta = {
homepage = "http://github.com/ekmett/profunctors/";

View file

@ -0,0 +1,14 @@
{ cabal, HUnit, QuickCheck }:
cabal.mkDerivation (self: {
pname = "quickcheck-io";
version = "0.1.0";
sha256 = "167ds7c7p1lcfsylxhq2sr0jxbviyim1n42dhyr0s0b6hazw8cjs";
buildDepends = [ HUnit QuickCheck ];
meta = {
description = "Use HUnit assertions as QuickCheck properties";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
};
})

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "reflection";
version = "1.1.7";
sha256 = "073v9y09fvh7nsfqp1jp2ncrq0xkcv5fvikl769ghv2ycgkfxl4z";
version = "1.2.0.1";
sha256 = "17pzw45yr13nq9y9nb3siypj5amkixy82xm8bpy0nzs1cdfyawx6";
buildDepends = [ tagged ];
meta = {
homepage = "http://github.com/ekmett/reflection";

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "shake";
version = "0.10.1";
sha256 = "0k8hk5aw5xk4aq7g8yjlkn1rjhcdy3jd5mna9phjs23kmfsmayk6";
version = "0.10.2";
sha256 = "0045dz46iacrihqlsdg00zmnkrma5swnmy2bp4h91fx0829lki9n";
isLibrary = true;
isExecutable = true;
buildDepends = [

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "skein";
version = "0.1.0.12";
sha256 = "1nx0ad0y7zmljc7phwin2aph6frs70hvz3di8q52kzpi5m1h3g3a";
version = "1.0.0";
sha256 = "03r9kqbvv6z1d8ivdwrxvac5bnd29w116pbixyrcrbx0sg1wwpfa";
buildDepends = [ cereal cryptoApi tagged ];
testDepends = [ cereal cryptoApi filepath hspec tagged ];
meta = {

View file

@ -20,6 +20,9 @@ cabal.mkDerivation (self: {
unorderedContainers vector vectorAlgorithms xmlhtml
];
jailbreak = true;
patchPhase = ''
sed -i -e 's|lens .*>= 3.7.6.*$|lens|' snap.cabal
'';
meta = {
homepage = "http://snapframework.com/";
description = "Top-level package for the Snap Web Framework";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "split";
version = "0.2.1.2";
sha256 = "0wjw4j9wgk66h7filzfh0py9b0wwmaynvwqvd6kinxgms86fpvyi";
version = "0.2.1.3";
sha256 = "1s3aga7asxz495bx7i72a6fkdlz1zv20rrrqg1avj7b1sjn3gy9w";
testDepends = [ QuickCheck ];
meta = {
description = "Combinator library for splitting lists";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "unix-compat";
version = "0.4.1.0";
sha256 = "155m3zg692zbfyck4njx1vzvb5vgs0dkzyzlqf2x78ds6j9bzjzi";
version = "0.4.1.1";
sha256 = "1cjny6zca5wdj7d56kjkaxlad85kknn91pisrizjy6wngszyaigf";
meta = {
homepage = "http://github.com/jystic/unix-compat";
description = "Portable POSIX-compatibility layer";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "unix-time";
version = "0.1.5";
sha256 = "13xks5kshr51mbs112j8vvhirzhbi3fq6zjw7l4z2iwn8chh4hwg";
version = "0.1.6";
sha256 = "0l8k42n67qwc1ljxw2ksmdnj630q1ql0im0j1z7yv9kak9pmqfy6";
testDepends = [ doctest hspec QuickCheck time ];
meta = {
description = "Unix time parser/formatter and utilities";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "vector-space-points";
version = "0.1.2.0";
sha256 = "19azl6g14rsxs0qbik6x637qw9jv4xl01w65xd0xh7833mypmj6d";
version = "0.1.2.1";
sha256 = "0prbmk48xdr2gbxqpv0g89xz5v3k9wps9v2gymkh32jag2lgzi66";
buildDepends = [ newtype vectorSpace ];
meta = {
description = "A type for points, as distinct from vectors";

View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "warp";
version = "1.3.7.5";
sha256 = "1y6xnlrqfd763s5r79f53vlbk4iirnci6wpaicrm14f791w2mppc";
version = "1.3.8";
sha256 = "0lpyrdwgsaxzds6qrh0drp0r90x1va4d7z2n65xb0rhkslr3sk3l";
buildDepends = [
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
httpTypes liftedBase network networkConduit simpleSendfile

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "xml";
version = "1.3.12";
sha256 = "1lmqnzna0zy297y4q6qviv7a4966zz9mhfhk6anrp66cz890whai";
version = "1.3.13";
sha256 = "04xq2ma2if5gqz16bjrxwigh4vzw6m8i2zk11s5qg3d4z370fdn3";
buildDepends = [ text ];
meta = {
homepage = "http://code.galois.com";

View file

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "yesod-auth";
version = "1.1.5.3";
sha256 = "07srz4zpkn8w382xwi8ri6mh9kgplf0m51819zw1hympphmd9z82";
version = "1.1.6";
sha256 = "0g6ik3qvjnpyfbr2fciz53l62q44zi7ipil8v7hy56808n5y6i4i";
buildDepends = [
aeson authenticate blazeHtml blazeMarkup fileEmbed hamlet
httpConduit httpTypes liftedBase mimeMail network persistent

View file

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "yesod-core";
version = "1.1.8.2";
sha256 = "0brrvij1vldb5zr3vnynikaf1x479qrgf7k3162nhrmwl57lm9sz";
version = "1.1.8.3";
sha256 = "116vglpqh2561g0gzhm4ijwx829c50ai1hh715vwi5j5i01y2rkr";
buildDepends = [
aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
clientsession conduit cookie failure fastLogger hamlet httpTypes
@ -23,6 +23,7 @@ cabal.mkDerivation (self: {
blazeBuilder conduit hamlet hspec httpTypes HUnit QuickCheck random
shakespeareCss shakespeareJs text transformers wai waiTest
];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/";
description = "Creation of type-safe, RESTful web applications";

View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation (rec {
name = "libffi-3.0.9";
name = "libffi-3.0.13";
src = fetchurl {
url = "ftp://sourceware.org/pub/libffi/${name}.tar.gz";
sha256 = "0ln4jbpb6clcsdpb9niqk0frgx4k0xki96wiv067ig0q4cajb7aq";
sha256 = "077ibkf84bvcd6rw1m6jb107br63i2pp301rkmsbgg6300adxp8x";
};
doCheck = true;

View file

@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
# will actually use.
configureFlags = stdenv.lib.optional stdenv.isCygwin [ "--enable-static" ];
crossAttrs = {
# Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW).
dontStrip = true;
dontCrossStrip = true;
};
meta = {
description = "GNU libiconv, an iconv(3) implementation";

View file

@ -3,14 +3,14 @@
, libtasn1, ebtables, libgcrypt, yajl
}:
let version = "1.0.2"; in
let version = "1.0.3"; in
stdenv.mkDerivation {
name = "libvirt-${version}";
src = fetchurl {
url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
sha256 = "0yf104r1377pg0kmx6sshmh8v5z0bdvv6266y5gbcn46yx92g34v";
sha256 = "0mr727n0ygxk6y69srg3ahmjd7wligamw683x2snmz6wgk6llkzn";
};
buildInputs =
@ -30,7 +30,7 @@ stdenv.mkDerivation {
postInstall =
''
substituteInPlace $out/etc/rc.d/init.d/libvirt-guests \
substituteInPlace $out/libexec/libvirt-guests.sh \
--replace "$out/bin" "${gettext}/bin"
'';

View file

@ -0,0 +1,21 @@
{ stdenv, fetchurl, cmake, unzip }:
stdenv.mkDerivation rec {
name = "ocio-${version}";
version = "1.0.8";
src = fetchurl {
url = "https://github.com/imageworks/OpenColorIO/archive/v1.0.8.zip";
sha256 = "1l70bf40dz2znm9rh3r6xs9d6kp719y1djayb7dc89khfqqbx2di";
};
buildInputs = [ cmake unzip ];
meta = with stdenv.lib; {
homepage = http://opencolorio.org;
description = "A color management framework for visual effects and animation";
license = licenses.bsd3;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
};
}

View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
name = "libtirpc-0.2.2";
name = "libtirpc-0.2.3";
src = fetchurl {
url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
sha256 = "f05eb17c85d62423858b8f74512cfe66a9ae1cedf93f03c2a0a32e04f0a33705";
sha256 = "0g4jd8da0kfxz5lv1x5v7f3mfxw53cck8g2zz4llrjmlj42flaag";
};
# http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf

View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool }:
let
version = "1.2.19";
in
stdenv.mkDerivation rec {
name = "xmlsec-${version}";
src = fetchurl {
url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
sha256 = "1h5ar0h8n0l8isgic82w00cwfpw7i9wxw17kbdb6q3yvzb4zgj1g";
};
buildInputs = [ libxml2 gnutls libxslt pkgconfig libgcrypt libtool ];
enableParallelBuilding = true;
meta = {
homepage = http://www.aleksey.com/xmlsec;
description = "XML Security Library in C based on libxml2";
license = "MIT";
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -2,20 +2,20 @@
stdenv.mkDerivation rec {
pname = "leiningen";
version = "2.0.0";
version = "2.1.2";
name = "${pname}-${version}";
src = fetchurl {
url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
sha256 = "0malymlswxwgh8amkw37qjb8n34ylw3chgbdxgxkq34rkvhv60hb";
sha256 = "10s4xpwrhd8wz3h2vj8ay4rf2hw8vzswfkr8ckckk3fhjcn130dy";
};
jarsrc = fetchurl {
url = "https://leiningen.s3.amazonaws.com/downloads/leiningen-2.0.0-standalone.jar";
sha256 = "10jvk19mr5dcl5a9kzna9zslh77v3ixi8awhrhxi30dn1yj3r7ck";
url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar";
sha256 = "08jq21zpsgwsmsz7lpfxidj2s3mv8i23fjwyl9qc6dngskkx45sa";
};
patches = ./lein_2.0.0.patch;
patches = ./lein_2.1.2.patch;
inherit rlwrap clojure;
@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
description = "Project automation for Clojure";
license = "EPL";
platforms = stdenv.lib.platforms.unix;
maintainer = with stdenv.lib.maintainers; [the-kenny];
};
}

File diff suppressed because it is too large Load diff

View file

@ -63,5 +63,6 @@ stdenv.mkDerivation rec {
* even practicing guitar chords!
'';
license = "GPLv3";
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "spring-${version}";
version = "0.91.0";
version = "94.1";
src = fetchurl {
url = "mirror://sourceforge/springrts/spring_91.0_src.tar.lzma";
sha256 = "0ycn9yxpbw58a8p3j3wf3r0x102k665l27bfp1vxq7kpwlk6314l";
url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma";
sha256 = "19myqwpz4mi4zdlcv8318dps0ymmw7qpawhq1rgk73ycmaiyaaka";
};
buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL

View file

@ -1,16 +1,16 @@
{ stdenv, fetchurl, cmake, wxGTK, openal, pkgconfig, curl, libtorrentRasterbar
{ stdenv, fetchurl, cmake, wxGTK, openal, pkgconfig, curl, libtorrentRasterbar, libpng, libX11
, gettext, bash, gawk, boost}:
stdenv.mkDerivation rec {
name = "springlobby-${version}";
version = "0.146";
version = "0.169";
src = fetchurl {
url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
sha256 = "55899baf6732e48bfaa36d80974aa135c051d2cbb6fe92fbcffd80440639eedf";
sha256 = "1wr8q2ha3wh718rr5rg7l6v404nf1rgkg4wkja77rfqy7r18zn7g";
};
buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost];
buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost libpng libX11 ];
prePatch = ''
substituteInPlace tools/regen_config_header.sh --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"

View file

@ -26,6 +26,7 @@
ludo = "Ludovic Courtès <ludo@gnu.org>";
marcweber = "Marc Weber <marco-oweber@gmx.de>";
mornfall = "Petr Ročkai <me@mornfall.net>";
the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
neznalek = "Vladimír Čunát <vcunat@gmail.com>";
orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
page = "Carles Pagès <page@cubata.homelinux.net>";

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