Merge branch 'master' into staging
This commit is contained in:
commit
0ebcd097fe
@ -1256,6 +1256,11 @@
|
||||
github = "fare";
|
||||
name = "Francois-Rene Rideau";
|
||||
};
|
||||
fdns = {
|
||||
email = "fdns02@gmail.com";
|
||||
github = "fdns";
|
||||
name = "Felipe Espinoza";
|
||||
};
|
||||
fgaz = {
|
||||
email = "francygazz@gmail.com";
|
||||
github = "fgaz";
|
||||
|
@ -9,7 +9,7 @@ let
|
||||
# Latest version number can be found at:
|
||||
# http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
|
||||
# Be careful not to pick the testing version.
|
||||
version = "1.0.69.336.g7edcc575-39";
|
||||
version = "1.0.72.117.g6bd7cc73-35";
|
||||
|
||||
deps = [
|
||||
alsaLib
|
||||
@ -54,7 +54,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
|
||||
sha256 = "0bh2q7g478g7wj661fypxcbhrbq87zingfyigg7rz1shgsgwc3gd";
|
||||
sha256 = "0yicwvg6jx8r657ff53326akq3g4ayiinlracjw5jrcs8x9whjap";
|
||||
};
|
||||
|
||||
buildInputs = [ dpkg makeWrapper ];
|
||||
|
@ -1,12 +1,12 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
rec {
|
||||
version = "8.0.1451";
|
||||
version = "8.0.1605";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim";
|
||||
repo = "vim";
|
||||
rev = "v${version}";
|
||||
sha256 = "1vxd5mr8c62qyf7ax7gi2wka48282yplckq91154yd55xcqw36zx";
|
||||
sha256 = "0a8zf43q806py14vq1frm350wycn47cmanj1hn1i7bqx1gdgcal9";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
@ -5,28 +5,20 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.17.0";
|
||||
version = "3.19.0";
|
||||
name = "calibre-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
|
||||
sha256 = "1w6hw1s0d4daa4q2ykzhxdndiq61l8z7ls7rxh7k7p62ia0i5sxp";
|
||||
sha256 = "0sann0aw6ngvmqp7049zg6hyqjrb5myq5ivr4r9x732c1cnjhhw9";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Patches from Debian that:
|
||||
# - disable plugin installation (very insecure)
|
||||
./disable_plugins.patch
|
||||
# - switches the version update from enabled to disabled by default
|
||||
(fetchpatch {
|
||||
name = "disable_plugins.patch";
|
||||
url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/disable_plugins.py-20111220183043-dcl08ccfagjxt1dv-1/disable_plugins.py";
|
||||
sha256 = "19spdx52dhbrfn9lm084yl3cfwm6f90imd51k97sf7flmpl569pk";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "no_updates_dialog.patch";
|
||||
url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/no_updates_dialog.pa-20081231120426-rzzufl0zo66t3mtc-16/no_updates_dialog.patch";
|
||||
sha256 = "16xwa2fa47jvs954fjrwr8rhh89aljgi1d1wrfxa40sknlmfwxif";
|
||||
})
|
||||
./no_updates_dialog.patch
|
||||
# the unrar patch is not from debian
|
||||
] ++ stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
|
||||
|
||||
|
17
pkgs/applications/misc/calibre/disable_plugins.patch
Normal file
17
pkgs/applications/misc/calibre/disable_plugins.patch
Normal file
@ -0,0 +1,17 @@
|
||||
Description: Disable plugin dialog. It uses a totally non-authenticated and non-trusted way of installing arbitrary code.
|
||||
Author: Martin Pitt <mpitt@debian.org>
|
||||
Bug-Debian: http://bugs.debian.org/640026
|
||||
|
||||
Index: calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py
|
||||
===================================================================
|
||||
--- calibre-0.8.29+dfsg.orig/src/calibre/gui2/actions/preferences.py 2011-12-16 05:49:14.000000000 +0100
|
||||
+++ calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py 2011-12-20 19:29:04.798468930 +0100
|
||||
@@ -28,8 +28,6 @@
|
||||
pm.addAction(QIcon(I('config.png')), _('Preferences'), self.do_config)
|
||||
cm('welcome wizard', _('Run welcome wizard'),
|
||||
icon='wizard.png', triggered=self.gui.run_wizard)
|
||||
- cm('plugin updater', _('Get plugins to enhance calibre'),
|
||||
- icon='plugins/plugin_updater.png', triggered=self.get_plugins)
|
||||
if not DEBUG:
|
||||
pm.addSeparator()
|
||||
cm('restart', _('Restart in debug mode'), icon='debug.png',
|
27
pkgs/applications/misc/calibre/no_updates_dialog.patch
Normal file
27
pkgs/applications/misc/calibre/no_updates_dialog.patch
Normal file
@ -0,0 +1,27 @@
|
||||
diff -burN calibre-2.9.0.orig/src/calibre/gui2/main.py calibre-2.9.0/src/calibre/gui2/main.py
|
||||
--- calibre-2.9.0.orig/src/calibre/gui2/main.py 2014-11-09 20:09:54.081231882 +0800
|
||||
+++ calibre-2.9.0/src/calibre/gui2/main.py 2014-11-09 20:15:48.193033844 +0800
|
||||
@@ -37,8 +37,9 @@
|
||||
help=_('Start minimized to system tray.'))
|
||||
parser.add_option('-v', '--verbose', default=0, action='count',
|
||||
help=_('Ignored, do not use. Present only for legacy reasons'))
|
||||
- parser.add_option('--no-update-check', default=False, action='store_true',
|
||||
- help=_('Do not check for updates'))
|
||||
+ parser.add_option('--update-check', dest='no_update_check', default=True,
|
||||
+ action='store_false',
|
||||
+ help=_('Check for updates'))
|
||||
parser.add_option('--ignore-plugins', default=False, action='store_true',
|
||||
help=_('Ignore custom plugins, useful if you installed a plugin'
|
||||
' that is preventing calibre from starting'))
|
||||
diff -burN calibre-2.9.0.orig/src/calibre/gui2/update.py calibre-2.9.0/src/calibre/gui2/update.py
|
||||
--- calibre-2.9.0.orig/src/calibre/gui2/update.py 2014-11-09 20:09:54.082231864 +0800
|
||||
+++ calibre-2.9.0/src/calibre/gui2/update.py 2014-11-09 20:17:49.954767115 +0800
|
||||
@@ -154,6 +154,8 @@
|
||||
self.update_checker.signal.update_found.connect(self.update_found,
|
||||
type=Qt.QueuedConnection)
|
||||
self.update_checker.start()
|
||||
+ else:
|
||||
+ self.update_checker = None
|
||||
|
||||
def recalc_update_label(self, number_of_plugin_updates):
|
||||
self.update_found(self.last_newest_calibre_version, number_of_plugin_updates)
|
@ -5,14 +5,14 @@ with stdenv.lib;
|
||||
|
||||
let patches' = if patches == null then [] else patches;
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "st-0.7";
|
||||
name = "st-0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.suckless.org/st/${name}.tar.gz";
|
||||
sha256 = "f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000";
|
||||
sha256 = "0xkmb7f1qq01ny1667c7bkf2zi3h4ryc6zpml22ccrkxs0h3jdbp";
|
||||
};
|
||||
|
||||
patches = patches' ++ [ ./st-fix-deletekey.patch ];
|
||||
patches = patches';
|
||||
|
||||
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
|
||||
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
|
||||
|
@ -1,15 +0,0 @@
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 1896246..b41747f 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -315,8 +315,8 @@ static Key key[] = {
|
||||
{ XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
|
||||
{ XK_Delete, ShiftMask, "\033[2K", -1, 0, 0},
|
||||
{ XK_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
|
||||
- { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
|
||||
- { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
|
||||
+ { XK_Delete, XK_ANY_MOD, "\033[P", +1, 0, 0},
|
||||
+ { XK_Delete, XK_ANY_MOD, "\033[3~", -1, 0, 0},
|
||||
{ XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0},
|
||||
{ XK_BackSpace, Mod1Mask, "\033\177", 0, 0, 0},
|
||||
{ XK_Home, ShiftMask, "\033[2J", 0, -1, 0},
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, makeWrapper, jre
|
||||
, version ? "1.3" }:
|
||||
, version ? "1.4" }:
|
||||
|
||||
let
|
||||
versionMap = {
|
||||
@ -10,9 +10,9 @@ let
|
||||
hadoopBundle = "-hadoop27";
|
||||
};
|
||||
"1.4" = {
|
||||
flinkVersion = "1.4.0";
|
||||
flinkVersion = "1.4.2";
|
||||
scalaVersion = "2.11";
|
||||
sha256 = "0d80djx1im3h8mf60qzi12km1bbik8a5l3nks85jzi0r0xzfgkm6";
|
||||
sha256 = "0x3cikys5brin0kx9zr69xfp8k5w6g8141yrrr26ks7gpss2x636";
|
||||
hadoopBundle = "";
|
||||
};
|
||||
};
|
||||
|
@ -1,80 +1,72 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python
|
||||
, transmission
|
||||
, deluge
|
||||
, config
|
||||
{ lib, python
|
||||
, delugeSupport ? true, deluge ? null
|
||||
}:
|
||||
|
||||
with python.pkgs;
|
||||
assert delugeSupport -> deluge != null;
|
||||
|
||||
# Flexget have been a trouble maker in the past,
|
||||
# if you see flexget breaking when updating packages, don't worry.
|
||||
# The current state is that we have no active maintainers for this package.
|
||||
# -- Mic92
|
||||
|
||||
let
|
||||
python' = python.override { inherit packageOverrides; };
|
||||
|
||||
packageOverrides = self: super: {
|
||||
sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {
|
||||
version = "1.1.10";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
sha256 = "1lvb14qclrx0qf6qqx8a8hkx5akk5lk3dvcqz8760v9hya52pnfv";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
with python'.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
version = "2.10.82";
|
||||
name = "FlexGet-${version}";
|
||||
pname = "FlexGet";
|
||||
version = "2.13.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Flexget";
|
||||
repo = "Flexget";
|
||||
rev = version;
|
||||
sha256 = "15508ihswfjbkzhf1f0qhn2ar1aiibz2ggp5d6r33icy8xwhpv09";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1lkmxwy7k4zlcqpigwk8skc2zi8a70vrw21pz80wvmf9yg0wc9z9";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
# test_regexp requires that HOME exist, test_filesystem requires a
|
||||
# unicode-capable filesystem (and setting LC_ALL doesn't work).
|
||||
# setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "chardet==3.0.3" "chardet" \
|
||||
--replace "rebulk==0.8.2" "rebulk" \
|
||||
--replace "cherrypy==10.2.2" "cherrypy" \
|
||||
--replace "portend==1.8" "portend" \
|
||||
--replace "sqlalchemy==1.1.10" "sqlalchemy" \
|
||||
--replace "zxcvbn-python==4.4.15" "zxcvbn-python" \
|
||||
--replace "flask-cors==3.0.2" "flask-cors" \
|
||||
--replace "certifi==2017.4.17" "certifi" \
|
||||
--replace "apscheduler==3.3.1" "apscheduler" \
|
||||
--replace "path.py==10.3.1" "path.py" \
|
||||
--replace "tempora==1.8" "tempora" \
|
||||
--replace "cheroot==5.5.0" "cheroot" \
|
||||
--replace "six==1.10.0" "six" \
|
||||
--replace "aniso8601==1.2.1" "aniso8601"
|
||||
# remove dependency constraints
|
||||
sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
export HOME=.
|
||||
py.test --disable-pytest-warnings -k "not test_quality_failures \
|
||||
and not test_group_quality \
|
||||
and not crash_report \
|
||||
and not test_multi_episode \
|
||||
and not test_double_episodes \
|
||||
and not test_inject_force \
|
||||
and not test_double_prefered \
|
||||
and not test_double \
|
||||
and not test_non_ascii"
|
||||
'';
|
||||
# ~400 failures
|
||||
doCheck = false;
|
||||
|
||||
buildInputs = [ pytest mock vcrpy pytest-catchlog boto3 ];
|
||||
propagatedBuildInputs = [
|
||||
feedparser sqlalchemy pyyaml chardet
|
||||
beautifulsoup4 html5lib PyRSS2Gen pynzb
|
||||
rpyc jinja2 jsonschema requests dateutil jsonschema
|
||||
feedparser sqlalchemy pyyaml
|
||||
chardet beautifulsoup4 html5lib
|
||||
PyRSS2Gen pynzb rpyc jinja2
|
||||
jsonschema requests dateutil
|
||||
pathpy guessit_2_0 APScheduler
|
||||
terminaltables colorclass
|
||||
cherrypy flask flask-restful flask-restplus
|
||||
flask-compress flask_login flask-cors
|
||||
pyparsing safe future zxcvbn-python
|
||||
werkzeug tempora cheroot rebulk portend
|
||||
cherrypy flask flask-restful
|
||||
flask-restplus flask-compress
|
||||
flask_login flask-cors safe
|
||||
pyparsing future zxcvbn-python
|
||||
werkzeug tempora cheroot rebulk
|
||||
portend transmissionrpc aniso8601
|
||||
babelfish certifi click futures
|
||||
idna itsdangerous markupsafe
|
||||
plumbum pytz six tzlocal urllib3
|
||||
webencodings werkzeug zxcvbn-python
|
||||
] ++ lib.optional (pythonOlder "3.4") pathlib
|
||||
# enable deluge and transmission plugin support, if they're installed
|
||||
++ lib.optional (config.deluge or false) deluge
|
||||
++ lib.optional (transmission != null) transmissionrpc;
|
||||
++ lib.optional delugeSupport deluge;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = https://flexget.com/;
|
||||
description = "Multipurpose automation tool for content like torrents";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ domenkozar tari ];
|
||||
broken = true; # as of 2018-02-09
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }:
|
||||
|
||||
let version = "1.23.0"; in
|
||||
let version = "1.23.2"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pidgin-sipe-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz";
|
||||
sha256 = "795811ced33fcc5affae259828f6452bfc0e0b02737ea68483e1bd9ec0459013";
|
||||
sha256 = "1xj4nn5h103q4agar167xwcp98qf8knrgs918nl07qaxp9g4558w";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "imapfilter-${version}";
|
||||
version = "2.6.10";
|
||||
version = "2.6.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lefcha";
|
||||
repo = "imapfilter";
|
||||
rev = "v${version}";
|
||||
sha256 = "1011pbgbaz43kmxcc5alv06jly9wqmqgr0b64cm5i1md727v3rzc";
|
||||
sha256 = "0cjnp7vqmgqym2zswabkmwlbj21r063vw7wkwxglj08z5qyjl5ps";
|
||||
};
|
||||
|
||||
makeFlagsArray = "PREFIX=$(out)";
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "inboxer-${version}";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Unofficial, free and open-source Google Inbox Desktop App";
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb";
|
||||
sha256 = "0nqgsqxsjnj46wsfb60p7fr631yx3fx7dfa4fpj6x2ml4i42kxid";
|
||||
sha256 = "1k2wgvs17lfxqmk0v7g8cf34h5ahr41vaibgb4a6ixay41hfx06d";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
let
|
||||
pname = "liferea";
|
||||
version = "1.12.1";
|
||||
version = "1.12.2";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
|
||||
sha256 = "14qx3x2xjcnydc4ma8vdac63phas7jzwbjl4b9r5hf6vxv3mpvdq";
|
||||
sha256 = "18mz1drp6axvjbr9jdw3i0ijl3l2m191198p4c93qnm7g96ldh15";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ];
|
||||
|
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "vnstat-${version}";
|
||||
version = "1.17";
|
||||
version = "1.18";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "0wbrmb4zapblb3b61180ryqy6i0c7gcacqz0y3r1x7nafqswbr0q";
|
||||
sha256 = "1mc7qqvrnl0zyhgh8n7wx1g1cbwq74xpvbz8rfjmyi77p693a6fp";
|
||||
url = "http://humdi.net/vnstat/${name}.tar.gz";
|
||||
};
|
||||
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "igv-${version}";
|
||||
version = "2.4.8";
|
||||
version = "2.4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip";
|
||||
sha256 = "1ca4lsb5j00066sd1gy8jr8jhzpd9142fhj4khb8nc45010wib0q";
|
||||
sha256 = "0acyq7602g2pz6mc9ip1297c68kgl9pq9yzk3k2lli9l5qvxi3g1";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip jre ];
|
||||
|
@ -1,34 +1,46 @@
|
||||
{ stdenv, fetchFromGitHub, zlib, boost, glucose }:
|
||||
{ stdenv, fetchurl, fetchFromGitHub, zlib, boost, glucose }:
|
||||
|
||||
let
|
||||
glucose' = fetchurl {
|
||||
url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup.tgz";
|
||||
sha256 = "0bq5l2jabhdfhng002qfk0mcj4pfi1v5853x3c7igwfrgx0jmfld";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "aspino-2016-01-31";
|
||||
name = "aspino-unstable-2017-03-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alviano";
|
||||
repo = "aspino";
|
||||
rev = "d28579b5967988b88bce6d9964a8f0a926286e9c";
|
||||
sha256 = "0r9dnkq3rldv5hhnmycmzqyg23hv5w3g3i5a00a8zalnzfiyirnq";
|
||||
rev = "e31c3b4e5791a454e6602439cb26bd98d23c4e78";
|
||||
sha256 = "0annsjs2prqmv1lbs0lxr7yclfzh47xg9zyiq6mdxcc02rxsi14f";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib boost ];
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "GCC = g++" "GCC = c++"
|
||||
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
cp ${glucose.src} patches/glucose-syrup.tgz
|
||||
cp ${glucose'} patches/glucose-syrup.tgz
|
||||
./bootstrap.sh
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install -m0755 build/release/{aspino,fairino-{bs,ls,ps},maxino-2015-{k16,kdyn}} $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "SAT/PseudoBoolean/MaxSat/ASP solver using glucose";
|
||||
maintainers = with maintainers; [ gebner ];
|
||||
maintainers = with maintainers; [ gebner ma27 ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.asl20;
|
||||
homepage = http://alviano.net/software/maxino/;
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }:
|
||||
|
||||
let
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
name = "fricas-" + version;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://sourceforge.net/projects/fricas/files/fricas/${version}/${name}-full.tar.bz2";
|
||||
sha256 = "17a3vfvsn2idydqslf5r6z3sk6a5bdgj6z1n3dmnwmpkc4z152vr";
|
||||
sha256 = "1avp9mbl5yn192c7kz5c2d18k33hay9lwii363b0v5hj3qgq2hhl";
|
||||
};
|
||||
|
||||
buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ];
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "trayer-1.1.7";
|
||||
name = "trayer-1.1.8";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ gdk_pixbuf gtk2 ];
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "sargon";
|
||||
repo = "trayer-srg";
|
||||
rev = name;
|
||||
sha256 = "06lpgralggh5546qgvpilzxh4anshli2za41x68x2zbaizyqb09a";
|
||||
sha256 = "1mvhwaqa9bng9wh3jg3b7y8gl7nprbydmhg963xg0r076jyzv0cg";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
@ -1,15 +1,15 @@
|
||||
{ stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }:
|
||||
|
||||
let
|
||||
rev = "592a5714595b4448b646a7d49df04c285668c2f8";
|
||||
rev= "f8e08c89dd98b7b8dba318d245dcd4abd3328ae2";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "manticore-${version}";
|
||||
version = "2014.08.18";
|
||||
version = "2017.08.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rrnewton";
|
||||
repo = "manticore_temp_mirror";
|
||||
sha256 = "1snwlm9a31wfgvzb80y7r7yvc6n0k0bi675lqwzll95as7cdswwi";
|
||||
owner = "ManticoreProject";
|
||||
repo = "manticore";
|
||||
sha256 = "06icq0qdzwyzbsyms53blxpb9i26n2vn7ci8p9xvvnq687hxhr73";
|
||||
inherit rev;
|
||||
};
|
||||
|
||||
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
|
||||
mkdir -p $out
|
||||
cd $out
|
||||
unpackFile $src
|
||||
mv manticore_temp_mirror-${rev}-src repo_checkout
|
||||
mv source repo_checkout
|
||||
cd repo_checkout
|
||||
chmod u+w . -R
|
||||
'';
|
||||
|
@ -1,20 +1,20 @@
|
||||
{ stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib
|
||||
{ stdenv, fetchurl, jdk, gmp, readline, openssl, libjpeg, unixODBC, zlib
|
||||
, libXinerama, libXft, libXpm, libSM, libXt, freetype, pkgconfig
|
||||
, fontconfig, makeWrapper ? stdenv.isDarwin
|
||||
}:
|
||||
|
||||
let
|
||||
version = "7.4.2";
|
||||
version = "7.6.4";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "swi-prolog-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz";
|
||||
sha256 = "12yzy3w2l1p9fv77lv20xbqq47d0zjw5rkz96mx1xg1lldyja5vz";
|
||||
sha256 = "14bq4sqs61maqpnmgy6687jjj0shwc27cpfsqbf056nrssmplg9d";
|
||||
};
|
||||
|
||||
buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama
|
||||
buildInputs = [ jdk gmp readline openssl libjpeg unixODBC libXinerama
|
||||
libXft libXpm libSM libXt zlib freetype pkgconfig fontconfig ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
|
||||
|
||||
|
@ -1006,4 +1006,7 @@ self: super: {
|
||||
sha256 = "1485bbjca1wqbh3c9yqj85kmq8j7zxq79y5isxypy3r6wjpr3g6b";
|
||||
});
|
||||
|
||||
# https://github.com/Daniel-Diaz/matrix/issues/55
|
||||
matrix_0_3_6_0 = dontCheck super.matrix_0_3_6_0;
|
||||
|
||||
}
|
||||
|
@ -90,9 +90,10 @@ self: super: {
|
||||
distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; });
|
||||
hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; });
|
||||
cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; });
|
||||
stylish-cabal = dontHaddock (dontCheck (super.stylish-cabal.overrideScope (self: super: {
|
||||
cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; });
|
||||
stylish-cabal = dontCheck (super.stylish-cabal.overrideScope (self: super: {
|
||||
Cabal = self.Cabal_2_2_0_0;
|
||||
haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
|
||||
})));
|
||||
}));
|
||||
|
||||
}
|
||||
|
@ -47,11 +47,6 @@ self: super: {
|
||||
|
||||
## Shadowed:
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=3 && <4.11
|
||||
boxes = super.boxes_0_1_5;
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
## • No instance for (GHC.Base.Semigroup BV)
|
||||
## arising from the superclasses of an instance declaration
|
||||
@ -134,37 +129,6 @@ self: super: {
|
||||
|
||||
## On Hackage:
|
||||
|
||||
## On Hackage, awaiting for import
|
||||
tasty = overrideCabal super.tasty (drv: {
|
||||
## • No instance for (Semigroup OptionSet)
|
||||
## arising from the superclasses of an instance declaration
|
||||
## • In the instance declaration for ‘Monoid OptionSet’
|
||||
version = "1.0.0.1";
|
||||
sha256 = "0ggqffw9kbb6nlq1pplk131qzxndqqzqyf4s2p7576nljx11a7qf";
|
||||
});
|
||||
|
||||
|
||||
|
||||
## Upstreamed
|
||||
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
cabal2nix = (overrideCabal super.cabal2nix (drv: {
|
||||
## Ambiguous occurrence ‘<>’
|
||||
## It could refer to either ‘Prelude.<>’,
|
||||
## imported from ‘Prelude’ at src/Distribution/Nixpkgs/Haskell/Derivation.hs:6:8-46
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "nixos";
|
||||
repo = "cabal2nix";
|
||||
rev = "32974fcc3d9b485bd35167d9ae90941a5b3d06df";
|
||||
sha256 = "1racp49z5922rvrc62clslzdkxh4axj2i0k83w5y6w5chl83abyd";
|
||||
};
|
||||
})).override {
|
||||
## • No instance for (Semigroup (List a))
|
||||
## arising from the 'deriving' clause of a data type declaration
|
||||
## Possible fix:
|
||||
hpack = self.hpack;
|
||||
};
|
||||
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
cabal-install = overrideCabal super.cabal-install (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
@ -535,32 +499,12 @@ self: super: {
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
## Issue: https://github.com/jgm/doctemplates/issues/2
|
||||
doctemplates = overrideCabal super.doctemplates (drv: {
|
||||
patches = (drv.patches or []) ++ [
|
||||
(pkgs.fetchpatch
|
||||
{ url = https://github.com/jgm/doctemplates/commit/3f8bb8feb19ed86b881bc09d963026db9d98df21.patch;
|
||||
sha256 = "0xmjljh8c90qlzp6wn39iy23pj2j0d4m4r1hxs22zps6qdwk5s6d";
|
||||
})
|
||||
];
|
||||
});
|
||||
|
||||
exception-transformers = overrideCabal super.exception-transformers (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## HUnit >=1.2 && <1.6
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
GenericPretty = overrideCabal super.GenericPretty (drv: {
|
||||
## https://github.com/RazvanRanca/GenericPretty/issues/2
|
||||
patches = (drv.patches or []) ++ [
|
||||
(pkgs.fetchpatch
|
||||
{ url = https://github.com/RazvanRanca/GenericPretty/pull/3.patch;
|
||||
sha256 = "1dpdqsjmy9j9b6md5r9jyhbxnxjd51nmfb5in01j10iqzhj9j51k";
|
||||
})
|
||||
];
|
||||
});
|
||||
|
||||
github = overrideCabal super.github (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.7 && <4.11
|
||||
@ -729,7 +673,47 @@ self: super: {
|
||||
stripLen = 1;
|
||||
});
|
||||
|
||||
# Fix missing semigroup instance.
|
||||
data-inttrie = appendPatch super.data-inttrie (pkgs.fetchpatch
|
||||
{ url = https://github.com/luqui/data-inttrie/pull/5.patch;
|
||||
sha256 = "1wwdzrbsjqb7ih4nl28sq5bbj125mxf93a74yh4viv5gmxwj606a";
|
||||
});
|
||||
|
||||
# 1.3.0.0 does not compile.
|
||||
conduit = self.conduit_1_3_0_1;
|
||||
|
||||
# https://github.com/jgm/pandoc-types/issues/37
|
||||
pandoc-types = self.pandoc-types_1_17_4_1;
|
||||
pandoc-types = self.pandoc-types_1_17_4_2;
|
||||
|
||||
## Need latest git version to support current haddock-library versions.
|
||||
pandoc = overrideSrc super.pandoc {
|
||||
version = "2.1.2-git";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "jgm";
|
||||
repo = "pandoc";
|
||||
rev = "fad8d0d67ff4736e1af554d2bfcf1688aa28c8ec";
|
||||
sha256 = "1sgfnyi2ma8vf91dw9ax9xbbjfcja1q5q9vcwa1rhh05jv8j036a";
|
||||
};
|
||||
};
|
||||
|
||||
# Fix missing semigroup instance.
|
||||
json = appendPatch super.json (pkgs.fetchpatch
|
||||
{ url = https://github.com/GaloisInc/json/commit/9292150bbe02c2d126ad6a876242578b1a9d1bf2.patch;
|
||||
sha256 = "1xw2gab0wzhszgcbjhg98kkzgnbfn9n3bx1qlk6g7ir6hhwppm9z";
|
||||
});
|
||||
|
||||
# Older versions don't compile.
|
||||
brick = self.brick_0_35;
|
||||
timezone-olson = self.timezone-olson_0_1_9;
|
||||
matrix = self.matrix_0_3_6_0;
|
||||
|
||||
# https://github.com/pikajude/th-printf/issues/8
|
||||
th-printf = doJailbreak super.th-printf;
|
||||
|
||||
# https://github.com/xmonad/xmonad/issues/155
|
||||
xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch
|
||||
{ url = https://github.com/xmonad/xmonad/pull/153/commits/c96a59fa0de2f674e60befd0f57e67b93ea7dcf6.patch;
|
||||
sha256 = "1mj3k0w8aqyy71kmc71vzhgxmr4h6i5b3sykwflzays50grjm5jp";
|
||||
})) self.semigroups;
|
||||
|
||||
}
|
||||
|
@ -9851,6 +9851,32 @@ self: {
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"Hoed_0_5_1" = callPackage
|
||||
({ mkDerivation, array, base, bytestring, cereal, cereal-text
|
||||
, cereal-vector, clock, containers, deepseq, directory, hashable
|
||||
, libgraph, open-browser, primitive, process, QuickCheck
|
||||
, regex-tdfa, regex-tdfa-text, semigroups, strict, template-haskell
|
||||
, terminal-size, text, transformers, uniplate, unordered-containers
|
||||
, vector, vector-th-unbox
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "Hoed";
|
||||
version = "0.5.1";
|
||||
sha256 = "1rzlqd1sha6p1cw5w0gpf1w7qsmc6088sjnq1kq44mp12ybxrxm8";
|
||||
libraryHaskellDepends = [
|
||||
array base bytestring cereal cereal-text cereal-vector clock
|
||||
containers deepseq directory hashable libgraph open-browser
|
||||
primitive process QuickCheck regex-tdfa regex-tdfa-text semigroups
|
||||
strict template-haskell terminal-size text transformers uniplate
|
||||
unordered-containers vector vector-th-unbox
|
||||
];
|
||||
testHaskellDepends = [ base process QuickCheck ];
|
||||
homepage = "https://github.com/MaartenFaddegon/Hoed";
|
||||
description = "Lightweight algorithmic debugging";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"HoleyMonoid" = callPackage
|
||||
({ mkDerivation, base }:
|
||||
mkDerivation {
|
||||
@ -20545,8 +20571,8 @@ self: {
|
||||
pname = "accelerate-examples";
|
||||
version = "1.1.0.0";
|
||||
sha256 = "0zpjmk6v314jfda7fy22xghfqlqfh8vyf938qwyp6xjf1mpq1r1x";
|
||||
revision = "2";
|
||||
editedCabalFile = "1r53mc266gr6h2j0diyb82isaw72g6cdgvlqbhcnlidi3g7vqqcs";
|
||||
revision = "3";
|
||||
editedCabalFile = "1ir5i8skpyzpvwa17yw02j9rn9c5qjjincwrnjdwaixcdc7lsy4b";
|
||||
configureFlags = [ "-f-opencl" ];
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
@ -22644,24 +22670,23 @@ self: {
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"aeson-typescript_0_1_0_5" = callPackage
|
||||
"aeson-typescript_0_1_0_6" = callPackage
|
||||
({ mkDerivation, aeson, base, bytestring, containers, directory
|
||||
, filepath, hspec, interpolate, mtl, process, tasty, tasty-ant-xml
|
||||
, tasty-hspec, template-haskell, temporary, text, th-abstraction
|
||||
, unordered-containers
|
||||
, filepath, hspec, interpolate, mtl, process, template-haskell
|
||||
, temporary, text, th-abstraction, unordered-containers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "aeson-typescript";
|
||||
version = "0.1.0.5";
|
||||
sha256 = "08mq1cvhgmys2jnf7jjh450ql6x800fc1a1xkczqrzw0dkbaab20";
|
||||
version = "0.1.0.6";
|
||||
sha256 = "11q165g6yvd87ahbfvxdpr6w61l0y9znv1x5jmznmj1c9m9s36id";
|
||||
libraryHaskellDepends = [
|
||||
aeson base containers interpolate mtl template-haskell text
|
||||
th-abstraction unordered-containers
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson base bytestring containers directory filepath hspec
|
||||
interpolate mtl process tasty tasty-ant-xml tasty-hspec
|
||||
template-haskell temporary text th-abstraction unordered-containers
|
||||
interpolate mtl process template-haskell temporary text
|
||||
th-abstraction unordered-containers
|
||||
];
|
||||
homepage = "https://github.com/codedownio/aeson-typescript#readme";
|
||||
description = "Generate TypeScript definition files from your ADTs";
|
||||
@ -23220,8 +23245,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "aivika-gpss";
|
||||
version = "0.5";
|
||||
sha256 = "1szf6xaq7lk3l473rm8pls5s23nk08dwdzf875hx96i0m7kxmp6p";
|
||||
version = "0.6.1";
|
||||
sha256 = "06jx9340rr8a23gpzwwzqv0baqnv62w8cf8slcmcmlr0k84lg4ca";
|
||||
libraryHaskellDepends = [
|
||||
aivika aivika-transformers base containers hashable mtl
|
||||
unordered-containers
|
||||
@ -31343,6 +31368,26 @@ self: {
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"aws-easy" = callPackage
|
||||
({ mkDerivation, amazonka, amazonka-core, base, bytestring, lens
|
||||
, resourcet, template-haskell, text
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "aws-easy";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "0lchj79l606a2wxh72g837ys3nb1628ps03wxm61s5fl49229c0w";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
amazonka amazonka-core base bytestring lens resourcet
|
||||
template-haskell text
|
||||
];
|
||||
executableHaskellDepends = [ base ];
|
||||
homepage = "https://github.com/rcook/aws-easy#readme";
|
||||
description = "AWS Easy: Helper functions for working with amazonka";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"aws-ec2" = callPackage
|
||||
({ mkDerivation, aeson, aws, base, base16-bytestring
|
||||
, base64-bytestring, blaze-builder, blaze-markup, byteable
|
||||
@ -37229,6 +37274,8 @@ self: {
|
||||
pname = "blink1";
|
||||
version = "0.4";
|
||||
sha256 = "0547wg4qk2xv5gzj1alaxk06j65dhmzhn6y48rjllyr4lc5bm2qj";
|
||||
revision = "1";
|
||||
editedCabalFile = "107838wpl7dw7r73gf7fkkcprafih7l5wy31ic7yc8wyp9s9hkxi";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [ base bytestring text unix usb vector ];
|
||||
@ -38526,8 +38573,8 @@ self: {
|
||||
pname = "brick";
|
||||
version = "0.34.1";
|
||||
sha256 = "0y07xq5r5qbn5fqkp0cy1s9a50lnqmk35dvmil38xn2g23dgmfys";
|
||||
revision = "1";
|
||||
editedCabalFile = "0viqyb6qhvigpz1jf8693jw10n48r4wqnh97f5xqbjjjdjy0qr4r";
|
||||
revision = "2";
|
||||
editedCabalFile = "0yk4wxlv693gnax8b0gr6g2zqsm53izwar0aagqc4w3bq3llx63b";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
@ -38540,6 +38587,29 @@ self: {
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"brick_0_35" = callPackage
|
||||
({ mkDerivation, base, config-ini, containers, contravariant
|
||||
, data-clist, deepseq, dlist, microlens, microlens-mtl
|
||||
, microlens-th, stm, template-haskell, text, text-zipper
|
||||
, transformers, vector, vty, word-wrap
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "brick";
|
||||
version = "0.35";
|
||||
sha256 = "16vfm60nz2zx819nv4s83108w1bhiyqx99zmacrlc371nlpdiyby";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
base config-ini containers contravariant data-clist deepseq dlist
|
||||
microlens microlens-mtl microlens-th stm template-haskell text
|
||||
text-zipper transformers vector vty word-wrap
|
||||
];
|
||||
homepage = "https://github.com/jtdaugherty/brick/";
|
||||
description = "A declarative terminal user interface library";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"brick-skylighting" = callPackage
|
||||
({ mkDerivation, base, brick, containers, skylighting, text, vty }:
|
||||
mkDerivation {
|
||||
@ -39546,13 +39616,18 @@ self: {
|
||||
}) {};
|
||||
|
||||
"bv-sized" = callPackage
|
||||
({ mkDerivation, base, containers, lens, parameterized-utils }:
|
||||
({ mkDerivation, base, containers, lens, parameterized-utils
|
||||
, QuickCheck, random
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "bv-sized";
|
||||
version = "0.1.1.1";
|
||||
sha256 = "127vg7759gnwlg91dbhgqaxb62mffhvq40sjixylxyz1f3lzhqmn";
|
||||
version = "0.2.0";
|
||||
sha256 = "0v0wrr4pf8krya5az91yqvivjg72p08x2nmsp335c66rpmg6ph1i";
|
||||
libraryHaskellDepends = [
|
||||
base containers lens parameterized-utils
|
||||
base containers lens parameterized-utils QuickCheck random
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base lens parameterized-utils QuickCheck random
|
||||
];
|
||||
homepage = "https://github.com/benjaminselfridge/bv-sized";
|
||||
description = "a BitVector datatype that is parameterized by the vector width";
|
||||
@ -41274,13 +41349,12 @@ self: {
|
||||
, containers, deepseq, directory, distribution-nixpkgs, filepath
|
||||
, hackage-db, hopenssl, hpack, language-nix, lens, monad-par
|
||||
, monad-par-extras, mtl, optparse-applicative, pretty, process
|
||||
, split, tasty, tasty-golden, text, time, transformers, utf8-string
|
||||
, yaml
|
||||
, split, tasty, tasty-golden, text, time, transformers, yaml
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "cabal2nix";
|
||||
version = "2.9";
|
||||
sha256 = "1n6r27i4njiidij228r9fdb45pmsiidan6pxs2is2vsl8k9d65c7";
|
||||
version = "2.9.1";
|
||||
sha256 = "1qz5gjwzkfpmqiz5k62sxkv4prdmzwfa3hg9zma5dg1k4vs9dhkv";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
@ -41292,7 +41366,7 @@ self: {
|
||||
executableHaskellDepends = [
|
||||
aeson base bytestring Cabal containers directory
|
||||
distribution-nixpkgs filepath hopenssl language-nix lens monad-par
|
||||
monad-par-extras mtl optparse-applicative pretty utf8-string
|
||||
monad-par-extras mtl optparse-applicative pretty
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base Cabal filepath language-nix lens pretty tasty tasty-golden
|
||||
@ -50762,6 +50836,40 @@ self: {
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"configuration-tools_0_3_1" = callPackage
|
||||
({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
|
||||
, base-unicode-symbols, base64-bytestring, bytestring, Cabal
|
||||
, case-insensitive, connection, data-default, deepseq, directory
|
||||
, dlist, enclosed-exceptions, filepath, http-client
|
||||
, http-client-tls, http-types, monad-control, mtl, network-uri
|
||||
, optparse-applicative, process, profunctors, semigroups, text, tls
|
||||
, transformers, unordered-containers, wai, warp, warp-tls, x509
|
||||
, x509-system, x509-validation, yaml
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "configuration-tools";
|
||||
version = "0.3.1";
|
||||
sha256 = "0ivfz3vjf81dnxqlzp4ij8snw0bfy227b26r3j1vvhc4n1qpxpz0";
|
||||
libraryHaskellDepends = [
|
||||
aeson ansi-wl-pprint attoparsec base base-unicode-symbols
|
||||
base64-bytestring bytestring Cabal case-insensitive connection
|
||||
data-default deepseq directory dlist enclosed-exceptions filepath
|
||||
http-client http-client-tls http-types monad-control mtl
|
||||
network-uri optparse-applicative process profunctors semigroups
|
||||
text tls transformers unordered-containers x509 x509-system
|
||||
x509-validation yaml
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base base-unicode-symbols bytestring Cabal enclosed-exceptions
|
||||
http-types monad-control mtl text transformers unordered-containers
|
||||
wai warp warp-tls yaml
|
||||
];
|
||||
homepage = "https://github.com/alephcloud/hs-configuration-tools";
|
||||
description = "Tools for specifying and parsing configurations";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"configurator" = callPackage
|
||||
({ mkDerivation, attoparsec, base, bytestring, directory, filepath
|
||||
, hashable, HUnit, test-framework, test-framework-hunit, text
|
||||
@ -53935,6 +54043,22 @@ self: {
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"crypto-enigma_0_0_2_11" = callPackage
|
||||
({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
|
||||
, split
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "crypto-enigma";
|
||||
version = "0.0.2.11";
|
||||
sha256 = "0wm8jifcwfad2hmh15hm2n93f2vzaxkvm2ndf57l0j97acbvbmy1";
|
||||
libraryHaskellDepends = [ base containers MissingH mtl split ];
|
||||
testHaskellDepends = [ base HUnit QuickCheck ];
|
||||
homepage = "https://github.com/orome/crypto-enigma-hs";
|
||||
description = "An Enigma machine simulator with display";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"crypto-multihash" = callPackage
|
||||
({ mkDerivation, base, base58-bytestring, bytestring, containers
|
||||
, cryptonite, hspec, memory, QuickCheck, string-conversions
|
||||
@ -75165,6 +75289,8 @@ self: {
|
||||
pname = "fmt";
|
||||
version = "0.5.0.0";
|
||||
sha256 = "156iv5c5aqlc6mmc5qcnsa4plhp99n4mzmm8rspxrc84gkl1agnf";
|
||||
revision = "1";
|
||||
editedCabalFile = "1vdgh45qv5jk1ym4y54sjgk0cnqhrqqi6iirrw8drq20v1srbpl3";
|
||||
libraryHaskellDepends = [
|
||||
base base16-bytestring base64-bytestring bytestring containers
|
||||
microlens text text-format time time-locale-compat
|
||||
@ -77037,6 +77163,24 @@ self: {
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"friday-juicypixels_0_1_2_4" = callPackage
|
||||
({ mkDerivation, base, bytestring, file-embed, friday, hspec
|
||||
, JuicyPixels, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "friday-juicypixels";
|
||||
version = "0.1.2.4";
|
||||
sha256 = "0gxfj3x5w65dfnkf6ymjs27w2i14yv2m218qgmvx1p80wy7q4nbd";
|
||||
libraryHaskellDepends = [ base friday JuicyPixels vector ];
|
||||
testHaskellDepends = [
|
||||
base bytestring file-embed friday hspec JuicyPixels
|
||||
];
|
||||
homepage = "github.com/TomMD/friday-juicypixels";
|
||||
description = "Converts between the Friday and JuicyPixels image types";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"friday-scale-dct" = callPackage
|
||||
({ mkDerivation, base, base-compat, carray, fft, friday, vector }:
|
||||
mkDerivation {
|
||||
@ -78364,6 +78508,19 @@ self: {
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"garlic-bread" = callPackage
|
||||
({ mkDerivation, base, hspec, mtl, transformers }:
|
||||
mkDerivation {
|
||||
pname = "garlic-bread";
|
||||
version = "0.1.0.1";
|
||||
sha256 = "1mky2jm8qadlv4534xnzfn4r24dipw6ac8s3wpkf90mxw9s6m8xm";
|
||||
libraryHaskellDepends = [ base mtl transformers ];
|
||||
testHaskellDepends = [ base hspec mtl transformers ];
|
||||
homepage = "https://github.com/parsonsmatt/garlic-bread#readme";
|
||||
description = "A monad transformer for keeping track of where you've come from";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"garsia-wachs" = callPackage
|
||||
({ mkDerivation, base }:
|
||||
mkDerivation {
|
||||
@ -80962,6 +81119,20 @@ self: {
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"ghc-parser_0_2_0_2" = callPackage
|
||||
({ mkDerivation, base, cpphs, ghc, happy }:
|
||||
mkDerivation {
|
||||
pname = "ghc-parser";
|
||||
version = "0.2.0.2";
|
||||
sha256 = "1130fpddf3jx84k558gsc83j3166qy15jp878w2d3lwgzxjcqx5v";
|
||||
libraryHaskellDepends = [ base ghc ];
|
||||
libraryToolDepends = [ cpphs happy ];
|
||||
homepage = "https://github.com/gibiansky/IHaskell";
|
||||
description = "Haskell source parser from GHC";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"ghc-paths" = callPackage
|
||||
({ mkDerivation, base, Cabal, directory }:
|
||||
mkDerivation {
|
||||
@ -81938,8 +82109,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "gi-gio";
|
||||
version = "2.0.15";
|
||||
sha256 = "1mxiwwm6dnbxxnqm05bh73qnb27dbfsyz3pr2bvgwvhp4f2m0nn3";
|
||||
version = "2.0.16";
|
||||
sha256 = "1xm13f4whvi08bwq2n6axkz1sirhqpsxpnfq9c8px0j9izy9qnpb";
|
||||
setupHaskellDepends = [ base Cabal haskell-gi ];
|
||||
libraryHaskellDepends = [
|
||||
base bytestring containers gi-glib gi-gobject haskell-gi
|
||||
@ -82184,6 +82355,8 @@ self: {
|
||||
pname = "gi-gtk-hs";
|
||||
version = "0.3.5.0";
|
||||
sha256 = "10vshqkc398lribxfz1lk2zbp2y1iqyb0gszzzkin07y3fzlfhiv";
|
||||
revision = "1";
|
||||
editedCabalFile = "01gcz19v90iw2iy8mmlavin68i5w1c1zzliyqnlss7sn5dqqx8bh";
|
||||
libraryHaskellDepends = [
|
||||
base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
|
||||
gi-gtk haskell-gi-base mtl text transformers
|
||||
@ -84311,6 +84484,23 @@ self: {
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"gloss_1_12_0_0" = callPackage
|
||||
({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
|
||||
, gloss-rendering, GLUT, OpenGL
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "gloss";
|
||||
version = "1.12.0.0";
|
||||
sha256 = "0jxcvvmxvmb7n0wp4lwhvl4axkbhwwv4i6pi4xng357hfanxh1k9";
|
||||
libraryHaskellDepends = [
|
||||
base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
|
||||
];
|
||||
homepage = "http://gloss.ouroborus.net";
|
||||
description = "Painless 2D vector graphics, animations and simulations";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"gloss-accelerate" = callPackage
|
||||
({ mkDerivation, accelerate, base, gloss, gloss-rendering }:
|
||||
mkDerivation {
|
||||
@ -84338,6 +84528,19 @@ self: {
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"gloss-algorithms_1_12_0_0" = callPackage
|
||||
({ mkDerivation, base, containers, ghc-prim, gloss }:
|
||||
mkDerivation {
|
||||
pname = "gloss-algorithms";
|
||||
version = "1.12.0.0";
|
||||
sha256 = "00vji2mlakawarqsywgvl10yk32jmlxcj2d058a6psjqb0pkq0wb";
|
||||
libraryHaskellDepends = [ base containers ghc-prim gloss ];
|
||||
homepage = "http://gloss.ouroborus.net";
|
||||
description = "Data structures and algorithms for working with 2D graphics";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"gloss-banana" = callPackage
|
||||
({ mkDerivation, base, gloss, reactive-banana }:
|
||||
mkDerivation {
|
||||
@ -84372,10 +84575,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "gloss-examples";
|
||||
version = "1.11.1.1";
|
||||
sha256 = "0m5xyr5q6kfb2h5pfd5nj4x39nhhsnr7h8vxghvhvw1khsbh5gj1";
|
||||
revision = "2";
|
||||
editedCabalFile = "0ldnhqmxs03040m5ym0qw1ig217j893rm1sq7rnjsmvh15ziw4yh";
|
||||
version = "1.12.0.0";
|
||||
sha256 = "1iimmphkq89h4k8iny52kgz1a0cq6lp8dzr0lkj4j5qnfaj65lhl";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
executableHaskellDepends = [
|
||||
@ -84437,6 +84638,23 @@ self: {
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"gloss-raster_1_12_0_0" = callPackage
|
||||
({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering
|
||||
, repa
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "gloss-raster";
|
||||
version = "1.12.0.0";
|
||||
sha256 = "14a1qcajm4fp4hr4y55mw1jl5id747d455yn1818y5kz75m4k7y8";
|
||||
libraryHaskellDepends = [
|
||||
base containers ghc-prim gloss gloss-rendering repa
|
||||
];
|
||||
homepage = "http://gloss.ouroborus.net";
|
||||
description = "Parallel rendering of raster images";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"gloss-raster-accelerate" = callPackage
|
||||
({ mkDerivation, accelerate, base, colour-accelerate, gloss
|
||||
, gloss-accelerate
|
||||
@ -84470,6 +84688,20 @@ self: {
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"gloss-rendering_1_12_0_0" = callPackage
|
||||
({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }:
|
||||
mkDerivation {
|
||||
pname = "gloss-rendering";
|
||||
version = "1.12.0.0";
|
||||
sha256 = "1g64wlyk13lssf8p71xhpjaqygzdkn5fq6k2bmqwixmq56bhpnb0";
|
||||
libraryHaskellDepends = [
|
||||
base bmp bytestring containers GLUT OpenGL
|
||||
];
|
||||
description = "Gloss picture data types and rendering functions";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"gloss-sodium" = callPackage
|
||||
({ mkDerivation, base, gloss, sodium }:
|
||||
mkDerivation {
|
||||
@ -99638,6 +99870,32 @@ self: {
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"hedis_0_10_1" = callPackage
|
||||
({ mkDerivation, async, base, bytestring, bytestring-lexing
|
||||
, deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
|
||||
, resource-pool, scanner, slave-thread, stm, test-framework
|
||||
, test-framework-hunit, text, time, unordered-containers, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hedis";
|
||||
version = "0.10.1";
|
||||
sha256 = "1xzma70f1p6zfihwpsnc23bdzw09yg50pig7knkj6bxkv19czbsn";
|
||||
libraryHaskellDepends = [
|
||||
async base bytestring bytestring-lexing deepseq errors HTTP mtl
|
||||
network network-uri resource-pool scanner stm text time
|
||||
unordered-containers vector
|
||||
];
|
||||
testHaskellDepends = [
|
||||
async base bytestring doctest HUnit mtl slave-thread stm
|
||||
test-framework test-framework-hunit text time
|
||||
];
|
||||
benchmarkHaskellDepends = [ base mtl time ];
|
||||
homepage = "https://github.com/informatikr/hedis";
|
||||
description = "Client library for the Redis datastore: supports full command set, pipelining";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"hedis-config" = callPackage
|
||||
({ mkDerivation, aeson, base, bytestring, hedis, scientific, text
|
||||
, time
|
||||
@ -111015,6 +111273,24 @@ self: {
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"hsyslog-udp_0_2_2" = callPackage
|
||||
({ mkDerivation, base, bytestring, hspec, hsyslog, network, text
|
||||
, time, unix
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hsyslog-udp";
|
||||
version = "0.2.2";
|
||||
sha256 = "1fr8cn3jwasnp9q23q5pmz3z6zh7z04jhcv77igacwpgw0729hd4";
|
||||
libraryHaskellDepends = [
|
||||
base bytestring hsyslog network text time unix
|
||||
];
|
||||
testHaskellDepends = [ base hspec time ];
|
||||
homepage = "https://github.com/ThoughtLeadr/hsyslog-udp";
|
||||
description = "Log to syslog over a network via UDP";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"hszephyr" = callPackage
|
||||
({ mkDerivation, base, bytestring, com_err, mtl, time, zephyr }:
|
||||
mkDerivation {
|
||||
@ -115942,6 +116218,43 @@ self: {
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"ihaskell_0_9_0_3" = callPackage
|
||||
({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
|
||||
, cmdargs, containers, directory, filepath, ghc, ghc-boot
|
||||
, ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
|
||||
, hspec, hspec-contrib, http-client, http-client-tls, HUnit
|
||||
, ipython-kernel, mtl, parsec, process, random, setenv, shelly
|
||||
, split, stm, strict, system-argv0, text, transformers, unix
|
||||
, unordered-containers, utf8-string, uuid, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "ihaskell";
|
||||
version = "0.9.0.3";
|
||||
sha256 = "13cblc7wy92gbsvvbmxmp1r9c3fkmzl61adan8v9zxqbgw1w284p";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
enableSeparateDataOutput = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson base base64-bytestring bytestring cereal cmdargs containers
|
||||
directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline
|
||||
haskell-src-exts hlint http-client http-client-tls ipython-kernel
|
||||
mtl parsec process random shelly split stm strict system-argv0 text
|
||||
transformers unix unordered-containers utf8-string uuid vector
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
aeson base bytestring containers directory ghc ipython-kernel
|
||||
process strict text transformers unix
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base directory ghc ghc-paths here hspec hspec-contrib HUnit setenv
|
||||
shelly text transformers
|
||||
];
|
||||
homepage = "http://github.com/gibiansky/IHaskell";
|
||||
description = "A Haskell backend kernel for the IPython project";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"ihaskell-aeson" = callPackage
|
||||
({ mkDerivation, aeson, aeson-pretty, base, bytestring, here
|
||||
, ihaskell, text
|
||||
@ -116007,8 +116320,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "ihaskell-diagrams";
|
||||
version = "0.3.1.1";
|
||||
sha256 = "1c6a469ymfcjmf4larh1sh6qzaxgq260r55vzx78irh036k5h0lc";
|
||||
version = "0.3.2.1";
|
||||
sha256 = "0ssczqr41nrbrdr95vz457mwxcpmcrwd1bihzccmici1fvjd13rx";
|
||||
libraryHaskellDepends = [
|
||||
active base bytestring diagrams diagrams-cairo diagrams-lib
|
||||
directory ihaskell text
|
||||
@ -118571,6 +118884,27 @@ self: {
|
||||
pname = "invertible";
|
||||
version = "0.2.0.3";
|
||||
sha256 = "0pckhl1nv6w66k3ll9q1bwbmzl2rpbwk6c3xkm7dscxzjzw43qwf";
|
||||
revision = "1";
|
||||
editedCabalFile = "0jkwx19gj653ribqmlpysyp2kf4rphwj837zzwwd7jf9cnmgyqlp";
|
||||
libraryHaskellDepends = [
|
||||
base haskell-src-meta invariant lens partial-isomorphisms
|
||||
semigroupoids template-haskell transformers TypeCompose
|
||||
];
|
||||
testHaskellDepends = [ base QuickCheck transformers ];
|
||||
description = "bidirectional arrows, bijective functions, and invariant functors";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"invertible_0_2_0_4" = callPackage
|
||||
({ mkDerivation, base, haskell-src-meta, invariant, lens
|
||||
, partial-isomorphisms, QuickCheck, semigroupoids, template-haskell
|
||||
, transformers, TypeCompose
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "invertible";
|
||||
version = "0.2.0.4";
|
||||
sha256 = "0hrg58p5yz97n2xi9mbad69skldr163mr1wdvykdsvwyyxhfl4q4";
|
||||
libraryHaskellDepends = [
|
||||
base haskell-src-meta invariant lens partial-isomorphisms
|
||||
semigroupoids template-haskell transformers TypeCompose
|
||||
@ -119172,6 +119506,29 @@ self: {
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"ipython-kernel_0_9_0_2" = callPackage
|
||||
({ mkDerivation, aeson, base, bytestring, cereal, containers
|
||||
, directory, filepath, mtl, process, SHA, temporary, text
|
||||
, transformers, unordered-containers, uuid, zeromq4-haskell
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "ipython-kernel";
|
||||
version = "0.9.0.2";
|
||||
sha256 = "01l22myk73igczzjj4b239brp80b3pfamw9w67lw4l4w6n7lc8sr";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
enableSeparateDataOutput = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson base bytestring cereal containers directory filepath mtl
|
||||
process SHA temporary text transformers unordered-containers uuid
|
||||
zeromq4-haskell
|
||||
];
|
||||
homepage = "http://github.com/gibiansky/IHaskell";
|
||||
description = "A library for creating kernels for IPython frontends";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"irc" = callPackage
|
||||
({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck
|
||||
, test-framework, test-framework-hunit, test-framework-quickcheck2
|
||||
@ -127878,8 +128235,8 @@ self: {
|
||||
pname = "lens-accelerate";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "0j4mbkpdwycpc4m9vh43ylxw1k7ayhbjm8r50jb1dha24fb3d9z4";
|
||||
revision = "1";
|
||||
editedCabalFile = "0mgh4px2gpbny3fnbxv91ml5anvq3gmxs3w3q0zgsbnhaw73w4cf";
|
||||
revision = "2";
|
||||
editedCabalFile = "1yk1zjwp7sabh90rgz4sa15vqj1wq837nypqjb0qhymslmrnvvnl";
|
||||
libraryHaskellDepends = [ accelerate base lens ];
|
||||
homepage = "https://github.com/tmcdonell/lens-accelerate";
|
||||
description = "Instances to mix lens with accelerate";
|
||||
@ -139413,8 +139770,8 @@ self: {
|
||||
pname = "modern-uri";
|
||||
version = "0.2.1.0";
|
||||
sha256 = "06lqkx91s0lvkamxxf070l990kh8g0c5f5yshh2lffjbk5zclnp6";
|
||||
revision = "2";
|
||||
editedCabalFile = "1xhm5vi9y9y0mzmyqac29d13pvm3d28glmqcd7ps9lf9fjrrpp6k";
|
||||
revision = "3";
|
||||
editedCabalFile = "05kk7q1bwrnffi2ya4mmmsgy8qr2s5d2lrxa2h0acygvdwg3gx7s";
|
||||
libraryHaskellDepends = [
|
||||
base bytestring containers contravariant deepseq exceptions
|
||||
megaparsec mtl profunctors QuickCheck reflection tagged
|
||||
@ -145388,30 +145745,27 @@ self: {
|
||||
}) {};
|
||||
|
||||
"nested-routes" = callPackage
|
||||
({ mkDerivation, attoparsec, base, bifunctors, bytestring, errors
|
||||
, exceptions, extractable-singleton, hashable, hashtables, hspec
|
||||
, hspec-wai, http-types, monad-control-aligned, mtl, poly-arity
|
||||
, pred-set, pred-trie, regex-compat, semigroups, tasty, tasty-hspec
|
||||
, text, transformers, tries, unordered-containers
|
||||
({ mkDerivation, attoparsec, base, errors, exceptions
|
||||
, extractable-singleton, hashable, hspec, hspec-wai, http-types
|
||||
, monad-control-aligned, mtl, poly-arity, pred-trie, regex-compat
|
||||
, tasty, tasty-hspec, text, tries, unordered-containers
|
||||
, wai-middleware-content-type, wai-middleware-verbs
|
||||
, wai-transformers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "nested-routes";
|
||||
version = "8.2.0";
|
||||
sha256 = "1fg901fa9an4589my637lld8y4nyq3pd0gqy008p10w3c0mznhw6";
|
||||
version = "9.0.0";
|
||||
sha256 = "1vdmwkr69n7ybwamfazy2p65r9s2fqbgvfy31wxiqyn6phg6r57v";
|
||||
libraryHaskellDepends = [
|
||||
attoparsec base bifunctors bytestring errors exceptions
|
||||
extractable-singleton hashable hashtables monad-control-aligned mtl
|
||||
poly-arity pred-set pred-trie regex-compat semigroups text
|
||||
transformers tries unordered-containers wai-middleware-content-type
|
||||
attoparsec base errors exceptions extractable-singleton hashable
|
||||
monad-control-aligned mtl poly-arity pred-trie regex-compat text
|
||||
tries unordered-containers wai-middleware-content-type
|
||||
wai-middleware-verbs wai-transformers
|
||||
];
|
||||
testHaskellDepends = [
|
||||
attoparsec base bifunctors bytestring errors exceptions
|
||||
extractable-singleton hashable hashtables hspec hspec-wai
|
||||
http-types monad-control-aligned mtl poly-arity pred-set pred-trie
|
||||
regex-compat semigroups tasty tasty-hspec text transformers tries
|
||||
attoparsec base errors exceptions extractable-singleton hashable
|
||||
hspec hspec-wai http-types monad-control-aligned mtl poly-arity
|
||||
pred-trie regex-compat tasty tasty-hspec text tries
|
||||
unordered-containers wai-middleware-content-type
|
||||
wai-middleware-verbs wai-transformers
|
||||
];
|
||||
@ -152944,7 +153298,7 @@ self: {
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"pandoc-types_1_17_4_1" = callPackage
|
||||
"pandoc-types_1_17_4_2" = callPackage
|
||||
({ mkDerivation, aeson, base, bytestring, containers, criterion
|
||||
, deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb
|
||||
, test-framework, test-framework-hunit, test-framework-quickcheck2
|
||||
@ -152952,8 +153306,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "pandoc-types";
|
||||
version = "1.17.4.1";
|
||||
sha256 = "1v2xy6vmg9kcvax9mwqwrjdkf860jwyxkbd45snvh82p368yfxq2";
|
||||
version = "1.17.4.2";
|
||||
sha256 = "1jiy4siyfcf4z0m0kn0z58cbrsvggavlxljrcb4srwblih55xqap";
|
||||
libraryHaskellDepends = [
|
||||
aeson base bytestring containers deepseq ghc-prim QuickCheck syb
|
||||
transformers
|
||||
@ -156064,6 +156418,26 @@ self: {
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"persistable-record_0_6_0_2" = callPackage
|
||||
({ mkDerivation, array, base, containers, dlist, names-th
|
||||
, product-isomorphic, quickcheck-simple, template-haskell
|
||||
, th-data-compat, transformers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "persistable-record";
|
||||
version = "0.6.0.2";
|
||||
sha256 = "1sj2izz8ppam28qcja02jj6fx7khdjmnr4xn2yglbxyzs91fjg44";
|
||||
libraryHaskellDepends = [
|
||||
array base containers dlist names-th product-isomorphic
|
||||
template-haskell th-data-compat transformers
|
||||
];
|
||||
testHaskellDepends = [ base quickcheck-simple ];
|
||||
homepage = "http://khibino.github.io/haskell-relational-record/";
|
||||
description = "Binding between SQL database values and haskell records";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"persistable-types-HDBC-pg" = callPackage
|
||||
({ mkDerivation, base, bytestring, convertible, HDBC
|
||||
, persistable-record, relational-query-HDBC, text-postgresql
|
||||
@ -159398,6 +159772,45 @@ self: {
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"plot-light_0_3_1" = callPackage
|
||||
({ mkDerivation, base, blaze-svg, colour, containers, data-default
|
||||
, hspec, mtl, QuickCheck, scientific, text, time
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "plot-light";
|
||||
version = "0.3.1";
|
||||
sha256 = "02bivm4gi0sv13yx2alxkcm0ssxbgiwyn93m54x8xwnvczfavsmw";
|
||||
libraryHaskellDepends = [
|
||||
base blaze-svg colour containers data-default mtl scientific text
|
||||
time
|
||||
];
|
||||
testHaskellDepends = [ base hspec QuickCheck ];
|
||||
homepage = "https://github.com/ocramz/plot-light";
|
||||
description = "A lightweight plotting library, exporting to SVG";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"plot-light-examples" = callPackage
|
||||
({ mkDerivation, attoparsec, attoparsec-time, base, blaze-svg
|
||||
, colour, plot-light, scientific, text, time
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "plot-light-examples";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "19r07cdv34ks0810gq1x6cmdk7jf8f1s983rf2jn4vga4w5akf0p";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
enableSeparateDataOutput = true;
|
||||
executableHaskellDepends = [
|
||||
attoparsec attoparsec-time base blaze-svg colour plot-light
|
||||
scientific text time
|
||||
];
|
||||
homepage = "https://github.com/ocramz/plot-light-examples";
|
||||
description = "Example binaries for plot-light";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"plotfont" = callPackage
|
||||
({ mkDerivation, base, containers, tasty, tasty-hunit }:
|
||||
mkDerivation {
|
||||
@ -161794,6 +162207,28 @@ self: {
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"pptable_0_3_0_0" = callPackage
|
||||
({ mkDerivation, base, boxes, containers, generic-deriving, HUnit
|
||||
, markdown-unlit, pretty, QuickCheck, syb, tasty, tasty-hunit
|
||||
, tasty-quickcheck, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "pptable";
|
||||
version = "0.3.0.0";
|
||||
sha256 = "05wkvnk2h3xvjivk8cd6z8xlscipvd2az1v1n4sdianf9r0gzdwq";
|
||||
libraryHaskellDepends = [
|
||||
base boxes containers generic-deriving pretty syb vector
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base boxes containers HUnit markdown-unlit QuickCheck tasty
|
||||
tasty-hunit tasty-quickcheck vector
|
||||
];
|
||||
homepage = "https://github.com/gdevanla/pptable#readme";
|
||||
description = "Pretty Print containers in a tabular format";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"pqc" = callPackage
|
||||
({ mkDerivation, base, QuickCheck, random, stm }:
|
||||
mkDerivation {
|
||||
@ -161998,6 +162433,36 @@ self: {
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"pred-trie_0_6_0_1" = callPackage
|
||||
({ mkDerivation, attoparsec, base, containers, criterion, deepseq
|
||||
, errors, hashable, hashtables, mtl, poly-arity, pred-set
|
||||
, QuickCheck, semigroups, sets, strict, tasty, tasty-hunit
|
||||
, tasty-quickcheck, text, tries, unordered-containers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "pred-trie";
|
||||
version = "0.6.0.1";
|
||||
sha256 = "0hymhjh7idpibzdx0214laf0zjf3a4anhsmxn0p5g9xkgh7l7m72";
|
||||
libraryHaskellDepends = [
|
||||
base containers deepseq hashable hashtables mtl poly-arity pred-set
|
||||
QuickCheck semigroups strict tries unordered-containers
|
||||
];
|
||||
testHaskellDepends = [
|
||||
attoparsec base containers deepseq errors hashable hashtables mtl
|
||||
poly-arity pred-set QuickCheck semigroups strict tasty tasty-hunit
|
||||
tasty-quickcheck text tries unordered-containers
|
||||
];
|
||||
benchmarkHaskellDepends = [
|
||||
attoparsec base containers criterion deepseq hashable hashtables
|
||||
mtl poly-arity pred-set QuickCheck semigroups sets strict text
|
||||
tries unordered-containers
|
||||
];
|
||||
homepage = "https://github.com/athanclark/pred-trie#readme";
|
||||
description = "Predicative tries";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"predicates" = callPackage
|
||||
({ mkDerivation, base }:
|
||||
mkDerivation {
|
||||
@ -165566,6 +166031,23 @@ self: {
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"pushbullet-types_0_4_1_0" = callPackage
|
||||
({ mkDerivation, aeson, base, http-api-data, microlens
|
||||
, microlens-th, scientific, text, time, unordered-containers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "pushbullet-types";
|
||||
version = "0.4.1.0";
|
||||
sha256 = "0ny8nlk50cn6zgikg7xwylkrablj05vcm5gjm9y4zdzhbz7s4qb4";
|
||||
libraryHaskellDepends = [
|
||||
aeson base http-api-data microlens microlens-th scientific text
|
||||
time unordered-containers
|
||||
];
|
||||
description = "Datatypes used by the Pushbullet APIs";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"pusher-haskell" = callPackage
|
||||
({ mkDerivation, aeson, base, bytestring, hspec, HTTP, MissingH
|
||||
, mtl, SHA, time
|
||||
@ -167970,8 +168452,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "random-bytestring";
|
||||
version = "0.1.2";
|
||||
sha256 = "132xlls7qw94y2ljc74m0qhlzb19yv3yfxmwhi25cnghggsb22qz";
|
||||
version = "0.1.3";
|
||||
sha256 = "0npm55xzb6rv4spqn5mhkq8r43nwm818v6f2c20yv2bzhk11a0qm";
|
||||
libraryHaskellDepends = [ base bytestring mwc-random pcg-random ];
|
||||
benchmarkHaskellDepends = [
|
||||
async base bytestring criterion cryptonite entropy ghc-prim
|
||||
@ -168391,6 +168873,20 @@ self: {
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"rank2classes_1_0_2" = callPackage
|
||||
({ mkDerivation, base, doctest, template-haskell, transformers }:
|
||||
mkDerivation {
|
||||
pname = "rank2classes";
|
||||
version = "1.0.2";
|
||||
sha256 = "1qkknjas2w0zrv5kx47i1cxaiyv7814fqj8y69kywsl93q919p42";
|
||||
libraryHaskellDepends = [ base template-haskell transformers ];
|
||||
testHaskellDepends = [ base doctest ];
|
||||
homepage = "https://github.com/blamario/grampa/tree/master/rank2classes";
|
||||
description = "standard type constructor class hierarchy, only with methods of rank 2 types";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"rapid" = callPackage
|
||||
({ mkDerivation, async, base, containers, foreign-store, stm }:
|
||||
mkDerivation {
|
||||
@ -172303,8 +172799,8 @@ self: {
|
||||
pname = "repa";
|
||||
version = "3.4.1.3";
|
||||
sha256 = "0w3swrv5rdzkngcv1b6lndsg93y0y0wcxg7asgnxd529jsrdfciy";
|
||||
revision = "1";
|
||||
editedCabalFile = "08n1c94kds39p5gaz46cij4swycr49jz7jhpr669jf68limhrqk6";
|
||||
revision = "2";
|
||||
editedCabalFile = "0kmypfnpzjszdzhpd1lskp0plja8zyr8r2y9xyscx4g5md9hh0zp";
|
||||
libraryHaskellDepends = [
|
||||
base bytestring ghc-prim QuickCheck template-haskell vector
|
||||
];
|
||||
@ -172412,8 +172908,8 @@ self: {
|
||||
pname = "repa-examples";
|
||||
version = "3.4.1.1";
|
||||
sha256 = "16jg56021r7974z66rhfyp246cj0r7h6wabnpl590q3fljwh5039";
|
||||
revision = "2";
|
||||
editedCabalFile = "1ljqrqlk5h34q4mg6qipx5qsgz8fhp51p5mfkzv822d7v5qdsnv7";
|
||||
revision = "3";
|
||||
editedCabalFile = "0vdzcx1fixvgqzmjxra8gfwhzs56qdrzixscq074sddv7jh5iz2f";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
executableHaskellDepends = [
|
||||
@ -189935,26 +190431,27 @@ self: {
|
||||
}) {inherit (pkgs) openssl;};
|
||||
|
||||
"sqlcli" = callPackage
|
||||
({ mkDerivation, base, logging, text, transformers }:
|
||||
({ mkDerivation, base, logging, text, transformers, unixODBC }:
|
||||
mkDerivation {
|
||||
pname = "sqlcli";
|
||||
version = "0.2.0.0";
|
||||
sha256 = "164p1frqcazzhcwd1b5n1y890nigai79s1qg8vkailfvnzdxffvq";
|
||||
version = "0.2.0.1";
|
||||
sha256 = "09x9g3rjz1idyr0rh885y4pdddn08g7hwcspa47n6yf5wlx33gln";
|
||||
libraryHaskellDepends = [ base logging text transformers ];
|
||||
librarySystemDepends = [ unixODBC ];
|
||||
homepage = "http://hub.darcs.net/mihaigiurgeanu/sqlcli";
|
||||
description = "Sql Call-Level Interface bindings for Haskell";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
}) {inherit (pkgs) unixODBC;};
|
||||
|
||||
"sqlcli-odbc" = callPackage
|
||||
({ mkDerivation, base, logging, sqlcli }:
|
||||
mkDerivation {
|
||||
pname = "sqlcli-odbc";
|
||||
version = "0.2.0.0";
|
||||
sha256 = "1zq1rgj32w72arhplqfiygflg8gablpm1alppd3y03wki1gnrd95";
|
||||
version = "0.2.0.1";
|
||||
sha256 = "1rfhdaa0wmvc78nbjhi93p9sv66xa6rjr79yyhlkqi1d335b8vb5";
|
||||
libraryHaskellDepends = [ base logging sqlcli ];
|
||||
homepage = "https://hub.darcs.com/mihaigiurgeanu/sqlcli-odbc";
|
||||
description = "Specific ODBC definitions to be used by SQL CLI clients";
|
||||
homepage = "https://hub.darcs.net/mihaigiurgeanu/sqlcli-odbc";
|
||||
description = "ODBC specific definitions to be used by SQL CLI clients";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
@ -207736,8 +208233,8 @@ self: {
|
||||
({ mkDerivation, base, containers, mtl, template-haskell }:
|
||||
mkDerivation {
|
||||
pname = "type-interpreter";
|
||||
version = "0.1.1";
|
||||
sha256 = "02v4y8limn1kdh27w8bq3d0q1ffnalpj9bqp7km1amfqwp2ljsij";
|
||||
version = "0.1.2";
|
||||
sha256 = "1phi14lmwyz6qi55vnnjhibglm74xkic2xiwmd1qxkj0dnb423wj";
|
||||
libraryHaskellDepends = [ base containers mtl template-haskell ];
|
||||
testHaskellDepends = [ base template-haskell ];
|
||||
description = "Interpreter for Template Haskell types";
|
||||
@ -209536,8 +210033,8 @@ self: {
|
||||
pname = "union";
|
||||
version = "0.1.1.2";
|
||||
sha256 = "10nkcmql6ryh3vp02yxk3i1f6fbxdcsjk6s5ani89qa05448xqkw";
|
||||
revision = "2";
|
||||
editedCabalFile = "088dcgyg9bzm5qczcddssjfwywk9lsj10lq7byh4f9rnsf0jppna";
|
||||
revision = "3";
|
||||
editedCabalFile = "1llczfg153qqrkp2biqaa9qqyzy6li5cnxbyp5p24d7f2dr0d5fc";
|
||||
libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ];
|
||||
benchmarkHaskellDepends = [ base criterion deepseq lens ];
|
||||
description = "Extensible type-safe unions";
|
||||
@ -225956,8 +226453,8 @@ self: {
|
||||
pname = "zip";
|
||||
version = "1.0.0";
|
||||
sha256 = "166iqyrmghlwwnka1gyxqjh875x7d3h0jnljlaslfvkfjhvb9ym9";
|
||||
revision = "1";
|
||||
editedCabalFile = "0yplpja4gbfr8lkwvv5q8lx9bia2dzm178hyhlmw1s2hniqjxzkn";
|
||||
revision = "2";
|
||||
editedCabalFile = "14dcabh3h6b1c8yzjq848i7arprgx7imx2rb9s0y2v0ax6b4dm48";
|
||||
libraryHaskellDepends = [
|
||||
base bytestring bzlib-conduit case-insensitive cereal conduit
|
||||
conduit-extra containers digest directory dlist exceptions filepath
|
||||
@ -226039,6 +226536,8 @@ self: {
|
||||
pname = "zip-stream";
|
||||
version = "0.1.0.1";
|
||||
sha256 = "17ndw8a6br9bgkr5s2jn54kq69bg4hwi55dfh899dbyzyl0yzxaq";
|
||||
revision = "1";
|
||||
editedCabalFile = "1g3yr6ggcxgzzdpaj7zn48k7mqfdnnz697f3midw2br1dnhv7zdf";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
|
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "allegro-${version}";
|
||||
version = "5.2.3.0";
|
||||
version = "5.2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liballeg";
|
||||
repo = "allegro5";
|
||||
rev = version;
|
||||
sha256 = "0bx240x0filalfarylqjgqf3g80c7dhzhy4m162swjlg0vjpgblr";
|
||||
sha256 = "01y3hirn5b08f188nnhb2cbqj4vzysr7l2qpz2208srv8arzmj2d";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -6,11 +6,11 @@
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "eccodes-${version}";
|
||||
version = "2.6.0";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
|
||||
sha256 = "0pzibd3vdqmqsqsnfir6q66p6f3cmr9hrrixzpfhf7k62vv9y1ha";
|
||||
sha256 = "0slfim64wdyd97nwv7ry0xwhiarphl93ij2v19c8a1c0dz7ld3qi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -1,16 +1,34 @@
|
||||
{stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx}:
|
||||
{ stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx
|
||||
, optimize ? false # impure
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "givaro";
|
||||
version = "4.0.2";
|
||||
version = "4.0.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "linbox-team";
|
||||
repo = "${pname}";
|
||||
rev = "v${version}";
|
||||
sha256 = "04n1lyc823z3l1d7mnmqpc9z1pkn646szjchasbfkn74m7cb0qz7";
|
||||
sha256 = "199p8wyj5i63jbnk7j8qbdbfp5rm2lpmcxyk3mdjy9bz7ygx3hhy";
|
||||
};
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [autoconf automake libtool gmpxx];
|
||||
configureFlags = [
|
||||
"--disable-optimization"
|
||||
] ++ stdenv.lib.optionals (!optimize) [
|
||||
# disable SIMD instructions (which are enabled *when available* by default)
|
||||
"--disable-sse"
|
||||
"--disable-sse2"
|
||||
"--disable-sse3"
|
||||
"--disable-ssse3"
|
||||
"--disable-sse41"
|
||||
"--disable-sse42"
|
||||
"--disable-avx"
|
||||
"--disable-avx2"
|
||||
"--disable-fma"
|
||||
"--disable-fma4"
|
||||
];
|
||||
doCheck = true;
|
||||
meta = {
|
||||
inherit version;
|
||||
description = ''A C++ library for arithmetic and algebraic computations'';
|
||||
|
@ -1,20 +1,13 @@
|
||||
{ stdenv, fetchurl, fetchpatch, cmake, libX11, libuuid, xz, vtk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "itk-4.11.0";
|
||||
name = "itk-4.12.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/itk/InsightToolkit-4.11.0.tar.xz;
|
||||
sha256 = "0axvyds0gads5914g0m70z5q16gzghr0rk0hy3qjpf1k9bkxvcq6";
|
||||
url = mirror://sourceforge/itk/InsightToolkit-4.12.2.tar.xz;
|
||||
sha256 = "1qw9mxbh083siljygahl4gdfv91xvfd8hfl7ghwii19f60xrvn2w";
|
||||
};
|
||||
|
||||
# Clang 4 dislikes signed comparisons of pointers against integers. Should no longer be
|
||||
# necessary once we get past ITK 4.11.
|
||||
patches = [ (fetchpatch {
|
||||
url = "https://github.com/InsightSoftwareConsortium/ITK/commit/d1407a55910ad9c232f3d241833cfd2e59024946.patch";
|
||||
sha256 = "0h851afkv23fwgkibjss30fkbz4nkfg6rmmm4pfvkwpml23gzz7s";
|
||||
}) ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_TESTING=OFF"
|
||||
"-DBUILD_EXAMPLES=OFF"
|
||||
|
@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
# On darwin the tests depend on the installed libraries because of install_name.
|
||||
doInstallCheck = true;
|
||||
installCheckTarget = "check";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit (src.meta) homepage;
|
||||
|
@ -3,7 +3,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "liblouis-${version}";
|
||||
|
||||
@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
|
||||
owner = "liblouis";
|
||||
repo = "liblouis";
|
||||
rev = "v${version}";
|
||||
sha256 = "1b3vf6sq2iffdvj0r2q5g5k198camy3sq2nwfz391brpwivsnayh";
|
||||
sha256 = "0klmyh6cg9khv59j4xdsrwwjzdgylw689gvrjiy5jsvqll58fcsd";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" "info" "doc" ];
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libraw-${version}";
|
||||
version = "0.18.7";
|
||||
version = "0.18.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
|
||||
sha256 = "0wap67mb03fl2himbs20yncnnrr71mszsfm2v4spks58c714gqw7";
|
||||
sha256 = "1qi0fkw2zmd0yplrf79z7lgpz0hxl45dj5rdgpaj7283jzys9b2n";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" "dev" "doc" ];
|
||||
|
@ -1,17 +1,20 @@
|
||||
{ stdenv, fetchFromGitHub, curl, libxml2 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libs3-2015-04-23";
|
||||
name = "libs3-2017-06-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bji";
|
||||
repo = "libs3";
|
||||
rev = "11a4e976c28ba525e7d61fbc3867c345a2af1519";
|
||||
sha256 = "0xjjwyw14sk9am6s2m25hxi55vmsrc2yiawd6ln2lvg59xjcr48i";
|
||||
rev = "fd8b149044e429ad30dc4c918f0713cdd40aadd2";
|
||||
sha256 = "0a4c9rsd3wildssvnvph6cd11adn0p3rd4l02z03lvxkjhm20gw3";
|
||||
};
|
||||
|
||||
buildInputs = [ curl libxml2 ];
|
||||
|
||||
# added to fix build with gcc7, review on update
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ];
|
||||
|
||||
DESTDIR = "\${out}";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
43
pkgs/development/libraries/libtins/default.nix
Normal file
43
pkgs/development/libraries/libtins/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libtins-${version}";
|
||||
version = "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfontanini";
|
||||
repo = "libtins";
|
||||
rev = "v${version}";
|
||||
sha256 = "00d1fxyg8q6djljm79ms69gcrsqxxksny3b16v99bzf3aivfss5x";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
rm -rf googletest
|
||||
cp -r ${gtest.src}/googletest googletest
|
||||
chmod -R a+w googletest
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake gtest ];
|
||||
buildInputs = [
|
||||
openssl
|
||||
libpcap
|
||||
boost
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
"--with-boost=${boost.dev}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
doCheck = true;
|
||||
checkPhase = "make tests && LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib make test";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "High-level, multiplatform C++ network packet sniffing and crafting library";
|
||||
homepage = https://libtins.github.io/;
|
||||
license = stdenv.lib.licenses.bsd2;
|
||||
maintainers = with maintainers; [ fdns ];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opendht-${version}";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savoirfairelinux";
|
||||
repo = "opendht";
|
||||
rev = "${version}";
|
||||
sha256 = "0zkxvs3vdlc4yzhfi2jh02bsnhh50fbfigqhnkmbx69lssnkyr05";
|
||||
sha256 = "0ybv41nbh86ricxfv478z4izbxvnvk86csr29c6qf4dinmrysf96";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -45,7 +45,7 @@
|
||||
|
||||
let
|
||||
inherit (stdenv.lib) optional optionalString;
|
||||
version = "3.10.2";
|
||||
version = "3.10.3";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -53,7 +53,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2";
|
||||
sha256 = "0bqh4bdnjdyww4mcpg6kn0x7338mfqbdgysn97dzrwwb26di7ars";
|
||||
sha256 = "1dyjlq3fiparvm8ypwk6rsmjzmnwk81l88gkishphpvc79ryp216";
|
||||
};
|
||||
|
||||
buildInputs = [ gfortran ];
|
||||
|
@ -1,23 +1,20 @@
|
||||
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
|
||||
, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman
|
||||
, xcbutilwm, libX11, libcap, xcbutilimage
|
||||
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors
|
||||
}:
|
||||
|
||||
let pname = "wlroots";
|
||||
version = "unstable-2017-12-22";
|
||||
version = "unstable-2018-03-16";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swaywm";
|
||||
repo = "wlroots";
|
||||
rev = "0a370c529806077a11638e7fa856d5fbb539496b";
|
||||
sha256 = "0h3i0psn5595dncv53l5m2mf13k9wcv3qi16vla5ckpskykc0xx6";
|
||||
rev = "9cc875429b40e2567b219f8e9ffd23316d136204";
|
||||
sha256 = "1prhic3pyf9n65qfg5akzkc9qv2z3ab60dpcacr7wgr9nxrvnsdq";
|
||||
};
|
||||
|
||||
# TODO: Temporary workaround for compilation errors
|
||||
patches = [ ./libdrm.patch ]; #./no-werror.patch
|
||||
|
||||
# $out for the library and $bin for rootston
|
||||
outputs = [ "out" "bin" ];
|
||||
|
||||
@ -25,7 +22,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
wayland libGL wayland-protocols libinput libxkbcommon pixman
|
||||
xcbutilwm libX11 libcap xcbutilimage
|
||||
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors
|
||||
];
|
||||
|
||||
# Install rootston (the reference compositor) to $bin
|
||||
@ -33,7 +30,7 @@ in stdenv.mkDerivation rec {
|
||||
mkdir -p $bin/bin
|
||||
cp rootston/rootston $bin/bin/
|
||||
mkdir $bin/lib
|
||||
cp libwlroots.so $bin/lib/
|
||||
cp libwlroots* $bin/lib/
|
||||
patchelf --set-rpath "$bin/lib:${stdenv.lib.makeLibraryPath buildInputs}" $bin/bin/rootston
|
||||
mkdir $bin/etc
|
||||
cp ../rootston/rootston.ini.example $bin/etc/rootston.ini
|
||||
|
@ -1,9 +0,0 @@
|
||||
--- a/backend/meson.build 2017-10-31 22:08:01.112927610 +0100
|
||||
+++ b/backend/meson.build 2017-10-31 22:09:28.155264343 +0100
|
||||
@@ -43,5 +43,5 @@
|
||||
'wlr_backend',
|
||||
backend_files,
|
||||
include_directories: wlr_inc,
|
||||
- dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos],
|
||||
+ dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos, drm],
|
||||
)
|
@ -1,10 +0,0 @@
|
||||
--- a/meson.build 2017-10-31 22:08:01.132927689 +0100
|
||||
+++ b/meson.build 2017-10-31 22:20:58.215784350 +0100
|
||||
@@ -5,7 +5,6 @@
|
||||
default_options: [
|
||||
'c_std=c11',
|
||||
'warning_level=2',
|
||||
- 'werror=true',
|
||||
],
|
||||
)
|
||||
|
22
pkgs/development/python-modules/py4j/default.nix
Normal file
22
pkgs/development/python-modules/py4j/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ buildPythonPackage, fetchPypi, stdenv }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "py4j";
|
||||
|
||||
version = "0.10.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension= "zip";
|
||||
sha256 = "10shayghsmcdr03w12a7sdm6vsxpjm8alw3ym3mr1hki45yarryk";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Py4J enables Python programs running in a Python interpreter to dynamically access Java objects in a Java Virtual Machine. Methods are called as if the Java objects resided in the Python interpreter and Java collections can be accessed through standard Python collection methods. Py4J also enables Java programs to call back Python objects.";
|
||||
homepage = https://www.py4j.org/;
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.shlevy ];
|
||||
};
|
||||
}
|
28
pkgs/development/python-modules/pyspark/default.nix
Normal file
28
pkgs/development/python-modules/pyspark/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ buildPythonPackage, fetchPypi, stdenv, py4j }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyspark";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0vlq07yqy6c7ayg401i0qynnliqz405bmw1r8alkck0m1s8kcd8b";
|
||||
};
|
||||
|
||||
# pypandoc is broken with pandoc2, so we just lose docs.
|
||||
postPatch = ''
|
||||
sed -i "s/'pypandoc'//" setup.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ py4j ];
|
||||
|
||||
# Tests assume running spark...
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Apache Spark";
|
||||
homepage = https://github.com/apache/spark/tree/master/python;
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.shlevy ];
|
||||
};
|
||||
}
|
29
pkgs/development/python-modules/tablib/default.nix
Normal file
29
pkgs/development/python-modules/tablib/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ buildPythonPackage, stdenv, fetchPypi, pytest, unicodecsv, pandas
|
||||
, xlwt, openpyxl, pyyaml, xlrd, odfpy, fetchpatch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tablib";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "11wxchj0qz77dn79yiq30k4b4gsm429f4bizk4lm4rb63nk51kxq";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest unicodecsv pandas ];
|
||||
propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/kennethreitz/tablib/commit/0e51a2d0944022af186d2dcd34c0ab3c47141ba5.patch";
|
||||
sha256 = "0lbbl871zdn5vpgqyjkil0c2ap3b5hz19rmihhyvrx7m4mlh1aij";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Tablib: format-agnostic tabular dataset library";
|
||||
homepage = http://python-tablib.org;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "antlr-${version}";
|
||||
version = "4.7";
|
||||
version = "4.7.1";
|
||||
src = fetchurl {
|
||||
url ="http://www.antlr.org/download/antlr-${version}-complete.jar";
|
||||
sha256 = "0r08ay63s5aajix5j8j7lf7j7l7wiwdkr112b66nyhkj5f6c72yd";
|
||||
sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl";
|
||||
};
|
||||
|
||||
unpackPhase = "true";
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sassc-${version}";
|
||||
version = "3.4.8";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sass/sassc/archive/${version}.tar.gz";
|
||||
sha256 = "02lnibrl6zgczkhvz01bdp0d2b0rbl69dfv5mdnbr4l8km7sa7b1";
|
||||
sha256 = "0hl0j4ky13fzcv2y7w352gaq8fjmypwgazf7ddqdv0sbj8qlxx96";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
@ -28,7 +28,7 @@ let
|
||||
qt4 = pyqt4.qt;
|
||||
|
||||
in buildPythonApplication rec {
|
||||
version = "2.0.47";
|
||||
version = "2.0.50";
|
||||
name = "anki-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
@ -37,7 +37,7 @@ in buildPythonApplication rec {
|
||||
# "http://ankisrs.net/download/mirror/${name}.tgz"
|
||||
# "http://ankisrs.net/download/mirror/archive/${name}.tgz"
|
||||
];
|
||||
sha256 = "067bsidqzy1zc301i2pk4biwp2kwvgk4kydp5z5s551acinkbdgv";
|
||||
sha256 = "05hq1f9m4vv3zpv7d05m4y6d82ibp1kk0gpwp73vza1ffq0wdcip";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ]
|
||||
|
@ -26,6 +26,147 @@ index 1f8829d..d8455eb 100644
|
||||
}
|
||||
|
||||
SEARCH_SOURCE =
|
||||
diff --git a/garglk/fontmac.m b/garglk/fontmac.m
|
||||
index d6e1426..72304a3 100644
|
||||
--- a/garglk/fontmac.m
|
||||
+++ b/garglk/fontmac.m
|
||||
@@ -167,7 +167,7 @@ static void propfont(char *file, int style)
|
||||
}
|
||||
}
|
||||
|
||||
-static NSMutableArray<NSURL *> * gli_registered_fonts = nil;
|
||||
+static NSMutableArray * gli_registered_fonts = nil;
|
||||
static NSDistributedLock * gli_font_lock = nil;
|
||||
|
||||
void fontreplace(char *font, int type)
|
||||
@@ -181,7 +181,7 @@ void fontreplace(char *font, int type)
|
||||
NSFontDescriptor * fontFamilyDescriptor =
|
||||
[[NSFontDescriptor fontDescriptorWithFontAttributes: nil] fontDescriptorWithFamily: fontFamily];
|
||||
|
||||
- NSArray<NSFontDescriptor *> * fontMatches =
|
||||
+ NSArray * fontMatches =
|
||||
[fontFamilyDescriptor matchingFontDescriptorsWithMandatoryKeys: nil];
|
||||
|
||||
for (NSFontDescriptor * sysfont in fontMatches)
|
||||
@@ -197,7 +197,7 @@ void fontreplace(char *font, int type)
|
||||
|
||||
else if ([sysfont symbolicTraits] & NSFontItalicTrait)
|
||||
style = FONTI;
|
||||
-
|
||||
+
|
||||
/* find path for font */
|
||||
CFURLRef urlRef = CTFontDescriptorCopyAttribute((CTFontDescriptorRef)sysfont, kCTFontURLAttribute);
|
||||
if (!urlRef)
|
||||
@@ -259,7 +259,7 @@ void fontload(void)
|
||||
|
||||
// obtain a list of all files in the Fonts directory
|
||||
NSString * fontFolder = [[NSString stringWithUTF8String: env] stringByAppendingPathComponent: @"Fonts"];
|
||||
- NSArray<NSString *> * fontFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: fontFolder error: nil];
|
||||
+ NSArray * fontFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: fontFolder error: nil];
|
||||
|
||||
// create a collection to hold the registered font URLs
|
||||
gli_registered_fonts = [NSMutableArray new];
|
||||
diff --git a/garglk/launchmac.m b/garglk/launchmac.m
|
||||
index 68deca5..9f752ac 100644
|
||||
--- a/garglk/launchmac.m
|
||||
+++ b/garglk/launchmac.m
|
||||
@@ -72,14 +72,14 @@ char *winfilters[] =
|
||||
height: (unsigned int) height
|
||||
{
|
||||
[[self openGLContext] makeCurrentContext];
|
||||
-
|
||||
+
|
||||
/* allocate new texture */
|
||||
glDeleteTextures(1, &output);
|
||||
glGenTextures(1, &output);
|
||||
|
||||
/* bind target to texture */
|
||||
- glEnable(GL_TEXTURE_RECTANGLE_ARB);
|
||||
- glBindTexture(GL_TEXTURE_RECTANGLE_ARB, output);
|
||||
+ glEnable(GL_TEXTURE_RECTANGLE_ARB);
|
||||
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, output);
|
||||
|
||||
/* set target parameters */
|
||||
glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_STORAGE_HINT_APPLE, GL_STORAGE_CACHED_APPLE);
|
||||
@@ -460,7 +460,7 @@ static BOOL isTextbufferEvent(NSEvent * evt)
|
||||
if (filter != FILTER_ALL)
|
||||
{
|
||||
NSArray * filterTypes = [NSArray arrayWithObject: [NSString stringWithCString: winfilters[filter]
|
||||
- encoding: NSUTF8StringEncoding]];
|
||||
+ encoding: NSUTF8StringEncoding]];
|
||||
[openDlg setAllowedFileTypes: filterTypes];
|
||||
[openDlg setAllowsOtherFileTypes: NO];
|
||||
}
|
||||
@@ -485,7 +485,7 @@ static BOOL isTextbufferEvent(NSEvent * evt)
|
||||
if (filter != FILTER_ALL)
|
||||
{
|
||||
NSArray * filterTypes = [NSArray arrayWithObject: [NSString stringWithCString: winfilters[filter]
|
||||
- encoding: NSUTF8StringEncoding]];
|
||||
+ encoding: NSUTF8StringEncoding]];
|
||||
[saveDlg setAllowedFileTypes: filterTypes];
|
||||
[saveDlg setAllowsOtherFileTypes: NO];
|
||||
}
|
||||
@@ -518,7 +518,7 @@ static BOOL isTextbufferEvent(NSEvent * evt)
|
||||
<GargoyleApp, NSApplicationDelegate, NSWindowDelegate>
|
||||
{
|
||||
BOOL openedFirstGame;
|
||||
- NSMutableDictionary<NSNumber *, GargoyleWindow *> * windows;
|
||||
+ NSMutableDictionary * windows;
|
||||
NSConnection * link;
|
||||
}
|
||||
- (BOOL) launchFile: (NSString *) file;
|
||||
@@ -760,20 +760,20 @@ static BOOL isTextbufferEvent(NSEvent * evt)
|
||||
- (BOOL) launchFileDialog
|
||||
{
|
||||
int result;
|
||||
-
|
||||
+
|
||||
NSOpenPanel * openDlg = [NSOpenPanel openPanel];
|
||||
|
||||
[openDlg setCanChooseFiles: YES];
|
||||
[openDlg setCanChooseDirectories: NO];
|
||||
[openDlg setAllowsMultipleSelection: NO];
|
||||
[openDlg setTitle: [NSString stringWithCString: AppName encoding: NSUTF8StringEncoding]];
|
||||
-
|
||||
+
|
||||
NSMutableArray *filterTypes = [NSMutableArray arrayWithCapacity:100];
|
||||
-
|
||||
- NSEnumerator *docTypeEnum = [[[[NSBundle mainBundle] infoDictionary]
|
||||
+
|
||||
+ NSEnumerator *docTypeEnum = [[[[NSBundle mainBundle] infoDictionary]
|
||||
objectForKey:@"CFBundleDocumentTypes"] objectEnumerator];
|
||||
NSDictionary *docType;
|
||||
-
|
||||
+
|
||||
while (docType = [docTypeEnum nextObject])
|
||||
{
|
||||
[filterTypes addObjectsFromArray:[docType objectForKey: @"CFBundleTypeExtensions"]];
|
||||
diff --git a/garglk/ttsmac.m b/garglk/ttsmac.m
|
||||
index 9f6ab0e..de3d6fe 100644
|
||||
--- a/garglk/ttsmac.m
|
||||
+++ b/garglk/ttsmac.m
|
||||
@@ -30,7 +30,7 @@
|
||||
#import "sysmac.h"
|
||||
|
||||
// a queue of phrases to feed to the speech synthesizer
|
||||
-static NSMutableArray<NSString *> * phraseQueue = nil;
|
||||
+static NSMutableArray * phraseQueue = nil;
|
||||
static NSRange purgeRange;
|
||||
|
||||
@interface SpeechDelegate : NSObject <NSSpeechSynthesizerDelegate>
|
||||
@@ -96,10 +96,10 @@ void gli_initialize_tts(void)
|
||||
NSString * lang = [NSString stringWithCString: gli_conf_speak_language
|
||||
encoding: NSUTF8StringEncoding];
|
||||
|
||||
- NSArray<NSString *> * voices = [NSSpeechSynthesizer availableVoices];
|
||||
+ NSArray * voices = [NSSpeechSynthesizer availableVoices];
|
||||
for (NSString * voice in voices)
|
||||
{
|
||||
- NSDictionary<NSString *, id> * attr = [NSSpeechSynthesizer attributesForVoice: voice];
|
||||
+ NSDictionary * attr = [NSSpeechSynthesizer attributesForVoice: voice];
|
||||
if ([lang isEqualToString: [attr objectForKey: NSVoiceLocaleIdentifier]])
|
||||
{
|
||||
[synth setVoice: voice];
|
||||
diff --git a/tads/tads3/vmtz.cpp b/tads/tads3/vmtz.cpp
|
||||
index 5e193a1..dce46f7 100644
|
||||
--- a/tads/tads3/vmtz.cpp
|
||||
|
@ -36,6 +36,11 @@ stdenv.mkDerivation {
|
||||
|
||||
patches = [ ./darwin.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Jamrules \
|
||||
--replace -mmacosx-version-min=10.7 -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET
|
||||
'';
|
||||
|
||||
buildPhase = jamenv + "jam -j$NIX_BUILD_CORES";
|
||||
|
||||
installPhase = if stdenv.isDarwin then (builtins.readFile ./darwin.sh) else jamenv + ''
|
||||
|
@ -9,11 +9,11 @@ assert enableMysql -> mysql != null;
|
||||
assert enableLdap -> openldap != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lighttpd-1.4.48";
|
||||
name = "lighttpd-1.4.49";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
|
||||
sha256 = "0djgsx06x3p22rjvzml5klq7gqd9nk88qzlxifa7p7ajqymdb2hg";
|
||||
sha256 = "02ff77cpvy1006cwfym38vf78xm18plyj636ll74r7kx2bblkpxf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pshs-${version}";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mgorny";
|
||||
repo = "pshs";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ffdyv5qiqdg3jq8y91fsml046g88d7fyy2k81yii11jw3yx2js0";
|
||||
sha256 = "04l03myh99npl78y8nss053gnc7k8q60vdbdpml19sshmwaw3fgi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
@ -3,10 +3,10 @@ let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="apache-jena-fuseki";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
name="${baseName}-${version}";
|
||||
url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
|
||||
sha256 = "0pdq103vqpkbwi84yyigw4dy60ch7xzazaj3gfcbipg73v81wpvp";
|
||||
sha256 = "0wmhfr1jlk34cimpz7gvfbi4bh8ki02acbmwdksnkal61f2dxj8q";
|
||||
};
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
|
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, lua }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.0.7";
|
||||
version = "4.0.8";
|
||||
name = "redis-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.redis.io/releases/${name}.tar.gz";
|
||||
sha256 = "1lgcc5k6bg7f34lxbfx0xv74nj66khd5x8g1igyy2h7v8inm9fhv";
|
||||
sha256 = "1b9jqacckx4qqyz905mnclxfcpsvrwc507n6zr4r4canq6w3h37z";
|
||||
};
|
||||
|
||||
buildInputs = [ lua ];
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pgbouncer-${version}";
|
||||
version = "1.7.2";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pgbouncer.github.io/downloads/files/${version}/${name}.tar.gz";
|
||||
sha256 = "de36b318fe4a2f20a5f60d1c5ea62c1ca331f6813d2c484866ecb59265a160ba";
|
||||
sha256 = "1j4d7rkivg3vg27pvirigq9cy4v7pi48x7w57baq131c5lmdx2zs";
|
||||
};
|
||||
|
||||
buildInputs = [ libevent openssl ];
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pgroonga-${version}";
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz";
|
||||
sha256 = "0023747i2x3j50z54l78maq7dya5ldd2sdydn6l5l7k6b6g4yr2d";
|
||||
sha256 = "0jlaxkj33dgr2hgh0f861ja1z53kqw0g1syinl2sacsna2i9pdxy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }:
|
||||
let
|
||||
pkgName = "dehydrated";
|
||||
version = "0.5.0";
|
||||
version = "0.6.1";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = pkgName + "-" + version;
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "lukas2511";
|
||||
repo = "dehydrated";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ysfsz1ny3gcc4r9szrr09dg63zd7ppv6aih13wmai806yapwxrr";
|
||||
sha256 = "0390fnycl3l4yqacwvaf7dp08rx2vvs27s06q7b478qzrn59flz4";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "abcMIDI-${version}";
|
||||
version = "2018.02.22";
|
||||
version = "2018.03.08";
|
||||
|
||||
src = fetchzip {
|
||||
url = "http://ifdo.ca/~seymour/runabc/${name}.zip";
|
||||
sha256 = "03ln05012yhlq8aalm00af6pidb44phmmidlc953453isfllg82a";
|
||||
sha256 = "0pdia3n23l4nhc4lmyphgh6swq35nnzqk2z4ykif1xajbkbddxm3";
|
||||
};
|
||||
|
||||
# There is also a file called "makefile" which seems to be preferred by the standard build phase
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "datamash-${version}";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/datamash/${name}.tar.gz";
|
||||
sha256 = "15jrv3ly0vgvwwi2qjmhi39n7wrklwifdk961wwfaxyc5jr6zm78";
|
||||
sha256 = "19jpcv4ryvbz0476d6dgpxpbjkpmih4q84wj06nslls338bm5fzf";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, slang, ncurses }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "most-5.0.0";
|
||||
name = "most-5.0.0a";
|
||||
|
||||
src = fetchurl {
|
||||
url = ftp://space.mit.edu/pub/davis/most/most-5.0.0.tar.bz2;
|
||||
sha256 = "1f5x7rvjg89b5klfqs1gb91jmbnd3fy08d8rwgdvgg0plqkxr7ja";
|
||||
url = ftp://space.mit.edu/pub/davis/most/most-5.0.0a.tar.bz2;
|
||||
sha256 = "1aas904g8x48vsfh3wcr2k6mjzkm5808lfgl2qqhdfdnf4p5mjwl";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
24
pkgs/tools/misc/noteshrink/default.nix
Normal file
24
pkgs/tools/misc/noteshrink/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ stdenv, fetchFromGitHub, python3, imagemagick }:
|
||||
|
||||
with python3.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
name = "noteshrink-${version}";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mzucker";
|
||||
repo = "noteshrink";
|
||||
rev = version;
|
||||
sha256 = "0xhrvg3d8ffnbbizsrfppcd2y98znvkgxjdmvbvin458m2rwccka";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy scipy imagemagick pillow ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Convert scans of handwritten notes to beautiful, compact PDFs";
|
||||
homepage = https://mzucker.github.io/2016/09/20/noteshrink.html;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rnhmjoj ];
|
||||
};
|
||||
}
|
@ -5,13 +5,13 @@ let
|
||||
inherit (pythonPackages) python nose pycrypto requests mock;
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "svtplay-dl-${version}";
|
||||
version = "1.9.10";
|
||||
version = "1.9.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spaam";
|
||||
repo = "svtplay-dl";
|
||||
rev = version;
|
||||
sha256 = "1qi5c9ii3qq5s1rk7vj6n0kxbfqanbl0151id79b2qs96bpvj7vi";
|
||||
sha256 = "14p2362rzyblma9321z4zrcbzfs9m269ry6sz44ly0bv5fik7gdy";
|
||||
};
|
||||
|
||||
pythonPaths = [ pycrypto requests ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dnscrypt-wrapper-${version}";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cofyc";
|
||||
repo = "dnscrypt-wrapper";
|
||||
rev = "v${version}";
|
||||
sha256 = "121y93sb06qc50fj7vv47r6dpzv77hh7ywl7sgrfp8i4jf4kaspa";
|
||||
sha256 = "187sq99zxdfv3xhq939rybb0pps3l6wgyyvbj3zns5jr6mms64vd";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "redir-${version}";
|
||||
version = "3.1";
|
||||
version = "3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "troglobit";
|
||||
repo = "redir";
|
||||
rev = "v${version}";
|
||||
sha256 = "1m05dchi15bzz9zfdb7jg59624sx4khp5zq0wf4pzr31s64f69cx";
|
||||
sha256 = "015vxpy6n7xflkq0lgls4f4vw7ynvv2635bwykzglin3v5ssrm2k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
@ -2,11 +2,11 @@
|
||||
, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.3.5";
|
||||
version = "0.3.6";
|
||||
name = "opkg-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz";
|
||||
sha256 = "0ciz6h6sx9hnz463alpkcqwqnq8jk382ifc6z89j29hix8fw4jvk";
|
||||
sha256 = "02ykhjpyxmh0qrqvc1s3vlhnr6wyxkcwqb8dplxqmkz83gkg01zn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ fetchurl, stdenv, guile, which, ed }:
|
||||
{ fetchurl, stdenv, guile, which, ed, libtool }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mcron-1.0.6";
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace makefile.in --replace "rwxs" "rwx"
|
||||
'';
|
||||
|
||||
buildInputs = [ guile which ed ];
|
||||
buildInputs = [ guile which ed libtool ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nq-${version}";
|
||||
version = "0.2.2";
|
||||
version = "0.3.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "chneukirchen";
|
||||
repo = "nq";
|
||||
rev = "v${version}";
|
||||
sha256 = "0348r3j5y445psm8lj35z100cfvbfp05s7ji6bxd0gg4n66l2c4l";
|
||||
sha256 = "1db96ykz35r273jyhf7cdknqk4p2jj9l8gbz7pjy1hq4pb6ffk99";
|
||||
};
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
postPatch = ''
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xe-${version}";
|
||||
version = "0.6.1";
|
||||
version = "0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chneukirchen";
|
||||
repo = "xe";
|
||||
rev = "v${version}";
|
||||
sha256 = "1dr3xlfq3zfdba1q96iags572lbk3z6s2179rs3pvsgkxn4m0qpf";
|
||||
sha256 = "04jr8f6jcijr0bsmn8ajm0aj35qh9my3xjsaq64h8lwg5bpyn29x";
|
||||
};
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
|
@ -1312,6 +1312,8 @@ with pkgs;
|
||||
|
||||
nfdump = callPackage ../tools/networking/nfdump { };
|
||||
|
||||
noteshrink = callPackage ../tools/misc/noteshrink { };
|
||||
|
||||
nrsc5 = callPackage ../applications/misc/nrsc5 { };
|
||||
|
||||
onboard = callPackage ../applications/misc/onboard { };
|
||||
@ -3392,6 +3394,8 @@ with pkgs;
|
||||
|
||||
libtirpc = callPackage ../development/libraries/ti-rpc { };
|
||||
|
||||
libtins = callPackage ../development/libraries/libtins { };
|
||||
|
||||
libshout = callPackage ../development/libraries/libshout { };
|
||||
|
||||
libqb = callPackage ../development/libraries/libqb { };
|
||||
@ -8649,7 +8653,9 @@ with pkgs;
|
||||
inherit (pkgs.gnome2) gtkglext;
|
||||
};
|
||||
|
||||
far2l = callPackage ../applications/misc/far2l { };
|
||||
far2l = callPackage ../applications/misc/far2l {
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages_4.stdenv else stdenv;
|
||||
};
|
||||
|
||||
farbfeld = callPackage ../development/libraries/farbfeld { };
|
||||
|
||||
|
@ -1570,6 +1570,8 @@ in {
|
||||
|
||||
proboscis = callPackage ../development/python-modules/proboscis {};
|
||||
|
||||
py4j = callPackage ../development/python-modules/py4j { };
|
||||
|
||||
pyechonest = self.buildPythonPackage rec {
|
||||
name = "pyechonest-8.0.2";
|
||||
|
||||
@ -2650,22 +2652,7 @@ in {
|
||||
|
||||
pyunifi = callPackage ../development/python-modules/pyunifi { };
|
||||
|
||||
tablib = buildPythonPackage rec {
|
||||
name = "tablib-${version}";
|
||||
version = "0.12.1";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/t/tablib/tablib-${version}.tar.gz";
|
||||
sha256 = "11wxchj0qz77dn79yiq30k4b4gsm429f4bizk4lm4rb63nk51kxq";
|
||||
};
|
||||
|
||||
buildInputs = with self; [ pytest unicodecsv pandas ];
|
||||
propagatedBuildInputs = with self; [ xlwt openpyxl pyyaml xlrd odfpy ];
|
||||
meta = with stdenv.lib; {
|
||||
description = "Tablib: format-agnostic tabular dataset library";
|
||||
homepage = "http://python-tablib.org";
|
||||
};
|
||||
};
|
||||
tablib = callPackage ../development/python-modules/tablib { };
|
||||
|
||||
wakeonlan = callPackage ../development/python-modules/wakeonlan { };
|
||||
|
||||
@ -20652,6 +20639,8 @@ EOF
|
||||
|
||||
spacy_models = callPackage ../development/python-modules/spacy/models.nix { };
|
||||
|
||||
pyspark = callPackage ../development/python-modules/pyspark { };
|
||||
|
||||
sseclient = callPackage ../development/python-modules/sseclient { };
|
||||
|
||||
textacy = callPackage ../development/python-modules/textacy { };
|
||||
|
Loading…
Reference in New Issue
Block a user