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

Merge branch 'master' into x-updates

Browse Source 
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
This commit is contained in:
Vladimír Čunát 2013-06-05 12:36:16 +02:00
commit 7af694700c
139 changed files with 1423 additions and 621 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maintainers/scripts/copy-tarball.sh
View File

@ -1,6 +1,6 @@
#! /bin/sh -e
distDir=/data/webserver/tarballs
distDir=${NIX_TARBALLS_CACHE:-/tarballs}
url="$1"
file="$2"

26
pkgs/applications/audio/audacity/default.nix
View File

@ -1,20 +1,32 @@
{ stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool,
libogg, libvorbis, libmad, alsaLib, libsndfile, libsamplerate, flac, lame,
expat, id3lib, ffmpeg, portaudio
libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame,
expat, libid3tag, ffmpeg /*, portaudio - given up fighting their portaudio.patch */
}:
stdenv.mkDerivation rec {
version = "2.0.2";
version = "2.0.3";
name = "audacity-${version}";
src = fetchurl {
url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.bz2";
sha256 = "17c7p5jww5zcg2k2fs1751mv5kbadcmgicszi1zxwj2p5b35x2mc";
url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.xz";
sha256 = "1k4bbxhpfl80vm3gm3jxqly0syqjij5kwziy4xyq2c8aj2miwj1f";
};
buildInputs = [ pkgconfig wxGTK libsndfile expat alsaLib libsamplerate
libvorbis libmad flac id3lib ffmpeg gettext ];
preConfigure = /* we prefer system-wide libs */ ''
mv lib-src lib-src-rm
mkdir lib-src
mv lib-src-rm/{Makefile*,lib-widget-extra,portaudio-v19,portmixer,portsmf,FileDialog,sbsms} lib-src/
rm -r lib-src-rm/
'';
buildInputs = [
pkgconfig gettext wxGTK gtk expat alsaLib
libsndfile soxr libid3tag
ffmpeg libmad lame libvorbis flac
]; #ToDo: soundtouch, detach sbsms
dontDisableStatic = true;
doCheck = true;
meta = {
description = "Sound editor with graphical UI";

14
pkgs/applications/editors/emacs-modes/haskell/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchgit, emacs }:
{ stdenv, fetchurl, emacs }:
stdenv.mkDerivation {
name = "haskell-mode-2.8.0.29-gae3e4499d2";
stdenv.mkDerivation rec {
name = "haskell-mode-2.9.1-102-g8d4b965";
src = fetchgit {
url = "http://github.com/haskell/haskell-mode.git";
rev = "ae3e4499d27a1468bdf88ffe0ce15cd7e4bb9f2a";
sha256 = "29a1725da620c13ff2b3b56906e76dd9f19317eee92bd5750b3aa9a4264effae";
src = fetchurl {
url = "https://github.com/haskell/haskell-mode/tarball/8d4b9651a69b62fcbedbac63de29a1e87ff0e97f";
sha256 = "02sil43885xjbfqakrxkm7bjnjd930lx6845fc2rxmkq5plkq85a";
name = "${name}.tar.gz";
};
buildInputs = [emacs];

30
pkgs/applications/graphics/alchemy/default.nix Normal file
View File

@ -0,0 +1,30 @@
{stdenv, fetchurl, jre}:
stdenv.mkDerivation {
name = "alchemy-007-alpha";
enableParallelBuilding = true;
src = fetchurl {
url = http://al.chemy.org/files/Alchemy-007.tar.gz;
sha256 = "1pk00m4iajvv9jzv96in10czpcf7zc3d4nmd9biqagpsg28mr70b";
};
installPhase = ''
ensureDir $out/bin $out/share
cp -a . $out/share/alchemy
cat >> $out/bin/alchemy << EOF
#!/bin/sh
cd $out/share/alchemy
${jre}/bin/java -jar Alchemy.jar "$@"
EOF
chmod +x $out/bin/alchemy
'';
meta = {
description = "Drawing application";
homepage = http://al.chemy.org/;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = [stdenv.lib.maintainers.marcweber];
platforms = stdenv.lib.platforms.linux;
};
}

32
pkgs/applications/graphics/digikam/2.nix Normal file
View File

@ -0,0 +1,32 @@
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
shared_desktop_ontologies, marble, mysql }:
stdenv.mkDerivation rec {
name = "digikam-2.9.0";
src = fetchurl {
url = "mirror://sourceforge/digikam/${name}.tar.bz2";
sha256 = "181vf065j1zz26zahkb7hy3fk4837nvwm61cnykvni7w40w0zpbk";
};
nativeBuildInputs = [ cmake automoc4 pkgconfig ];
buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql ];
# Make digikam find some FindXXXX.cmake
KDEDIRS="${marble}:${qjson}";
enableParallelBuilding = true;
meta = {
description = "Photo Management Program";
license = "GPL";
homepage = http://www.digikam.org;
maintainers = with stdenv.lib.maintainers; [ viric urkud ];
inherit (kdelibs.meta) platforms;
};
}

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

@ -4,11 +4,11 @@ liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost
shared_desktop_ontologies, marble, mysql }:
stdenv.mkDerivation rec {
name = "digikam-2.6.0";
name = "digikam-3.2.0";
src = fetchurl {
url = "mirror://sourceforge/digikam/${name}.tar.bz2";
sha256 = "1prnaywnbv0xpw6knqagzc4gn1vsj9kw2hvdasjwknc9ljiyl721";
url = "http://download.kde.org/stable/digikam/${name}.tar.bz2";
sha256 = "06j858d2nvbqh0bw6m60rh1bsws06fm5vfjpwwi3zxsf5ka08wmx";
};
nativeBuildInputs = [ cmake automoc4 pkgconfig ];

11
pkgs/applications/graphics/freecad/default.nix
View File

@ -1,15 +1,14 @@
{ fetchgit, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts,
{ fetchurl, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts,
boost, zlib,
python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }:
stdenv.mkDerivation rec {
name = "freecad-${version}";
version = "git-20121213";
version = "0.13.1830";
src = fetchgit {
url = git://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad;
rev = "d3949cedc7e3c924d426660515e06eaf55d1a67f";
sha256 = "0a07ih0z5d8m69zasmvi7z4lgq0pa67k2g7r1l6nz2d0b30py61w";
src = fetchurl {
url = "mirror://sourceforge/free-cad/${name}.tar.gz";
sha256 = "04rgww5y32asn4sx5j4wh79ggvb479pq56xfcfj6gkg44mid23jm";
};
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost

20
pkgs/applications/misc/audio/soxr/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
name = "soxr-0.1.1";
src = fetchurl {
url = "mirror://sourceforge/soxr/${name}-Source.tar.xz";
sha256 = "1hmadwqfpg15vhwq9pa1sl5xslibrjpk6hpq2s9hfmx1s5l6ihfw";
};
preConfigure = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/build/src'';
buildInputs = [ cmake ];
meta = {
description = "An audio resampling library";
homepage = http://soxr.sourceforge.net;
license = "LGPLv2.1+";
};
}

38
pkgs/applications/misc/vanitygen/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ fetchurl, stdenv, openssl, pcre }:
stdenv.mkDerivation rec {
version = "0.21";
name = "vanitygen-${version}";
src = fetchurl {
name = "vanitygen-${version}.tar.gz";
url = "https://github.com/samr7/vanitygen/tarball/0.21";
sha256 = "1lj0gi08lg0pcby5pbpi08ysynzy24qa1n1065112shkpasi0kxv";
};
buildInputs = [ openssl pcre ];
installPhase = ''
ensureDir $out/bin
cp vanitygen $out/bin
cp keyconv $out/bin/vanitygen-keyconv
'';
meta = {
description = "Bitcoin vanity address generator";
longDescription= ''
Vanitygen can search for exact prefixes or regular expression
matches, so you can generate Bitcoin addresses that starts
with the needed mnemonic.
Vanitygen can generate regular bitcoin addresses, namecoin
addresses, and testnet addresses.
When searching for exact prefixes, vanitygen will ensure that
the prefix is possible, will provide a difficulty estimate,
and will run about 30% faster.
'';
homepage = "https://github.com/samr7/vanitygen";
license = "AGPLv3";
};
}

10
pkgs/applications/misc/xmobar/default.nix
View File

@ -1,15 +1,15 @@
{ cabal, filepath, libXrandr, mtl, parsec, stm, time, utf8String
, wirelesstools, X11, X11Xft
{ cabal, filepath, libXrandr, mtl, parsec, regexCompat, stm, time
, utf8String, wirelesstools, X11, X11Xft
}:
cabal.mkDerivation (self: {
pname = "xmobar";
version = "0.17";
sha256 = "0ahb3xqxcfvpgxyb901bpl4i56mnslzwplcqxrr13glngcl7d25s";
version = "0.18";
sha256 = "08kk0yjx51vjrvvvd34hv8v80dsh8kjv150qf413ikaff0i28v7w";
isLibrary = false;
isExecutable = true;
buildDepends = [
filepath mtl parsec stm time utf8String X11 X11Xft
filepath mtl parsec regexCompat stm time utf8String X11 X11Xft
];
extraLibraries = [ libXrandr wirelesstools ];
configureFlags = "-fwith_xft -fwith_iwlib";

2
pkgs/applications/networking/bittorrentsync/default.nix
View File

@ -16,7 +16,7 @@ let
version = "1.0.134";
sha256 = if stdenv.system == "x86_64-linux" then "1kyxiqjabqgsg7n0a8snh03axxzpniazp93shb2l1b6x0f7d24n7"
else if stdenv.system == "i686-linux" then "02wb8pqcb1rk108r49cqyg7s14grmjnkr6p3068pkiwdwwgi8jakbt"
else if stdenv.system == "i686-linux" then "02wb8pqcb1rk108r49cqyg7s14grmjnkr6p3068pkiwdwwgi8jak"
else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
in stdenv.mkDerivation {

6
pkgs/applications/networking/browsers/firefox/21.0.nix → pkgs/applications/networking/browsers/firefox/20.0.nix
View File

@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "21.0";
firefoxVersion = "20.0";
xulVersion = "21.0"; # this attribute is used by other packages
xulVersion = "20.0"; # this attribute is used by other packages
src = fetchurl {
@ -27,7 +27,7 @@ rec {
# Fall back to this url for versions not available at releases.mozilla.org.
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
];
sha256 = "076rfh82m1b1hw10dzbgg13h63wmnispgyvag4nb20ylnlf0629r";
sha1 = "6d776c29da0be0d2a50abeb504d63b06b7861218";
};
commonConfigureFlags =

22
pkgs/applications/networking/ids/bro/default.nix Normal file
View File

@ -0,0 +1,22 @@
{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, perl, zlib, file, curl, geoip, gperftools }:
stdenv.mkDerivation rec {
name = "bro-2.1";
src = fetchurl {
url = "http://www.bro.org/downloads/release/${name}.tar.gz";
sha256 = "1q2mm7rbgjcn01na2wm5fdfdm9pggzgljxj0n127s93fip3vg0qd";
};
buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip gperftools ];
USER="something";
enableParallelBuilding = true;
meta = {
description = "Bro is a powerful network analysis framework that is much different from the typical IDS you may know.";
homepage = http://www.bro.org/;
license = "BSD";
};
}

19
pkgs/applications/networking/ids/daq/default.nix Normal file
View File

@ -0,0 +1,19 @@
{stdenv, fetchurl, flex, bison, libpcap}:
stdenv.mkDerivation rec {
name = "daq-2.0.0";
src = fetchurl {
name = "${name}.tar.gz";
url = http://www.snort.org/downloads/2311;
sha256 = "0f0w5jfmx0n2sms4f2mfg984a27r7qh927vkd7fclvx9cbiwibzv";
};
buildInputs = [ flex bison libpcap ];
meta = {
description = "Data AcQuisition library (DAQ), for packet I/O";
homepage = http://www.snort.org;
license = "GPLv2";
};
}

19
pkgs/applications/networking/ids/snort/default.nix Normal file
View File

@ -0,0 +1,19 @@
{stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}:
stdenv.mkDerivation rec {
name = "snort-2.9.4.6";
src = fetchurl {
name = "${name}.tar.gz";
url = http://www.snort.org/downloads/2320;
sha256 = "1g5kn36l67a5m95h2shqwqbbjb6rgl3sf1bciakal2l4n6857ang";
};
buildInputs = [ libpcap pcre libdnet daq zlib flex bison ];
meta = {
description = "Snort is an open source network intrusion prevention and detection system (IDS/IPS)";
homepage = http://www.snort.org;
license = "GPLv2";
};
}

5
pkgs/applications/networking/p2p/gnunet/svn.nix
View File

@ -4,14 +4,15 @@
, makeWrapper, autoconf, automake }:
let
rev = "27314";
rev = "27317";
in
stdenv.mkDerivation rec {
name = "gnunet-svn-${rev}";
src = fetchsvn {
url = https://gnunet.org/svn/gnunet;
sha256 = "14b893y5dy84hp1klrmng06znbh2m2wk4f1kpbhzbwnvjyhk6kdq";
rev = "27317";
sha256 = "1l7jypm57wjhzlwdj8xzhfppjdpy6wbph4nqgwxxb9q056wwf9zy";
};
buildInputs = [

49
pkgs/applications/version-management/git-and-tools/cgit/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt, docbook_xml_xslt }:
stdenv.mkDerivation rec {
name = "cgit-0.9.2";
src = fetchurl {
url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
sha256 = "0q177q1r7ssna32c760l4dx6p4aaz6kdv27zn2jb34bx98045h08";
};
# cgit is is tightly coupled with git and needs a git source tree to build.
# The cgit-0.9.2 Makefile has GIT_VER = 1.8.3, so use that version.
# IMPORTANT: Remember to check which git version cgit needs on every version
# bump.
gitSrc = fetchurl {
url = https://git-core.googlecode.com/files/git-1.8.3.tar.gz;
sha256 = "0fn5xdx30dl8dl1cdpqif5hgc3qnxlqfpwyhm0sm1wgqhgbcdlzi";
};
buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt ];
# Give cgit a git source tree and pass configuration parameters (as make
# variables).
preBuild = ''
mkdir -p git
tar --strip-components=1 -xf "$gitSrc" -C git
makeFlagsArray+=(prefix="$out" CGIT_SCRIPT_PATH="$out/cgit/")
'';
# Install manpage.
postInstall = ''
# xmllint fails:
#make install-man
# bypassing xmllint works:
a2x --no-xmllint -f manpage cgitrc.5.txt
mkdir -p "$out/share/man/man5"
cp cgitrc.5 "$out/share/man/man5"
'';
meta = {
homepage = http://git.zx2c4.com/cgit/about/;
description = "Web frontend for git repositories";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ bjornfor ];
};
}

12
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -42,17 +42,7 @@ rec {
sendEmailSupport = !stdenv.isDarwin;
});
gitAnnex = lib.makeOverridable (import ./git-annex) {
inherit stdenv fetchurl perl which ikiwiki curl bup git gnupg1 lsof openssh rsync;
inherit (haskellPackages) ghc aeson async blazeBuilder bloomfilter
caseInsensitive clientsession cryptoApi dataDefault dataenc DAV dbus dns
editDistance extensibleExceptions filepath gnutls hamlet hinotify hS3
hslogger httpConduit httpTypes HUnit IfElse json liftedBase MissingH
monadControl mtl network networkInfo networkMulticast networkProtocolXmpp
QuickCheck random regexCompat SafeSemaphore SHA stm text time regexTdfa
transformers transformersBase utf8String uuid wai waiLogger warp
xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic;
};
gitAnnex = pkgs.haskellPackages.gitAnnex;
qgit = import ./qgit {
inherit fetchurl stdenv;

110
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
View File

@ -1,73 +1,57 @@
{ stdenv, fetchurl, perl, which, ikiwiki, ghc, aeson, async, blazeBuilder
, bloomfilter, bup, caseInsensitive, clientsession, cryptoApi, curl, dataDefault
, dataenc, DAV, dbus, dns, editDistance, extensibleExceptions, filepath, git
, gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, httpConduit, httpTypes, HUnit
, IfElse, json, liftedBase, lsof, MissingH, monadControl, mtl, network
, networkInfo, networkMulticast, networkProtocolXmpp, openssh, QuickCheck
, random, regexCompat, rsync, SafeSemaphore, SHA, stm, text, time, transformers
, transformersBase, utf8String, uuid, wai, waiLogger, warp, xmlConduit, xmlTypes
, yesod, yesodDefault, yesodForm, yesodStatic, regexTdfa
{ cabal, aeson, async, blazeBuilder, bloomfilter, bup
, caseInsensitive, clientsession, cryptoApi, curl, dataDefault
, dataenc, DAV, dbus, dlist, dns, editDistance
, extensibleExceptions, filepath, git, gnupg1, gnutls, hamlet
, hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, HUnit
, IfElse, json, lsof, MissingH, MonadCatchIOTransformers
, monadControl, mtl, network, networkInfo, networkMulticast
, networkProtocolXmpp, openssh, QuickCheck, random, regexTdfa
, rsync, SafeSemaphore, SHA, stm, text, time, transformers
, unixCompat, utf8String, uuid, wai, waiLogger, warp, xmlConduit
, xmlTypes, yesod, yesodDefault, yesodForm, yesodStatic
}:
let
version = "4.20130501";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "https://github.com/joeyh/git-annex/tarball/${version}";
sha256 = "1280sdj3d3s3k5a1znzl7xzzyncv9kz522bprhwb9if03v6xh2kl";
name = "git-annex-${version}.tar.gz";
};
buildInputs = [ ghc aeson async blazeBuilder bloomfilter bup ikiwiki
caseInsensitive clientsession cryptoApi curl dataDefault dataenc DAV dbus
dns editDistance extensibleExceptions filepath git gnupg1 gnutls hamlet
hinotify hS3 hslogger httpConduit httpTypes HUnit IfElse json liftedBase
lsof MissingH monadControl mtl network networkInfo networkMulticast
networkProtocolXmpp openssh QuickCheck random regexCompat rsync
SafeSemaphore SHA stm text time transformers transformersBase utf8String
uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault yesodForm
yesodStatic which perl regexTdfa ];
configurePhase = ''
makeFlagsArray=( PREFIX=$out CABAL=./Setup )
patchShebangs .
ghc -O2 --make Setup
./Setup configure -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -fwebapp -fassistant -fdbus -finotify -fwebdav -fs3
'';
doCheck = true;
cabal.mkDerivation (self: {
pname = "git-annex";
version = "4.20130601";
sha256 = "0l6jbi9r26w5h9hfg9v9qybqvijp4n7c9l1zd4ikxg2nqcc8j8ln";
isLibrary = false;
isExecutable = true;
buildDepends = [
aeson async blazeBuilder bloomfilter caseInsensitive clientsession
cryptoApi dataDefault dataenc DAV dbus dlist dns editDistance
extensibleExceptions filepath gnutls hamlet hinotify hS3 hslogger
HTTP httpConduit httpTypes HUnit IfElse json MissingH
MonadCatchIOTransformers monadControl mtl network networkInfo
networkMulticast networkProtocolXmpp QuickCheck random regexTdfa
SafeSemaphore SHA stm text time transformers unixCompat utf8String
uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault
yesodForm yesodStatic
];
buildTools = [ bup curl git gnupg1 lsof openssh rsync ];
configureFlags = "-fS3
-fWebDAV
-fInotify
-fDbus
-f-Assistant
-f-Webapp
-fPairing
-fXMPP
-fDNS
-fProduction
-fTDFA";
preConfigure = "patchShebangs .";
checkPhase = ''
export HOME="$NIX_BUILD_TOP/tmp"
mkdir "$HOME"
cp dist/build/git-annex/git-annex git-annex
./git-annex test
'';
meta = {
homepage = "http://git-annex.branchable.com/";
description = "Manage files with git without checking them into git";
license = stdenv.lib.licenses.gpl3Plus;
longDescription = ''
Git-annex allows managing files with git, without checking the
file contents into git. While that may seem paradoxical, it is
useful when dealing with files larger than git can currently
easily handle, whether due to limitations in memory, checksumming
time, or disk space.
Even without file content tracking, being able to manage files
with git, move files around and delete files with versioned
directory trees, and use branches and distributed clones, are all
very handy reasons to use git. And annexed files can co-exist in
the same git repository with regularly versioned files, which is
convenient for maintaining documents, Makefiles, etc that are
associated with annexed files but that benefit from full revision
control.
'';
platforms = ghc.meta.platforms;
maintainers = [ stdenv.lib.maintainers.simons ];
description = "manage files with git, without checking their contents into git";
license = "GPL";
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
};
}
})

8
pkgs/applications/video/kdenlive/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon
, mlt, gettext , qimageblitz, qjson, shared_mime_info, soprano
, pkgconfig, shared_desktop_ontologies }:
, pkgconfig, shared_desktop_ontologies, libv4l }:
stdenv.mkDerivation rec {
name = "kdenlive-${version}";
@ -11,11 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "1rw2cbzy5mabwijvryyzbhpgldn2zy5jy4j87hl4m1i8ah9lgi7x";
};
buildInputs =
buildInputs =
[ cmake qt4 perl kdelibs automoc4 phonon mlt gettext qimageblitz
qjson shared_mime_info soprano pkgconfig shared_desktop_ontologies
qjson shared_mime_info soprano pkgconfig shared_desktop_ontologies libv4l
];
enableParallelBuilding = true;
meta = {
description = "Free and open source video editor";
license = "GPLv2+";

23
pkgs/development/compilers/idris/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ cabal, binary, Cabal, filepath, gmp, happy, haskeline
, languageJava, libffi, mtl, parsec, split, text, transformers
}:
cabal.mkDerivation (self: {
pname = "idris";
version = "0.9.8";
sha256 = "1mxc6mic3d508ni9pqxw8q31f27shyaxs1rchfl2jg58i9w6iy7h";
isLibrary = false;
isExecutable = true;
buildDepends = [
binary Cabal filepath haskeline languageJava libffi mtl parsec
split text transformers
];
buildTools = [ happy ];
extraLibraries = [ gmp ];
meta = {
homepage = "http://www.idris-lang.org/";
description = "Functional Programming Language with Dependent Types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

5
pkgs/development/compilers/mentor/default.nix
View File

@ -37,6 +37,11 @@ let
*gdb) patchelf --set-rpath "${ncurses}/lib" "$file";;
esac
done
# Manpages
mkdir -p "$out/share/man"
ln -s "$out"/share/doc/*/man/man1 "$out/share/man/man1"
ln -s "$out"/share/doc/*/man/man7 "$out/share/man/man7"
'';
meta = with stdenv.lib; {

15
pkgs/development/interpreters/php/5.4.nix
View File

@ -144,6 +144,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
configureFlags = ["--enable-zip"];
};
ftp = {
configureFlags = ["--enable-ftp"];
};
/*
php is build within this derivation in order to add the xdebug lines to the php.ini.
So both Apache and command line php both use xdebug without having to configure anything.
@ -181,13 +185,22 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
mcryptSupport = config.php.mcrypt or false;
bz2Support = config.php.bz2 or false;
zipSupport = config.php.zip or true;
ftpSupport = config.php.ftp or true;
};
configurePhase = ''
# Don't record the configure flags since this causes unnecessary
# runtime dependencies.
for i in main/build-defs.h.in scripts/php-config.in; do
substituteInPlace $i \
--replace '@CONFIGURE_COMMAND@' '(omitted)' \
--replace '@CONFIGURE_OPTIONS@' "" \
--replace '@PHP_LDFLAGS@' ""
done
iniFile=$out/etc/php-recommended.ini
[[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
echo configurePhase end
'';
installPhase = ''

2
pkgs/development/libraries/coin3d/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.1.3";
src = fetchurl {
url = "http://ftp.coin3d.org/coin/src/all/Coin-${version}.tar.gz";
url = "https://bitbucket.org/Coin3D/coin/downloads/Coin-${version}.tar.gz";
sha256 = "05ylhrcglm81dajbk132l1w892634z2i97x10fm64y1ih72phd2q";
};

2
pkgs/development/libraries/crypto++/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
# I add what 'enableParallelBuilding' would add to the make call,
# if we were using the generic build phase.
buildPhase = ''
make PREFIX="$out" all -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
make PREFIX="$out" all libcryptopp.so -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
'';
# TODO: Installing cryptotest.exe doesn't seem to be necessary. We run

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

@ -1,15 +1,15 @@
{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle
{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig
, guileBindings, guile, perl, gmp }:
assert guileBindings -> guile != null;
stdenv.mkDerivation (rec {
name = "gnutls-3.1.10";
name = "gnutls-3.1.12";
src = fetchurl {
url = "mirror://gnupg/gnutls/v3.1/${name}.tar.xz";
sha256 = "0in6wxlvpv48maawmbg3jysq2rhjqxypgi6kkr173hc8kksp6lsk";
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${name}.tar.xz";
sha256 = "025k37wsl21ncwrg489ysbjqsz8iralvgv98adj960sl03787lyc";
};
# Note: GMP is a dependency of Nettle, whose public headers include
@ -34,7 +34,7 @@ stdenv.mkDerivation (rec {
buildInputs = [ zlib lzo ]
++ stdenv.lib.optional guileBindings guile;
nativeBuildInputs = [ perl ];
nativeBuildInputs = [ perl pkgconfig ];
propagatedBuildInputs = [ nettle libtasn1 ];

6
pkgs/development/libraries/haskell/Agda/default.nix
View File

@ -1,6 +1,6 @@
{ cabal, alex, binary, deepseq, filepath, geniplate, happy
, hashable, hashtables, haskeline, haskellSrcExts, mtl, parallel
, QuickCheck, text, unorderedContainers, xhtml, zlib
, QuickCheck, text, time, unorderedContainers, xhtml, zlib
}:
cabal.mkDerivation (self: {
@ -11,8 +11,8 @@ cabal.mkDerivation (self: {
isExecutable = true;
buildDepends = [
binary deepseq filepath geniplate hashable hashtables haskeline
haskellSrcExts mtl parallel QuickCheck text unorderedContainers
xhtml zlib
haskellSrcExts mtl parallel QuickCheck text time
unorderedContainers xhtml zlib
];
buildTools = [ alex happy ];
jailbreak = true;

0
pkgs/development/libraries/haskell/hfuse/default.nix → pkgs/development/libraries/haskell/HFuse/default.nix
View File

3
pkgs/development/libraries/haskell/Hipmunk/default.nix
View File

@ -5,6 +5,9 @@ cabal.mkDerivation (self: {
version = "5.2.0.10";
sha256 = "0kq6dlx1g7dra7nsfmrc13yvnl7wh00fadmgln9v2vyf0ww82x95";
buildDepends = [ StateVar transformers ];
patchPhase = ''
sed -i -e 's|containers.*,|containers,|' Hipmunk.cabal
'';
meta = {
homepage = "http://patch-tag.com/r/felipe/hipmunk/home";
description = "A Haskell binding for Chipmunk";

4
pkgs/development/libraries/haskell/asn1-types/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "asn1-types";
version = "0.1.3";
sha256 = "1d55vhax71d29c2b6238pz1hqp4jnyvvfhs8f05qpcv754b4s4jg";
version = "0.2.0";
sha256 = "0350g5p3zbvm29nnjd554i6fyc47vmzpb42w6q46v3i9fiy23kvd";
buildDepends = [ time ];
meta = {
homepage = "http://github.com/vincenthz/hs-asn1-types";

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

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "0.2.2.6";
sha256 = "19ygaf2g4yqkfbc6bw6fmf9jsymbj1iallzvl0zw3vjx860rchfg";
buildDepends = [ mtl time ];
jailbreak = true;
meta = {
homepage = "http://github.com/tibbe/benchpress";
description = "Micro-benchmarking with detailed statistics";

16
pkgs/development/libraries/haskell/bmp/1.2.5.1.nix Normal file
View File

@ -0,0 +1,16 @@
{ cabal, binary }:
cabal.mkDerivation (self: {
pname = "bmp";
version = "1.2.5.1";
sha256 = "1q1g5p7kan9hqb4s50fz989c4p8vmfrs7qvwiqx9bcic8k7jqld4";
buildDepends = [ binary ];
jailbreak = true;
meta = {
homepage = "http://code.ouroborus.net/bmp";
description = "Read and write uncompressed BMP image files";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "certificate";
version = "1.3.7";
sha256 = "06sfka5p381gayx2q7vvyr7dl8q8d4jfqdrys3k0z8fjxdbqrqya";
version = "1.3.8";
sha256 = "1id3jfaisl04n1mjj9lbq3gyz8hyn3r9p9chzmfbra0pcj3vf1m0";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "1.0.5";
sha256 = "0w8japlx0darpf67ki753l0kw64lgisr1dww3alfwjlya0k84z65";
version = "1.0.6";
sha256 = "0da5wxhsfjgcn850iimcp15vhg5lw0fa8i7c3hdw4yvrpza14dcn";
buildDepends = [
liftedBase mmorph monadControl resourcet text transformers
transformersBase void

13
pkgs/development/libraries/haskell/criterion/default.nix
View File

@ -1,14 +1,15 @@
{ cabal, aeson, deepseq, filepath, hastache, mtl, mwcRandom, parsec
, statistics, time, transformers, vector, vectorAlgorithms
{ cabal, aeson, binary, deepseq, filepath, Glob, hastache, mtl
, mwcRandom, parsec, statistics, time, transformers, vector
, vectorAlgorithms
}:
cabal.mkDerivation (self: {
pname = "criterion";
version = "0.6.2.1";
sha256 = "08gbs61qqsq0kh2r33kzm9mmbs3ar5krmp1a0cf21c012k6k55z5";
version = "0.8.0.0";
sha256 = "05v4glwvidsd4gm2jcvmlcpfaxg2x0fb69w051rbwg9scanrm7bf";
buildDepends = [
aeson deepseq filepath hastache mtl mwcRandom parsec statistics
time transformers vector vectorAlgorithms
aeson binary deepseq filepath Glob hastache mtl mwcRandom parsec
statistics time transformers vector vectorAlgorithms
];
meta = {
homepage = "https://github.com/bos/criterion";

4
pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "crypto-pubkey-types";
version = "0.3.2";
sha256 = "12gzx4mj8rc243vvjkzvrxnj2f7x3z86yfgahx3my5vsaw4bix2h";
version = "0.4.0";
sha256 = "0bapzvd0xgv38mbj1xhzcswchnx81sq0wwyax3qqzcpgvcyz28sl";
buildDepends = [ asn1Types ];
meta = {
homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types";

4
pkgs/development/libraries/haskell/crypto-pubkey/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "crypto-pubkey";
version = "0.1.3";
sha256 = "154bclz7mg2v7q72y6y0ylw0b28527nsmc8f6zf6ja5l9c9skw0g";
version = "0.1.4";
sha256 = "13ah3ip6gdv7b1zz5qwi7515a3k8pp3l0jr1kq4q2a0vqy24gkn1";
buildDepends = [
cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandomApi
];

5
pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
View File

@ -3,12 +3,11 @@
cabal.mkDerivation (self: {
pname = "digestive-functors-heist";
version = "0.6.2.1";
sha256 = "1hs1qiaakxgv1lyd74cahqphrpqch1wayx0c9zpgjja3bnwjcj8n";
version = "0.7.0.0";
sha256 = "0ljsr4yy3pb4cjg9dcgfcs9rn1ihg3xi9ak5p3h3kw3w19d1hsaq";
buildDepends = [
blazeBuilder digestiveFunctors heist mtl text xmlhtml
];
jailbreak = true;
meta = {
homepage = "http://github.com/jaspervdj/digestive-functors";
description = "Heist frontend for the digestive-functors library";

14
pkgs/development/libraries/haskell/digestive-functors/default.nix
View File

@ -1,11 +1,17 @@
{ cabal, HUnit, mtl, testFramework, testFrameworkHunit, text }:
{ cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2, text
}:
cabal.mkDerivation (self: {
pname = "digestive-functors";
version = "0.6.0.1";
sha256 = "1ni1hfmpz14yvgjphwz64hqhg7xbhvvqbdnapspipplvnl0rcmhi";
version = "0.6.1.0";
sha256 = "0p38q8xz01vjn1mf718xi5ny3i7z9zd00lnnybmd6zy03laq4a2d";
buildDepends = [ mtl text ];
testDepends = [ HUnit mtl testFramework testFrameworkHunit text ];
testDepends = [
HUnit mtl QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2 text
];
jailbreak = true;
meta = {
homepage = "http://github.com/jaspervdj/digestive-functors";
description = "A practical formlet library";

1
pkgs/development/libraries/haskell/distributed-process/default.nix
View File

@ -20,6 +20,7 @@ cabal.mkDerivation (self: {
testFrameworkHunit
];
noHaddock = true;
jailbreak = true;
doCheck = false;
meta = {
homepage = "http://github.com/haskell-distributed/distributed-process";

4
pkgs/development/libraries/haskell/file-embed/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "file-embed";
version = "0.0.4.7";
sha256 = "1hn08499kay0y6ik5z1s58s8r9h1nzf116avgi6ia4b565wpzkvi";
version = "0.0.4.8";
sha256 = "1jq4jdrxw822gzz7mc07nx4yj233mwmykp6xk371pf3hnq8rly0h";
buildDepends = [ filepath ];
testDepends = [ filepath HUnit ];
meta = {

4
pkgs/development/libraries/haskell/ghc-mod/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "ghc-mod";
version = "2.0.2";
sha256 = "1j2av7lcsnpizy6lyykk47rmm07rkfjyg9glfi7ma5cg082v15ni";
version = "2.0.3";
sha256 = "0f0n4cqpspad3ygw89rp8wj1gxb7mv5zrd8938zm1rn2mimihggr";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "gloss";
version = "1.7.8.2";
sha256 = "0jf49vdms8jzygkwch5k8s611pay0xqwq1lc0p476d37rzb8qpn4";
version = "1.7.8.3";
sha256 = "0wbp8bz5c3hzix6r7nbg6dmakb77i3lq4hgjk3gd8mvksd3n97jr";
buildDepends = [ bmp GLUT OpenGL ];
jailbreak = true;
meta = {

23
pkgs/development/libraries/haskell/happstack/happstack-util.nix
View File

@ -1,23 +0,0 @@
{ cabal, extensibleExceptions, filepath, hslogger, mtl, network
, parsec, random, time, unixCompat
}:
cabal.mkDerivation (self: {
pname = "happstack-util";
version = "6.0.3";
sha256 = "0hqssd5wzir6rxn46q8r3hdp3nl7v5m7w322j39120xpg2bhiphh";
isLibrary = true;
isExecutable = true;
buildDepends = [
extensibleExceptions filepath hslogger mtl network parsec random
time unixCompat
];
jailbreak = true;
meta = {
homepage = "http://happstack.com";
description = "Web framework";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

12
pkgs/development/libraries/haskell/hledger-lib/default.nix
View File

@ -1,15 +1,21 @@
{ cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, prettyShow
, regexCompat, regexpr, safe, split, time, transformers, utf8String
, regexCompat, regexpr, safe, split, testFramework
, testFrameworkHunit, time, transformers, utf8String
}:
cabal.mkDerivation (self: {
pname = "hledger-lib";
version = "0.20.0.1";
sha256 = "1skm2jii7d8b6a6i98xwxckxwhikgj44823wqzdk8f3bq9zlwhcg";
version = "0.21.2";
sha256 = "07li348kmwz9j4bfgmkq7zs9nyqxi5hhydij2fg4jwj0hbfxvmy9";
buildDepends = [
cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat
regexpr safe split time transformers utf8String
];
testDepends = [
cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat
regexpr safe split testFramework testFrameworkHunit time
transformers
];
meta = {
homepage = "http://hledger.org";
description = "Core data types, parsers and utilities for the hledger accounting tool";

25
pkgs/development/libraries/haskell/hledger-web/default.nix
View File

@ -1,26 +1,25 @@
{ cabal, blazeHtml, blazeMarkup, clientsession, cmdargs
, dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib
, httpConduit, HUnit, monadControl, networkConduit, parsec, regexpr
, safe, shakespeareCss, shakespeareJs, shakespeareText, text, time
, transformers, wai, waiExtra, waiHandlerLaunch, warp, yaml, yesod
, yesodCore, yesodDefault, yesodForm, yesodStatic, yesodTest
, dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib, hspec
, httpConduit, HUnit, json, networkConduit, parsec, regexpr, safe
, shakespeareText, text, time, transformers, wai, waiExtra
, waiHandlerLaunch, warp, yaml, yesod, yesodCore, yesodPlatform
, yesodStatic, yesodTest
}:
cabal.mkDerivation (self: {
pname = "hledger-web";
version = "0.20.0.1";
sha256 = "0fq3wfsy2ykyplr66ac91yd2vwzfw3ji8mq9q4jn58nnh6bgxfa1";
version = "0.21.2";
sha256 = "1z8nyvqzyjh36g50w4gmh8mzvydanfn1s3gx4nliwk4mjfj4bbkl";
isLibrary = true;
isExecutable = true;
buildDepends = [
blazeHtml blazeMarkup clientsession cmdargs dataDefault filepath
hamlet hjsmin hledger hledgerLib httpConduit HUnit monadControl
networkConduit parsec regexpr safe shakespeareCss shakespeareJs
shakespeareText text time transformers wai waiExtra
waiHandlerLaunch warp yaml yesod yesodCore yesodDefault yesodForm
yesodStatic
hamlet hjsmin hledger hledgerLib httpConduit HUnit json
networkConduit parsec regexpr safe shakespeareText text time
transformers wai waiExtra waiHandlerLaunch warp yaml yesod
yesodCore yesodPlatform yesodStatic
];
testDepends = [ yesodCore yesodDefault yesodTest ];
testDepends = [ hspec yesod yesodTest ];
doCheck = false;
meta = {
homepage = "http://hledger.org";

16
pkgs/development/libraries/haskell/hledger/default.nix
View File

@ -1,18 +1,24 @@
{ cabal, cmdargs, filepath, haskeline, hledgerLib, HUnit, mtl
, parsec, regexpr, safe, shakespeareText, split, text, time
, utf8String
{ cabal, cmdargs, csv, filepath, haskeline, hledgerLib, HUnit, mtl
, parsec, prettyShow, regexCompat, regexpr, safe, shakespeareText
, split, testFramework, testFrameworkHunit, text, time
, transformers, utf8String
}:
cabal.mkDerivation (self: {
pname = "hledger";
version = "0.20.0.1";
sha256 = "0sdsxdydpmnarxz94py8rlbcffpan7l299ff7j9gn4f42z3sarw7";
version = "0.21.2";
sha256 = "04n9bm97zqh8am83fr2aflw3gv5nwm9jm7bp9vzd4986f1c43ig3";
isLibrary = true;
isExecutable = true;
buildDepends = [
cmdargs filepath haskeline hledgerLib HUnit mtl parsec regexpr safe
shakespeareText split text time utf8String
];
testDepends = [
cmdargs csv filepath haskeline hledgerLib HUnit mtl parsec
prettyShow regexCompat regexpr safe shakespeareText split
testFramework testFrameworkHunit text time transformers
];
meta = {
homepage = "http://hledger.org";
description = "The main command-line interface for the hledger accounting tool";

4
pkgs/development/libraries/haskell/hs-bibutils/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hs-bibutils";
version = "4.17.1";
sha256 = "0qn3kibwwiaandmk672n9lki431934qahj81r4yj2acmyv6fcycf";
version = "5.0";
sha256 = "18gchn62g2cqzyj1nr8wd5i6smhq739g00cblkllj1jkni33ch2l";
buildDepends = [ syb ];
meta = {
homepage = "http://gorgias.mine.nu/repos/hs-bibutils/";

4
pkgs/development/libraries/haskell/http-conduit/default.nix
View File

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.9.3";
sha256 = "03c08jj6941kxl5iw60n8s8qnxp2rsfgfmf7m761iy7i7hsj1rkk";
version = "1.9.4";
sha256 = "0zm8m3nvxyc9z3b8d47ggx56raqpz1aa8r268k6gidpc5zpad2yl";
buildDepends = [
asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
caseInsensitive certificate conduit cookie cprngAes dataDefault

1
pkgs/development/libraries/haskell/language-c-quote/default.nix
View File

@ -15,6 +15,7 @@ cabal.mkDerivation (self: {
HUnit srcloc symbol testFramework testFrameworkHunit
];
buildTools = [ alex happy ];
jailbreak = true;
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";
description = "C/CUDA/OpenCL/Objective-C quasiquoting library";

22
pkgs/development/libraries/haskell/language-java/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ cabal, alex, cpphs, filepath, HUnit, mtl, parsec, QuickCheck, syb
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
}:
cabal.mkDerivation (self: {
pname = "language-java";
version = "0.2.4";
sha256 = "1fb36xq75mzmbsh25s0pscazvz6nvfy2mn1270653m7s3gdgcs5f";
buildDepends = [ cpphs parsec syb ];
testDepends = [
filepath HUnit mtl QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2
];
buildTools = [ alex ];
doCheck = false;
meta = {
homepage = "http://github.com/vincenthz/language-java";
description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

13
pkgs/development/libraries/haskell/libffi/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ cabal, libffi }:
cabal.mkDerivation (self: {
pname = "libffi";
version = "0.1";
sha256 = "0g7jnhng3j7z5517aaqga0144aamibsbpgm3yynwyfzkq1kp0f28";
pkgconfigDepends = [ libffi ];
meta = {
description = "A binding to libffi";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

13
pkgs/development/libraries/haskell/liblastfm/default.nix
View File

@ -1,14 +1,15 @@
{ cabal, aeson, attoparsec, cereal, cryptoApi, httpConduit
, httpTypes, HUnit, network, pureMD5, testFramework
, testFrameworkHunit, text
{ cabal, aeson, attoparsec, cereal, contravariant, cryptoApi
, httpConduit, httpTypes, HUnit, network, pureMD5, testFramework
, testFrameworkHunit, text, void
}:
cabal.mkDerivation (self: {
pname = "liblastfm";
version = "0.1.1.2";
sha256 = "1zckgjc0r2s1s6s9s309dr2ri8bzj1fi8gcbhm3hifczq1v149w9";
version = "0.2.0.0";
sha256 = "1x147mry8pq8qzrhrsbxm4b7sb80c9900kq2igwvcskwszd5h56n";
buildDepends = [
aeson cereal cryptoApi httpConduit httpTypes network pureMD5 text
aeson cereal contravariant cryptoApi httpConduit httpTypes network
pureMD5 text void
];
testDepends = [
aeson attoparsec HUnit testFramework testFrameworkHunit text

4
pkgs/development/libraries/haskell/lifted-base/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "lifted-base";
version = "0.2.0.5";
sha256 = "1an7wlz31szccbypbrh59i3py210mh7jbfi0zaizd32q0im1573r";
version = "0.2.1.0";
sha256 = "0c4vzyfyjvqv5q8mprgxf9ckibpp5k1zh9k5slmdsd9m1l3pwwqy";
buildDepends = [
baseUnicodeSymbols monadControl transformersBase
];

4
pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix → pkgs/development/libraries/haskell/monad-par/0.3.4.2.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "monad-par";
version = "0.3.4.1";
sha256 = "0v0gnxzv49zvmgm2cb20dlb8m7mn4chpwrc61g4zp69nabjpwwm8";
version = "0.3.4.2";
sha256 = "1k10m4w2g92psahsvcyi98sc31wg5anijp46lbsipi2r2gxxc7bs";
buildDepends = [
abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
parallel

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "mongoDB";
version = "1.3.2";
sha256 = "0gv0i2z6f797ibjfp16ax2aiqa66sclxjy8sabrwydwcyr96xb4y";
version = "1.4.0";
sha256 = "1cj73k6lfpxmfaigqwwglnncfl1ikz6yjgs0d9f6k42kwysbddwz";
buildDepends = [
binary bson cryptohash liftedBase monadControl mtl network parsec
random randomShuffle text transformersBase

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "multiarg";
version = "0.14.0.0";
sha256 = "05zibar3yqwz2k2ihpby8jdfr4qniz2cz2989sxjf72hqih0g9pb";
version = "0.16.0.0";
sha256 = "086mnhbp1d3n0xdn4cdlyrkkgrykg4bwhi7sbfdmn688qhpl3g9m";
buildDepends = [ explicitException utf8String ];
meta = {
homepage = "https://github.com/massysett/multiarg";

5
pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
View File

@ -4,13 +4,12 @@
cabal.mkDerivation (self: {
pname = "network-protocol-xmpp";
version = "0.4.4";
sha256 = "0l2s412aazli80jszdl1am01z14a0q2z8fsxxjawk4cy70d6f4ry";
version = "0.4.5";
sha256 = "1phnd9nygpc8gmyriwaqjnvygxi5zg4nx2i1m3vwwxql221420gg";
buildDepends = [
gnuidn gnutls gsasl libxmlSax monadsTf network text transformers
xmlTypes
];
jailbreak = true;
meta = {
homepage = "https://john-millikin.com/software/haskell-xmpp/";
description = "Client library for the XMPP protocol";

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "parseargs";
version = "0.1.3.4";
sha256 = "1n55ay42qiwm72fa63xbz5m5fi0ld5dr3vypmyz5mc0zzhqwxz2j";
version = "0.1.3.5";
sha256 = "1ig1n2nnicmy71qwcl5hkdk4mvwq0mz6zr5h9kw329lgvr9cyzyc";
isLibrary = true;
isExecutable = true;
meta = {

11
pkgs/development/libraries/haskell/persistent-postgresql/default.nix
View File

@ -1,16 +1,15 @@
{ cabal, aeson, conduit, monadControl, persistent, postgresqlLibpq
, postgresqlSimple, text, time, transformers
{ cabal, aeson, blazeBuilder, conduit, monadControl, persistent
, postgresqlLibpq, postgresqlSimple, text, time, transformers
}:
cabal.mkDerivation (self: {
pname = "persistent-postgresql";
version = "1.1.3.1";
sha256 = "1lbr4x45hzk73439x6is9zw6y3mqy1ivmblncvg70kzw0kmjhpnk";
version = "1.2.0";
sha256 = "0i5ha1vs91makwrw4qqwdzp92i24ynmmsmjyqpik6q80fxxiwps6";
buildDepends = [
aeson conduit monadControl persistent postgresqlLibpq
aeson blazeBuilder conduit monadControl persistent postgresqlLibpq
postgresqlSimple text time transformers
];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/book/persistent";
description = "Backend for the persistent library using postgresql";

4
pkgs/development/libraries/haskell/persistent-sqlite/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "persistent-sqlite";
version = "1.1.5";
sha256 = "1kqxp0qsvxfz352yg9k1wgb2nfm7kcz8xdj9q537ilh99wxkp6cl";
version = "1.2.0";
sha256 = "09xd9z16rcq9ymx5ysshzdr30lih55b9kasvbq5xw6wq7lvg6q4h";
buildDepends = [
aeson conduit monadControl monadLogger persistent text transformers
];

12
pkgs/development/libraries/haskell/persistent-template/default.nix
View File

@ -1,12 +1,14 @@
{ cabal, aeson, hspec, monadControl, persistent, QuickCheck, text
, transformers
{ cabal, aeson, hspec, monadControl, monadLogger, persistent
, QuickCheck, text, transformers
}:
cabal.mkDerivation (self: {
pname = "persistent-template";
version = "1.1.3.1";
sha256 = "0171x8mv3ff9ppllkp3mgpwa8p1zg3y6fykq70z9h0hx1ny0407p";
buildDepends = [ aeson monadControl persistent text transformers ];
version = "1.2.0.1";
sha256 = "1l8ws4mijl0cwcl14ms8hibfgcn3y6b1679xc0cdyz1ifiymkdns";
buildDepends = [
aeson monadControl monadLogger persistent text transformers
];
testDepends = [ aeson hspec persistent QuickCheck text ];
meta = {
homepage = "http://www.yesodweb.com/book/persistent";

10
pkgs/development/libraries/haskell/persistent/default.nix
View File

@ -7,15 +7,19 @@
cabal.mkDerivation (self: {
pname = "persistent";
version = "1.1.5.1";
sha256 = "1ds0q3mzgg60makx7impyxsvpzd3issa89igcy176yb54ypjwfnz";
version = "1.2.0.1";
sha256 = "1bs74g1fkwq4wvz18lp0ial6z58vpslgv0rqdn91ka6gw8k4fvlb";
buildDepends = [
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
liftedBase monadControl monadLogger pathPieces poolConduit
resourcet silently text time transformers transformersBase
unorderedContainers vector
];
testDepends = [ hspec text ];
testDepends = [
aeson attoparsec base64Bytestring blazeHtml conduit hspec
monadControl monadLogger pathPieces resourcet text time
transformers unorderedContainers vector
];
extraLibraries = [ sqlite ];
meta = {
homepage = "http://www.yesodweb.com/book/persistent";

13
pkgs/development/libraries/haskell/pipes-concurrency/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ cabal, pipes, stm, transformers }:
cabal.mkDerivation (self: {
pname = "pipes-concurrency";
version = "1.1.0";
sha256 = "05xpwxhf08yf88ya89f8gcy4vphi6qxyccf2yiyi5zrf6c2pkr00";
buildDepends = [ pipes stm transformers ];
meta = {
description = "Concurrency for the pipes ecosystem";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

13
pkgs/development/libraries/haskell/pipes-parse/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ cabal, pipes }:
cabal.mkDerivation (self: {
pname = "pipes-parse";
version = "1.0.0";
sha256 = "0fk39a6d0ik5ghwyj6yyi9d0cj2sp22812fin7amcxcafrplf88w";
buildDepends = [ pipes ];
meta = {
description = "Parsing infrastructure for the pipes ecosystem";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

13
pkgs/development/libraries/haskell/pipes-safe/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ cabal, pipes, transformers }:
cabal.mkDerivation (self: {
pname = "pipes-safe";
version = "1.2.0";
sha256 = "0ki9i9378j8kgw5dd91b38r686pcr9fl2vf9dfgfshia072ppggj";
buildDepends = [ pipes transformers ];
meta = {
description = "Safety for the pipes ecosystem";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

13
pkgs/development/libraries/haskell/pipes/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ cabal, mmorph, transformers }:
cabal.mkDerivation (self: {
pname = "pipes";
version = "3.3.0";
sha256 = "1bgznfv7hxqwj5f7vkm8d41phw63bl2swzr0wrz0pcqxlr42likb";
buildDepends = [ mmorph transformers ];
meta = {
description = "Compositional pipelines";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

8
pkgs/development/libraries/haskell/postgresql-simple/default.nix
View File

@ -5,13 +5,15 @@
cabal.mkDerivation (self: {
pname = "postgresql-simple";
version = "0.2.4.1";
sha256 = "09yszkiahfyidaq9yfk4mda5sf1m8bcqqag51vasybln9k9hhws3";
version = "0.3.3.0";
sha256 = "0srkalfg41gdnzwwa2bmwwrcdqnw13f7b94wv4d5a6sg6yf1ry1l";
buildDepends = [
attoparsec blazeBuilder blazeTextual postgresqlLibpq text time
transformers vector
];
testDepends = [ base16Bytestring cryptohash HUnit text time ];
testDepends = [
base16Bytestring cryptohash HUnit text time vector
];
doCheck = false;
meta = {
description = "Mid-Level PostgreSQL client library";

4
pkgs/development/libraries/haskell/repa-examples/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "repa-examples";
version = "3.2.3.1";
sha256 = "1lflgpnig2ks2mwp7bywyjqr2v426gbk1675mkkvjncgr5ahf11g";
version = "3.2.3.2";
sha256 = "1l8bvaaap5gl62j9zinjgj8vlqq4b52p46hnj8kq9n09lxq6xq96";
isLibrary = false;
isExecutable = true;
buildDepends = [

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "repa";
version = "3.2.3.2";
sha256 = "0xwaqkir4gjlhnvd1r69ycswg4p65ig38d2np69hv195zr47pmvh";
version = "3.2.3.3";
sha256 = "0rdny7yjcmz9iy07sqnjmwyr58f0kyzzdycwi55j963rb4vqkacn";
buildDepends = [ QuickCheck vector ];
meta = {
homepage = "http://repa.ouroborus.net";

7
pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
View File

@ -1,10 +1,11 @@
{ cabal, parsec, shakespeare, text }:
{ cabal, hspec, parsec, shakespeare, text }:
cabal.mkDerivation (self: {
pname = "shakespeare-i18n";
version = "1.0.0.2";
sha256 = "11ydkl6v31v79q8a8fqf4p99p7dv9dlimr3rhi9cs5lrxz9gmf5z";
version = "1.0.0.3";
sha256 = "0k5daz6ayc4d6zxsq7p27bp5fq4qr31qxw9z9mwb5xcz2404d00r";
buildDepends = [ parsec shakespeare text ];
testDepends = [ hspec text ];
meta = {
homepage = "http://www.yesodweb.com/book/shakespearean-templates";
description = "A type-based approach to internationalization";

14
pkgs/development/libraries/haskell/statistics/default.nix
View File

@ -1,16 +1,16 @@
{ cabal, deepseq, erf, HUnit, ieee754, mathFunctions, monadPar
, mwcRandom, primitive, QuickCheck, testFramework
{ cabal, binary, deepseq, erf, HUnit, ieee754, mathFunctions
, monadPar, mwcRandom, primitive, QuickCheck, testFramework
, testFrameworkHunit, testFrameworkQuickcheck2, vector
, vectorAlgorithms
, vectorAlgorithms, vectorBinaryInstances
}:
cabal.mkDerivation (self: {
pname = "statistics";
version = "0.10.3.1";
sha256 = "12abfqxsriqlncr60wwcsm0q41hmqc6vp9p1hmnv2l3qqcisk60s";
version = "0.10.4.1";
sha256 = "0kd3zn8ckz3h9dnighmfviacw5cy6czsj90ryn8c0h6yb2s3gqi1";
buildDepends = [
deepseq erf mathFunctions monadPar mwcRandom primitive vector
vectorAlgorithms
binary deepseq erf mathFunctions monadPar mwcRandom primitive
vector vectorAlgorithms vectorBinaryInstances
];
testDepends = [
erf HUnit ieee754 mathFunctions mwcRandom primitive QuickCheck

4
pkgs/development/libraries/haskell/stm-chans/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "stm-chans";
version = "2.0.0";
sha256 = "041dmjmr70was4vxf1ihizzarms7a8x53m80i65ggxxmq5xqmsa3";
version = "3.0.0";
sha256 = "1nnl5h88dshcmk0ydhkf84kkf6989igxry9r0z7lwlxfgf7q9nim";
buildDepends = [ stm ];
meta = {
homepage = "http://code.haskell.org/~wren/";

4
pkgs/development/libraries/haskell/stm-conduit/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "stm-conduit";
version = "1.1.0";
sha256 = "1b5v3vf9izzpw3vaslskhdxqnc1zmag1f3x50dh8r1nl318ndkf7";
version = "2.1.0";
sha256 = "0rxnw7kpxvhwmpbn2v9ps0b2hw9321817nyywjjq3x8fadg8w99l";
buildDepends = [ conduit resourcet stm stmChans transformers ];
testDepends = [
conduit HUnit QuickCheck stm stmChans testFramework

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

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "0.1.4";
sha256 = "00318syprv1ixfbr4v7xq86z10f0psxk0b8kaxvawvacm8hp61bn";
buildDepends = [ deepseq syb ];
jailbreak = true;
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";
description = "A 'Symbol' type for fast symbol comparison";

4
pkgs/development/libraries/haskell/tls-extra/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "tls-extra";
version = "0.6.1";
sha256 = "0gc3dz3s188jk6q2lai56y4ckxh62s9gm04d7jznr6jzpx2i4fan";
version = "0.6.4";
sha256 = "058ia1cabs7ribz287iqkkjvqpp2n7c219f3xc92fhm0qq00mh5n";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/wai-extra/default.nix
View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "wai-extra";
version = "1.3.4";
sha256 = "1ay82q58pizc48rh4d8z7ybf2jjvzxqylj6mx34nvrxxlmxf5gfx";
version = "1.3.4.2";
sha256 = "14mrvh3av6dn4jx5q06b4lyjw8sr1ynygbncf5fbp3nzn8nmh17s";
buildDepends = [
ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
caseInsensitive conduit dataDefault dateCache fastLogger httpTypes

4
pkgs/development/libraries/haskell/wai-logger/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "wai-logger";
version = "0.3.0";
sha256 = "132jcjyqr7bxcfi7v9mapvx8dci0lz8rv91mgnrzgvpac542c2yq";
version = "0.3.1";
sha256 = "0x1d67fcfpjrgyjr7hipifqrzk13x8z8xmlj7h999r8mswijhgii";
buildDepends = [
blazeBuilder byteorder caseInsensitive dateCache fastLogger
httpTypes network wai

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "wai";
version = "1.4.0";
sha256 = "1213sib2qp1xafrrnmkxabgkba0g00awy6dx9jnlfkj5r6m32wdq";
version = "1.4.0.1";
sha256 = "1d08mp7dpf8iw50yjysr5p7fc9jgdcwql943p9c11x35n2ks6z2n";
buildDepends = [
blazeBuilder conduit httpTypes network text transformers vault
];

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "warp";
version = "1.3.8.1";
sha256 = "07kzfv8j9x6qhl9kjhyl6gricq88y6ys48vml4chqnd8sg9vki3x";
version = "1.3.8.2";
sha256 = "0s8na04n21glgkc0bcc0171ikh9cagx35s2h6i1pb5pwa8l0akv6";
buildDepends = [
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
httpTypes liftedBase network networkConduit simpleSendfile

3
pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
View File

@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
sha256 = "0d79hr6cz9zj3w57h6630nfnsmfq1w73gz04jjmlhwh8ih557imw";
buildDepends = [ filepath parsec stm time wxc wxdirect ];
extraLibraries = [ libX11 mesa wxGTK ];
patchPhase = ''
sed -i -e 's|containers >=.*|containers|' wxcore.cabal
'';
meta = {
homepage = "http://haskell.org/haskellwiki/WxHaskell";
description = "wxHaskell core";

3
pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
View File

@ -7,6 +7,9 @@ cabal.mkDerivation (self: {
isLibrary = true;
isExecutable = true;
buildDepends = [ parsec strict time ];
patchPhase = ''
sed -i -e 's|containers >=.*|containers|' wxdirect.cabal
'';
meta = {
homepage = "http://haskell.org/haskellwiki/WxHaskell";
description = "helper tool for building wxHaskell";

5
pkgs/development/libraries/haskell/xdot/default.nix
View File

@ -2,10 +2,9 @@
cabal.mkDerivation (self: {
pname = "xdot";
version = "0.2.3";
sha256 = "0xb8igsqydiw1w00frn4mxkflhxkayif2vivxmq5fk53am2f43wy";
version = "0.2.3.1";
sha256 = "1gricrnssxgzaq1z7nnyppmz284nix0m89477x22mal125pkcf7n";
buildDepends = [ cairo graphviz gtk mtl polyparse text ];
jailbreak = true;
meta = {
description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
license = self.stdenv.lib.licenses.bsd3;

26
pkgs/development/libraries/haskell/yesod-auth/default.nix
View File

@ -1,21 +1,21 @@
{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, fileEmbed
, hamlet, httpConduit, httpTypes, liftedBase, mimeMail, network
, persistent, persistentTemplate, pureMD5, pwstoreFast, random, SHA
, shakespeareCss, shakespeareJs, text, transformers
, unorderedContainers, wai, yesodCore, yesodForm, yesodJson
, yesodPersistent
{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, dataDefault
, emailValidate, fileEmbed, hamlet, httpConduit, httpTypes
, liftedBase, mimeMail, network, persistent, persistentTemplate
, pureMD5, pwstoreFast, random, resourcet, SHA, shakespeareCss
, shakespeareJs, text, transformers, unorderedContainers, wai
, yesodCore, yesodForm, yesodPersistent
}:
cabal.mkDerivation (self: {
pname = "yesod-auth";
version = "1.1.7";
sha256 = "0vsgpvmsmdzbwj5l862bzm21ld3adkmbwgkffbpjr4yylbvvyvrn";
version = "1.2.0.1";
sha256 = "02nljkc12mgjhvkiv876w6w13q9s9iigya8v4jzj6myv48lainvd";
buildDepends = [
aeson authenticate blazeHtml blazeMarkup fileEmbed hamlet
httpConduit httpTypes liftedBase mimeMail network persistent
persistentTemplate pureMD5 pwstoreFast random SHA shakespeareCss
shakespeareJs text transformers unorderedContainers wai yesodCore
yesodForm yesodJson yesodPersistent
aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate
fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network
persistent persistentTemplate pureMD5 pwstoreFast random resourcet
SHA shakespeareCss shakespeareJs text transformers
unorderedContainers wai yesodCore yesodForm yesodPersistent
];
meta = {
homepage = "http://www.yesodweb.com/";

37
pkgs/development/libraries/haskell/yesod-core/default.nix
View File

@ -1,29 +1,30 @@
{ cabal, aeson, blazeBuilder, blazeHtml, blazeMarkup
, caseInsensitive, cereal, clientsession, conduit, cookie, failure
, fastLogger, hamlet, hspec, httpTypes, HUnit, liftedBase
, monadControl, monadLogger, parsec, pathPieces, QuickCheck, random
, resourcet, shakespeare, shakespeareCss, shakespeareI18n
, shakespeareJs, text, time, transformers, transformersBase, vector
, wai, waiExtra, waiTest, yesodRoutes
{ cabal, aeson, attoparsecConduit, blazeBuilder, blazeHtml
, blazeMarkup, caseInsensitive, cereal, clientsession, conduit
, cookie, dataDefault, failure, fastLogger, hamlet, hspec
, httpTypes, HUnit, liftedBase, monadControl, monadLogger, parsec
, pathPieces, QuickCheck, random, resourcet, safe, shakespeare
, shakespeareCss, shakespeareI18n, shakespeareJs, text, time
, transformers, transformersBase, vector, wai, waiExtra, waiTest
, warp, yesodRoutes
}:
cabal.mkDerivation (self: {
pname = "yesod-core";
version = "1.1.8.3";
sha256 = "116vglpqh2561g0gzhm4ijwx829c50ai1hh715vwi5j5i01y2rkr";
version = "1.2.1";
sha256 = "1p9xaw0d9dx68q7i99kjcqy1lhmd164drbcw3489560wa71mwamk";
buildDepends = [
aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
clientsession conduit cookie failure fastLogger hamlet httpTypes
liftedBase monadControl monadLogger parsec pathPieces random
resourcet shakespeare shakespeareCss shakespeareI18n shakespeareJs
text time transformers transformersBase vector wai waiExtra
yesodRoutes
aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
caseInsensitive cereal clientsession conduit cookie dataDefault
failure fastLogger hamlet httpTypes liftedBase monadControl
monadLogger parsec pathPieces random resourcet safe shakespeare
shakespeareCss shakespeareI18n shakespeareJs text time transformers
transformersBase vector wai waiExtra warp yesodRoutes
];
testDepends = [
blazeBuilder conduit hamlet hspec httpTypes HUnit QuickCheck random
shakespeareCss shakespeareJs text transformers wai waiTest
blazeBuilder conduit hamlet hspec httpTypes HUnit liftedBase
QuickCheck random resourcet shakespeareCss shakespeareJs text
transformers wai waiTest
];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/";
description = "Creation of type-safe, RESTful web applications";

17
pkgs/development/libraries/haskell/yesod-default/default.nix
View File

@ -1,20 +1,13 @@
{ cabal, dataDefault, hamlet, networkConduit, safe, shakespeareCss
, shakespeareJs, text, transformers, unorderedContainers, wai
, waiExtra, warp, yaml, yesodCore
}:
{ cabal, yesodCore }:
cabal.mkDerivation (self: {
pname = "yesod-default";
version = "1.1.3.2";
sha256 = "07gm9sj4c231wdmfmb7df1s8wvqa6fw7nhcq554h16h2ibv5pcqg";
buildDepends = [
dataDefault hamlet networkConduit safe shakespeareCss shakespeareJs
text transformers unorderedContainers wai waiExtra warp yaml
yesodCore
];
version = "1.2.0";
sha256 = "15nsknnxnfbkpg4pswxcpgfb2y0hz0xxj56jknd93hcm7aay36pk";
buildDepends = [ yesodCore ];
meta = {
homepage = "http://www.yesodweb.com/";
description = "Default config and main functions for your yesod application";
description = "Default config and main functions for your yesod application (deprecated)";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];

12
pkgs/development/libraries/haskell/yesod-form/default.nix
View File

@ -1,18 +1,18 @@
{ cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup
, cryptoApi, dataDefault, emailValidate, hamlet, hspec, network
, persistent, shakespeareCss, shakespeareJs, text, time
, persistent, resourcet, shakespeareCss, shakespeareJs, text, time
, transformers, wai, xssSanitize, yesodCore, yesodPersistent
}:
cabal.mkDerivation (self: {
pname = "yesod-form";
version = "1.2.1.3";
sha256 = "1mrqr6pfrhkk0vv9lhd4wxiic8d1hsraiqmjcqsfbpdyrc6fqypq";
version = "1.3.0";
sha256 = "1y729h61w30yi4mcva727317gdc70nhn6jzxb7fmc9hqgnh136nc";
buildDepends = [
aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
dataDefault emailValidate hamlet network persistent shakespeareCss
shakespeareJs text time transformers wai xssSanitize yesodCore
yesodPersistent
dataDefault emailValidate hamlet network persistent resourcet
shakespeareCss shakespeareJs text time transformers wai xssSanitize
yesodCore yesodPersistent
];
testDepends = [ hspec text time ];
meta = {

17
pkgs/development/libraries/haskell/yesod-json/default.nix
View File

@ -1,20 +1,13 @@
{ cabal, aeson, attoparsecConduit, blazeBuilder, conduit, hspec
, safe, shakespeareJs, text, transformers, vector, wai, waiExtra
, waiTest, yesodCore, yesodRoutes
}:
{ cabal, yesodCore }:
cabal.mkDerivation (self: {
pname = "yesod-json";
version = "1.1.2.2";
sha256 = "1bl4rs3biv2man0n8ijldil32lyswjqk5ykz0nv06qsaaafjpc3g";
buildDepends = [
aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs
text transformers vector wai waiExtra yesodCore yesodRoutes
];
testDepends = [ hspec text waiTest yesodCore ];
version = "1.2.0";
sha256 = "0d035k1ls5iq1c12yxknyc33qd22ayyhl69y62zmcw7arwx35sgw";
buildDepends = [ yesodCore ];
meta = {
homepage = "http://www.yesodweb.com/";
description = "Generate content for Yesod using the aeson package";
description = "Generate content for Yesod using the aeson package. (deprecated)";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];

16
pkgs/development/libraries/haskell/yesod-persistent/default.nix
View File

@ -1,11 +1,19 @@
{ cabal, persistent, persistentTemplate, transformers, yesodCore }:
{ cabal, blazeBuilder, conduit, hspec, liftedBase, persistent
, persistentSqlite, persistentTemplate, poolConduit, resourcet
, text, transformers, waiTest, yesodCore
}:
cabal.mkDerivation (self: {
pname = "yesod-persistent";
version = "1.1.0.1";
sha256 = "0kgd1b7kaif644hjbvkc53yxr7qk310zdndypd9h0j31paw52k1p";
version = "1.2.0";
sha256 = "1gzzs62mnx2q15sm3hvlk18qjgk3bi828klgl2ckc0462f7z8d0k";
buildDepends = [
persistent persistentTemplate transformers yesodCore
blazeBuilder conduit liftedBase persistent persistentTemplate
poolConduit resourcet transformers yesodCore
];
testDepends = [
blazeBuilder conduit hspec persistent persistentSqlite text waiTest
yesodCore
];
meta = {
homepage = "http://www.yesodweb.com/";

65
pkgs/development/libraries/haskell/yesod-platform/default.nix Normal file
View File

@ -0,0 +1,65 @@
{ cabal, aeson, ansiTerminal, asn1Data, asn1Types, attoparsec
, attoparsecConduit, authenticate, base64Bytestring
, baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml
, blazeMarkup, byteorder, caseInsensitive, cereal, certificate
, cipherAes, cipherRc4, clientsession, conduit, cookie, cprngAes
, cryptoApi, cryptoConduit, cryptohash, cryptoNumbers, cryptoPubkey
, cryptoPubkeyTypes, cryptoRandomApi, cssText, dataDefault
, dataDefaultClass, dataDefaultInstancesBase
, dataDefaultInstancesContainers, dataDefaultInstancesDlist
, dataDefaultInstancesOldLocale, dateCache, dlist, emailValidate
, entropy, failure, fastLogger, fileEmbed, filesystemConduit
, hamlet, hashable, hjsmin, hspec, hspecExpectations, htmlConduit
, httpConduit, httpDate, httpTypes, languageJavascript, liftedBase
, mimeMail, mimeTypes, mmorph, monadControl, monadLogger
, networkConduit, pathPieces, pem, persistent, persistentTemplate
, poolConduit, primitive, publicsuffixlist, pureMD5, pwstoreFast
, quickcheckIo, resourcePool, resourcet, safe, semigroups, setenv
, SHA, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs
, shakespeareText, silently, simpleSendfile, skein, socks
, stringsearch, systemFileio, systemFilepath, tagged, tagsoup
, tagstreamConduit, tls, tlsExtra, transformersBase, unixCompat
, unorderedContainers, utf8Light, utf8String, vault, vector, void
, wai, waiAppStatic, waiExtra, waiLogger, waiTest, warp, word8
, xmlConduit, xmlTypes, xssSanitize, yaml, yesod, yesodAuth
, yesodCore, yesodForm, yesodPersistent, yesodRoutes, yesodStatic
, yesodTest, zlibBindings, zlibConduit
}:
cabal.mkDerivation (self: {
pname = "yesod-platform";
version = "1.2.0.1";
sha256 = "0hff8kx5d1z8xmy7fnzzhvy9774r26i4bczkb4cz30v3v5pf2g15";
buildDepends = [
aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
authenticate base64Bytestring baseUnicodeSymbols blazeBuilder
blazeBuilderConduit blazeHtml blazeMarkup byteorder caseInsensitive
cereal certificate cipherAes cipherRc4 clientsession conduit cookie
cprngAes cryptoApi cryptoConduit cryptohash cryptoNumbers
cryptoPubkey cryptoPubkeyTypes cryptoRandomApi cssText dataDefault
dataDefaultClass dataDefaultInstancesBase
dataDefaultInstancesContainers dataDefaultInstancesDlist
dataDefaultInstancesOldLocale dateCache dlist emailValidate entropy
failure fastLogger fileEmbed filesystemConduit hamlet hashable
hjsmin hspec hspecExpectations htmlConduit httpConduit httpDate
httpTypes languageJavascript liftedBase mimeMail mimeTypes mmorph
monadControl monadLogger networkConduit pathPieces pem persistent
persistentTemplate poolConduit primitive publicsuffixlist pureMD5
pwstoreFast quickcheckIo resourcePool resourcet safe semigroups
setenv SHA shakespeare shakespeareCss shakespeareI18n shakespeareJs
shakespeareText silently simpleSendfile skein socks stringsearch
systemFileio systemFilepath tagged tagsoup tagstreamConduit tls
tlsExtra transformersBase unixCompat unorderedContainers utf8Light
utf8String vault vector void wai waiAppStatic waiExtra waiLogger
waiTest warp word8 xmlConduit xmlTypes xssSanitize yaml yesod
yesodAuth yesodCore yesodForm yesodPersistent yesodRoutes
yesodStatic yesodTest zlibBindings zlibConduit
];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/";
description = "Meta package for Yesod";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/yesod-routes/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "yesod-routes";
version = "1.1.2";
sha256 = "17yv2z7k1s958xyn552wpk0cwpivsnkvia8477yhgbp4n2d1i5jv";
version = "1.2.0";
sha256 = "1d7z0v6jrl08w7qz3apwdjss3vq151y28l7231cpqiia46damib2";
buildDepends = [ pathPieces text vector ];
testDepends = [ hspec HUnit pathPieces text ];
meta = {

23
pkgs/development/libraries/haskell/yesod-static/default.nix
View File

@ -1,21 +1,24 @@
{ cabal, base64Bytestring, cereal, conduit, cryptoConduit
, cryptohash, fileEmbed, hspec, httpTypes, systemFilepath, text
, transformers, unixCompat, wai, waiAppStatic, yesodCore
, cryptohash, dataDefault, fileEmbed, hspec, httpTypes
, shakespeareCss, systemFileio, systemFilepath, text, transformers
, unixCompat, wai, waiAppStatic, yesodCore
}:
cabal.mkDerivation (self: {
pname = "yesod-static";
version = "1.1.2.3";
sha256 = "15wk7kpr5xdxia07wyx7msfdlyafqn2pkkrzzdfqvij972n17xmh";
version = "1.2.0";
sha256 = "18fkphk8qzshm5r0ivdvllmbmvl5q6m84zsf1g0fmridqz2xywjz";
buildDepends = [
base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed
httpTypes systemFilepath text transformers unixCompat wai
waiAppStatic yesodCore
base64Bytestring cereal conduit cryptoConduit cryptohash
dataDefault fileEmbed httpTypes shakespeareCss systemFileio
systemFilepath text transformers unixCompat wai waiAppStatic
yesodCore
];
testDepends = [
base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed
hspec httpTypes systemFilepath text transformers unixCompat wai
waiAppStatic yesodCore
base64Bytestring cereal conduit cryptoConduit cryptohash
dataDefault fileEmbed hspec httpTypes shakespeareCss systemFileio
systemFilepath text transformers unixCompat wai waiAppStatic
yesodCore
];
meta = {
homepage = "http://www.yesodweb.com/";

13
pkgs/development/libraries/haskell/yesod-test/default.nix
View File

@ -1,20 +1,23 @@
{ cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup
, caseInsensitive, cookie, hspec, htmlConduit, httpTypes, HUnit
, monadControl, network, persistent, poolConduit, text, time
, transformers, wai, waiTest, xmlConduit, xmlTypes
, transformers, wai, waiTest, xmlConduit, xmlTypes, yesodCore
, yesodForm
}:
cabal.mkDerivation (self: {
pname = "yesod-test";
version = "0.3.5";
sha256 = "095hwl1dm4mk467la68x3lilj0c056603kl0nn8ra4glcr86273j";
version = "1.2.0";
sha256 = "184hfhp62jq2icyn1l6s8kvdcsa6099vmykg2nxrafg9f83lb53q";
buildDepends = [
attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
cookie hspec htmlConduit httpTypes HUnit monadControl network
persistent poolConduit text time transformers wai waiTest
xmlConduit xmlTypes
xmlConduit xmlTypes yesodCore
];
testDepends = [
hspec htmlConduit HUnit text xmlConduit yesodCore yesodForm
];
testDepends = [ hspec htmlConduit HUnit xmlConduit ];
meta = {
homepage = "http://www.yesodweb.com";
description = "integration testing for WAI/Yesod Applications";

33
pkgs/development/libraries/haskell/yesod/default.nix
View File

@ -1,31 +1,18 @@
{ cabal, aeson, attoparsec, base64Bytestring, blazeBuilder
, blazeHtml, blazeMarkup, Cabal, conduit, fileEmbed, filepath
, fsnotify, ghcPaths, hamlet, httpConduit, httpReverseProxy
, httpTypes, liftedBase, monadControl, network, networkConduit
, optparseApplicative, parsec, projectTemplate, resourcet
, shakespeare, shakespeareCss, shakespeareJs, shakespeareText
, split, systemFileio, systemFilepath, tar, text, time
, transformers, unixCompat, unorderedContainers, wai, waiExtra
, warp, yaml, yesodAuth, yesodCore, yesodDefault, yesodForm
, yesodJson, yesodPersistent, zlib
{ cabal, aeson, blazeHtml, blazeMarkup, dataDefault, hamlet
, monadControl, networkConduit, safe, shakespeareCss, shakespeareJs
, text, transformers, unorderedContainers, wai, waiExtra, warp
, yaml, yesodAuth, yesodCore, yesodForm, yesodPersistent
}:
cabal.mkDerivation (self: {
pname = "yesod";
version = "1.1.9.3";
sha256 = "16w96lyd0z9slhzggbvmb23yfr3jkwywpmp15kbilwn7ghjlkm41";
isLibrary = true;
isExecutable = true;
version = "1.2.0.1";
sha256 = "1whkw0lmkyja2j6vbfcf5rjmmhmc85r4arjwjrvdmz6jkjyqham3";
buildDepends = [
aeson attoparsec base64Bytestring blazeBuilder blazeHtml
blazeMarkup Cabal conduit fileEmbed filepath fsnotify ghcPaths
hamlet httpConduit httpReverseProxy httpTypes liftedBase
monadControl network networkConduit optparseApplicative parsec
projectTemplate resourcet shakespeare shakespeareCss shakespeareJs
shakespeareText split systemFileio systemFilepath tar text time
transformers unixCompat unorderedContainers wai waiExtra warp yaml
yesodAuth yesodCore yesodDefault yesodForm yesodJson
yesodPersistent zlib
aeson blazeHtml blazeMarkup dataDefault hamlet monadControl
networkConduit safe shakespeareCss shakespeareJs text transformers
unorderedContainers wai waiExtra warp yaml yesodAuth yesodCore
yesodForm yesodPersistent
];
meta = {
homepage = "http://www.yesodweb.com/";

2
pkgs/development/libraries/libf2c/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = http://www.netlib.org/f2c/libf2c.zip;
sha256 = "14py0zdwzj5gqjzi0z2hlcy3czpzx1fav55akdj143qgav8h6dav";
sha256 = "1mcp1lh7gay7hm186dr0wvwd2bc05xydhnc1qy3dqs4n3r102g7i";
};
unpackPhase = ''

2
pkgs/development/libraries/libotr/3.2.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchurl, libgcrypt}:
stdenv.mkDerivation {
name = "libotr-3.2.0";
name = "libotr-3.2.1";
src = fetchurl {
url = http://www.cypherpunks.ca/otr/libotr-3.2.0.tar.gz;
sha256 = "14v6idnqpp2vhgir9bzp1ay2gmhqsb8iavrkwmallakfwch9sfyq";

12
pkgs/development/libraries/mlt/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, SDL, ffmpeg, libdv, libsamplerate, libvorbis
, libxml2 , pkgconfig, qt4, sox }:
, libxml2 , pkgconfig, qt4, sox, gtk2 }:
stdenv.mkDerivation rec {
name = "mlt-${version}";
@ -10,18 +10,20 @@ stdenv.mkDerivation rec {
sha256 = "0m4nzxli1pl8w59m4iwwhpmr1xdz7xfknmbl3a0mkkd1jzdiq3nc";
};
buildInputs =
buildInputs =
[ SDL ffmpeg libdv libsamplerate libvorbis libxml2 pkgconfig qt4
sox
sox # gtk2 /*optional*/
];
# Mostly taken from:
# http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine
configureFlags = [ "--enable-gpl" "--avformat-swscale" ];
configureFlags = [ "--enable-gpl" "--enable-gpl3" "--avformat-swscale" ];
enableParallelBuilding = true;
meta = {
homepage = http://www.mltframework.org/;
description = "Open source multimedia framework, designed for television broadcasting";
license = "GPLv2+";
license = "GPLv3";
};
}

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

@ -1,11 +1,11 @@
{ fetchurl, stdenv, gmp, gnum4 }:
stdenv.mkDerivation (rec {
name = "nettle-2.5";
name = "nettle-2.7.1";
src = fetchurl {
url = "mirror://gnu/nettle/${name}.tar.gz";
sha256 = "0wicr7amx01l03rm0pzgr1qvw3f9blaw17vjsy1301dh13ll58aa";
sha256 = "0h2vap31yvi1a438d36lg1r1nllfx3y19r4rfxv7slrm6kafnwdw";
};
buildInputs = [ gnum4 ];
@ -15,6 +15,9 @@ stdenv.mkDerivation (rec {
enableParallelBuilding = true;
# It doesn't build otherwise
dontDisableStatic = true;
patches = stdenv.lib.optional (stdenv.system == "i686-cygwin")
./cygwin.patch;

41
pkgs/development/libraries/opencascade/6.5.nix Normal file
View File

@ -0,0 +1,41 @@
{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, automake, autoconf, libtool, qt4,
ftgl, freetype}:
stdenv.mkDerivation rec {
name = "opencascade-6.5.4";
src = fetchurl {
url = http://files.opencascade.com/OCCT/OCC_6.5.4_release/OpenCASCADE654.tar.gz;
sha256 = "1di08mc0wly4cdi3rh9kj52bk0bfpyk6dy03c9yfnv04i7z03kmy";
};
buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ];
preUnpack = ''
sourceRoot=`pwd`/ros
'';
preConfigure = ''
sh ./build_configure
'';
# -fpermissive helps building opencascade, although gcc detects a flaw in the code
# and reports an error otherwise. Further versions may fix that.
NIX_CFLAGS_COMPILE = "-fpermissive";
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ];
postInstall = ''
mv $out/inc $out/include
mkdir -p $out/share/doc/${name}
cp -R ../doc $out/share/doc/${name}
'';
enableParallelBuilding = true;
meta = {
description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
homepage = http://www.opencascade.org/;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

26
pkgs/development/libraries/opencascade/default.nix
View File

@ -1,33 +1,23 @@
{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, automake, autoconf, libtool, qt4,
ftgl, freetype}:
{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, qt4, freetype}:
stdenv.mkDerivation rec {
name = "opencascade-6.5.4";
name = "opencascade-6.6.0";
src = fetchurl {
url = http://files.opencascade.com/OCCT/OCC_6.5.4_release/OpenCASCADE654.tar.gz;
sha256 = "1di08mc0wly4cdi3rh9kj52bk0bfpyk6dy03c9yfnv04i7z03kmy";
url = http://files.opencascade.com/OCCT/OCC_6.6.0_release/OpenCASCADE660.tgz;
sha256 = "0q2xn915w9skv9sj74lxnyv9g3b0yi1j04majyzxk6sv4nra97z3";
};
buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ];
buildInputs = [ cmake mesa tcl tk file libXmu qt4 freetype ];
preUnpack = ''
sourceRoot=`pwd`/ros
sourceRoot=`pwd`/ros/adm/cmake
cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype}"
'';
preConfigure = ''
sh ./build_configure
'';
# -fpermissive helps building opencascade, although gcc detects a flaw in the code
# and reports an error otherwise. Further versions may fix that.
NIX_CFLAGS_COMPILE = "-fpermissive";
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ];
postInstall = ''
mv $out/inc $out/include
mkdir -p $out/share/doc/${name}
cp -R ../doc $out/share/doc/${name}
cp -R ../../../doc $out/share/doc/${name}
'';
enableParallelBuilding = true;

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