JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into x-updates

Browse Source 
Conflicts (just different styles, same semantics):
	pkgs/development/libraries/libusb1/default.nix
This commit is contained in:
Vladimír Čunát 2013-12-07 14:17:16 +01:00
commit 6690c97569
141 changed files with 3022 additions and 990 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/databases/postgresql.nix
View File

@ -211,6 +211,7 @@ in
# Shut down Postgres using SIGINT ("Fast Shutdown mode"). See
# http://www.postgresql.org/docs/current/static/server-shutdown.html
KillSignal = "SIGINT";
KillMode = "process"; # FIXME: this may cause processes to be left behind in the cgroup even after the final SIGKILL
# Give Postgres a decent amount of time to clean up after
# receiving systemd's SIGINT.

5
nixos/modules/services/networking/avahi-daemon.nix
View File

@ -51,7 +51,10 @@ in
hostName = mkOption {
type = types.str;
description = ''Host name advertised on the LAN.'';
description = ''
Host name advertised on the LAN. If not set, avahi will use the value
of config.networking.hostName.
'';
};
browseDomains = mkOption {

4
pkgs/applications/audio/caps/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "caps-${version}";
version = "0.9.7";
version = "0.9.16";
src = fetchurl {
url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2";
sha256 = "0ks98r3j404s9h88x50lj5lj4l64ijj29fz5i08iyq8jrb7r0zm0";
sha256 = "117l04w2zwqak856lihmaxg6f22vlz71knpxy0axiyri0x82lbwv";
};
configurePhase = ''
echo "PREFIX = $out" > defines.make

4
pkgs/applications/audio/drumkv1/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "drumkv1-${version}";
version = "0.3.2";
version = "0.3.5";
src = fetchurl {
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
sha256 = "0bafg06iavri9dmg7hpz554kpqf1iv9crcdq46y4n4wyyxd7kajl";
sha256 = "125aa1lmmwjdbzyv13yaax4n6ni7h7v7c7clmjaz7bglzay7xq5w";
};
buildInputs = [ jackaudio libsndfile lv2 qt4 ];

4
pkgs/applications/audio/fluidsynth/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "fluidsynth-${version}";
version = "1.1.5";
version = "1.1.6";
src = fetchurl {
url = "mirror://sourceforge/fluidsynth/${name}.tar.bz2";
sha256 = "1x73a5rsyvfmh1j0484kzgnk251q61g1g2jdja673l8fizi0xd24";
sha256 = "00gn93bx4cz9bfwf3a8xyj2by7w23nca4zxf09ll53kzpzglg2yj";
};
preBuild = stdenv.lib.optionalString stdenv.isDarwin ''

4
pkgs/applications/audio/jalv/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "jalv-${version}";
version = "1.4.0";
version = "1.4.2";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "1hq968fhiz86428krqhjl3vlw71bigc9bsfcv97zgvsjh0fh6qa0";
sha256 = "132cq347xpa91d9m7nnmpla7gz4xg0njfw7kzwnp0gz172k0klp7";
};
buildInputs = [

8
pkgs/applications/editors/emacs-modes/ess/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, emacs, texinfo }:
stdenv.mkDerivation {
name = "ess-13.05";
stdenv.mkDerivation rec {
name = "ess-13.09";
src = fetchurl {
url = "http://ess.r-project.org/downloads/ess/ess-13.05.tgz";
sha256 = "007rd8hg1aclr2i8178ym5c4bi7vgmwkp802v1mkgr85h50zlfdk";
url = "http://ess.r-project.org/downloads/ess/${name}.tgz";
sha256 = "1lki3vb6p7cw98zqq0gaia68flpqrjkd6dcl85fs0cc8qf55yqnh";
};
buildInputs = [ emacs texinfo ];

4
pkgs/applications/graphics/graphicsmagick/default.nix
View File

@ -2,14 +2,14 @@
, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz
, libX11}:
let version = "1.3.13"; in
let version = "1.3.18"; in
stdenv.mkDerivation {
name = "graphicsmagick-${version}";
src = fetchurl {
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
sha256 = "08lgjvhvhw3by5h4kfpl7072dbvkcpsajy5f6izq69cv61vadqs5";
sha256 = "1axh4j2jr3l92dan15b2nmx9da4l7i0rcz9b5bvfd4q742zfwj7x";
};
configureFlags = "--enable-shared";

6
pkgs/applications/graphics/sxiv/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, libX11, imlib2, giflib }:
stdenv.mkDerivation {
name = "sxiv-1.1";
name = "sxiv-1.1.1";
src = fetchurl {
url = "https://github.com/muennich/sxiv/archive/v1.1.tar.gz";
url = "https://github.com/muennich/sxiv/archive/v1.1.1.tar.gz";
name = "sxiv-1.1.tar.gz";
sha256 = "0gsqwa1yacsig7ycjrw0sjyrsa9mynfzzbwm1vp2bgk4s9hb08kx";
sha256 = "07r8125xa8d5q71ql71s4i1dx4swy8hypxh2s5h7z2jnn5y9nmih";
};
buildInputs = [ libX11 imlib2 giflib ];

4
pkgs/applications/misc/krename/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt4, phonon }:
stdenv.mkDerivation rec {
name = "krename-4.0.4";
name = "krename-4.0.9";
src = fetchurl {
url = "mirror://sourceforge/krename/${name}.tar.bz2";
sha256 = "12qhclw1vbg5bv6619qd4408y8d1w26499gcr8gwhgfzk0v83hic";
sha256 = "11bdg5vdcs393n0aibhm3jh3wxlk5kz78jhkwf7cj9086qkg9wds";
};
buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt4 phonon ];

24
pkgs/applications/misc/robomongo/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, qt5, openssl, boost, cmake, scons, python, pcre, bzip2 }:
stdenv.mkDerivation {
name = "robomongo-0.8.3";
src = fetchurl {
url = https://github.com/paralect/robomongo/archive/v0.8.3.tar.gz;
sha256 = "1x8vpmqvjscjcw30hf0i5vsrg3rldlwx6z52i1hymlck2jfzkank";
};
patches = [ ./robomongo.patch ];
NIX_CFLAGS_COMPILE = "-fno-stack-protector";
buildInputs = [ cmake boost scons qt5 openssl python pcre bzip2 ];
meta = {
homepage = "http://robomongo.org/";
description = "Query GUI for mongodb";
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.amorsillo ];
};
}

48
pkgs/applications/misc/robomongo/robomongo.patch Normal file
View File

@ -0,0 +1,48 @@
Remove check for QT_NO_STYLE_GTK to avoid building with QCleanlooksStyle which results in error due to missing QCleanlooksStyle
Ensure environment is preserved for scons build -- scons clears the env but we want to keep the nix build environment
Fix typo in cmakelists
diff -rupN robomongo-0.8.3/CMakeLists.txt robomongo-0.8.3-patched/CMakeLists.txt
--- robomongo-0.8.3/CMakeLists.txt 2013-10-01 10:55:00.000000000 -0400
+++ robomongo-0.8.3-patched/CMakeLists.txt 2013-12-06 12:22:06.070659856 -0500
@@ -133,7 +133,7 @@ ELSE()
ENDIF()
##################################DEFAULT VALUES##########################################
-IF(NOT CMAKE_INSTALL_PREFIX})
+IF(NOT CMAKE_INSTALL_PREFIX)
SET(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install")
ENDIF()
diff -rupN robomongo-0.8.3/src/robomongo/gui/AppStyle.h robomongo-0.8.3-patched/src/robomongo/gui/AppStyle.h
--- robomongo-0.8.3/src/robomongo/gui/AppStyle.h 2013-10-01 10:55:00.000000000 -0400
+++ robomongo-0.8.3-patched/src/robomongo/gui/AppStyle.h 2013-12-06 12:20:57.417297186 -0500
@@ -8,13 +8,8 @@
#include <QProxyStyle>
typedef QProxyStyle OsStyle;
#elif defined OS_LINUX
- #if !defined(QT_NO_STYLE_GTK)
- #include <QProxyStyle>
- typedef QProxyStyle OsStyle;
- #else
- #include <QCleanlooksStyle>
- typedef QCleanlooksStyle OsStyle;
- #endif
+ #include <QProxyStyle>
+ typedef QProxyStyle OsStyle;
#endif
namespace Robomongo
diff -rupN robomongo-0.8.3/src/third-party/mongodb/SConstruct robomongo-0.8.3-patched/src/third-party/mongodb/SConstruct
--- robomongo-0.8.3/src/third-party/mongodb/SConstruct 2013-10-01 10:55:00.000000000 -0400
+++ robomongo-0.8.3-patched/src/third-party/mongodb/SConstruct 2013-12-06 12:21:45.705255731 -0500
@@ -283,7 +283,8 @@ usePCH = has_option( "usePCH" )
justClientLib = (COMMAND_LINE_TARGETS == ['mongoclient'])
-env = Environment( BUILD_DIR=variantDir,
+env = Environment( ENV=os.environ,
+ BUILD_DIR=variantDir,
CLIENT_ARCHIVE='${CLIENT_DIST_BASENAME}${DIST_ARCHIVE_SUFFIX}',
CLIENT_DIST_BASENAME=get_option('client-dist-basename'),
CLIENT_LICENSE='#distsrc/client/LICENSE.txt',

4
pkgs/applications/misc/zathura/core/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }:
stdenv.mkDerivation rec {
version = "0.2.5";
version = "0.2.6";
name = "zathura-core-${version}";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
sha256 = "1lw9q0x4b7x6z86hwgs93f8srimd0sj8fwg91185f63yz9g800fr";
sha1 = "d84878388969d523027a1661f49fd29638bd460b";
};
buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ];

10
pkgs/applications/networking/irc/quassel/default.nix
View File

@ -4,6 +4,7 @@
, withKDE ? stdenv.isLinux # enable KDE integration
, ssl ? true # enable SSL support
, previews ? false # enable webpage previews on hovering over URLs
, tag ? "" # tag added to the package name
, stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon }:
let
@ -11,13 +12,16 @@ let
in with stdenv; mkDerivation rec {
name = "quassel-0.9.0";
version = "0.9.2";
name = "quassel${tag}-${version}";
src = fetchurl {
url = "http://quassel-irc.org/pub/${name}.tar.bz2";
sha256 = "09v0igjkzan3hllk47w39hkav6v1419vpxn2lfd8473kwdmf0grf";
url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2";
sha256 = "1h2kzi4pgfv3qmvhxix9fffdjixs3bsya0i5c18dkh894mh02kgh";
};
enableParallelBuilding = true;
buildInputs = [ cmake qt4 ]
++ lib.optional withKDE kdelibs
++ lib.optional withKDE automoc4

11
pkgs/applications/networking/mailreaders/sup/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchurl, ruby, rake, rubygems, makeWrapper, ncursesw_sup
{ stdenv, fetchgit, ruby, rake, rubygems, makeWrapper, ncursesw_sup
, xapian_ruby, gpgme, libiconvOrEmpty, mime_types, chronic, trollop, lockfile
, gettext, iconv, locale, text, highline, rmail_sup, unicode, gnupg, which }:
stdenv.mkDerivation rec {
version = "f27661b1656ae1f0d28fd89595b5a16f268d8d3d";
version = "20131130";
name = "sup-${version}";
meta = {
@ -16,9 +16,10 @@ stdenv.mkDerivation rec {
dontStrip = true;
src = fetchurl {
url = "https://github.com/sup-heliotrope/sup/archive/${version}.tar.gz";
sha256 = "08fxf1knji3260d0mrp86x6yayp43iq7kc5rfay3hga8i2sckdia";
src = fetchgit {
url = git://github.com/sup-heliotrope/sup.git;
rev = "a5a1e39034204ac4b05c9171a71164712690b010";
sha256 = "0w2w7dcif1ri1qq81csz7gj45rqd9z7hjd6x29awibybyyqyvj5s";
};
buildInputs =

14
pkgs/applications/networking/mumble/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, qt4, libvorbis, boost, speechd, protobuf, libsndfile,
avahi, dbus, libcap, pkgconfig,
{ stdenv, fetchurl, qt4, boost, speechd, protobuf, libsndfile,
speex, libopus, avahi, pkgconfig,
jackSupport ? false,
jackaudio ? null }:
@ -18,16 +18,18 @@ stdenv.mkDerivation rec {
'';
configurePhase = ''
qmake CONFIG+=no-g15 CONFIG+=no-update \
CONFIG+=no-embed-qt-translations CONFIG+=no-ice \
qmake CONFIG+=no-g15 CONFIG+=no-update CONFIG+=no-server \
CONFIG+=no-embed-qt-translations CONFIG+=packaged \
CONFIG+=bundled-celt CONFIG+=no-bundled-opus \
CONFIG+=no-bundled-speex
''
+ stdenv.lib.optionalString jackSupport ''
CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio
'';
buildInputs = [ qt4 libvorbis boost speechd protobuf libsndfile avahi dbus
libcap pkgconfig ]
buildInputs = [ qt4 boost speechd protobuf libsndfile speex
libopus avahi pkgconfig ]
++ (stdenv.lib.optional jackSupport jackaudio);
installPhase = ''

30
pkgs/applications/networking/mumble/murmur.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, fetchurl, qt4, boost, protobuf, avahi, libcap, pkgconfig }:
stdenv.mkDerivation rec {
name = "murmur-" + version;
version = "1.2.4";
src = fetchurl {
url = "mirror://sourceforge/mumble/mumble-${version}.tar.gz";
sha256 = "16wwj6gwcnyjlnzh7wk0l255ldxmbwx0wi652sdp20lsv61q7kx1";
};
configurePhase = ''
qmake CONFIG+=no-client CONFIG+=no-ice CONFIG+=no-embed-qt
'';
buildInputs = [ qt4 boost protobuf avahi libcap pkgconfig ];
installPhase = ''
mkdir -p $out
cp -r ./release $out/bin
'';
meta = {
homepage = http://mumble.sourceforge.net/;
description = "Low-latency, high quality voice chat software";
license = "BSD";
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [viric];
};
}

6
pkgs/applications/science/astronomy/xplanet/default.nix
View File

@ -2,15 +2,17 @@
, libjpeg, netpbm}:
stdenv.mkDerivation rec {
name = "xplanet-1.2.2";
name = "xplanet-1.3.0";
src = fetchurl {
url = "mirror://sourceforge/xplanet/${name}.tar.gz";
sha256 = "1jnkrly9njkibxqbg5im4pq9cqjzwmki6jzd318dvlfmnicqr3vg";
sha256 = "0hml2v228wi2r61m1pgka7h96rl92b6apk0iigm62miyp4mp9ys4";
};
buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg netpbm ];
patches = [ ./giflib.patch ];
meta = {
description = "Renders an image of the earth or other planets into the X root window";
homepage = http://xplanet.sourceforge.net;

130
pkgs/applications/science/astronomy/xplanet/giflib.patch Normal file
View File

@ -0,0 +1,130 @@
diff -wbBur xplanet-1.3.0/src/libimage/gif.c /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c
--- xplanet-1.3.0/src/libimage/gif.c 2006-03-26 01:50:51.000000000 +0300
+++ /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c 2013-07-30 18:21:17.412474692 +0400
@@ -20,7 +20,7 @@
#include <stdio.h>
#include <stdlib.h>
-
+#define FALSE 0
#include <gif_lib.h>
/*
@@ -42,11 +42,11 @@
int color_index;
unsigned char *ptr = NULL;
- infile = DGifOpenFileName(filename);
+ infile = DGifOpenFileName(filename, NULL);
if (infile == NULL)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -54,7 +54,7 @@
{
if (DGifGetRecordType(infile, &record_type) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -63,7 +63,7 @@
case IMAGE_DESC_RECORD_TYPE:
if (DGifGetImageDesc(infile) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -107,14 +107,14 @@
GifByteType *ext;
if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
while (ext != NULL)
{
if (DGifGetExtensionNext(infile, &ext) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
}
@@ -178,7 +178,7 @@
return(0);
}
- colormap = MakeMapObject(colormap_size, NULL);
+ colormap = GifMakeMapObject(colormap_size, NULL);
for (i = 0; i < width * height; i++)
{
@@ -187,10 +187,10 @@
blue[i] = (GifByteType) rgb[3*i+2];
}
- if (QuantizeBuffer(width, height, &colormap_size, red, green, blue,
+ if (GifQuantizeBuffer(width, height, &colormap_size, red, green, blue,
buffer, colormap->Colors) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -198,24 +198,24 @@
free(green);
free(blue);
- outfile = EGifOpenFileName((char *) filename, FALSE);
+ outfile = EGifOpenFileName((char *) filename, FALSE, NULL);
if (outfile == NULL)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
if (EGifPutScreenDesc(outfile, width, height, colormap_size, 0, colormap)
== GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
if (EGifPutImageDesc(outfile, 0, 0, width, height, FALSE, NULL)
== GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -224,7 +224,7 @@
{
if (EGifPutLine(outfile, ptr, width) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
ptr += width;
@@ -233,7 +233,7 @@
EGifSpew(outfile);
if (EGifCloseFile(outfile) == GIF_ERROR)
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
free(buffer);

4
pkgs/applications/version-management/mercurial/default.nix
View File

@ -2,7 +2,7 @@
, guiSupport ? false, tk ? null, curses }:
let
name = "mercurial-2.6.1";
name = "mercurial-2.8.1";
in
stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://mercurial.selenic.com/release/${name}.tar.gz";
sha256 = "0r4fg269xnqgacc82ppm3wxl9wwvvgwz8z6zi1iai4gx76iklhdn";
sha256 = "0riksf6p07yxfq1xlraqhl8cacsgb1gg7si185mlbdknrh2a4ffj";
};
inherit python; # pass it so that the same version can be used in hg2git

4
pkgs/applications/video/key-mon/default.nix
View File

@ -3,12 +3,12 @@
buildPythonPackage rec {
name = "key-mon-${version}";
version = "1.13";
version = "1.16";
namePrefix = "";
src = fetchurl {
url = "http://key-mon.googlecode.com/files/${name}.tar.gz";
sha256 = "02h7lcnyqwyqsycd1vlvl11ms81v0zmr9p0pfyl5gmzry9dj7imj";
sha256 = "1pfki1fyh3q29sj6kq1chhi1h2v9ki6sp09qyww59rjraypvzsis";
};
propagatedBuildInputs =

6
pkgs/data/fonts/cantarell-fonts/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "cantarell-fonts-0.0.7";
name = "cantarell-fonts-0.0.15";
src = fetchurl {
url = mirror://gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.7.tar.xz;
sha256 = "1410ywvi951ngmx58g339phzsaf1rgjja6i0xvg49r4ds90zh8ba";
url = mirror://gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.15.tar.xz;
sha256 = "0zmwzzfjrlpkdjb475ann11m53a2idm76ydd2rw1hjmdr74dq72j";
};
meta = {

29
pkgs/desktops/cinnamon/cinnamon-translations.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "cinnamon-translations";
version="2.0.3";
src = fetchurl {
url = "http://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz";
sha256 = "07w3v118xrfp8r4dkbdiyd1vr9ah7f3bm2zw9wag9s8l8x0zfxgc";
};
installPhase =
''
mkdir -pv $out/usr/share/cinnamon/locale
cp -av mo-export/* $out/usr/share/cinnamon/locale/
'';
meta = {
homepage = "http://cinnamon.linuxmint.com";
description = "Translations files for the Cinnamon desktop" ;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.roelof ];
};
}

23
pkgs/desktops/gnome-3/core/gnome-menus/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ stdenv, fetchurl, intltool, pkgconfig, glib }:
let
version = "3.10.1";
in
stdenv.mkDerivation {
name = "gnome-menus-${version}";
src = fetchurl {
url = "http://ftp.gnome.org/pub/gnome/sources/gnome-menus/3.10/gnome-menus-3.10.1.tar.xz";
sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
};
preBuild = "patchShebangs ./scripts";
buildInputs=[ intltool pkgconfig glib ];
meta = {
homepage = "http://www.gnome.org";
description = "Gnome menu specification";
platforms = stdenv.lib.platforms.linux;
};
}

2
pkgs/desktops/gnome-3/default.nix
View File

@ -24,6 +24,8 @@ rec {
gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
gnome-menus = callPackage ./core/gnome-menus { };
gnome_keyring = callPackage ./core/gnome-keyring { };
libgnome_keyring = callPackage ./core/libgnome-keyring { };

2
pkgs/desktops/kde-4.11/default.nix
View File

@ -1,4 +1,4 @@
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.2" }:
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.4" }:
let
# Need callPackageOrig to avoid infinite cycle

444
pkgs/desktops/kde-4.11/kde-package/4.11.4.nix Normal file
View File

@ -0,0 +1,444 @@
{stable=true;
hashes=builtins.listToAttrs[
{name="amor";value="1ljcsrvd2pdy0swvlc0rpjh39bvash5qwszx0lpc9v083jg9cwym";}
{name="analitza";value="1h2bcllpzlkbgxi72g8g143zk06kywgy00rcn5mypsy35b3ka70d";}
{name="ark";value="0q1g5kab6147pdw1mdwr2rkmggrg1x3plw9y0bny1xfvdlkmm1aq";}
{name="audiocd-kio";value="05a56m059awii6gk60dphb3hwi9zq5gd38i0gdx2fq9ns8a5k1qd";}
{name="blinken";value="0fhfy2yvpgcfjdjqq85ws2vddhbv0ljp5gda3x7i7lv730vmhvcq";}
{name="bomber";value="1bgpvd3kib6p7vwkkw9al1qd2mcxl8rv2lzw30d3a0mjka0a31x8";}
{name="bovo";value="0yb1fds74c803l932nmhs00gxqa80rcmnx5js43r60xjca8i97bf";}
{name="cantor";value="154dxff6yki487hy4xy301swm2j9wiv9ql6fhm399cr54yx595ix";}
{name="cervisia";value="1v2h0awmlnvjzyaaqkix4mzv3i63qf21y65nxxfvhzv29imqbx29";}
{name="dolphin-plugins";value="0jpmc93w8z1mg5cxxppqzkkr9mz5lsd1nsaflvmpyyrgvf81x2d7";}
{name="dragon";value="0q2b6f36yaqlbrpjq5h89d8igi270fxipbhj7dy8f31jbyiyrqk1";}
{name="ffmpegthumbs";value="175r16jk0sps6144a5d1yan3m6fyargcpa5pk05g3j6fm9z5il6n";}
{name="filelight";value="1wgzpcq11znw7gxqf6dv0zhiyyljax9cjglsg7hldrpmpcv36ry2";}
{name="granatier";value="1830bp4wb2dsqrh5wlw5si5k9aihv2sgv76flpksdywzgp35nsp6";}
{name="gwenview";value="02i8zkb93ribn2kb2f9yqr2ldgr5qzc9lsfw4iyzjbnsdssww0y5";}
{name="jovie";value="1qi602477f796wf27b9arhkl4lxcwl3zdr3d5ma38x1zqy422zcx";}
{name="juk";value="195wa7qzhadal8pqy98lsxivjkazms9bg5vig89q281p5gf675rj";}
{name="kaccessible";value="0mj1zfrkq14yi1sxg3xyq234rfq8ykjmalkbn4a1fb5prvr4x9zp";}
{name="kactivities";value="0xhmmam62pgw1f2sdgp7yhf8pxpblcaf1jrclfr0h3pjigghvixi";}
{name="kajongg";value="1ag5xs842923y347k92x2phbj6rjmzfpy8wxsqhkygw5bi12n7sd";}
{name="kalgebra";value="1c66ad47m94lb2qrn3cas8g194sri79xzx8dzprj7avc3659n3jh";}
{name="kalzium";value="0li8dip02hr22p0xrnhqlgjqrqmanyv48cpfd2q6q9hjhqjasf85";}
{name="kamera";value="0dcpypb1xzwn2qj2bfcz0dr2ck3falhqa5cgv0sa1lkizndsr9gw";}
{name="kanagram";value="1gmk1ncw8sappzz5hr5im4n23fiy628k9wjrf2fhdlrfin1qwhrn";}
{name="kapman";value="0pnxnql2vc88rjbgz2zmacwxv8nipfdqlaldllnnx0nzzv8y5fky";}
{name="kapptemplate";value="19n4dsdnsk0rm7xci43jmxxczf699nbslk5sqgx7ymrhqwjad647";}
{name="kate";value="137r2snggr4lckqdpck9m9lxa97ldhdqm5y1hs7gfnpnhkjhb1nm";}
{name="katomic";value="12096dnqyz41sf94w0ywpmwj1w5idrk7mbi0k18qjgbm9rqmapc7";}
{name="kblackbox";value="1qjp86lvbjy1chxik3v5m6c90wp86qa8vvpxiz87yryb3zzzrhmc";}
{name="kblocks";value="0vwmv5m2zhdagc5vhdvp8jkfnq3r6ls02a5r5k6m2vl5n5a9mi9k";}
{name="kbounce";value="1cy7lmx1viqwf62mpi137wsx2haqclgxccsdp5gk8xa3s9r9s08d";}
{name="kbreakout";value="1zf6bpdyq5qzzz2xgmprcfkx7jdg153skb24vr44x137sj8mhmb9";}
{name="kbruch";value="07w1isaddxs2vv5c92nskwfybh78naqgc84wzrfcand3h6bl1s6y";}
{name="kcachegrind";value="08c17i6mk50n7nw9b5n7hc6kgxr6k30lr79jxyh96q861ynlhsqm";}
{name="kcalc";value="0lj33rxcj4zb4bmdhz4gwmmakj8kz66bf97rdid4r82cdd1hyjj8";}
{name="kcharselect";value="1ghpnwv47yybviygrz3adjzrkmdwnl0qbljm41d0s6x5583p1dvd";}
{name="kcolorchooser";value="0951nnc3xlp45qh2im91xhnl7w241667bnpnr6xk4p9pn9h979ys";}
{name="kcron";value="1rlfyxqg15r7naqbcwgma7z2vwd6dn95fr4sr3pb460bk9pbpgvi";}
{name="kdeartwork";value="0rpipr6zvywr6fipz8m0bw7iik9vrxslbnnfjy7rf45ywkbz7rnz";}
{name="kde-baseapps";value="15j335pnswjmwcgcgsdxpkmdw6a6pskkk290j9h8pjrcf1fnwbfn";}
{name="kde-base-artwork";value="0ics2inh6vc5k06rfgx8nw3xr782s5r9fj9w2xvd4ynj87mswr0l";}
{name="kde-dev-scripts";value="0fkk70c1q7icsds4b99kk4bwxhldy8m7k829d2n659vi3mn0pw98";}
{name="kde-dev-utils";value="016899rkw5imqlr1n25jzyl7bm6pg7hfdc13i81ghglfwrzqcwsv";}
{name="kdegraphics-mobipocket";value="1x0h9hli509a7fqwy8zvccw8cnxfmaw1grnf6c8iy4fzjik1kimv";}
{name="kdegraphics-strigi-analyzer";value="1qpiydbqxs6xvwdad6w5k2kjx22ldy3lz3fl3afahgi038a246a1";}
{name="kdegraphics-thumbnailers";value="18pn0r7s334jy93ln42r0ny52nynlrbqxr65z1gqfxxh6bmf1z67";}
{name="kdelibs";value="1v9d0r5a07fsyrnrikwgwvh64p1gqx3ch2makl55qqqyzyg16lnx";}
{name="kdenetwork-filesharing";value="1y5n2bvx3p5zcr1615avzlcj2jwjw9g3ah6na99anyk14j1x8pnr";}
{name="kdenetwork-strigi-analyzers";value="1zymkbs4hd9lxck8fylbdkvlcfdm37g3a42gnfi7pcyqc7mv8az9";}
{name="kdepim";value="1rk35yzf0pm6bmnx4fjd2mw6wrn1fvllnqqrg5s2afz6v4shc9b4";}
{name="kdepimlibs";value="1lc5ly08drsaa198il44cbnbwrpzk9ci6nwks2gc8p93rrqd4siv";}
{name="kdepim-runtime";value="0bxjh2xcp46xnsk71zv22as7qyz393ri5mvshg2nam1jfs3fw38r";}
{name="kdeplasma-addons";value="1zdya555q7ljpabsggw23l008fy1q5sjpaphcr9jb4ycyhk879fc";}
{name="kde-runtime";value="05nd0ir5x6i2lkh4xhkmdvqs5rfy2bcj6ib6a9nd1v6j2v6h90dj";}
{name="kdesdk-kioslaves";value="0bdzm70gw64yab3wi35xri6nkkx4vf5b20r3056z6gys932wzfnp";}
{name="kdesdk-strigi-analyzers";value="026swm6mq4dzsq5a38kd6ijwm18gvwqq87k58z8yxc8xwj12cf4d";}
{name="kdesdk-thumbnailers";value="1zpakq07zgv1z6imfzpin180nyda1wdaiqjvd8wdl61c444byagp";}
{name="kde-wallpapers";value="0mrdgjqyw0l960f6gr6ggjgdw9fhnkv9xl5pf6sxla6jfz3w28lc";}
{name="kdewebdev";value="1zk4nnllan06l712scs5pxsy1awb962h1i5l4sf91d9plczdldli";}
{name="kde-workspace";value="0vzi0xy17n1r24gflcxfc8ld2qkg77k8isbz94zi9q56qpm0lhhk";}
{name="kdf";value="0sagjckmnlfh3mbfrvwxgcmngay6nc3wl3wf5jc5agyhpnac55wb";}
{name="kdiamond";value="17xkadf2ycsrd35j83gh2awmf9a5sm814cyz18pcgwjrp6k95dkg";}
{name="kdnssd";value="0vwqj5dzzjm4i780d3glnqkl5adn388y48nwazr4dz3kz1ay43hb";}
{name="kfloppy";value="0nybxrvki28j01bwdas9ys7m6a549190mai4s5sfnsz1sz3h0glh";}
{name="kfourinline";value="043xl0dby94b1v7hbnpsahd5ihgrzp3616zcf7af0icjmwxyqk8w";}
{name="kgamma";value="1l1j81zxl2v063wwbvalbvpsjbiq4zvpqfhpfrnp8gsp7s1sn0y9";}
{name="kgeography";value="1da95fq7437wiqy77v15k7b9y32d627ghfn16dbfpn1gl2srl6md";}
{name="kget";value="0g0yx6mkmz97j7kv9a5y8n4aqrrnr05k42d5jql74s0f1c32f8cr";}
{name="kgoldrunner";value="0dy0hx9ksfwyhsz160jlzks5m9y75nffgg53j4bcrzfakhbjiqfx";}
{name="kgpg";value="0qh8l99gpk71mag6zy86wjhm9mswy4sx7glxrwbbcqz67zag7ky3";}
{name="khangman";value="0452a4di9kbh36spvfaa66sgwfdrj6838h7h7k1g9bay9i7zw1vq";}
{name="kig";value="1yf8x2r1qmarqpsqzraf8xxamlgpynhdrl1afl74ay4npngc3dlp";}
{name="kigo";value="04jbhy55yb72nqsy9cblj813z33zddbmxv6fgxr8i2avr378d79c";}
{name="killbots";value="0sqislgqb8lkqq1gshx7m499nvwwcl5wfn5b6bpvg12azshzffs8";}
{name="kimono";value="0bjk8nq4avh0df1i5yz4y6ibgaas7503827dwf8klzns17if54mq";}
{name="kiriki";value="0209cjsiz8db4nlb9n77zdj25bi71xfl75b7l2wd64pgwlp4k0f6";}
{name="kiten";value="0hb0d5rcwl68vr0ca2vkqxmjx1iz6xjddyxd7fshggv1jbpybcy7";}
{name="kjumpingcube";value="0qxaagxg5cd12jjx4sm7mhh2x5xrgl5vsj0h7400x61j3wbr8npb";}
{name="klettres";value="04a5vy0qw70lm9wsh6qs3lvbadsa8d3blba9c7xxyxhy8l7zmp0h";}
{name="klickety";value="05csnzkb9c396b6gp3iij8m5cjgw68hw8bxqg6sv4gj66iyrymbr";}
{name="klines";value="09cl1cyc2mjqsf4p9ws749v2gpailj6kww2wph1iz4l3sgnavi1p";}
{name="kmag";value="0mna9a46140qa3y3p19gpif83qik4jgl3705mm8s06qh6ryan753";}
{name="kmahjongg";value="0k38vq5r4hr3pfqd37bvb08h7xm54l4kljgyfy3wrx565mq7n5xh";}
{name="kmines";value="04fwfsnj1a1cfr6c3h8cq9anvi4nh4kr5xbcc9l74zvmnnl8j1cw";}
{name="kmix";value="0wqiqgvf1hyinymwn5crqsa3bd7xv934qniyp8pwhlxk1k2ix6x0";}
{name="kmousetool";value="1g643dm8111jk4zq7smlp6hdz42qcmsar2v7y9c9i2a1169r5n1z";}
{name="kmouth";value="1ccibpnw09qm6r9nfb2jchrjwg8i5k3shq6g41i80sgpja6ir8h8";}
{name="kmplot";value="0kx3ccznqydqyc50sn27b6dswwyalhdhxrd789ac9xx6gpn1vcid";}
{name="knavalbattle";value="1lm4393jl45f90zbyvsznln4n7qccl3qw8a1d984ghmqvnx576jr";}
{name="knetwalk";value="0v91z2sd3pyrwsqwxhwz4rhm6lc3lr2y8kkpbyqmf8sf4pchfnkl";}
{name="kolf";value="00s9p9pxkd3insjs0fxnqcnhycy27wm5isyp4bnaa11i79i4zl3g";}
{name="kollision";value="0sf5pzrk10ad6x86wvbmf61jmnpb29hzc21z6l84cbq8iwqpms6x";}
{name="kolourpaint";value="1icagd88zvp138dr9l2g5cp7cisry0jmja5qh8mxpidk3ax94d7s";}
{name="kompare";value="02y3rlr4v5p6x9x2i0h39x0g1fql893hhyizb05ici2a61ddbs94";}
{name="konquest";value="0dg183wmz8b551g3j5rnd591y2sb8ksi0a3cnf8jm8wf3fwfa3zd";}
{name="konsole";value="15n68fihdi6fc0hgrk36q668x653y3z8zqfb5zzawpgd2pmnfkma";}
{name="kopete";value="1658mlfxaxl67zwd7gl0z83jnp8a8lwgvknxgpaa1nyyn2ygflkv";}
{name="korundum";value="1r0dk8hb54wwqk464rwaz3160mc32i7f06ar7k5cg4n9wkqrn9bk";}
{name="kpat";value="082kldxd0pnwdcayaww6dkal0imfnsnwdbcsdlcapzjp51i978q6";}
{name="kppp";value="1adsa7x8i8xc51a6k9fkqwkrv3rz0iwg1xkjfagslgm8s4iac8ki";}
{name="krdc";value="1ddvf4ls6mwmljg5szwqcwn3lsvvpx3pgrx7f0ml5hiymw87mhrr";}
{name="kremotecontrol";value="18imhmss3f5azcj4qnrx4jib2y0xx7rdjd4a6s4h8pqmigln6bin";}
{name="kreversi";value="0qhfpr7j7v8349kj0avk6qrsaiqj5q8bc4pf58abfsgv205gp3rj";}
{name="krfb";value="00z2hrbsfg461dky454xf8ipjp9phfxm8pb6kk0lzakkfzh59zzl";}
{name="kross-interpreters";value="1pz5isyb69cal9qyrhih7s5k6p2l2wwk5qiwczhc3h0ynmk2wssv";}
{name="kruler";value="03d48bv94l9ff7nli7k5q16xl92b38ih90v1bgxkq8pxl7gq493i";}
{name="ksaneplugin";value="0vwzkxqbha1qy6z965s8r1w183ipjz6vqfcxndjdrarzs7mw9ans";}
{name="kscd";value="1ari082m0bhn8ws8wl2kps94s7vhxkrmhlzpzggvl6fssa5fssya";}
{name="kshisen";value="18pliigc2wg1iypf9r8imqp5ih35vbdd4fac7fsac9mzmdvr8pib";}
{name="ksirk";value="1is01dzsd2x6m6vn71i552q0z3qshhgfmlqkvl9g3vsjlz9a811j";}
{name="ksnakeduel";value="0bnaxvzgf7bml483xdvpv1axfi39gxpbykcj8p4vcmkyaqlg9xc6";}
{name="ksnapshot";value="11s5ika5fbh9rhkfbpg9qiyrbd698z17aqqi44qmwn7w7hmd51si";}
{name="kspaceduel";value="058x1j3nv5g77zjkvkzwr0nwfy43gyaqc180mk8xidkzk6w8ncdf";}
{name="ksquares";value="1si68d370k69dd70dvc5s3ny0q3lm1qp0xkyrlzphvfr9ivyb6dj";}
{name="kstars";value="0dxdqgbayh2mdqdjx88prsm5bplsj73xy6zjz4lml99pqz5h24wa";}
{name="ksudoku";value="1b3csnl43i5xfwxnc10qb8aypx8ci5x6lia9qwppcv9w0gqqpmdn";}
{name="ksystemlog";value="1spkyqn0ywi0nbbrcmnkmh88z6525ppshw9wnrzm2ncs9ypsy45s";}
{name="kteatime";value="00nwbw5509g0iz80bg1jljj07kwl9z8zxkvq27qkzx1h0bm9593n";}
{name="ktimer";value="0v9pfbd2hbp7wa01y13845360p7r2bdzpf9h2vc4xb9nifzva9gj";}
{name="ktouch";value="11shkrmw1cbn19j4k167d4qjanh5b6jdqhp65dn24zxbs9prk1y9";}
{name="ktuberling";value="0axx1slrk7142gm9sc61amixzabphdfp2m6zkdw4zi67ly2w15vf";}
{name="kturtle";value="1cm6g8n2qy779cgmvfxvmg49fssrggd1hr87pz1xakd2xkz2qbid";}
{name="ktux";value="039ip37bw0bxc7haz3a9b5ks9hy4k0nyyrqq7n6wdhkg0m4ji5l1";}
{name="kubrick";value="1fmr7w7f8p54892icbvmhd439adg5b04ddfln9ky34akbw8jiap7";}
{name="kuser";value="14dszc4nxgmsm1q6cigh18b97ds4ixsfqp1l717lj39makz7r6jd";}
{name="kwallet";value="1s2w3zqbaml3i3p0s3znka7kwcwib76p0zpfbfzjaxzgxwmb4nwm";}
{name="kwordquiz";value="1a6chbc4hpybxa7w50jlasp5nzrz9z4qk766cxflpf532s6mv9yl";}
{name="libkcddb";value="0h7kg4wnjn2j1wjm758jyf0qiwllzm39zxwkvyd4r744ra88ym6a";}
{name="libkcompactdisc";value="18nwbjgviyqd6pvaq4l7hsihask54knfwsk6z4rpk25ln74ls7rs";}
{name="libkdcraw";value="1b7yzv25dp55mqkj8ap3qy97ddhdagbsfv8kanswln33k8phjvn7";}
{name="libkdeedu";value="1y2iwivgqsg1bb34bif99pa58cqlamfv727h8p69b5r3x0kj1mkk";}
{name="libkdegames";value="0k29wf6zcqvpf9xzrxbizn4pi8mijq8rbr01vck9wx8glj3306gj";}
{name="libkexiv2";value="048rx25n64fyyms9wjdsnlngh5j7650gzxpszf683jgf70x9paj5";}
{name="libkipi";value="0i8k2x68n88v0jwp0yqwbgx6n13vrspb66p3dckwkh4nfsrmnpwn";}
{name="libkmahjongg";value="0b5gfqqk0jjkbhdvh55njlci1k18icijq8a0m987x92dlhyn6hf2";}
{name="libksane";value="13ghwcssd6zp731lcqa3z8q974g5sv48nlp38crpni83jz7wqyl8";}
{name="lokalize";value="1i09brs8v71xhyn3fw69asfvz95gw5iblrnqzf1iybh858fz3sg8";}
{name="lskat";value="11754yxbabhps0w521rzcsqjpkxdk53ikqjchhr91syiymf556as";}
{name="marble";value="07d6hgb65r6aa9h4ikxnssfiq5a0qqbvlq68mp9qib7hhl38qrcx";}
{name="mplayerthumbs";value="1z7f4ibs8jms61kary73p0v4myxsxsag299zp1h3ldfbfshv73yv";}
{name="nepomuk-core";value="08cqvw42zzq981vs9gdix5jjsfgn2i4x0hi7q5ajd2rqyjxngh3s";}
{name="nepomuk-widgets";value="0ncvza1zlk203q57741rx1cj6gqy009ygqpcnlnfbd6xpqyphqq7";}
{name="okteta";value="0b1y8r6fa8dy3xjyiyzj4iy4shwgqff4lv9hrw2dvm3knfvjiyzz";}
{name="okular";value="0wlk1rwgif1qbk7f2v26bgg27vhbjfr4pgbdvncmms43839n9zqq";}
{name="oxygen-icons";value="1w5yn2xyp5kadg5rf2zxb88apgj13c055if3fj5w70mxir1z8nzq";}
{name="pairs";value="00ygnr0r064z33z19mirz79b9dj0wfk6yp38n2rmj1z2568pq9gq";}
{name="palapeli";value="0gbp50aph2ckjj6bw7f5p2xfxw6x8qnypk45c4ys2bfj3xs3kzp9";}
{name="parley";value="0s1iv864ijrlp9wcj13lvy68133dq7spvrmf2xnspn98ba7dydc0";}
{name="perlkde";value="131dipnns5rmncrxh7wmpqxnwxkvnh11rhb7dx76gc9mvgr6k3kg";}
{name="perlqt";value="1rkjv0xmn7v8mgmlfvzfa5ix18xl62hcbgrjg800hrvj43cj7ixj";}
{name="picmi";value="18im6q18zsahx4y75d21ihnmpn00ml8y99xgcwf061jknf3l9rfa";}
{name="poxml";value="0l9zarf51p10hqdnfzks4q7vhm1lkjh1cyi3bqn097jncsv3c0pi";}
{name="print-manager";value="1csnbl0q50g7b0yc681pgf88vvw7f4vzqpq493nn1n6gr8i46l6v";}
{name="pykde4";value="0mwvs209d75s3smsb9wbvcp5n94a9rxh8nvh8d1wyvlkn60kfpr5";}
{name="qtruby";value="1d89h83is86szy4bqa9rb9xcc3iwjgl3kxldcy64cls44cif9vkx";}
{name="qyoto";value="063m9a8b7qc1hxii2w3zyf69b84129zppbrxm83i4q4s0v5y63in";}
{name="rocs";value="02f9cnzkq18fiblih384v3ngaps9lhgqjmzqv2k8k09bxm6pyiz5";}
{name="smokegen";value="17bgshfmxa8iyp65fss3g74wdjdy4rnq7wsf223ls38jk6fjnkmi";}
{name="smokekde";value="0dl24czf5rspgqwm5i8f0a6y911alirnz2vdjywa2j2nimi690il";}
{name="smokeqt";value="1j0qpqr5zjffr8hfkyav50jpxj8xj8n9jk24gahvjnkk9wpyqbjc";}
{name="step";value="1xz074h5hwmacf4v4ca2m580h1sppvvgcwbym142vr55pd3yd2f3";}
{name="superkaramba";value="16xijicbqj771mdy9l91ml8ikm0qjs9ykj8nz6az2xzw6q8izz2g";}
{name="svgpart";value="1d6si3w4kpbxgzyi044cr1ch9b0jrl23fyzabdzxgb2qkcfxifng";}
{name="sweeper";value="1snjprdkzgf80z6waclhibzwcky6k4qam9bkgfd9lkaf9hba5x88";}
{name="umbrello";value="08h82pizkkgqqdgfs2jinwzjb6bc2nr4zyh50fkr0bk0xlspp87f";}
];
modules=[
{
module="kdemultimedia";
split=true;
pkgs=[
{ name="audiocd-kio"; sane="audiocd_kio"; }
{ name="dragon"; }
{ name="ffmpegthumbs"; }
{ name="juk"; }
{ name="kmix"; }
{ name="kscd"; }
{ name="libkcddb"; }
{ name="libkcompactdisc"; }
{ name="mplayerthumbs"; }
];
}
{
module="kdegraphics";
split=true;
pkgs=[
{ name="gwenview"; }
{ name="kamera"; }
{ name="kcolorchooser"; }
{ name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
{ name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
{ name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
{ name="kgamma"; }
{ name="kolourpaint"; }
{ name="kruler"; }
{ name="ksaneplugin"; }
{ name="ksnapshot"; }
{ name="libkdcraw"; }
{ name="libkexiv2"; }
{ name="libkipi"; }
{ name="libksane"; }
{ name="okular"; }
{ name="svgpart"; }
];
}
{
module="kdelibs";
split=true;
pkgs=[
{ name="kdelibs"; }
{ name="nepomuk-core"; sane="nepomuk_core"; }
{ name="nepomuk-widgets"; sane="nepomuk_widgets"; }
];
}
{
module="kdenetwork";
split=true;
pkgs=[
{ name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
{ name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
{ name="kdnssd"; }
{ name="kget"; }
{ name="kopete"; }
{ name="kppp"; }
{ name="krdc"; }
{ name="krfb"; }
];
}
{
module="kdeutils";
split=true;
pkgs=[
{ name="ark"; }
{ name="filelight"; }
{ name="kcalc"; }
{ name="kcharselect"; }
{ name="kdf"; }
{ name="kfloppy"; }
{ name="kgpg"; }
{ name="kremotecontrol"; }
{ name="ktimer"; }
{ name="kwallet"; }
{ name="print-manager"; sane="print_manager"; }
{ name="superkaramba"; }
{ name="sweeper"; }
];
}
{
module="applications";
split=true;
pkgs=[
{ name="kate"; }
{ name="konsole"; }
];
}
{
module="kdetoys";
split=true;
pkgs=[
{ name="amor"; }
{ name="kteatime"; }
{ name="ktux"; }
];
}
{
module="kdesdk";
split=true;
pkgs=[
{ name="cervisia"; }
{ name="dolphin-plugins"; sane="dolphin_plugins"; }
{ name="kapptemplate"; }
{ name="kcachegrind"; }
{ name="kde-dev-scripts"; sane="kde_dev_scripts"; }
{ name="kde-dev-utils"; sane="kde_dev_utils"; }
{ name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
{ name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
{ name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
{ name="kompare"; }
{ name="lokalize"; }
{ name="okteta"; }
{ name="poxml"; }
{ name="umbrello"; }
];
}
{
module="kdegames";
split=true;
pkgs=[
{ name="bomber"; }
{ name="bovo"; }
{ name="granatier"; }
{ name="kajongg"; }
{ name="kapman"; }
{ name="katomic"; }
{ name="kblackbox"; }
{ name="kblocks"; }
{ name="kbounce"; }
{ name="kbreakout"; }
{ name="kdiamond"; }
{ name="kfourinline"; }
{ name="kgoldrunner"; }
{ name="kigo"; }
{ name="killbots"; }
{ name="kiriki"; }
{ name="kjumpingcube"; }
{ name="klickety"; }
{ name="klines"; }
{ name="kmahjongg"; }
{ name="kmines"; }
{ name="knavalbattle"; }
{ name="knetwalk"; }
{ name="kolf"; }
{ name="kollision"; }
{ name="konquest"; }
{ name="kpat"; }
{ name="kreversi"; }
{ name="kshisen"; }
{ name="ksirk"; }
{ name="ksnakeduel"; }
{ name="kspaceduel"; }
{ name="ksquares"; }
{ name="ksudoku"; }
{ name="ktuberling"; }
{ name="kubrick"; }
{ name="libkdegames"; }
{ name="libkmahjongg"; }
{ name="lskat"; }
{ name="palapeli"; }
{ name="picmi"; }
];
}
{
module="kdeedu";
split=true;
pkgs=[
{ name="analitza"; }
{ name="blinken"; }
{ name="cantor"; }
{ name="kalgebra"; }
{ name="kalzium"; }
{ name="kanagram"; }
{ name="kbruch"; }
{ name="kgeography"; }
{ name="khangman"; }
{ name="kig"; }
{ name="kiten"; }
{ name="klettres"; }
{ name="kmplot"; }
{ name="kstars"; }
{ name="ktouch"; }
{ name="kturtle"; }
{ name="kwordquiz"; }
{ name="libkdeedu"; }
{ name="marble"; }
{ name="pairs"; }
{ name="parley"; }
{ name="rocs"; }
{ name="step"; }
];
}
{
module="kdeadmin";
split=true;
pkgs=[
{ name="kcron"; }
{ name="ksystemlog"; }
{ name="kuser"; }
];
}
{
module="kdebindings";
split=true;
pkgs=[
{ name="kimono"; }
{ name="korundum"; }
{ name="kross-interpreters"; sane="kross_interpreters"; }
{ name="perlkde"; }
{ name="perlqt"; }
{ name="pykde4"; }
{ name="qtruby"; }
{ name="qyoto"; }
{ name="smokegen"; }
{ name="smokekde"; }
{ name="smokeqt"; }
];
}
{
module="kdeaccessibility";
split=true;
pkgs=[
{ name="jovie"; }
{ name="kaccessible"; }
{ name="kmag"; }
{ name="kmousetool"; }
{ name="kmouth"; }
];
}
{
module="kde-baseapps";
sane="kde_baseapps"; split=true;
pkgs=[
{ name="kde-baseapps"; sane="kde_baseapps"; }
];
}
{ module="kactivities"; split=false;}
{ module="kdeartwork"; split=false;
pkgs=[
{ name="ColorSchemes"; }
{ name="IconThemes"; }
{ name="emoticons"; }
{ name="kscreensaver"; }
{ name="kwin-styles"; sane="kwin_styles";}
{ name="sounds"; }
{ name="styles"; }
{ name="wallpapers"; }
{ name="HighResolutionWallpapers"; }
{ name="WeatherWallpapers"; }
{ name="desktopthemes"; }
];
}
{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
{ module="kdelibs"; split=false;}
{ module="kdepim"; split=false;}
{ module="kdepimlibs"; split=false;}
{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
{ module="kde-runtime"; sane="kde_runtime"; split=false;}
{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
{ module="kdewebdev"; split=false;
pkgs=[
{ name="klinkstatus"; }
{ name="kfilereplace"; }
{ name="kimagemapeditor"; }
{ name="kommander"; }
];
}
{ module="kde-workspace"; sane="kde_workspace"; split=false;}
{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
];
}

272
pkgs/desktops/kde-4.11/l10n/manifest-4.11.4.nix Normal file
View File

@ -0,0 +1,272 @@
[
{
lang = "ar";
saneName = "ar";
sha256 = "11dzsk6kvqpvpi77414hyis5s0kp4l0xplyyhvkp28shnbzx3cab";
}
{
lang = "bg";
saneName = "bg";
sha256 = "0f4j7s31gw9g183wsxh27dvqkckhrlh1yr4dmd6cjiabpnk5avr5";
}
{
lang = "bs";
saneName = "bs";
sha256 = "09f8dayah2gb4j70pljih8rvk6fiprfvmagii72ymfjw5p609msh";
}
{
lang = "ca";
saneName = "ca";
sha256 = "08jlsy3ak9c5jbwan5wsq4y66sz6pam5mym1hmjfwp1dzknd8lxn";
}
{
lang = "ca@valencia";
saneName = "ca_valencia";
sha256 = "0lwk1qf6xnvxd6lmdif9126i4bna7cwk8dj0dd3s2qm4613gyjdz";
}
{
lang = "cs";
saneName = "cs";
sha256 = "16lm4k45rrxvc228bjzl57a39aybkh6kizm960znkfg8dslxvhnr";
}
{
lang = "da";
saneName = "da";
sha256 = "1z0mkh7sqsblhar3fjind0m63mlx817fhw1r9f0jrijkwmv163cx";
}
{
lang = "de";
saneName = "de";
sha256 = "15611y569bk17ss62ic56ai6lwpqhg9apsqcnkdlh1iwk2wkzg8x";
}
{
lang = "el";
saneName = "el";
sha256 = "1p75mfw2rs9qb0m2zybscrv2jhj7aq8w5a1rxs3hrddr2wc2k0g1";
}
{
lang = "en_GB";
saneName = "en_GB";
sha256 = "0zj9qn2k160184x9lypxyl6d5r8drxz585lagsvd7l0ckx3maqxn";
}
{
lang = "es";
saneName = "es";
sha256 = "0bc11cxjf8672mch30asn34pnn53a3xhz9wb4jly9bxy3bjs93m6";
}
{
lang = "et";
saneName = "et";
sha256 = "1l1h1q65qsmrzgcvralpdmmmnpricbiyc5bhrd1valvgvwys2rj2";
}
{
lang = "eu";
saneName = "eu";
sha256 = "1wsgvmacix0vd7qr029lsgnksw3hnx57aczigcf7m5dy1mi2jk1j";
}
{
lang = "fa";
saneName = "fa";
sha256 = "1j7f32wsbnpzdhfki9wnb18mq26la61f6ksmad33cikq3pwn1qvf";
}
{
lang = "fi";
saneName = "fi";
sha256 = "1l5cvnbkgv9kxn2b67ycmkyqkdpjzq3a8ggsmn4397bj9vlplcdy";
}
{
lang = "fr";
saneName = "fr";
sha256 = "1lnayg8j76gzhxl21x5z92q3g8gc791c4hlgr3ifg54s8rknbbf6";
}
{
lang = "ga";
saneName = "ga";
sha256 = "0z8ncf32qpp9538kb5l41qhvk0c05j168x5q72cfliigs77m9jya";
}
{
lang = "gl";
saneName = "gl";
sha256 = "10pjjkp4nhlrjlv38w3srl5x3fi8713qsbp4i92bksas6p1n6pnw";
}
{
lang = "he";
saneName = "he";
sha256 = "1d4094ql7nzw5gvhgvdw9j8pacpnlbq76j9670wj5z5mxaggm5n4";
}
{
lang = "hi";
saneName = "hi";
sha256 = "18s7h8bldkhl55akglmdaq1kx1z8171g96ysxvljy3aqnv400cpd";
}
{
lang = "hr";
saneName = "hr";
sha256 = "14insp30nb18dva5rpd1mgixhbm6rrkbbs7wl796jqzxlxin1bbg";
}
{
lang = "hu";
saneName = "hu";
sha256 = "02mwbsg8cvnrqizcggpsq6r9hp26z4r5sg62iksknl4fahzi9jwa";
}
{
lang = "ia";
saneName = "ia";
sha256 = "0w3yncz364rd7jby39cqmmswh5p7i7hn08yfn038pj9k2wvg3nli";
}
{
lang = "is";
saneName = "is";
sha256 = "09ja8vnl8ykh9j0wdrmlwhjj71dsl0kl1mlsbi0c95dphbj58m0q";
}
{
lang = "it";
saneName = "it";
sha256 = "145r6lcf7mbnfv0kk0kxmd7aq80y5dlkxpp2fy31rigpkz8syiaz";
}
{
lang = "ja";
saneName = "ja";
sha256 = "1s11lqac8j1qbp0fq67zq7jss7j60pwgprjki73s77icir5sijpv";
}
{
lang = "kk";
saneName = "kk";
sha256 = "1y27ax3viixbhh6yrib9k4px0y4aj6fzpnyxd9j6yibh4gmkxa49";
}
{
lang = "km";
saneName = "km";
sha256 = "08nb4fv4hafxyhdxsdf29yh3nv5c0hb3ar0329xlw5kvkvfckgza";
}
{
lang = "ko";
saneName = "ko";
sha256 = "1qzzbphcjl506wha4i9drzc0hrlrc4cicmw37vl1hylbkw7lfrdf";
}
{
lang = "lt";
saneName = "lt";
sha256 = "1rqjv25y8s0g5mr47fasybcfvw36i9z41l8gpi3rdvv52b4s0n4c";
}
{
lang = "lv";
saneName = "lv";
sha256 = "1cfdvbq40fk9f6xqz27bzy4shrh0i7sqbaf3l54f0zpgnqmk6c8a";
}
{
lang = "mr";
saneName = "mr";
sha256 = "1jz355nz34f15gic4hl09qdd648gjl3ybinbf5kpy0nj5d052lwj";
}
{
lang = "nb";
saneName = "nb";
sha256 = "1v1f42cipx39i9as0k2arb51a4qizh65vdld35dlkfxnkkwl5gb2";
}
{
lang = "nds";
saneName = "nds";
sha256 = "1mwrwwclds1fkwgak1fl148qpxblkk5jxbnjfl7lgc2a28c4w4y8";
}
{
lang = "nl";
saneName = "nl";
sha256 = "0x9jqq4jbf6664m201pjf0bk5m7kziqpc59ai6n3amq7ihg5zbyj";
}
{
lang = "nn";
saneName = "nn";
sha256 = "1x8hr1sb36jnw9g897dww3c72hqrxhpjgnzm6x8xcqjb93rrjqnz";
}
{
lang = "pa";
saneName = "pa";
sha256 = "1lvdz8hi5y6sia6il8x47k607dl11abmgpa07gvplv5g6gshm27q";
}
{
lang = "pl";
saneName = "pl";
sha256 = "0pnzdz0ms85cqjd2aav2cm1w5rb3v0q96nz7b70dz9mnyxrnjiha";
}
{
lang = "pt";
saneName = "pt";
sha256 = "1jgadk819ws6zcvkqrvjyx7kn0sgsdvmg15hi03mn4nijf8mzzlb";
}
{
lang = "pt_BR";
saneName = "pt_BR";
sha256 = "06yyrv21g0fyvisj45r9iqiclydj0y5lb4bkykd28f0g6nrcjlzv";
}
{
lang = "ro";
saneName = "ro";
sha256 = "040fnm9rmj156mn033axx6isa9fvaskw5dqzh40mjchqz4bgw6vx";
}
{
lang = "ru";
saneName = "ru";
sha256 = "1p5glmm7a495b1avv9n9y1im04z8nxps13pf0crvzdwplkiin8id";
}
{
lang = "sk";
saneName = "sk";
sha256 = "19d10b807kg50jq03xgc84dksfcfmp1vimqjbfd53qgdxdfxa9c0";
}
{
lang = "sl";
saneName = "sl";
sha256 = "1lpgyar5hq39463dsgwlmym5rgivyqyipls8l0km6sy24kmh43g6";
}
{
lang = "sr";
saneName = "sr";
sha256 = "0600x4vgflbyg0vr97vqpd405j311780d983xrf22awbyqg3hiqa";
}
{
lang = "sv";
saneName = "sv";
sha256 = "1zi3s9g4nykxrrpqm2fq8didip1jzv8iyscrg7fc8mls7ikz51bp";
}
{
lang = "tg";
saneName = "tg";
sha256 = "15zm9p0g4qrb2wz761gvpd05yz2pz8lpcsmdqx8lclvlqr58xl8v";
}
{
lang = "tr";
saneName = "tr";
sha256 = "039jmlljc3fdynsa27whmx50jb8jx3x7k1l6xdrijdk4j43j047p";
}
{
lang = "ug";
saneName = "ug";
sha256 = "05krj1b7z1rirr7141pyaxssnbgf74v8bcxhb2m9yb944nx2z1wx";
}
{
lang = "uk";
saneName = "uk";
sha256 = "19bkp5hsxd5zfgdwyc6bx1425phd8d9kd43xin13cdcikdq5nh6z";
}
{
lang = "vi";
saneName = "vi";
sha256 = "1fy0v0zd8mq59f3wlpn855ff8q8x6yy8a17vjnwfw69qmar0x4g8";
}
{
lang = "wa";
saneName = "wa";
sha256 = "0h8kycdjg8cglb7sn5m4v8djwb4smhzmws2khr309nv4930vqf14";
}
{
lang = "zh_CN";
saneName = "zh_CN";
sha256 = "0aaybsbbf19js8bxmj7kqqjnqp68fzkqdrbhjlh5c1jdxqvlr2w8";
}
{
lang = "zh_TW";
saneName = "zh_TW";
sha256 = "1xgndbjqhgw5pnws8qbb4xvrcnbr96m275hrhd3rb99q5xd4br20";
}
]

6
pkgs/desktops/kde-4.11/support/akonadi/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite }:
stdenv.mkDerivation rec {
name = "akonadi-1.10.2";
name = "akonadi-1.11.0";
src = fetchurl {
url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
sha256 = "1jij7vmrxg4kzqcq4ci73q3m3927bym5xb34kvmpq3h7p1d0vmgk";
sha256 = "0k96i8xq3xkm5rrxrj3zqgppcmqbzcpc918xnx0p54jkkm85gchc";
};
buildInputs = [ qt4 soprano libxslt boost sqlite ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
description = "KDE PIM Storage Service";
license = "LGPL";
homepage = http://pim.kde.org/akonadi;
maintainers = [ maintainers.sander maintainers.urkud ];
maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
platforms = platforms.linux;
};
}

10
pkgs/development/compilers/ghc/head.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
{ stdenv, fetchurl, ghc, perl, gmp, ncurses, happy, alex }:
stdenv.mkDerivation rec {
version = "7.7.20130828";
version = "7.7.20131202";
name = "ghc-${version}";
src = fetchurl {
url = "http://darcs.haskell.org/ghcBuilder/uploads/tn23/${name}-src.tar.bz2";
sha256 = "180nkd77kz3mv4g7yq8ipx34p5q8k714l0z2527y49lghy118jzv";
url = "http://cryp.to/${name}.tar.xz";
sha256 = "1gnp5c3x7dbaz7s2yvkw2fmvqh5by2gpp0zlcyj8p2gv13gxi2cb";
};
buildInputs = [ ghc perl gmp ncurses ];
buildInputs = [ ghc perl gmp ncurses happy alex ];
enableParallelBuilding = true;

4
pkgs/development/compilers/idris/default.nix
View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "idris";
version = "0.9.10";
sha256 = "0sbadjc4kj59f5240036pryxr4b6k6y2zkmszv99wq660mm7a3d3";
version = "0.9.10.1";
sha256 = "194gbpk8fy64maj9lcwj9hkbndc3287bh9mz2jm09vd11i23iyg1";
isLibrary = false;
isExecutable = true;
buildDepends = [

4
pkgs/development/interpreters/ruby/rubygems.nix
View File

@ -1,10 +1,10 @@
args : with args;
rec {
version = "1.8.17";
version = "1.8.25";
src = fetchurl {
url = "http://production.cf.rubygems.org/rubygems/${name}.tgz";
sha256 = "068sr55r8wiw55bpf93pp07871cbqhxk9cxma6arhd04j7n8ppph";
sha256 = "1j0wiy829nsfrpdzr9xzs39jf1lga3f5b7773vxqfs3lz3fli4v4";
};
buildInputs = [ruby makeWrapper];

9
pkgs/development/libraries/aspell/dictionaries.nix
View File

@ -140,6 +140,15 @@ in {
};
};
pt = buildDict {
shortName = "pt-0.50-1";
fullName = "Portuguese";
src = fetchurl {
url = mirror://gnu/aspell/dict/pt/aspell-pt-0.50-1.tar.bz2;
sha256 = "07xzlnxxzadqsapng29p2gdwj0bijv10wpjnqlwzmkxnx6fxzkcy";
};
};
ru = buildDict {
shortName = "ru-0.99f7-1";
fullName = "Russian";

1
pkgs/development/libraries/aterm/2.8.nix
View File

@ -31,5 +31,6 @@ stdenv.mkDerivation {
description = "Library for manipulation of term data structures in C";
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = stdenv.lib.maintainers.eelco;
broken = true;
};
}

4
pkgs/development/libraries/audio/lv2/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "lv2-${version}";
version = "1.4.0";
version = "1.6.0";
src = fetchurl {
url = "http://lv2plug.in/spec/${name}.tar.bz2";
sha256 = "035hlfva2mij698nj3z1mz9g4mj4z5jx9axs6ww47jgyjcq38asz";
sha256 = "0nxrkmcpsm4v25wp2l7lcw4n0823kbplilpv51fszf710qsn7k9v";
};
buildInputs = [ gtk libsndfile pkgconfig python ];

11
pkgs/development/libraries/avahi/default.nix
View File

@ -7,11 +7,11 @@
assert qt4Support -> qt4 != null;
stdenv.mkDerivation rec {
name = "avahi-0.6.30";
name = "avahi-0.6.31";
src = fetchurl {
url = "${meta.homepage}/download/${name}.tar.gz";
sha256 = "07zzaxs81rbrfhj0rnq616c3j37f3g84dn7d4q3h5l1r4dn33r7r";
sha256 = "0j5b5ld6bjyh3qhd2nw0jb84znq0wqai7fsrdzg7bpg24jdp2wl3";
};
patches = [ ./no-mkdir-localstatedir.patch ];
@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
avahi-core/socket.c
'';
postInstall = ''
# Maintain compat for mdnsresponder and howl
${if withLibdnssdCompat then "ln -s avahi-compat-libdns_sd/dns_sd.h $out/include/dns_sd.h" else ""}
ln -s avahi-compat-howl $out/include/howl
ln -s avahi-compat-howl.pc $out/lib/pkgconfig/howl.pc
'';
meta = with stdenv.lib; {
description = "mDNS/DNS-SD implementation";
homepage = http://avahi.org;

4
pkgs/development/libraries/cln/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, gmp }:
stdenv.mkDerivation rec {
name = "cln-1.3.1";
name = "cln-1.3.3";
src = fetchurl {
url = "${meta.homepage}${name}.tar.bz2";
sha256 = "1sd8jy5vnmww537zq6g6i586ffslm7fjliz04krv6scapgklq6ca";
sha256 = "04i6kdjwm4cr5pa70pilifnpvsh430rrlapkgw1x8c5vxkijxz2p";
};
buildInputs = [ gmp ];

4
pkgs/development/libraries/eigen/2.0.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchurl, cmake}:
let
v = "2.0.16";
v = "2.0.17";
in
stdenv.mkDerivation {
name = "eigen-${v}";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
name = "eigen-${v}.tar.bz2";
sha256 = "1akcb4g5hvc664gfc6sxb6f6jrm55fgks6017wg0smyvmm6k09v0";
sha256 = "0q4ry2pmdb9lvm0g92wi6s6qng3m9q73n5flwbkfcz1nxmbfhmbj";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/eigen/default.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchurl, cmake}:
let
v = "3.1.2";
v = "3.2.0";
in
stdenv.mkDerivation {
name = "eigen-${v}";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
name = "eigen-${v}.tar.bz2";
sha256 = "1hywvbn4a8f96fjn3cvd6nxzh5jvh05s1r263d9vqlgn25dxrzay";
sha256 = "1dpshkcqjz3ckad56mkk1agbnlq0rk2d0wv14zwjg4lk1nb7h7q1";
};
nativeBuildInputs = [ cmake ];

77
pkgs/development/libraries/ffmpeg/0.6.nix Normal file
View File

@ -0,0 +1,77 @@
{ stdenv, fetchurl, pkgconfig, yasm
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, vorbisSupport ? true, libvorbis ? null
, vpxSupport ? false, libvpx ? null
, x264Support ? true, x264 ? null
, xvidSupport ? true, xvidcore ? null
, vdpauSupport ? true, libvdpau ? null
, faacSupport ? false, faac ? null
}:
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert vorbisSupport -> libvorbis != null;
assert vpxSupport -> libvpx != null;
assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null;
assert vdpauSupport -> libvdpau != null;
assert faacSupport -> faac != null;
stdenv.mkDerivation rec {
name = "ffmpeg-0.6.7";
src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "13l78gv2qhyw05bl9s6wkmykzsn4p04bb69a849a5c4hiffwz837";
};
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
# the resulting library is GPL'ed, so it can only be used in GPL'ed
# applications.
configureFlags = [
"--enable-gpl"
"--enable-postproc"
"--enable-swscale"
"--disable-ffserver"
"--disable-ffplay"
"--enable-shared"
"--enable-runtime-cpudetect"
]
++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
++ stdenv.lib.optional speexSupport "--enable-libspeex"
++ stdenv.lib.optional theoraSupport "--enable-libtheora"
++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
++ stdenv.lib.optional vpxSupport "--enable-libvpx"
++ stdenv.lib.optional x264Support "--enable-libx264"
++ stdenv.lib.optional xvidSupport "--enable-libxvid"
++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree";
buildInputs = [ pkgconfig lame yasm ]
++ stdenv.lib.optional mp3Support lame
++ stdenv.lib.optional speexSupport speex
++ stdenv.lib.optional theoraSupport libtheora
++ stdenv.lib.optional vorbisSupport libvorbis
++ stdenv.lib.optional vpxSupport libvpx
++ stdenv.lib.optional x264Support x264
++ stdenv.lib.optional xvidSupport xvidcore
++ stdenv.lib.optional vdpauSupport libvdpau
++ stdenv.lib.optional faacSupport faac;
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";
};
}

104
pkgs/development/libraries/ffmpeg/2.x.nix Normal file
View File

@ -0,0 +1,104 @@
{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, vorbisSupport ? true, libvorbis ? null
, vpxSupport ? false, libvpx ? null
, x264Support ? true, x264 ? null
, xvidSupport ? true, xvidcore ? null
, opusSupport ? true, libopus ? null
, vdpauSupport ? true, libvdpau ? null
, vaapiSupport ? true, libva ? null
, faacSupport ? false, faac ? null
, dc1394Support ? false, libdc1394 ? null
, x11grabSupport ? false, libXext ? null, libXfixes ? null
, playSupport ? true, SDL ? null
, freetypeSupport ? true, freetype ? null, fontconfig ? null
}:
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert vorbisSupport -> libvorbis != null;
assert vpxSupport -> libvpx != null;
assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null;
assert opusSupport -> libopus != null;
assert vdpauSupport -> libvdpau != null;
assert vaapiSupport -> libva != null;
assert faacSupport -> faac != null;
assert x11grabSupport -> libXext != null && libXfixes != null;
assert playSupport -> SDL != null;
assert freetypeSupport -> freetype != null;
stdenv.mkDerivation rec {
name = "ffmpeg-2.1.1";
src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "1qnspbpwa6cflsb6mkm84ay4nfx60ism6d7lgvnasidck9dmxydy";
};
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
# the resulting library is GPL'ed, so it can only be used in GPL'ed
# applications.
configureFlags = [
"--enable-gpl"
"--enable-postproc"
"--enable-swscale"
"--enable-shared"
"--enable-avresample"
"--enable-runtime-cpudetect"
]
++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
++ stdenv.lib.optional speexSupport "--enable-libspeex"
++ stdenv.lib.optional theoraSupport "--enable-libtheora"
++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
++ stdenv.lib.optional vpxSupport "--enable-libvpx"
++ stdenv.lib.optional x264Support "--enable-libx264"
++ stdenv.lib.optional xvidSupport "--enable-libxvid"
++ stdenv.lib.optional opusSupport "--enable-libopus"
++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
++ stdenv.lib.optional x11grabSupport "--enable-x11grab"
++ stdenv.lib.optional playSupport "--enable-ffplay"
++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig";
buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ]
++ stdenv.lib.optional mp3Support lame
++ stdenv.lib.optional speexSupport speex
++ stdenv.lib.optional theoraSupport libtheora
++ stdenv.lib.optional vorbisSupport libvorbis
++ stdenv.lib.optional vpxSupport libvpx
++ stdenv.lib.optional x264Support x264
++ stdenv.lib.optional xvidSupport xvidcore
++ stdenv.lib.optional opusSupport libopus
++ stdenv.lib.optional vdpauSupport libvdpau
++ stdenv.lib.optional vaapiSupport libva
++ stdenv.lib.optional faacSupport faac
++ stdenv.lib.optional dc1394Support libdc1394
++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]
++ stdenv.lib.optional playSupport SDL
++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ];
enableParallelBuilding = true;
crossAttrs = {
dontSetConfigureCross = true;
configureFlags = configureFlags ++ [
"--cross-prefix=${stdenv.cross.config}-"
"--enable-cross-compile"
"--target_os=linux"
"--arch=${stdenv.cross.arch}"
];
};
passthru = {
inherit vdpauSupport;
};
meta = {
homepage = http://www.ffmpeg.org/;
description = "A complete, cross-platform solution to record, convert and stream audio and video";
};
}

10
pkgs/development/libraries/giflib/default.nix
View File

@ -1,10 +1,12 @@
{stdenv, fetchurl}:
{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }:
stdenv.mkDerivation {
name = "giflib-4.1.6";
name = "giflib-5.0.5";
src = fetchurl {
url = mirror://sourceforge/giflib/giflib-4.1.6.tar.bz2;
sha256 = "1v9b7ywz7qg8hli0s9vv1b8q9xxb2xvqq2mg1zpr73xwqpcwxhg1";
url = mirror://sourceforge/giflib/giflib-5.0.5.tar.bz2;
sha256 = "02c6pwll9pzw5fhg5gccx2ws56d70ylfryk21nv5lqhwdcv8lvb0";
};
buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
}

4
pkgs/development/libraries/gpgme/default.nix
View File

@ -11,11 +11,11 @@ let
"${gnupg}/bin/gpg2";
in
stdenv.mkDerivation rec {
name = "gpgme-1.4.1";
name = "gpgme-1.4.3";
src = fetchurl {
url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2";
sha1 = "d6110763e7459214fd72705e87ebc682e3b5815e";
sha256 = "15h429h6pd67iiv580bjmwbkadpxsdppw0xrqpcm4dvm24jc271d";
};
propagatedBuildInputs = [ libgpgerror glib libassuan pth ];

4
pkgs/development/libraries/grantlee/default.nix
View File

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

4
pkgs/development/libraries/haskell/GLUT/2.5.0.1.nix → pkgs/development/libraries/haskell/GLUT/2.5.0.2.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "GLUT";
version = "2.5.0.1";
sha256 = "0f0bz64j7fxa0np8w53n51ri5m0pkwyc1kv7pvdnx02h181gl6l0";
version = "2.5.0.2";
sha256 = "0v6lwxn9karmym4fzd0hramcj86sb4wgiyqn47hmcg1dd1fsnhb5";
buildDepends = [ OpenGL OpenGLRaw ];
extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
meta = {

2
pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
View File

@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
isExecutable = true;
buildDepends = [ HDBC mtl time utf8String ];
extraLibraries = [ odbc ];
noHaddock = true; # Haddocks currently fail to build
noHaddock = true;
meta = {
homepage = "https://github.com/hdbc/hdbc-odbc";
description = "ODBC driver for HDBC";

1
pkgs/development/libraries/haskell/accelerate-cuda/default.nix
View File

@ -18,6 +18,7 @@ cabal.mkDerivation (self: {
description = "Accelerate backend for NVIDIA GPUs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

1
pkgs/development/libraries/haskell/accelerate-examples/default.nix
View File

@ -25,6 +25,7 @@ cabal.mkDerivation (self: {
description = "Examples using the Accelerate library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

1
pkgs/development/libraries/haskell/accelerate-fft/default.nix
View File

@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
description = "FFT using the Accelerate library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
};
})

1
pkgs/development/libraries/haskell/async/2.0.1.4.nix
View File

@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "1hi40bjwpl65mz7zj0sgh16bp9dwafbm5ysi2q8fzwwq5l0zxpa1";
buildDepends = [ stm ];
testDepends = [ HUnit testFramework testFrameworkHunit ];
jailbreak = true;
meta = {
homepage = "https://github.com/simonmar/async";
description = "Run IO operations asynchronously and wait for their results";

5
pkgs/development/libraries/haskell/codec-image-devil/default.nix
View File

@ -4,10 +4,9 @@ cabal.mkDerivation (self: {
pname = "Codec-Image-DevIL";
version = "0.2.3";
sha256 = "1kv3hns9f0bhfb723nj9szyz3zfqpvy02azzsiymzjz4ajhqmrsz";
buildDepends = [ libdevil ];
extraLibraries = [ libdevil ];
meta = {
homepage = "http://hackage.haskell.org/package/Codec-Image-DevIL";
description = "Simple FFI interface to the DevIL image library";
description = "An FFI interface to the DevIL library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};

1
pkgs/development/libraries/haskell/cuda/default.nix
View File

@ -35,6 +35,7 @@ cabal.mkDerivation (self: {
description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

1
pkgs/development/libraries/haskell/cufft/default.nix
View File

@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
description = "Haskell bindings for the CUFFT library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
};
})

1
pkgs/development/libraries/haskell/data-pprint/default.nix
View File

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "0.2.3";
sha256 = "1ygbhn399d4hlrdjmg7gxbr5akydb78p6qa80rv7m6j0fsqzbf6y";
buildDepends = [ deepseq mtl parallel time ];
jailbreak = true;
meta = {
description = "Prettyprint and compare Data values";
license = self.stdenv.lib.licenses.bsd3;

1
pkgs/development/libraries/haskell/haskell-src-exts/1.14.0.nix → pkgs/development/libraries/haskell/haskell-src-exts/default.nix
View File

@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
];
buildTools = [ happy ];
doCheck = false;
preConfigure = "runhaskell Setup.hs clean";
meta = {
homepage = "https://github.com/haskell-suite/haskell-src-exts";
description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";

1
pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix
View File

@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "1ay3i2sbrp0pzg6fagg8gqrwq5lcnm5jb5sr11frbk274a82cdwz";
buildDepends = [ syb ];
buildTools = [ happy ];
preConfigure = "runhaskell Setup.hs clean";
meta = {
description = "Support for manipulating Haskell source code";
license = self.stdenv.lib.licenses.bsd3;

4
pkgs/development/libraries/haskell/network/2.4.2.0.nix → pkgs/development/libraries/haskell/network/2.4.2.1.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "network";
version = "2.4.2.0";
sha256 = "1v6iwww8xym0sr2593ri0aa6gcs6n2975fi9gaz9n7rizbqm88qs";
version = "2.4.2.1";
sha256 = "1rm8zlpy6738wxagk1xmlvawn807cd4xf2fn0hgjqj12scviz60p";
buildDepends = [ parsec ];
testDepends = [
HUnit testFramework testFrameworkHunit testFrameworkQuickcheck2

4
pkgs/development/libraries/haskell/postgresql-libpq/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "postgresql-libpq";
version = "0.8.2.4";
sha256 = "1dqb4pnsvd6378rhmlhi151sin06wfm9sx12m3ir9x0j5ppb5sx6";
version = "0.8.2.5";
sha256 = "102sakvff53dald2s7pbf22m2rgv9761251hj7bwy125jssxcd15";
extraLibraries = [ postgresql ];
meta = {
homepage = "http://github.com/lpsmith/postgresql-libpq";

2
pkgs/development/libraries/haskell/scientific/default.nix
View File

@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
sha256 = "1x3c8z1d7nhr1z5dlbs60pxfrgclfbwjhrkpvr0jnz0fpy2m9x5r";
buildDepends = [ deepseq hashable text ];
testDepends = [ smallcheck tasty tastySmallcheck text ];
doCheck = false;
meta = {
homepage = "https://github.com/basvandijk/scientific";
description = "Arbitrary-precision floating-point numbers represented using scientific notation";
@ -15,5 +16,4 @@ cabal.mkDerivation (self: {
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
doCheck = false;
})

4
pkgs/development/libraries/haskell/tasty/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "tasty";
version = "0.4.0.1";
sha256 = "04nnjg04520lvjm8h2ma0ihm4bz6p0ppk445i8gmn82ixwan76h0";
version = "0.4.1.1";
sha256 = "09xha87ivkllczbf0vf2n8zjn1wa5g8v8j1h9ad3207r45ndzn0w";
buildDepends = [
ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged
];

6
pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
View File

@ -4,13 +4,13 @@
cabal.mkDerivation (self: {
pname = "zeromq3-haskell";
version = "0.5";
sha256 = "16qh3q5rshaxzl79aiivrysl3dhilnd2mw2p45ifgbgv87m277gq";
version = "0.5.1";
sha256 = "0jmdhs2apmcr3wf5r739gq9qqad59qj82h7qpdk3m4cc2a7djil0";
buildDepends = [
async MonadCatchIOTransformers semigroups transformers
];
testDepends = [
ansiTerminal checkers MonadCatchIOTransformers QuickCheck
ansiTerminal async checkers MonadCatchIOTransformers QuickCheck
transformers
];
extraLibraries = [ zeromq ];

4
pkgs/development/libraries/kerberos/heimdal.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl, sqlite} :
stdenv.mkDerivation rec {
name = "heimdal-1.5.2";
name = "heimdal-1.5.3";
src = fetchurl {
urls = [
"http://www.h5l.org/dist/src/${name}.tar.gz"
"http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz"
];
sha256 = "22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec";
sha256 = "19gypf9vzfrs2bw231qljfl4cqc1riyg0ai0xmm1nd1wngnpphma";
};
## ugly, X should be made an option

4
pkgs/development/libraries/lensfun/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng }:
stdenv.mkDerivation rec {
name = "lensfun-0.2.5";
name = "lensfun-0.2.7";
src = fetchurl {
url = "http://download.berlios.de/lensfun/${name}.tar.bz2";
sha256 = "11zvi3lk60iljync3a495h9la7makx6lf22fbvr4lwc933mrh562";
sha256 = "0xv4h219zn0ldhhjnjc1q2bgpbfqzpd4b31gf9yyrwbapm3hgprx";
};
patchPhase = "sed -e 's@/usr/bin/python@${python}/bin/python@' -i configure";

4
pkgs/development/libraries/libcue/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "libcue-1.3.0";
name = "libcue-1.4.0";
src = fetchurl {
url = "mirror://sourceforge/libcue/${name}.tar.bz2";
sha256 = "0gcd9maxh82fc0qah0q8xh74sch0px3n7c0qx0298n2qbk2mkn12";
sha256 = "17kjd7rjz1bvfn44n3n2bjb7a1ywd0yc0g4sqp5ihf9b5bn7cwlb";
};
meta = {
description = "A library to parse a cue sheet";

6
pkgs/development/libraries/libestr/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "libestr-0.1.4";
name = "libestr-0.1.9";
src = fetchurl {
url = http://libestr.adiscon.com/files/download/libestr-0.1.4.tar.gz;
sha256 = "1qw5vqryawdm434l9ql3r160ap2f5mmp7b6pciac7qli62y0a2z3";
url = http://libestr.adiscon.com/files/download/libestr-0.1.9.tar.gz;
sha256 = "06km9mlw5qq4aa7503l81d0qcghzl0n3lh0z41r1xjpa04nnwb42";
};
}

3
pkgs/development/libraries/libgdiplus/default.nix
View File

@ -10,11 +10,14 @@ stdenv.mkDerivation rec {
sha256 = "0klnbly2q0yx5p0l5z8da9lhqsjj9xqj06kdw2v7rnms4z1vdpkd";
};
NIX_LDFLAGS = "-lgif";
patches =
[ (fetchurl {
url = "https://raw.github.com/MagicGroup/MagicSpecLib/master/libgdiplus/libgdiplus-2.10.1-libpng15.patch";
sha256 = "130r0jm065pjvbz5dkx96w37vj1wqc8fakmi2znribs14g0bl65f";
})
./giflib.patch
];
patchFlags = "-p0";

117
pkgs/development/libraries/libgdiplus/giflib.patch Normal file
View File

@ -0,0 +1,117 @@
diff --git a/src/gifcodec.c b/src/gifcodec.c
index 8dee0eb..564beed 100644
--- src/gifcodec.c
+++ src/gifcodec.c
@@ -39,8 +39,10 @@ GUID gdip_gif_image_format_guid = {0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0
#include "gifcodec.h"
+#if GIFLIB_MAJOR < 5
/* giflib declares this incorrectly as EgifOpen */
extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc);
+#endif
/* Data structure used for callback */
typedef struct
@@ -105,7 +107,7 @@ gdip_gif_inputfunc (GifFileType *gif, GifByteType *data, int len)
*/
static int
-AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[])
+AddExtensionBlockMono(SavedImage *New, int Len, int func, BYTE ExtData[])
{
ExtensionBlock *ep;
@@ -129,7 +131,7 @@ AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[])
if (ExtData) {
memcpy(ep->Bytes, ExtData, Len);
- ep->Function = New->Function;
+ ep->Function = func;
}
return (GIF_OK);
@@ -232,20 +234,20 @@ DGifSlurpMono(GifFileType * GifFile, SavedImage *TrailingExtensions)
}
case EXTENSION_RECORD_TYPE: {
- if (DGifGetExtension(GifFile, &temp_save.Function, &ExtData) == GIF_ERROR) {
+ int func;
+ if (DGifGetExtension(GifFile, &func, &ExtData) == GIF_ERROR) {
return (GIF_ERROR);
}
while (ExtData != NULL) {
/* Create an extension block with our data */
- if (AddExtensionBlockMono(&temp_save, ExtData[0], &ExtData[1]) == GIF_ERROR) {
+ if (AddExtensionBlockMono(&temp_save, func, ExtData[0], &ExtData[1]) == GIF_ERROR) {
return (GIF_ERROR);
}
if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) {
return (GIF_ERROR);
}
- temp_save.Function = 0;
}
break;
}
@@ -303,12 +305,19 @@ gdip_load_gif_image (void *stream, GpImage **image, BOOL from_file)
result = NULL;
loop_counter = FALSE;
+#if GIFLIB_MAJOR < 5
if (from_file) {
gif = DGifOpen(stream, &gdip_gif_fileinputfunc);
} else {
gif = DGifOpen (stream, &gdip_gif_inputfunc);
}
-
+#else
+ if (from_file)
+ gif = DGifOpen(stream, &gdip_gif_fileinputfunc, NULL);
+ else
+ gif = DGifOpen(stream, &gdip_gif_inputfunc, NULL);
+#endif
+
if (gif == NULL) {
goto error;
}
@@ -660,11 +669,22 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file)
return InvalidParameter;
}
+#if GIFLIB_MAJOR < 5
if (from_file) {
fp = EGifOpenFileName (stream, 0);
} else {
fp = EGifOpen (stream, gdip_gif_outputfunc);
}
+#else
+ if (from_file)
+ fp = EGifOpenFileName (stream, 0, NULL);
+ else
+ fp = EGifOpen (stream, gdip_gif_outputfunc, NULL);
+#define MakeMapObject GifMakeMapObject
+#define FreeMapObject GifFreeMapObject
+#define QuantizeBuffer GifQuantizeBuffer
+#define BitSize GifBitSize
+#endif
if (!fp) {
return FileNotFound;
@@ -848,8 +868,15 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file)
Buffer[0] = 1;
Buffer[1] = ptr[0];
Buffer[2] = ptr[1];
+#if GIFLIB_MAJOR < 5
EGifPutExtensionFirst(fp, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0");
EGifPutExtensionLast(fp, APPLICATION_EXT_FUNC_CODE, 3, Buffer);
+#else
+ EGifPutExtensionLeader(fp, APPLICATION_EXT_FUNC_CODE);
+ EGifPutExtensionBlock(fp, 11, "NETSCAPE2.0");
+ EGifPutExtensionBlock(fp, 3, Buffer);
+ EGifPutExtensionTrailer(fp);
+#endif
}
}

4
pkgs/development/libraries/libgpod/default.nix
View File

@ -3,10 +3,10 @@
libimobiledevice, python, pygobject, mutagen }:
stdenv.mkDerivation rec {
name = "libgpod-0.8.2";
name = "libgpod-0.8.3";
src = fetchurl {
url = "mirror://sourceforge/gtkpod/${name}.tar.bz2";
sha256 = "14m0amy56q4riwvcjszv04a9zp7l2xk8nx0vvhy94yqd0sqfjm00";
sha256 = "0pcmgv1ra0ymv73mlj4qxzgyir026z9jpl5s5bkg35afs1cpk2k3";
};
preConfigure = "configureFlagsArray=( --with-udev-dir=$out/lib/udev )";

4
pkgs/development/libraries/libinfinity/default.nix
View File

@ -11,10 +11,10 @@ let
in stdenv.mkDerivation rec {
name = "libinfinity-0.5.3";
name = "libinfinity-0.5.4";
src = fetchurl {
url = "http://releases.0x539.de/libinfinity/${name}.tar.gz";
sha256 = "04qa3ky2skhc9b5f9i9sc8hci3ykklqznmgy616yzs3n22bmax9j";
sha256 = "1i7nj8qjay6amg455mwhhfqjvxnfyyql9y40a6a4a3ky170ly004";
};
buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss ]

4
pkgs/development/libraries/libnetfilter_conntrack/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
stdenv.mkDerivation rec {
name = "libnetfilter_conntrack-1.0.2";
name = "libnetfilter_conntrack-1.0.4";
src = fetchurl {
url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
md5 = "447114b5d61bb9a9617ead3217c3d3ff";
sha256 = "0zcwjav1qgr7ikmvfmy7g3nc7s1kj4j4939d18mpyha9mwy4mv6r";
};
buildInputs = [ pkgconfig libnfnetlink libmnl ];

4
pkgs/development/libraries/libofx/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }:
stdenv.mkDerivation rec {
name = "libofx-0.9.4";
name = "libofx-0.9.9";
src = fetchurl {
url = "mirror://sourceforge/libofx/${name}.tar.gz";
sha256 = "1byvc1ar7s0nivi5cmycwlwh1y4xiad7ipfkgx57lbk7slgn8c4v";
sha256 = "08vvfj1rq0drcdfchrgb5zp05a2xl3a5aapsfgj0gqy3rp2qivwl";
};
configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ];

6
pkgs/development/libraries/libopus/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, fixedPoint ? false }:
stdenv.mkDerivation rec {
name = "libopus-1.0.2";
name = "libopus-1.0.3";
src = fetchurl {
url = "http://downloads.xiph.org/releases/opus/opus-1.0.2.tar.gz";
sha256 = "12npbkrcwvh3fl9l18cwrxwg269cg2j6j7876cc9q0axxvdmwqfs";
url = "http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz";
sha256 = "175l7hv7d03c4iz60g185nqvwrabc39ksil0d7g07i6vjaf0h6hr";
};
configureFlags = stdenv.lib.optionalString fixedPoint "--enable-fixed-point";

4
pkgs/development/libraries/libsecret/default.nix
View File

@ -2,12 +2,12 @@
intltool, gtk_doc, gobjectIntrospection, pkgconfig, libxslt, libgcrypt }:
stdenv.mkDerivation rec {
version = "0.15";
version = "0.16";
name = "libsecret-${version}";
src = fetchurl {
url = "https://git.gnome.org/browse/libsecret/snapshot/libsecret-${version}.zip";
sha256 = "088v1z7zbdi8b0779jads7q20x1gx6c4zmrj3q0vysc7a0k16i6k";
sha256 = "1yf4zvzfa45wr5bqlh54g3bmd0lgcsa8hnhppa99czca0zj7bkks";
};
propagatedBuildInputs = [ glib dbus_libs ];

4
pkgs/development/libraries/libtorrent-rasterbar/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libtorrent-rasterbar-${version}";
version = "0.16.8";
version = "0.16.12";
src = fetchurl {
url = "http://libtorrent.googlecode.com/files/${name}.tar.gz";
sha256 = "01jxhyndqkc0qag22s5w0vs63hlp4rr4bca8k7fj37gky7w119c0";
sha256 = "0s2nxhz4d93xcl6hchmfgi8hq7aw8mrkgixh5an7fbk4shswpcg8";
};
buildInputs = [ boost pkgconfig openssl zlib python ];

4
pkgs/development/libraries/libvirt/default.nix
View File

@ -4,14 +4,14 @@
, dnsmasq
}:
let version = "1.1.4"; in
let version = "1.2.0"; in
stdenv.mkDerivation {
name = "libvirt-${version}";
src = fetchurl {
url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
sha256 = "13yr9g1dk1bzzlm9h93kmavncyg6svjv3rjrv43ccl3sc37za42r";
sha256 = "1p9dn96j8qqp20lr0kvc7zyjjcpgsa9k41slyk2jmnv1g2p7ird8";
};
buildInputs =

4
pkgs/development/libraries/libxmlxx/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl
, pkgconfig, libxml2, glibmm, perl }:
stdenv.mkDerivation rec {
name = "libxml++-2.30.0";
name = "libxml++-2.30.1";
src = fetchurl {
url = "mirror://gnome/sources/libxml++/2.30/${name}.tar.bz2";
sha256 = "1hgpw9lld0k6z34kxrapz8dxf3cbgnnhkx6himnvw9ax3qf7p5gk";
sha256 = "02mrib11cjx5fshdr8p1biwvyl0xfkf86b6nh8ashwv590v0wgs3";
};
buildInputs = [ pkgconfig glibmm perl ];

7
pkgs/development/libraries/ntrack/default.nix
View File

@ -18,7 +18,12 @@ stdenv.mkDerivation rec {
configureFlags = "--without-gobject CFLAGS=--std=gnu99";
patchPhase = ''sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c'';
# Remove this patch after version 016
patches = [ ./libnl-fix.patch ];
postPatch = ''
sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c
'';
meta = {
description = "Network Connectivity Tracking library for Desktop Applications";

11
pkgs/development/libraries/ntrack/libnl-fix.patch Normal file
View File

@ -0,0 +1,11 @@
--- ./modules/ntrack-libnl.c.orig 2013-12-02 11:31:54.749215448 -0600
+++ ./modules/ntrack-libnl.c 2013-12-02 11:34:46.597684553 -0600
@@ -530,7 +530,7 @@
op_default_route_disappeared ((struct _ntrack_monitor_arch*) self, nl_info);
} else if (nl_info->topmost_route && topmost_route) {
int diff_bits;
- if ((diff_bits = (route_obj_ops.oo_id_attrs | ROUTE_ATTR_OIF
+ if ((diff_bits = (nl_object_get_id_attrs(OBJ_CAST(topmost_route)) | ROUTE_ATTR_OIF
| ROUTE_ATTR_GATEWAY) &
nl_object_diff (OBJ_CAST (nl_info->topmost_route),
OBJ_CAST (topmost_route)))) {

4
pkgs/development/libraries/openbabel/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pkgconfig }:
stdenv.mkDerivation rec {
name = "openbabel-2.3.1";
name = "openbabel-2.3.2";
src = fetchurl {
url = "mirror://sourceforge/openbabel/${name}.tar.gz";
sha256 = "18yprqsk0fi1ri4fmvpx2ym6gx9fp3by681pl3jffpjqmz4qnbly";
sha256 = "122if0jkm71ngd1b0dic8k567b3j2hcikbwnpxgchv5ag5ka5b2f";
};
# TODO : perl & python bindings;

4
pkgs/development/libraries/phonon-backend-gstreamer/default.nix
View File

@ -2,7 +2,7 @@
, gst_plugins_base }:
let
version = "4.6.3";
version = "4.7.0";
pname = "phonon-backend-gstreamer";
in
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz";
sha256 = "0n5ggap1xzspq8x1j9bvnf7wqqh5495sysri7zyg42g32gqp7qjm";
sha256 = "0zg7hnaywk9wpcvzgskx2334cgfz09ii77pvasrn00ikcqqnnxrs";
};
buildInputs = [ phonon qt4 gstreamer gst_plugins_base ];

4
pkgs/development/libraries/phonon-backend-vlc/default.nix
View File

@ -2,7 +2,7 @@
let
pname = "phonon-backend-vlc";
v = "0.5.0";
v = "0.7.0";
vlc_ = vlc.override { inherit qt4; }; #Force using the same qt version
in
@ -11,7 +11,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz";
sha256 = "1233szd05ahaxyk1sjis374n90m40svfks2aq9jx3g3lxygzwmi2";
sha256 = "1rhzc3d188l6ygxgfxwikscj71pyy0nchzikvkkq465r9ajavdgd";
};
nativeBuildInputs = [ cmake automoc4 xz ];

6
pkgs/development/libraries/phonon/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, cmake, automoc4, qt4, pulseaudio }:
let
v = "4.6.0";
v = "4.7.0";
in
stdenv.mkDerivation rec {
name = "phonon-${v}";
src = fetchurl {
url = "mirror://kde/stable/phonon/${v}/src/${name}.tar.xz";
sha256 = "2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4";
url = "mirror://kde/stable/phonon/${v}/${name}.tar.xz";
sha256 = "1sxrnwm16dxy32xmrqf26762wmbqing1zx8i4vlvzgzvd9xy39ac";
};
buildInputs = [ qt4 pulseaudio ];

4
pkgs/development/libraries/soprano/default.nix
View File

@ -2,11 +2,11 @@
, pkgconfig }:
stdenv.mkDerivation rec {
name = "soprano-2.9.3";
name = "soprano-2.9.4";
src = fetchurl {
url = "mirror://sourceforge/soprano/${name}.tar.bz2";
sha256 = "08gb5d8bgy7vc6qd6r1kkmmc5rli67dlglpjqjlahpnvs26r1cwl";
sha256 = "1rg0x7yg0a1cbnxz7kqk52580wla8jbnj4d4r3j7l7g7ajyny1k4";
};
patches = [ ./find-virtuoso.patch ];

4
pkgs/development/libraries/unixODBC/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "unixODBC-2.3.1";
name = "unixODBC-2.3.2";
src = fetchurl {
url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz";
md5 = "86788d4006620fa1f171c13d07fdcaab";
sha256 = "16jw5fq7wgfky6ak1h2j2pqx99jivsdl4q8aq6immpr55xs5jd4w";
};
configureFlags = "--disable-gui --sysconfdir=/etc";
}

377
pkgs/development/mobile/androidenv/addon.xml
View File

@ -319,7 +319,152 @@ This is the Google TV Add-on for the Android Software Development Kit License Ag
August 15, 2011
</sdk:license>
</sdk:license>
<sdk:license id="google-gdk-license" type="text">This is an early Sneak Peek of the GDK that is subject to change. Please stay tuned for the full Developer Preview coming soon.
Terms and Conditions
This is the Glass Development Kit License Agreement.
1. Introduction
1.1 The Glass Development Kit (referred to in this License Agreement as the "GDK" and specifically including the Android system files, packaged APIs, and GDK library files, if and when they are made available) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the GDK.
1.2 &quot;Glass&quot; means Glass devices and the Glass software stack for use on Glass devices.
1.3 &quot;Android&quot; means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
1.4 &quot;Google&quot; means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
2. Accepting this License Agreement
2.1 In order to use the GDK, you must first agree to this License Agreement. You may not use the GDK if you do not accept this License Agreement.
2.2 By clicking to accept, you hereby agree to the terms of this License Agreement.
2.3 You may not use the GDK and may not accept the License Agreement if you are a person barred from receiving the GDK under the laws of the United States or other countries including the country in which you are resident or from which you use the GDK.
2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the GDK on behalf of your employer or other entity.
3. GDK License from Google
3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable and non-exclusive license to use the GDK solely to develop applications to run on the Glass platform for Glass devices.
3.2 You agree that Google or third parties own all legal right, title and interest in and to the GDK, including any Intellectual Property Rights that subsist in the GDK. &quot;Intellectual Property Rights&quot; means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
3.3 You may not use the GDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the GDK or any part of the GDK; or (b) load any part of the GDK onto a mobile handset or wearable computing device or any other hardware device except a Glass device personal computer, combine any part of the GDK with other software, or distribute any software or device incorporating a part of the GDK.
3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Glass, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the GDK.
3.5 Use, reproduction and distribution of components of the GDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.
3.6 You agree that the form and nature of the GDK that Google provides may change without prior notice to you and that future versions of the GDK may be incompatible with applications developed on previous versions of the GDK. You agree that Google may stop (permanently or temporarily) providing the GDK (or any features within the GDK) to you or to users generally at Google's sole discretion, without prior notice to you.
3.7 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the GDK.
3.9 Your use of any Android system files, packaged APIs, or other components of the GDK which are part of the Android Software Development Kit is subject to the terms of the Android Software Development Kit License Agreement located at http://developer.android.com/sdk/terms.html. These terms are hereby incorporated by reference into this License Agreement.
4. Use of the GDK by You
4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the GDK, including any intellectual property rights that subsist in those applications.
4.2 You agree to use the GDK and write applications only for purposes that are permitted by (a) this License Agreement, (b) the Glass Platform Developer Policies (located at https://developers.google.com/glass/policies, and hereby incorporated into this License Agreement by reference), and (c) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
4.3 You agree that if you use the GDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.
4.4 You agree that you will not engage in any activity with the GDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google.
4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Glass and/or applications for Glass, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
4.7 The GDK is in development, and your testing and feedback are an important part of the development process. By using the GDK, you acknowledge that implementation of some features are still under development and that you should not rely on the GDK, Glass devices, Glass system software, Google Mirror API, or Glass services having the full functionality of a stable release.
5. Your Developer Credentials
5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
6. Privacy and Information
6.1 In order to continually innovate and improve the GDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the GDK are being used and how they are being used. Before any of this information is collected, the GDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
6.2 The data collected is examined in the aggregate to improve the GDK and is maintained in accordance with Google's Privacy Policy.
7. Third Party Applications
7.1 If you use the GDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.
8. Using Google APIs
8.1 Google APIs
8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
9. Terminating this License Agreement
9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.
9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the GDK and any relevant developer credentials.
9.3 Google may at any time, terminate this License Agreement with you if:
(A) you have breached any provision of this License Agreement; or
(B) Google is required to do so by law; or
(C) the partner with whom Google offered certain parts of GDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the GDK to you; or
(D) Google decides to no longer provide the GDK or certain parts of the GDK to users in the country in which you are resident or from which you use the service, or the provision of the GDK or certain GDK services to you by Google is, in Google's sole discretion, no longer commercially viable.
9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.
10. DISCLAIMER OF WARRANTIES
10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GDK IS AT YOUR SOLE RISK AND THAT THE GDK IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot; WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
10.2 YOUR USE OF THE GDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
11. LIMITATION OF LIABILITY
11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
12. Indemnification
12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the GDK, (b) any application you develop on the GDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.
13. Changes to the License Agreement
13.1 Google may make changes to the License Agreement as it distributes new versions of the GDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the GDK is made available.
14. General Legal Terms
14.1 This License Agreement constitutes the whole legal agreement between you and Google and governs your use of the GDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the GDK.
14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.
14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.
14.5 EXPORT RESTRICTIONS. THE GDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.
14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
November 19, 2013
</sdk:license>
<!-- ADD-ONS ....................... -->
@ -708,6 +853,97 @@ August 15, 2011
<sdk:uses-license ref="android-sdk-license"/>
</sdk:add-on>
<sdk:add-on>
<!-- Generated at Tue May 14 08:07:47 2013 from git_jb-mr1.1-dev @ 673949 -->
<sdk:vendor-id>google</sdk:vendor-id>
<sdk:vendor-display>Google Inc.</sdk:vendor-display>
<sdk:name-id>google_apis</sdk:name-id>
<sdk:name-display>Google APIs</sdk:name-display>
<sdk:description>Android + Google APIs</sdk:description>
<sdk:api-level>17</sdk:api-level>
<sdk:revision>3</sdk:revision>
<sdk:libs>
<sdk:lib>
<sdk:name>com.google.android.maps</sdk:name>
</sdk:lib>
<sdk:lib>
<sdk:name>com.android.future.usb.accessory</sdk:name>
</sdk:lib>
<sdk:lib>
<sdk:name>com.google.android.media.effects</sdk:name>
</sdk:lib>
</sdk:libs>
<sdk:archives>
<sdk:archive arch="any" os="any">
<sdk:size>137156978</sdk:size>
<sdk:checksum type="sha1">8246f61d24f0408c8e7bc352a1e522b7e2b619ba</sdk:checksum>
<sdk:url>google_apis-17_r03.zip</sdk:url>
</sdk:archive>
</sdk:archives>
<sdk:uses-license ref="android-sdk-license"/>
</sdk:add-on>
<sdk:add-on>
<!-- Generated at Thu Sep 19 12:49:30 2013 from git_jb-mr2-dev @ 836888 -->
<sdk:vendor-id>google</sdk:vendor-id>
<sdk:vendor-display>Google Inc.</sdk:vendor-display>
<sdk:name-id>google_apis</sdk:name-id>
<sdk:name-display>Google APIs</sdk:name-display>
<sdk:description>Android + Google APIs</sdk:description>
<sdk:api-level>18</sdk:api-level>
<sdk:revision>3</sdk:revision>
<sdk:libs>
<sdk:lib>
<sdk:name>com.google.android.maps</sdk:name>
</sdk:lib>
<sdk:lib>
<sdk:name>com.android.future.usb.accessory</sdk:name>
</sdk:lib>
<sdk:lib>
<sdk:name>com.google.android.media.effects</sdk:name>
</sdk:lib>
</sdk:libs>
<sdk:archives>
<sdk:archive arch="any" os="any">
<sdk:size>143149689</sdk:size>
<sdk:checksum type="sha1">147bce09c1163edc17194f3db496ec1086fcf965</sdk:checksum>
<sdk:url>google_apis-18_r03.zip</sdk:url>
</sdk:archive>
</sdk:archives>
<sdk:uses-license ref="android-sdk-license"/>
</sdk:add-on>
<sdk:add-on>
<!-- Generated at Mon Oct 28 22:29:49 2013 from git_klp-release @ 892118 -->
<sdk:vendor-id>google</sdk:vendor-id>
<sdk:vendor-display>Google Inc.</sdk:vendor-display>
<sdk:name-id>google_apis</sdk:name-id>
<sdk:name-display>Google APIs</sdk:name-display>
<sdk:description>Android + Google APIs</sdk:description>
<sdk:api-level>19</sdk:api-level>
<sdk:revision>1</sdk:revision>
<sdk:libs>
<sdk:lib>
<sdk:name>com.google.android.maps</sdk:name>
</sdk:lib>
<sdk:lib>
<sdk:name>com.android.future.usb.accessory</sdk:name>
</sdk:lib>
<sdk:lib>
<sdk:name>com.google.android.media.effects</sdk:name>
</sdk:lib>
</sdk:libs>
<sdk:archives>
<sdk:archive arch="any" os="any">
<sdk:size>150689239</sdk:size>
<sdk:checksum type="sha1">6c530a8318446e4da1e3ab7d2abd154bc493bc5a</sdk:checksum>
<sdk:url>google_apis-19_r01.zip</sdk:url>
</sdk:archive>
</sdk:archives>
<sdk:uses-license ref="android-sdk-license"/>
</sdk:add-on>
<!-- GOOGLE TV ADDONS ............. -->
<sdk:add-on>
@ -750,71 +986,40 @@ August 15, 2011
<sdk:libs/>
</sdk:add-on>
<sdk:add-on>
<!-- Generated at Tue May 14 08:07:47 2013 from git_jb-mr1.1-dev @ 673949 -->
<sdk:vendor-id>google</sdk:vendor-id>
<sdk:vendor-display>Google Inc.</sdk:vendor-display>
<sdk:name-id>google_apis</sdk:name-id>
<sdk:name-display>Google APIs</sdk:name-display>
<sdk:description>Android + Google APIs</sdk:description>
<sdk:api-level>17</sdk:api-level>
<sdk:revision>3</sdk:revision>
<sdk:libs>
<sdk:lib>
<sdk:name>com.google.android.maps</sdk:name>
</sdk:lib>
<sdk:lib>
<sdk:name>com.android.future.usb.accessory</sdk:name>
</sdk:lib>
<sdk:lib>
<sdk:name>com.google.android.media.effects</sdk:name>
</sdk:lib>
</sdk:libs>
<sdk:archives>
<sdk:archive arch="any" os="any">
<sdk:size>137156978</sdk:size>
<sdk:checksum type="sha1">8246f61d24f0408c8e7bc352a1e522b7e2b619ba</sdk:checksum>
<sdk:url>google_apis-17_r03.zip</sdk:url>
</sdk:archive>
</sdk:archives>
<sdk:uses-license ref="android-sdk-license"/>
</sdk:add-on>
<!-- GLASS ADDONS ............. -->
<sdk:add-on>
<!-- Generated at Mon Aug 12 12:42:05 2013 from git_jb-mr2-dev @ 774058 -->
<sdk:vendor-id>google</sdk:vendor-id>
<sdk:vendor-display>Google Inc.</sdk:vendor-display>
<sdk:name-id>google_apis</sdk:name-id>
<sdk:name-display>Google APIs</sdk:name-display>
<sdk:description>Android + Google APIs</sdk:description>
<sdk:api-level>18</sdk:api-level>
<sdk:revision>2</sdk:revision>
<sdk:libs>
<sdk:lib>
<sdk:name>com.google.android.maps</sdk:name>
</sdk:lib>
<sdk:lib>
<sdk:name>com.android.future.usb.accessory</sdk:name>
</sdk:lib>
<sdk:lib>
<sdk:name>com.google.android.media.effects</sdk:name>
</sdk:lib>
</sdk:libs>
<sdk:name-id>google_gdk</sdk:name-id>
<sdk:name-display>Glass Development Kit Sneak Peek</sdk:name-display>
<sdk:api-level>15</sdk:api-level>
<sdk:revision>01</sdk:revision>
<sdk:description>Sneak peek of the Glass Development Kit</sdk:description>
<sdk:desc-url>https://developers.google.com/glass/gdk/</sdk:desc-url>
<sdk:uses-license ref="google-gdk-license"/>
<sdk:archives>
<sdk:archive arch="any" os="any">
<sdk:size>142778022</sdk:size>
<sdk:checksum type="sha1">40f2a6a6d6227dadd82cfe0f9783bd4c6bdb29c2</sdk:checksum>
<sdk:url>google_apis-18_r02.zip</sdk:url>
<sdk:archive os="any">
<sdk:size>281839</sdk:size>
<sdk:checksum type="sha1">a3c7317fb2fe8a0dfc06828a5aabc457372b82a7</sdk:checksum>
<sdk:url>https://dl-ssl.google.com/glass/xe11/google-gdk.zip</sdk:url>
</sdk:archive>
</sdk:archives>
<sdk:uses-license ref="android-sdk-license"/>
<sdk:libs>
<sdk:lib>
<sdk:name>com.google.android.glass</sdk:name>
<sdk:description>APIs for Google Glass Development Kit Sneak Peek.</sdk:description>
</sdk:lib>
</sdk:libs>
</sdk:add-on>
<!-- EXTRAS VENDOR=ANDROID ........................ -->
<sdk:extra>
<!-- Generated at Tue Jul 23 17:18:50 2013 from git_jb-mr2-ub-dev @ 751786 -->
<sdk:revision>18</sdk:revision>
<!-- Generated at Wed Oct 30 14:52:38 2013 from git_klp-dev @ 894928 -->
<sdk:revision>19</sdk:revision>
<sdk:vendor-display>Android</sdk:vendor-display>
<sdk:vendor-id>android</sdk:vendor-id>
<sdk:name-display>Android Support Library</sdk:name-display>
@ -822,17 +1027,17 @@ August 15, 2011
<sdk:old-paths>compatibility</sdk:old-paths>
<sdk:archives>
<sdk:archive arch="any" os="any">
<sdk:size>4438319</sdk:size>
<sdk:checksum type="sha1">bd67b4b8a6bac629f24c8aea75c3619a26d9a568</sdk:checksum>
<sdk:url>support_r18.zip</sdk:url>
<sdk:size>4905998</sdk:size>
<sdk:checksum type="sha1">54b8661595856a08f032d41bb139f375a7609308</sdk:checksum>
<sdk:url>support_r19.zip</sdk:url>
</sdk:archive>
</sdk:archives>
<sdk:uses-license ref="android-sdk-license"/>
</sdk:extra>
<sdk:extra>
<!-- Generated from git_jb-mr2-ub-dev @ 751786 -->
<sdk:revision>2</sdk:revision>
<!-- Generated from git_klp-dev @ 894928 -->
<sdk:revision>3</sdk:revision>
<sdk:vendor-display>Android</sdk:vendor-display>
<sdk:vendor-id>android</sdk:vendor-id>
<sdk:name-display>Android Support Repository</sdk:name-display>
@ -840,9 +1045,9 @@ August 15, 2011
<sdk:path>m2repository</sdk:path>
<sdk:archives>
<sdk:archive arch="any" os="any">
<sdk:size>3705797</sdk:size>
<sdk:checksum type="sha1">c4284e4bf17a1e8bafc96a18de36984022d5a46a</sdk:checksum>
<sdk:url>android_m2repository_r02.zip</sdk:url>
<sdk:size>6282146</sdk:size>
<sdk:checksum type="sha1">db4650f817f1507211ec6186d2d9e72074e6df12</sdk:checksum>
<sdk:url>android_m2repository_r03.zip</sdk:url>
</sdk:archive>
</sdk:archives>
<sdk:uses-license ref="android-sdk-license"/>
@ -855,14 +1060,14 @@ August 15, 2011
<sdk:vendor-display>Google Inc.</sdk:vendor-display>
<sdk:name-display>Google Repository</sdk:name-display>
<sdk:path>m2repository</sdk:path>
<sdk:revision>2</sdk:revision>
<sdk:revision>4</sdk:revision>
<sdk:description>Local Maven repository for Google Libraries</sdk:description>
<sdk:uses-license ref="android-sdk-license"/>
<sdk:archives>
<sdk:archive os="any">
<sdk:size>2043649</sdk:size>
<sdk:checksum type="sha1">f518e0170e84a6bccbadb8a043989cc61f4c37aa</sdk:checksum>
<sdk:url>google_m2repository_r02.zip</sdk:url>
<sdk:size>3891592</sdk:size>
<sdk:checksum type="sha1">c418daafd203a8cb4899d49bd321da83b927586e</sdk:checksum>
<sdk:url>google_m2repository_r04.zip</sdk:url>
</sdk:archive>
</sdk:archives>
</sdk:extra>
@ -908,17 +1113,35 @@ August 15, 2011
<sdk:extra>
<sdk:vendor-id>google</sdk:vendor-id>
<sdk:vendor-display>Google Inc.</sdk:vendor-display>
<sdk:name-display>Google Play services</sdk:name-display>
<sdk:path>google_play_services</sdk:path>
<sdk:revision>11</sdk:revision>
<sdk:description>Google Play Services client library and sample code</sdk:description>
<sdk:name-display>Google Play services for Froyo</sdk:name-display>
<sdk:path>google_play_services_froyo</sdk:path>
<sdk:revision>12</sdk:revision>
<sdk:description>Google Play services client library and sample code</sdk:description>
<sdk:desc-url>https://developers.google.com/android/google-play-services/index</sdk:desc-url>
<sdk:uses-license ref="android-sdk-license"/>
<sdk:archives>
<sdk:archive os="any">
<sdk:size>5265306</sdk:size>
<sdk:checksum type="sha1">00851350c55b016bef202700f643f246fb0c24ea</sdk:checksum>
<sdk:url>google_play_services_3264130_r11.zip</sdk:url>
<sdk:size>5265389</sdk:size>
<sdk:checksum type="sha1">92558dbc380bba3d55d0ec181167fb05ce7c79d9</sdk:checksum>
<sdk:url>google_play_services_3265130_r12.zip</sdk:url>
</sdk:archive>
</sdk:archives>
</sdk:extra>
<sdk:extra>
<sdk:vendor-id>google</sdk:vendor-id>
<sdk:vendor-display>Google Inc.</sdk:vendor-display>
<sdk:name-display>Google Play services</sdk:name-display>
<sdk:path>google_play_services</sdk:path>
<sdk:revision>13</sdk:revision>
<sdk:description>Google Play services client library and sample code</sdk:description>
<sdk:desc-url>https://developers.google.com/android/google-play-services/index</sdk:desc-url>
<sdk:uses-license ref="android-sdk-license"/>
<sdk:archives>
<sdk:archive os="any">
<sdk:size>7958511</sdk:size>
<sdk:checksum type="sha1">1be94e8f767616e862f0088ab673e1980a6022c4</sdk:checksum>
<sdk:url>google_play_services_4030530_r13.zip</sdk:url>
</sdk:archive>
</sdk:archives>
</sdk:extra>
@ -948,14 +1171,14 @@ August 15, 2011
<sdk:name-display>Google Play Billing Library</sdk:name-display>
<sdk:path>play_billing</sdk:path>
<sdk:old-paths>market_billing</sdk:old-paths>
<sdk:revision>4</sdk:revision>
<sdk:revision>5</sdk:revision>
<sdk:description>Google Play Billing files and sample code</sdk:description>
<sdk:desc-url>http://developer.android.com/google/play/billing/index.html</sdk:desc-url>
<sdk:archives>
<sdk:archive os="any">
<sdk:size>437084</sdk:size>
<sdk:checksum type="sha1">38fdae51dadb6d1e63e177adba3e4d96b751686e</sdk:checksum>
<sdk:url>play_billing_r04.zip</sdk:url>
<sdk:size>436654</sdk:size>
<sdk:checksum type="sha1">bd2ac5ce7127070ac3229003eb69cfb806628ac9</sdk:checksum>
<sdk:url>play_billing_r05.zip</sdk:url>
</sdk:archive>
</sdk:archives>
<sdk:uses-license ref="android-sdk-license"/>

16
pkgs/development/mobile/androidenv/addons.nix
View File

@ -197,8 +197,20 @@ in
google_apis_18 = buildGoogleApis {
name = "google_apis-18";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/google_apis-18_r02.zip;
sha1 = "40f2a6a6d6227dadd82cfe0f9783bd4c6bdb29c2";
url = https://dl-ssl.google.com/android/repository/google_apis-18_r03.zip;
sha1 = "147bce09c1163edc17194f3db496ec1086fcf965";
};
meta = {
description = "Android + Google APIs";
};
};
google_apis_19 = buildGoogleApis {
name = "google_apis-19";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/google_apis-19_r01.zip;
sha1 = "6c530a8318446e4da1e3ab7d2abd154bc493bc5a";
};
meta = {
description = "Android + Google APIs";

14
pkgs/development/mobile/androidenv/androidsdk.nix
View File

@ -8,16 +8,16 @@
{platformVersions, abiVersions, useGoogleAPIs}:
stdenv.mkDerivation {
name = "android-sdk-22.2";
name = "android-sdk-22.3";
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
then fetchurl {
url = http://dl.google.com/android/android-sdk_r22.2-linux.tgz;
md5 = "2a3776839e823ba9acb7a87a3fe26e02";
url = http://dl.google.com/android/android-sdk_r22.3-linux.tgz;
md5 = "6ae581a906d6420ad67176dff25a31cc";
}
else if stdenv.system == "x86_64-darwin" then fetchurl {
url = http://dl.google.com/android/android-sdk_r22.2-macosx.zip;
md5 = "9dfef6404e2f842c433073796aed8b7d";
url = http://dl.google.com/android/android-sdk_r22.3-macosx.zip;
md5 = "ecde88ca1f05955826697848fcb4a9e7";
}
else throw "platform not ${stdenv.system} supported!";
@ -132,7 +132,7 @@ stdenv.mkDerivation {
let
googleApis = builtins.getAttr ("google_apis_"+platformVersion) addons;
in
"ln -s ${googleApis}/* addon-google_apis-${platformVersion}"
"ln -s ${googleApis}/* addon-google_apis-${platformVersion}\n"
else "") platformVersions
else ""}
@ -148,7 +148,7 @@ stdenv.mkDerivation {
let
platform = builtins.getAttr ("platform_"+platformVersion) platforms;
in
"ln -s ${platform}/* android-${platformVersion}"
"ln -s ${platform}/* android-${platformVersion}\n"
else ""
) platformVersions}

10
pkgs/development/mobile/androidenv/platform-tools.nix
View File

@ -1,15 +1,15 @@
{stdenv, stdenv_32bit, fetchurl, unzip}:
stdenv.mkDerivation {
name = "android-platform-tools-r18.0.1";
name = "android-platform-tools-r19";
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
then fetchurl {
url = https://dl-ssl.google.com/android/repository/platform-tools_r18.0.1-linux.zip;
sha1 = "cf9bdbbaa34da37b59724f914dad907c2c74a387";
url = https://dl-ssl.google.com/android/repository/platform-tools_r19-linux.zip;
sha1 = "66ee37daf8a2a8f1aa8939ccd4093658e30aa49b";
}
else if stdenv.system == "x86_64-darwin" then fetchurl {
url = https://dl-ssl.google.com/android/repository/platform-tools_r18.0.1-macosx.zip;
sha1 = "126325cbb55928c38acbb9c7bb5d9145d94fad56";
url = https://dl-ssl.google.com/android/repository/platform-tools_r19-macosx.zip;
sha1 = "69af30f488163dfc3da8cef1bb6cc7e8a6df5681";
}
else throw "System ${stdenv.system} not supported!";

12
pkgs/development/mobile/androidenv/platforms-linux.nix
View File

@ -218,5 +218,17 @@ in
};
};
platform_19 = buildPlatform {
name = "android-platform-4.4";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-19_r01.zip;
sha1 = "96281811998272dce46e8285d15fce444a3d5a96";
};
meta = {
description = "Android SDK Platform 4.4";
};
};
}

12
pkgs/development/mobile/androidenv/platforms-macosx.nix
View File

@ -218,5 +218,17 @@ in
};
};
platform_19 = buildPlatform {
name = "android-platform-4.4";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/android-19_r01.zip;
sha1 = "96281811998272dce46e8285d15fce444a3d5a96";
};
meta = {
description = "Android SDK Platform 4.4";
};
};
}

180
pkgs/development/mobile/androidenv/repository-8.xml
View File

@ -638,6 +638,30 @@ November 13, 2012
<sdk:uses-license ref="android-sdk-license"/>
</sdk:platform>
<sdk:platform>
<!-- Generated at Mon Oct 28 23:34:31 2013 from git_klp-release @ 892118 -->
<sdk:revision>1</sdk:revision>
<sdk:description>Android SDK Platform 4.4</sdk:description>
<sdk:version>4.4</sdk:version>
<sdk:api-level>19</sdk:api-level>
<sdk:min-tools-rev>
<sdk:major>22</sdk:major>
</sdk:min-tools-rev>
<sdk:layoutlib>
<sdk:api>10</sdk:api>
<sdk:revision>1</sdk:revision>
</sdk:layoutlib>
<sdk:archives>
<sdk:archive arch="any" os="any">
<sdk:size>59279956</sdk:size>
<sdk:checksum type="sha1">96281811998272dce46e8285d15fce444a3d5a96</sdk:checksum>
<sdk:url>android-19_r01.zip</sdk:url>
</sdk:archive>
</sdk:archives>
<sdk:uses-license ref="android-sdk-license"/>
</sdk:platform>
<!-- SYSTEM IMAGES ........................ -->
<sdk:system-image>
@ -720,6 +744,23 @@ November 13, 2012
<sdk:uses-license ref="android-sdk-license"/>
</sdk:system-image>
<sdk:system-image>
<!-- Generated at Mon Oct 28 23:36:43 2013 from git_klp-release @ 892118 -->
<sdk:revision>1</sdk:revision>
<sdk:description>Android SDK Platform 4.4</sdk:description>
<sdk:api-level>19</sdk:api-level>
<sdk:abi>armeabi-v7a</sdk:abi>
<sdk:archives>
<sdk:archive arch="any" os="any">
<sdk:size>155838103</sdk:size>
<sdk:checksum type="sha1">12dd1187dfd953b1ffcef5067d94578590f9e600</sdk:checksum>
<sdk:url>sysimg_armv7a-19_r01.zip</sdk:url>
</sdk:archive>
</sdk:archives>
<sdk:uses-license ref="android-sdk-license"/>
</sdk:system-image>
<!-- SAMPLES ........................ -->
<!-- Generated on Mon Feb 22 13:39:38 PST 2010 using eclair 25887: Samples. -->
@ -919,30 +960,44 @@ November 13, 2012
<sdk:uses-license ref="android-sdk-license"/>
</sdk:sample>
<sdk:sample>
<!-- Generated at Wed Oct 30 20:26:32 2013 from git_klp-dev @ 896074 -->
<sdk:revision>1</sdk:revision>
<sdk:api-level>19</sdk:api-level>
<sdk:archives>
<sdk:archive arch="any" os="any">
<sdk:size>20697510</sdk:size>
<sdk:checksum type="sha1">c2007694b5e5ad6737f647db8160155d5258cb7f</sdk:checksum>
<sdk:url>samples-19_r01.zip</sdk:url>
</sdk:archive>
</sdk:archives>
<sdk:uses-license ref="android-sdk-license"/>
</sdk:sample>
<!-- PLATFORM-TOOLS ........................ -->
<sdk:platform-tool>
<!-- Generated at Mon Jul 29 15:56:24 2013 from git_jb-mr2-dev @ 754669 -->
<!-- Generated at Mon Oct 28 23:35:14 2013 from git_klp-release @ 886418 -->
<sdk:revision>
<sdk:major>18</sdk:major>
<sdk:major>19</sdk:major>
<sdk:minor>0</sdk:minor>
<sdk:micro>1</sdk:micro>
<sdk:micro>0</sdk:micro>
</sdk:revision>
<sdk:archives>
<sdk:archive arch="any" os="windows">
<sdk:size>954769</sdk:size>
<sdk:checksum type="sha1">b40fea3ed72296dd42dd616a7abf536b8dace20d</sdk:checksum>
<sdk:url>platform-tools_r18.0.1-windows.zip</sdk:url>
<sdk:size>1116358</sdk:size>
<sdk:checksum type="sha1">755dcb5b5b72bbca90dd055eec4c8d0b1fce7cfd</sdk:checksum>
<sdk:url>platform-tools_r19-windows.zip</sdk:url>
</sdk:archive>
<sdk:archive arch="any" os="linux">
<sdk:size>1011194</sdk:size>
<sdk:checksum type="sha1">cf9bdbbaa34da37b59724f914dad907c2c74a387</sdk:checksum>
<sdk:url>platform-tools_r18.0.1-linux.zip</sdk:url>
<sdk:size>1172749</sdk:size>
<sdk:checksum type="sha1">66ee37daf8a2a8f1aa8939ccd4093658e30aa49b</sdk:checksum>
<sdk:url>platform-tools_r19-linux.zip</sdk:url>
</sdk:archive>
<sdk:archive arch="any" os="macosx">
<sdk:size>971087</sdk:size>
<sdk:checksum type="sha1">126325cbb55928c38acbb9c7bb5d9145d94fad56</sdk:checksum>
<sdk:url>platform-tools_r18.0.1-macosx.zip</sdk:url>
<sdk:size>1120849</sdk:size>
<sdk:checksum type="sha1">69af30f488163dfc3da8cef1bb6cc7e8a6df5681</sdk:checksum>
<sdk:url>platform-tools_r19-macosx.zip</sdk:url>
</sdk:archive>
</sdk:archives>
<sdk:uses-license ref="android-sdk-license"/>
@ -1033,33 +1088,86 @@ November 13, 2012
<sdk:uses-license ref="android-sdk-license"/>
</sdk:build-tool>
<sdk:build-tool>
<!-- Generated at Thu Oct 10 14:18:15 2013 from git_jb-mr2-dev @ 867478 -->
<sdk:revision>
<sdk:major>18</sdk:major>
<sdk:minor>1</sdk:minor>
<sdk:micro>1</sdk:micro>
</sdk:revision>
<sdk:archives>
<sdk:archive arch="any" os="windows">
<sdk:size>19660000</sdk:size>
<sdk:checksum type="sha1">c4605066e2f851387ea70bc1442b1968bd7b4a15</sdk:checksum>
<sdk:url>build-tools_r18.1.1-windows.zip</sdk:url>
</sdk:archive>
<sdk:archive arch="any" os="linux">
<sdk:size>20229760</sdk:size>
<sdk:checksum type="sha1">68c9acbfc0cec2d51b19efaed39831a17055d998</sdk:checksum>
<sdk:url>build-tools_r18.1.1-linux.zip</sdk:url>
</sdk:archive>
<sdk:archive arch="any" os="macosx">
<sdk:size>20452157</sdk:size>
<sdk:checksum type="sha1">a9d9d37f6ddf859e57abc78802a77aaa166e48d4</sdk:checksum>
<sdk:url>build-tools_r18.1.1-macosx.zip</sdk:url>
</sdk:archive>
</sdk:archives>
<sdk:uses-license ref="android-sdk-license"/>
</sdk:build-tool>
<sdk:build-tool>
<!-- Generated at Mon Oct 28 23:12:03 2013 from git_klp-release @ 886418 -->
<sdk:revision>
<sdk:major>19</sdk:major>
<sdk:minor>0</sdk:minor>
<sdk:micro>0</sdk:micro>
</sdk:revision>
<sdk:archives>
<sdk:archive arch="any" os="windows">
<sdk:size>20611447</sdk:size>
<sdk:checksum type="sha1">6edf505c20f5ece9c48fa0aff9a90488f9654d52</sdk:checksum>
<sdk:url>build-tools_r19-windows.zip</sdk:url>
</sdk:archive>
<sdk:archive arch="any" os="linux">
<sdk:size>21339943</sdk:size>
<sdk:checksum type="sha1">55c1a6cf632e7d346f0002b275ec41fd3137fd83</sdk:checksum>
<sdk:url>build-tools_r19-linux.zip</sdk:url>
</sdk:archive>
<sdk:archive arch="any" os="macosx">
<sdk:size>21441270</sdk:size>
<sdk:checksum type="sha1">86ec1c12db1bc446b7bcaefc5cc14eb361044e90</sdk:checksum>
<sdk:url>build-tools_r19-macosx.zip</sdk:url>
</sdk:archive>
</sdk:archives>
<sdk:uses-license ref="android-sdk-license"/>
</sdk:build-tool>
<!-- TOOLS ........................ -->
<sdk:tool>
<!-- Generated at Wed Sep 11 18:24:51 2013 from git_mirror-aosp-tools_r22.2 @ 822324 -->
<!-- Generated at Mon Oct 28 23:45:30 2013 from git_mirror-aosp-tools_r22.2 @ 887826 -->
<sdk:revision>
<sdk:major>22</sdk:major>
<sdk:minor>2</sdk:minor>
<sdk:micro>0</sdk:micro>
<sdk:minor>3</sdk:minor>
</sdk:revision>
<sdk:min-platform-tools-rev>
<sdk:major>18</sdk:major>
</sdk:min-platform-tools-rev>
<sdk:archives>
<sdk:archive arch="any" os="windows">
<sdk:size>108669997</sdk:size>
<sdk:checksum type="sha1">c4231cd769ef9d1b6ae69202a1a0d0f783f04ea7</sdk:checksum>
<sdk:url>tools_r22.2-windows.zip</sdk:url>
<sdk:size>108726734</sdk:size>
<sdk:checksum type="sha1">1cdc825c9a84ccf69b4a6386076a881d962dd7a9</sdk:checksum>
<sdk:url>tools_r22.3-windows.zip</sdk:url>
</sdk:archive>
<sdk:archive arch="any" os="linux">
<sdk:size>101168674</sdk:size>
<sdk:checksum type="sha1">a11febd30023ed2590bca4c2d7b1dc2b0cfcd715</sdk:checksum>
<sdk:url>tools_r22.2-linux.zip</sdk:url>
<sdk:size>101224750</sdk:size>
<sdk:checksum type="sha1">f76251916a23cb3d85e579f01cc6711a334f9064</sdk:checksum>
<sdk:url>tools_r22.3-linux.zip</sdk:url>
</sdk:archive>
<sdk:archive arch="any" os="macosx">
<sdk:size>74822802</sdk:size>
<sdk:checksum type="sha1">76896171d0c9ba91c875c8f13ac58cd2e50e9f28</sdk:checksum>
<sdk:url>tools_r22.2-macosx.zip</sdk:url>
<sdk:size>74859563</sdk:size>
<sdk:checksum type="sha1">697d7f6fa44f02e6894d0eeb948ea97e3cdc8c3c</sdk:checksum>
<sdk:url>tools_r22.3-macosx.zip</sdk:url>
</sdk:archive>
</sdk:archives>
<sdk:uses-license ref="android-sdk-license"/>
@ -1068,14 +1176,14 @@ November 13, 2012
<!-- DOCS ........................ -->
<sdk:doc>
<!-- Generated at Tue Jul 23 17:15:55 2013 from git_jb-mr2-release @ 737497 -->
<!-- Generated at Wed Oct 30 22:52:09 2013 from git_klp-dev @ 896129 -->
<sdk:revision>1</sdk:revision>
<sdk:api-level>18</sdk:api-level>
<sdk:api-level>19</sdk:api-level>
<sdk:archives>
<sdk:archive arch="any" os="any">
<sdk:size>142332266</sdk:size>
<sdk:checksum type="sha1">83632d157781d31f2a8e52acad5c4c5d0f307cba</sdk:checksum>
<sdk:url>docs-18_r01.zip</sdk:url>
<sdk:size>181765706</sdk:size>
<sdk:checksum type="sha1">6c92bb045f75a2eabfbdc3e26ff64ce0a7a2b3fc</sdk:checksum>
<sdk:url>docs-19_r01.zip</sdk:url>
</sdk:archive>
</sdk:archives>
<sdk:uses-license ref="android-sdk-license"/>
@ -1152,4 +1260,18 @@ November 13, 2012
</sdk:archives>
<sdk:uses-license ref="android-sdk-license"/>
</sdk:source>
<sdk:source>
<!-- Generated at Mon Oct 28 23:37:07 2013 from git_klp-release @ 892118 -->
<sdk:revision>1</sdk:revision>
<sdk:api-level>19</sdk:api-level>
<sdk:archives>
<sdk:archive arch="any" os="any">
<sdk:size>21656670</sdk:size>
<sdk:checksum type="sha1">91d9f5f4117723eecc4434b7de0e7f6295ea0508</sdk:checksum>
<sdk:url>sources-19_r01.zip</sdk:url>
</sdk:archive>
</sdk:archives>
<sdk:uses-license ref="android-sdk-license"/>
</sdk:source>
</sdk:sdk-repository>

8
pkgs/development/mobile/androidenv/sysimages.nix
View File

@ -53,6 +53,14 @@ in
};
};
sysimg_armeabi-v7a_19 = buildSystemImage {
name = "armeabi-v7a-19";
src = fetchurl {
url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-19_r01.zip;
sha1 = "12dd1187dfd953b1ffcef5067d94578590f9e600";
};
};
sysimg_x86_10 = buildSystemImage {
name = "x86-10";
src = fetchurl {

27
pkgs/development/ocaml-modules/ocamlsdl/default.nix Normal file
View File

@ -0,0 +1,27 @@
{stdenv, fetchurl, ocaml, pkgconfig, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "ocamlsdl";
version = "0.9.1";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz";
sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f";
};
buildInputs = [ocaml pkgconfig findlib SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl];
propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkgconfig ];
createFindlibDestdir = true;
meta = {
homepage = http://ocamlsdl.sourceforge.net/;
description = "OCaml bindings for SDL 1.2";
license = "LGPL 2.1";
};
}

4
pkgs/development/python-modules/pycrypto/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, python, buildPythonPackage, gmp }:
buildPythonPackage rec {
name = "pycrypto-2.6";
name = "pycrypto-2.6.1";
namePrefix = "";
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/pycrypto/${name}.tar.gz";
md5 = "88dad0a270d1fe83a39e0467a66a22bb";
sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj";
};
buildInputs = [ python gmp ];

4
pkgs/development/python-modules/pyopenssl/default.nix
View File

@ -2,7 +2,7 @@ a :
let
fetchurl = a.fetchurl;
version = a.lib.attrByPath ["version"] "0.13" a;
version = a.lib.attrByPath ["version"] "0.13.1" a;
propagatedBuildInputs = with a; [
openssl python
];
@ -10,7 +10,7 @@ in
rec {
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz";
sha256 = "21e12b03abaa0e04ecc8cd9c251598f71bae11c9f385304234e4ea5618c6163b";
sha256 = "1nrg2kas0wsv65j8sia8zkkc6ir5i20lrhkfavjxzxhl0iqyq1ms";
};
inherit propagatedBuildInputs;

43
pkgs/development/tools/analysis/valgrind/default.nix
View File

@ -1,24 +1,33 @@
{ stdenv, fetchurl, perl, gdb }:
stdenv.mkDerivation (rec {
name = "valgrind-3.8.1";
stdenv.mkDerivation rec {
name = "valgrind-3.9.0";
src = fetchurl {
url = "http://valgrind.org/downloads/${name}.tar.bz2";
sha256 = "1nsqk70ry3221sd62s4f0njcrncppszs4xxjcak13lxyfq2y0fs7";
sha256 = "1w6n5qvxy2ssbczcl1c2yd2ggjn3ipay2hvpn10laly2dfh73bz6";
};
patches = [ ./glibc-2.17.patch ];
# Perl is needed for `cg_annotate'.
# GDB is needed to provide a sane default for `--db-command'.
nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) gdb;
enableParallelBuilding = true;
patchPhase =
# Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666).
''
echo "getting rid of the \`-arch' GCC option..."
find -name Makefile\* -exec \
sed -i {} -e's/DARWIN\(.*\)-arch [^ ]\+/DARWIN\1/g' \;
sed -i coregrind/link_tool_exe_darwin.in \
-e 's/^my \$archstr = .*/my $archstr = "x86_64";/g'
'';
configureFlags =
if (stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin")
then [ "--enable-only64bit" ]
else [];
stdenv.lib.optional (stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin") "--enable-only64bit";
postInstall = ''
for i in $out/lib/valgrind/*.supp; do
@ -43,23 +52,7 @@ stdenv.mkDerivation (rec {
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [ eelco ];
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
}
//
(if stdenv.isDarwin
then {
patchPhase =
# Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666).
'' echo "getting rid of the \`-arch' GCC option..."
find -name Makefile\* -exec \
sed -i {} -e's/DARWIN\(.*\)-arch [^ ]\+/DARWIN\1/g' \;
sed -i coregrind/link_tool_exe_darwin.in \
-e 's/^my \$archstr = .*/my $archstr = "x86_64";/g'
'';
}
else {}))

78
pkgs/development/tools/analysis/valgrind/glibc-2.17.patch
View File

@ -1,78 +0,0 @@
commit 3781ac11ff374b3517011c1710ec517d52f25cd2
Author: tom <tom@a5019735-40e9-0310-863c-91ae7b9d1cf9>
Date: Mon Jan 14 09:48:49 2013 +0000
Accept glibc 2.17 as valid.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13228 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/configure.in b/configure.in
index e0fb12d..0f3b3df 100644
--- a/configure.in
+++ b/configure.in
@@ -906,6 +906,13 @@ case "${GLIBC_VERSION}" in
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
;;
+ 2.17)
+ AC_MSG_RESULT(2.17 family)
+ AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x])
+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ ;;
darwin)
AC_MSG_RESULT(Darwin)
AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
@@ -919,7 +926,7 @@ case "${GLIBC_VERSION}" in
*)
AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16])
+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17])
AC_MSG_ERROR([or Darwin libc])
;;
esac
diff -ur valgrind-3.8.1/config.h.in valgrind-3.8.1/config.h.in
--- valgrind-3.8.1/config.h.in 2013-01-16 17:15:33.531018561 +0100
+++ valgrind-3.8.1/config.h.in 2013-01-16 17:19:21.000000000 +0100
@@ -48,6 +48,9 @@
/* Define to 1 if you're using glibc 2.16.x */
#undef GLIBC_2_16
+/* Define to 1 if you're using glibc 2.17.x */
+#undef GLIBC_2_17
+
/* Define to 1 if you're using glibc 2.2.x */
#undef GLIBC_2_2
diff -ur valgrind-3.8.1/configure valgrind-3.8.1/configure
--- valgrind-3.8.1/configure 2013-01-16 17:15:33.563018480 +0100
+++ valgrind-3.8.1/configure 2013-01-16 17:19:21.373643238 +0100
@@ -6610,6 +6610,16 @@
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
;;
+ 2.17)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.17 family" >&5
+$as_echo "2.17 family" >&6; }
+
+$as_echo "#define GLIBC_2_17 1" >>confdefs.h
+
+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ ;;
darwin)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
$as_echo "Darwin" >&6; }
@@ -6630,7 +6640,7 @@
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
$as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
- as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5
+ as_fn_error "Valgrind requires glibc version 2.2 - 2.17" "$LINENO" 5
as_fn_error "or Darwin libc" "$LINENO" 5
;;
esac

4
pkgs/development/tools/haskell/cabal2nix/default.nix
View File

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
version = "1.55";
sha256 = "0rda8g595pr7vlhzyflw9kz6fw1iz76yimbl1zizgrnpnq3h11w3";
version = "1.56";
sha256 = "0sppg4ab62ql5hdd9cdhff4f5zy74si9h5rn3sqils0hwmxl86f8";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];

38
pkgs/development/tools/misc/drush/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ stdenv, fetchurl, php, which, makeWrapper, bash, coreutils, ncurses }:
stdenv.mkDerivation rec {
name = "drush-6.1.0";
meta = with stdenv.lib; {
description = "Command-line shell and Unix scripting interface for Drupal";
homepage = http://github.com/drush-ops/drush;
license = licenses.gpl2;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.all;
};
src = fetchurl {
url = https://github.com/drush-ops/drush/archive/6.1.0.tar.gz;
sha256 = "1jgnc4jjyapyn04iczvcz92ic0vq8d1w8xi55ismqyy5cxhqj6bp";
};
consoleTable = fetchurl {
url = http://download.pear.php.net/package/Console_Table-1.1.3.tgz;
sha256 = "07gbjd7m1fj5dmavr0z20vkqwx1cz2522sj9022p257jifj1yl76";
};
buildInputs = [ php which makeWrapper ];
installPhase = ''
# install libraries
cd lib
tar -xf ${consoleTable}
cd ..
mkdir -p "$out"
cp -r . "$out/src"
mkdir "$out/bin"
wrapProgram "$out/src/drush" --prefix PATH : "${which}/bin:${php}/bin:${bash}/bin:${coreutils}/bin:${ncurses}/bin"
ln -s "$out/src/drush" "$out/bin/drush"
'';
}

8
pkgs/development/tools/parsing/alex/3.1.2.nix → pkgs/development/tools/parsing/alex/3.1.3.nix
View File

@ -1,13 +1,13 @@
{ cabal, perl, QuickCheck }:
{ cabal, happy, perl, QuickCheck }:
cabal.mkDerivation (self: {
pname = "alex";
version = "3.1.2";
sha256 = "0v8y6s9gwfk3cda6cpdl0n6vljmjbpnrdi3n93q41x24bhjyn50x";
version = "3.1.3";
sha256 = "14hajxpqb6va5mclp2k682bgw9sbmd372vw41kq5aq815bkschcd";
isLibrary = false;
isExecutable = true;
buildDepends = [ QuickCheck ];
buildTools = [ perl ];
buildTools = [ happy perl ];
meta = {
homepage = "http://www.haskell.org/alex/";
description = "Alex is a tool for generating lexical analysers in Haskell";

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