alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

svn merge ^/nixpkgs/trunk

Browse source 
svn path=/nixpkgs/branches/libpng15/; revision=32321
This commit is contained in:
Yury G. Kudryashov 2012-02-16 11:23:36 +00:00
parent c615cbae70 1eed9f56e3
commit 070874c5f1
646 changed files with 2521 additions and 1990 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/editors/emacs-24/default.nix
View file

@ -4,23 +4,18 @@
, alsaLib
}:
# XXX: ?
# - checking for alsa >= 1.0.0... no
# - checking for Wand >= 6.2.8... no
# - imagemagickBig instead of imagemagick?
assert (gtk != null) -> (pkgconfig != null);
assert (libXft != null) -> libpng != null; # probably a bug
assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
stdenv.mkDerivation rec {
name = "emacs-24.0.92";
name = "emacs-24.0.93";
builder = ./builder.sh;
src = fetchurl {
url = "http://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.gz";
sha256 = "0pwps72zj7mm6asly1vdq46dcj3in4qrkb6ss9xq6nbf039nj4w6";
sha256 = "4a100accb2f76231aed4dddb32d3725dec131280ad3bdf1b39b52ce337a210fe";
};
buildInputs =

34
pkgs/applications/editors/emacs-modes/calfw/default.nix Normal file
View file

@ -0,0 +1,34 @@
{ fetchgit, stdenv, emacs }:
# TODO: byte-compile in build phase - a buildEmacsPackage that does
# that would be nice
stdenv.mkDerivation rec {
name = "calfw-1.3-5-ga9b6615";
src = fetchgit {
url = "git://github.com/kiwanami/emacs-calfw.git";
rev = "a9b6615b6666bbebe78257c557fd9a2e3a325d8d";
sha256 = "524acc8fec7e64ebe0d370ddb1d96eee6a409d650b79011fa910c35225a7f393";
};
buildInputs = [ emacs ];
installPhase =
''
ensureDir "$out/share/doc/${name}"
cp -v readme.md "$out/share/doc/${name}"
ensureDir "$out/share/emacs/site-lisp/"
cp *.el "$out/share/emacs/site-lisp/"
'';
meta = {
description = "A calendar framework for Emacs";
license = "GPLv3+";
maintainers = with stdenv.lib.maintainers; [ chaoflow ];
platforms = stdenv.lib.platforms.gnu;
};
}

2
pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
inherit date;
cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
module = "emacs-w3m";
sha256 = "ad46592d4fe3cdaadc02ce6d3fb1ac237e200beecd2ad11a04c1395a38a70a0a";
sha256 = "7a6d90b9d25f137d5a204cfa29f6c6afa8edb1ee302f969110ffda11f11909cc";
};
buildInputs = [ emacs w3m texinfo autoconf ];

22
pkgs/applications/editors/emacs-modes/js2/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ stdenv, fetchgit, emacs }:
stdenv.mkDerivation {
name = "js2-mode-0-20120130";
src = fetchgit {
url = "git://github.com/mooz/js2-mode.git";
rev = "4c008b1987aa53769899e24808b6d74b41b4ff40";
sha256 = "6af5f52e46ffe85b7610e2db19a96afbef60a6f5374f1c5db3653448e30160be";
};
buildInputs = [ emacs ];
buildPhase = ''
emacs --batch -f batch-byte-compile js2-mode.el
'';
installPhase = ''
mkdir -p $out/share/emacs/site-lisp
cp js2-mode.el js2-mode.elc $out/share/emacs/site-lisp/
'';
}

12
pkgs/applications/editors/leksah/default.nix
View file

@ -1,6 +1,6 @@
{ cabal, binary, binaryShared, deepseq, glib, gtk, gtksourceview2
, hslogger, leksahServer, ltk, mtl, network, parsec, processLeksah
, regexBase, regexTdfa, strict, time, utf8String
{ cabal, binary, binaryShared, Cabal, deepseq, filepath, glib, gtk
, gtksourceview2, hslogger, leksahServer, ltk, mtl, network, parsec
, processLeksah, regexBase, regexTdfa, strict, time, utf8String
}:
cabal.mkDerivation (self: {
@ -10,9 +10,9 @@ cabal.mkDerivation (self: {
isLibrary = true;
isExecutable = true;
buildDepends = [
binary binaryShared deepseq glib gtk gtksourceview2 hslogger
leksahServer ltk mtl network parsec processLeksah regexBase
regexTdfa strict time utf8String
binary binaryShared Cabal deepseq filepath glib gtk gtksourceview2
hslogger leksahServer ltk mtl network parsec processLeksah
regexBase regexTdfa strict time utf8String
];
noHaddock = true;
meta = {

14
pkgs/applications/graphics/djview/default.nix
View file

@ -1,14 +1,18 @@
{stdenv, fetchurl, djvulibre, qt4 }:
{stdenv, fetchurl, djvulibre, qt4, pkgconfig }:
stdenv.mkDerivation {
name = "djview4-4.1-2";
stdenv.mkDerivation rec {
name = "djview-4.8";
src = fetchurl {
url = mirror://sf/djvu/djview4-4.1-2.tar.gz;
sha256 = "10k0h892kab3n8xypw6vsnvhwil410hvvqj375pwiss4vlm5isv1";
url = "mirror://sourceforge/djvu/${name}.tar.gz";
sha256 = "17y8jvbvj98h25qwsr93v24x75famv8d0jbb0h46xjj555y6wx4c";
};
buildInputs = [djvulibre qt4];
buildNativeInputs = [ pkgconfig ];
patches = [ ./djview4-qt-4.8.patch ];
passthru = {
mozillaPlugin = "/lib/netscape/plugins";
};

38
pkgs/applications/graphics/djview/djview4-qt-4.8.patch Normal file
View file

@ -0,0 +1,38 @@
Origin: OpenSUSE
Index: djview-4.8/src/qdjvuwidget.cpp
===================================================================
--- djview-4.8.orig/src/qdjvuwidget.cpp
+++ djview-4.8/src/qdjvuwidget.cpp
@@ -153,7 +153,7 @@ all_numbers(const char *s)
}
template<class T> static inline void
-swap(T& x, T& y)
+myswap(T& x, T& y)
{
T tmp;
tmp = x;
@@ -173,11 +173,11 @@ ksmallest(T *v, int n, int k)
/* Sort v[lo], v[m], v[hi] by insertion */
m = (lo+hi)/2;
if (v[lo]>v[m])
- swap(v[lo],v[m]);
+ myswap(v[lo],v[m]);
if (v[m]>v[hi]) {
- swap(v[m],v[hi]);
+ myswap(v[m],v[hi]);
if (v[lo]>v[m])
- swap(v[lo],v[m]);
+ myswap(v[lo],v[m]);
}
/* Extract pivot, place sentinel */
pivot = v[m];
@@ -191,7 +191,7 @@ ksmallest(T *v, int n, int k)
do ++l; while (v[l]<pivot);
do --h; while (v[h]>pivot);
if (l < h) {
- swap(v[l],v[h]);
+ myswap(v[l],v[h]);
goto loop;
}
/* Finish up */

4
pkgs/applications/graphics/gimp/default.nix
View file

@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
name = "gimp-2.6.11";
name = "gimp-2.6.12";
src = fetchurl {
url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
sha256 = "18dhgicc3f04q0js521kq9w3gq8yqawpf6vdb7m14f9vh380hvcv";
sha256 = "0qpcgaa4pdqqhyyy8vjvzfflxgsrrs25zk79gixzlnbzq3qwjlym";
};
buildInputs = [

22
pkgs/applications/graphics/hugin/default.nix
View file

@ -1,25 +1,29 @@
{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost,
pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc, mesa, freeglut,
glew, libXmu, libXi }:
{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost
, pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc, mesa
, freeglut, glew, libXmu, libXi, tclap }:
stdenv.mkDerivation rec {
name = "hugin-2010.4.0";
name = "hugin-2011.4.0";
src = fetchurl {
url = "mirror://sourceforge/hugin/${name}.tar.bz2";
sha256 = "13n3p4f39mbdydsjqy48csjgvv30lfcwvln5y5dyy95lyrfwcp6l";
sha256 = "1bnxljgqxzfdz14l7y29wzi52x1a38mghsjavnr28fr4vfmqwjrf";
};
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
NIX_LDFLAGS = "-lrt";
#NIX_LDFLAGS = "-lrt";
buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig
buildInputs = [ panotools wxGTK libtiff libpng openexr boost tclap
exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ];
buildNativeInputs = [ cmake pkgconfig ];
propagatedUserEnvPackages = [ enblendenfuse autopanosiftc ];
postInstall = ''
ensureDir "$out/nix-support"
echo "${enblendenfuse} ${autopanosiftc}" > $out/nix-support/propagated-user-env-packages
mkdir -p "$out/nix-support"
echo $propagatedUserEnvPackages > $out/nix-support/propagated-user-env-packages
'';
meta = {

9
pkgs/applications/graphics/paraview/default.nix
View file

@ -7,10 +7,10 @@
}:
stdenv.mkDerivation rec {
name = "paraview-3.10.1";
name = "paraview-3.12.0";
src = fetchurl {
url = "http://www.paraview.org/files/v3.10/ParaView-3.10.1.tar.gz";
sha256 = "1z2wvywpd3rvz4jhfs3mi35hsx4yqkdim58d075jx9kg7gifwga5";
url = "http://www.paraview.org/files/v3.12/ParaView-3.12.0.tar.gz";
sha256 = "0n0n0hrv02rd9rb63z4baalf40m8v870027mr47b93scgp18qyim";
};
# [ 5%] Generating vtkGLSLShaderLibrary.h
@ -32,8 +32,7 @@ stdenv.mkDerivation rec {
# "-DPYTHON_LIBRARY="
];
# I don't enable it due to memory bounds
enableParallelBuilding = false;
enableParallelBuilding = true;
buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa ];

13
pkgs/applications/misc/ikiwiki/default.nix
View file

@ -1,10 +1,9 @@
{ stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick, YAML
, TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate
, CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple
, gitSupport ? false
, git ? null
, monotoneSupport ? false
, monotone ? null
, YAMLLibYAML
, gitSupport ? false, git ? null
, monotoneSupport ? false, monotone ? null
, extraUtils ? []
}:
@ -13,19 +12,19 @@ assert monotoneSupport -> (monotone != null);
let
name = "ikiwiki";
version = "3.20120115";
version = "3.20120202";
in
stdenv.mkDerivation {
name = "${name}-${version}";
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
sha256 = "3145372b3d86068f90348a96f9daf3a3b438d747be0e977358d82ee752499c1f";
sha256 = "0bada9a98e0990c6d99e8ca978e42926578aec36d033d6a273e415349a6cbb48";
};
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
RpcXML XMLSimple PerlMagick YAML]
RpcXML XMLSimple PerlMagick YAML YAMLLibYAML ]
++ stdenv.lib.optionals gitSupport [git]
++ stdenv.lib.optionals monotoneSupport [monotone];

7
pkgs/applications/misc/xmobar/default.nix
View file

@ -1,4 +1,5 @@
{ cabal, libXrandr, mtl, parsec, stm, time, utf8String, X11, X11Xft
{ cabal, Cabal, filepath, libXrandr, mtl, parsec, stm, time
, utf8String, X11, X11Xft
}:
cabal.mkDerivation (self: {
@ -7,7 +8,9 @@ cabal.mkDerivation (self: {
sha256 = "1y26b2a5v9hxv1zmjcb4m8j9qkqdn74mqc3q58vgp5cav45rphvh";
isLibrary = false;
isExecutable = true;
buildDepends = [ mtl parsec stm time utf8String X11 X11Xft ];
buildDepends = [
Cabal filepath mtl parsec stm time utf8String X11 X11Xft
];
extraLibraries = [ libXrandr ];
configureFlags = "-fwith_xft";
meta = {

6
pkgs/applications/networking/browsers/firefox/10.0.nix
View file

@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "10.0";
firefoxVersion = "10.0.1";
xulVersion = "10.0"; # this attribute is used by other packages
xulVersion = "10.0.1"; # this attribute is used by other packages
src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "cbf1fb0efe0a3a2b2dafaa324b136736e93de70c";
sha1 = "8613957db84e6722ccf1ebf74fab927139614bfc";
};
commonConfigureFlags =

4
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View file

@ -23,8 +23,8 @@
stdenv.mkDerivation {
name = "pidgin-2.9.0";
src = fetchurl {
url = mirror://sourceforge/pidgin/pidgin-2.9.0.tar.bz2;
sha256 = "1mygaap7cbak9n9zm4wshxnvb27a68w633d712vy2knr8z78xvi8";
url = mirror://sourceforge/pidgin/pidgin-2.10.1.tar.bz2;
sha256 = "2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8";
};
inherit nss ncurses;

10
pkgs/applications/networking/linphone/default.nix
View file

@ -2,16 +2,18 @@
readline, ffmpeg, alsaLib, SDL, libv4l, libtheora, libXv }:
stdenv.mkDerivation rec {
name = "linphone-3.4.3";
name = "linphone-3.5.0";
src = fetchurl {
url = "mirror://savannah/linphone/3.4.x/sources/${name}.tar.gz";
sha256 = "14k655z0kfmnm42nxhsl25rjim9swrr4kpnplkx3pd9b3yha1rwj";
url = "mirror://savannah/linphone/3.5.x/sources/${name}.tar.gz";
sha256 = "1jrgsyx2mn6y50hjfx79fzqhp42r78cjr63w3bfjdl258zy2f6ix";
};
buildInputs = [ intltool pkgconfig gtk libglade libosip libexosip speex readline
buildInputs = [ intltool gtk libglade libosip libexosip speex readline
ffmpeg alsaLib SDL libv4l libtheora libXv ];
buildNativeInputs = [ pkgconfig ];
meta = {
homepage = http://www.linphone.org/;
description = "Open Source video SIP softphone";

5
pkgs/applications/networking/mailreaders/notmuch/default.nix
View file

@ -58,9 +58,8 @@ stdenv.mkDerivation rec {
'';
# XXX: emacs tests broken
#postBuild = ''
# make test
#'';
doCheck = false;
checkTarget = "test";
meta = {
description = "Notmuch -- The mail indexer";

6
pkgs/applications/networking/newsreaders/kwooty/default.nix
View file

@ -5,14 +5,14 @@
, unrar, p7zip, par2cmdline, coreutils
}:
let version = "0.8.0";
let version = "0.8.1";
name = "kwooty-${version}";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/kwooty/${name}.tar.gz";
sha256 = "bb50fb9b3d6c973f2abee62cfc11a7086900a4b676c12bf4e0a2adc170a977fc";
sha256 = "746ed50ec3c067711932c89dc3ee5527c126f37c6922b3eda49535eb83c245e4";
};
patches = [ ./searchPath.patch ];
@ -33,6 +33,6 @@ in stdenv.mkDerivation {
];
meta = with stdenv.lib; {
description = "Binary news reader for KDE";
description = "Binary news reader of KDE";
};
}

16
pkgs/applications/networking/p2p/tribler/default.nix
View file

@ -1,14 +1,15 @@
{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }:
{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools
, enablePlayer ? false, vlc ? null }:
let rev = "22523"; in
let rev = "24912"; in
stdenv.mkDerivation {
name = "tribler-5.4.3-pre${rev}";
name = "tribler-5.5.13-pre${rev}";
src = fetchsvn {
url = http://svn.tribler.org/abc/branches/release-5.4.x;
url = http://svn.tribler.org/abc/branches/release-5.5.x;
inherit rev;
sha256 = "09hscrnl50s9qncklnqqzwxwvidl3hj7hr7qsysmv6sw7b9rbx0g";
sha256 = "1x4rf83gsxif7fwx7p4crfji52i5y8rp54qfv1lbyxr8dfqjx83g";
};
buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ];
@ -34,7 +35,10 @@ stdenv.mkDerivation {
--set _TRIBLERPATH $out/share/tribler \
--set PYTHONPATH $out/share/tribler:$program_PYTHONPATH \
--run 'cd $_TRIBLERPATH' \
--add-flags "-O $out/share/tribler/Tribler/Main/tribler.py"
--add-flags "-O $out/share/tribler/Tribler/Main/tribler.py" \
${stdenv.lib.optionalString enablePlayer ''
--prefix LD_LIBRARY_PATH : ${vlc}/lib
''}
'';
meta = {

27
pkgs/applications/office/calligra/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ stdenv, fetchurl, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa
, kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2
, fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, popplerQt4
, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies }:
stdenv.mkDerivation rec {
name = "calligra-2.3.87";
src = fetchurl {
url = "mirror://kde/unstable/${name}/${name}.tar.bz2";
sha256 = "1arrk2ww3bykv4y8fsn1dn25gq9bf7a4ygggkrczfrxlbv1s9p9v";
};
buildNativeInputs = [ cmake perl pkgconfig ];
buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs
createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype
sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl
shared_desktop_ontologies ];
meta = {
description = "A Qt/KDE office suite, formely known as koffice";
homepage = http://calligra.org;
maintainers = [ stdenv.lib.maintainers.urkud ];
inherit (kdelibs.meta) platforms;
};
}

4
pkgs/applications/office/hledger-interest/default.nix
View file

@ -1,4 +1,4 @@
{ cabal, hledgerLib, mtl, time }:
{ cabal, Cabal, hledgerLib, mtl, time }:
cabal.mkDerivation (self: {
pname = "hledger-interest";
@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "0lm4jcxcig3yxzhbnka1q54fvshn5b9d91a5a2mbmkzbwhzjj0lg";
isLibrary = false;
isExecutable = true;
buildDepends = [ hledgerLib mtl time ];
buildDepends = [ Cabal hledgerLib mtl time ];
meta = {
homepage = "http://github.com/peti/hledger-interest";
description = "computes interest for a given account";

12
pkgs/applications/office/kmymoney/default.nix
View file

@ -1,20 +1,20 @@
{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext,
shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }:
{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, pkgconfig
, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }:
stdenv.mkDerivation rec {
name = "kmymoney-4.6.1";
name = "kmymoney-4.6.2";
src = fetchurl {
url = "mirror://sourceforge/kmymoney2/${name}.tar.bz2";
sha256 = "0ympq70z0a9zrs623jznj6hnjph2rdhpra0np2mqm1mmy72bkjjz";
sha256 = "0x9bl4h2mk8dv49nnn7drv528fnl5ynvvyy7q4m22k0d5yxarn5d";
};
buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical ];
buildNativeInputs = [ cmake automoc4 gettext shared_mime_info ];
buildNativeInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ];
KDEDIRS = libalkimia;
patches = [ ./qgpgme.patch ];
patches = [ ./qgpgme.patch ./qt-4.8.patch ];
meta = {
homepage = http://kmymoney2.sourceforge.net/;

32
pkgs/applications/office/kmymoney/qt-4.8.patch Normal file
View file

@ -0,0 +1,32 @@
From: Christoph Feck <christoph@maxiom.de>
Date: Thu, 10 Nov 2011 11:34:20 +0000
Subject: Fix compile with Qt 4.8
X-Git-Url: http://quickgit.kde.org/?p=kmymoney.git&amp;a=commitdiff&amp;h=8324cfb9657d8c03f83691402386e8c5bfb29981
---
Fix compile with Qt 4.8
Sideported commits f42a0a3d878afebb298609c9886851858c56cc15 and
fe74b25bf3b78c42e95569fe467a397876bc9c04 from massif-visualizer
---
--- a/libkdchart/src/KDChartBackgroundAttributes.cpp
+++ b/libkdchart/src/KDChartBackgroundAttributes.cpp
@@ -22,6 +22,7 @@
#include "KDChartBackgroundAttributes.h"
#include <QPixmap>
+#include <QVariant>
#include <KDABLibFakes>
@@ -150,7 +151,7 @@ QDebug operator<<(QDebug dbg, const KDCh
<< "visible="<<ba.isVisible()
<< "brush="<<ba.brush()
<< "pixmapmode="<<ba.pixmapMode()
- << "pixmap="<<ba.pixmap()
+ << "pixmap="<<QVariant(ba.pixmap())
<< ")";
return dbg;
}

7
pkgs/applications/office/openoffice/libreoffice.nix
View file

@ -6,10 +6,13 @@
, libXinerama, openssl, gperf, cppunit, GConf, ORBit2
, autoconf, openldap, postgresql, bash
, langs ? [ "en-US" "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ]
, force ? false
}:
throw "The expression for libreoffice is still not ready"
if !force then
throw ''The expression for libreoffice is still not ready.
Set config.libreoffice.force = true; if you want to try it anyway.''
else
stdenv.mkDerivation rec {
name = "libreoffice-3.4.5.2";

4
pkgs/applications/science/math/wxmaxima/default.nix
View file

@ -2,14 +2,14 @@
let
name = "wxmaxima";
version = "11.08.0";
version = "12.01.0";
in
stdenv.mkDerivation {
name = "${name}-${version}";
src = fetchurl {
url = "mirror://sourceforge/${name}/wxMaxima-${version}.tar.gz";
sha256 = "dfa25cc15de52829a93da624d42344213cc979351b5fcd3dff2afed6738832df";
sha256 = "358cdafe81b7e7290f6bb8c93580b0e2f0ae5a4d148a476e5af375aa9bf77054";
};
buildInputs = [wxGTK maxima makeWrapper];

11
pkgs/applications/version-management/darcs/default.nix
View file

@ -1,6 +1,6 @@
{ cabal, curl, extensibleExceptions, hashedStorage, haskeline, html
, HTTP, mmap, mtl, network, parsec, random, regexCompat, tar
, terminfo, text, zlib
{ cabal, Cabal, curl, extensibleExceptions, filepath, hashedStorage
, haskeline, html, HTTP, mmap, mtl, network, parsec, random
, regexCompat, tar, terminfo, text, zlib
}:
cabal.mkDerivation (self: {
@ -10,8 +10,9 @@ cabal.mkDerivation (self: {
isLibrary = true;
isExecutable = true;
buildDepends = [
extensibleExceptions hashedStorage haskeline html HTTP mmap mtl
network parsec random regexCompat tar terminfo text zlib
Cabal extensibleExceptions filepath hashedStorage haskeline html
HTTP mmap mtl network parsec random regexCompat tar terminfo text
zlib
];
extraLibraries = [ curl ];
meta = {

6
pkgs/applications/version-management/git-and-tools/svn2git/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchgit, ruby, makeWrapper, git }:
stdenv.mkDerivation rec {
name = "svn2git-2.1.0-20111206";
name = "svn2git-2.2.0";
src = fetchgit {
url = https://github.com/nirvdrum/svn2git;
rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848";
sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca";
rev = "db0769835e9d1d3ff324091a3bb7756200a09932";
sha256 = "6d2f2acb9900e2aa8e608d3239b42f890f2334b622adb5ea33b2b4815a52efa2";
};
buildInputs = [ ruby makeWrapper ];

4
pkgs/applications/version-management/subversion/default.nix
View file

@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport;
stdenv.mkDerivation rec {
version = "1.7.2";
version = "1.7.3";
name = "subversion-${version}";
src = fetchurl {
url = "mirror://apache/subversion//${name}.tar.bz2";
sha1 = "8c0824aeb7f42da1ff4f7cd296877af7f59812bb";
sha1 = "624d4070361c0e8d7cf4f5c667629e72459b122d";
};
buildInputs = [ zlib apr aprutil sqlite ]

25
pkgs/applications/video/vlc/default.nix
View file

@ -19,20 +19,23 @@ stdenv.mkDerivation rec {
sha256 = "1h93jdx89dfgxlnw66lfcdk9kisadm689zanvgkzbfb3si2frv83";
};
buildInputs = [
perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
libkate libtiger libv4l samba liboggz libass libdvbpsi
]
++ (with xlibs; [ xlibs.xlibs libXv libXvMC libXpm xcbutil libva ]);
buildInputs =
[ perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
libkate libtiger libv4l samba liboggz libass libdvbpsi libva
xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
];
buildNativeInputs = [ pkgconfig ];
configureFlags = [ "--enable-alsa"
"--with-kde-solid=$out/share/apps/solid/actions"
];
configureFlags =
[ "--enable-alsa"
"--with-kde-solid=$out/share/apps/solid/actions"
];
enableParallelBuilding = true;
preBuild = ''
substituteInPlace modules/misc/freetype.c --replace \

6
pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
View file

@ -1,5 +1,5 @@
{ cabal, extensibleExceptions, mtl, random, utf8String, X11, X11Xft
, xmonad
{ cabal, Cabal, extensibleExceptions, mtl, random, utf8String, X11
, X11Xft, xmonad
}:
cabal.mkDerivation (self: {
@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
version = "0.10";
sha256 = "0lp7qr69rpjy4s3knhdgh2bp6zs81xp0az1lisv4a2i7i1ys7hfq";
buildDepends = [
extensibleExceptions mtl random utf8String X11 X11Xft xmonad
Cabal extensibleExceptions mtl random utf8String X11 X11Xft xmonad
];
meta = {
homepage = "http://xmonad.org/";

6
pkgs/applications/window-managers/xmonad/xmonad-extras.nix
View file

@ -1,4 +1,4 @@
{ cabal, hint, HList, libmpd, mtl, network, parsec, random
{ cabal, Cabal, hint, HList, libmpd, mtl, network, parsec, random
, regexPosix, split, X11, xmonad, xmonadContrib
}:
@ -7,8 +7,8 @@ cabal.mkDerivation (self: {
version = "0.10.1";
sha256 = "17rac0xjw1zw1jlc1rpq54vg50xscb3b98knk4gkb8bv1khpgz27";
buildDepends = [
hint HList libmpd mtl network parsec random regexPosix split X11
xmonad xmonadContrib
Cabal hint HList libmpd mtl network parsec random regexPosix split
X11 xmonad xmonadContrib
];
noHaddock = true;
meta = {

59
pkgs/build-support/vm/default.nix
View file

@ -166,6 +166,7 @@ rec {
halt -d -p -f
'';
initrd = makeInitrd {
contents = [
{ object = stage1Init;
@ -961,6 +962,30 @@ rec {
packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ];
};
fedora16i386 = {
name = "fedora-16-i386";
fullName = "Fedora 16 (i386)";
packagesList = fetchurl {
url = mirror://fedora/linux/releases/16/Everything/i386/os/repodata/8d5e9b291748d8254e1e66ad2d35bdb7e020d8c2c6a84f928595597b7e546118-primary.xml.gz;
sha256 = "8d5e9b291748d8254e1e66ad2d35bdb7e020d8c2c6a84f928595597b7e546118";
};
urlPrefix = mirror://fedora/linux/releases/16/Everything/i386/os;
archs = ["noarch" "i386" "i586" "i686"];
packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
};
fedora16x86_64 = {
name = "fedora-16-x86_64";
fullName = "Fedora 16 (x86_64)";
packagesList = fetchurl {
url = mirror://fedora/linux/releases/16/Everything/x86_64/os/repodata/3fffacc6006d9b4782e57f3f11fcb44ab2a1abf6625e4afb4bf6a1e6475dd107-primary.xml.gz;
sha256 = "3fffacc6006d9b4782e57f3f11fcb44ab2a1abf6625e4afb4bf6a1e6475dd107";
};
urlPrefix = mirror://fedora/linux/releases/16/Everything/x86_64/os;
archs = ["noarch" "x86_64"];
packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
};
opensuse103i386 = {
name = "opensuse-10.3-i586";
fullName = "openSUSE 10.3 (i586)";
@ -1175,6 +1200,28 @@ rec {
packages = commonDebPackages ++ [ "diffutils" ];
};
ubuntu1110i386 = {
name = "ubuntu-11.10-oneiric-i386";
fullName = "Ubuntu 11.10 Oneiric (i386)";
packagesList = fetchurl {
url = mirror://ubuntu/dists/oneiric/main/binary-i386/Packages.bz2;
sha256 = "11r1s76ppi7rwz08i20d7n4ndaj9lb9wsl9k8ww4s1c6agzpwv8a";
};
urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diffutils" ];
};
ubuntu1110x86_64 = {
name = "ubuntu-11.10-oneiric-amd64";
fullName = "Ubuntu 11.10 Oneiric (amd64)";
packagesList = fetchurl {
url = mirror://ubuntu/dists/oneiric/main/binary-amd64/Packages.bz2;
sha256 = "07k784gxwaqmyggmzczy9hjkgfp6p6dcs8rhkxw5hfzn0jaf8l2s";
};
urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diffutils" ];
};
debian40i386 = {
name = "debian-4.0r9-etch-i386";
fullName = "Debian 4.0r9 Etch (i386)";
@ -1220,22 +1267,22 @@ rec {
};
debian60i386 = {
name = "debian-6.0.3-squeeze-i386";
fullName = "Debian 6.0.3 Squeeze (i386)";
name = "debian-6.0.4-squeeze-i386";
fullName = "Debian 6.0.4 Squeeze (i386)";
packagesList = fetchurl {
url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2;
sha1 = "90a55b6bb049d0777d06d5b28a1848b38678426b";
sha256 = "5686732aa690d80ba4c390af3f7b9ba3c3c8c17861c89bca3a3694c403d7b7e6";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};
debian60x86_64 = {
name = "debian-6.0.3-squeeze-amd64";
fullName = "Debian 6.0.3 Squeeze (amd64)";
name = "debian-6.0.4-squeeze-amd64";
fullName = "Debian 6.0.4 Squeeze (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2;
sha1 = "071626063ab0a70f10200e2e27a5c7fae29fa4ad";
sha256 = "525f919bb48a4d2d0cb3a4fb5b0d4338e7936f68753ca945358ea1c3792ea7b7";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;

7
pkgs/desktops/kde-4.8/kdepim-runtime.nix
View file

@ -5,6 +5,13 @@ kde {
buildInputs = [ kdepimlibs akonadi boost shared_desktop_ontologies libxml2
libxslt ];
patches = map fetchurl [ {
# See https://bugs.kde.org/show_bug.cgi?id=289932
url = "http://bugsfiles.kde.org/attachment.cgi?id=68763";
name = "delays-in-nepomuk-indexing.patch";
sha256 = "0j3ndqwvi4bg789jb0wqsh2zpwi1gwdyng9gdmng189dx409jf85";
} ];
meta = {
description = "KDE PIM runtime";
license = "GPL";

4
pkgs/development/compilers/Agda-executable/default.nix
View file

@ -1,4 +1,4 @@
{ cabal, Agda }:
{ cabal, Agda, Cabal }:
cabal.mkDerivation (self: {
pname = "Agda-executable";
@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "1n1ak6z2vh356k9mk0zkiv6dqp9dvx97a7r21b0xnhwkmh3f8p5p";
isLibrary = false;
isExecutable = true;
buildDepends = [ Agda ];
buildDepends = [ Agda Cabal ];
meta = {
homepage = "http://wiki.portal.chalmers.se/agda/";
description = "Command-line program for type-checking and compiling Agda programs";

4
pkgs/development/compilers/epic/default.nix
View file

@ -1,4 +1,4 @@
{ cabal, boehmgc, gmp, happy, mtl }:
{ cabal, boehmgc, Cabal, gmp, happy, mtl }:
cabal.mkDerivation (self: {
pname = "epic";
@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "1irvfk8xf627bfzsgbqa56816jkc99rrxpml9ycg2grq7razp9fw";
isLibrary = true;
isExecutable = true;
buildDepends = [ mtl ];
buildDepends = [ Cabal mtl ];
buildTools = [ happy ];
extraLibraries = [ boehmgc gmp ];
meta = {

7
pkgs/development/compilers/idris/default.nix
View file

@ -1,4 +1,5 @@
{ cabal, binary, epic, happy, haskeline, mtl, parsec, transformers
{ cabal, binary, Cabal, epic, filepath, happy, haskeline, mtl
, parsec, transformers
}:
cabal.mkDerivation (self: {
@ -7,7 +8,9 @@ cabal.mkDerivation (self: {
sha256 = "1yvw15750mqrvq1kd7bsk3ldq3s0z947c4f93pv7008gq5im4cvr";
isLibrary = false;
isExecutable = true;
buildDepends = [ binary epic haskeline mtl parsec transformers ];
buildDepends = [
binary Cabal epic filepath haskeline mtl parsec transformers
];
buildTools = [ happy ];
noHaddock = true;
meta = {

3
pkgs/development/compilers/nvidia-cg-toolkit/default.nix
View file

@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
ensureDir "$out/lib/"
[ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/"
[ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/"
for mandir in man1 man3 manCg manCgFX
for mandir in man1 man3 \
${if stdenv.system == "x86_64-linux" then "manCg" else ""} manCgFX
do
ensureDir "$out/share/man/$mandir/"
cp -v share/man/$mandir/* "$out/share/man/$mandir/"

12
pkgs/development/interpreters/guile/default.nix
View file

@ -6,7 +6,7 @@
then coverageAnalysis
else stdenv.mkDerivation)
rec {
(rec {
name = "guile-2.0.5";
src = fetchurl {
@ -69,3 +69,13 @@ rec {
platforms = stdenv.lib.platforms.all;
};
}
//
(if stdenv.isFreeBSD
then {
# XXX: Thread support is currently broken on FreeBSD (namely the
# `SCM_I_IS_THREAD' assertion in `scm_spawn_thread' is hit.)
configureFlags = [ "--without-threads" ];
}
else {}))

113
pkgs/development/interpreters/ruby/generated.nix
View file

@ -3,7 +3,7 @@
g: # Get dependencies from patched gems
{
aliases = {
ZenTest = g.ZenTest_4_5_0;
ZenTest = g.ZenTest_4_6_2;
actionmailer = g.actionmailer_3_2_1;
actionpack = g.actionpack_3_2_1;
activemodel = g.activemodel_3_2_1;
@ -12,13 +12,16 @@ g: # Get dependencies from patched gems
activesupport = g.activesupport_3_2_1;
arel = g.arel_3_0_0;
atoulme_Antwrap = g.atoulme_Antwrap_0_7_1;
autotest_rails = g.autotest_rails_4_1_1;
autotest_rails = g.autotest_rails_4_1_2;
builder = g.builder_3_0_0;
buildr = g.buildr_1_4_6;
bundler = g.bundler_1_0_21;
childprocess = g.childprocess_0_3_0;
bundler = g.bundler_1_0_22;
childprocess = g.childprocess_0_3_1;
coffee_script = g.coffee_script_2_2_0;
coffee_script_source = g.coffee_script_source_1_2_0;
diff_lcs = g.diff_lcs_1_1_3;
erubis = g.erubis_2_7_0;
execjs = g.execjs_1_3_0;
ffi = g.ffi_1_0_11;
highline = g.highline_1_5_1;
hike = g.hike_1_2_1;
@ -50,9 +53,9 @@ g: # Get dependencies from patched gems
rspec_expectations = g.rspec_expectations_2_1_0;
rspec_mocks = g.rspec_mocks_2_1_0;
rubyforge = g.rubyforge_2_0_4;
rubyzip = g.rubyzip_0_9_5;
sass = g.sass_3_1_13;
selenium_webdriver = g.selenium_webdriver_2_18_0;
rubyzip = g.rubyzip_0_9_6_1;
sass = g.sass_3_1_15;
selenium_webdriver = g.selenium_webdriver_2_19_0;
sprockets = g.sprockets_2_1_2;
thor = g.thor_0_14_6;
tilt = g.tilt_1_3_3;
@ -60,13 +63,13 @@ g: # Get dependencies from patched gems
tzinfo = g.tzinfo_0_3_31;
xml_simple = g.xml_simple_1_0_12;
};
gem_nix_args = [ ''autotest-rails'' ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ];
gem_nix_args = [ ''autotest-rails'' ''buildr'' ''coffee-script'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ];
gems = {
ZenTest_4_5_0 = {
ZenTest_4_6_2 = {
basename = ''ZenTest'';
meta = {
description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby'';
homepage = ''http://www.zenspider.com/ZSS/Products/ZenTest/'';
homepage = ''https://github.com/seattlerb/zentest'';
longDescription = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and
multiruby.
@ -77,6 +80,8 @@ tool anymore but it is the package namesake, so it stays.
unit_diff is a command-line filter to diff expected results from
actual results and allow you to quickly see exactly what is wrong.
Do note that minitest 2.2+ provides an enhanced assert_equal obviating
the need for unit_diff
autotest is a continous testing facility meant to be used during
development. As soon as you save a file, autotest will run the
@ -86,9 +91,9 @@ multiruby runs anything you want on multiple versions of ruby. Great
for compatibility checking! Use multiruby_setup to manage your
installed versions.'';
};
name = ''ZenTest-4.5.0'';
name = ''ZenTest-4.6.2'';
requiredGems = [ ];
sha256 = ''05iam95wqafz4c890b17w7ahp9i4jbz4hsw6304p9zbsaq7d7h1h'';
sha256 = ''0knbim1lvp7q7k529if3h78584x845h9xyz08vykrdqa97x4lkh0'';
};
actionmailer_3_2_1 = {
basename = ''actionmailer'';
@ -153,7 +158,7 @@ installed versions.'';
longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
};
name = ''activesupport-3.2.1'';
requiredGems = [ g.i18n_0_6_0 g.multi_json_1_0_4 ];
requiredGems = [ g.i18n_0_6_0 ];
sha256 = ''0ajkzsa7467jp7lxgjcsl94nqkvw9d0h492rypljs0f8f1fn744v'';
};
arel_3_0_0 = {
@ -196,7 +201,7 @@ database compatibility and query generation.'';
requiredGems = [ g.rjb_1_3_9 ];
sha256 = ''0r9jy2asyma8h0878nhjfbi00qvb4yapc8glngvmkkj21zbx2mfy'';
};
autotest_rails_4_1_1 = {
autotest_rails_4_1_2 = {
basename = ''autotest_rails'';
meta = {
description = ''This is an autotest plugin to provide rails support'';
@ -204,9 +209,9 @@ database compatibility and query generation.'';
longDescription = ''This is an autotest plugin to provide rails support. It provides basic
rails support and extra plugins for migrations and fixtures.'';
};
name = ''autotest-rails-4.1.1'';
requiredGems = [ g.ZenTest_4_5_0 ];
sha256 = ''09i6mpxibs8yfdcr53nazlxq94yswahz9gdjqdz9srfshcccqbal'';
name = ''autotest-rails-4.1.2'';
requiredGems = [ g.ZenTest_4_6_2 ];
sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4'';
};
builder_2_1_2 = {
basename = ''builder'';
@ -251,27 +256,55 @@ for those one-off tasks, with a language that's a joy to use.
requiredGems = [ g.rake_0_8_7 g.builder_2_1_2 g.net_ssh_2_0_23 g.net_sftp_2_0_4 g.rubyzip_0_9_4 g.highline_1_5_1 g.json_pure_1_4_3 g.rubyforge_2_0_3 g.hoe_2_3_3 g.rjb_1_3_3 g.atoulme_Antwrap_0_7_1 g.diff_lcs_1_1_2 g.rspec_expectations_2_1_0 g.rspec_mocks_2_1_0 g.rspec_core_2_1_0 g.rspec_2_1_0 g.xml_simple_1_0_12 g.minitar_0_5_3 ];
sha256 = ''11qwqrdnmzzi4zhgajfq1f1ckvd4kpfm9gyqrfjfalphs4gi0vxz'';
};
bundler_1_0_21 = {
bundler_1_0_22 = {
basename = ''bundler'';
meta = {
description = ''The best way to manage your application's dependencies'';
homepage = ''http://gembundler.com'';
longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
};
name = ''bundler-1.0.21'';
name = ''bundler-1.0.22'';
requiredGems = [ ];
sha256 = ''0lcxz75vvgqib43wxzv6021qs5d7bxhnds4j4q27hzqs982cn0s6'';
sha256 = ''0hzcsicdvvyhp6b6rv208859a13ag1cxxcd3nd3hf90jldd2iry0'';
};
childprocess_0_3_0 = {
childprocess_0_3_1 = {
basename = ''childprocess'';
meta = {
description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
homepage = ''http://github.com/jarib/childprocess'';
longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
};
name = ''childprocess-0.3.0'';
name = ''childprocess-0.3.1'';
requiredGems = [ g.ffi_1_0_11 ];
sha256 = ''1bvx6nkc1m24wjjybk943x1vjr51c98l0pwj73hj1r237307jyb4'';
sha256 = ''0phkpxvwz88kgbi4d2akiqbppf374kn2rwf64hfs99p1j1ksbw5l'';
};
coffee_script_2_2_0 = {
basename = ''coffee_script'';
meta = {
description = ''Ruby CoffeeScript Compiler'';
homepage = ''http://github.com/josh/ruby-coffee-script'';
longDescription = '' Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler.
'';
};
name = ''coffee-script-2.2.0'';
requiredGems = [ g.coffee_script_source_1_2_0 g.execjs_1_3_0 ];
sha256 = ''133cp4znfp44wwnv12myw8s0z6qws74ilqmw88iwzkshg689zpdc'';
};
coffee_script_source_1_2_0 = {
basename = ''coffee_script_source'';
meta = {
description = ''The CoffeeScript Compiler'';
homepage = ''http://jashkenas.github.com/coffee-script/'';
longDescription = '' CoffeeScript is a little language that compiles into JavaScript.
Underneath all of those embarrassing braces and semicolons,
JavaScript has always had a gorgeous object model at its heart.
CoffeeScript is an attempt to expose the good parts of JavaScript
in a simple way.
'';
};
name = ''coffee-script-source-1.2.0'';
requiredGems = [ ];
sha256 = ''13cpmlj2m5lyxipdxmnajy12bzwmgc6g2n090gpa0wd5am7xvhkp'';
};
diff_lcs_1_1_2 = {
basename = ''diff_lcs'';
@ -332,6 +365,18 @@ is the MIT license.'';
requiredGems = [ ];
sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3'';
};
execjs_1_3_0 = {
basename = ''execjs'';
meta = {
description = ''Run JavaScript code from Ruby'';
homepage = ''https://github.com/sstephenson/execjs'';
longDescription = '' ExecJS lets you run JavaScript code from Ruby.
'';
};
name = ''execjs-1.3.0'';
requiredGems = [ g.multi_json_1_0_4 ];
sha256 = ''1sski14wdzfljx2f9j7r09li3rxqwvink8n5v489ykw1sicg6l2s'';
};
ffi_1_0_11 = {
basename = ''ffi'';
meta = {
@ -633,7 +678,7 @@ request helpers feature.'';
longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
};
name = ''rails-3.2.1'';
requiredGems = [ g.activesupport_3_2_1 g.actionpack_3_2_1 g.activerecord_3_2_1 g.activeresource_3_2_1 g.actionmailer_3_2_1 g.railties_3_2_1 g.bundler_1_0_21 ];
requiredGems = [ g.activesupport_3_2_1 g.actionpack_3_2_1 g.activerecord_3_2_1 g.activeresource_3_2_1 g.actionmailer_3_2_1 g.railties_3_2_1 g.bundler_1_0_22 ];
sha256 = ''0fx5pmywvh0s263dd6qv34rbc4qxnla5qzh8r30zrip24j6w0nr5'';
};
railties_3_2_1 = {
@ -809,17 +854,17 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''1lc67ssqyz49rm1jms5sdvy6x41h070razxlmvj4j5q6w3qixx41'';
};
rubyzip_0_9_5 = {
rubyzip_0_9_6_1 = {
basename = ''rubyzip'';
meta = {
description = ''rubyzip is a ruby module for reading and writing zip files'';
homepage = ''http://github.com/aussiegeek/rubyzip'';
};
name = ''rubyzip-0.9.5'';
name = ''rubyzip-0.9.6.1'';
requiredGems = [ ];
sha256 = ''1744bds6lc46d1kjfgapf34p2574s70hcyz63877qkry4db2jb54'';
sha256 = ''0azmbbv5j7xx45rn3502vb01n1b2zczi1jk84aw9qc3y9fvkwc3i'';
};
sass_3_1_13 = {
sass_3_1_15 = {
basename = ''sass'';
meta = {
description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
@ -830,20 +875,20 @@ See RDoc for a description of RDoc's markup and basic use.'';
command line tool or a web-framework plugin.
'';
};
name = ''sass-3.1.13'';
name = ''sass-3.1.15'';
requiredGems = [ ];
sha256 = ''0x07yckw9c4d59713midk2n85d3h88fcp147p8nai88gbvrm8b63'';
sha256 = ''1lsmqm84w03w8s54i53cf3mplklpasakff2ng6zqf75digg27fzs'';
};
selenium_webdriver_2_18_0 = {
selenium_webdriver_2_19_0 = {
basename = ''selenium_webdriver'';
meta = {
description = ''The next generation developer focused tool for automated testing of webapps'';
homepage = ''http://selenium.googlecode.com'';
longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
};
name = ''selenium-webdriver-2.18.0'';
requiredGems = [ g.rubyzip_0_9_5 g.childprocess_0_3_0 ];
sha256 = ''17am2b6bjv62s02n1bfmhg9wz5n7sppzh7dx1llp28ivj2hdfbg9'';
name = ''selenium-webdriver-2.19.0'';
requiredGems = [ g.rubyzip_0_9_6_1 g.childprocess_0_3_1 ];
sha256 = ''1phhb8ivv203r4qs2nwxnkd6qmx02lj1xgsc5wkkm0gxl2lgz0ll'';
};
sprockets_2_1_2 = {
basename = ''sprockets'';

4
pkgs/development/libraries/apr-util/default.nix
View file

@ -6,11 +6,11 @@
assert bdbSupport -> db4 != null;
stdenv.mkDerivation rec {
name = "apr-util-1.3.12";
name = "apr-util-1.4.1";
src = fetchurl {
url = "mirror://apache/apr/${name}.tar.bz2";
md5 = "0f671b037ca62751a8a7005578085560";
md5 = "52b31b33fb1aa16e65ddaefc76e41151";
};
configureFlags = ''

4
pkgs/development/libraries/apr/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "apr-1.4.5";
name = "apr-1.4.6";
src = fetchurl {
url = "mirror://apache/apr/${name}.tar.bz2";
md5 = "8b53f5a5669d0597f2da889a2f576eb6";
md5 = "ffee70a111fd07372982b0550bbb14b7";
};
configureFlags =

33
pkgs/development/libraries/consolekit/commands.patch Normal file
View file

@ -0,0 +1,33 @@
This patch adds shutdown commands specific to NixOS, as NixOS does not have
a /sbin or /usr/sbin directory. In order not to have a dependency on the
package that provides "shutdown" when in an environment other than NixOS,
we'll make it depend on /var/run/current-system.
Note: this patch does not compromise system security. Other systems than
NixOS should have already shutdown in the earlier directories being searched,
and otherwise /var/run is writable only be root.
--- ConsoleKit-0.4.1/tools/linux/ck-system-restart.org 2012-02-13 11:29:57.352902568 +0100
+++ ConsoleKit-0.4.1/tools/linux/ck-system-restart 2012-02-13 11:43:27.593317712 +0100
@@ -7,6 +7,9 @@
elif [ -x "/usr/sbin/shutdown" ] ; then
/usr/sbin/shutdown -r now
exit $?
+elif [ -x "/var/run/current-system/sw/sbin/shutdown" ] ; then
+ /var/run/current-system/sw/sbin/shutdown -r now
+ exit $?
else
exit 1
fi
--- ConsoleKit-0.4.1/tools/linux/ck-system-stop.org 2012-02-13 11:30:06.228950934 +0100
+++ ConsoleKit-0.4.1/tools/linux/ck-system-stop 2012-02-13 11:44:12.664563304 +0100
@@ -7,6 +7,9 @@
elif [ -x "/usr/sbin/shutdown" ] ; then
/usr/sbin/shutdown -h now
exit $?
+elif [ -x "/var/run/current-system/sw/sbin/shutdown" ] ; then
+ /var/run/current-system/sw/sbin/shutdown -h now
+ exit $?
else
exit 1
fi

4
pkgs/development/libraries/consolekit/default.nix
View file

@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 polkit expat ];
patches = [ ./0001-Don-t-daemonize-when-activated.patch
./0002-Don-t-take-bus-name-until-ready.patch ];
./0002-Don-t-take-bus-name-until-ready.patch
./commands.patch # adds shutdown commands for NixOS to the list of shutdown commands
];
# For console-kit to get the rpath to libgcc_s, needed for pthread_cancel to work
NIX_LDFLAGS = "-lgcc_s";

6
pkgs/development/libraries/exosip/default.nix
View file

@ -1,10 +1,10 @@
{stdenv, fetchurl, libosip, openssl, pkgconfig }:
stdenv.mkDerivation rec {
version = "3.5.0";
version = "3.6.0";
src = fetchurl {
url = http://download.savannah.gnu.org/releases/exosip/libeXosip2-3.5.0.tar.gz;
sha256 = "1z0s8qxxvyaksnnb9srfi3aipkkb7c1rsxdywl9xyxgnlri0w0a6";
url = "http://download.savannah.gnu.org/releases/exosip/libeXosip2-${version}.tar.gz";
sha256 = "0r1mj8x5991bgwf03bx1ajn5kbbmw1136jabw2pn7dls9h41mnli";
};
name = "libexosip2-${version}";

4
pkgs/development/libraries/ffmpeg/default.nix
View file

@ -2,10 +2,10 @@
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, vorbisSupport ? false, libvorbis ? null
, vorbisSupport ? true, libvorbis ? null
, vpxSupport ? false, libvpx ? null
, x264Support ? true, x264 ? null
, xvidSupport ? false, xvidcore ? null
, xvidSupport ? true, xvidcore ? null
, faacSupport ? false, faac ? null
}:

15
pkgs/development/libraries/gtk+/3.2.x.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl_gnome, pkgconfig, glib, atk, pango, cairo, perl, xlibs
{ stdenv, fetchurl, pkgconfig, glib, atk, pango129, cairo, perl, xlibs
, gdk_pixbuf, xz
, xineramaSupport ? true
, cupsSupport ? true, cups ? null
@ -8,12 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null;
stdenv.mkDerivation rec {
name = src.pkgname;
name = "gtk+-3.2.3";
src = fetchurl_gnome {
project = "gtk+";
major = "3"; minor = "2"; patchlevel = "0"; extension = "xz";
sha256 = "0k6l5sw8njbnbapzm9v5jwlrrl7xv1b8c9lmqx97bzbapslw3qxw";
src = fetchurl {
url = mirror://gnome/sources/gtk+/3.2/gtk+-3.2.3.tar.xz;
sha256 = "0g8x2kcqq17bccm4yszim837saj73zfk66ia2azcgfqfa7r21kz2";
};
enableParallelBuilding = true;
@ -21,14 +20,12 @@ stdenv.mkDerivation rec {
buildNativeInputs = [ perl pkgconfig xz ];
propagatedBuildInputs =
[ xlibs.xlibs glib atk pango gdk_pixbuf cairo
[ xlibs.xlibs glib atk pango129 gdk_pixbuf cairo
xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
]
++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
++ stdenv.lib.optionals cupsSupport [ cups ];
configureFlags = "--with-xinput=yes";
postInstall = "rm -rf $out/share/gtk-doc";
meta = {

3
pkgs/development/libraries/haskell/AC-Vector/default.nix
View file

@ -1,9 +1,10 @@
{ cabal }:
{ cabal, Cabal }:
cabal.mkDerivation (self: {
pname = "AC-Vector";
version = "2.3.2";
sha256 = "04ahf6ldfhvzbml9xd6yplygn8ih7b8zz7cw03hkr053g5kzylay";
buildDepends = [ Cabal ];
meta = {
description = "Efficient geometric vectors and transformations";
license = self.stdenv.lib.licenses.bsd3;

8
pkgs/development/libraries/haskell/Agda/default.nix
View file

@ -1,5 +1,5 @@
{ cabal, alex, binary, happy, hashable, hashtables, haskeline
, haskellSrcExts, mtl, QuickCheck, syb, xhtml, zlib
{ cabal, alex, binary, Cabal, filepath, happy, hashable, hashtables
, haskeline, haskellSrcExts, mtl, QuickCheck, syb, xhtml, zlib
}:
cabal.mkDerivation (self: {
@ -9,8 +9,8 @@ cabal.mkDerivation (self: {
isLibrary = true;
isExecutable = true;
buildDepends = [
binary hashable hashtables haskeline haskellSrcExts mtl QuickCheck
syb xhtml zlib
binary Cabal filepath hashable hashtables haskeline haskellSrcExts
mtl QuickCheck syb xhtml zlib
];
buildTools = [ alex happy ];
meta = {

4
pkgs/development/libraries/haskell/AspectAG/default.nix
View file

@ -1,10 +1,10 @@
{ cabal, HList, mtl }:
{ cabal, Cabal, HList, mtl }:
cabal.mkDerivation (self: {
pname = "AspectAG";
version = "0.3.4.1";
sha256 = "12iaf27crynwnnd7qm1zvvaj6zw6i6c05mb4dsq55dnhph2l356g";
buildDepends = [ HList mtl ];
buildDepends = [ Cabal HList mtl ];
meta = {
homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/AspectAG";
description = "Attribute Grammars in the form of an EDSL";

3
pkgs/development/libraries/haskell/Boolean/default.nix
View file

@ -1,9 +1,10 @@
{ cabal }:
{ cabal, Cabal }:
cabal.mkDerivation (self: {
pname = "Boolean";
version = "0.0.1";
sha256 = "dafcfb2e9d7f7aa24a3d3ceb385424176297cdf6f6044028d42d0fea1cae7765";
buildDepends = [ Cabal ];
meta = {
description = "Generalized booleans";
license = self.stdenv.lib.licenses.bsd3;

18
pkgs/development/libraries/haskell/Cabal/1.14.0.nix Normal file
View file

@ -0,0 +1,18 @@
{ cabal, filepath }:
cabal.mkDerivation (self: {
pname = "Cabal";
version = "1.14.0";
sha256 = "1r5b4x1ham5gdg9m9l8idpvr9czlk1q21vqmg0di4adkp2fhlm3j";
buildDepends = [ filepath ];
meta = {
homepage = "http://www.haskell.org/cabal/";
description = "A framework for packaging Haskell software";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

6
pkgs/development/libraries/haskell/Chart/default.nix
View file

@ -1,5 +1,5 @@
{ cabal, cairo, colour, dataAccessor, dataAccessorTemplate, mtl
, time
{ cabal, Cabal, cairo, colour, dataAccessor, dataAccessorTemplate
, mtl, time
}:
cabal.mkDerivation (self: {
@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
version = "0.15";
sha256 = "1357gqn2ifalknl85n2z9ysf195dnaxm175rp0kmmzbf4vik9gc4";
buildDepends = [
cairo colour dataAccessor dataAccessorTemplate mtl time
Cabal cairo colour dataAccessor dataAccessorTemplate mtl time
];
meta = {
homepage = "http://www.dockerz.net/software/chart.html";

4
pkgs/development/libraries/haskell/ConfigFile/default.nix
View file

@ -1,4 +1,4 @@
{ cabal, MissingH, mtl, parsec }:
{ cabal, Cabal, MissingH, mtl, parsec }:
cabal.mkDerivation (self: {
pname = "ConfigFile";
@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "0w2yhbnqldhmj3d98j720l4lj4d08abqcff751p2slszdm5pw1jm";
isLibrary = true;
isExecutable = true;
buildDepends = [ MissingH mtl parsec ];
buildDepends = [ Cabal MissingH mtl parsec ];
noHaddock = true;
meta = {
homepage = "http://software.complete.org/configfile";

4
pkgs/development/libraries/haskell/CouchDB/default.nix
View file

@ -1,10 +1,10 @@
{ cabal, HTTP, json, mtl, network }:
{ cabal, Cabal, HTTP, json, mtl, network }:
cabal.mkDerivation (self: {
pname = "CouchDB";
version = "0.10.1";
sha256 = "1ny62ab0sjrkh7mpxj0ahqrv7c8dh0n5s1g8xl0mq3yiwlrjdsim";
buildDepends = [ HTTP json mtl network ];
buildDepends = [ Cabal HTTP json mtl network ];
meta = {
homepage = "http://github.com/arjunguha/haskell-couchdb/";
description = "CouchDB interface";

4
pkgs/development/libraries/haskell/Crypto/default.nix
View file

@ -1,4 +1,4 @@
{ cabal, HUnit, QuickCheck, random }:
{ cabal, Cabal, HUnit, QuickCheck, random }:
cabal.mkDerivation (self: {
pname = "Crypto";
@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "05wafv8flrh1893rh208azzig5k5pa022s2fg3f8lrqb23c6v63p";
isLibrary = true;
isExecutable = true;
buildDepends = [ HUnit QuickCheck random ];
buildDepends = [ Cabal HUnit QuickCheck random ];
meta = {
description = "Collects together existing Haskell cryptographic functions into a package";
license = "unknown";

6
pkgs/development/libraries/haskell/DSH/default.nix
View file

@ -1,4 +1,4 @@
{ cabal, convertible, csv, FerryCore, HaXml, HDBC, json, mtl
{ cabal, Cabal, convertible, csv, FerryCore, HaXml, HDBC, json, mtl
, Pathfinder, syb, text, xhtml
}:
@ -7,8 +7,8 @@ cabal.mkDerivation (self: {
version = "0.7.8";
sha256 = "1mlym2hs7sr78lih8c0yi5y5h14vxy3zpl3gfnidh9wiw5cai9lg";
buildDepends = [
convertible csv FerryCore HaXml HDBC json mtl Pathfinder syb text
xhtml
Cabal convertible csv FerryCore HaXml HDBC json mtl Pathfinder syb
text xhtml
];
meta = {
description = "Database Supported Haskell";

3
pkgs/development/libraries/haskell/Diff/default.nix
View file

@ -1,9 +1,10 @@
{ cabal }:
{ cabal, Cabal }:
cabal.mkDerivation (self: {
pname = "Diff";
version = "0.1.3";
sha256 = "02dhy4rp3mkzm5x3h1rkdin2h8qcb7h7nhn14gl2gvl6wdykfh5w";
buildDepends = [ Cabal ];
meta = {
description = "O(ND) diff algorithm in haskell";
license = self.stdenv.lib.licenses.bsd3;

4
pkgs/development/libraries/haskell/FerryCore/default.nix
View file

@ -1,10 +1,10 @@
{ cabal, HaXml, mtl, parsec, TableAlgebra }:
{ cabal, Cabal, HaXml, mtl, parsec, TableAlgebra }:
cabal.mkDerivation (self: {
pname = "FerryCore";
version = "0.4.6.4";
sha256 = "1dxhbrmcl36dg14lyihpy8fd8sdsmawh70fykllcjk3fh7a11wgp";
buildDepends = [ HaXml mtl parsec TableAlgebra ];
buildDepends = [ Cabal HaXml mtl parsec TableAlgebra ];
meta = {
description = "Ferry Core Components";
license = self.stdenv.lib.licenses.bsd3;

4
pkgs/development/libraries/haskell/GLFW/default.nix
View file

@ -1,10 +1,10 @@
{ cabal, libX11, mesa, OpenGL }:
{ cabal, Cabal, libX11, mesa, OpenGL }:
cabal.mkDerivation (self: {
pname = "GLFW";
version = "0.5.0.1";
sha256 = "1zjxw0fn1am9n4bwqn8jwp14cdgyg1cv5v8rrg2bisggw7wdc4c6";
buildDepends = [ OpenGL ];
buildDepends = [ Cabal OpenGL ];
extraLibraries = [ libX11 mesa ];
meta = {
homepage = "http://haskell.org/haskellwiki/GLFW";

4
pkgs/development/libraries/haskell/GLURaw/default.nix
View file

@ -1,10 +1,10 @@
{ cabal, freeglut, mesa, OpenGLRaw }:
{ cabal, Cabal, freeglut, mesa, OpenGLRaw }:
cabal.mkDerivation (self: {
pname = "GLURaw";
version = "1.2.0.0";
sha256 = "06dsazj3zadjahwy926gnjngqg8cb1mhdxh8bg5f3axf3hsvxqp1";
buildDepends = [ OpenGLRaw ];
buildDepends = [ Cabal OpenGLRaw ];
extraLibraries = [ freeglut mesa ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Opengl";

6
pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
View file

@ -1,10 +1,12 @@
{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
{ cabal, Cabal, freeglut, libICE, libSM, libXi, libXmu, mesa
, OpenGL
}:
cabal.mkDerivation (self: {
pname = "GLUT";
version = "2.1.1.2";
sha256 = "d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb";
buildDepends = [ OpenGL ];
buildDepends = [ Cabal OpenGL ];
extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";

6
pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
View file

@ -1,10 +1,12 @@
{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
{ cabal, Cabal, freeglut, libICE, libSM, libXi, libXmu, mesa
, OpenGL
}:
cabal.mkDerivation (self: {
pname = "GLUT";
version = "2.1.2.1";
sha256 = "0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02";
buildDepends = [ OpenGL ];
buildDepends = [ Cabal OpenGL ];
extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";

6
pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix
View file

@ -1,12 +1,12 @@
{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
, StateVar, Tensor
{ cabal, Cabal, freeglut, libICE, libSM, libXi, libXmu, mesa
, OpenGL, StateVar, Tensor
}:
cabal.mkDerivation (self: {
pname = "GLUT";
version = "2.2.2.1";
sha256 = "09qpkrwpc3w173mvqwda7vi0ncpzzzrnlfa14ja7jba489a8l1mw";
buildDepends = [ OpenGL StateVar Tensor ];
buildDepends = [ Cabal OpenGL StateVar Tensor ];
extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Opengl";

6
pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix
View file

@ -1,12 +1,12 @@
{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
, OpenGLRaw, StateVar, Tensor
{ cabal, Cabal, freeglut, libICE, libSM, libXi, libXmu, mesa
, OpenGL, OpenGLRaw, StateVar, Tensor
}:
cabal.mkDerivation (self: {
pname = "GLUT";
version = "2.3.0.0";
sha256 = "10rh57w3lx8fs0xy24lqilv5a5sgq57kshydja41r6fq9wdvwp99";
buildDepends = [ OpenGL OpenGLRaw StateVar Tensor ];
buildDepends = [ Cabal OpenGL OpenGLRaw StateVar Tensor ];
extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Opengl";

3
pkgs/development/libraries/haskell/GlomeVec/default.nix
View file

@ -1,9 +1,10 @@
{ cabal }:
{ cabal, Cabal }:
cabal.mkDerivation (self: {
pname = "GlomeVec";
version = "0.1.2";
sha256 = "6023c11977bf16baf487235087e94f5a2f465e8403b8e40ab513e7879dd52639";
buildDepends = [ Cabal ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Glome";
description = "Simple 3D vector library";

4
pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
View file

@ -1,4 +1,4 @@
{ cabal, HDBC, mtl, odbc, time, utf8String }:
{ cabal, Cabal, HDBC, mtl, odbc, time, utf8String }:
cabal.mkDerivation (self: {
pname = "HDBC-odbc";
@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "0vza38ggs863wjh25xnwslwlin68166ywws72bs766rl0rq7fkf4";
isLibrary = true;
isExecutable = true;
buildDepends = [ HDBC mtl time utf8String ];
buildDepends = [ Cabal HDBC mtl time utf8String ];
extraLibraries = [ odbc ];
noHaddock = true;
meta = {

4
pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
View file

@ -1,4 +1,4 @@
{ cabal, HDBC, mtl, parsec, postgresql, time, utf8String }:
{ cabal, Cabal, HDBC, mtl, parsec, postgresql, time, utf8String }:
cabal.mkDerivation (self: {
pname = "HDBC-postgresql";
@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "0fwza9h2ghl70x44c4snfybnnfsj1mwlf5a1x12ddl1fbj6fx6gs";
isLibrary = true;
isExecutable = true;
buildDepends = [ HDBC mtl parsec time utf8String ];
buildDepends = [ Cabal HDBC mtl parsec time utf8String ];
extraLibraries = [ postgresql ];
meta = {
homepage = "http://software.complete.org/hdbc-postgresql";

4
pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix
View file

@ -1,4 +1,4 @@
{ cabal, HDBC, mtl, sqlite, utf8String }:
{ cabal, Cabal, HDBC, mtl, sqlite, utf8String }:
cabal.mkDerivation (self: {
pname = "HDBC-sqlite3";
@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "11765nsncgyv9j6r5wpziqyhy0lxrmqbhgricbdx0c788ky75y92";
isLibrary = true;
isExecutable = true;
buildDepends = [ HDBC mtl utf8String ];
buildDepends = [ Cabal HDBC mtl utf8String ];
extraLibraries = [ sqlite ];
meta = {
homepage = "http://software.complete.org/hdbc-sqlite3";

10
pkgs/development/libraries/haskell/HDBC/HDBC.nix
View file

@ -1,14 +1,14 @@
{ cabal, convertible, mtl, text, time, utf8String }:
{ cabal, Cabal, convertible, mtl, text, time, utf8String }:
cabal.mkDerivation (self: {
pname = "HDBC";
version = "2.3.1.0";
sha256 = "1y3qcc0ids9k3af4qkhabwg82q03a21wl4vdqhj1h0zmf08b3m6k";
version = "2.3.1.1";
sha256 = "1gqihvsf5w7j8xbn1xy93mdrsh77qwxbhfmyjivbm6i95w1i0kb7";
isLibrary = true;
isExecutable = true;
buildDepends = [ convertible mtl text time utf8String ];
buildDepends = [ Cabal convertible mtl text time utf8String ];
meta = {
homepage = "https://github.com/jgoerzen/hdbc/wiki";
homepage = "https://github.com/hdbc/hdbc";
description = "Haskell Database Connectivity";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

4
pkgs/development/libraries/haskell/HGL/default.nix
View file

@ -1,10 +1,10 @@
{ cabal, X11 }:
{ cabal, Cabal, X11 }:
cabal.mkDerivation (self: {
pname = "HGL";
version = "3.2.0.2";
sha256 = "13wcvf6bfii9pihr8m08b81fyslf5n587ds4zzgizbd8m38k81vz";
buildDepends = [ X11 ];
buildDepends = [ Cabal X11 ];
meta = {
description = "A simple graphics library based on X11 or Win32";
license = self.stdenv.lib.licenses.bsd3;

3
pkgs/development/libraries/haskell/HList/default.nix
View file

@ -1,9 +1,10 @@
{ cabal }:
{ cabal, Cabal }:
cabal.mkDerivation (self: {
pname = "HList";
version = "0.2.3";
sha256 = "1efbe0c2cb361ab0a9d864a09f9c58075132cb50094207260cb1363fe73c2908";
buildDepends = [ Cabal ];
meta = {
description = "Heterogeneous lists";
license = self.stdenv.lib.licenses.mit;

7
pkgs/development/libraries/haskell/HStringTemplate/default.nix
View file

@ -1,5 +1,5 @@
{ cabal, deepseq, mtl, parsec, syb, sybWithClass, text, time
, utf8String
{ cabal, Cabal, deepseq, filepath, mtl, parsec, syb, sybWithClass
, text, time, utf8String
}:
cabal.mkDerivation (self: {
@ -7,7 +7,8 @@ cabal.mkDerivation (self: {
version = "0.6.8";
sha256 = "1fybvb3v2b786n1hfzcvyanj3yfm5j8z4fm48vaskcggawh6rlkr";
buildDepends = [
deepseq mtl parsec syb sybWithClass text time utf8String
Cabal deepseq filepath mtl parsec syb sybWithClass text time
utf8String
];
meta = {
description = "StringTemplate implementation in Haskell";

4
pkgs/development/libraries/haskell/HTTP/4000.0.6.nix
View file

@ -1,10 +1,10 @@
{ cabal, mtl, network, parsec }:
{ cabal, Cabal, mtl, network, parsec }:
cabal.mkDerivation (self: {
pname = "HTTP";
version = "4000.0.6";
sha256 = "75af1ac4dc21b10c8a1a54a33179ea822e591887bab7278360a3d6b38304d39b";
buildDepends = [ mtl network parsec ];
buildDepends = [ Cabal mtl network parsec ];
meta = {
homepage = "http://projects.haskell.org/http/";
description = "A library for client-side HTTP";

4
pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
View file

@ -1,10 +1,10 @@
{ cabal, mtl, network, parsec }:
{ cabal, Cabal, mtl, network, parsec }:
cabal.mkDerivation (self: {
pname = "HTTP";
version = "4000.0.9";
sha256 = "1e2b4a8b782ad1417c8755bb0d248851bc142b351366ed460e07f2945a5e95ba";
buildDepends = [ mtl network parsec ];
buildDepends = [ Cabal mtl network parsec ];
meta = {
homepage = "http://projects.haskell.org/http/";
description = "A library for client-side HTTP";

4
pkgs/development/libraries/haskell/HTTP/4000.1.1.nix
View file

@ -1,10 +1,10 @@
{ cabal, mtl, network, parsec }:
{ cabal, Cabal, mtl, network, parsec }:
cabal.mkDerivation (self: {
pname = "HTTP";
version = "4000.1.1";
sha256 = "09khx5fb673a0d7m3bl39xjdxvc60m52rmm4865cha2mby0zidy3";
buildDepends = [ mtl network parsec ];
buildDepends = [ Cabal mtl network parsec ];
meta = {
homepage = "http://projects.haskell.org/http/";
description = "A library for client-side HTTP";

4
pkgs/development/libraries/haskell/HTTP/4000.1.2.nix
View file

@ -1,10 +1,10 @@
{ cabal, mtl, network, parsec }:
{ cabal, Cabal, mtl, network, parsec }:
cabal.mkDerivation (self: {
pname = "HTTP";
version = "4000.1.2";
sha256 = "19vcy8xinrvn01caly6sg1p1yvbbf7nwq10kxmnwqssnl4h5cwn8";
buildDepends = [ mtl network parsec ];
buildDepends = [ Cabal mtl network parsec ];
meta = {
homepage = "http://projects.haskell.org/http/";
description = "A library for client-side HTTP";

4
pkgs/development/libraries/haskell/HTTP/4000.2.1.nix
View file

@ -1,10 +1,10 @@
{ cabal, mtl, network, parsec }:
{ cabal, Cabal, mtl, network, parsec }:
cabal.mkDerivation (self: {
pname = "HTTP";
version = "4000.2.1";
sha256 = "01076rk7ly5228pszn54x4nqc6rqq1xw11ij9ajvhzf419islh0a";
buildDepends = [ mtl network parsec ];
buildDepends = [ Cabal mtl network parsec ];
meta = {
homepage = "https://github.com/haskell/HTTP";
description = "A library for client-side HTTP";

4
pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
View file

@ -1,10 +1,10 @@
{ cabal, mtl, network, parsec }:
{ cabal, Cabal, mtl, network, parsec }:
cabal.mkDerivation (self: {
pname = "HTTP";
version = "4000.2.2";
sha256 = "0qrr9wdj25sdfxifppmw0w14g8skpgf42ic4iqcqylxxzfa8v7vh";
buildDepends = [ mtl network parsec ];
buildDepends = [ Cabal mtl network parsec ];
meta = {
homepage = "https://github.com/haskell/HTTP";
description = "A library for client-side HTTP";

3
pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix
View file

@ -1,9 +1,10 @@
{ cabal }:
{ cabal, Cabal }:
cabal.mkDerivation (self: {
pname = "HUnit";
version = "1.2.0.3";
sha256 = "954f584f7c096c3ddef677e70b3811195bb4fd18dfdb4727a260ca7d7465de12";
buildDepends = [ Cabal ];
meta = {
homepage = "http://hunit.sourceforge.net/";
description = "A unit testing framework for Haskell";

3
pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
View file

@ -1,4 +1,4 @@
{ cabal }:
{ cabal, Cabal }:
cabal.mkDerivation (self: {
pname = "HUnit";
@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "47235503b666658588181795540d29212283059b21edc42e1b4f1998e46ac853";
isLibrary = true;
isExecutable = true;
buildDepends = [ Cabal ];
meta = {
homepage = "http://hunit.sourceforge.net/";
description = "A unit testing framework for Haskell";

3
pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix
View file

@ -1,4 +1,4 @@
{ cabal }:
{ cabal, Cabal }:
cabal.mkDerivation (self: {
pname = "HUnit";
@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "158i6s014ybh5bflzspd21qzdlhdyk89yqpmk8kwc59lxjvvjsxz";
isLibrary = true;
isExecutable = true;
buildDepends = [ Cabal ];
meta = {
homepage = "http://hunit.sourceforge.net/";
description = "A unit testing framework for Haskell";

3
pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix
View file

@ -1,4 +1,4 @@
{ cabal }:
{ cabal, Cabal }:
cabal.mkDerivation (self: {
pname = "HUnit";
@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "0yijvrjmmz6vvgi5h1195z4psmymvhq6rr7kkd26nqbd34lbrg7x";
isLibrary = true;
isExecutable = true;
buildDepends = [ Cabal ];
meta = {
homepage = "http://hunit.sourceforge.net/";
description = "A unit testing framework for Haskell";

4
pkgs/development/libraries/haskell/HaXml/default.nix
View file

@ -1,4 +1,4 @@
{ cabal, polyparse, random }:
{ cabal, Cabal, filepath, polyparse, random }:
cabal.mkDerivation (self: {
pname = "HaXml";
@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "1ckmi8iwyaid4mcnh8117s9kq45f8r7sidh6dbhzbj0dl29rrkbz";
isLibrary = true;
isExecutable = true;
buildDepends = [ polyparse random ];
buildDepends = [ Cabal filepath polyparse random ];
meta = {
homepage = "http://www.cs.york.ac.uk/fp/HaXml/";
description = "Utilities for manipulating XML documents";

4
pkgs/development/libraries/haskell/HaskellForMaths/default.nix
View file

@ -1,10 +1,10 @@
{ cabal, random }:
{ cabal, Cabal, random }:
cabal.mkDerivation (self: {
pname = "HaskellForMaths";
version = "0.4.3";
sha256 = "00s502h3pw9i464qn6cn74ihghcnn5gsar891q276ld682m5vdns";
buildDepends = [ random ];
buildDepends = [ Cabal random ];
meta = {
homepage = "http://haskellformaths.blogspot.com/";
description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";

4
pkgs/development/libraries/haskell/Hipmunk/default.nix
View file

@ -1,10 +1,10 @@
{ cabal, StateVar, transformers }:
{ cabal, Cabal, StateVar, transformers }:
cabal.mkDerivation (self: {
pname = "Hipmunk";
version = "5.2.0.6";
sha256 = "16yh7v6v05nksspcfz8h054piyhmrfbpaada36562rjxcywyfnfj";
buildDepends = [ StateVar transformers ];
buildDepends = [ Cabal StateVar transformers ];
noHaddock = true;
meta = {
homepage = "http://patch-tag.com/r/felipe/hipmunk/home";

4
pkgs/development/libraries/haskell/HsOpenSSL/default.nix
View file

@ -1,10 +1,10 @@
{ cabal, network, openssl, time }:
{ cabal, Cabal, network, openssl, time }:
cabal.mkDerivation (self: {
pname = "HsOpenSSL";
version = "0.10.1.2";
sha256 = "0najn3749s6jxqavpxw7q58jzsvli06sxjgkvs3lidasv6jhwmxh";
buildDepends = [ network time ];
buildDepends = [ Cabal network time ];
extraLibraries = [ openssl ];
meta = {
homepage = "https://github.com/phonohawk/HsOpenSSL";

4
pkgs/development/libraries/haskell/HsSyck/default.nix
View file

@ -1,10 +1,10 @@
{ cabal, syb, utf8String }:
{ cabal, Cabal, syb, utf8String }:
cabal.mkDerivation (self: {
pname = "HsSyck";
version = "0.50";
sha256 = "0ap675i2fngvd1nw1dk8p2fz4nbd2aq5ci8dsvpcjbp28y9j2blm";
buildDepends = [ syb utf8String ];
buildDepends = [ Cabal syb utf8String ];
meta = {
description = "Fast, lightweight YAML loader and dumper";
license = self.stdenv.lib.licenses.bsd3;

6
pkgs/development/libraries/haskell/JsContracts/default.nix
View file

@ -1,4 +1,4 @@
{ cabal, mtl, parsec, syb, WebBits, WebBitsHtml }:
{ cabal, Cabal, filepath, mtl, parsec, syb, WebBits, WebBitsHtml }:
cabal.mkDerivation (self: {
pname = "JsContracts";
@ -6,7 +6,9 @@ cabal.mkDerivation (self: {
sha256 = "17l6kdpdc7lrpd9j4d2b6vklkpclshcjy6hzpi442b7pj96sn589";
isLibrary = true;
isExecutable = true;
buildDepends = [ mtl parsec syb WebBits WebBitsHtml ];
buildDepends = [
Cabal filepath mtl parsec syb WebBits WebBitsHtml
];
meta = {
homepage = "http://www.cs.brown.edu/research/plt/";
description = "Design-by-contract for JavaScript";

3
pkgs/development/libraries/haskell/ListLike/default.nix
View file

@ -1,4 +1,4 @@
{ cabal }:
{ cabal, Cabal }:
cabal.mkDerivation (self: {
pname = "ListLike";
@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "0cpj7vqlazs2yzh0ffhlg69kdb18xyicybfw614nlqfhhrp53lj9";
isLibrary = true;
isExecutable = true;
buildDepends = [ Cabal ];
meta = {
homepage = "http://software.complete.org/listlike";
description = "Generic support for list-like structures";

4
pkgs/development/libraries/haskell/MaybeT/default.nix
View file

@ -1,10 +1,10 @@
{ cabal, mtl }:
{ cabal, Cabal, mtl }:
cabal.mkDerivation (self: {
pname = "MaybeT";
version = "0.1.2";
sha256 = "995e61165122656807d84174e5c1516340fd7ddeba6571c20751352a8476b632";
buildDepends = [ mtl ];
buildDepends = [ Cabal mtl ];
meta = {
description = "MaybeT monad transformer";
license = self.stdenv.lib.licenses.bsd3;

3
pkgs/development/libraries/haskell/MemoTrie/default.nix
View file

@ -1,9 +1,10 @@
{ cabal }:
{ cabal, Cabal }:
cabal.mkDerivation (self: {
pname = "MemoTrie";
version = "0.4.10";
sha256 = "1hkraq33sai046gwqlabc9nkz6jbl6vgj0c6lc6j4j5h5d8v08kk";
buildDepends = [ Cabal ];
meta = {
homepage = "http://haskell.org/haskellwiki/MemoTrie";
description = "Trie-based memo functions";

5
pkgs/development/libraries/haskell/MissingH/default.nix
View file

@ -1,4 +1,5 @@
{ cabal, hslogger, HUnit, mtl, network, parsec, random, regexCompat
{ cabal, Cabal, filepath, hslogger, HUnit, mtl, network, parsec
, random, regexCompat
}:
cabal.mkDerivation (self: {
@ -8,7 +9,7 @@ cabal.mkDerivation (self: {
isLibrary = true;
isExecutable = true;
buildDepends = [
hslogger HUnit mtl network parsec random regexCompat
Cabal filepath hslogger HUnit mtl network parsec random regexCompat
];
meta = {
homepage = "http://software.complete.org/missingh";

4
pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
View file

@ -1,10 +1,10 @@
{ cabal, extensibleExceptions, mtl }:
{ cabal, Cabal, extensibleExceptions, mtl }:
cabal.mkDerivation (self: {
pname = "MonadCatchIO-mtl";
version = "0.3.0.4";
sha256 = "0wzdrfplwa4v9miv88rg3jvf7l6gphc29lpdp5qjm5873y57jxm7";
buildDepends = [ extensibleExceptions mtl ];
buildDepends = [ Cabal extensibleExceptions mtl ];
meta = {
homepage = "http://darcsden.com/jcpetruzza/MonadCatchIO-mtl";
description = "Monad-transformer version of the Control.Exception module";

4
pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
View file

@ -1,10 +1,10 @@
{ cabal, extensibleExceptions, transformers }:
{ cabal, Cabal, extensibleExceptions, transformers }:
cabal.mkDerivation (self: {
pname = "MonadCatchIO-transformers";
version = "0.2.2.3";
sha256 = "1qwy9rrmf3kl7rb7v46n81xmrwy4xl63lfnlsiz1qc0hybjkl7m6";
buildDepends = [ extensibleExceptions transformers ];
buildDepends = [ Cabal extensibleExceptions transformers ];
meta = {
description = "Monad-transformer compatible version of the Control.Exception module";
license = self.stdenv.lib.licenses.bsd3;

4
pkgs/development/libraries/haskell/MonadPrompt/default.nix
View file

@ -1,10 +1,10 @@
{ cabal, mtl }:
{ cabal, Cabal, mtl }:
cabal.mkDerivation (self: {
pname = "MonadPrompt";
version = "1.0.0.3";
sha256 = "0v6svyiajri7c463bz1a1x1nin5s9s7c3s7y0gjc4cn7lhgdsvf2";
buildDepends = [ mtl ];
buildDepends = [ Cabal mtl ];
meta = {
description = "MonadPrompt, implementation & examples";
license = self.stdenv.lib.licenses.bsd3;

4
pkgs/development/libraries/haskell/MonadRandom/default.nix
View file

@ -1,10 +1,10 @@
{ cabal, mtl, random }:
{ cabal, Cabal, mtl, random }:
cabal.mkDerivation (self: {
pname = "MonadRandom";
version = "0.1.6";
sha256 = "1429w2h66sf0cw992xj4w9clapcqgpdzmh80as7zxf8l87rarqqp";
buildDepends = [ mtl random ];
buildDepends = [ Cabal mtl random ];
meta = {
description = "Random-number generation monad";
license = "unknown";

4
pkgs/development/libraries/haskell/NanoProlog/default.nix
View file

@ -1,4 +1,4 @@
{ cabal, ListLike, uuParsinglib }:
{ cabal, Cabal, ListLike, uuParsinglib }:
cabal.mkDerivation (self: {
pname = "NanoProlog";
@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "0wjjwzzc78sj7nsaq1hgxiwv0pc069mxns425lhmrlxcm0vf8fmn";
isLibrary = true;
isExecutable = true;
buildDepends = [ ListLike uuParsinglib ];
buildDepends = [ Cabal ListLike uuParsinglib ];
meta = {
description = "Very small interpreter for a Prolog-like language";
license = self.stdenv.lib.licenses.bsd3;

3
pkgs/development/libraries/haskell/NumInstances/default.nix
View file

@ -1,9 +1,10 @@
{ cabal }:
{ cabal, Cabal }:
cabal.mkDerivation (self: {
pname = "NumInstances";
version = "1.0";
sha256 = "1fmg3slwma5f88a2qxj54ny40s67qbdyvsyh506bkp11v54958fy";
buildDepends = [ Cabal ];
meta = {
description = "Instances of numeric classes for functions and tuples";
license = self.stdenv.lib.licenses.bsd3;

3
pkgs/development/libraries/haskell/ObjectName/default.nix
View file

@ -1,9 +1,10 @@
{ cabal }:
{ cabal, Cabal }:
cabal.mkDerivation (self: {
pname = "ObjectName";
version = "1.0.0.0";
sha256 = "0yr1aa0ail2h9qsq2bslcwwq6cxl2lzajmc1laj19r7ks62p32rm";
buildDepends = [ Cabal ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";
description = "Explicitly handled object names";

3
pkgs/development/libraries/haskell/OneTuple/default.nix
View file

@ -1,9 +1,10 @@
{ cabal }:
{ cabal, Cabal }:
cabal.mkDerivation (self: {
pname = "OneTuple";
version = "0.2.1";
sha256 = "1x52b68zh3k9lnps5s87kzan7dzvqp6mrwgayjq15w9dv6v78vsb";
buildDepends = [ Cabal ];
meta = {
description = "Singleton Tuple";
license = self.stdenv.lib.licenses.bsd3;

4
pkgs/development/libraries/haskell/OpenAL/default.nix
View file

@ -1,10 +1,10 @@
{ cabal, ObjectName, openal, StateVar, Tensor }:
{ cabal, Cabal, ObjectName, openal, StateVar, Tensor }:
cabal.mkDerivation (self: {
pname = "OpenAL";
version = "1.4.0.0";
sha256 = "1vn9r8fd4zwqm8a9d8bgvi9vs1lmygn8sw1rlv819b5wmjwz3ms2";
buildDepends = [ ObjectName StateVar Tensor ];
buildDepends = [ Cabal ObjectName StateVar Tensor ];
extraLibraries = [ openal ];
meta = {
homepage = "http://connect.creativelabs.com/openal/";

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