1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00

Merge recent master into x-updates

Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
This commit is contained in:
Vladimír Čunát 2014-07-21 12:05:57 +02:00
commit 9b02635faa
91 changed files with 1289 additions and 174 deletions

View file

@ -17,7 +17,10 @@ in
# Note: the order in which desktop manager modules are imported here
# determines the default: later modules (if enabled) are preferred.
# E.g., if KDE is enabled, it supersedes xterm.
imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde4_next.nix ./e17.nix ./gnome3.nix ./xbmc.nix ];
imports = [
./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde4_next.nix
./e17.nix ./e18.nix ./gnome3.nix ./xbmc.nix
];
options = {

View file

@ -0,0 +1,40 @@
{ config, pkgs, ... }:
with pkgs.lib;
let
xcfg = config.services.xserver;
cfg = xcfg.desktopManager.e18;
in
{
options = {
services.xserver.desktopManager.e18.enable = mkOption {
default = false;
example = true;
description = "Enable the E18 desktop environment.";
};
};
config = mkIf (xcfg.enable && cfg.enable) {
environment.systemPackages = [
pkgs.e18.efl pkgs.e18.evas pkgs.e18.emotion pkgs.e18.elementary pkgs.e18.enlightenment
pkgs.e18.terminology pkgs.e18.econnman
];
services.xserver.desktopManager.session = [
{ name = "E18";
start = ''
${pkgs.e18.enlightenment}/bin/enlightenment_start
waitPID=$!
'';
}];
};
}

View file

@ -825,6 +825,7 @@ in
systemd.services."user@".restartIfChanged = false;
systemd.services.systemd-remount-fs.restartIfChanged = false;
systemd.services.systemd-journal-flush.restartIfChanged = false;
};
}

View file

@ -121,12 +121,26 @@ in
networking.usePredictableInterfaceNames = false;
systemd.services.wait-metadata-online = {
description = "Wait for GCE metadata server to become reachable";
wantedBy = [ "network-online.target" ];
before = [ "network-online.target" ];
path = [ pkgs.netcat ];
script = ''
# wait for the metadata server to become available for up to 60 seconds
for counter in {1..30}; do sleep 2 && nc -vzw 2 metadata 80 && break; done
'';
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
};
systemd.services.fetch-ssh-keys =
{ description = "Fetch host keys and authorized_keys for root user";
wantedBy = [ "multi-user.target" ];
wantedBy = [ "sshd.service" ];
before = [ "sshd.service" ];
after = [ "network.target" ];
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
path = [ pkgs.curl ];
script =
@ -148,7 +162,7 @@ in
fi
echo "obtaining SSH private host key..."
curl -o /root/ssh_host_ecdsa_key http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key
curl -o /root/ssh_host_ecdsa_key --retry-max-time 60 http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key
if [ $? -eq 0 -a -e /root/ssh_host_ecdsa_key ]; then
mv -f /root/ssh_host_ecdsa_key /etc/ssh/ssh_host_ecdsa_key
echo "downloaded ssh_host_ecdsa_key"
@ -156,7 +170,7 @@ in
fi
echo "obtaining SSH public host key..."
curl -o /root/ssh_host_ecdsa_key.pub http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key_pub
curl -o /root/ssh_host_ecdsa_key.pub --retry-max-time 60 http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key_pub
if [ $? -eq 0 -a -e /root/ssh_host_ecdsa_key.pub ]; then
mv -f /root/ssh_host_ecdsa_key.pub /etc/ssh/ssh_host_ecdsa_key.pub
echo "downloaded ssh_host_ecdsa_key.pub"

View file

@ -83,6 +83,21 @@ rec {
};
};
focusblur = pluginDerivation rec {
/* menu:
Blur/Focus Blur
*/
name = "focusblur-3.2.6";
buildInputs = [ gimp pkgconfig pkgs.fftwSinglePrec ] ++ gimp.nativeBuildInputs;
patches = [ ./patches/focusblur-glib.patch ];
postInstall = "fail";
installPhase = "installPlugins src/focusblur";
src = fetchurl {
url = "http://registry.gimp.org/files/${name}.tar.bz2";
sha256 = "1gqf3hchz7n7v5kpqkhqh8kwnxbsvlb5cr2w2n7ngrvl56f5xs1h";
};
};
resynthesizer = pluginDerivation {
/* menu:
Filters/Map/Resynthesize

View file

@ -0,0 +1,200 @@
ls diff --git focusblur-3.2.6/src/aaa.h focusblur-3.2.6/src/aaa.h
index 4a6d90b..c74cab2 100644
--- focusblur-3.2.6/src/aaa.h
+++ focusblur-3.2.6/src/aaa.h
@@ -19,8 +19,7 @@
#ifndef __AAA_H__
#define __AAA_H__
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
G_BEGIN_DECLS
diff --git focusblur-3.2.6/src/brush.h focusblur-3.2.6/src/brush.h
index 685b253..8778fec 100644
--- focusblur-3.2.6/src/brush.h
+++ focusblur-3.2.6/src/brush.h
@@ -22,7 +22,7 @@
#ifndef __FOCUSBLUR_BRUSH_H__
#define __FOCUSBLUR_BRUSH_H__
-#include <glib/gtypes.h>
+#include <glib.h>
#include "focusblurtypes.h"
G_BEGIN_DECLS
diff --git focusblur-3.2.6/src/depthmap.h focusblur-3.2.6/src/depthmap.h
index 78f5e99..baee540 100644
--- focusblur-3.2.6/src/depthmap.h
+++ focusblur-3.2.6/src/depthmap.h
@@ -22,7 +22,7 @@
#ifndef __FOCUSBLUR_DEPTHMAP_H__
#define __FOCUSBLUR_DEPTHMAP_H__
-#include <glib/gtypes.h>
+#include <glib.h>
#include "focusblurtypes.h"
#include "focusblurenums.h"
diff --git focusblur-3.2.6/src/diffusion.h focusblur-3.2.6/src/diffusion.h
index 07ffe4b..3c1e4b9 100644
--- focusblur-3.2.6/src/diffusion.h
+++ focusblur-3.2.6/src/diffusion.h
@@ -23,7 +23,7 @@
#define __FOCUSBLUR_DIFFUSION_H__
-#include <glib/gtypes.h>
+#include <glib.h>
#include "focusblur.h"
#include "focusblurtypes.h"
diff --git focusblur-3.2.6/src/fftblur.h focusblur-3.2.6/src/fftblur.h
index 124bcba..cd809fa 100644
--- focusblur-3.2.6/src/fftblur.h
+++ focusblur-3.2.6/src/fftblur.h
@@ -23,8 +23,7 @@
#define __FOCUSBLUR_FFTBLUR_H__
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
#include <libgimpwidgets/gimpwidgetstypes.h>
#include "focusblurparam.h"
diff --git focusblur-3.2.6/src/fftblurbuffer.h focusblur-3.2.6/src/fftblurbuffer.h
index b34d682..42e6380 100644
--- focusblur-3.2.6/src/fftblurbuffer.h
+++ focusblur-3.2.6/src/fftblurbuffer.h
@@ -28,8 +28,7 @@
#endif
#include <fftw3.h>
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
#include <gtk/gtkstyle.h>
#include <libgimp/gimptypes.h>
#include <libgimpwidgets/gimpwidgetstypes.h>
diff --git focusblur-3.2.6/src/fftblurproc.h focusblur-3.2.6/src/fftblurproc.h
index 495572d..10a34f4 100644
--- focusblur-3.2.6/src/fftblurproc.h
+++ focusblur-3.2.6/src/fftblurproc.h
@@ -23,8 +23,7 @@
#define __FOCUSBLUR_FFTBLUR_PROC_H__
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
#include "focusblurtypes.h"
diff --git focusblur-3.2.6/src/focusblur.h focusblur-3.2.6/src/focusblur.h
index 54ca40a..d7e13a6 100644
--- focusblur-3.2.6/src/focusblur.h
+++ focusblur-3.2.6/src/focusblur.h
@@ -22,7 +22,7 @@
#ifndef __FOCUSBLUR_H__
#define __FOCUSBLUR_H__
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
diff --git focusblur-3.2.6/src/focusblurparam.h focusblur-3.2.6/src/focusblurparam.h
index 64c887b..32865b4 100644
--- focusblur-3.2.6/src/focusblurparam.h
+++ focusblur-3.2.6/src/focusblurparam.h
@@ -22,8 +22,7 @@
#ifndef __FOCUSBLUR_PARAM_H__
#define __FOCUSBLUR_PARAM_H__
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
#include <gtk/gtkstyle.h>
#include <libgimp/gimptypes.h>
diff --git focusblur-3.2.6/src/focusblurstock.h focusblur-3.2.6/src/focusblurstock.h
index 15f3603..cfc0567 100644
--- focusblur-3.2.6/src/focusblurstock.h
+++ focusblur-3.2.6/src/focusblurstock.h
@@ -22,7 +22,7 @@
#ifndef __FOCUSBLUR_STOCK_H__
#define __FOCUSBLUR_STOCK_H__
-#include <glib/gtypes.h>
+#include <glib.h>
G_BEGIN_DECLS
diff --git focusblur-3.2.6/src/focusblurtypes.h focusblur-3.2.6/src/focusblurtypes.h
index 0954c60..1531c84 100644
--- focusblur-3.2.6/src/focusblurtypes.h
+++ focusblur-3.2.6/src/focusblurtypes.h
@@ -22,7 +22,7 @@
#ifndef __FOCUSBLUR_TYPES_H__
#define __FOCUSBLUR_TYPES_H__
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
diff --git focusblur-3.2.6/src/interface.h focusblur-3.2.6/src/interface.h
index 6defd27..e819c60 100644
--- focusblur-3.2.6/src/interface.h
+++ focusblur-3.2.6/src/interface.h
@@ -22,7 +22,7 @@
#ifndef __FOCUSBLUR_INTERFACE_H__
#define __FOCUSBLUR_INTERFACE_H__
-#include <glib/gtypes.h>
+#include <glib.h>
#include "focusblurtypes.h"
diff --git focusblur-3.2.6/src/render.h focusblur-3.2.6/src/render.h
index febbd24..a501f1e 100644
--- focusblur-3.2.6/src/render.h
+++ focusblur-3.2.6/src/render.h
@@ -24,7 +24,7 @@
#include "config.h"
-#include <glib/gtypes.h>
+#include <glib.h>
//#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
diff --git focusblur-3.2.6/src/shine.h focusblur-3.2.6/src/shine.h
index c5a3621..86b4c09 100644
--- focusblur-3.2.6/src/shine.h
+++ focusblur-3.2.6/src/shine.h
@@ -22,7 +22,7 @@
#ifndef __FOCUSBLUR_SHINE_H__
#define __FOCUSBLUR_SHINE_H__
-#include <glib/gtypes.h>
+#include <glib.h>
#include <libgimp/gimptypes.h>
#include "focusblurtypes.h"
diff --git focusblur-3.2.6/src/source.h focusblur-3.2.6/src/source.h
index 50d34ca..8eec35c 100644
--- focusblur-3.2.6/src/source.h
+++ focusblur-3.2.6/src/source.h
@@ -24,7 +24,7 @@
#include "config.h"
-#include <glib/gtypes.h>
+#include <glib.h>
#include <libgimp/gimptypes.h>
#include "focusblurtypes.h"

View file

@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
name = "calibre-1.44.0";
name = "calibre-1.45.0";
src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.xz";
sha256 = "14k9rzp4rphls4zkzrdq8kk0mgzsh5sdmngxklb58r71xj2r995j";
sha256 = "0g9fzpkjvi0h7h5azk3v425l8gxd8zidcz3nrzlg26hgvbkzpm20";
};
inherit python;

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "kdeconnect-${version}";
version = "0.7";
version = "0.7.2";
src = fetchurl {
url = "http://download.kde.org/unstable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz";
sha256 = "0a8g3avg9x5j07cf3c16i4w65q3fn1cbs8zxgq0vl14rzdy09q2j";
sha256 = "1v7sicgy39n8pn7nzq9f7lkmwbcvavhy3b66agyhxwmyzz6mcd4g";
};
buildInputs = [ gettext kdelibs libXtst makeWrapper qca2 qca2_ossl qjson ];

View file

@ -7,19 +7,19 @@
, gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient
, httpConduit, httpTypes, IfElse, json, liftedBase, lsof, MissingH
, monadControl, mtl, network, networkInfo, networkMulticast
, networkProtocolXmpp, openssh, optparseApplicative, perl
, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, securemem
, SHA, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck
, tastyRerun, text, time, transformers, unixCompat, utf8String
, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes, yesod
, yesodCore, yesodDefault, yesodForm, yesodStatic
, networkProtocolXmpp, openssh, optparseApplicative, pathPieces
, perl, QuickCheck, random, regexTdfa, rsync, SafeSemaphore
, securemem, SHA, shakespeare, stm, tasty, tastyHunit
, tastyQuickcheck, tastyRerun, text, time, transformers, unixCompat
, utf8String, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes
, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic
, fsnotify
}:
cabal.mkDerivation (self: {
pname = "git-annex";
version = "5.20140709";
sha256 = "0n636b52199kj8w3awfvrabg6c76kb133gbfh9r8sp0xrg376z2s";
version = "5.20140717";
sha256 = "199gqp85f6xnyg3svs23n3r6q4pflvz4zy5y376klay9mzzp0rbl";
isLibrary = false;
isExecutable = true;
buildDepends = [
@ -29,11 +29,11 @@ cabal.mkDerivation (self: {
feed filepath gnutls hamlet hS3 hslogger HTTP httpClient
httpConduit httpTypes IfElse json liftedBase MissingH monadControl
mtl network networkInfo networkMulticast networkProtocolXmpp
optparseApplicative QuickCheck random regexTdfa SafeSemaphore
securemem SHA shakespeare stm tasty tastyHunit tastyQuickcheck
tastyRerun text time transformers unixCompat utf8String uuid wai
waiExtra warp warpTls xmlTypes yesod yesodCore yesodDefault
yesodForm yesodStatic
optparseApplicative pathPieces QuickCheck random regexTdfa
SafeSemaphore securemem SHA shakespeare stm tasty tastyHunit
tastyQuickcheck tastyRerun text time transformers unixCompat
utf8String uuid wai waiExtra warp warpTls xmlTypes yesod yesodCore
yesodDefault yesodForm yesodStatic
] ++ (if self.stdenv.isDarwin then [
fsnotify
] else [

View file

@ -10,7 +10,7 @@
let
version = "2.0.1";
version = "2.0.2";
svn = subversionClient.override { perlBindings = true; };
@ -21,7 +21,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "1pylqr2qzndy92x3pq8hkwsb3garww2jxb167s6hshrva81s24mb";
sha256 = "1hk9xxnqiyxii4cfl0j88kws5h1w8xavmfp8a2qb3as5jwnc5y5w";
};
patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ];

View file

@ -9,6 +9,6 @@ relpath="${path#$server}"
echo "URL: $url" >&2
curl -A 'text/html; text/xhtml; text/xml; */*' -L -k "$url" | sed -re 's/^/-/;s/[hH][rR][eE][fF]=("([^"]*)"|'\''([^'\'']*)'\''|([^"'\'' <>&]+)[ <>&])/\n+\2\3\4\n-/g' | \
curl -A 'text/html; text/xhtml; text/xml; */*' -L -k "$url" | sed -re 's/^/-/;s/[^a-zA-Z][hH][rR][eE][fF]=("([^"]*)"|'\''([^'\'']*)'\''|([^"'\'' <>&]+)[ <>&])/\n+\2\3\4\n-/g' | \
sed -e '/^-/d; s/^[+]//; /^#/d;'"s/^\\//$protocol:\\/\\/$server\\//g" | \
sed -re 's`^[^:]*$`'"$protocol://$basepath/&\`"

View file

@ -0,0 +1,16 @@
{ callPackage, pkgs }:
rec {
#### CORE EFL
efl = callPackage ./efl.nix { };
evas = callPackage ./evas.nix { };
emotion = callPackage ./emotion.nix { };
elementary = callPackage ./elementary.nix { };
#### WINDOW MANAGER
enlightenment = callPackage ./enlightenment.nix { };
#### APPLICATIONS
econnman = callPackage ./econnman.nix { };
terminology = callPackage ./terminology.nix { };
}

View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, pkgconfig, e18, python27, python27Packages, dbus, makeWrapper }:
stdenv.mkDerivation rec {
name = "econnman-${version}";
version = "1.1";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz";
sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0";
};
buildInputs = [ makeWrapper pkgconfig e18.efl python27 dbus ];
propagatedBuildInputs = [ python27Packages.pythonefl python27Packages.dbus e18.elementary ];
postInstall = ''
wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl}/lib/python2.7/site-packages
'';
meta = {
description = "Econnman is a user interface for the connman network connection manager";
homepage = http://enlightenment.org/;
maintainers = [ stdenv.lib.maintainers.matejc ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl3;
};
}

23
pkgs/desktops/e18/efl.nix Normal file
View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, wayland, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages }:
stdenv.mkDerivation rec {
name = "efl-${version}";
version = "1.10.2";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz";
sha256 = "0py8x0kv2hgl5v983xb6653fvmvn20im6picpc0hqfyxy09g1b24";
};
buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto xlibs.libX11 libdrm udev utillinuxCurses luajit ];
propagatedBuildInputs = [ wayland libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext bullet xlibs.libXScrnSaver ];
configureFlags = [ "--with-opengl=full" "--with-tests=none" "--enable-wayland" "--enable-sdl" "--enable-drm" ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="-I${xlibs.libXtst} $NIX_CFLAGS_COMPILE"
export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH"
'';
meta = {
description = "Enlightenment Core libraries";
homepage = http://enlightenment.org/;
maintainers = [ stdenv.lib.maintainers.matejc ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl3;
};
}

View file

@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, e18 }:
stdenv.mkDerivation rec {
name = "elementary-${version}";
version = "1.10.2";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz";
sha256 = "0y3knvmabl9adc8pd54p7qxpf7gvciixc1rk40hqppwhdgbgpz28";
};
buildInputs = [ pkgconfig e18.efl ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
'';
meta = {
description = "Widget set/toolkit";
homepage = http://enlightenment.org/;
maintainers = [ stdenv.lib.maintainers.matejc ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl2;
};
}

View file

@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, e18, vlc }:
stdenv.mkDerivation rec {
name = "emotion_generic_players-${version}";
version = "1.10.0";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz";
sha256 = "1nwlrk9inrhiv6jpzji10ikcdlhzhz7f2b5qhi2ai8bb6j61ryyc";
};
buildInputs = [ pkgconfig e18.efl vlc ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 $NIX_CFLAGS_COMPILE"
'';
meta = {
description = "Extra video decoders";
homepage = http://enlightenment.org/;
maintainers = [ stdenv.lib.maintainers.matejc ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.bsd2;
};
}

View file

@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, e18, xlibs, libffi, pam, alsaLib, luajit }:
stdenv.mkDerivation rec {
name = "enlightenment-${version}";
version = "0.18.8";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.gz";
sha256 = "1fsigbrknkwy909p1gqwxag1bar3p413s4f6fq3qnbsd6gjbvj8l";
};
buildInputs = [ pkgconfig e18.efl e18.elementary xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 -I${e18.efl}/include/ecore-imf-1 -I${e18.efl}/include/ethumb-client-1 -I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
'';
meta = {
description = "The Compositing Window Manager and Desktop Shell";
homepage = http://enlightenment.org/;
maintainers = [ stdenv.lib.maintainers.matejc ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.bsd2;
};
}

View file

@ -0,0 +1,17 @@
{ stdenv, fetchurl, pkgconfig, e18, zlib }:
stdenv.mkDerivation rec {
name = "evas_generic_loaders-${version}";
version = "1.10.0";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz";
sha256 = "0qx44g7a8pzcgspx8q10zjiwzafis301fhpchd4pskfxhqd4qagm";
};
buildInputs = [ pkgconfig e18.efl zlib ];
meta = {
description = "Extra image decoders";
homepage = http://enlightenment.org/;
maintainers = [ stdenv.lib.maintainers.matejc ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl2;
};
}

View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, pkgconfig, e18 }:
stdenv.mkDerivation rec {
name = "terminology-${version}";
version = "0.6.1";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz";
sha256 = "1wi9njyfs95y4nb9jd30032qqka5cg7k0wacck8s1yqxwg5ng38x";
};
buildInputs = [ pkgconfig e18.efl e18.elementary ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 $NIX_CFLAGS_COMPILE"
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ecore-con-1 $NIX_CFLAGS_COMPILE"
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eldbus-1 $NIX_CFLAGS_COMPILE"
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
'';
meta = {
description = "The best terminal emulator written with the EFL";
homepage = http://enlightenment.org/;
maintainers = [ stdenv.lib.maintainers.matejc ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.bsd2;
};
}

View file

@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
name = "hhvm-${version}";
version = "3.1.0";
version = "3.2.0";
src = fetchgit {
url = "https://github.com/facebook/hhvm.git";
rev = "71ecbd8fb5e94b2a008387a2b5e9a8df5c6f5c7b";
sha256 = "1zv3k3bxahwyna2jgicwxm9lxs11jddpc9v41488rmzvfhdmzzkn";
rev = "01228273b8cf709aacbd3df1c51b1e690ecebac8";
sha256 = "418d5a55ac4ba5335a42329ebfb7dd96fdb8d5edbc2700251c86e9fa2ae4a967";
fetchSubmodules = true;
};
@ -37,6 +37,8 @@ stdenv.mkDerivation rec {
patchPhase = ''
substituteInPlace hphp/util/generate-buildinfo.sh \
--replace /bin/bash ${stdenv.shell}
substituteInPlace ./configure \
--replace "/usr/bin/env bash" ${stdenv.shell}
'';
installPhase = ''
mkdir -p $out/bin $out/lib

View file

@ -1,27 +1,27 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint, binary
, blazeHtml, blazeMarkup, boehmgc, Cabal, cheapskate, deepseq
, filepath, gmp, happy, haskeline, languageJava, lens, libffi
, llvmGeneral, llvmGeneralPure, mtl, network, optparseApplicative
, parsers, split, text, time, transformers, trifecta
, unorderedContainers, utf8String, vector, vectorBinaryInstances
, xml, zlib
{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint
, base64Bytestring, binary, blazeHtml, blazeMarkup, boehmgc, Cabal
, cheapskate, deepseq, filepath, fingertree, gmp, happy, haskeline
, languageJava, lens, libffi, llvmGeneral, llvmGeneralPure, mtl
, network, optparseApplicative, parsers, split, text, time
, transformers, trifecta, unorderedContainers, utf8String, vector
, vectorBinaryInstances, xml, zlib
}:
cabal.mkDerivation (self: {
pname = "idris";
version = "0.9.13.1";
sha256 = "09528c2zxriw3l8c7dd2k5db9j1qmqhs6nbqwc7dkskzqv9snz7n";
version = "0.9.14";
sha256 = "0kfzp89sass93p9zsxq616zfix7ipi1rmjqmcjixihi01k7c0b8b";
isLibrary = true;
isExecutable = true;
buildDepends = [
annotatedWlPprint ansiTerminal ansiWlPprint binary blazeHtml
blazeMarkup Cabal cheapskate deepseq filepath haskeline
languageJava lens libffi llvmGeneral llvmGeneralPure mtl network
optparseApplicative parsers split text time transformers trifecta
unorderedContainers utf8String vector vectorBinaryInstances xml
zlib
annotatedWlPprint ansiTerminal ansiWlPprint base64Bytestring binary
blazeHtml blazeMarkup Cabal cheapskate deepseq filepath fingertree
haskeline languageJava lens libffi llvmGeneral llvmGeneralPure mtl
network optparseApplicative parsers split text time transformers
trifecta unorderedContainers utf8String vector
vectorBinaryInstances xml zlib
];
buildTools = [ happy ];
extraLibraries = [ boehmgc gmp ];

View file

@ -2,21 +2,23 @@
{ cabal, aeson, base64Bytestring, cpphs, Diff, filepath
, haskellSrcExts, HUnit, liftedBase, monadControl, mtl, QuickCheck
, random, regexCompat, temporary, text, unorderedContainers, xmlgen
, random, regexCompat, temporary, text, time, unorderedContainers
, vector, xmlgen
}:
cabal.mkDerivation (self: {
pname = "HTF";
version = "0.11.4.0";
sha256 = "0bg84x6xk359zby04xw62yy227fk85mgs7x5nkdbsxcajm7j0bs9";
version = "0.12.0.0";
sha256 = "1mbil44gbcl52f84dphxkdvxsyz8bhc532mlq37aqr1bmj54rv0i";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson base64Bytestring cpphs Diff haskellSrcExts HUnit liftedBase
monadControl mtl QuickCheck random regexCompat text xmlgen
monadControl mtl QuickCheck random regexCompat text time vector
xmlgen
];
testDepends = [
aeson filepath mtl random regexCompat temporary text
aeson filepath HUnit mtl random regexCompat temporary text
unorderedContainers
];
doCheck = false;

View file

@ -0,0 +1,19 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, random, testFramework, tfRandom, transformers }:
cabal.mkDerivation (self: {
pname = "QuickCheck";
version = "2.7.6";
sha256 = "09y5l0062l9i5jp9v6811kvkk4zpy0mizwaw44abgz0x1h59gn40";
buildDepends = [ random tfRandom transformers ];
testDepends = [ testFramework ];
noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
meta = {
homepage = "https://github.com/nick8325/quickcheck";
description = "Automatic testing of Haskell programs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View file

@ -0,0 +1,15 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, attoparsec, scientific, text }:
cabal.mkDerivation (self: {
pname = "aeson-utils";
version = "0.2.2.1";
sha256 = "0sj4kdcxcj2wnf3s109yxq8gghz976hkiqs19bjcp6qkzdf5w6sd";
buildDepends = [ aeson attoparsec scientific text ];
meta = {
description = "Utilities for working with Aeson";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -0,0 +1,28 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit
, mtl, QuickCheck, scientific, syb, testFramework
, testFrameworkHunit, testFrameworkQuickcheck2, text, time
, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "aeson";
version = "0.8.0.0";
sha256 = "0p2x03wjawhav87jp57vwclra0gjwn1gqk74zgnji25ypwsvgkk4";
buildDepends = [
attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
text time unorderedContainers vector
];
testDepends = [
attoparsec HUnit QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2 text time unorderedContainers vector
];
meta = {
homepage = "https://github.com/bos/aeson";
description = "Fast JSON parsing and encoding";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View file

@ -0,0 +1,15 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, haskellSrcMeta }:
cabal.mkDerivation (self: {
pname = "applicative-quoters";
version = "0.1.0.8";
sha256 = "10m29d0938khjdazsmsvvncr5xndnpzpm1b7ymzb3b4b81xmcpgl";
buildDepends = [ haskellSrcMeta ];
meta = {
description = "Quasiquoters for idiom brackets and an applicative do-notation";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -0,0 +1,23 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, ansiTerminal, cmdargs, dlist, filepath, regexPosix, safe
, split, stm, stringsearch, unorderedContainers
}:
cabal.mkDerivation (self: {
pname = "cgrep";
version = "6.4.3.1";
sha256 = "0pqifapjgazz7wiydc775i4f6iixq8v87rzjgvvymdbdsn0sfa0r";
isLibrary = false;
isExecutable = true;
buildDepends = [
ansiTerminal cmdargs dlist filepath regexPosix safe split stm
stringsearch unorderedContainers
];
meta = {
homepage = "http://awgn.github.io/cgrep/";
description = "Command line tool";
license = self.stdenv.lib.licenses.gpl2;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -0,0 +1,14 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal }:
cabal.mkDerivation (self: {
pname = "code-builder";
version = "0.1.3";
sha256 = "1ax4c19xkszahcxvwc1wa1hrgk6ajck5sbprbplsi1gc9jj4g7jm";
meta = {
description = "Simple system for generating code";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,22 +1,22 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, attoparsec, blazeBuilder, conduit, exceptions, filepath
, hspec, monadControl, network, primitive, resourcet
{ cabal, async, attoparsec, blazeBuilder, conduit, exceptions
, filepath, hspec, monadControl, network, primitive, resourcet, stm
, streamingCommons, text, transformers, transformersBase
}:
cabal.mkDerivation (self: {
pname = "conduit-extra";
version = "1.1.1";
sha256 = "1876kg7zb0gasl7ijmx48r5r2jv3c5xxa1xb6g6iqfysx0qsv6z2";
version = "1.1.2";
sha256 = "1hglg491vgy6hjggi7067rjly3dlnr3byf6xlc20narzr25sxfxi";
buildDepends = [
attoparsec blazeBuilder conduit filepath monadControl network
primitive resourcet streamingCommons text transformers
primitive resourcet stm streamingCommons text transformers
transformersBase
];
testDepends = [
attoparsec blazeBuilder conduit exceptions hspec resourcet text
transformers transformersBase
async attoparsec blazeBuilder conduit exceptions hspec resourcet
stm text transformers transformersBase
];
noHaddock = true;
meta = {

View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "1.1.6";
sha256 = "1nhjj5zz934fd6fdbmkl8xvnvlaprxccgpwxffmdgqwxhvxgprq3";
version = "1.1.7";
sha256 = "0xk2his7qbidnzs56xcgnjipbnqmmnh74qy8dfvbznkkqhxdzmz6";
buildDepends = [
exceptions liftedBase mmorph monadControl mtl resourcet
transformers transformersBase void

View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "connection";
version = "0.2.1";
sha256 = "1wdjfc9lld3wkr7ncjkszmrwqp74p994ml3chymniz440xg1lxwy";
version = "0.2.3";
sha256 = "02mqn19pssdak82jw38p3cbwjyfvmjc6fawgx5981hzbdgb64vsb";
buildDepends = [
cprngAes dataDefaultClass network socks tls x509 x509Store
x509System x509Validation

View file

@ -0,0 +1,16 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, lochTh, placeholders }:
cabal.mkDerivation (self: {
pname = "focus";
version = "0.1.1";
sha256 = "0x158zqxgm8ys4mxs94zl811qfdcb06jqy5h99qc63r7snwnixmd";
buildDepends = [ lochTh placeholders ];
meta = {
homepage = "https://github.com/nikita-volkov/focus";
description = "A general abstraction for manipulating elements of container data structures";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -0,0 +1,20 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, attoparsec, genericDeriving, HUnit, mtl, tagged
, text, vector
}:
cabal.mkDerivation (self: {
pname = "generic-aeson";
version = "0.1.0.3";
sha256 = "1svbjgd8g1ljximqb4pph9lvsswgvkj46jkqq8lzmh9ql385g2vp";
buildDepends = [
aeson attoparsec genericDeriving mtl tagged text vector
];
testDepends = [ aeson attoparsec HUnit ];
meta = {
description = "Derivation of Aeson instances using GHC generics";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,6 +1,6 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cairo, glib, gtk, gtk2hsBuildtools, libc, mtl, pango
{ cabal, cairo, gio, glib, gtk, gtk2hsBuildtools, libc, mtl, pango
, pkgconfig
}:
@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
pname = "gtk";
version = "0.12.5.7";
sha256 = "0hax4ixdz523753rc774c8g76bjlj56lsabyl5nwkpnppffpa73w";
buildDepends = [ cairo glib mtl pango ];
buildDepends = [ cairo gio glib mtl pango ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ glib gtk ];

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "highlighting-kate";
version = "0.5.8.3";
sha256 = "03x9vp6mvk9hxs92cmy42aqiyh4prnh343xg36znyjii6xw2x3mf";
version = "0.5.8.4";
sha256 = "018j5z4cl9iv5m9wzjykh2gcn5d4fi7vahj76jv0ah101g6fqvrh";
isLibrary = true;
isExecutable = true;
buildDepends = [

View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "http-client-tls";
version = "0.2.1.2";
sha256 = "08qq2d4mqdd80jb99wm4gd4bqvnrlcpblvqgn18p8bzhw1qq6siy";
version = "0.2.2";
sha256 = "0a01r05h5fxswyn6k6cgqgak4scqjan72hyy5wbdqzzhl4rmh7j5";
buildDepends = [
connection dataDefaultClass httpClient network tls
];

View file

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "http-client";
version = "0.3.4";
sha256 = "0y4va0xfriv3qv31hbh7kbzmf61rr3ffr4z4vlfdlzacfv8307y4";
version = "0.3.5";
sha256 = "0ffr4xccm2yp5ikiz5dzzjm82vz7gab56l80ra9criry9qirmwqh";
buildDepends = [
base64Bytestring blazeBuilder caseInsensitive cookie
dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes

View file

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "2.1.2.3";
sha256 = "07d9lhkqf1kr4mg61q0pcf8y73wkdymazxrvr425wjh9363r89gl";
version = "2.1.3";
sha256 = "1z9i0b9kl1kqh3nvbhh5vmqyg19pkdpj4cbkfhj0r47rbcynhwlb";
buildDepends = [
conduit httpClient httpClientTls httpTypes liftedBase monadControl
mtl resourcet transformers

View file

@ -0,0 +1,16 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, hxt, mtl }:
cabal.mkDerivation (self: {
pname = "hxt-pickle-utils";
version = "0.1.0.2";
sha256 = "06v4935lljcyyx4a5v0z4id3fz4v28aghsrzr94k6diibpnwcdz2";
buildDepends = [ hxt mtl ];
meta = {
homepage = "https://github.com/silkapp/hxt-pickle-utils";
description = "Utility functions for using HXT picklers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -23,6 +23,5 @@ cabal.mkDerivation (self: {
description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir";
license = "unknown";
platforms = self.ghc.meta.platforms;
maintainers = [ "Daniel Bergey <bergey@teallabs.org>" ];
};
})

View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "interpolate";
version = "0.0.2";
sha256 = "0l9hrgwmvp7h2mgw90gk45zgp0yy00201ki9hwg26sh2wd0sj6f8";
version = "0.0.3";
sha256 = "05aksslx7mvic3cgw9ixwjp0r759a4gf7m178pbp8xm8dpdksjjw";
buildDepends = [ haskellSrcMeta ];
testDepends = [
doctest haskellSrcMeta hspec QuickCheck quickcheckInstances text

View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "iproute";
version = "1.2.12";
sha256 = "19pr6my4nw7qq9lsp6xvz55lm9svwzqka5qcqy79sfdkxg459rg5";
version = "1.3.0";
sha256 = "1n9lcm1f2rlqkvg90zikf2h4badzh9r24zqb27648l48254m6q5p";
buildDepends = [ appar byteorder network ];
testDepends = [
appar byteorder doctest hspec network QuickCheck safe

View file

@ -0,0 +1,25 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, attoparsec, genericAeson, genericDeriving, HUnit
, tagged, tasty, tastyHunit, tastyTh, text, time
, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "json-schema";
version = "0.6";
sha256 = "1rlx6r4ybbgz8q159mxh0hp3l0cc8q4nc1g7yd1ii1z4p9wjmnny";
buildDepends = [
aeson genericAeson genericDeriving tagged text time
unorderedContainers vector
];
testDepends = [
aeson attoparsec genericAeson HUnit tagged tasty tastyHunit tastyTh
text
];
meta = {
description = "Types and type classes for defining JSON schemas";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -0,0 +1,15 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal }:
cabal.mkDerivation (self: {
pname = "loch-th";
version = "0.2.1";
sha256 = "1kfrjsgzq6wl749n2wm1fhwwigjxcd9lww7whiwjrbmhiz5ism3p";
meta = {
homepage = "https://github.com/liskin/loch-th";
description = "Support for precise error locations in source files (Template Haskell version)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "monad-logger";
version = "0.3.6.1";
sha256 = "0ylsrhp2a9qir03nmmz6rkim149pw1fgm63lfg611gvh598ig6ss";
version = "0.3.7";
sha256 = "03fzp8cvx8qapyjgnm6gywj8b1pcd43y3fb4vg1wgxa55lsg6y58";
buildDepends = [
blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase
monadControl monadLoops mtl resourcet stm stmChans text

View file

@ -0,0 +1,16 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, parsec }:
cabal.mkDerivation (self: {
pname = "multipart";
version = "0.1.1";
sha256 = "12sxi21baq1wsa3z6qrczyk47finw85yiql26l90wxk99smm90pj";
buildDepends = [ parsec ];
meta = {
homepage = "http://www.github.com/silkapp/multipart";
description = "A partial fork of the cgi package exposing the multipart module";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -0,0 +1,23 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, attoparsec, charset, doctest, filepath, parsec, QuickCheck
, quickcheckInstances, text, transformers, unorderedContainers
}:
cabal.mkDerivation (self: {
pname = "parsers";
version = "0.12";
sha256 = "0lb1djb2mmlkfqpbz7683i27d3ivv0r99l6w79951wgsqb62xph3";
buildDepends = [
attoparsec charset parsec text transformers unorderedContainers
];
testDepends = [
attoparsec doctest filepath parsec QuickCheck quickcheckInstances
];
meta = {
homepage = "http://github.com/ekmett/parsers/";
description = "Parsing combinators";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "path-pieces";
version = "0.1.3.1";
sha256 = "140pkci5k6aa9ncxa29fn2p0g6lb79zci0k02nblv59qmj5hj8ic";
version = "0.1.4";
sha256 = "1fxhp4bk88km7z1rdpify7l38li5k21qxw3vgcmq9b6bblvz6y2v";
buildDepends = [ text time ];
testDepends = [ hspec HUnit QuickCheck text ];
meta = {

View file

@ -0,0 +1,15 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal }:
cabal.mkDerivation (self: {
pname = "placeholders";
version = "0.1";
sha256 = "0ih35n2pw5gr9ggj2xz5zfcs4bdk200fdw6q9hdy3xna7maphak5";
meta = {
homepage = "http://github.com/ahammar/placeholders";
description = "Placeholders for use while developing Haskell code";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,22 +1,22 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, conduit, controlMonadLoop, hspec, mtl, resourcet
, shakespeare, shakespeareText, text
{ cabal, conduit, conduitExtra, controlMonadLoop, hspec, mtl
, resourcet, shakespeare, shakespeareText, text
}:
cabal.mkDerivation (self: {
pname = "process-conduit";
version = "1.1.0.0";
sha256 = "1b3snck651cpb7i3c78cn264zrjan3lzydf59209abkvb6fv1hql";
version = "1.2.0.1";
sha256 = "0hnbywmjvk3y26sc9a0jfqzm04pg08zd2bflld1mvni02s89lvc8";
buildDepends = [
conduit controlMonadLoop mtl resourcet shakespeare shakespeareText
text
];
testDepends = [ conduit hspec ];
testDepends = [ conduit conduitExtra hspec resourcet ];
doCheck = false;
meta = {
homepage = "http://github.com/tanakh/process-conduit";
description = "Conduits for processes";
homepage = "http://github.com/snoyberg/process-conduit";
description = "Conduits for processes (deprecated)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};

View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "purescript";
version = "0.5.2.6";
sha256 = "0aszzaj3942xgq0nmql68s5cgplhkqrk0k6cfd1mx5lq5n0qxf94";
version = "0.5.3";
sha256 = "05vhz3j4gx9paxmvimy154730078bl148819shwml6l6vq02723i";
isLibrary = true;
isExecutable = true;
buildDepends = [

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "reflection";
version = "1.4";
sha256 = "0i6yb3fa9wizyaz8x9b7yzkw9jf7zahdrkr2y0iw7igdxqn4n0k7";
version = "1.5.1";
sha256 = "18ail6j7rs5jff9zxphxd7vjkwanpv12dhi98s86r65425fdhjlx";
buildDepends = [ tagged ];
meta = {
homepage = "http://github.com/ekmett/reflection";

View file

@ -0,0 +1,16 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, hxt, regular, text }:
cabal.mkDerivation (self: {
pname = "regular-xmlpickler";
version = "0.2";
sha256 = "1qjx4xsidnpr2as3m2ir97ap5vc9cw6a0z332g53ifx9gskjli9f";
buildDepends = [ hxt regular text ];
meta = {
homepage = "http://github.com/silkapp/regular-xmlpickler";
description = "Generic generation of HXT XmlPickler instances using Regular";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -0,0 +1,23 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aesonUtils, caseInsensitive, dataDefault
, exceptionTransformers, httpConduit, httpTypes, hxt
, hxtPickleUtils, monadControl, mtl, primitive, resourcet
, restTypes, tostring, transformersBase, uriEncode, utf8String
}:
cabal.mkDerivation (self: {
pname = "rest-client";
version = "0.4";
sha256 = "18mvmp4c5zznph8q5ash6224wig5kwvb6v19dkn39n4l72cdq7wm";
buildDepends = [
aesonUtils caseInsensitive dataDefault exceptionTransformers
httpConduit httpTypes hxt hxtPickleUtils monadControl mtl primitive
resourcet restTypes tostring transformersBase uriEncode utf8String
];
meta = {
description = "Utility library for use in generated API client libraries";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -0,0 +1,26 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, aesonUtils, either, errors, fclabels, HUnit, hxt
, hxtPickleUtils, jsonSchema, mtl, multipart, random, restStringmap
, restTypes, safe, split, testFramework, testFrameworkHunit, text
, transformers, unorderedContainers, uriEncode, utf8String, uuid
}:
cabal.mkDerivation (self: {
pname = "rest-core";
version = "0.31.1";
sha256 = "1cx1zmy1zr43n9nlrbar828izccpkvrvjkrda03ra9fkcjgd6qy6";
buildDepends = [
aeson aesonUtils either errors fclabels hxt hxtPickleUtils
jsonSchema mtl multipart random restStringmap restTypes safe split
text transformers unorderedContainers uriEncode utf8String uuid
];
testDepends = [
HUnit mtl testFramework testFrameworkHunit unorderedContainers
];
meta = {
description = "Rest API library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -0,0 +1,28 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, blazeHtml, Cabal, codeBuilder, fclabels, filepath
, hashable, haskellSrcExts, hslogger, HStringTemplate, HUnit, hxt
, jsonSchema, restCore, safe, scientific, split, tagged
, testFramework, testFrameworkHunit, text, uniplate
, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "rest-gen";
version = "0.14.2";
sha256 = "1hmf77hs3pp6lf4glh3lbbwfjr029js185v69bk8ycr1c4ib8nbp";
buildDepends = [
aeson blazeHtml Cabal codeBuilder fclabels filepath hashable
haskellSrcExts hslogger HStringTemplate hxt jsonSchema restCore
safe scientific split tagged text uniplate unorderedContainers
vector
];
testDepends = [
haskellSrcExts HUnit restCore testFramework testFrameworkHunit
];
meta = {
description = "Documentation and client generation from rest definition";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -0,0 +1,15 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, happstackServer, mtl, restCore, restGen, utf8String }:
cabal.mkDerivation (self: {
pname = "rest-happstack";
version = "0.2.10";
sha256 = "1np8y0v6jnk2lw0aqlzb9dn1vlk8cg75xrhkjmm6qh0z90fy3p6z";
buildDepends = [ happstackServer mtl restCore restGen utf8String ];
meta = {
description = "Rest driver for Happstack";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -0,0 +1,20 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, caseInsensitive, restCore, safe, snapCore
, unorderedContainers, uriEncode, utf8String
}:
cabal.mkDerivation (self: {
pname = "rest-snap";
version = "0.1.17.12";
sha256 = "0hhpscdbph34psfn2h1g0znds0cz7ja9byr6bg7jmj0h86plz8al";
buildDepends = [
caseInsensitive restCore safe snapCore unorderedContainers
uriEncode utf8String
];
meta = {
description = "Rest driver for Snap";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -0,0 +1,20 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, hashable, hxt, jsonSchema, tagged, text, tostring
, unorderedContainers
}:
cabal.mkDerivation (self: {
pname = "rest-stringmap";
version = "0.2.0.2";
sha256 = "0nzkc09679c2mz3amh1avk2kfjpqbhbxsr0r9zvgcs71gqkal2mz";
buildDepends = [
aeson hashable hxt jsonSchema tagged text tostring
unorderedContainers
];
meta = {
description = "Maps with stringy keys that can be transcoded to JSON and XML";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -0,0 +1,20 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, genericAeson, hxt, jsonSchema, mtl, regular
, regularXmlpickler, restStringmap, text, uuid
}:
cabal.mkDerivation (self: {
pname = "rest-types";
version = "1.10.1";
sha256 = "0i4y1s35ybly1nayqj9c2zqwikpxnzjamq24qbhg0lpqr0dpc1rg";
buildDepends = [
aeson genericAeson hxt jsonSchema mtl regular regularXmlpickler
restStringmap text uuid
];
meta = {
description = "Silk Rest Framework Types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -0,0 +1,20 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, caseInsensitive, httpTypes, mimeTypes, mtl, restCore
, restTypes, text, unorderedContainers, utf8String, wai
}:
cabal.mkDerivation (self: {
pname = "rest-wai";
version = "0.1.0.2";
sha256 = "06wnazy0262b2875q4km2xy9zz7l681vlfj3ny1ha9valnqr3q6w";
buildDepends = [
caseInsensitive httpTypes mimeTypes mtl restCore restTypes text
unorderedContainers utf8String wai
];
meta = {
description = "Rest driver for WAI applications";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "safe";
version = "0.3.6";
sha256 = "03fjasjw8mh8c15xg8dncdn9g8scr427889vchcckilll40kvzvm";
version = "0.3.7";
sha256 = "0rw8mjarwl7rwc6fczq0zxlp1nlb6r1rk71whwziwi032hgc8561";
meta = {
homepage = "http://community.haskell.org/~ndm/safe/";
description = "Library of safe (exception free) functions";

View file

@ -1,6 +1,6 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, binary, deepseq, erf, HUnit, ieee754, mathFunctions
{ cabal, aeson, binary, deepseq, erf, HUnit, ieee754, mathFunctions
, monadPar, mwcRandom, primitive, QuickCheck, testFramework
, testFrameworkHunit, testFrameworkQuickcheck2, vector
, vectorAlgorithms, vectorBinaryInstances
@ -8,10 +8,10 @@
cabal.mkDerivation (self: {
pname = "statistics";
version = "0.11.0.3";
sha256 = "184lzivqjjj69pxcnr5ibxjqikypfl5nd63i44qgwdhwyvcaqdh3";
version = "0.13.1.0";
sha256 = "0y46fna0kqs8bsqbf3v1k9ppq3njd5kxf1qlvvmphydpi3x038nd";
buildDepends = [
binary deepseq erf mathFunctions monadPar mwcRandom primitive
aeson binary deepseq erf mathFunctions monadPar mwcRandom primitive
vector vectorAlgorithms vectorBinaryInstances
];
testDepends = [

View file

@ -0,0 +1,23 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, focus, free, hashable, HTF, lochTh, mtl, placeholders
, primitive, QuickCheck, unorderedContainers
}:
cabal.mkDerivation (self: {
pname = "stm-containers";
version = "0.1.2";
sha256 = "1rzxjspf0lzmviixnxv9f2wjxqhwv65fb1nws915ghs1sj774gab";
buildDepends = [ focus hashable lochTh placeholders primitive ];
testDepends = [
focus free hashable HTF lochTh mtl placeholders primitive
QuickCheck unorderedContainers
];
doCheck = false;
meta = {
homepage = "https://github.com/nikita-volkov/stm-containers";
description = "Containers for STM";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,15 +1,15 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, async, blazeBuilder, deepseq, hspec, network, QuickCheck
, random, text, transformers, zlib
, random, stm, text, transformers, zlib
}:
cabal.mkDerivation (self: {
pname = "streaming-commons";
version = "0.1.3.1";
sha256 = "0ryj9pp681f1pqvcyy5ci2zng6ax93j5navm886k095wxmamhzmf";
version = "0.1.4";
sha256 = "0p18sha2xa583rn9jyhylcykgrvydrwnl47c2wxf1c1yswn45iz6";
buildDepends = [
blazeBuilder network random text transformers zlib
blazeBuilder network random stm text transformers zlib
];
testDepends = [
async blazeBuilder deepseq hspec network QuickCheck text zlib

View file

@ -0,0 +1,15 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, text, utf8String }:
cabal.mkDerivation (self: {
pname = "tostring";
version = "0.2.0.1";
sha256 = "1gihls2xslr9fzad2659zv8af9k4cm84888nhx3z9bwasviyg448";
buildDepends = [ text utf8String ];
meta = {
description = "The ToString class";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "unix-time";
version = "0.3.1";
sha256 = "1r7glbcr3108zrlpy2d09jyk1gv9k90d5saajipmb1f5l45rdhnj";
version = "0.3.2";
sha256 = "0bbzrm4hprqsljwscpfmnw3ipj809q7570alzn1qampijsbb4cds";
buildDepends = [ binary ];
testDepends = [ doctest hspec QuickCheck time ];
meta = {

View file

@ -0,0 +1,17 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, network, text, utf8String }:
cabal.mkDerivation (self: {
pname = "uri-encode";
version = "1.5.0.2";
sha256 = "1lsj9y3sw9wlpsw7j20frvv9a165mcqx7x7vrp2gamka1120pkym";
isLibrary = true;
isExecutable = true;
buildDepends = [ network text utf8String ];
meta = {
description = "Unicode aware uri-encoding";
license = "unknown";
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,21 +1,21 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, attoparsec, base64Bytestring, cond, dataDefault
, directoryTree, exceptions, filepath, HTTP, liftedBase
, monadControl, mtl, network, parallel, scientific, temporary, text
, time, transformers, transformersBase, unorderedContainers, vector
, zipArchive
, directoryTree, exceptions, filepath, httpClient, httpTypes
, liftedBase, monadControl, mtl, network, parallel, scientific
, temporary, text, time, transformers, transformersBase
, unorderedContainers, vector, zipArchive
}:
cabal.mkDerivation (self: {
pname = "webdriver";
version = "0.5.5";
sha256 = "1k656ghkaqlnp4a9dd99s3l2vm21zsqpqxwfg2lq5rx2yw402nga";
version = "0.6.0.1";
sha256 = "0qpk1i6qr12lcx25bdljwqxgdhf5qk67h04bp6vwmm16dwzsyqd1";
buildDepends = [
aeson attoparsec base64Bytestring cond dataDefault directoryTree
exceptions filepath HTTP liftedBase monadControl mtl network
scientific temporary text time transformers transformersBase
unorderedContainers vector zipArchive
exceptions filepath httpClient httpTypes liftedBase monadControl
mtl network scientific temporary text time transformers
transformersBase unorderedContainers vector zipArchive
];
testDepends = [ parallel text ];
jailbreak = true;

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "word8";
version = "0.1.0";
sha256 = "1729ip83wyw8w3v8mzmazaw5b9l81zg95hrkmfq3qjk5gz1s75s0";
version = "0.1.1";
sha256 = "1xpa0haacimrblxg3x3n5vdcnkg3ff5zqamppdarv0zvkcdj139r";
testDepends = [ hspec ];
meta = {
description = "Word8 library";

View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "yaml";
version = "0.8.8.3";
sha256 = "031d1wx31mw9lw0swlcf1xfzdixaq6wmglhzaj9sixhid0r2isvf";
version = "0.8.8.4";
sha256 = "1mh5xv66cqvk0r5n6pwcm11m9489y40l69ca417yvymkksmncc7b";
isLibrary = true;
isExecutable = true;
buildDepends = [

View file

@ -67,7 +67,7 @@ stdenv.mkDerivation {
security unlock-keychain -p "" $keychainName
security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Z0-9]\{36\}")
provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}")
# Ensure that the requested provisioning profile can be found

View file

@ -1,4 +1,4 @@
{pkgs, pkgs_i686, xcodeVersion ? "5.0", tiVersion ? "3.2.1.GA"}:
{pkgs, pkgs_i686, xcodeVersion ? "5.0", tiVersion ? "3.2.3.GA"}:
let
# We have to use Oracle's JDK. On Darwin, just simply expose the host system's
@ -30,7 +30,7 @@ rec {
titaniumsdk = let
titaniumSdkFile = if tiVersion == "3.1.4.GA" then ./titaniumsdk-3.1.nix
else if tiVersion == "3.2.3.GA" then ./titaniumsdk-3.2.nix
else if tiVersion == "3.3.0.RC2" then ./titaniumsdk-3.3.nix
else if tiVersion == "3.3.0.GA" then ./titaniumsdk-3.3.nix
else throw "Titanium version not supported: "+tiVersion;
in
import titaniumSdkFile {

View file

@ -1,14 +1,14 @@
{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
stdenv.mkDerivation {
name = "mobilesdk-3.3.0.RC2";
name = "mobilesdk-3.3.0.GA";
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
url = http://builds.appcelerator.com/mobile/3.3.0/mobilesdk-3.3.0.RC2-linux.zip;
sha1 = "ad4d0003b81ffc5947c1961548ad4b8591aaec5b";
url = http://builds.appcelerator.com/mobile/3.3.0/mobilesdk-3.3.0.GA-linux.zip;
sha1 = "9a9cca05a4cf8700df60b7e9d9cd969ecb70d81e";
}
else if stdenv.system == "x86_64-darwin" then fetchurl {
url = http://builds.appcelerator.com/mobile/3.3.0/mobilesdk-3.3.0.RC2-osx.zip;
sha1 = "621080fdd48801bfec7113fef1f224caabf0d4dd";
url = http://builds.appcelerator.com/mobile/3.3.0/mobilesdk-3.3.0.GA-osx.zip;
sha1 = "c6333e4da2564b9c51b865c1db49a062fbc743af";
}
else throw "Platform: ${stdenv.system} not supported!";
@ -28,7 +28,7 @@ stdenv.mkDerivation {
# Rename ugly version number
cd mobilesdk/*
cd 3.3.0.RC2
cd 3.3.0.GA
# Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
# Yes, I know it's nasty :-)

View file

@ -60,7 +60,7 @@ stdenv.mkDerivation {
security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A
# Determine provisioning ID
PROVISIONING_PROFILE=$(grep UUID -A1 -a ${provisioningProfile} | grep -o "[-A-Z0-9]\{36\}")
PROVISIONING_PROFILE=$(grep UUID -A1 -a ${provisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}")
if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision" ]
then

View file

@ -0,0 +1,23 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, Cabal, deepseq, filepath, ghcPaths, hspec, QuickCheck
, xhtml
}:
cabal.mkDerivation (self: {
pname = "haddock";
version = "2.14.3";
sha256 = "031ikrsbkpmmwgdkgdr8s19dfx5y6n39rmyljjdfqygas17gcm6l";
isLibrary = true;
isExecutable = true;
buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ];
testDepends = [ Cabal deepseq filepath hspec QuickCheck ];
doCheck = false;
meta = {
homepage = "http://www.haskell.org/haddock/";
description = "A documentation-generation tool for Haskell libraries";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View file

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "HaRe";
version = "0.7.2.4";
sha256 = "1ljyvs3mdgxzyvss071yvgnrnmhdyp9a10cmvij1d47li1wbj1j1";
version = "0.7.2.5";
sha256 = "09v0z1r03bzazgjf26fv54q1jpmv14zyl6w9083xcf2cs3yy6vfh";
isLibrary = true;
isExecutable = true;
buildDepends = [

View file

@ -6,14 +6,15 @@
cabal.mkDerivation (self: {
pname = "codex";
version = "0.1.0.1";
sha256 = "1s2sn2i0ah4wgyzz5vqkm65jkl3c38cwa2kp0az4xl3vb8y6x7la";
version = "0.1.0.2";
sha256 = "0dsc5dx5zcxf5wd2qf6gqzr8d613z1gkllmzzkbny3lxa512crsw";
isLibrary = true;
isExecutable = true;
buildDepends = [
Cabal downloadCurl either filepath hackageDb MissingH monadLoops
tar text transformers yaml zlib
];
jailbreak = true;
meta = {
homepage = "http://github.com/aloiscochard/codex";
description = "A ctags file generator for cabal project dependencies";

View file

@ -0,0 +1,22 @@
{ stdenv, fetchurl, libelf }:
let
version = "20130503";
in
stdenv.mkDerivation rec {
name = "prelink-${version}";
buildInputs = [ libelf ];
src = fetchurl {
url = "http://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2";
sha256 = "1w20f6ilqrz8ca51qhrn1n13h7q1r34k09g33d6l2vwvbrhcffb3";
};
meta = {
homepage = http://people.redhat.com/jakub/prelink/;
license = "GPL";
description = "ELF prelinking utility to speed up dynamic linking";
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libusb }:
{ stdenv, fetchurl, pkgconfig, libusb1 }:
stdenv.mkDerivation {
name = "usb-modeswitch-1.1.2";
stdenv.mkDerivation rec {
name = "usb-modeswitch-2.2.0";
src =fetchurl {
url = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-1.1.2.tar.bz2";
sha256 = "1wzhd0r49nh5y43qrvsi3c7a29206zwd6v8xlpb8dqm40xg3j9nz";
url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
sha256 = "0flaj3mq0xhzk72kkpclwglf77kcw5rkwvkaimn5zvbiw4yi0li7";
};
# make clean: we always build from source. It should be necessary on x86_64 only
@ -16,7 +16,7 @@ stdenv.mkDerivation {
makeFlags="DESTDIR=$out PREFIX=$out"
'';
buildInputs = [ libusb ];
buildInputs = [ pkgconfig libusb1 ];
meta = {
license = "GPLv2";

View file

@ -4,18 +4,18 @@
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
stdenv.mkDerivation rec {
name = "vagrant-1.4.3";
name = "vagrant-1.6.3";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.3_x86_64.deb;
sha256 = "dbd06de0f3560e2d046448d627bca0cbb0ee34b036ef605aa87ed20e6ad2684b";
url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_x86_64.deb;
sha256 = "1gmdg92dw7afnvpji0wg4nzr7vhk8mrmcqk3hcrkwscby2f2bhqg";
}
else
fetchurl {
url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.3_i686.deb;
sha256 = "66e613fc1c9e31ecaf8e5f1d07d2ae4fca3d4fc2e43593543962664258d9af9b";
url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_i686.deb;
sha256 = "1z26b6yghqgx8jbi2igf4kk4h6rzy869gli2vj7ayl7vbqdfvb60";
};
meta = with stdenv.lib; {
@ -81,4 +81,13 @@ stdenv.mkDerivation rec {
cp -r opt "$out"
cp -r usr/bin "$out"
'';
preFixup = ''
# 'hide' the template file from shebang-patching
chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.2/lib/bundler/templates/Executable
'';
postFixup = ''
chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.2/lib/bundler/templates/Executable
'';
}

View file

@ -99,18 +99,17 @@ stdenv.mkDerivation rec {
ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages
fi
# TODO: toPerlLibPath can be added to
# pkgs/development/interpreters/perl5.16/setup-hook.sh (and the other perl
# versions) just like for python. NOTE: it causes massive rebuilds.
# $(toPerlLibPath $out perlPackages.Log4Perl ...)
for file in "$out"/bin/munindoc "$out"/sbin/munin-* "$out"/lib/munin-* "$out"/www/cgi/*; do
# don't wrap .jar files
case "$file" in
*.jar) continue;;
esac
wrapProgram "$file" \
--set PERL5LIB "$out/lib/perl5/site_perl:${perlPackages.Log4Perl}/lib/perl5/site_perl:${perlPackages.IOSocketInet6}/lib/perl5/site_perl:${perlPackages.Socket6}/lib/perl5/site_perl:${perlPackages.URI}/lib/perl5/site_perl:${perlPackages.DBFile}/lib/perl5/site_perl:${perlPackages.DateManip}/lib/perl5/site_perl:${perlPackages.HTMLTemplate}/lib/perl5/site_perl:${perlPackages.FileCopyRecursive}/lib/perl5/site_perl:${perlPackages.FCGI}/lib/perl5/site_perl:${perlPackages.NetSNMP}/lib/perl5/site_perl:${perlPackages.NetServer}/lib/perl5/site_perl:${perlPackages.ListMoreUtils}/lib/perl5/site_perl:${perlPackages.TimeHiRes}/lib/perl5/site_perl:${rrdtool}/lib/perl:${perlPackages.DBDPg}/lib/perl5/site_perl:${perlPackages.LWPUserAgent}/lib/perl5/site_perl"
--set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; stdenv.lib.makePerlPath [
Log4Perl IOSocketInet6 Socket6 URI DBFile DateManip
HTMLTemplate FileCopyRecursive FCGI NetSNMP NetServer
ListMoreUtils TimeHiRes DBDPg LWPUserAgent
]}"
done
'';

View file

@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
++ opt mpg123Support mpg123
++ opt aacSupport faad2
++ opt zipSupport zziplib
++ opt zipSupport pulseaudio;
++ opt pulseaudioSupport pulseaudio;
configureFlags =
[ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa")

View file

@ -70,6 +70,6 @@ EOF
license = "MIT-like";
homePage = "http://www.zsh.org/";
maintainers = with stdenv.lib.maintainers; [ chaoflow ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -0,0 +1,24 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "cv-2014-07-20";
src = fetchFromGitHub {
owner = "Xfennec";
repo = "cv";
rev = "7441de974cc13f3b07903bb86c41be4e45c8e81b";
sha256 = "19ky88b52a8zcv7lx802y4zi3sp0cdhya08cnax0yvlwwq43w6x9";
};
buildInputs = [ ];
makeFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
homepage = https://github.com/Xfennec/cv;
description = "Tool that shows the progress of coreutils programs";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ pSub ];
};
}

View file

@ -3,11 +3,11 @@
wpa_supplicant, readline6, pptp, ppp, tree }:
stdenv.mkDerivation {
name = "connman-1.20";
name = "connman-1.24";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/network/connman/connman.git";
rev = "8047f3d051b32d38ac0b1e78296b482368728ec6";
sha256 = "0hb03rzrspgry8z43x8x76vlq1hdq2wggkk7wbidavnqhpmz7dxz";
rev = "11b8a873988ab5fc3f360c5b6fb25a6761fe7683";
sha256 = "12z1krm5qnjyamc3qr2px7wvz7qkss7jk5brnmhyalqmcnkwcbrm";
};
buildInputs = [ autoconf automake libtool pkgconfig openconnect polkit

View file

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "nix-1.8pre3666_5bcb982";
name = "nix-1.8pre3679_f609eec";
src = fetchurl {
url = "http://hydra.nixos.org/build/12516859/download/5/${name}.tar.xz";
sha256 = "6b968ec6db727dad2dc1fb6d31395996bd7cad14fddadfa996661c1f2c142c32";
url = "http://hydra.nixos.org/build/12606291/download/5/${name}.tar.xz";
sha256 = "d185c00db8c1ab977d37695da0130628290af8dc315b3e24aa24d3ee25cdf875";
};
nativeBuildInputs = [ perl pkgconfig ];

View file

@ -22,6 +22,10 @@
, gnused ? null
, coreutils ? null
# if true, enable all the below filters and backends
, enableExtraPlugins ? false
# unzip is needed to extract filter and backend plugins
, unzip ? null
# filters
, enableDitaaFilter ? false, jre ? null
@ -58,17 +62,26 @@ assert enableStandardFeatures ->
coreutils != null;
# filters
assert (enableDitaaFilter || enableMscgenFilter || enableDiagFilter || enableQrcodeFilter || enableAafigureFilter) -> unzip != null;
assert enableDitaaFilter -> jre != null;
assert enableMscgenFilter -> mscgen != null;
assert enableDiagFilter -> blockdiag != null && seqdiag != null && actdiag != null && nwdiag != null;
assert enableMatplotlibFilter -> matplotlib != null && numpy != null;
assert enableAafigureFilter -> aafigure != null && recursivePthLoader != null;
assert enableExtraPlugins || enableDitaaFilter || enableMscgenFilter || enableDiagFilter || enableQrcodeFilter || enableAafigureFilter -> unzip != null;
assert enableExtraPlugins || enableDitaaFilter -> jre != null;
assert enableExtraPlugins || enableMscgenFilter -> mscgen != null;
assert enableExtraPlugins || enableDiagFilter -> blockdiag != null && seqdiag != null && actdiag != null && nwdiag != null;
assert enableExtraPlugins || enableMatplotlibFilter -> matplotlib != null && numpy != null;
assert enableExtraPlugins || enableAafigureFilter -> aafigure != null && recursivePthLoader != null;
# backends
assert (enableDeckjsBackend || enableOdfBackend) -> unzip != null;
assert enableExtraPlugins || enableDeckjsBackend || enableOdfBackend -> unzip != null;
let
_enableDitaaFilter = enableExtraPlugins || enableDitaaFilter;
_enableMscgenFilter = enableExtraPlugins || enableMscgenFilter;
_enableDiagFilter = enableExtraPlugins || enableDiagFilter;
_enableQrcodeFilter = enableExtraPlugins || enableQrcodeFilter;
_enableMatplotlibFilter = enableExtraPlugins || enableMatplotlibFilter;
_enableAafigureFilter = enableExtraPlugins || enableAafigureFilter;
_enableDeckjsBackend = enableExtraPlugins || enableDeckjsBackend;
_enableOdfBackend = enableExtraPlugins || enableOdfBackend;
#
# filters
#
@ -141,17 +154,17 @@ stdenv.mkDerivation rec {
patchPhase = with stdenv.lib; ''
mkdir -p "$out/etc/asciidoc/filters"
mkdir -p "$out/etc/asciidoc/backends"
'' + optionalString enableDitaaFilter ''
'' + optionalString _enableDitaaFilter ''
echo "Extracting ditaa filter"
unzip -d "$out/etc/asciidoc/filters/ditaa" "${ditaaFilterSrc}"
sed -i -e "s|java -jar|${jre}/bin/java -jar|" \
"$out/etc/asciidoc/filters/ditaa/ditaa2img.py"
'' + optionalString enableMscgenFilter ''
'' + optionalString _enableMscgenFilter ''
echo "Extracting mscgen filter"
unzip -d "$out/etc/asciidoc/filters/mscgen" "${mscgenFilterSrc}"
sed -i -e "s|filter-wrapper.py mscgen|filter-wrapper.py ${mscgen}/bin/mscgen|" \
"$out/etc/asciidoc/filters/mscgen/mscgen-filter.conf"
'' + optionalString enableDiagFilter ''
'' + optionalString _enableDiagFilter ''
echo "Extracting diag filter"
unzip -d "$out/etc/asciidoc/filters/diag" "${diagFilterSrc}"
sed -i \
@ -161,12 +174,12 @@ stdenv.mkDerivation rec {
-e "s|filter='nwdiag|filter=\'${nwdiag}/bin/nwdiag|" \
-e "s|filter='packetdiag|filter=\'${nwdiag}/bin/packetdiag|" \
"$out/etc/asciidoc/filters/diag/diag-filter.conf"
'' + optionalString enableQrcodeFilter ''
'' + optionalString _enableQrcodeFilter ''
echo "Extracting qrcode filter"
unzip -d "$out/etc/asciidoc/filters/qrcode" "${qrcodeFilterSrc}"
sed -i -e "s|systemcmd('qrencode|systemcmd('${qrencode}/bin/qrencode|" \
"$out/etc/asciidoc/filters/qrcode/qrcode2img.py"
'' + optionalString enableMatplotlibFilter ''
'' + optionalString _enableMatplotlibFilter ''
echo "Extracting mpl (matplotlib) filter"
mkdir -p "$out/etc/asciidoc/filters/mpl"
tar xvf "${matplotlibFilterSrc}" -C "$out/etc/asciidoc/filters/mpl" --strip-components=1
@ -177,7 +190,7 @@ stdenv.mkDerivation rec {
numpy_path="$(toPythonPath ${numpy})"
sed -i "/^import.*sys/asys.path.append(\"$matplotlib_path\"); sys.path.append(\"$numpy_path\");" \
"$out/etc/asciidoc/filters/mpl/mplw.py"
'' + optionalString enableAafigureFilter ''
'' + optionalString _enableAafigureFilter ''
echo "Extracting aafigure filter"
unzip -d "$out/etc/asciidoc/filters/aafigure" "${aafigureFilterSrc}"
# Add aafigure to sys.path (and it needs recursive-pth-loader)
@ -185,10 +198,10 @@ stdenv.mkDerivation rec {
aafigure_path="$(toPythonPath ${aafigure})"
sed -i "/^import.*sys/asys.path.append(\"$pth_loader_path\"); sys.path.append(\"$aafigure_path\"); import sitecustomize" \
"$out/etc/asciidoc/filters/aafigure/aafig2img.py"
'' + optionalString enableDeckjsBackend ''
'' + optionalString _enableDeckjsBackend ''
echo "Extracting deckjs backend"
unzip -d "$out/etc/asciidoc/backends/deckjs" "${deckjsBackendSrc}"
'' + optionalString enableOdfBackend ''
'' + optionalString _enableOdfBackend ''
echo "Extracting odf backend (odt + odp)"
unzip -d "$out/etc/asciidoc/backends/odt" "${odtBackendSrc}"
unzip -d "$out/etc/asciidoc/backends/odp" "${odpBackendSrc}"
@ -244,7 +257,7 @@ stdenv.mkDerivation rec {
preInstall = "mkdir -p $out/etc/vim";
meta = with stdenv.lib; {
description = "Text-based document generation system ${stdenv.lib.optionalString enableStandardFeatures "(full version)"}";
description = "Text-based document generation system";
longDescription = ''
AsciiDoc is a text document format for writing notes, documentation,
articles, books, ebooks, slideshows, web pages, man pages and blogs.

View file

@ -609,6 +609,8 @@ let
flex = flex_2_5_35;
};
cv = callPackage ../tools/misc/cv { };
ditaa = callPackage ../tools/graphics/ditaa { };
direnv = callPackage ../tools/misc/direnv { };
@ -4063,6 +4065,8 @@ let
pkgconfig = forceNativeDrv (callPackage ../development/tools/misc/pkgconfig { });
pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; });
prelink = callPackage ../development/tools/misc/prelink { };
premake3 = callPackage ../development/tools/misc/premake/3.nix { };
premake4 = callPackage ../development/tools/misc/premake { };
@ -4156,7 +4160,9 @@ let
uncrustify = callPackage ../development/tools/misc/uncrustify { };
vagrant = callPackage ../development/tools/vagrant { };
vagrant = callPackage ../development/tools/vagrant {
ruby = ruby2;
};
gdb = callPackage ../development/tools/misc/gdb {
hurd = gnu.hurdCross;
@ -10481,6 +10487,11 @@ let
import ../desktops/e17 { inherit callPackage pkgs; }
);
e18 = recurseIntoAttrs (
let callPackage = newScope pkgs.e18; in
import ../desktops/e18 { inherit callPackage pkgs; }
);
gnome2 = callPackage ../desktops/gnome-2 {
callPackage = pkgs.newScope pkgs.gnome2;
self = pkgs.gnome2;

View file

@ -141,12 +141,15 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; };
aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; };
aeson = self.aeson_0_7_0_6;
aeson_0_8_0_0 = callPackage ../development/libraries/haskell/aeson/0.8.0.0.nix { blazeBuilder = null; };
aeson = self.aeson_0_7_0_6; # 0.8.0.0 breaks too many packages at the moment
aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {};
aesonQq = callPackage ../development/libraries/haskell/aeson-qq {};
aesonUtils = callPackage ../development/libraries/haskell/aeson-utils {};
alsaCore = callPackage ../development/libraries/haskell/alsa-core {};
alsaMixer = callPackage ../development/libraries/haskell/alsa-mixer {};
@ -163,6 +166,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {};
applicativeQuoters = callPackage ../development/libraries/haskell/applicative-quoters {};
ariadne = callPackage ../development/libraries/haskell/ariadne {};
arithmoi = callPackage ../development/libraries/haskell/arithmoi {};
@ -374,6 +379,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
cgi_3001_1_8_5 = callPackage ../development/libraries/haskell/cgi/3001.1.8.5.nix {};
cgi = self.cgi_3001_1_8_5;
cgrep = callPackage ../development/libraries/haskell/cgrep {};
charset = callPackage ../development/libraries/haskell/charset {};
Chart = callPackage ../development/libraries/haskell/Chart {};
@ -425,6 +432,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
cmdtheline = callPackage ../development/libraries/haskell/cmdtheline {};
codeBuilder = callPackage ../development/libraries/haskell/code-builder {};
CodecImageDevIL = callPackage ../development/libraries/haskell/codec-image-devil {};
colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {};
@ -811,6 +820,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
fingertree = callPackage ../development/libraries/haskell/fingertree {};
focus = callPackage ../development/libraries/haskell/focus {};
foldl = callPackage ../development/libraries/haskell/foldl {};
folds = callPackage ../development/libraries/haskell/folds {};
@ -841,6 +852,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
gdiff = callPackage ../development/libraries/haskell/gdiff {};
genericAeson = callPackage ../development/libraries/haskell/generic-aeson {};
genericDeriving = callPackage ../development/libraries/haskell/generic-deriving {};
ghcCore = callPackage ../development/libraries/haskell/ghc-core {};
@ -1255,6 +1268,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
hxtHttp = callPackage ../development/libraries/haskell/hxt-http {};
hxtPickleUtils = callPackage ../development/libraries/haskell/hxt-pickle-utils {};
hxtRegexXmlschema = callPackage ../development/libraries/haskell/hxt-regex-xmlschema {};
hxtTagsoup = callPackage ../development/libraries/haskell/hxt-tagsoup {};
@ -1338,6 +1353,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {};
jsonSchema = callPackage ../development/libraries/haskell/json-schema {};
jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};
JuicyPixelsUtil = callPackage ../development/libraries/haskell/JuicyPixels-util {};
@ -1442,6 +1459,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
lrucache = callPackage ../development/libraries/haskell/lrucache {};
lochTh = callPackage ../development/libraries/haskell/loch-th {};
lockfreeQueue = callPackage ../development/libraries/haskell/lockfree-queue {};
logfloat = callPackage ../development/libraries/haskell/logfloat {};
@ -1575,6 +1594,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
multimap = callPackage ../development/libraries/haskell/multimap {};
multipart = callPackage ../development/libraries/haskell/multipart {};
multiplate = callPackage ../development/libraries/haskell/multiplate {};
multirec = callPackage ../development/libraries/haskell/multirec {};
@ -1725,7 +1746,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {};
parsers_0_11_0_3 = callPackage ../development/libraries/haskell/parsers/0.11.0.3.nix {};
parsers = self.parsers_0_11_0_3;
parsers_0_12 = callPackage ../development/libraries/haskell/parsers/0.12.nix {};
parsers = self.parsers_0_11_0_3; # the new version breaks trifecta
parsimony = callPackage ../development/libraries/haskell/parsimony {};
@ -1787,6 +1809,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
pipesZlib = callPackage ../development/libraries/haskell/pipes-zlib {};
placeholders = callPackage ../development/libraries/haskell/placeholders {};
polyparse = callPackage ../development/libraries/haskell/polyparse {};
pointed = callPackage ../development/libraries/haskell/pointed {};
@ -1875,7 +1899,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {};
QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {};
QuickCheck_2_7_5 = callPackage ../development/libraries/haskell/QuickCheck/2.7.5.nix {};
QuickCheck = self.QuickCheck_2_7_5;
QuickCheck_2_7_6 = callPackage ../development/libraries/haskell/QuickCheck/2.7.6.nix {};
QuickCheck = self.QuickCheck_2_7_6;
quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {};
@ -1961,6 +1986,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
regular = callPackage ../development/libraries/haskell/regular {};
regularXmlpickler = callPackage ../development/libraries/haskell/regular-xmlpickler {};
remote = callPackage ../development/libraries/haskell/remote {};
repa = callPackage ../development/libraries/haskell/repa {};
@ -1978,6 +2005,22 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
resourcet = callPackage ../development/libraries/haskell/resourcet {};
restClient = callPackage ../development/libraries/haskell/rest-client {};
restCore = callPackage ../development/libraries/haskell/rest-core {};
restGen = callPackage ../development/libraries/haskell/rest-gen {};
restHappstack = callPackage ../development/libraries/haskell/rest-happstack {};
restSnap = callPackage ../development/libraries/haskell/rest-snap {};
restStringmap = callPackage ../development/libraries/haskell/rest-stringmap {};
restTypes = callPackage ../development/libraries/haskell/rest-types {};
restWai = callPackage ../development/libraries/haskell/rest-wai {};
retry = callPackage ../development/libraries/haskell/retry {};
rethinkdb = callPackage ../development/libraries/haskell/rethinkdb {};
@ -2207,6 +2250,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
stmConduit = callPackage ../development/libraries/haskell/stm-conduit {};
stmContainers = callPackage ../development/libraries/haskell/stm-containers {};
STMonadTrans = callPackage ../development/libraries/haskell/STMonadTrans {};
stmStats = callPackage ../development/libraries/haskell/stm-stats {};
@ -2387,6 +2432,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
tls = self.tls_1_1_5;
};
tostring = callPackage ../development/libraries/haskell/tostring {};
transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {};
transformers_0_3_0_0 = callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {};
transformers_0_4_1_0 = callPackage ../development/libraries/haskell/transformers/0.4.1.0.nix {};
@ -2459,6 +2506,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
uri = callPackage ../development/libraries/haskell/uri {};
uriEncode = callPackage ../development/libraries/haskell/uri-encode {};
url = callPackage ../development/libraries/haskell/url {};
urlencoded = callPackage ../development/libraries/haskell/urlencoded {};
@ -2708,6 +2757,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
Agda_2_3_2_2 = callPackage ../development/compilers/agda/2.3.2.2.nix {};
Agda_2_4_0_1 = callPackage ../development/compilers/agda/2.4.0.1.nix {
binary = self.binary_0_7_2_1;
QuickCheck = self.QuickCheck_2_7_5;
};
Agda = self.Agda_2_4_0_1;
@ -2758,7 +2808,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {};
haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {};
haddock_2_14_2 = callPackage ../development/tools/documentation/haddock/2.14.2.nix {};
haddock = self.haddock_2_14_2;
haddock_2_14_3 = callPackage ../development/tools/documentation/haddock/2.14.3.nix {};
haddock = self.haddock_2_14_3;
HandsomeSoup = callPackage ../development/libraries/haskell/HandsomeSoup {};

View file

@ -9511,6 +9511,27 @@ rec {
};
};
pythonefl = buildPythonPackage rec {
name = "python-efl-${version}";
version = "1.10.0";
src = fetchurl {
url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz";
sha256 = "1inv2qalnm9paifdwyh9q3ffxcp9bjj92phvfw1rgkaildvfji5i";
};
preConfigure = ''
export NIX_CFLAGS_COMPILE="-I${pkgs.e18.efl}/include/eo-1 -I${pkgs.e18.efl}/include/eina-1 -I${pkgs.e18.efl}/include/eina-1/eina -I${pkgs.e18.efl}/include/evas-1 -I${dbus}/include/dbus-1.0 -I${pkgs.e18.efl}/include/efl-1 -I${pkgs.e18.efl}/include/eet-1 -I${pkgs.e18.efl}/include/ecore-1 -I${pkgs.e18.efl}/include/ecore-evas-1 -I${pkgs.e18.efl}/include/ecore-file-1 -I${pkgs.e18.efl}/include/ecore-input-1 -I${pkgs.e18.efl}/include/ecore-imf-1 -I${pkgs.e18.efl}/include/ecore-con-1 -I${pkgs.e18.efl}/include/edje-1 -I${pkgs.e18.efl}/include/eldbus-1 -I${pkgs.e18.efl}/include/efreet-1 -I${pkgs.e18.efl}/include/ethumb-client-1 -I${pkgs.e18.efl}/include/ethumb-1 -I${pkgs.e18.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE"
'';
buildInputs = [ pkgs.pkgconfig pkgs.e18.efl pkgs.e18.elementary ];
meta = {
description = "Python bindings for EFL and Elementary.";
homepage = http://enlightenment.org/;
maintainers = [ stdenv.lib.maintainers.matejc ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl3;
};
};
# python2.7 specific packages
} // optionalAttrs isPy27 (
with pythonPackages;