forked from mirrors/nixpkgs
Merge master into x-updates
This commit is contained in:
Vladimír Čunát
commit
50ac037864
|
|
@ -199,7 +199,7 @@ in
|
|||
"unix"
|
||||
|
||||
# Misc. stuff.
|
||||
"pcips2" "xtkbd"
|
||||
"pcips2" "atkbd"
|
||||
|
||||
# To wait for SCSI devices to appear.
|
||||
"scsi_wait_scan"
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{stdenv, fetchurl, libogg, libao, pkgconfig, libopus}:
|
||||
{stdenv, fetchurl, libogg, libao, pkgconfig, libopus, flac}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opus-tools-0.1.6";
|
||||
name = "opus-tools-0.1.8";
|
||||
src = fetchurl {
|
||||
url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
|
||||
sha256 = "1hd2ych34y3qy4rj4hd5cp29ixy891afizlsxphsfvfplk1dp1nc";
|
||||
sha256 = "1xm2lhdz92n9zmk496lyagisyzja46kx8q340vay9i51krbqiqg4";
|
||||
};
|
||||
|
||||
buildInputs = [ libogg libao pkgconfig libopus ];
|
||||
buildInputs = [ libogg libao pkgconfig libopus flac ];
|
||||
|
||||
meta = {
|
||||
description = "Tools to work with opus encoded audio streams";
|
||||
|
|
|
|||
17
pkgs/applications/audio/opusfile/default.nix
Normal file
17
pkgs/applications/audio/opusfile/default.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{stdenv, fetchurl, pkgconfig, openssl, libogg, libopus}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opusfile-0.4";
|
||||
src = fetchurl {
|
||||
url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
|
||||
sha256 = "0h4iwyqgid0cibqwzckz3r94qfp09099nk1cx5nz6i3cf08yldlq";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig openssl libogg libopus ];
|
||||
|
||||
meta = {
|
||||
description = "High-level API for decoding and seeking in .opus files";
|
||||
homepage = http://www.opus-codec.org/;
|
||||
license = "BSD";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.3.9";
|
||||
version = "0.3.10";
|
||||
name = "qjackctl-${version}";
|
||||
|
||||
# some dependencies such as killall have to be installed additionally
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
|
||||
sha256 = "0a4s7lwd5b67qbwv1yck8bw6zz8ffx1gza5fwflfqrfcfl3dds2y";
|
||||
sha256 = "0ch14y3p0x5ss28cpnqcxp42zb2w07d3l1n2sbrkgiz58iy97paw";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 alsaLib jackaudio dbus ];
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
|
||||
sha256 = "196iq15waa2yyryiwhf6ynlpqnpknm4cc4azakg01xs70yiphsfl";
|
||||
sha256 = "0v84xna2vp83njxbizlxnindcp2i67xd89kgl9nic1hz6ywlylz6";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
buildInputs = [
|
||||
boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr unzip
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, cmake, sword, qt4, boost, cluceneCore}:
|
||||
{stdenv, fetchurl, cmake, sword, qt4, boost, clucene_core}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
|
|
@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
preConfigure = ''
|
||||
export CLUCENE_HOME=${cluceneCore};
|
||||
export CLUCENE_HOME=${clucene_core};
|
||||
export SWORD_HOME=${sword};
|
||||
'';
|
||||
|
||||
buildInputs = [ cmake sword qt4 boost cluceneCore ];
|
||||
buildInputs = [ cmake sword qt4 boost clucene_core ];
|
||||
|
||||
cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ stdenv, fetchurl, db45, gtk, bzip2 }:
|
||||
{ stdenv, fetchurl, db4, gtk, bzip2 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "jigdo-0.7.3";
|
||||
|
||||
# Debian sources
|
||||
# Debian sources
|
||||
src = fetchurl {
|
||||
url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3.orig.tar.gz;
|
||||
sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv";
|
||||
|
|
@ -13,12 +13,12 @@ stdenv.mkDerivation {
|
|||
url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-2.diff.gz;
|
||||
sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3";
|
||||
};
|
||||
|
||||
buildInputs = [ db45 gtk bzip2 ];
|
||||
|
||||
buildInputs = [ db4 gtk bzip2 ];
|
||||
|
||||
configureFlags = "--without-libdb";
|
||||
|
||||
meta = {
|
||||
meta = {
|
||||
description = "Download utility that can fetch files from several sources simultaneously";
|
||||
homepage = http://atterer.net/jigdo/;
|
||||
license = "GPLv2";
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xterm-281";
|
||||
name = "xterm-300";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://invisible-island.net/xterm/${name}.tgz";
|
||||
sha256 = "1yrjjya7z5s3fi0iiaxgna35jh0ib2zx1yafyng35jma6qbwhxx7";
|
||||
sha256 = "1k8p7q4d1gpk6zikb8hys8b30yq2v001nlp3r9g40my31ij9al31";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchgit, unzip, xulrunner, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "conkeror-1.0pre-20130817-1";
|
||||
name = "conkeror-1.0pre-20131116-1";
|
||||
|
||||
src = fetchgit {
|
||||
url = git://repo.or.cz/conkeror.git;
|
||||
rev = "refs/tags/debian-1.0--pre+git130817-1";
|
||||
sha256 = "aef3c782ac98c031e7b99852f42538e225e151cd226cde3094823a5cae015fcf";
|
||||
rev = "refs/tags/debian-1.0--pre+git131116-1";
|
||||
sha256 = "6fe0f30487c5bb8f2183dc7c2e15cf29df7cc8b1950b5fc15c26510c74a1f7d3";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
|
||||
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
|
||||
, hunspell, libevent, libstartup_notification, libvpx
|
||||
, cairo, gstreamer, gst_plugins_base
|
||||
, cairo, gstreamer, gst_plugins_base, icu
|
||||
, debugBuild ? false
|
||||
, # If you want the resulting program to call itself "Firefox" instead
|
||||
# of "Shiretoko" or whatever, enable this option. However, those
|
||||
|
|
@ -33,11 +33,7 @@ rec {
|
|||
};
|
||||
|
||||
commonConfigureFlags =
|
||||
[ "--enable-optimize"
|
||||
#"--enable-profiling"
|
||||
(if debugBuild then "--enable-debug" else "--disable-debug")
|
||||
"--enable-strip"
|
||||
"--with-system-jpeg"
|
||||
[ "--with-system-jpeg"
|
||||
"--with-system-zlib"
|
||||
"--with-system-bz2"
|
||||
"--with-system-nspr"
|
||||
|
|
@ -45,18 +41,24 @@ rec {
|
|||
"--with-system-libevent"
|
||||
"--with-system-libvpx"
|
||||
"--with-system-png"
|
||||
"--enable-startup-notification"
|
||||
"--with-system-icu"
|
||||
"--enable-system-ffi"
|
||||
"--enable-system-hunspell"
|
||||
"--enable-system-pixman"
|
||||
"--enable-system-sqlite"
|
||||
"--enable-system-cairo"
|
||||
"--enable-gstreamer"
|
||||
"--enable-startup-notification"
|
||||
# "--enable-content-sandbox" # available since 26.0, but not much info available
|
||||
# "--enable-content-sandbox-reporter" # keeping disabled for now
|
||||
"--disable-crashreporter"
|
||||
"--disable-tests"
|
||||
"--disable-necko-wifi" # maybe we want to enable this at some point
|
||||
"--disable-installer"
|
||||
"--disable-updater"
|
||||
];
|
||||
] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
|
||||
else [ "--disable-debug" "--enable-release"
|
||||
"--enable-optimize" "--enable-strip" ]);
|
||||
|
||||
|
||||
xulrunner = stdenv.mkDerivation rec {
|
||||
|
|
@ -72,7 +74,7 @@ rec {
|
|||
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
|
||||
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
|
||||
hunspell libevent libstartup_notification libvpx cairo
|
||||
gstreamer gst_plugins_base
|
||||
gstreamer gst_plugins_base icu
|
||||
];
|
||||
|
||||
configureFlags =
|
||||
|
|
@ -138,7 +140,7 @@ rec {
|
|||
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
|
||||
xlibs.pixman yasm mesa sqlite file unzip pysqlite
|
||||
hunspell libevent libstartup_notification libvpx cairo
|
||||
gstreamer gst_plugins_base
|
||||
gstreamer gst_plugins_base icu
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ stdenv, fetchurl, pidgin} :
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pidgin-msn-pecan-0.1.0";
|
||||
name = "pidgin-msn-pecan-0.1.4";
|
||||
src = fetchurl {
|
||||
url = http://msn-pecan.googlecode.com/files/msn-pecan-0.1.0.tar.bz2;
|
||||
sha256 = "06cgkdlv2brv2g5hpx8g8p6j296cnvd29l8fap30i1k0mznbjxf4";
|
||||
url = http://msn-pecan.googlecode.com/files/msn-pecan-0.1.4.tar.bz2;
|
||||
sha256 = "0d43z2ay9is1r2kkc9my8pz0fwdyzv7k19vdmbird18lg7rlbjd2";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-haze";
|
||||
name = "${pname}-0.7.0";
|
||||
name = "${pname}-0.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
|
||||
sha256 = "1gaj8518ilm3gnzqf3lmiqgnwkay8wfbsqngcz15whzji8sl608b";
|
||||
sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";
|
||||
};
|
||||
|
||||
buildInputs = [ glib telepathy_glib dbus_glib pidgin ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-5.14.1";
|
||||
name = "${pname}-5.16.0";
|
||||
pname = "telepathy-mission-control";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
|
||||
sha256 = "1jqzby5sr09bprp3fyr8w65rcv9ljc045rp7lm9ik89wkhcw05jb";
|
||||
sha256 = "1l61w6j04mbrjsbcfrlc0safh9nlsjnj0z6lszal64r9bhkcghzd";
|
||||
};
|
||||
|
||||
buildInputs = [ telepathy_glib ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-rakia";
|
||||
name = "${pname}-0.7.4";
|
||||
name = "${pname}-0.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/releases/${pname}/${name}.tar.gz";
|
||||
sha256 = "11cmmdq31kivm6nsv61hxy3hxnnmbd8sj55xqwx9hyqzybh70dyf";
|
||||
sha256 = "18dxffa8hhjyvqkhhac05rrkx81vnncjrakg5ygikfp0j79vrbhv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [pkgconfigUpstream libxslt python];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-salut";
|
||||
name = "${pname}-0.8.0";
|
||||
name = "${pname}-0.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
|
||||
sha256 = "1kmmpwjbfph37bjvpkfphff8dzhr896i55knf311f778fbsgl17m";
|
||||
sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh";
|
||||
};
|
||||
|
||||
buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@ let
|
|||
buildInputs = map (n: builtins.getAttr n x)
|
||||
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
||||
sourceInfo = rec {
|
||||
version="1.2.0";
|
||||
version="1.2.3";
|
||||
baseName="vacuum-im";
|
||||
name="${baseName}-${version}";
|
||||
url="http://vacuum-im.googlecode.com/files/vacuum-${version}.tar.xz";
|
||||
hash="55a2c27aaaf79c7a4de127c22d3845ede35970283d35ee57fd5ceca581b085fc";
|
||||
hash="037k2b2kkp2ywkrshqa0fj18mkd2jq60x4x62kzbrsvb85qcbbxh";
|
||||
};
|
||||
in
|
||||
rec {
|
||||
|
|
|
|||
|
|
@ -1,25 +1,21 @@
|
|||
{ stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison
|
||||
, gnutls, libgcrypt, glib, zlib, libxml2, libxslt, adns, geoip
|
||||
, heimdal, python, lynx, lua5
|
||||
, makeDesktopItem
|
||||
{ stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares, gnutls, libgcrypt
|
||||
, geoip, heimdal, lua5, gtk, makeDesktopItem
|
||||
}:
|
||||
|
||||
let version = "1.8.11"; in
|
||||
let version = "1.10.3"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "wireshark-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2";
|
||||
sha256 = "1nwgizs9z1dalicpp2fd9pqafidy49j0v3d1rml0spfqrkbjpfpw";
|
||||
sha256 = "1329zph63z5mcij9lp111bh6b2w88z3d40gvjld2rjmhmqv1nr61";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ perl pkgconfig gtk libpcap flex bison gnutls libgcrypt
|
||||
glib zlib libxml2 libxslt adns geoip heimdal python lynx lua5
|
||||
];
|
||||
[ bison flex perl pkgconfig libpcap lua5 heimdal libgcrypt gnutls geoip libnl c-ares gtk ];
|
||||
|
||||
configureFlags = "--disable-usr-local --with-ssl --enable-threads --enable-packet-editor";
|
||||
configureFlags = "--disable-usr-local --enable-packet-editor --with-ssl";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "Wireshark";
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnumeric-1.12.0";
|
||||
name = "gnumeric-1.12.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
|
||||
sha256 = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111";
|
||||
sha256 = "1rv2ifw6rp0iza4fkf3bffvdkyi77dwvzdnvcbpqcyn2kxfsvlsc";
|
||||
};
|
||||
|
||||
configureFlags = "--disable-component";
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{stdenv, fetchurl, readline, bison, libX11, libICE, libXaw, libXext}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ng-spice-rework-24";
|
||||
name = "ng-spice-rework-25";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/ngspice/ngspice-24.tar.gz";
|
||||
sha256 = "0rgh75hbqrsljz767whbj65wi6369yc286v0qk8jxnv2da7p9ll6";
|
||||
url = "mirror://sourceforge/ngspice/ngspice-25.tar.gz";
|
||||
sha256 = "03hlxwvl2j1wlb5yg4swvmph9gja37c2gqvwvzv6z16vg2wvn06h";
|
||||
};
|
||||
|
||||
buildInputs = [ readline libX11 bison libICE libXaw libXext ];
|
||||
|
|
|
|||
|
|
@ -1,20 +1,19 @@
|
|||
{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs, expat }:
|
||||
|
||||
# the homepage mentions this is the final release.
|
||||
# from now on, kdesvn will be part of the official kde software distribution
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kdesvn-1.5.5";
|
||||
name = "kdesvn-1.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/downloads/${name}.tar.bz2";
|
||||
sha256 = "02sb34p04dyd88ksxvpiffhxqwmhs3yv1wif9m8w0fly9hvy1zk7";
|
||||
src = fetchurl rec {
|
||||
url = "http://pkgs.fedoraproject.org/repo/pkgs/kdesvn/${name}.tar.bz2/${md5}/${name}.tar.bz2";
|
||||
md5 = "7e6adc98ff4777a06d5752d3f2b58fa3";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake
|
||||
'';
|
||||
|
||||
patches = [ ./docbook.patch ./virtual_inheritance.patch ];
|
||||
|
||||
|
||||
buildInputs = [ apr aprutil subversion db4 kdelibs expat ];
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
The name of the dtd changed in kdelibs 4.5, so we need to increase it.
|
||||
|
||||
diff --git a/doc/nl/index.docbook b/doc/nl/index.docbook
|
||||
index 8747869..a9676aa 100644
|
||||
--- a/doc/nl/index.docbook
|
||||
+++ b/doc/nl/index.docbook
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" ?>
|
||||
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
|
||||
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
|
||||
<!ENTITY kdesvn "<application>kdesvn</application>">
|
||||
<!ENTITY kappname "&kdesvn;"><!-- Do *not* replace kappname-->
|
||||
<!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h
|
||||
+++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h
|
||||
@@ -49,7 +49,7 @@ typedef svn::SharedPointer<KTemporaryFil
|
||||
/**
|
||||
@author Rajko Albrecht <ral@alwins-world.de>
|
||||
*/
|
||||
-class RevGraphView : virtual public QGraphicsView
|
||||
+class RevGraphView : public QGraphicsView
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
|
@ -66,12 +66,12 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mplayer2-20130130";
|
||||
name = "mplayer2-20130428";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.mplayer2.org/mplayer2.git";
|
||||
rev = "d3c580156c0b8777ff082426ebd61bb7ffe0c225";
|
||||
sha256 = "1akf2mb2zklz609ks555vjvcs1gw8nwg5kbb9jwra8c4v1dfyhys";
|
||||
rev = "6c87a981baa4972fd71c25dfddea017b5a972e89";
|
||||
sha256 = "b09c1331141dd0939dfa424ae14dc0bdf82c8a72bb32c78e3ad15e3ee1d2c851";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
|
|
|||
|
|
@ -55,11 +55,12 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mpv-20130812";
|
||||
name = "mpv-20131222";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/mpv-player/mpv.git";
|
||||
rev = "62925a5c15a76568c155259bafa1361ec139c66b";
|
||||
rev = "e6bea0ec5a";
|
||||
sha256 = "984c7d19b1916b7e5befc370ffb7f6c31e560c64c47090b924a115d00c35a1a8";
|
||||
};
|
||||
|
||||
buildInputs = with stdenv.lib;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, qt4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "smplayer-0.8.5";
|
||||
name = "smplayer-0.8.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
|
||||
sha256 = "0vbfvaqg5c25vabq1mf9xg6kzgvxnpd0i172y1gjznnlpcw2fxrw";
|
||||
sha256 = "1p70929j8prc4mgqxvsbcjxy8zwp4r9jk0mp0iddxl7vfyck74g0";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 ];
|
||||
|
|
|
|||
85
pkgs/development/compilers/go/1.2.nix
Normal file
85
pkgs/development/compilers/go/1.2.nix
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }:
|
||||
|
||||
let
|
||||
loader386 = "${glibc}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc}/lib/ld-linux.so.3";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "go-1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://go.googlecode.com/files/go1.2.src.tar.gz;
|
||||
sha1 = "7dd2408d40471aeb30a9e0b502c6717b5bf383a5";
|
||||
};
|
||||
|
||||
buildInputs = [ bison glibc bash makeWrapper ];
|
||||
|
||||
# I'm not sure what go wants from its 'src', but the go installation manual
|
||||
# describes an installation keeping the src.
|
||||
preUnpack = ''
|
||||
mkdir -p $out/share
|
||||
cd $out/share
|
||||
'';
|
||||
|
||||
prePatch = ''
|
||||
cd ..
|
||||
if [ ! -d go ]; then
|
||||
mv * go
|
||||
fi
|
||||
cd go
|
||||
|
||||
patchShebangs ./ # replace /bin/bash
|
||||
# !!! substituteInPlace does not seems to be effective.
|
||||
sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
|
||||
sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
|
||||
sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c
|
||||
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
|
||||
sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go
|
||||
|
||||
#sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
|
||||
# -e 's,/bin/echo,${coreutils}/bin/echo,' \
|
||||
# src/pkg/exec/exec_test.go
|
||||
|
||||
# Disabling the 'os/http/net' tests (they want files not available in
|
||||
# chroot builds)
|
||||
rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
|
||||
# The os test wants to read files in an existing path. Just it don't be /usr/bin.
|
||||
sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
|
||||
sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
|
||||
# Disable the hostname test
|
||||
sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
|
||||
'';
|
||||
|
||||
patches = [ ./cacert-1.2.patch ];
|
||||
|
||||
GOOS = "linux";
|
||||
GOARCH = if stdenv.system == "i686-linux" then "386"
|
||||
else if stdenv.system == "x86_64-linux" then "amd64"
|
||||
else if stdenv.system == "armv5tel-linux" then "arm"
|
||||
else throw "Unsupported system";
|
||||
GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
export GOROOT="$(pwd)/"
|
||||
export GOBIN="$out/bin"
|
||||
export PATH="$GOBIN:$PATH"
|
||||
cd ./src
|
||||
./all.bash
|
||||
cd -
|
||||
|
||||
# Copy the emacs configuration for Go files.
|
||||
mkdir -p "$out/share/emacs/site-lisp"
|
||||
cp ./misc/emacs/* $out/share/emacs/site-lisp/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://golang.org/;
|
||||
description = "The Go Programming language";
|
||||
license = "BSD";
|
||||
maintainers = with stdenv.lib.maintainers; [ pierron viric ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
15
pkgs/development/compilers/go/cacert-1.2.patch
Normal file
15
pkgs/development/compilers/go/cacert-1.2.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
Go comes with hardcoded cacert. We add the usual in NixOS,
|
||||
for easier NixOS life.
|
||||
|
||||
diff --git a/src/pkg/crypto/x509/root_unix.go b/src/pkg/crypto/x509/root_unix.go
|
||||
index 76e79f4..6ef1dd3 100644
|
||||
--- a/src/pkg/crypto/x509/root_unix.go
|
||||
+++ b/src/pkg/crypto/x509/root_unix.go
|
||||
@@ -15,6 +15,7 @@ var certFiles = []string{
|
||||
"/etc/ssl/ca-bundle.pem", // OpenSUSE
|
||||
"/etc/ssl/cert.pem", // OpenBSD
|
||||
"/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly
|
||||
+ "/etc/ssl/certs/ca-bundle.crt", // NixOS
|
||||
}
|
||||
|
||||
func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) {
|
||||
|
|
@ -21,13 +21,13 @@ assert vdpauSupport -> libvdpau != null;
|
|||
assert faacSupport -> faac != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ffmpeg-0.10";
|
||||
|
||||
name = "ffmpeg-0.10.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
|
||||
sha256 = "1ybzw6d5axr807141izvm2yf4pa0hc1zcywj89nsn3qsdnknlna3";
|
||||
sha256 = "14fbjhiwv5zg9yh0zk3k9h6id815xrikyz6l2cdl7z4vazbmhq4k";
|
||||
};
|
||||
|
||||
|
||||
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
|
||||
# the resulting library is GPL'ed, so it can only be used in GPL'ed
|
||||
# applications.
|
||||
|
|
@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
|
|||
++ stdenv.lib.optional dc1394Support libdc1394;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
crossAttrs = {
|
||||
dontSetConfigureCross = true;
|
||||
configureFlags = configureFlags ++ [
|
||||
|
|
@ -31,11 +31,11 @@ assert playSupport -> SDL != null;
|
|||
assert freetypeSupport -> freetype != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ffmpeg-1.2.3";
|
||||
name = "ffmpeg-1.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
|
||||
sha256 = "0nvilgwaivzvikgp9lpvrwi4p1clxl4w8j961599bg0r2v7n4x6r";
|
||||
sha256 = "1pqd544jmbggwisbkm0pj0l585b8a9x5n3jl9zbmqmw63g7ci5iv";
|
||||
};
|
||||
|
||||
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{ stdenv, fetchurl, zlib, ffmpeg, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ffms-2.17";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ffms-2.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://ffmpegsource.googlecode.com/files/ffms-2.17-src.tar.bz2;
|
||||
sha256 = "0gb42hrwnldz3zjlk4llx85dvxysxlfrdf5yy3fay8r8k1vpl7wr";
|
||||
url = https://codeload.github.com/FFMS/ffms2/tar.gz/2.19;
|
||||
name = "${name}.tar.gz";
|
||||
sha256 = "0498si8bzwyxxq0f1yc6invzb1lv1ab436gwzn9418839x8pj4vg";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-fPIC";
|
||||
|
|
|
|||
|
|
@ -1,17 +1,19 @@
|
|||
{ stdenv, fetchurl, libunwind }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gperftools-2.0";
|
||||
name = "gperftools-2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gperftools.googlecode.com/files/${name}.tar.gz";
|
||||
sha1 = "da7181a7ba9b5ee7302daf6c16e886c179fe8d1b";
|
||||
sha256 = "0ks9gsnhxrs2vccc6ha9m8xmj83lmw09xcws4zc0k57q4jcy5bgk";
|
||||
};
|
||||
|
||||
patches = [ ./glibc-2.16.patch ];
|
||||
|
||||
buildInputs = [ libunwind ];
|
||||
|
||||
# some packages want to link to the static tcmalloc_minimal
|
||||
# to drop the runtime dependency on gperftools
|
||||
dontDisableStatic = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
Index: gperftools-2.0/src/base/linuxthreads.cc
|
||||
===================================================================
|
||||
--- gperftools-2.0.orig/src/base/linuxthreads.cc
|
||||
+++ gperftools-2.0/src/base/linuxthreads.cc
|
||||
@@ -193,7 +193,7 @@ static volatile int *sig_pids, sig_num_t
|
||||
/* Signal handler to help us recover from dying while we are attached to
|
||||
* other threads.
|
||||
*/
|
||||
-static void SignalHandler(int signum, siginfo_t *si, void *data) {
|
||||
+static void SignalHandler(int signum, struct siginfo *si, void *data) {
|
||||
if (sig_pids != NULL) {
|
||||
if (signum == SIGABRT) {
|
||||
while (sig_num_threads-- > 0) {
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm
|
||||
{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm, orc
|
||||
, useInternalFfmpeg ? false, ffmpeg ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-ffmpeg-0.10.12";
|
||||
name = "gst-ffmpeg-0.10.13";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2"
|
||||
"mirror://gentoo/distfiles/${name}.tar.bz2"
|
||||
];
|
||||
sha256 = "0fyppl8q18g71jd2r0mbiqk8hhrdxq43dglma06mxyjb5c80fxxi";
|
||||
sha256 = "0qmvgwcfybci78sd73mhvm4bsb7l0xsk9yljrgik80g011ds1z3n";
|
||||
};
|
||||
|
||||
# Upstream strongly recommends against using --with-system-ffmpeg,
|
||||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg";
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig bzip2 gst_plugins_base ]
|
||||
[ pkgconfig bzip2 gst_plugins_base orc ]
|
||||
++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]);
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
|
||||
, libdvdnav, libdvdread }:
|
||||
, libdvdnav, libdvdread, orc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-plugins-bad-0.10.23";
|
||||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig glib gstreamer gst_plugins_base libdvdnav libdvdread ];
|
||||
[ pkgconfig glib gstreamer gst_plugins_base libdvdnav libdvdread orc ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ fetchurl, stdenv, pkgconfig, python, gstreamer, xlibs, alsaLib, cdparanoia
|
||||
, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo
|
||||
, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc
|
||||
, libintlOrEmpty
|
||||
, # Whether to build no plugins that have external dependencies
|
||||
# (except the ALSA plugin).
|
||||
|
|
@ -18,13 +18,14 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
sed -i 's@/bin/echo@echo@g' configure
|
||||
sed -i -e 's/^ /\t/' docs/{libs,plugins}/Makefile.in
|
||||
'';
|
||||
|
||||
# TODO : v4l, libvisual
|
||||
buildInputs =
|
||||
[ pkgconfig glib cairo ]
|
||||
[ pkgconfig glib cairo orc ]
|
||||
# can't build alsaLib on darwin
|
||||
++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib
|
||||
++ stdenv.lib.optionals (!minimalDeps)
|
||||
|
|
@ -37,9 +38,9 @@ stdenv.mkDerivation rec {
|
|||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
|
||||
|
||||
propagatedBuildInputs = [ gstreamer ];
|
||||
|
||||
|
||||
postInstall = "rm -rf $out/share/gtk-doc";
|
||||
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://gstreamer.freedesktop.org;
|
||||
description = "Base plug-ins for GStreamer";
|
||||
|
|
@ -48,4 +49,3 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
|
||||
, flac, libjpeg, zlib, speex, libpng, libdv, libcaca
|
||||
, libiec61883, libavc1394, taglib, pulseaudio
|
||||
, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
|
||||
, libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc
|
||||
, glib, gstreamer, bzip2
|
||||
}:
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs =
|
||||
[ pkgconfig glib gstreamer gst_plugins_base libavc1394 libiec61883
|
||||
aalib libcaca cairo libdv flac libjpeg libpng pulseaudio speex
|
||||
taglib bzip2
|
||||
taglib bzip2 libvpx gdk_pixbuf orc
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
|
||||
, libmad, libdvdread, libmpeg2, libcdio, a52dec }:
|
||||
, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-plugins-ugly-0.10.19";
|
||||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec ];
|
||||
[ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
16
pkgs/development/libraries/haskell/event-list/default.nix
Normal file
16
pkgs/development/libraries/haskell/event-list/default.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{ cabal, nonNegative, QuickCheck, transformers, utilityHt }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "event-list";
|
||||
version = "0.1.0.2";
|
||||
sha256 = "01j48871nijhkbqdsfvbvq01yr9b5a056fn03ccgazikfsd368ri";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ nonNegative QuickCheck transformers utilityHt ];
|
||||
meta = {
|
||||
homepage = "http://code.haskell.org/~thielema/event-list/";
|
||||
description = "Event lists with relative or absolute time stamps";
|
||||
license = "GPL";
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
21
pkgs/development/libraries/haskell/haskore/default.nix
Normal file
21
pkgs/development/libraries/haskell/haskore/default.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ cabal, dataAccessor, eventList, haskellSrc, markovChain, midi
|
||||
, nonNegative, parsec, random, transformers, utilityHt
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "haskore";
|
||||
version = "0.2.0.3";
|
||||
sha256 = "0vg4m2cmy1fabfnck9v22jicflb0if64h0wjvyrgpn2ykb9wwbpa";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
dataAccessor eventList haskellSrc markovChain midi nonNegative
|
||||
parsec random transformers utilityHt
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/haskellwiki/Haskore";
|
||||
description = "The Haskore Computer Music System";
|
||||
license = "GPL";
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
14
pkgs/development/libraries/haskell/markov-chain/default.nix
Normal file
14
pkgs/development/libraries/haskell/markov-chain/default.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
{ cabal, random, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "markov-chain";
|
||||
version = "0.0.3.2";
|
||||
sha256 = "0shld9b6vdi5274wyhwpw5ggfm6xi5j7m3ag989bxarhrfzjxgdk";
|
||||
buildDepends = [ random transformers ];
|
||||
meta = {
|
||||
homepage = "http://code.haskell.org/~thielema/markov-chain/";
|
||||
description = "Markov Chains for generating random sequences with a user definable behaviour";
|
||||
license = "GPL";
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
21
pkgs/development/libraries/haskell/midi/default.nix
Normal file
21
pkgs/development/libraries/haskell/midi/default.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ cabal, binary, eventList, explicitException, monoidTransformer
|
||||
, nonNegative, QuickCheck, random, transformers, utilityHt
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "midi";
|
||||
version = "0.2.1";
|
||||
sha256 = "0i767y0835979s9i3wm8qwzh2awhhmfvhc5zvq2lkn8xlsp3wa6y";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
binary eventList explicitException monoidTransformer nonNegative
|
||||
QuickCheck random transformers utilityHt
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/haskellwiki/MIDI";
|
||||
description = "Handling of MIDI messages and files";
|
||||
license = "GPL";
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "monoid-transformer";
|
||||
version = "0.0.2";
|
||||
sha256 = "0hd8jb1iw6lbgml3f08n680bdij56cjanpkr4fc1jr7qn6yzzb2j";
|
||||
meta = {
|
||||
description = "Monoid counterparts to some ubiquitous monad transformers";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
{ cabal, protocolBuffers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "protocol-buffers-descriptor";
|
||||
version = "2.0.14";
|
||||
sha256 = "0xbpmm9a4fg42c9zbarawqdl4klfjjc233ilbsibb7asa3v7zmj3";
|
||||
buildDepends = [ protocolBuffers ];
|
||||
meta = {
|
||||
homepage = "http://code.haskell.org/protocol-buffers/";
|
||||
description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
{ cabal, binary, filepath, mtl, syb, utf8String }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "protocol-buffers";
|
||||
version = "2.0.14";
|
||||
sha256 = "1wihnpvc7kjq345a6v702s42gmrqd9cjm50safc7kigyvhr5vm1i";
|
||||
buildDepends = [ binary filepath mtl syb utf8String ];
|
||||
meta = {
|
||||
homepage = "http://code.haskell.org/protocol-buffers/";
|
||||
description = "Parse Google Protocol Buffer specifications";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
21
pkgs/development/libraries/haskell/rethinkdb/default.nix
Normal file
21
pkgs/development/libraries/haskell/rethinkdb/default.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ cabal, aeson, attoparsec, dataDefault, mtl, network
|
||||
, protocolBuffers, protocolBuffersDescriptor, text, time
|
||||
, unorderedContainers, utf8String, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "rethinkdb";
|
||||
version = "1.8.0.5";
|
||||
sha256 = "1s3mzbs0b2jdvs1gfdxb2fp2lw7978ja63411iz43yjd29d3pwzq";
|
||||
buildDepends = [
|
||||
aeson attoparsec dataDefault mtl network protocolBuffers
|
||||
protocolBuffersDescriptor text time unorderedContainers utf8String
|
||||
vector
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/atnnn/haskell-rethinkdb";
|
||||
description = "RethinkDB is a distributed document store with a powerful query language";
|
||||
license = self.stdenv.lib.licenses.asl20;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -18,7 +18,8 @@ cabal.mkDerivation (self: {
|
|||
substituteInPlace trifecta.cabal \
|
||||
--replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.7," \
|
||||
--replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \
|
||||
--replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2,"
|
||||
--replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \
|
||||
--replace "comonad == 3.*," "comonad >= 3 && < 5,"
|
||||
'';
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/trifecta/";
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@ cabal.mkDerivation (self: {
|
|||
substituteInPlace trifecta.cabal \
|
||||
--replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.7," \
|
||||
--replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \
|
||||
--replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2,"
|
||||
--replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \
|
||||
--replace "comonad >= 3 && < 4," "comonad >= 3 && < 5,"
|
||||
'';
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/trifecta/";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, autoconf, automake, libtool, libxml2, cppunit, boost
|
||||
, apr, aprutil, db45, expat
|
||||
, apr, aprutil, db4, expat
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
src/main/cpp/socketoutputstream.cpp
|
||||
'';
|
||||
|
||||
buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db45 expat];
|
||||
buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db4 expat];
|
||||
|
||||
meta = {
|
||||
homepage = http://logging.apache.org/log4cxx/index.html;
|
||||
|
|
|
|||
17
pkgs/development/libraries/mdds/0.7.1.nix
Normal file
17
pkgs/development/libraries/mdds/0.7.1.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.1";
|
||||
name = "mdds-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://multidimalgorithm.googlecode.com/files/mdds_${version}.tar.bz2";
|
||||
sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = https://code.google.com/p/multidimalgorithm/;
|
||||
description = "A collection of multi-dimensional data structure and indexing algorithm";
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -13,11 +13,11 @@ let
|
|||
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
||||
sourceInfo = rec {
|
||||
baseName="simgear";
|
||||
version="2.12.0";
|
||||
version="2.12.1";
|
||||
name="${baseName}-${version}";
|
||||
extension="tar.bz2";
|
||||
url="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.${extension}";
|
||||
hash="0spl6afk8rm96ss4lh7zy5561m5m2qgwsnqjyp35jr1gyyrc944f";
|
||||
hash="0w8drzglgp01019frx96062qcigzfflsyq59f8shpwmzjb2hzli4";
|
||||
};
|
||||
in
|
||||
rec {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, pkgconfig, icu, cluceneCore, curl}:
|
||||
{stdenv, fetchurl, pkgconfig, icu, clucene_core, curl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1fc71avaxkhx6kckjiflw6j02lpg569b9bzaksq49i1m87awfxmg";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig icu cluceneCore curl ];
|
||||
buildInputs = [ pkgconfig icu clucene_core curl ];
|
||||
|
||||
# because curl/types.h disappeared since at least curl 7.21.7
|
||||
patches = [ ./dont_include_curl_types_h.patch ];
|
||||
|
|
@ -31,4 +31,3 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tcllib-${version}";
|
||||
version = "1.14";
|
||||
version = "1.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz";
|
||||
sha256 = "11052fgfmv9vyswzjjgfvh3pi0k3fnfnl9ri6nl4vc6f6z5ry56x";
|
||||
sha256 = "1zdzaqdpxljsaabgknq3paakgs262qy255ib4p329knsv608jc3d";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "telepathy-glib-0.20.4";
|
||||
name = "telepathy-glib-0.22.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
|
||||
sha256 = "0v5izjmgm1phy51l2y5whfrgzqx8510lqp16d2y5hb21bp40g8y9";
|
||||
sha256 = "0mqrq2azw70rm50vy21acfnzn8mmh0w7dxh87mwr1lyk0jn1n232";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [dbus_glib glib python];
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{stdenv, fetchurl, python, db4}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "bsddb3-4.5.0";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bsddb3-6.0.1";
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/pybsddb/bsddb3-4.5.0.tar.gz;
|
||||
sha256 = "1h09kij32iikr9racp5p7qrb4li2gf2hs0lyq6d312qarja4d45v";
|
||||
url = "https://pypi.python.org/packages/source/b/bsddb3/${name}.tar.gz";
|
||||
md5 = "2b22ab1b4d896961c30e4106660e9139";
|
||||
};
|
||||
buildInputs = [python];
|
||||
buildPhase = "true";
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
|
|||
name = "bison-3.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/bison/${name}.tar.xz";
|
||||
sha256 = "0g4gjan477lac18m51kv4xzcsp6wjfsfwvd2dxymcl6vid9fihx2";
|
||||
url = "mirror://gnu/bison/${name}.tar.gz";
|
||||
sha256 = "1vc17y6242jlwp0gdj7wsim3nvc1ws7q3j0v3065nz8g9hd9vwnd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ m4 ] ++ stdenv.lib.optionals doCheck [perl flex];
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.3.4";
|
||||
version = "1.4.1";
|
||||
name = "oxygen-gtk2-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2";
|
||||
sha256 = "02q46kq0hhrmzwbjngg31ydl2198ls5bxgnz2si4amdmqii1nlmj";
|
||||
sha256 = "13vrdlzg8h5gxn04f488f65yfy9m0amqpqdbs9l304yxgm7mkawd";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip, which }:
|
||||
{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit }:
|
||||
|
||||
/*
|
||||
About Vim and plugins
|
||||
|
|
@ -197,6 +197,22 @@ in rec
|
|||
};
|
||||
};
|
||||
|
||||
golang = simpleDerivation {
|
||||
name = "vim-golang-20131127";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/jnwhiteh/vim-golang.git";
|
||||
rev = "832d64e5a813511ed52217aa24f0255c49671bab";
|
||||
};
|
||||
path = "golang";
|
||||
meta = with stdenv.lib; {
|
||||
description = "Vim plugins for Go";
|
||||
homepage = https://github.com/jnwhiteh/vim-golang;
|
||||
license = licenses.publicDomain;
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
};
|
||||
|
||||
ipython = simpleDerivation {
|
||||
name = "vim-ipython-ff8f88f3fe518851a91dc88aaa5a75f8f352a960";
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "powertop-2.2";
|
||||
name = "powertop-2.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.gz";
|
||||
sha256 = "0a5haxawcjrlwwxx4j5kd4ad05gjmcr13v8gswfwfxcn7fyf2f8k";
|
||||
sha256 = "02rwqbpasdayl201v0549gbp2f82rd0hqiv3i111r7npanjhhb4b";
|
||||
};
|
||||
|
||||
buildInputs = [ gettext libnl ncurses pciutils pkgconfig zlib ];
|
||||
|
|
|
|||
36
pkgs/servers/nosql/rethinkdb/default.nix
Normal file
36
pkgs/servers/nosql/rethinkdb/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ stdenv, fetchurl, which, protobuf, v8, ncurses, gperftools, boost, m4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rethinkdb-1.11.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.rethinkdb.com/dist/${name}.tgz";
|
||||
sha256 = "04wz07y891vygc5ksrvkk1ch05xj16nahv20bnxwcllkbl4gf9lj";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
export ALLOW_WARNINGS=1
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
configureFlags = "--lib-path ${gperftools}/lib";
|
||||
|
||||
buildInputs = [ protobuf v8 ncurses boost ];
|
||||
|
||||
nativeBuildInputs = [ which m4 ];
|
||||
|
||||
|
||||
meta = {
|
||||
description = "An open-source distributed database built with love";
|
||||
longDescription = ''
|
||||
RethinkDB is built to store JSON documents, and scale to multiple machines with very little
|
||||
effort. It has a pleasant query language that supports really useful queries like table joins
|
||||
and group by, and is easy to setup and learn.
|
||||
'';
|
||||
homepage = http://www.rethinkdb.com;
|
||||
license = "AGPLv3";
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -30,10 +30,10 @@ rec {
|
|||
};
|
||||
|
||||
squid32 = squid30.merge rec {
|
||||
name = "squid-3.2.2";
|
||||
name = "squid-3.2.13";
|
||||
src = args.fetchurl {
|
||||
url = "http://www.squid-cache.org/Versions/v3/3.2/${name}.tar.bz2";
|
||||
sha256 = "13jlx3d6rqq7ajxs8bgn8a0mh932jhq6aa8032q205nxnhqs0l4l";
|
||||
sha256 = "0dafqv00dr3nyrm9k47d6r7gv2r3f9hjd1ykl3kkvjca11r4n54j";
|
||||
};
|
||||
buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2
|
||||
libtool openssl];
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ stdenv, fetchurl, buildPythonPackage
|
||||
, python, cython, pkgconfig
|
||||
, xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo
|
||||
, ffmpeg_1, x264, libvpx, pil, libwebp }:
|
||||
, ffmpeg, x264, libvpx, pil, libwebp }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "xpra-0.9.5";
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://xpra.org/src/${name}.tar.bz2";
|
||||
sha256 = "1qr9gxmfnkays9hrw2qki1jdkyxhbbkjx71gy23x423cfsxsjmiw";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
python cython pkgconfig
|
||||
buildInputs = [
|
||||
python cython pkgconfig
|
||||
|
||||
xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto
|
||||
xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto
|
||||
|
|
@ -21,10 +21,10 @@ buildPythonPackage rec {
|
|||
|
||||
pango cairo gdk_pixbuf atk gtk glib
|
||||
|
||||
ffmpeg_1 libvpx x264 libwebp
|
||||
ffmpeg libvpx x264 libwebp
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = [
|
||||
pil pygtk pygobject
|
||||
];
|
||||
|
||||
|
|
@ -36,7 +36,7 @@ buildPythonPackage rec {
|
|||
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)"
|
||||
python ./setup.py build --enable-Xdummy
|
||||
'';
|
||||
|
||||
|
||||
meta = {
|
||||
homepage = http://xpra.org/;
|
||||
description = "Persistent remote applications for X";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, stdenv, pkgconfig, db48, libgcrypt, avahi, libiconv, pam, openssl }:
|
||||
{ fetchurl, stdenv, pkgconfig, db4, libgcrypt, avahi, libiconv, pam, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "netatalk-3.1.0";
|
||||
|
|
@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig db48 libgcrypt avahi libiconv pam openssl ];
|
||||
buildInputs = [ pkgconfig db4 libgcrypt avahi libiconv pam openssl ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-bdb=${db48}"
|
||||
"--with-bdb=${db4}"
|
||||
"--with-openssl=${openssl}"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{fetchurl, stdenv, flex, bdb}:
|
||||
{fetchurl, stdenv, flex, db4}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bogofilter-1.2.4";
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
# FIXME: We would need `pax' as a "propagated build input" (for use
|
||||
# by the `bf_tar' script) but we don't have it currently.
|
||||
|
||||
buildInputs = [ flex bdb ];
|
||||
buildInputs = [ flex db4 ];
|
||||
|
||||
meta = {
|
||||
homepage = http://bogofilter.sourceforge.net/;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchurl, python, zip }:
|
||||
|
||||
let
|
||||
version = "2013.12.17.2";
|
||||
version = "2013.12.20";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "youtube-dl-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
|
||||
sha256 = "1dmv14v623v9afxfn0rw1gfdd91sngfgj4dg7hwbmnqsja0qxydv";
|
||||
sha256 = "0cqr0rpa247gfk5fg65sj94x4d9a1s85343gnqmc763h5h8v50zb";
|
||||
};
|
||||
|
||||
buildInputs = [ python ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, python, sysstat, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.8.0";
|
||||
version = "4.0.1";
|
||||
name = "dd-agent-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/DataDog/dd-agent/archive/${version}.zip";
|
||||
sha256 = "1mh22rbja07gc7ydn357hlij0dl2rygkqsya9ckynsvmkkzn2gyx";
|
||||
sha256 = "0gybdbjkj7qwnzic03xkypagb30zhm22gp3nkwrdhi8fdmwz3nm1";
|
||||
};
|
||||
|
||||
buildInputs = [ python unzip ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, libpcap, enableStatic ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tcpdump-4.4.0";
|
||||
name = "tcpdump-4.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.tcpdump.org/release/${name}.tar.gz";
|
||||
sha256 = "1g9h2p31xwpdg88v7wv9hc8calq8sjs25800vzd9i45q5knln9qj";
|
||||
sha256 = "15hb7zkzd66nag102qbv100hcnf7frglbkylmr8adwr8f5jkkaql";
|
||||
};
|
||||
|
||||
buildInputs = [ libpcap ];
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls}:
|
||||
{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "rsyslog-7.2.7";
|
||||
name = "rsyslog-7.4.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.2.7.tar.gz;
|
||||
sha256 = "0vgrbbklsvnwcy0m0kbxcj5lhpn2k9bsv0lh0vnyn6hc2hx56cs8";
|
||||
url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.4.7.tar.gz;
|
||||
sha256 = "5fc7f930fa748bb6a9d86a3fc831eb1a14107db81b67d79ba8f113cf2776fa21";
|
||||
};
|
||||
|
||||
buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls];
|
||||
buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd];
|
||||
|
||||
configureFlags = "--enable-gnutls";
|
||||
preConfigure = ''
|
||||
export configureFlags="$configureFlags --enable-gnutls --enable-cached-man-pages --enable-imjournal --with-systemdsystemunitdir=$out/etc/systemd/system"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.rsyslog.com/";
|
||||
|
|
|
|||
|
|
@ -392,8 +392,9 @@ let
|
|||
|
||||
acct = callPackage ../tools/system/acct { };
|
||||
|
||||
acoustidFingerprinter = callPackage
|
||||
../tools/audio/acoustid-fingerprinter { };
|
||||
acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter {
|
||||
ffmpeg = ffmpeg_1;
|
||||
};
|
||||
|
||||
actdiag = pythonPackages.actdiag;
|
||||
|
||||
|
|
@ -612,9 +613,7 @@ let
|
|||
inherit unzip;
|
||||
};
|
||||
|
||||
bogofilter = callPackage ../tools/misc/bogofilter {
|
||||
bdb = db4;
|
||||
};
|
||||
bogofilter = callPackage ../tools/misc/bogofilter { };
|
||||
|
||||
bsdiff = callPackage ../tools/compression/bsdiff { };
|
||||
|
||||
|
|
@ -643,8 +642,7 @@ let
|
|||
cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
|
||||
|
||||
cfdg = builderDefsPackage ../tools/graphics/cfdg {
|
||||
inherit libpng bison flex;
|
||||
ffmpeg = ffmpeg_1;
|
||||
inherit libpng bison flex ffmpeg;
|
||||
};
|
||||
|
||||
checkinstall = callPackage ../tools/package-management/checkinstall { };
|
||||
|
|
@ -1205,7 +1203,9 @@ let
|
|||
|
||||
klavaro = callPackage ../games/klavaro {};
|
||||
|
||||
minidlna = callPackage ../tools/networking/minidlna { };
|
||||
minidlna = callPackage ../tools/networking/minidlna {
|
||||
ffmpeg = ffmpeg_0_10;
|
||||
};
|
||||
|
||||
mmv = callPackage ../tools/misc/mmv { };
|
||||
|
||||
|
|
@ -2792,7 +2792,9 @@ let
|
|||
else
|
||||
callPackage ../development/compilers/go/1.1.nix { };
|
||||
|
||||
go = go_1_1;
|
||||
go_1_2 = callPackage ../development/compilers/go/1.2.nix { };
|
||||
|
||||
go = go_1_2;
|
||||
|
||||
gprolog = callPackage ../development/compilers/gprolog { };
|
||||
|
||||
|
|
@ -3334,7 +3336,6 @@ let
|
|||
regina = callPackage ../development/interpreters/regina {};
|
||||
|
||||
renpy = callPackage ../development/interpreters/renpy {
|
||||
ffmpeg = ffmpeg_1;
|
||||
wrapPython = pythonPackages.wrapPython;
|
||||
};
|
||||
|
||||
|
|
@ -4022,9 +4023,9 @@ let
|
|||
|
||||
clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { };
|
||||
|
||||
clucene_core = callPackage ../development/libraries/clucene-core { };
|
||||
clucene_core_1 = callPackage ../development/libraries/clucene-core { };
|
||||
|
||||
cluceneCore = clucene_core; # !!! remove this
|
||||
clucene_core = clucene_core_1;
|
||||
|
||||
clutter = callPackage ../development/libraries/clutter { };
|
||||
|
||||
|
|
@ -4057,7 +4058,7 @@ let
|
|||
|
||||
cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { };
|
||||
|
||||
db4 = db45;
|
||||
db4 = db48;
|
||||
|
||||
db44 = callPackage ../development/libraries/db4/db4-4.4.nix { };
|
||||
|
||||
|
|
@ -4129,14 +4130,6 @@ let
|
|||
|
||||
fcgi = callPackage ../development/libraries/fcgi { };
|
||||
|
||||
ffmpeg = callPackage ../development/libraries/ffmpeg {
|
||||
vpxSupport = !stdenv.isMips;
|
||||
|
||||
stdenv = if stdenv.isDarwin
|
||||
then overrideGCC stdenv gccApple
|
||||
else stdenv;
|
||||
};
|
||||
|
||||
ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.nix {
|
||||
vpxSupport = !stdenv.isMips;
|
||||
};
|
||||
|
|
@ -4145,6 +4138,14 @@ let
|
|||
vpxSupport = !stdenv.isMips;
|
||||
};
|
||||
|
||||
ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix {
|
||||
vpxSupport = !stdenv.isMips;
|
||||
|
||||
stdenv = if stdenv.isDarwin
|
||||
then overrideGCC stdenv gccApple
|
||||
else stdenv;
|
||||
};
|
||||
|
||||
ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix {
|
||||
vpxSupport = !stdenv.isMips;
|
||||
texinfo = texinfo5;
|
||||
|
|
@ -4155,6 +4156,8 @@ let
|
|||
texinfo = texinfo5;
|
||||
};
|
||||
|
||||
ffmpeg = ffmpeg_2;
|
||||
|
||||
ffms = callPackage ../development/libraries/ffms { };
|
||||
|
||||
fftw = callPackage ../development/libraries/fftw {
|
||||
|
|
@ -4416,7 +4419,9 @@ let
|
|||
|
||||
gst_plugins_ugly = callPackage ../development/libraries/gstreamer/gst-plugins-ugly {};
|
||||
|
||||
gst_ffmpeg = callPackage ../development/libraries/gstreamer/gst-ffmpeg {};
|
||||
gst_ffmpeg = callPackage ../development/libraries/gstreamer/gst-ffmpeg {
|
||||
ffmpeg = ffmpeg_0_10;
|
||||
};
|
||||
|
||||
gst_python = callPackage ../development/libraries/gstreamer/gst-python {};
|
||||
|
||||
|
|
@ -5245,12 +5250,11 @@ let
|
|||
|
||||
lzo = callPackage ../development/libraries/lzo { };
|
||||
|
||||
mdds_0_7_1 = callPackage ../development/libraries/mdds/0.7.1.nix { };
|
||||
mdds = callPackage ../development/libraries/mdds { };
|
||||
|
||||
# failed to build
|
||||
mediastreamer = callPackage ../development/libraries/mediastreamer {
|
||||
ffmpeg = ffmpeg_1;
|
||||
};
|
||||
mediastreamer = callPackage ../development/libraries/mediastreamer { };
|
||||
|
||||
mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
|
||||
|
||||
|
|
@ -5294,9 +5298,7 @@ let
|
|||
|
||||
mkvtoolnix = callPackage ../applications/video/mkvtoolnix { };
|
||||
|
||||
mlt = callPackage ../development/libraries/mlt {
|
||||
ffmpeg = ffmpeg_1;
|
||||
};
|
||||
mlt = callPackage ../development/libraries/mlt { };
|
||||
|
||||
libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
|
||||
|
||||
|
|
@ -5397,12 +5399,9 @@ let
|
|||
|
||||
openct = callPackage ../development/libraries/openct { };
|
||||
|
||||
opencv = callPackage ../development/libraries/opencv {
|
||||
ffmpeg = ffmpeg_0_6_90;
|
||||
};
|
||||
opencv = callPackage ../development/libraries/opencv { };
|
||||
|
||||
opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix {
|
||||
ffmpeg = ffmpeg_0_6_90;
|
||||
libpng = libpng12;
|
||||
};
|
||||
|
||||
|
|
@ -5427,6 +5426,7 @@ let
|
|||
|
||||
openscenegraph = callPackage ../development/libraries/openscenegraph {
|
||||
giflib = giflib_4_1;
|
||||
ffmpeg = ffmpeg_0_10;
|
||||
};
|
||||
|
||||
openssl = callPackage ../development/libraries/openssl {
|
||||
|
|
@ -5863,20 +5863,22 @@ let
|
|||
inherit gtk2; # for plugins etc. even with gtk3, see Gentoo ebuild
|
||||
inherit gtk3 glib atk cairo pango fontconfig freetype;
|
||||
inherit (gnome) gtkdoc libsoup;
|
||||
inherit pkgconfig libtool intltool autoconf automake gperf bison flex
|
||||
inherit pkgconfig libtool intltool autoconf automake gperf flex
|
||||
libjpeg libpng libtiff libxml2 libxslt sqlite icu curl
|
||||
which libproxy geoclue enchant python ruby perl mesa xlibs;
|
||||
inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good;
|
||||
bison = bison2;
|
||||
};
|
||||
|
||||
webkit_gtk2 =
|
||||
builderDefsPackage ../development/libraries/webkit/gtk2.nix {
|
||||
inherit gtk2 glib atk cairo pango fontconfig freetype;
|
||||
inherit (gnome) gtkdoc libsoup;
|
||||
inherit pkgconfig libtool intltool autoconf automake gperf bison flex
|
||||
inherit pkgconfig libtool intltool autoconf automake gperf flex
|
||||
libjpeg libpng libtiff libxml2 libxslt sqlite icu curl
|
||||
which libproxy geoclue enchant python ruby perl mesa xlibs;
|
||||
inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good;
|
||||
bison = bison2;
|
||||
};
|
||||
|
||||
webkitgtk = callPackage ../development/libraries/webkitgtk {
|
||||
|
|
@ -5928,7 +5930,9 @@ let
|
|||
|
||||
xcb-util-cursor = callPackage ../development/libraries/xcb-util-cursor { };
|
||||
|
||||
xineLib = callPackage ../development/libraries/xine-lib { };
|
||||
xineLib = callPackage ../development/libraries/xine-lib {
|
||||
ffmpeg = ffmpeg_1;
|
||||
};
|
||||
|
||||
xautolock = callPackage ../misc/screensavers/xautolock { };
|
||||
|
||||
|
|
@ -6302,9 +6306,7 @@ let
|
|||
|
||||
mailman = callPackage ../servers/mail/mailman { };
|
||||
|
||||
mediatomb = callPackage ../servers/mediatomb {
|
||||
ffmpeg = ffmpeg_0_6_90;
|
||||
};
|
||||
mediatomb = callPackage ../servers/mediatomb { };
|
||||
|
||||
memcached = callPackage ../servers/memcached {};
|
||||
|
||||
|
|
@ -6432,6 +6434,8 @@ let
|
|||
|
||||
restund = callPackage ../servers/restund {};
|
||||
|
||||
rethinkdb = callPackage ../servers/nosql/rethinkdb { };
|
||||
|
||||
spamassassin = callPackage ../servers/mail/spamassassin {
|
||||
inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile
|
||||
HTTPDate MailDKIM LWP IOSocketSSL;
|
||||
|
|
@ -7503,7 +7507,9 @@ let
|
|||
|
||||
audacious = callPackage ../applications/audio/audacious { };
|
||||
|
||||
audacity = callPackage ../applications/audio/audacity { };
|
||||
audacity = callPackage ../applications/audio/audacity {
|
||||
ffmpeg = ffmpeg_0_10;
|
||||
};
|
||||
|
||||
milkytracker = callPackage ../applications/audio/milkytracker { };
|
||||
|
||||
|
|
@ -7531,7 +7537,9 @@ let
|
|||
};
|
||||
awesome = awesome-3-5;
|
||||
|
||||
baresip = callPackage ../applications/networking/instant-messengers/baresip {};
|
||||
baresip = callPackage ../applications/networking/instant-messengers/baresip {
|
||||
ffmpeg = ffmpeg_1;
|
||||
};
|
||||
|
||||
batik = callPackage ../applications/graphics/batik { };
|
||||
|
||||
|
|
@ -7548,9 +7556,7 @@ let
|
|||
|
||||
bibletime = callPackage ../applications/misc/bibletime { };
|
||||
|
||||
bitcoin = callPackage ../applications/misc/bitcoin {
|
||||
db4 = db48;
|
||||
};
|
||||
bitcoin = callPackage ../applications/misc/bitcoin { };
|
||||
|
||||
bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee {
|
||||
# For some reason, TLS support is broken when using GnuTLS 3.0 (can't
|
||||
|
|
@ -7941,8 +7947,9 @@ let
|
|||
lib flex bison cairo fontconfig
|
||||
gdal zlib ncurses gdbm proj pkgconfig swig
|
||||
blas liblapack libjpeg libpng mysql unixODBC mesa postgresql python
|
||||
readline sqlite tcl tk libtiff freetype ffmpeg makeWrapper wxGTK;
|
||||
readline sqlite tcl tk libtiff freetype makeWrapper wxGTK;
|
||||
fftw = fftwSinglePrec;
|
||||
ffmpeg = ffmpeg_0_10;
|
||||
motif = lesstif;
|
||||
opendwg = libdwg;
|
||||
wxPython = wxPython28;
|
||||
|
|
@ -8020,13 +8027,13 @@ let
|
|||
xfontsel = callPackage ../applications/misc/xfontsel { };
|
||||
xlsfonts = callPackage ../applications/misc/xlsfonts { };
|
||||
|
||||
freerdp = callPackage ../applications/networking/remote/freerdp { };
|
||||
freerdp = callPackage ../applications/networking/remote/freerdp {
|
||||
ffmpeg = ffmpeg_1;
|
||||
};
|
||||
|
||||
freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { };
|
||||
|
||||
freicoin = callPackage ../applications/misc/freicoin {
|
||||
db4 = db48;
|
||||
};
|
||||
freicoin = callPackage ../applications/misc/freicoin { };
|
||||
|
||||
fspot = callPackage ../applications/graphics/f-spot {
|
||||
inherit (gnome) libgnome libgnomeui;
|
||||
|
|
@ -8368,6 +8375,7 @@ let
|
|||
poppler = poppler_0_18;
|
||||
clucene_core = clucene_core_2;
|
||||
lcms = lcms2;
|
||||
mdds = mdds_0_7_1;
|
||||
};
|
||||
|
||||
liferea = callPackage ../applications/networking/newsreaders/liferea { };
|
||||
|
|
@ -8512,9 +8520,7 @@ let
|
|||
pulseSupport = config.pulseaudio or false;
|
||||
};
|
||||
|
||||
mplayer2 = callPackage ../applications/video/mplayer2 {
|
||||
ffmpeg = ffmpeg_1;
|
||||
};
|
||||
mplayer2 = callPackage ../applications/video/mplayer2 { };
|
||||
|
||||
MPlayerPlugin = browser:
|
||||
import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in {
|
||||
|
|
@ -8525,7 +8531,7 @@ let
|
|||
};
|
||||
|
||||
mpv = callPackage ../applications/video/mpv {
|
||||
ffmpeg = ffmpeg_1;
|
||||
ffmpeg = ffmpeg_2;
|
||||
bs2bSupport = true;
|
||||
quviSupport = true;
|
||||
cacaSupport = true;
|
||||
|
|
@ -8648,6 +8654,8 @@ let
|
|||
inherit (pkgs.kde4) kdelibs;
|
||||
};
|
||||
|
||||
opusfile = callPackage ../applications/audio/opusfile { };
|
||||
|
||||
opusTools = callPackage ../applications/audio/opus-tools { };
|
||||
|
||||
pan = callPackage ../applications/networking/newsreaders/pan {
|
||||
|
|
@ -9106,9 +9114,7 @@ let
|
|||
inherit (xlibs) libX11;
|
||||
};
|
||||
|
||||
vlc = callPackage ../applications/video/vlc {
|
||||
ffmpeg = ffmpeg_1;
|
||||
};
|
||||
vlc = callPackage ../applications/video/vlc { };
|
||||
|
||||
vnstat = callPackage ../applications/networking/vnstat { };
|
||||
|
||||
|
|
@ -9189,10 +9195,8 @@ let
|
|||
++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
|
||||
++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
|
||||
);
|
||||
libs =
|
||||
if cfg.enableQuakeLive or false
|
||||
then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]
|
||||
else [ ];
|
||||
libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false)
|
||||
(with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]);
|
||||
gtk_modules = [ libcanberra ];
|
||||
};
|
||||
|
||||
|
|
@ -9212,7 +9216,9 @@ let
|
|||
|
||||
xbindkeys = callPackage ../tools/X11/xbindkeys { };
|
||||
|
||||
xbmc = callPackage ../applications/video/xbmc { };
|
||||
xbmc = callPackage ../applications/video/xbmc {
|
||||
ffmpeg = ffmpeg_1;
|
||||
};
|
||||
|
||||
xca = callPackage ../applications/misc/xca { };
|
||||
|
||||
|
|
@ -9692,7 +9698,6 @@ let
|
|||
eigen = eigen2;
|
||||
libotr = libotr_3_2;
|
||||
libusb = libusb1;
|
||||
ffmpeg = ffmpeg_1;
|
||||
libcanberra = libcanberra_kde;
|
||||
}) ../desktops/kde-4.10;
|
||||
|
||||
|
|
@ -9701,7 +9706,6 @@ let
|
|||
eigen = eigen2;
|
||||
libotr = libotr_3_2;
|
||||
libusb = libusb1;
|
||||
ffmpeg = ffmpeg_1;
|
||||
libcanberra = libcanberra_kde;
|
||||
}) ../desktops/kde-4.11;
|
||||
|
||||
|
|
|
|||
|
|
@ -981,6 +981,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
|||
|
||||
esqueleto = callPackage ../development/libraries/haskell/esqueleto {};
|
||||
|
||||
eventList = callPackage ../development/libraries/haskell/event-list {};
|
||||
|
||||
exPool = callPackage ../development/libraries/haskell/ex-pool { hashable = self.hashable_1_2_1_0; };
|
||||
|
||||
exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {};
|
||||
|
|
@ -1205,6 +1207,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
|||
|
||||
haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {};
|
||||
|
||||
haskore = callPackage ../development/libraries/haskell/haskore {};
|
||||
|
||||
hastache = callPackage ../development/libraries/haskell/hastache {};
|
||||
|
||||
hexpat = callPackage ../development/libraries/haskell/hexpat {};
|
||||
|
|
@ -1498,6 +1502,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
|||
|
||||
mainlandPretty = callPackage ../development/libraries/haskell/mainland-pretty {};
|
||||
|
||||
markovChain = callPackage ../development/libraries/haskell/markov-chain {};
|
||||
|
||||
maude = callPackage ../development/libraries/haskell/maude {};
|
||||
|
||||
MaybeT = callPackage ../development/libraries/haskell/MaybeT {};
|
||||
|
|
@ -1506,6 +1512,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
|||
|
||||
mersenneRandomPure64 = callPackage ../development/libraries/haskell/mersenne-random-pure64 {};
|
||||
|
||||
midi = callPackage ../development/libraries/haskell/midi {};
|
||||
|
||||
minimorph = callPackage ../development/libraries/haskell/minimorph {};
|
||||
|
||||
miniutter = callPackage ../development/libraries/haskell/miniutter {};
|
||||
|
|
@ -1552,6 +1560,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
|||
|
||||
monoidExtras = callPackage ../development/libraries/haskell/monoid-extras {};
|
||||
|
||||
monoidTransformer = callPackage ../development/libraries/haskell/monoid-transformer {};
|
||||
|
||||
mongoDB = callPackage ../development/libraries/haskell/mongoDB {};
|
||||
|
||||
monoTraversable = callPackage ../development/libraries/haskell/mono-traversable {};
|
||||
|
|
@ -1813,6 +1823,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
|||
fgl = self.fgl_5_4_2_4;
|
||||
};
|
||||
|
||||
protocolBuffers = callPackage ../development/libraries/haskell/protocol-buffers {};
|
||||
|
||||
protocolBuffersDescriptor = callPackage ../development/libraries/haskell/protocol-buffers-descriptor {};
|
||||
|
||||
PSQueue = callPackage ../development/libraries/haskell/PSQueue {};
|
||||
|
||||
publicsuffixlist = callPackage ../development/libraries/haskell/publicsuffixlist {};
|
||||
|
|
@ -1925,6 +1939,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
|||
|
||||
resourcet = callPackage ../development/libraries/haskell/resourcet {};
|
||||
|
||||
rethinkdb = callPackage ../development/libraries/haskell/rethinkdb {};
|
||||
|
||||
rfc5051 = callPackage ../development/libraries/haskell/rfc5051 {};
|
||||
|
||||
rosezipper = callPackage ../development/libraries/haskell/rosezipper {};
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -110,4 +110,6 @@
|
|||
, "meat"
|
||||
, "hipache"
|
||||
, "posix"
|
||||
, "node-protobuf"
|
||||
, "rethinkdb"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ rec {
|
|||
"node-expat" = [ pkgs.expat ];
|
||||
"rbytes" = [ pkgs.openssl ];
|
||||
"phantomjs" = [ pkgs.phantomjs ];
|
||||
"node-protobuf" = [ pkgs.protobuf ];
|
||||
};
|
||||
|
||||
buildNodePackage = import ../development/web/nodejs/build-node-package.nix {
|
||||
|
|
|
|||
|
|
@ -1884,10 +1884,10 @@ rec {
|
|||
};
|
||||
|
||||
DataUUIDMT = buildPerlPackage {
|
||||
name = "Data-UUID-MT-1.000";
|
||||
name = "Data-UUID-MT-1.001";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Data-UUID-MT-1.000.tar.gz;
|
||||
sha256 = "1bwrxv8fp4arwrmslsb7jlnafs8cww1p5f409d1l5kpyfj2vpsyp";
|
||||
url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Data-UUID-MT-1.001.tar.gz;
|
||||
sha256 = "0bb7qibq1c5lhaihxa1sck9pb744p8c7172jgx5zh4c32ac4nk1h";
|
||||
};
|
||||
buildInputs = [ ListAllUtils ];
|
||||
propagatedBuildInputs = [ MathRandomMTAuto ];
|
||||
|
|
@ -1937,10 +1937,10 @@ rec {
|
|||
};
|
||||
|
||||
DateTime = buildPerlModule {
|
||||
name = "DateTime-1.03";
|
||||
name = "DateTime-1.04";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.03.tar.gz;
|
||||
sha256 = "384f97c73da02492d771d6b5c3b37f6b18c2e12f4db3246b1d61ff19c6d6ad6d";
|
||||
url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.04.tar.gz;
|
||||
sha256 = "1krnrp8hv0m4v1lxrvwgc3vvcycld21ygvjy5p7vaf5h1jpjzrwz";
|
||||
};
|
||||
buildInputs = [ TestFatal ];
|
||||
propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate TryTiny ];
|
||||
|
|
@ -2109,10 +2109,10 @@ rec {
|
|||
};
|
||||
|
||||
DateTimeTimeZone = buildPerlPackage {
|
||||
name = "DateTime-TimeZone-1.59";
|
||||
name = "DateTime-TimeZone-1.63";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-1.59.tar.gz;
|
||||
sha256 = "b1d50f6abde68671da1db883168ef8d6793a11ba75de02174f42e1dfd16b2522";
|
||||
url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-1.63.tar.gz;
|
||||
sha256 = "02a3kyz3cyrag98b1949k19axm03fa5ri82gdc1y4lnxjvjvxkfw";
|
||||
};
|
||||
buildInputs = [ TestOutput ];
|
||||
propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate ];
|
||||
|
|
@ -3105,10 +3105,10 @@ rec {
|
|||
};
|
||||
|
||||
ExtUtilsCBuilder = buildPerlPackage rec {
|
||||
name = "ExtUtils-CBuilder-0.280205";
|
||||
name = "ExtUtils-CBuilder-0.280212";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
|
||||
sha256 = "0nfrr3zd71gnsbp5xacdb70n17slrzj421s4nyr11zg5cqsj3ngs";
|
||||
sha256 = "0zc4hkcb8wk7nm0b2b6pb1lpih52blx6x2w6x99bcr0d581807xg";
|
||||
};
|
||||
buildInputs = [ PerlOSType ];
|
||||
};
|
||||
|
|
@ -3197,10 +3197,10 @@ rec {
|
|||
};
|
||||
|
||||
ExtUtilsManifest = buildPerlPackage rec {
|
||||
name = "ExtUtils-Manifest-1.61";
|
||||
name = "ExtUtils-Manifest-1.63";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
|
||||
sha256 = "18jj4lrip2g580b2fw5khxvdx6h3pavgihvb87snggrlgabpj20n";
|
||||
sha256 = "0p4hj03nb5n6mk7pskpw066n1i3hr80nq7k7rc3fgl329v6syfmg";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -3302,10 +3302,10 @@ rec {
|
|||
};
|
||||
|
||||
Filechdir = buildPerlPackage rec {
|
||||
name = "File-chdir-0.1006";
|
||||
name = "File-chdir-0.1008";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
|
||||
sha256 = "b26e91f8b5480544da599412612ff9287007be9703d41c35251f09c5ff19879a";
|
||||
sha256 = "0n8dz80fgk3shfxncyr4aff5hnsd846c5np6d68kc0mxqj2g0flr";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -3591,10 +3591,10 @@ rec {
|
|||
};
|
||||
|
||||
GD = buildPerlPackage rec {
|
||||
name = "GD-2.49";
|
||||
name = "GD-2.50";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz";
|
||||
sha256 = "03wwvhvni22cs7arai7d3wkb2qfa9p20grrb32hdxv41nqxqpihh";
|
||||
sha256 = "1qm8l0z2568byw4zmaqf954y3rm8nzx1nnz6cxnxd3d4cz894lvd";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype
|
||||
|
|
@ -3629,10 +3629,10 @@ rec {
|
|||
};
|
||||
|
||||
GeoIP = buildPerlPackage rec {
|
||||
name = "Geo-IP-1.39";
|
||||
name = "Geo-IP-1.43";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/B/BO/BORISZ/${name}.tar.gz";
|
||||
sha256 = "1yc0rn67nk4z8aq8d82axhfmgi0l91rkksqbf27ylasrhyb6ykx5";
|
||||
sha256 = "0p7mcn4rzvhrblx72f5a1yg88mqgv6f46mq0rvhhkmkpwckb0yjq";
|
||||
};
|
||||
makeMakerFlags = "LIBS=-L${pkgs.geoip}/lib INC=-I${pkgs.geoip}/include";
|
||||
doCheck = false; # seems to access the network
|
||||
|
|
@ -3852,11 +3852,12 @@ rec {
|
|||
};
|
||||
|
||||
HTMLFormFu = buildPerlPackage rec {
|
||||
name = "HTML-FormFu-0.09007";
|
||||
name = "HTML-FormFu-0.09010";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz";
|
||||
sha256 = "1yg9fy6s8f1jscfxf7a9hm91x43cjhk3ijw46z94sw8133h50rvy";
|
||||
sha256 = "08hf6z35yhfd1521ip8x5hpwb7h09k643s9sqf6ddmi9yvqini1k";
|
||||
};
|
||||
buildInputs = [ CGISimple ];
|
||||
propagatedBuildInputs =
|
||||
[ ClassAccessorChained Clone ConfigAny
|
||||
DateCalc ListMoreUtils EmailValid
|
||||
|
|
@ -4345,11 +4346,11 @@ rec {
|
|||
};
|
||||
|
||||
ImageExifTool = buildPerlPackage rec {
|
||||
name = "Image-ExifTool-8.41";
|
||||
name = "Image-ExifTool-9.27";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz";
|
||||
sha256 = "1fdjic0bhbai8zzl3287i9wcs88khiv8qx5slx9n3gzvbnxacvqg";
|
||||
sha256 = "1f37pi7a6fcphp0kkhj7yr9b5c95m2wvy5jcwjq1xdiq74gdi16c";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -4442,11 +4443,12 @@ rec {
|
|||
};
|
||||
|
||||
JSON = buildPerlPackage {
|
||||
name = "JSON-2.53";
|
||||
name = "JSON-2.90";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.53.tar.gz;
|
||||
sha256 = "0rfms17d0pkai26kqyzaylbr5wxcrrhyjkyshq85l41xb0g1iplh";
|
||||
url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.90.tar.gz;
|
||||
sha256 = "127yppvr17qik9pkd1vy901hs4l13kg6rhp76jdgcyask35v7nsd";
|
||||
};
|
||||
buildInputs = [ TestPod ];
|
||||
meta = {
|
||||
description = "JSON (JavaScript Object Notation) encoder/decoder";
|
||||
license = "perl";
|
||||
|
|
@ -4467,10 +4469,10 @@ rec {
|
|||
};
|
||||
|
||||
JSONPP = buildPerlPackage rec {
|
||||
name = "JSON-PP-2.27200";
|
||||
name = "JSON-PP-2.27203";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-2.27200.tar.gz;
|
||||
sha256 = "1lv9riws9f72gya2fsp5jvbd1fbzyi8423x38a491ryy9cai2ph3";
|
||||
url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-2.27203.tar.gz;
|
||||
sha256 = "0ljwya1fb4969pckcq2j1g6axgx8qh9yscxbs6qf62qxf8wkj1mp";
|
||||
};
|
||||
meta = {
|
||||
description = "JSON::XS compatible pure-Perl module";
|
||||
|
|
@ -4688,10 +4690,10 @@ rec {
|
|||
};
|
||||
|
||||
LogDispatch = buildPerlPackage {
|
||||
name = "Log-Dispatch-2.39";
|
||||
name = "Log-Dispatch-2.41";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.39.tar.gz;
|
||||
sha256 = "1bi2nza0nc66i0ls2zkxi6bbwkh456pl0q8h57mq6skbhbmcwbb8";
|
||||
url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.41.tar.gz;
|
||||
sha256 = "0vsmlkx2g9lc13pl9v96kn575yszfvd79a236b8v0s1di83gm09z";
|
||||
};
|
||||
propagatedBuildInputs = [ ClassLoad ParamsValidate ];
|
||||
meta = {
|
||||
|
|
@ -4845,10 +4847,10 @@ rec {
|
|||
};
|
||||
|
||||
MailDKIM = buildPerlPackage rec {
|
||||
name = "Mail-DKIM-0.39";
|
||||
name = "Mail-DKIM-0.40";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/J/JA/JASLONG/${name}.tar.gz";
|
||||
sha256 = "b1425a540f514c483e80566fb3decc2c1db4162306f6ae8794cef72a2d73557b";
|
||||
sha256 = "1wd6mab4fp47v1nh85jfxsjmysnyv5mwvfv47cn5m2h2lb1s0piw";
|
||||
};
|
||||
propagatedBuildInputs = [ CryptOpenSSLRSA NetDNS MailTools ];
|
||||
doCheck = false; # tries to access the domain name system
|
||||
|
|
@ -5643,10 +5645,10 @@ rec {
|
|||
};
|
||||
|
||||
MooseXSetOnce = buildPerlPackage rec {
|
||||
name = "MooseX-SetOnce-0.200001";
|
||||
name = "MooseX-SetOnce-0.200002";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz";
|
||||
sha256 = "0qa2i45g2zn4r0wg7hba9va68nin5l63gr9l8b5q3hr4cjn97ll6";
|
||||
sha256 = "0ndnl8dj7nh8lvckl6r3jw31d0dmq30qf2pqkgcz0lykzjvhdvfb";
|
||||
};
|
||||
buildInputs = [ TestFatal ];
|
||||
propagatedBuildInputs = [ Moose ];
|
||||
|
|
@ -6679,10 +6681,10 @@ rec {
|
|||
};
|
||||
|
||||
PerlPrereqScanner = buildPerlPackage {
|
||||
name = "Perl-PrereqScanner-1.016";
|
||||
name = "Perl-PrereqScanner-1.018";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.016.tar.gz;
|
||||
sha256 = "1ab70723f3d036ef91684572beacab40bf99f5ed69922769aa077664c778c474";
|
||||
url = mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.018.tar.gz;
|
||||
sha256 = "11zkam8svpgcjhjda0ap3afd797a69ndcc64fy3xw0j8v8kxa6hc";
|
||||
};
|
||||
buildInputs = [ PPI TryTiny ];
|
||||
propagatedBuildInputs = [ GetoptLongDescriptive ListMoreUtils ModulePath Moose PPI ParamsUtil StringRewritePrefix namespaceautoclean ];
|
||||
|
|
@ -6826,10 +6828,10 @@ rec {
|
|||
};
|
||||
|
||||
PodWeaver = buildPerlPackage {
|
||||
name = "Pod-Weaver-3.101638";
|
||||
name = "Pod-Weaver-4.004";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-3.101638.tar.gz;
|
||||
sha256 = "1232b761016221e331a266a42661fa352447d0da075ebdb41dc4c4d71e60629c";
|
||||
url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-4.004.tar.gz;
|
||||
sha256 = "0hw500qkbmnwm385za5x7ypijx0lqk8cfc9jq232v95ka0hqcg29";
|
||||
};
|
||||
buildInputs = [ PPI SoftwareLicense TestDifferences ];
|
||||
propagatedBuildInputs = [ ConfigMVP ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli Moose MooseAutobox ParamsUtil PodElemental StringFlogger StringFormatter StringRewritePrefix namespaceautoclean ];
|
||||
|
|
@ -7543,10 +7545,10 @@ rec {
|
|||
};
|
||||
|
||||
SubInstall = buildPerlPackage {
|
||||
name = "Sub-Install-0.926";
|
||||
name = "Sub-Install-0.927";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.926.tar.gz;
|
||||
sha256 = "0gkns6p11j46j6yzacanhbqgd4ws5r0ppg6yivz7cjbq8dk4kcmc";
|
||||
url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.927.tar.gz;
|
||||
sha256 = "0nmgsdbwi8f474jkyd6w9jfnpav99xp8biydcdri8qri623f6plm";
|
||||
};
|
||||
meta = {
|
||||
homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
|
||||
|
|
@ -8263,10 +8265,10 @@ rec {
|
|||
};
|
||||
|
||||
TestPod = buildPerlPackage {
|
||||
name = "Test-Pod-1.45";
|
||||
name = "Test-Pod-1.48";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-Pod-1.45.tar.gz;
|
||||
sha256 = "0yv0bglm4b9zfi9l5z6x2dy6pzlh8n5z9yl7py5v6h48mwgk74fk";
|
||||
url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-Pod-1.48.tar.gz;
|
||||
sha256 = "1hmwwhabyng4jrnll926b4ab73r40w3pfchlrvs0yx6kh6kwwy14";
|
||||
};
|
||||
meta = {
|
||||
homepage = http://search.cpan.org/dist/Test-Pod/;
|
||||
|
|
|
|||
|
|
@ -334,7 +334,6 @@ let
|
|||
ffado = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
ffmpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
ffmpeg_0_6_90 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
ffmpeg_1_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
fileschanged = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
fio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
firefox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
|
|
|
|||
Loading…
Reference in a new issue